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 ec238128df8a41644501c9620c03103e93c89afd (commit) via 10ad048deccf8a42b5850e9197619a91756d3906 (commit) via 7180ae3897fecf7366f1e465f90048cd8174ca78 (commit) via e8bae96337cc79c86388f805bfc637d67cd0c362 (commit) via b651a44dba1874126f43da03b33e46cea55b2895 (commit) via 61e1585f054ee47cf78d21abed09769c9482efc4 (commit) from 4912df2ff60c3bf0d8dff3093bac58c892801c6b (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 ec238128df8a41644501c9620c03103e93c89afd Merge: 7180ae3 10ad048 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 4 21:09:54 2011 +0200
Merge branch 'master' into next
commit 7180ae3897fecf7366f1e465f90048cd8174ca78 Merge: e8bae96 4912df2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 4 21:05:46 2011 +0200
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
commit e8bae96337cc79c86388f805bfc637d67cd0c362 Merge: 641baa8 b651a44 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 4 12:53:27 2011 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/50/filelists/files | 1 + .../{oldcore/32 => core/50}/filelists/squid | 0 html/cgi-bin/portfw.cgi | 2 +- lfs/squid | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/32 => core/50}/filelists/squid (100%)
Difference in files: diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index 9d39707..034310c 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -3,6 +3,7 @@ var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup var/ipfire/graphs.pl +srv/web/ipfire/cgi-bin/portfw.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat usr/local/share/GeoIP/GeoIP.dat usr/share/hwdata/pci.ids diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/50/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi index 5583fb8..199682f 100644 --- a/html/cgi-bin/portfw.cgi +++ b/html/cgi-bin/portfw.cgi @@ -1038,7 +1038,7 @@ sub disallowreserved { # port 67 and 68 same for tcp and udp, don't bother putting in an array my $msg = ""; - my @tcp_reserved = (81,222,444); + my @tcp_reserved = (); my $prt = $_[0]; # the port or range my $ryn = $_[1]; # tells us whether or not it is a port range my $prot = $_[2]; # protocol diff --git a/lfs/squid b/lfs/squid index bdc1646..ef676a2 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 3.1.11 +VER = 3.1.13
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 +$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree