- Update to 2.1.0 [1]

- Install some additional documentation [1]
- Fix WITH_MYSQL, WITH_ODBC and WITH_POSTGRES knobs [2]

PR:		60400 [1], 59445 [2]
Submitted by:	Nicolas Jombart <ecu@ipv42.net> [1],
		Ken Stailey <kstailey@yahoo.com> [2]

12 files changed, 135 insertions, 56 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index 1aad279e2ee3..a5c2e0de12b0 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -6,46 +6,55 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight network intrusion detection system
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mysql=no --with-odbc=no --with-postgresql=no
-MAN8=		snort.8
 
 .if defined(WITH_FLEXRESP)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
-CONFIGURE_ARGS+=--enable-flexresp
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
-LDFLAGS+=	"-L${LOCALBASE}/lib"
+BUILD_DEPENDS=		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+CONFIGURE_ARGS=		--enable-flexresp
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="${LDFLAGS}"
+LDFLAGS+=		"-L${LOCALBASE}/lib"
 .endif
 
 .if defined(WITH_MYSQL)
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--with-mysql=no
 .endif
 
 .if defined(WITH_ODBC)
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=--with-odbc=${LOCALBASE}
-LDFLAGS+=	${PTHREAD_LIBS}
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
+LDFLAGS+=		${PTHREAD_LIBS}
+.else
+CONFIGURE_ARGS+=	--with-odbc=no
 .endif
 
 .if defined(WITH_POSTGRES)
 POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE}/pgsql
+LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
-LDFLAGS+=	-lssl -lcrypto
+LDFLAGS+=		-lssl -lcrypto
 .endif
+.else
+CONFIGURE_ARGS+=	--with-postgresql=no
 .endif
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-USE_REINPLACE=	yes
+MAN8=	snort.8
+DOCS=	AUTHORS NEWS README.csv BUGS README README.database \
+	CREDITS README.FLEXRESP FAQ snort_manual.pdf \
+	README.PLUGINS USAGE README.thresholding README.flow \
+	README.flow-portscan README.http_inspect README.wireless
 
 post-patch:
 	${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/src/snort.c
@@ -56,19 +65,13 @@ pre-configure:
 	@${ECHO} "to get additional support."
 	@${ECHO} ""
 
-DOCS=	AUTHORS NEWS README.csv BUGS README README.database \
-	CREDITS README.FLEXRESP RULES.todo FAQ \
-	SnortUsersManual.pdf README.PLUGINS USAGE README.thresholding
-
 post-install:
-	${MKDIR} ${DATADIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/rules/*.rules ${DATADIR}; \
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/rules/*.rules ${DATADIR}; \
 	${INSTALL_DATA} ${WRKSRC}/etc/classification.config ${DATADIR}/classification.config-sample; \
 	if [ ! -f ${DATADIR}/classification.config ]; then \
 	    ${CP} ${DATADIR}/classification.config-sample \
diff --git a/security/snort/distinfo b/security/snort/distinfo
index 34cca982c56f..3593002f1eed 100644
--- a/security/snort/distinfo
+++ b/security/snort/distinfo
@@ -1 +1 @@
-MD5 (snort-2.0.5.tar.gz) = f129ee00a3d6e7b7c1ff4a1e1fba3a08
+MD5 (snort-2.1.0.tar.gz) = 1da6d683d18b39a72a3c277e8deffc69
diff --git a/security/snort/files/patch-event_wrapper.h b/security/snort/files/patch-event_wrapper.h
new file mode 100644
index 000000000000..2ecabc7d4187
--- /dev/null
+++ b/security/snort/files/patch-event_wrapper.h
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..4be911446e7d
--- /dev/null
+++ b/security/snort/files/patch-flow.h
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..a218bda25816
--- /dev/null
+++ b/security/snort/files/patch-flow_stat.h
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000000..35a343aa9716
--- /dev/null
+++ b/security/snort/files/patch-flowps.h
@@ -0,0 +1,16 @@
+--- 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
new file mode 100644
index 000000000000..39bfac96ed40
--- /dev/null
+++ b/security/snort/files/patch-ipobj.c
@@ -0,0 +1,10 @@
+--- 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-src_preprocessors_spp_frag2_c b/security/snort/files/patch-src_preprocessors_spp_frag2_c
deleted file mode 100644
index 9da49cfeb13d..000000000000
--- a/security/snort/files/patch-src_preprocessors_spp_frag2_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_preprocessors_spp_frag2_c,v 1.1 2003/06/24 17:02:38 pvalchev Exp $
---- src/preprocessors/spp_frag2.c.orig	Wed Apr  9 09:45:15 2003
-+++ src/preprocessors/spp_frag2.c	Mon Jun 23 17:00:19 2003
-@@ -93,7 +93,8 @@ void Frag2Init(u_char *args);
- #define FRAG2_TTL_LIMIT      5
- #define FRAG2_MIN_TTL        0
- 
--#if defined (SOLARIS) || defined (SUNOS)
-+#if defined (SOLARIS) || defined (SUNOS) || defined (__sparc__) || \
-+    defined (__sparc64__)
- #define SPARC_TWIDDLE       2
- #else
- #define SPARC_TWIDDLE       0
diff --git a/security/snort/files/patch-src_preprocessors_spp_stream4_c b/security/snort/files/patch-src_preprocessors_spp_stream4_c
deleted file mode 100644
index fa6dc3b060a5..000000000000
--- a/security/snort/files/patch-src_preprocessors_spp_stream4_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_preprocessors_spp_stream4_c,v 1.1 2003/06/24 17:02:38 pvalchev Exp $
---- src/preprocessors/spp_stream4.c.orig	Mon Jun 23 16:59:22 2003
-+++ src/preprocessors/spp_stream4.c	Mon Jun 23 17:00:46 2003
-@@ -153,7 +153,8 @@ extern int *file_line;
- /* We must twiddle to align the offset the ethernet header and align
-    the IP header on solaris -- maybe this will work on HPUX too.
- */
--#if defined (SOLARIS) || defined (SUNOS) || defined (HPUX)
-+#if defined (SOLARIS) || defined (SUNOS) || defined (HPUX) || \
-+    defined (__sparc__) || defined(__sparc64__)
- #define SPARC_TWIDDLE       2
- #else
- #define SPARC_TWIDDLE       0
diff --git a/security/snort/files/patch-util_net.c b/security/snort/files/patch-util_net.c
new file mode 100644
index 000000000000..458e4d82e2ca
--- /dev/null
+++ b/security/snort/files/patch-util_net.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..3ad1689cf718
--- /dev/null
+++ b/security/snort/files/patch-util_net.h
@@ -0,0 +1,16 @@
+--- 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 0806f91fdc87..e1d52ae7cc3c 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -11,12 +11,15 @@ etc/rc.d/snort.sh.sample
 %%PORTDOCS%%%%DOCSDIR%%/README.database
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP
-%%PORTDOCS%%%%DOCSDIR%%/RULES.todo
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/SnortUsersManual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS
 %%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%PORTDOCS%%%%DOCSDIR%%/README.thresholding
+%%PORTDOCS%%%%DOCSDIR%%/snort_manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/README.flow
+%%PORTDOCS%%%%DOCSDIR%%/README.flow-portscan
+%%PORTDOCS%%%%DOCSDIR%%/README.http_inspect
+%%PORTDOCS%%%%DOCSDIR%%/README.wireless
 %%DATADIR%%/attack-responses.rules
 %%DATADIR%%/backdoor.rules
 %%DATADIR%%/bad-traffic.rules