IPFire-SCM March 2014

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3c3f0b664eb09375e084e969038154899fecf162
by git＠ipfire.org 07 Mar '14

07 Mar '14

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 3c3f0b664eb09375e084e969038154899fecf162 (commit) from 91dd042b20210df0bb0461ebf09791e3c028ea86 (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 3c3f0b664eb09375e084e969038154899fecf162 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Mar 7 09:29:20 2014 +0100 kernel: update to 3.10.33. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index fcadd69..1993cc8 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.32 +VER = 3.10.33 RPI_PATCHES = linux-3.10.27-grsec-943b563 -GRS_PATCHES = grsecurity-2.9.1-3.10.32-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.33-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 37 +PAK_VER = 38 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 58bfaf95f4e23be2d658dab0a7fb9615 +$(DL_FILE)_MD5 = 01865f9c129f3c7eee51e25b3781a364 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 8cf81f48408306d93ccee59b58af2e92 -$(GRS_PATCHES)_MD5 = b67dbf569e3f3657dad0e64ec951e1cc +$(GRS_PATCHES)_MD5 = c99be0018e8bc55fb2e2b8f0ea9783d5 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2e358974082686a65ce692731183f9d47e655a7d
by git＠ipfire.org 05 Mar '14

05 Mar '14

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 3.x development tree". The branch, master has been updated via 2e358974082686a65ce692731183f9d47e655a7d (commit) from 1a6db4966acfa97283819ce5f838c3f03eab0cf6 (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 2e358974082686a65ce692731183f9d47e655a7d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 5 23:58:09 2014 +0000 libsolv: Update to 0.4.1 (bcedc98). ----------------------------------------------------------------------- Summary of changes: libsolv/libsolv.nm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 2488344..2956829 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -4,9 +4,9 @@ ############################################################################### name = libsolv -version = 0.0.0 -git_ver = f663ca2 -release = 7.git%{git_ver} +version = 0.4.1 +git_ver = bcedc98 +release = 1.git%{git_ver} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries @@ -39,7 +39,9 @@ build -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DENABLE_PERL=0 \ -DENABLE_PYTHON=0 \ - -DENABLE_RUBY=0 + -DENABLE_RUBY=0 \ + -DMULTI_SEMANTICS=1 + make %{PARALLELISMFLAGS} end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91dd042b20210df0bb0461ebf09791e3c028ea86
by git＠ipfire.org 05 Mar '14

05 Mar '14

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 91dd042b20210df0bb0461ebf09791e3c028ea86 (commit) from 63f2fb7fda9112d9e39414328e5d4fab28809c63 (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 91dd042b20210df0bb0461ebf09791e3c028ea86 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 5 23:53:21 2014 +0100 gpl.cgi: Fix proper redirection so that the agreement has only to be accepted once. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/gpl.cgi | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) Difference in files: diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi index 5cfbebd..94187ce 100644 --- a/html/cgi-bin/gpl.cgi +++ b/html/cgi-bin/gpl.cgi @@ -29,28 +29,29 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "/opt/pakfire/lib/functions.pl"; - -my %cgiparams; -my $refresh; - +# If the license has already been accepted. if ( -e "/var/ipfire/main/gpl_accepted" ) { - print "Status: 302 Moved Temporarily\n"; - print "Location: index.cgi\n\n"; - exit (0); + &redirect(); } -&Header::showhttpheaders(); +my %cgiparams; $cgiparams{'ACTION'} = ''; + &Header::getcgihash(\%cgiparams); -&Header::openpage($Lang::tr{'main page'}, 1, $refresh); -&Header::openbigbox('', 'center'); +# Check if the license agreement has been accepted. +if ($cgiparams{'ACTION'} eq "$Lang::tr{'yes'}" && $cgiparams{'gpl_accepted'} eq '1') { + open(FILE, ">/var/ipfire/main/gpl_accepted"); + close(FILE); -# licence agreement -if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') { - system('touch /var/ipfire/main/gpl_accepted'); + &redirect(); } +&Header::showhttpheaders(); + +&Header::openpage($Lang::tr{'main page'}, 1); +&Header::openbigbox('', 'center'); + &Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'}); print <<END; $Lang::tr{'gpl please read carefully the general public license and accept it below'}. @@ -80,3 +81,9 @@ END &Header::closebox(); &Header::closebigbox(); &Header::closepage(); + +sub redirect { + print "Status: 302 Moved Temporarily\n"; + print "Location: index.cgi\n\n"; + exit (0); +} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 63f2fb7fda9112d9e39414328e5d4fab28809c63
by git＠ipfire.org 05 Mar '14

05 Mar '14

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 63f2fb7fda9112d9e39414328e5d4fab28809c63 (commit) from 323923d912cb86fd2e89326aa61bad06bf05d6dd (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 63f2fb7fda9112d9e39414328e5d4fab28809c63 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 5 14:07:23 2014 +0100 firewall: Filter logging of broadcasts from the internal networks. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/firewall | 14 ++++++++++++++ 1 file changed, 14 insertions(+) Difference in files: diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index e87952b..a67af70 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -230,6 +230,20 @@ iptables_init() { iptables -t nat -N REDNAT iptables -t nat -A POSTROUTING -j REDNAT + # Filter logging of incoming broadcasts. + iptables -N BROADCAST_FILTER + iptables -A INPUT -j BROADCAST_FILTER + + iptables -A BROADCAST_FILTER -i "${GREEN_DEV}" -d "${GREEN_BROADCAST}" -j DROP + + if [ -n "${BLUE_DEV}" -a -n "${BLUE_BROADCAST}" ]; then + iptables -A BROADCAST_FILTER -i "${BLUE_DEV}" -d "${BLUE_BROADCAST}" -j DROP + fi + + if [ -n "${ORANGE_DEV}" -a -n "${ORANGE_BROADCAST}" ]; then + iptables -A BROADCAST_FILTER -i "${ORANGE_DEV}" -d "${ORANGE_BROADCAST}" -j DROP + fi + # Apply OpenVPN firewall rules /usr/local/bin/openvpnctrl --firewall-rules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 323923d912cb86fd2e89326aa61bad06bf05d6dd
by git＠ipfire.org 05 Mar '14

05 Mar '14

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 323923d912cb86fd2e89326aa61bad06bf05d6dd (commit) from 32c6ebdced9682fdbdbe54059de25a036557d3b0 (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 323923d912cb86fd2e89326aa61bad06bf05d6dd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 5 13:59:28 2014 +0100 firewall: Allow remarks in Unicode. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 13 +++++++++++++ 1 file changed, 13 insertions(+) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index e633b3c..7bcb079 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -21,7 +21,11 @@ use strict; use Sort::Naturally; +use utf8; +use feature 'unicode_strings'; + no warnings 'uninitialized'; + # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -2142,6 +2146,7 @@ sub saverule #print"6"; } $fwdfwsettings{'ruleremark'}=~ s/,/;/g; + utf8::decode($fwdfwsettings{'ruleremark'}); $fwdfwsettings{'ruleremark'}=&Header::escape($fwdfwsettings{'ruleremark'}); if ($fwdfwsettings{'updatefwrule'} ne 'on'){ my $key = &General::findhasharraykey ($hash); @@ -2279,6 +2284,14 @@ sub validremark { # Checks a hostname against RFC1035 my $remark = $_[0]; + + # Try to decode $remark into UTF-8. If this doesn't work, + # we assume that the string it not sane. + if (!utf8::decode($remark)) { + return 0; + } + + # Check if the string only contains of printable characters. if ($remark =~ /^[[:print:]]*$/) { return 1; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 32c6ebdced9682fdbdbe54059de25a036557d3b0
by git＠ipfire.org 05 Mar '14

05 Mar '14

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 32c6ebdced9682fdbdbe54059de25a036557d3b0 (commit) via 6e9cf9ad860616468a0d1367e345dd24a3664c17 (commit) via 65c9b3a50815587bc212160465c92b6150e6fb77 (commit) via 2610f3930ab91a3b7ba79a80ac9e6f6d0ea3c724 (commit) via b062a11bbe730454c48c2c45ff0b1e0eec454471 (commit) via 13e3cf285e32334e2de1a23a916fa941994fdd23 (commit) via 179deb37d02efbb6c180568ef361a7caf3ede70e (commit) via 5f050d607c11a875564916de98cb3c3f2c2ce390 (commit) via 9556a0fb95e2a7c5458ea2dcaecc29c2a71c5f86 (commit) via 5a09c99a89fdeed47e0fa9ea0b3623b08422ca26 (commit) via abb3cfcc9ef1ffec5235ead3b9cad4014c141aa9 (commit) from 9c3bcb9f00fc09c86312b382bfb594c08fabc9ed (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 32c6ebdced9682fdbdbe54059de25a036557d3b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 5 12:31:36 2014 +0100 firewall: Make ICMP ratelimiting a bit saner again. commit 6e9cf9ad860616468a0d1367e345dd24a3664c17 Merge: 9c3bcb9 65c9b3a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 5 12:25:12 2014 +0100 Merge remote-tracking branch 'amarx/beta3' into next commit 65c9b3a50815587bc212160465c92b6150e6fb77 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 5 08:13:04 2014 +0100 Firewall: Remarkcheck should now support old firewallrules from converter commit 2610f3930ab91a3b7ba79a80ac9e6f6d0ea3c724 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 5 08:02:05 2014 +0100 Firewall: When no manual ip is given on rulecreation and rule is added, there's automatically std_networks "ALL" selected commit b062a11bbe730454c48c2c45ff0b1e0eec454471 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 14:26:55 2014 +0100 firewall: Don't colourise MAC addresses. Fixes #10491. commit 13e3cf285e32334e2de1a23a916fa941994fdd23 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 14:14:54 2014 +0100 firewall: Extend rate limiting for ICMP error messages. Fixes #10489. commit 179deb37d02efbb6c180568ef361a7caf3ede70e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 12:38:13 2014 +0100 firewall: Add chain name to logged rules. This helps us to debug faster where a packet has been dropped. commit 5f050d607c11a875564916de98cb3c3f2c2ce390 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 12:36:52 2014 +0100 firewall: Add rate limiting for LOG messages. Fixes #10488. commit 9556a0fb95e2a7c5458ea2dcaecc29c2a71c5f86 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 4 16:11:35 2014 +0100 Firewall: When no manual ip is given, standard networks "all" is selected commit 5a09c99a89fdeed47e0fa9ea0b3623b08422ca26 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 4 16:00:14 2014 +0100 Firewall: Now it is possible to just change the remark in input and outgoing commit abb3cfcc9ef1ffec5235ead3b9cad4014c141aa9 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 4 15:44:02 2014 +0100 Firewall: FIX allowed chars in remark ----------------------------------------------------------------------- Summary of changes: config/etc/sysctl.conf | 3 ++- html/cgi-bin/firewall.cgi | 35 +++++++++++++++-------------------- 2 files changed, 17 insertions(+), 21 deletions(-) Difference in files: diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index a91aeb3..e2e3d81 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -3,7 +3,8 @@ net.ipv4.ip_dynaddr = 1 net.ipv4.icmp_echo_ignore_broadcasts = 1 net.ipv4.icmp_ignore_bogus_error_responses = 1 -net.ipv4.icmp_ratemask = 88089 +net.ipv4.icmp_ratelimit = 1000 +net.ipv4.icmp_ratemask = 6168 net.ipv4.tcp_syncookies = 1 net.ipv4.tcp_fin_timeout = 30 diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index dfb9697..e633b3c 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -194,6 +194,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') $errormessage=&checksource; if(!$errormessage){&checktarget;} if(!$errormessage){&checkrule;} + #check if manual ip (source) is orange network if ($fwdfwsettings{'grp1'} eq 'src_addr'){ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); @@ -313,6 +314,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){ $errormessage=$Lang::tr{'fwdfw err remark'}."<br>"; } + if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ + $errormessage=''; + } if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ $fwdfwsettings{'nosave'} = 'on'; } @@ -504,8 +508,8 @@ sub checksource return $errormessage; } }elsif($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} eq ''){ - $errormessage.=$Lang::tr{'fwdfw err nosrcip'}; - return $errormessage; + $fwdfwsettings{'grp1'}='std_net_src'; + $fwdfwsettings{$fwdfwsettings{'grp1'}} = 'ALL'; } #check empty fields @@ -605,8 +609,8 @@ sub checktarget return $errormessage; } }elsif($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} eq ''){ - $errormessage.=$Lang::tr{'fwdfw err notgtip'}; - return $errormessage; + $fwdfwsettings{'grp2'}='std_net_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'ALL'; } #check for mac in targetgroup if ($fwdfwsettings{'grp2'} eq 'cust_grp_tgt'){ @@ -2137,6 +2141,8 @@ sub saverule &changerule($configfwdfw); #print"6"; } + $fwdfwsettings{'ruleremark'}=~ s/,/;/g; + $fwdfwsettings{'ruleremark'}=&Header::escape($fwdfwsettings{'ruleremark'}); if ($fwdfwsettings{'updatefwrule'} ne 'on'){ my $key = &General::findhasharraykey ($hash); $$hash{$key}[0] = $fwdfwsettings{'RULE_ACTION'}; @@ -2272,22 +2278,11 @@ sub saverule sub validremark { # Checks a hostname against RFC1035 - my $remark = $_[0]; - - # Each part should be at least two characters in length - # but no more than 63 characters - if (length ($remark) < 1 || length ($remark) > 255) { - return 0;} - # Only valid characters are a-z, A-Z, 0-9 and - - if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) { - return 0;} - # First character can only be a letter or a digit - if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9(]*$/) { - return 0;} - # Last character can only be a letter or a digit - if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) { - return 0;} - return 1; + my $remark = $_[0]; + if ($remark =~ /^[[:print:]]*$/) { + return 1; + } + return 0; } sub viewtablerule { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1a6db4966acfa97283819ce5f838c3f03eab0cf6
by git＠ipfire.org 04 Mar '14

04 Mar '14

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 3.x development tree". The branch, master has been updated via 1a6db4966acfa97283819ce5f838c3f03eab0cf6 (commit) from c19f1e904b92390c033a613017de5f299cf332b6 (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 1a6db4966acfa97283819ce5f838c3f03eab0cf6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 20:31:42 2014 +0100 gnutls: Update to 3.2.12. Disable SRP authentication, non-SuiteB curves and guile. ----------------------------------------------------------------------- Summary of changes: gnutls/gnutls.nm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 86f3c87..d12f7fe 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -6,7 +6,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.2 -ver_min = 8 +ver_min = 12 release = 1 groups = System/Libraries @@ -28,7 +28,6 @@ build requires datefudge gettext - guile-devel libgcrypt-devel libidn-devel libtasn1-devel >= 3.2 @@ -46,7 +45,9 @@ build configure_options += \ --with-included-libcfg \ --disable-openssl-compatibility \ - --with-libgcrypt + --disable-srp-authentication \ + --disable-non-suiteb-curves \ + --disable-guile # Test suite does not work when srp is disabled. test hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9c3bcb9f00fc09c86312b382bfb594c08fabc9ed
by git＠ipfire.org 04 Mar '14

04 Mar '14

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 9c3bcb9f00fc09c86312b382bfb594c08fabc9ed (commit) from 2ed474684d5f7152e34ef606d282798561e5c35f (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 9c3bcb9f00fc09c86312b382bfb594c08fabc9ed Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 4 16:00:14 2014 +0100 Firewall: Now it is possible to just change the remark in input and outgoing ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 6 ++++++ 1 file changed, 6 insertions(+) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 52bac58..dfb9697 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -223,6 +223,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){ $errormessage=$Lang::tr{'fwdfw err remark'}."<br>"; } + if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ + $errormessage=''; + } if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ $fwdfwsettings{'nosave'} = 'on'; } @@ -264,6 +267,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){ $errormessage=$Lang::tr{'fwdfw err remark'}."<br>"; } + if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){ + $errormessage=''; + } if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){ $fwdfwsettings{'nosave'} = 'on'; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2ed474684d5f7152e34ef606d282798561e5c35f
by git＠ipfire.org 04 Mar '14

04 Mar '14

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 2ed474684d5f7152e34ef606d282798561e5c35f (commit) via 90c2ce0c20c8b0cdb027220f5363b51dd9195d83 (commit) via 40962f9760ce8da23ebd5c723d75775e7853943d (commit) from 0ba66e9293e106469894d84268b997a67f71e105 (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 2ed474684d5f7152e34ef606d282798561e5c35f Merge: 0ba66e9 90c2ce0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 14:54:06 2014 +0100 Merge remote-tracking branch 'amarx/beta3' into next commit 90c2ce0c20c8b0cdb027220f5363b51dd9195d83 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 4 14:51:20 2014 +0100 Firewall: get rid of /32 subnetz when using manual ip addresses commit 40962f9760ce8da23ebd5c723d75775e7853943d Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Mar 4 14:40:59 2014 +0100 Firewall: Bugfix - when creating a new hostgroup, the system checked for existing name in servicegroups instead of hostgroups ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 2 +- html/cgi-bin/fwhosts.cgi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 9f960b4..52bac58 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1571,7 +1571,7 @@ sub newrule my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;} my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}}); - if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;} + if ($dcidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;} &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'}); #------SOURCE------------------------------------------------------- print "<form method='post'>"; diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 34d43f3..049233c 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -2014,7 +2014,7 @@ sub checkname } sub checkgroup { - &General::readhasharray("$configsrvgrp", \%customservicegrp ); + &General::readhasharray("$configgrp", \%customgrp ); my $name=shift; foreach my $key (keys %customservicegrp) { if($customservicegrp{$key}[0] eq $name){ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ba66e9293e106469894d84268b997a67f71e105
by git＠ipfire.org 04 Mar '14

04 Mar '14

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 0ba66e9293e106469894d84268b997a67f71e105 (commit) from fa8229546b11ac356ff1df733a0b17eb045559ee (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 0ba66e9293e106469894d84268b997a67f71e105 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 4 14:26:55 2014 +0100 firewall: Don't colourise MAC addresses. Fixes #10491. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 6 ++++++ 1 file changed, 6 insertions(+) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 7b75765..9f960b4 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1286,6 +1286,12 @@ sub getcolor my $val=shift; my $hash=shift; if($optionsfw{'SHOWCOLORS'} eq 'on'){ + # Don't colourise MAC addresses + if (&General::validmac($val)) { + $tdcolor = ""; + return; + } + #custom Hosts if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){ foreach my $key (sort keys %$hash){ hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2014