[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dbe2a1cc36f78e1cf48150dc4e1756be1d04abce

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dbe2a1cc36f78e1cf48150dc4e1756be1d04abce

[git]

[-- Attachment #1: Type: text/plain, Size: 4205 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  dbe2a1cc36f78e1cf48150dc4e1756be1d04abce (commit)
       via  afe1107dc978dfae14c576cc1d9dc80c9e09107e (commit)
      from  d25b7c32bd420267d2604dfa34e6e3bfa7de9ed7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dbe2a1cc36f78e1cf48150dc4e1756be1d04abce
Merge: d25b7c3 afe1107
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon May 12 19:30:02 2014 +0200

    Merge remote-tracking branch 'stevee/snort-update' into next

commit afe1107dc978dfae14c576cc1d9dc80c9e09107e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun May 11 19:26:32 2014 +0200

    snort: Update to 2.9.6.1.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/snort |  4 +++-
 lfs/snort                     | 30 +++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort
index e35838d..706c5f8 100644
--- a/config/rootfiles/common/snort
+++ b/config/rootfiles/common/snort
@@ -30,7 +30,6 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/bitop.h
 #usr/include/snort/dynamic_preproc/cpuclock.h
 #usr/include/snort/dynamic_preproc/file_api.h
-#usr/include/snort/dynamic_preproc/file_lib.h
 #usr/include/snort/dynamic_preproc/idle_processing.h
 #usr/include/snort/dynamic_preproc/ipv6_port.h
 #usr/include/snort/dynamic_preproc/mempool.h
@@ -180,11 +179,14 @@ usr/sbin/snort
 #usr/share/doc/snort/README.dnp3
 #usr/share/doc/snort/README.dns
 #usr/share/doc/snort/README.event_queue
+#usr/share/doc/snort/README.file
+#usr/share/doc/snort/README.file_ips
 #usr/share/doc/snort/README.filters
 #usr/share/doc/snort/README.flowbits
 #usr/share/doc/snort/README.frag3
 #usr/share/doc/snort/README.ftptelnet
 #usr/share/doc/snort/README.gre
+#usr/share/doc/snort/README.ha
 #usr/share/doc/snort/README.http_inspect
 #usr/share/doc/snort/README.imap
 #usr/share/doc/snort/README.ipip
diff --git a/lfs/snort b/lfs/snort
index 2d5d04a..45c17a8 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.5.3
+VER        = 2.9.6.1
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f99465c0734a6173bfca899dcb72266b
+$(DL_FILE)_MD5 = d7c0f1ddb2e70b70acdaa4664abb5fb0
 
 install : $(TARGET)
 
@@ -70,14 +70,26 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/snort* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
-		--sysconfdir=/etc/snort --target=i586 \
-		--enable-linux-smp-stats --enable-smb-alerts \
-		--enable-gre --enable-mpls --enable-targetbased \
-		--enable-decoder-preprocessor-rules --enable-ppm \
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--disable-nls \
+		--sysconfdir=/etc/snort \
+		--target=i586 \
+		--enable-linux-smp-stats \
+		--enable-smb-alerts \
+		--enable-gre --enable-mpls \
+		--enable-targetbased \
+		--enable-decoder-preprocessor-rules \
+		--enable-ppm \
 		--enable-non-ether-decoders \
-		--enable-perfprofiling --enable-zlib --enable-active-response \
-		--enable-normalizer --enable-reload --enable-react --enable-flexresp3
+		--enable-perfprofiling \
+		--enable-zlib \
+		--enable-active-response \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-react \
+		--enable-flexresp3
+
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	mv /usr/bin/snort /usr/sbin/


hooks/post-receive
--
IPFire 2.x development tree