public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79b89b90e4b9425e29551bd8ceb8a85cd224c62d
@ 2019-01-07 18:37 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2019-01-07 18:37 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 6227 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  79b89b90e4b9425e29551bd8ceb8a85cd224c62d (commit)
       via  d09cb651b5e829db009d5f0bfeb13acf353bc041 (commit)
       via  0cd3eab3ae87f31e3d928eb2f800e3abaf1896bf (commit)
       via  d01b31914a69c5e1edf9a059b1fd6b8e5a90ec84 (commit)
      from  1338e08d0d10300a279ece4e7b4673b20209679b (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 79b89b90e4b9425e29551bd8ceb8a85cd224c62d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jan 5 21:12:24 2019 +0000

    Revert "core127: Ship updated tar"
    
    This reverts commit 9ab1c9302c01f11010d0cb87a66366361465461e.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d09cb651b5e829db009d5f0bfeb13acf353bc041
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jan 5 21:11:44 2019 +0000

    Revert "tar: Update to 1.31"
    
    This reverts commit bb473fd1d6e97785dee70ceb75f9b898f92fc507.
    
    tar crashes when used with --no-overwrite-dir. See #11958.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0cd3eab3ae87f31e3d928eb2f800e3abaf1896bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jan 5 21:11:14 2019 +0000

    core127: Ship updated snort
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d01b31914a69c5e1edf9a059b1fd6b8e5a90ec84
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sat Jan 5 10:40:08 2019 +0100

    snort: Update to 2.9.12
    
    For details see:
    
    Release notes:
    https://snort.org/downloads/snort/release_notes_2.9.12.txt
    
    Changelog:
    https://snort.org/downloads/snort/changelog_2.9.12.txt
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/127/filelists/files                  | 1 +
 config/rootfiles/{oldcore/104 => core/127}/filelists/snort | 0
 config/rootfiles/core/127/filelists/tar                    | 1 -
 html/cgi-bin/ids.cgi                                       | 4 ++--
 lfs/snort                                                  | 8 +++++---
 lfs/tar                                                    | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)
 copy config/rootfiles/{oldcore/104 => core/127}/filelists/snort (100%)
 delete mode 120000 config/rootfiles/core/127/filelists/tar

Difference in files:
diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
index c38b489c7..0416427be 100644
--- a/config/rootfiles/core/127/filelists/files
+++ b/config/rootfiles/core/127/filelists/files
@@ -6,5 +6,6 @@ var/ipfire/langs
 etc/rc.d/init.d/aws
 etc/rc.d/init.d/unbound
 srv/web/ipfire/cgi-bin/dnsforward.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/config/rootfiles/core/127/filelists/snort b/config/rootfiles/core/127/filelists/snort
new file mode 120000
index 000000000..9406ce01c
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/127/filelists/tar b/config/rootfiles/core/127/filelists/tar
deleted file mode 120000
index 3e585d2eb..000000000
--- a/config/rootfiles/core/127/filelists/tar
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/tar
\ No newline at end of file
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index eddfc387c..5a3f4c314 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -259,9 +259,9 @@ if ($snortsettings{'OINKCODE'} ne "") {
 
 if (!$errormessage) {
 	if ($snortsettings{'RULES'} eq 'subscripted') {
-		$url=" https://www.snort.org/rules/snortrules-snapshot-29111.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+		$url=" https://www.snort.org/rules/snortrules-snapshot-29120.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 	} elsif ($snortsettings{'RULES'} eq 'registered') {
-		$url=" https://www.snort.org/rules/snortrules-snapshot-29111.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+		$url=" https://www.snort.org/rules/snortrules-snapshot-29120.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 	} elsif ($snortsettings{'RULES'} eq 'community') {
 		$url=" https://www.snort.org/rules/community";
 	} else {
diff --git a/lfs/snort b/lfs/snort
index 813c05c14..e7b5a19f7 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.11.1
+VER        = 2.9.12
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 378e3938b2b5c8e358f942d0ffce18cc
+$(DL_FILE)_MD5 = 3a305d9c44bd0319aa50783a60c8947f
 
 install : $(TARGET)
 
@@ -75,7 +75,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--sysconfdir=/etc/snort \
 		--target=i586 \
 		--enable-linux-smp-stats \
-		--enable-gre --enable-mpls \
+		--disable-open-appid \
+		--enable-gre \
+		--enable-mpls \
 		--enable-targetbased \
 		--enable-ppm \
 		--enable-non-ether-decoders \
diff --git a/lfs/tar b/lfs/tar
index b8cf8b3b2..cbab6c2a9 100644
--- a/lfs/tar
+++ b/lfs/tar
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.31
+VER        = 1.30
 
 THISAPP    = tar-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 77afa35b696c8d760331fa0e12c2fac9
+$(DL_FILE)_MD5 = 8404e4c1fc5a3000228ab2b8ad674a65
 
 install : $(TARGET)
 


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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-01-07 18:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-07 18:37 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79b89b90e4b9425e29551bd8ceb8a85cd224c62d Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox