cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update snort to 2.8.3.2, from Markus Lude.

Browse Source
This commit is contained in:
rui 2009-02-12 22:12:08 +00:00
parent 167193e5f2
commit 5ec2bcefaf
25 changed files with 193 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
net/snort/Makefile
View File

@ -1,94 +1,89 @@
# $OpenBSD: Makefile,v 1.52 2008/02/12 14:13:32 rui Exp $
# $OpenBSD: Makefile,v 1.53 2009/02/12 22:12:08 rui Exp $
COMMENT= highly flexible sniffer/NIDS
COMMENT = highly flexible sniffer/NIDS
DISTNAME= snort-2.8.0.1
CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
DISTNAME = snort-2.8.3.2
CATEGORIES = net security
MASTER_SITES = ${HOMEPAGE}dl/
HOMEPAGE= http://www.snort.org/
HOMEPAGE = http://www.snort.org/
MAINTAINER= Markus Lude <markus.lude@gmx.de>
MAINTAINER = Markus Lude <markus.lude@gmx.de>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pcap
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m pcap
SHARED_LIBS= sf_engine 1.0 \
sf_dns_preproc 1.0 \
sf_ftptelnet_preproc 1.0 \
sf_smtp_preproc 1.0 \
sf_dcerpc_preproc 0.0 \
sf_ssh_preproc 0.0 \
_sfdynamic_example_rule 0.0 \
_sfdynamic_preprocessor_example 0.0
SHARED_LIBS = sf_engine 2.0 \
sf_dns_preproc 2.0 \
sf_ftptelnet_preproc 2.0 \
sf_smtp_preproc 2.0 \
sf_dcerpc_preproc 1.0 \
sf_ssh_preproc 1.0 \
sf_ssl_preproc 0.0 \
_sfdynamic_example_rule 0.0 \
_sfdynamic_preprocessor_example 0.0
USE_LIBTOOL= Yes
USE_LIBTOOL = Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-dynamicplugin
SEPARATE_BUILD = concurrent
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--enable-dynamicplugin
LIB_DEPENDS= pcre::devel/pcre
MAKE_FLAGS = mandir=${TRUEPREFIX}/man
LIB_DEPENDS = pcre::devel/pcre
# gcc 3.3.5, Bus errors
.if ${MACHINE_ARCH} == "sparc64"
CFLAGS+= -O0
CFLAGS += -O0
.endif
FLAVORS= postgresql mysql flexresp prelude
FLAVOR?=
FLAVORS = postgresql mysql flexresp prelude
FLAVOR ?=
.if ${FLAVOR:L:Mflexresp}
LIB_DEPENDS+= dnet.=1::net/libdnet
CONFIGURE_ARGS+=--enable-flexresp2
MASTER_SITES0= http://www-fs.informatik.uni-tuebingen.de/~lude/openbsd/distfiles/
PATCHFILES= snort-flexresp_patch.diff:0
LIB_DEPENDS += dnet.=1::net/libdnet
CONFIGURE_ARGS += --enable-flexresp2
.endif
.if ${FLAVOR:L:Mpostgresql}
LIB_DEPENDS+= pq.>=2::databases/postgresql
CONFIGURE_ARGS+=--with-postgresql="${LOCALBASE}"
LIB_DEPENDS += pq.>=2::databases/postgresql
CONFIGURE_ARGS += --with-postgresql="${LOCALBASE}"
.endif
.if ${FLAVOR:L:Mmysql}
LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
CONFIGURE_ARGS+=--with-mysql-libraries="${LOCALBASE}/lib" \
--with-mysql-includes="${LOCALBASE}/include"
WANTLIB+= z
LIB_DEPENDS += lib/mysql/mysqlclient.>=10::databases/mysql
CONFIGURE_ARGS += --with-mysql-libraries="${LOCALBASE}/lib" \
--with-mysql-includes="${LOCALBASE}/include"
WANTLIB += z
.endif
.if ${FLAVOR:L:Mprelude}
MODULES= devel/gettext
WANTLIB+= gcrypt gnutls gpg-error pthread z
LIB_DEPENDS+= prelude.>=8::security/prelude/libprelude
CONFIGURE_ARGS+=--enable-prelude
MESSAGE= ${PKGDIR}/MESSAGE-prelude
MODULES = devel/gettext
WANTLIB += gcrypt gnutls gpg-error pthread tasn1 z
LIB_DEPENDS += prelude.>=8::security/prelude/libprelude
CONFIGURE_ARGS += --enable-prelude
MESSAGE = ${PKGDIR}/MESSAGE-prelude
.endif
CONFIGS= classification.config gen-msg.map reference.config \
sid-msg.map snort.conf threshold.conf unicode.map
CONFIGS = classification.config gen-msg.map reference.config \
sid-msg.map snort.conf threshold.conf unicode.map
PREPROC= decoder.rules preprocessor.rules
PREPROC = decoder.rules preprocessor.rules
DOCS= AUTHORS CREDITS README README.* *.pdf TODO USAGE WISHLIST
DOCS = AUTHORS CREDITS README README.* *.pdf TODO USAGE \
WISHLIST
# workaround conflicts between distpatches and patches
post-patch:
.if ${FLAVOR:L:Mflexresp}
@perl -pi -e "s,ip_t,snort_ip," ${WRKSRC}/src/preprocessors/stream.h
.endif
SCHEMAS = create_db2 create_mssql create_mysql \
create_oracle.sql create_postgresql
post-build:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
${WRKSRC}/etc/snort.conf
@perl -pi -e "s,/usr/local/,${LOCALBASE}/," \
${WRKSRC}/etc/snort.conf
pre-configure:
@${SUBST_CMD} ${WRKSRC}/etc/snort.conf
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snort
@ -102,10 +97,13 @@ post-install:
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
.for j in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${j} ${PREFIX}/share/doc/snort
.for i in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/snort
.endfor
.for i in ${SCHEMAS}
${INSTALL_DATA} ${WRKSRC}/schemas/${i} ${PREFIX}/share/doc/snort
.endfor
NO_REGRESS= Yes
NO_REGRESS = Yes
.include <bsd.port.mk>

