10 files changed, 4 insertions, 103 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index 364f958d70f4..9e783f4f130f 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/
 
diff --git a/security/snort/distinfo b/security/snort/distinfo
index c045338cb26e..e62447b3ff01 100644
--- a/security/snort/distinfo
+++ b/security/snort/distinfo
@@ -1,2 +1,2 @@
-MD5 (snort-2.1.0.tar.gz) = 1da6d683d18b39a72a3c277e8deffc69
-SIZE (snort-2.1.0.tar.gz) = 2244701
+MD5 (snort-2.1.1.tar.gz) = f53ce230616c1f6aafedf546a7cc0f0f
+SIZE (snort-2.1.1.tar.gz) = 2309735
diff --git a/security/snort/files/patch-event_wrapper.h b/security/snort/files/patch-event_wrapper.h
deleted file mode 100644
index 2ecabc7d4187..000000000000
--- a/security/snort/files/patch-event_wrapper.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/event_wrapper.h.orig	Fri Dec 19 14:37:32 2003
-+++ src/event_wrapper.h	Fri Dec 19 14:38:49 2003
-@@ -1,7 +1,11 @@
- #ifndef _EVENT_WRAPPER_H
- #define _EVENT_WRAPPER_H
- 
--#include <stdint.h>
-+#if HAVE_STDINT_H
-+ #include <stdint.h>
-+#else
-+ #include <inttypes.h>
-+#endif
- 
- #include "log.h"
- #include "detect.h"
diff --git a/security/snort/files/patch-flow.h b/security/snort/files/patch-flow.h
deleted file mode 100644
index 4be911446e7d..000000000000
--- a/security/snort/files/patch-flow.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/preprocessors/flow/flow.h.orig	Fri Dec 19 14:43:23 2003
-+++ src/preprocessors/flow/flow.h	Fri Dec 19 14:43:48 2003
-@@ -1,7 +1,11 @@
- #ifndef _FLOW_H
- #define _FLOW_H
- 
--#include <stdint.h>
-+#if HAVE_STDINT_H
-+ #include <stdint.h>
-+#else
-+ #include <inttypes.h>
-+#endif
- 
- #include "flow_error.h"
- #include "util_math.h"
diff --git a/security/snort/files/patch-flow_stat.h b/security/snort/files/patch-flow_stat.h
deleted file mode 100644
index a218bda25816..000000000000
--- a/security/snort/files/patch-flow_stat.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/preprocessors/flow/flow_stat.h.orig	Fri Dec 19 14:37:49 2003
-+++ src/preprocessors/flow/flow_stat.h	Fri Dec 19 14:39:27 2003
-@@ -2,8 +2,13 @@
- #define _FLOW_STAT_H
- 
- #include <stdio.h>
--#include <stdint.h>
- #include <time.h>
-+
-+#if HAVE_STDINT_H
-+ #include <stdint.h>
-+#else
-+ #include <inttypes.h>
-+#endif
- 
- #include "flow.h"
- 
diff --git a/security/snort/files/patch-flowps.h b/security/snort/files/patch-flowps.h
deleted file mode 100644
index 35a343aa9716..000000000000
--- a/security/snort/files/patch-flowps.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/preprocessors/flow/portscan/flowps.h.orig	Fri Dec 19 14:37:56 2003
-+++ src/preprocessors/flow/portscan/flowps.h	Fri Dec 19 14:39:51 2003
-@@ -6,7 +6,12 @@
- #endif
- 
- #include <time.h>
--#include <stdint.h>
-+
-+#if HAVE_STDINT_H
-+ #include <stdint.h>
-+#else
-+ #include <inttypes.h>
-+#endif
- 
- #include "flow.h"
- #include "unique_tracker.h"
diff --git a/security/snort/files/patch-ipobj.c b/security/snort/files/patch-ipobj.c
deleted file mode 100644
index 39bfac96ed40..000000000000
--- a/security/snort/files/patch-ipobj.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sfutil/ipobj.c.orig	Fri Dec 19 14:16:33 2003
-+++ src/sfutil/ipobj.c	Fri Dec 19 14:18:10 2003
-@@ -19,6 +19,7 @@
- #include <string.h>
- 
- #ifndef WIN32
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/security/snort/files/patch-util_net.c b/security/snort/files/patch-util_net.c
deleted file mode 100644
index 458e4d82e2ca..000000000000
--- a/security/snort/files/patch-util_net.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sfutil/util_net.c.orig	Fri Dec 19 14:18:45 2003
-+++ src/sfutil/util_net.c	Fri Dec 19 14:19:04 2003
-@@ -6,6 +6,7 @@
- 
- #ifndef WIN32
- /* for inet_ntoa */
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/security/snort/files/patch-util_net.h b/security/snort/files/patch-util_net.h
deleted file mode 100644
index 3ad1689cf718..000000000000
--- a/security/snort/files/patch-util_net.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/sfutil/util_net.h.orig	Fri Dec 19 14:32:47 2003
-+++ src/sfutil/util_net.h	Fri Dec 19 14:34:31 2003
-@@ -11,7 +11,12 @@
- #ifndef _UTIL_NET_H
- #define _UTIL_NET_H
- 
--#include <stdint.h>
-+
-+#if HAVE_STDINT_H
-+ #include <stdint.h>
-+#else
-+ #include <inttypes.h>
-+#endif
- 
- char *inet_ntoax(uint32_t ip);
- char * mktcpflag_str(int flags);
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index 375c1c8825be..0aa409143428 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -25,6 +25,7 @@ etc/rc.d/snort.sh.sample
 %%PORTDOCS%%%%DOCSDIR%%/README.csv
 %%PORTDOCS%%%%DOCSDIR%%/README.database
 %%PORTDOCS%%%%DOCSDIR%%/README.flow
+%%PORTDOCS%%%%DOCSDIR%%/README.flowbits
 %%PORTDOCS%%%%DOCSDIR%%/README.flow-portscan
 %%PORTDOCS%%%%DOCSDIR%%/README.http_inspect
 %%PORTDOCS%%%%DOCSDIR%%/README.thresholding