Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Dec 2003 15:32:10 +0100 (CET)
From:      Nicolas Jombart <ecu@ipv42.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/60400: [PATCH] security/snort: update to 2.1.0
Message-ID:  <20031219143210.321BD1525A@shiva.bouglou.net>
Resent-Message-ID: <200312191440.hBJEeLS1003244@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         60400
>Category:       ports
>Synopsis:       [PATCH] security/snort: update to 2.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 19 06:40:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Nicolas Jombart
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD shiva.int.ipv42.net 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Tue Aug 26 15:11:08 CEST 2003
>Description:
- Update to 2.1.0
- Add some doc

Removed files (no more needed) :
	files/patch-src_preprocessors_spp_frag2_c
	files/patch-src_preprocessors_spp_stream4_c

Added files (mostly stdint.h stuff) :
	files/patch-ipobj.c
	files/patch-util_net.c
	files/patch-util_net.h
	files/patch-event_wrapper.h
	files/patch-flow_stat.h
	files/patch-flowps.h
	files/patch-flow.h

TODO: detection of libnet and not libnet-devel with flexresp

Generated with FreeBSD Port Tools 0.50 and fingers
>How-To-Repeat:
>Fix:

--- snort-2.1.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/snort/Makefile /usr/home/ecu/ecu/ports/ports/security/snort/Makefile
--- /usr/ports/security/snort/Makefile	Thu Nov 27 14:32:31 2003
+++ /usr/home/ecu/ecu/ports/ports/security/snort/Makefile	Fri Dec 19 14:52:35 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/
 
@@ -57,8 +57,9 @@
 	@${ECHO} ""
 
 DOCS=	AUTHORS NEWS README.csv BUGS README README.database \
-	CREDITS README.FLEXRESP RULES.todo FAQ \
-	SnortUsersManual.pdf README.PLUGINS USAGE README.thresholding
+	CREDITS README.FLEXRESP FAQ snort_manual.pdf \
+	README.PLUGINS USAGE README.thresholding README.flow \
+	README.flow-portscan README.http_inspect README.wireless
 
 post-install:
 	${MKDIR} ${DATADIR}
diff -ruN --exclude=CVS /usr/ports/security/snort/distinfo /usr/home/ecu/ecu/ports/ports/security/snort/distinfo
--- /usr/ports/security/snort/distinfo	Thu Nov 27 14:32:31 2003
+++ /usr/home/ecu/ecu/ports/ports/security/snort/distinfo	Fri Dec 19 13:54:18 2003
@@ -1 +1 @@
-MD5 (snort-2.0.5.tar.gz) = f129ee00a3d6e7b7c1ff4a1e1fba3a08
+MD5 (snort-2.1.0.tar.gz) = 1da6d683d18b39a72a3c277e8deffc69
diff -ruN --exclude=CVS /usr/ports/security/snort/files/patch-event_wrapper.h /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-event_wrapper.h
--- /usr/ports/security/snort/files/patch-event_wrapper.h	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-event_wrapper.h	Fri Dec 19 14:40:16 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-flow.h /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-flow.h
--- /usr/ports/security/snort/files/patch-flow.h	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-flow.h	Fri Dec 19 14:44:24 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-flow_stat.h /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-flow_stat.h
--- /usr/ports/security/snort/files/patch-flow_stat.h	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-flow_stat.h	Fri Dec 19 14:40:35 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-flowps.h /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-flowps.h
--- /usr/ports/security/snort/files/patch-flowps.h	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-flowps.h	Fri Dec 19 14:40:58 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-ipobj.c /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-ipobj.c
--- /usr/ports/security/snort/files/patch-ipobj.c	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-ipobj.c	Fri Dec 19 14:25:43 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-src_preprocessors_spp_frag2_c /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-src_preprocessors_spp_frag2_c
--- /usr/ports/security/snort/files/patch-src_preprocessors_spp_frag2_c	Fri Jun 27 04:50:51 2003
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-src_preprocessors_spp_frag2_c	Thu Jan  1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-src_preprocessors_spp_stream4_c /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-src_preprocessors_spp_stream4_c
--- /usr/ports/security/snort/files/patch-src_preprocessors_spp_stream4_c	Fri Jun 27 04:50:51 2003
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-src_preprocessors_spp_stream4_c	Thu Jan  1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-util_net.c /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-util_net.c
--- /usr/ports/security/snort/files/patch-util_net.c	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-util_net.c	Fri Dec 19 14:26:02 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/files/patch-util_net.h /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-util_net.h
--- /usr/ports/security/snort/files/patch-util_net.h	Thu Jan  1 01:00:00 1970
+++ /usr/home/ecu/ecu/ports/ports/security/snort/files/patch-util_net.h	Fri Dec 19 14:34:56 2003
@@ -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 -ruN --exclude=CVS /usr/ports/security/snort/pkg-plist /usr/home/ecu/ecu/ports/ports/security/snort/pkg-plist
--- /usr/ports/security/snort/pkg-plist	Thu Nov 27 14:32:31 2003
+++ /usr/home/ecu/ecu/ports/ports/security/snort/pkg-plist	Fri Dec 19 14:53:31 2003
@@ -11,12 +11,15 @@
 %%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
--- snort-2.1.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031219143210.321BD1525A>