15
net/snort/distinfo
View File

@ -1,10 +1,5 @@
MD5 (snort-2.8.0.1.tar.gz) = u2UOjv6Fj1w8yx5HF3XX5w==
MD5 (snort-flexresp_patch.diff) = ZYyI5dSWIpCkny37tRidUQ==
RMD160 (snort-2.8.0.1.tar.gz) = oLC+wvfMoNR6WYcIu/xpysr0ShI=
RMD160 (snort-flexresp_patch.diff) = vrc4csTm8t0HUKMbYMrMzDs66jA=
SHA1 (snort-2.8.0.1.tar.gz) = s7RfptUDcvZYfNd2r0O0FSURljA=
SHA1 (snort-flexresp_patch.diff) = qkgi0RNWJintUwpX6uYE4QdeWV4=
SHA256 (snort-2.8.0.1.tar.gz) = T6dP2/5nc2Kw/vImAm5/EQ196Fa6qtIbX+Pr0PYnsRI=
SHA256 (snort-flexresp_patch.diff) = cBSVJQ939iIageqqNMHQnsa1GjjplPju96ePvHBMyNY=
SIZE (snort-2.8.0.1.tar.gz) = 4331731
SIZE (snort-flexresp_patch.diff) = 48418
MD5 (snort-2.8.3.2.tar.gz) = 91VH2jNEbdtMoH7v2c4x3A==
RMD160 (snort-2.8.3.2.tar.gz) = IkPA8DLM1fFbRGGP2gCQRCbSz4Y=
SHA1 (snort-2.8.3.2.tar.gz) = P+Y1LMzcN4KPJS8GKwal+jEDXaw=
SHA256 (snort-2.8.3.2.tar.gz) = nsNBHGgekQcjTKBBAEJAidM3VCsCL4y1gPLrrlsEDD4=
SIZE (snort-2.8.3.2.tar.gz) = 4478448

