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 a891f3da005dd62fc73e66a13933b76f864cc783 (commit) via 6a0fb93fdbc94d823a1291d627a4f2ab263058ae (commit) via 08d5192eb1ac55711e9c880096f024d1515bd08b (commit) via 95d2e1da15dbc99c79fbd34921929fa4ad88c4fe (commit) via 1c5719bf847f818e972ea7e47547ac5dfbcf774d (commit) via 99fcb81b45545073b1a8dea005bc8852fffb18ce (commit) via 3d2477d7c76e2f0d798440ac1007c1cab10a1fc0 (commit) via 3640afefc73c6c765395d85e2ca9abb59a8b2237 (commit) from 508b73104f689672260d4f464325c3dc35a32945 (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 a891f3da005dd62fc73e66a13933b76f864cc783 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 17 00:53:38 2010 +0100

Set next for development build string.

commit 6a0fb93fdbc94d823a1291d627a4f2ab263058ae Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 17 00:53:06 2010 +0100

Updated compat-wireless (2.6.36-5).

commit 08d5192eb1ac55711e9c880096f024d1515bd08b Merge: 508b731 95d2e1d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 17 00:51:39 2010 +0100

Merge commit 'origin/master' into next

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

Summary of changes: config/rootfiles/core/42/filelists/files | 2 ++ .../{oldcore/36 => core/42}/filelists/openssh | 0 .../{oldcore/28 => core/42}/filelists/openssl | 0 html/cgi-bin/ids.cgi | 2 +- lfs/compat-wireless | 4 ++-- lfs/openssh | 4 ++-- lfs/openssl | 4 ++-- make.sh | 6 +++--- 8 files changed, 12 insertions(+), 10 deletions(-) copy config/rootfiles/{oldcore/36 => core/42}/filelists/openssh (100%) copy config/rootfiles/{oldcore/28 => core/42}/filelists/openssl (100%)

Difference in files: diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files index 0037af1..ef6c2e7 100644 --- a/config/rootfiles/core/42/filelists/files +++ b/config/rootfiles/core/42/filelists/files @@ -1 +1,3 @@ etc/system-release +srv/web/ipfire/html/images/urlfilter/copy.gif +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/config/rootfiles/core/42/filelists/openssh b/config/rootfiles/core/42/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/42/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/42/filelists/openssl b/config/rootfiles/core/42/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/42/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 1b70ca6..62e6c70 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -271,7 +271,7 @@ if ($snortsettings{'RULES'} eq 'subscripted') { $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861.tar.gz/$snortsetting..."; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%..."; } else { - $url="http://www.emergingthreats.net/rules/emerging.rules.tar.gz"; + $url="http://rules.emergingthreats.net/open/snort-2.8.6/emerging.rules.tar.gz"; }

if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 44a2dcc..79d8dfe 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -34,7 +34,7 @@ else endif endif

-VER = 2.6.35-1 +VER = 2.6.36-5-spn

THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505 +$(DL_FILE)_MD5 = 095d00646a44100ba979e8f13746ed86

install : $(TARGET)

diff --git a/lfs/openssh b/lfs/openssh index ffcf476..c9ce714 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@

include Config

-VER = 5.4p1 +VER = 5.6p1

THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e +$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0

install : $(TARGET)

diff --git a/lfs/openssl b/lfs/openssl index 5c8b413..38e2b38 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 63ddc5116488985e820075e65fbe6aa4 +$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39

install : $(TARGET)

diff --git a/make.sh b/make.sh index 4bec05b..110d926 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.8test" # Version number -CORE="42" # Core Level (Filename) -PAKFIRE_CORE="41" # Core Level (PAKFIRE) +CORE="43" # Core Level (Filename) +PAKFIRE_CORE="42" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -690,7 +690,7 @@ buildipfire() { echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "master" ]; then + if [ "$GIT_BRANCH" = "next" ]; then echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release else echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release

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