Index: snort/Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- snort/Makefile 3 Aug 2006 23:15:58 -0000 1.47
+++ snort/Makefile 20 Sep 2006 13:18:07 -0000
@@ -2,22 +2,28 @@
COMMENT= "highly flexible sniffer/NIDS"
-DISTNAME= snort-2.4.5
-PKGNAME= ${DISTNAME}p0
+DISTNAME= snort-2.6.0.2
+PKGNAME= ${DISTNAME}
CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
HOMEPAGE= http://www.snort.org/
+SHARED_LIBS= sf_engine 0.0 \
+ sf_dns_preproc 0.0 \
+ sf_ftptelnet_preproc 0.0 \
+ sf_smtp_preproc 0.0
# License: GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m pcap
+WANTLIB= c com_err m pcap
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+ --enable-dynamicplugin
LIB_DEPENDS= pcre::devel/pcre
@@ -30,11 +36,8 @@
FLAVOR?=
.if ${FLAVOR:L:Mflexresp}
-LIB_DEPENDS+= lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --enable-flexresp \
- --with-libnet-includes=${LOCALBASE}/include/libnet-1.0 \
- --with-libnet-libraries=${LOCALBASE}/lib/libnet-1.0
+LIB_DEPENDS+= dnet.=1::net/libdnet
+CONFIGURE_ARGS+= --enable-flexresp2
.endif
.if ${FLAVOR:L:Mpostgresql}
Index: snort/distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- snort/distinfo 8 Jun 2006 20:25:53 -0000 1.13
+++ snort/distinfo 20 Sep 2006 13:18:07 -0000
@@ -1,4 +1,4 @@
-MD5 (snort-2.4.5.tar.gz) = 108b3c20dcbaf3cdb17ea9203342eaaa
-RMD160 (snort-2.4.5.tar.gz) = 1b697ccd84e1c10406ac20ccc0c46f79ea661e11
-SHA1 (snort-2.4.5.tar.gz) = 3ba7dae8058aecf4e4eb1c7a816a7c8a4fb7c550
-SIZE (snort-2.4.5.tar.gz) = 2817837
+MD5 (snort-2.6.0.2.tar.gz) = 5c094ff6d82db845a5f023e4a492103e
+RMD160 (snort-2.6.0.2.tar.gz) = 706d63db83b7d037ac8a71c8104324d9b7594eb5
+SHA1 (snort-2.6.0.2.tar.gz) = 1a6b3fb19a82f83bf0fce5a8db6eb1277c72379b
+SIZE (snort-2.6.0.2.tar.gz) = 3350277
Index: snort/patches/patch-configure
===================================================================
RCS file: snort/patches/patch-configure
diff -N snort/patches/patch-configure
--- snort/patches/patch-configure 12 Apr 2006 22:03:48 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2006/04/12 22:03:48 david Exp $
---- configure.orig Wed Mar 8 15:38:24 2006
-+++ configure Thu Mar 9 09:03:15 2006
-@@ -8397,20 +8397,20 @@ fi
- # Check whether --enable-flexresp or --disable-flexresp was given.
- if test "${enable_flexresp+set}" = set; then
- enableval="$enable_flexresp"
-- CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines
--cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"
-+ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config-1.0 --defines
--cflags`" LDFLAGS="`libnet-config-1.0 --libs` ${LDFLAGS} "
- fi;
-
-
- if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then
-
-- if test `libnet-config --cflags | wc -c` = "1"; then
-+ if test `libnet-config-1.0 --cflags | wc -c` = "1"; then
- CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
- LIBNET_CONFIG_BROKEN_CFLAGS=yes
- fi
-
-- if test `libnet-config --libs | wc -c` = "1"; then
-- { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your
system. If you" >&5
--echo "$as_me: WARNING: libnet-config --libs is broken on your system. If
you" >&2;}
-+ if test `libnet-config-1.0 --libs | wc -c` = "1"; then
-+ { echo "$as_me:$LINENO: WARNING: libnet-config-1.0 --libs is broken on
your system. If you" >&5
-+echo "$as_me: WARNING: libnet-config-1.0 --libs is broken on your system. If
you" >&2;}
- { echo "$as_me:$LINENO: WARNING: are using a precompiled package please
notify the" >&5
- echo "$as_me: WARNING: are using a precompiled package please notify the"
>&2;}
- { echo "$as_me:$LINENO: WARNING: maintainer." >&5
-@@ -8590,7 +8590,7 @@ echo $ECHO_N "checking for libnet versio
- libnet_dir="/usr/include /usr/local/include /sw/include"
- fi
- else
-- libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+ libnet_dir=`libnet-config-1.0 --cflags | cut -dI -f2`
- fi
-
- LIBNET_INC_DIR=""
Index: snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
===================================================================
RCS file: snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
diff -N snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 20 Sep
2006 13:18:07 -0000
@@ -0,0 +1,11 @@
+--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Wed Sep 20 16:10:44 2006
++++ src/dynamic-plugins/sf_dynamic_plugins.c Wed Sep 20 16:09:23 2006
+@@ -42,6 +42,8 @@
+ #define EXT "*.sl"
+ #elif defined(MACOS)
+ #define EXT "*.dylib"
++#elif defined(OPENBSD)
++#define EXT "*.so.*"
+ #else
+ #define EXT "*.so"
+ #endif
Index: snort/pkg/PFRAG.shared
===================================================================
RCS file: snort/pkg/PFRAG.shared
diff -N snort/pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ snort/pkg/PFRAG.shared 20 Sep 2006 13:18:07 -0000
@@ -0,0 +1,5 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED]
lib/snort_dynamicengine/libsf_engine.so.${LIBsf_engine_VERSION}
[EMAIL PROTECTED]
lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.${LIBsf_dns_preproc_VERSION}
[EMAIL PROTECTED]
lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.${LIBsf_ftptelnet_preproc_VERSION}
[EMAIL PROTECTED]
lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.${LIBsf_smtp_preproc_VERSION}
Index: snort/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- snort/pkg/PLIST 4 Feb 2006 13:15:42 -0000 1.14
+++ snort/pkg/PLIST 20 Sep 2006 13:18:07 -0000
@@ -1,7 +1,18 @@
@comment $OpenBSD: PLIST,v 1.14 2006/02/04 13:15:42 david Exp $
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
+%%SHARED%%
bin/snort
+lib/snort_dynamicengine/
+lib/snort_dynamicengine/libsf_engine.a
+lib/snort_dynamicengine/libsf_engine.la
+lib/snort_dynamicpreprocessor/
+lib/snort_dynamicpreprocessor/libsf_dns_preproc.a
+lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
+lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.a
+lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.la
+lib/snort_dynamicpreprocessor/libsf_smtp_preproc.a
+lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
@man man/man8/snort.8
share/examples/snort/
@sample ${SYSCONFDIR}/snort/