10
net/snort/patches/patch-etc_snort_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_snort_conf,v 1.2 2008/02/12 14:13:32 rui Exp $
--- etc/snort.conf.orig Fri Sep 7 20:32:45 2007
+++ etc/snort.conf Mon Nov 19 22:23:57 2007
$OpenBSD: patch-etc_snort_conf,v 1.3 2009/02/12 22:12:08 rui Exp $
--- etc/snort.conf.orig Mon Sep 15 18:28:02 2008
+++ etc/snort.conf Thu Nov 6 17:44:46 2008
@@ -78,7 +78,10 @@ var SNMP_SERVERS $HOME_NET
# like this:
#
@ -19,8 +19,8 @@ $OpenBSD: patch-etc_snort_conf,v 1.2 2008/02/12 14:13:32 rui Exp $
# such as: c:\snort\rules
-var RULE_PATH ../rules
-var PREPROC_RULE_PATH ../preproc_rules
+var RULE_PATH %%SYSCONFDIR%%/snort/rules
+var PREPROC_RULE_PATH %%SYSCONFDIR%%/snort/preproc_rules
+var RULE_PATH ${SYSCONFDIR}/snort/rules
+var PREPROC_RULE_PATH ${SYSCONFDIR}/snort/preproc_rules
# Configure the snort decoder
# ============================

8
net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.2 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Thu Feb 7 09:41:13 2008
+++ src/dynamic-plugins/sf_dynamic_plugins.c Thu Feb 7 09:41:29 2008
@@ -218,8 +218,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.3 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Wed Apr 30 20:53:15 2008
+++ src/dynamic-plugins/sf_dynamic_plugins.c Fri Aug 8 14:57:43 2008
@@ -227,8 +227,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
dirEntry = readdir(directory);
while (dirEntry)
{

10
net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.2 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-preprocessors/Makefile.in.orig Wed Nov 14 15:32:47 2007
+++ src/dynamic-preprocessors/Makefile.in Thu Nov 29 12:07:49 2007
@@ -543,8 +543,7 @@ maintainer-clean-generic:
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.3 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/Makefile.in.orig Fri Jul 18 22:52:05 2008
+++ src/dynamic-preprocessors/Makefile.in Fri Aug 8 14:57:43 2008
@@ -569,8 +569,7 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
@ -11,7 +11,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.2 2008/02/12 14:13:32
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
@@ -700,20 +699,6 @@ include/str_search.h: $(srcdir)/../preprocessors/str_s
@@ -737,20 +736,6 @@ include/str_search.h: $(srcdir)/../preprocessors/str_s
clean-local:
rm -rf include build

10
net/snort/patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc_Makefile_in,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-preprocessors/dcerpc/Makefile.in.orig Wed Nov 14 15:32:47 2007
+++ src/dynamic-preprocessors/dcerpc/Makefile.in Thu Nov 29 12:07:50 2007
@@ -394,7 +394,7 @@ distdir: $(DISTFILES)
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc_Makefile_in,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/dcerpc/Makefile.in.orig Fri Jul 18 22:52:05 2008
+++ src/dynamic-preprocessors/dcerpc/Makefile.in Fri Aug 8 14:57:43 2008
@@ -392,7 +392,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@ -9,4 +9,4 @@ $OpenBSD: patch-src_dynamic-preprocessors_dcerpc_Makefile_in,v 1.1 2008/02/12 14
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \

10
net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.2 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-preprocessors/dns/Makefile.in.orig Wed Nov 14 15:32:47 2007
+++ src/dynamic-preprocessors/dns/Makefile.in Thu Nov 29 12:07:51 2007
@@ -376,7 +376,7 @@ distdir: $(DISTFILES)
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.3 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/dns/Makefile.in.orig Fri Jul 18 22:52:06 2008
+++ src/dynamic-preprocessors/dns/Makefile.in Fri Aug 8 14:57:43 2008
@@ -374,7 +374,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@ -9,4 +9,4 @@ $OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.2 2008/02/12 14:13
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \

10
net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.2 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Wed Nov 14 15:32:47 2007
+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Thu Nov 29 12:07:52 2007
@@ -415,7 +415,7 @@ distdir: $(DISTFILES)
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.3 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Fri Jul 18 22:52:06 2008
+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Fri Aug 8 14:57:43 2008
@@ -414,7 +414,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@ -9,4 +9,4 @@ $OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.2 2008/02/12
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \

10
net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.2 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-preprocessors/smtp/Makefile.in.orig Wed Nov 14 15:32:47 2007
+++ src/dynamic-preprocessors/smtp/Makefile.in Thu Nov 29 12:07:53 2007
@@ -390,7 +390,7 @@ distdir: $(DISTFILES)
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.3 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/smtp/Makefile.in.orig Fri Jul 18 22:52:07 2008
+++ src/dynamic-preprocessors/smtp/Makefile.in Fri Aug 8 14:57:44 2008
@@ -393,7 +393,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@ -9,4 +9,4 @@ $OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.2 2008/02/12 14:1
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \

10
net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/dynamic-preprocessors/ssh/Makefile.in.orig Wed Nov 14 15:32:47 2007
+++ src/dynamic-preprocessors/ssh/Makefile.in Thu Nov 29 12:07:54 2007
@@ -376,7 +376,7 @@ distdir: $(DISTFILES)
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/ssh/Makefile.in.orig Fri Jul 18 22:52:08 2008
+++ src/dynamic-preprocessors/ssh/Makefile.in Fri Aug 8 14:57:44 2008
@@ -374,7 +374,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@ -9,4 +9,4 @@ $OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.1 2008/02/12 14:13
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \

12
net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.1 2009/02/12 22:12:08 rui Exp $
--- src/dynamic-preprocessors/ssl/Makefile.in.orig Fri Jul 18 22:52:08 2008
+++ src/dynamic-preprocessors/ssl/Makefile.in Fri Aug 8 15:59:22 2008
@@ -384,7 +384,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \

14
net/snort/patches/patch-src_log_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_log_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/log.c.orig Mon Aug 20 19:40:24 2007
+++ src/log.c Mon Nov 19 22:32:12 2007
@@ -355,7 +355,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
$OpenBSD: patch-src_log_c,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/log.c.orig Mon Jun 16 20:33:54 2008
+++ src/log.c Fri Sep 5 22:54:34 2008
@@ -358,7 +358,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type););
bzero((char *) timestamp, TIMEBUF_SIZE);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_log_c,v 1.1 2008/02/12 14:13:32 rui Exp $
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
@@ -800,7 +800,7 @@ void PrintArpHeader(FILE * fp, Packet * p)
@@ -851,7 +851,7 @@ void PrintArpHeader(FILE * fp, Packet * p)
bzero((struct in_addr *) &ip_addr, sizeof(struct in_addr));
bzero((char *) timestamp, TIMEBUF_SIZE);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_log_c,v 1.1 2008/02/12 14:13:32 rui Exp $
/* determine what to use as MAC src and dst */
if (p->eh != NULL)
@@ -1874,7 +1874,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
@@ -1929,7 +1929,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
bzero((char *) timestamp, TIMEBUF_SIZE);
@ -28,7 +28,7 @@ $OpenBSD: patch-src_log_c,v 1.1 2008/02/12 14:13:32 rui Exp $
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
@@ -2048,7 +2048,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
@@ -2103,7 +2103,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
bzero((char *) timestamp, TIMEBUF_SIZE);

