[git.ipfire.org] IPFire 2.x development tree branch, core84, updated. e43b21264f8b0c28a9b03f8f65d46e47572df719

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3931 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, core84 has been updated
       via  e43b21264f8b0c28a9b03f8f65d46e47572df719 (commit)
       via  791c2b45d873d02d3955ac846b69a3ee1e1f6f47 (commit)
       via  243f8ca6e937084c18085d85278ee9c200c69936 (commit)
      from  8285512a18dad754da18e57e25445609f6ad7148 (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 e43b21264f8b0c28a9b03f8f65d46e47572df719
Merge: 8285512 791c2b4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Oct 4 13:53:49 2014 +0200

    Merge branch 'next'

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

Summary of changes:
 config/firewall/rules.pl                                 | 14 ++++++++++++--
 config/rootfiles/{oldcore/32 => core/84}/filelists/squid |  0
 config/rootfiles/core/84/update.sh                       |  2 ++
 lfs/squid                                                |  4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)
 copy config/rootfiles/{oldcore/32 => core/84}/filelists/squid (100%)

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 40fb8dd..4d70382 100755
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -131,6 +131,12 @@ sub print_rule {
 	print "\n";
 }
 
+sub count_elements {
+	my $hash = shift;
+
+	return scalar @$hash;
+}
+
 sub flush {
 	run("$IPTABLES -F $CHAIN_INPUT");
 	run("$IPTABLES -F $CHAIN_FORWARD");
@@ -186,6 +192,9 @@ sub buildrules {
 		# Skip disabled rules.
 		next unless ($$hash{$key}[2] eq 'ON');
 
+		# Count number of elements in this line
+		my $elements = &count_elements($$hash{$key});
+
 		if ($DEBUG) {
 			print_rule($$hash{$key});
 		}
@@ -270,7 +279,8 @@ sub buildrules {
 
 		# Concurrent connection limit
 		my @ratelimit_options = ();
-		if ($$hash{$key}[32] eq 'ON') {
+
+		if (($elements gt 34) && ($$hash{$key}[32] eq 'ON')) {
 			my $conn_limit = $$hash{$key}[33];
 
 			if ($conn_limit ge 1) {
@@ -286,7 +296,7 @@ sub buildrules {
 		}
 
 		# Ratelimit
-		if ($$hash{$key}[34] eq 'ON') {
+		if (($elements gt 37) && ($$hash{$key}[34] eq 'ON')) {
 			my $rate_limit = "$$hash{$key}[35]/$$hash{$key}[36]";
 
 				if ($rate_limit) {
diff --git a/config/rootfiles/core/84/filelists/squid b/config/rootfiles/core/84/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/84/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/84/update.sh b/config/rootfiles/core/84/update.sh
index 1b83326..93a9e20 100644
--- a/config/rootfiles/core/84/update.sh
+++ b/config/rootfiles/core/84/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/dnsmasq stop
 
 # Remove old files
@@ -41,6 +42,7 @@ extract_files
 
 # Start services
 /etc/init.d/dnsmasq start
+/etc/init.d/squid start
 
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
diff --git a/lfs/squid b/lfs/squid
index 921feeb..548abd9 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.4.7
+VER        = 3.4.8
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 74677634121649ccb87a5655fcd4298d
+$(DL_FILE)_MD5 = b0c4335447248810169f58ea4d8b204a
 
 install : $(TARGET)
 


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