12
net/snort/patches/patch-src_log_text_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_log_text_c,v 1.1 2009/02/12 22:12:08 rui Exp $
--- src/log_text.c.orig Wed Apr 30 20:41:31 2008
+++ src/log_text.c Fri Aug 8 16:03:17 2008
@@ -61,7 +61,7 @@ extern OptTreeNode *otn_tmp; /* global ptr to curre
void LogTimeStamp(TextLog* log, Packet* p)
{
char timestamp[TIMEBUF_SIZE];
- ts_print((struct timeval*)&p->pkth->ts, timestamp);
+ ts_print((struct timeval32*)&p->pkth->ts, timestamp);
TextLog_Puts(log, timestamp);
}

12
net/snort/patches/patch-src_output-plugins_spo_alert_fast_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_output-plugins_spo_alert_fast_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/output-plugins/spo_alert_fast.c.orig Mon Aug 20 19:26:05 2007
+++ src/output-plugins/spo_alert_fast.c Mon Nov 19 22:36:30 2007
@@ -138,7 +138,7 @@ void AlertFast(Packet *p, char *msg, void *arg, Event
SpoAlertFastData *data = (SpoAlertFastData *)arg;
bzero((char *) timestamp, TIMEBUF_SIZE);
- ts_print(p == NULL ? NULL : (struct timeval *) & p->pkth->ts, timestamp);
+ ts_print(p == NULL ? NULL : (struct timeval32 *) & p->pkth->ts, timestamp);
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, data->file);

12
net/snort/patches/patch-src_output-plugins_spo_alert_full_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_output-plugins_spo_alert_full_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/output-plugins/spo_alert_full.c.orig Mon Aug 20 19:26:05 2007
+++ src/output-plugins/spo_alert_full.c Mon Nov 19 22:36:14 2007
@@ -162,7 +162,7 @@ void AlertFull(Packet *p, char *msg, void *arg, Event
DEBUG_WRAP(DebugMessage(DEBUG_LOG, "Logging Alert data!\n"););
bzero((char *) timestamp, TIMEBUF_SIZE);
- ts_print(p == NULL ? NULL : (struct timeval *) & p->pkth->ts, timestamp);
+ ts_print(p == NULL ? NULL : (struct timeval32 *) & p->pkth->ts, timestamp);
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, data->file);

12
net/snort/patches/patch-src_output-plugins_spo_csv_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_output-plugins_spo_csv_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/output-plugins/spo_csv.c.orig Mon Aug 20 19:26:06 2007
+++ src/output-plugins/spo_csv.c Mon Nov 19 22:37:14 2007
@@ -270,7 +270,7 @@ void RealAlertCSV(Packet * p, char *msg, FILE * file,
return;
bzero((char *) timestamp, TIMEBUF_SIZE);
- ts_print(p == NULL ? NULL : (struct timeval *) & p->pkth->ts, timestamp);
+ ts_print(p == NULL ? NULL : (struct timeval32 *) & p->pkth->ts, timestamp);
DEBUG_WRAP(DebugMessage(DEBUG_LOG,"Logging CSV Alert data\n"););

28
net/snort/patches/patch-src_ppm_c
View File

@ -1,7 +1,25 @@
$OpenBSD: patch-src_ppm_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/ppm.c.orig Mon Aug 20 19:25:02 2007
+++ src/ppm.c Mon Nov 19 22:39:12 2007
@@ -360,7 +360,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
$OpenBSD: patch-src_ppm_c,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/ppm.c.orig Mon Sep 15 16:41:26 2008
+++ src/ppm.c Thu Oct 30 18:26:56 2008
@@ -395,7 +395,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
{
if(!*timestamp)
- ts_print((struct timeval*)&p->pkth->ts, timestamp);
+ ts_print((struct timeval32*)&p->pkth->ts, timestamp);
for (i=0; i< ppm_n_crules; i++)
{
@@ -451,7 +451,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
{
if(!*timestamp)
- ts_print((struct timeval*)&p->pkth->ts, timestamp);
+ ts_print((struct timeval32*)&p->pkth->ts, timestamp);
for (i=0; i< ppm_n_rules; i++)
{
@@ -520,7 +520,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
{
if(!*timestamp)
@ -10,7 +28,7 @@ $OpenBSD: patch-src_ppm_c,v 1.1 2008/02/12 14:13:32 rui Exp $
LogMessage(PPM_FMT_REENABLED,
otn->sigInfo.generator,
@@ -423,7 +423,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
@@ -583,7 +583,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
{
if(!*timestamp)

8
net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Nov 13 21:32:49 2007
+++ src/preprocessors/Stream5/snort_stream5_tcp.c Thu Nov 29 12:08:00 2007
@@ -6076,7 +6076,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Dec 30 16:50:33 2008
+++ src/preprocessors/Stream5/snort_stream5_tcp.c Wed Jan 21 02:42:47 2009
@@ -6501,7 +6501,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
bzero((char *)timestamp, TIMEBUF_SIZE);

12
net/snort/patches/patch-src_preprocessors_snort_stream4_session_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_preprocessors_snort_stream4_session_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/preprocessors/snort_stream4_session.c.orig Mon Aug 20 19:30:23 2007
+++ src/preprocessors/snort_stream4_session.c Mon Nov 19 22:50:05 2007
@@ -149,7 +149,7 @@ int GetSessionKey(Packet *p, SessionHashKey *key)
key->proto = GET_IPH_PROTO(p);
#ifdef _LP64
- key->pad1 = key->pad2 = 0;
+ key->pad1 = key->pad2 = key->pad3 = 0;
#endif
return 1;

8
net/snort/patches/patch-src_preprocessors_spp_sfportscan_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/preprocessors/spp_sfportscan.c.orig Fri Sep 7 19:59:20 2007
+++ src/preprocessors/spp_sfportscan.c Mon Nov 19 22:39:50 2007
@@ -247,7 +247,7 @@ static int LogPortscanAlert(Packet *p, char *msg, u_in
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/preprocessors/spp_sfportscan.c.orig Mon Feb 25 20:27:45 2008
+++ src/preprocessors/spp_sfportscan.c Fri Aug 8 14:57:45 2008
@@ -287,7 +287,7 @@ static int LogPortscanAlert(Packet *p, char *msg, u_in
return 0;
}

80
net/snort/patches/patch-src_preprocessors_stream_h
View File

@ -1,80 +0,0 @@
$OpenBSD: patch-src_preprocessors_stream_h,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/preprocessors/stream.h.orig Mon Aug 20 19:30:23 2007
+++ src/preprocessors/stream.h Sat Dec 1 02:18:24 2007
@@ -39,12 +39,12 @@ typedef struct _StreamPacketData
u_int8_t *pktOrig;
u_int8_t *pkt;
struct pcap_pkthdr pkth;
- u_int16_t pkt_size;
/* Pointer to trimmed payload */
u_int8_t *payload;
- u_int16_t payload_size;
u_int32_t seq_num;
u_int32_t cksum;
+ u_int16_t pkt_size;
+ u_int16_t payload_size;
u_int8_t chuck; /* mark the spd for chucking if it's
* been reassembled
*/
@@ -66,34 +66,37 @@ typedef struct _StreamAlertInfo
typedef struct _Stream
{
ip_t ip; /* IP addr */
- u_int16_t port; /* port number */
- u_int8_t state; /* stream state */
u_int32_t isn; /* initial sequence number */
u_int32_t base_seq; /* base seq num for this packet set */
u_int32_t last_ack; /* last segment ack'd */
+ u_int16_t port; /* port number */
u_int16_t win_size; /* window size */
u_int32_t next_seq; /* next sequence we expect to see -- used on reassemble */
u_int32_t pkts_sent; /* track the number of packets in this stream */
u_int32_t bytes_sent; /* track the number of bytes in this stream */
u_int32_t bytes_tracked; /* track the total number of bytes on this side */
+ u_int8_t state; /* stream state */
u_int8_t state_queue; /* queued state transition */
u_int8_t expected_flags; /* tcp flag needed to accept transition */
- u_int32_t trans_seq; /* sequence number of transition packet */
u_int8_t stq_chk_seq; /* flag to see if we need to check the seq
num of the state transition packet */
+ u_int32_t trans_seq; /* sequence number of transition packet */
u_int32_t overlap_pkts; /* track the number of packets with duplicate seq #s */
u_int32_t bytes_inspected; /* track the number of bytes seen since last
* data from other side */
+ u_int32_t pkt_count;
StreamPacketData *seglist;
StreamPacketData *seglist_tail;
- u_int32_t pkt_count;
- char flags;
StreamAlertInfo alerts[MAX_SESSION_ALERTS];
u_int8_t alert_count; /* count alerts seen in a stream */
u_int8_t outoforder; /* flag indicating stream is no longer in order */
+ char flags;
+#if defined(_LP64)
+ char pad;
+#endif
} Stream;
typedef struct _SessionHashKey
@@ -103,14 +106,13 @@ typedef struct _SessionHashKey
u_int16_t port; /* If IPs are the same, this will be the lower of
* the two ports. Otherwise, it will be the port
* corresponding to lowIP. */
-#if defined(_LP64)
- u_int16_t pad1;
-#endif
u_int16_t port2;
+ u_int8_t proto;
#if defined(_LP64)
- u_int16_t pad2;
+ u_int8_t pad1;
+ u_int8_t pad2;
+ u_int8_t pad3;
#endif
- u_int8_t proto;
} SessionHashKey;
typedef struct _StreamApplicationData

10
net/snort/patches/patch-src_util_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_c,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/util.c.orig Mon Aug 20 18:31:51 2007
+++ src/util.c Mon Nov 19 22:37:37 2007
@@ -392,12 +392,13 @@ int DisplayBanner()
$OpenBSD: patch-src_util_c,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/util.c.orig Tue Apr 15 20:13:56 2008
+++ src/util.c Fri Aug 8 14:57:45 2008
@@ -406,12 +406,13 @@ int DisplayBanner()
* Returns: void function
*
****************************************************************************/
@ -16,7 +16,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2008/02/12 14:13:32 rui Exp $
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
@@ -407,7 +408,9 @@ void ts_print(register const struct timeval *tvp, char
@@ -421,7 +422,9 @@ void ts_print(register const struct timeval *tvp, char
/* manual page (for linux) says tz is never used, so.. */
bzero((char *) &tz, sizeof(tz));
gettimeofday(&tv, &tz);

12
net/snort/patches/patch-src_util_h
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-src_util_h,v 1.1 2008/02/12 14:13:32 rui Exp $
--- src/util.h.orig Mon Aug 20 18:35:44 2007
+++ src/util.h Mon Nov 19 22:31:17 2007
@@ -34,6 +34,7 @@
#endif
$OpenBSD: patch-src_util_h,v 1.2 2009/02/12 22:12:08 rui Exp $
--- src/util.h.orig Tue Feb 26 02:19:23 2008
+++ src/util.h Fri Aug 8 16:01:52 2008
@@ -36,6 +36,7 @@
#include "sf_types.h"
#include "sflsq.h"
+#include "pcap_pkthdr32.h"
/* specifies that a function does not return
* used for quieting Visual Studio warnings
@@ -139,7 +140,7 @@ typedef struct _IntervalStats
@@ -147,7 +148,7 @@ typedef struct _IntervalStats
int DisplayBanner();
void GetTime(char *);
int gmt2local(time_t);

3
net/snort/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2008/02/12 14:13:32 rui Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2009/02/12 22:12:08 rui Exp $
@lib lib/snort_dynamicengine/libsf_engine.so.${LIBsf_engine_VERSION}
@lib lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so.${LIB_sfdynamic_preprocessor_example_VERSION}
@lib lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.so.${LIBsf_dcerpc_preproc_VERSION}
@ -6,4 +6,5 @@
@lib lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.${LIBsf_ftptelnet_preproc_VERSION}
@lib lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.${LIBsf_smtp_preproc_VERSION}
@lib lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.${LIBsf_ssh_preproc_VERSION}
@lib lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so.${LIBsf_ssl_preproc_VERSION}
@lib lib/snort_dynamicrules/lib_sfdynamic_example_rule.so.${LIB_sfdynamic_example_rule_VERSION}

16
net/snort/pkg/PLIST
View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.16 2008/02/12 14:13:32 rui Exp $
@comment $OpenBSD: PLIST,v 1.17 2009/02/12 22:12:08 rui Exp $
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
%%prelude%%
%%SHARED%%
bin/snort
@bin bin/snort
lib/snort_dynamicengine/
lib/snort_dynamicengine/libsf_engine.a
@comment lib/snort_dynamicengine/libsf_engine.la
@ -20,6 +20,8 @@ lib/snort_dynamicpreprocessor/libsf_smtp_preproc.a
@comment lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
lib/snort_dynamicpreprocessor/libsf_ssh_preproc.a
@comment lib/snort_dynamicpreprocessor/libsf_ssh_preproc.la
lib/snort_dynamicpreprocessor/libsf_ssl_preproc.a
@comment lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la
lib/snort_dynamicrules/
lib/snort_dynamicrules/lib_sfdynamic_example_rule.a
@comment lib/snort_dynamicrules/lib_sfdynamic_example_rule.la
@ -47,6 +49,7 @@ share/doc/snort/README.csv
share/doc/snort/README.database
share/doc/snort/README.dcerpc
share/doc/snort/README.decode
share/doc/snort/README.decoder_preproc_rules
share/doc/snort/README.dns
share/doc/snort/README.event_queue
share/doc/snort/README.flow
@ -54,11 +57,15 @@ share/doc/snort/README.flow-portscan
share/doc/snort/README.flowbits
share/doc/snort/README.frag3
share/doc/snort/README.ftptelnet
share/doc/snort/README.gre
share/doc/snort/README.http_inspect
share/doc/snort/README.ipip
share/doc/snort/README.ipv6
share/doc/snort/README.pcap_readmode
share/doc/snort/README.ppm
share/doc/snort/README.sfportscan
share/doc/snort/README.ssh
share/doc/snort/README.ssl
share/doc/snort/README.stream4
share/doc/snort/README.stream5
share/doc/snort/README.tag
@ -68,6 +75,11 @@ share/doc/snort/README.wireless
share/doc/snort/TODO
share/doc/snort/USAGE
share/doc/snort/WISHLIST
share/doc/snort/create_db2
share/doc/snort/create_mssql
share/doc/snort/create_mysql
share/doc/snort/create_oracle.sql
share/doc/snort/create_postgresql
share/doc/snort/faq.pdf
share/doc/snort/generators
share/doc/snort/snort_manual.pdf