IPFire-SCM August 2018

ipfire-scm@lists.ipfire.org

1 participants
54 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3da2a66193ce8e3f92d3c29be95a4076a4fa0274
by Michael Tremer 31 Aug '18

31 Aug '18

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 3da2a66193ce8e3f92d3c29be95a4076a4fa0274 (commit) from fd313a1ae690ce95d91802fea0d94d85da084fd8 (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 3da2a66193ce8e3f92d3c29be95a4076a4fa0274 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 31 11:08:53 2018 +0100 aws: Don't update the system on first boot This will violate AWS policy and therefore had to be removed. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/helper/aws-setup | 12 ------------ 1 file changed, 12 deletions(-) Difference in files: diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index b2bb5a966..e3f1d0a9f 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -98,18 +98,6 @@ import_aws_configuration() { # Download the user-data script only on the first boot if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then - # Initialize pakfire - /etc/init.d/pakfire start &>/dev/null - - # Install all available updates - ( pakfire update && pakfire upgrade -y ) &>/dev/null - - # If an update requires a reboot, we will do it - if [ -e "/var/run/need_reboot" ]; then - reboot - exit 1 - fi - # Download user-data local user_data="$(get user-data)" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fd313a1ae690ce95d91802fea0d94d85da084fd8
by Arne Fitzenreiter 29 Aug '18

29 Aug '18

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 fd313a1ae690ce95d91802fea0d94d85da084fd8 (commit) via 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f (commit) via e5eedea01de6e70c0440f0c97e418ca053382424 (commit) via 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 (commit) via a019c963a2bc232a381aefbafc260b3ea3bf4f2b (commit) via 66c449c053c9e059f04e28d0ccad74840f1a528e (commit) via b38239f90715974b7744499cb65c97b961fb6ff4 (commit) via ee84b26a271139cd37fb361db9fbed21b894ffec (commit) from aa61d769b7f5eca23c7744590dfa18c1ef1d7c36 (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 fd313a1ae690ce95d91802fea0d94d85da084fd8 Merge: aa61d769b 574a71177 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 29 07:43:06 2018 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/123/filelists/files | 2 ++ config/rootfiles/oldcore/{100 => 123}/filelists/i586/openssl-sse2 | 0 config/rootfiles/oldcore/{121 => 123}/filelists/xtables-addons | 0 config/rootfiles/oldcore/123/update.sh | 3 +++ lfs/intel-microcode | 6 +++--- lfs/linux | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) copy config/rootfiles/oldcore/{100 => 123}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/oldcore/{121 => 123}/filelists/xtables-addons (100%) Difference in files: diff --git a/config/rootfiles/oldcore/123/filelists/files b/config/rootfiles/oldcore/123/filelists/files index 3ff006fe5..e2be472f6 100644 --- a/config/rootfiles/oldcore/123/filelists/files +++ b/config/rootfiles/oldcore/123/filelists/files @@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/local/bin/backupiso +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 usr/sbin/dhclient usr/share/GeoIP/GeoIP.dat var/ipfire/backup/bin/backup.pl diff --git a/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/123/filelists/xtables-addons b/config/rootfiles/oldcore/123/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/oldcore/123/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/oldcore/123/update.sh b/config/rootfiles/oldcore/123/update.sh index 76eff74bb..964a23862 100644 --- a/config/rootfiles/oldcore/123/update.sh +++ b/config/rootfiles/oldcore/123/update.sh @@ -34,6 +34,9 @@ done # Stop services /etc/init.d/squid stop +# remove old xtables modules / some are renamend +rm -rf /lib/xtables + # Extract files extract_files diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 349f3667c..217bc9850 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 20180807 +VER = 20180807a THISAPP = microcode-$(VER) DL_FILE = $(THISAPP).tgz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 49f534f1079d3c5bc178a150c1c105aa +$(DL_FILE)_MD5 = b12f8680d87c81a302e8c85712ed1a80 install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index 5e7b334cd..003c477f6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -194,7 +194,7 @@ else ifeq "$(BUILD_PLATFORM)" "arm" cd $(DIR_APP) && make $(MAKETUNING) dtbs mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) - cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \ + cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \ cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \ chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \ done hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f
by Arne Fitzenreiter 29 Aug '18

29 Aug '18

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, master has been updated via 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f (commit) from e5eedea01de6e70c0440f0c97e418ca053382424 (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 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 28 12:39:08 2018 +0200 kernel: fix dtb handling Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 5e7b334cd..003c477f6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -194,7 +194,7 @@ else ifeq "$(BUILD_PLATFORM)" "arm" cd $(DIR_APP) && make $(MAKETUNING) dtbs mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) - cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \ + cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \ cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \ chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \ done hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core123, updated. 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f
by Arne Fitzenreiter 29 Aug '18

29 Aug '18

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, core123 has been updated via 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f (commit) from e5eedea01de6e70c0440f0c97e418ca053382424 (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 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 28 12:39:08 2018 +0200 kernel: fix dtb handling Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 5e7b334cd..003c477f6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -194,7 +194,7 @@ else ifeq "$(BUILD_PLATFORM)" "arm" cd $(DIR_APP) && make $(MAKETUNING) dtbs mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) - cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \ + cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \ cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \ chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \ done hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aa61d769b7f5eca23c7744590dfa18c1ef1d7c36
by Michael Tremer 27 Aug '18

27 Aug '18

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 aa61d769b7f5eca23c7744590dfa18c1ef1d7c36 (commit) via 06d55142e51b270d3f7f4e8ee69cc6260e87b3f7 (commit) via e32591e7bfa07c5d72688cf37d86df0bea6740f6 (commit) from 973ffc2987afd070c95974bbebfd5c3973ca3db0 (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 aa61d769b7f5eca23c7744590dfa18c1ef1d7c36 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 27 07:34:28 2018 +0100 core124: Ship latest pakfire changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 06d55142e51b270d3f7f4e8ee69cc6260e87b3f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 27 07:29:19 2018 +0100 pakfire: Remove any reference to counter.py The concept has been retired a very log time ago and the web service only responds with 200 what ever it is being sent. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e32591e7bfa07c5d72688cf37d86df0bea6740f6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 27 07:23:03 2018 +0100 pakfire: Remove mirror health check This is not really necessary because pakfire will automatically failover to the next mirror anyways and that a mirror responds to an ICMP echo request doesn't necessarily mean that it can deliver the requested file. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/filelists/files | 3 + html/cgi-bin/pakfire.cgi | 11 --- src/pakfire/lib/functions.pl | 122 ++++++++---------------------- src/pakfire/pakfire | 1 - 4 files changed, 33 insertions(+), 104 deletions(-) Difference in files: diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 7093d0de8..320d2808d 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -4,10 +4,13 @@ etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize +opt/pakfire/lib/functions.pl +opt/pakfire/pakfire srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/install-bootloader usr/local/bin/backupiso diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 143f123b7..79ff636c8 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -43,7 +43,6 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; $pakfiresettings{'AUTOUPDATE'} = 'off'; -$pakfiresettings{'HEALTHCHECK'} = 'on'; $pakfiresettings{'UUID'} = 'on'; sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();} @@ -163,9 +162,6 @@ my %checked=(); $checked{'AUTOUPDATE'}{'off'} = ''; $checked{'AUTOUPDATE'}{'on'} = ''; $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'"; -$checked{'HEALTHCHECK'}{'off'} = ''; -$checked{'HEALTHCHECK'}{'on'} = ''; -$checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'"; $checked{'UUID'}{'off'} = ''; $checked{'UUID'}{'on'} = ''; $checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'"; @@ -292,13 +288,6 @@ print <<END; <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left"> on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> | <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr> - <tr><td align='left' width='45%'>$Lang::tr{'pakfire health check'}</td><td align="left"> - on <input type='radio' name='HEALTHCHECK' value='on' $checked{'HEALTHCHECK'}{'on'} /> | - <input type='radio' name='HEALTHCHECK' value='off' $checked{'HEALTHCHECK'}{'off'} /> off </td></tr> - <tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left"> - on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> | - <input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr> - <tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr> </table> </form> END diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index dd4007a44..12a405bd7 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -118,20 +118,6 @@ sub usage { exit 1; } -sub pinghost { - my $host = shift; - - $p = Net::Ping->new("icmp"); - if ($p->ping($host)) { - logger("PING INFO: $host is alive"); - return 1; - } else { - logger("PING INFO: $host is unreachable"); - return 0; - } - $p->close(); -} - sub fetchfile { my $getfile = shift; my $gethost = shift; @@ -141,7 +127,7 @@ sub fetchfile { use File::Basename; $bfile = basename("$getfile"); - logger("DOWNLOAD STARTED: $getfile") unless ($bfile =~ /^counter\?.*/); + logger("DOWNLOAD STARTED: $getfile"); $i = 0; while (($allok == 0) && $i < 5) { @@ -159,9 +145,7 @@ sub fetchfile { $proto = "HTTP" unless $proto; - unless ($bfile =~ /^counter\?.*/) { - logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file"); - } + logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file"); my $ua = LWP::UserAgent->new; $ua->agent("Pakfire/$Conf::version"); @@ -171,10 +155,10 @@ sub fetchfile { &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings); if ($proxysettings{'UPSTREAM_PROXY'}) { - logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"") unless ($bfile =~ /^counter.py\?.*/); + logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\""); if ($proxysettings{'UPSTREAM_USER'}) { $ua->proxy([["http", "https"] => "http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"]); - logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =~ /^counter.py\?.*/); + logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\""); } else { $ua->proxy([["http", "https"] => "http://$proxysettings{'UPSTREAM_PROXY'}/"]); } @@ -193,19 +177,13 @@ sub fetchfile { } } - my $response; + my $result = $ua->head($url); + my $remote_headers = $result->headers; + $total_size = $remote_headers->content_length; + logger("DOWNLOAD INFO: $file has size of $total_size bytes"); - unless ($bfile =~ /^counter.py\?.*/) { - my $result = $ua->head($url); - my $remote_headers = $result->headers; - $total_size = $remote_headers->content_length; - logger("DOWNLOAD INFO: $file has size of $total_size bytes"); - - $response = $ua->get($url, ':content_cb' => \&callback ); - message(""); - } else { - $response = $ua->get($url); - } + my $response = $ua->get($url, ':content_cb' => \&callback ); + message(""); my $code = $response->code(); my $log = $response->status_line; @@ -217,31 +195,27 @@ sub fetchfile { } if ($response->is_success) { - unless ($bfile =~ /^counter.py\?.*/) { - if (open(FILE, ">$Conf::tmpdir/$bfile")) { - print FILE $final_data; - close(FILE); - logger("DOWNLOAD INFO: File received. Start checking signature..."); - if (&valid_signature("$Conf::tmpdir/$bfile")) { - logger("DOWNLOAD INFO: Signature of $bfile is fine."); - move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile"); - } else { - message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting..."); - my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`; - if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");} - else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");} - exit 1; - } - logger("DOWNLOAD FINISHED: $file"); - $allok = 1; - return 0; + if (open(FILE, ">$Conf::tmpdir/$bfile")) { + print FILE $final_data; + close(FILE); + logger("DOWNLOAD INFO: File received. Start checking signature..."); + if (&valid_signature("$Conf::tmpdir/$bfile")) { + logger("DOWNLOAD INFO: Signature of $bfile is fine."); + move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile"); } else { - logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing."); + message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting..."); + my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`; + if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");} + else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");} + exit 1; } - } else { + logger("DOWNLOAD FINISHED: $file"); + $allok = 1; return 0; + } else { + logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing."); } - } else { + } else { logger("DOWNLOAD ERROR: $log"); } } @@ -349,10 +323,8 @@ sub selectmirror { ### Choose a random server and test if it is online # If the check fails try a new server. # This will never give up. - my $found = 0; my $servers = 0; - my $pingdelay = 1; - while ($found == 0) { + while (1) { $server = int(rand($scount) + 1); $servers = 0; my ($line, $proto, $path, $host); @@ -364,22 +336,8 @@ sub selectmirror { $proto = $templine[0]; $host = $templine[1]; $path = $templine[2]; - if ($pakfiresettings{'HEALTHCHECK'} eq "off") { - logger("PING INFO: Healthcheck is disabled"); - $found = 1; - return ($proto, $host, $path); - } - elsif (pinghost("$host")) { - $found = 1; - return ($proto, $host, $path); - } - if ($found == 0) { - sleep($pingdelay); - $pingdelay=$pingdelay*2; - if ($pingdelay>1200) { - $pingdelay=1200; - } - } + + return ($proto, $host, $path); } } } @@ -789,9 +747,6 @@ sub setuppak { message("PAKFIRE INST: $pak: Copying files and running post-installation scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./install.sh >> $Conf::logdir/install-$pak.log 2>&1"); $return %= 255; - if ($pakfiresettings{'UUID'} ne "off") { - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&ipak=$pak&return=$return", "$Conf::mainserver"); - } if ($return == 0) { move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak"); cleanup("tmp"); @@ -850,9 +805,6 @@ sub upgradepak { message("PAKFIRE UPGR: $pak: Upgrading files and running post-upgrading scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./update.sh >> $Conf::logdir/update-$pak.log 2>&1"); $return %= 255; - if ($pakfiresettings{'UUID'} ne "off") { - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&upak=$pak&return=$return", "$Conf::mainserver"); - } if ($return == 0) { move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak"); cleanup("tmp"); @@ -875,9 +827,6 @@ sub removepak { message("PAKFIRE REMV: $pak: Removing files and running post-removing scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./uninstall.sh >> $Conf::logdir/uninstall-$pak.log 2>&1"); $return %= 255; - if ($pakfiresettings{'UUID'} ne "off") { - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver"); - } if ($return == 0) { unlink("$Conf::dbdir/rootfiles/$pak"); unlink("$Conf::dbdir/installed/meta-$pak"); @@ -924,17 +873,6 @@ sub makeuuid { } } -sub senduuid { - if ($pakfiresettings{'UUID'} ne "off") { - unless("$Conf::uuid") { - $Conf::uuid = `cat $Conf::dbdir/uuid`; - } - logger("Sending my uuid: $Conf::uuid"); - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid", "$Conf::mainserver"); - system("rm -f $Conf::tmpdir/counter* 2>/dev/null"); - } -} - sub callback { my ($data, $response, $protocol) = @_; $final_data .= $data; diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index dfba91556..041ba669a 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -249,7 +249,6 @@ } elsif ("$ARGV[0]" eq "update") { &Pakfire::makeuuid(); - &Pakfire::senduuid(); &Pakfire::getmirrors("$force"); &Pakfire::dbgetlist("$force"); &Pakfire::getcoredb("$force"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e5eedea01de6e70c0440f0c97e418ca053382424
by Arne Fitzenreiter 24 Aug '18

24 Aug '18

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, master has been updated via e5eedea01de6e70c0440f0c97e418ca053382424 (commit) via 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 (commit) via a019c963a2bc232a381aefbafc260b3ea3bf4f2b (commit) via 66c449c053c9e059f04e28d0ccad74840f1a528e (commit) via b38239f90715974b7744499cb65c97b961fb6ff4 (commit) via ee84b26a271139cd37fb361db9fbed21b894ffec (commit) from b211357dae62b44f53c88ded9de6d601c6a8acb8 (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 e5eedea01de6e70c0440f0c97e418ca053382424 Merge: 1ce35de5c a019c963a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 24 20:22:05 2018 +0200 Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123 commit 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 24 20:19:29 2018 +0200 intel-microcode: update to 20180807a Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a019c963a2bc232a381aefbafc260b3ea3bf4f2b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 20 16:23:49 2018 +0200 core123: ship libssp (was missing on x86_64) Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 66c449c053c9e059f04e28d0ccad74840f1a528e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 20 16:22:20 2018 +0200 gcc: x86_64 add libspp to rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b38239f90715974b7744499cb65c97b961fb6ff4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 17 20:30:17 2018 +0200 core123: ship xtables-addons. xtables are build for installed iptables version so we need to ship it even if it was not updated. Also clean /lib/xtables because some modules are renamed. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ee84b26a271139cd37fb361db9fbed21b894ffec Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 17 07:06:45 2018 +0200 core123: ship openssl sse2 version on i586 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/gcc | 4 ++-- config/rootfiles/core/123/filelists/files | 2 ++ .../rootfiles/{oldcore/100 => core/123}/filelists/i586/openssl-sse2 | 0 config/rootfiles/{oldcore/121 => core/123}/filelists/xtables-addons | 0 config/rootfiles/core/123/update.sh | 3 +++ lfs/intel-microcode | 6 +++--- 6 files changed, 10 insertions(+), 5 deletions(-) copy config/rootfiles/{oldcore/100 => core/123}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/121 => core/123}/filelists/xtables-addons (100%) Difference in files: diff --git a/config/rootfiles/common/x86_64/gcc b/config/rootfiles/common/x86_64/gcc index b461f6532..667ec9e49 100644 --- a/config/rootfiles/common/x86_64/gcc +++ b/config/rootfiles/common/x86_64/gcc @@ -1434,8 +1434,8 @@ usr/lib/libquadmath.so.0.0.0 #usr/lib/libssp.a #usr/lib/libssp.la #usr/lib/libssp.so -#usr/lib/libssp.so.0 -#usr/lib/libssp.so.0.0.0 +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 #usr/lib/libssp_nonshared.a #usr/lib/libssp_nonshared.la #usr/lib/libstdc++.a diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files index 3ff006fe5..e2be472f6 100644 --- a/config/rootfiles/core/123/filelists/files +++ b/config/rootfiles/core/123/filelists/files @@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/local/bin/backupiso +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 usr/sbin/dhclient usr/share/GeoIP/GeoIP.dat var/ipfire/backup/bin/backup.pl diff --git a/config/rootfiles/core/123/filelists/i586/openssl-sse2 b/config/rootfiles/core/123/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/123/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/xtables-addons b/config/rootfiles/core/123/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/core/123/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index 76eff74bb..964a23862 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@ -34,6 +34,9 @@ done # Stop services /etc/init.d/squid stop +# remove old xtables modules / some are renamend +rm -rf /lib/xtables + # Extract files extract_files diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 349f3667c..217bc9850 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 20180807 +VER = 20180807a THISAPP = microcode-$(VER) DL_FILE = $(THISAPP).tgz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 49f534f1079d3c5bc178a150c1c105aa +$(DL_FILE)_MD5 = b12f8680d87c81a302e8c85712ed1a80 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core123, updated. e5eedea01de6e70c0440f0c97e418ca053382424
by Arne Fitzenreiter 24 Aug '18

24 Aug '18

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, core123 has been updated via e5eedea01de6e70c0440f0c97e418ca053382424 (commit) via 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 (commit) from a019c963a2bc232a381aefbafc260b3ea3bf4f2b (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 e5eedea01de6e70c0440f0c97e418ca053382424 Merge: 1ce35de5c a019c963a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 24 20:22:05 2018 +0200 Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123 commit 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 24 20:19:29 2018 +0200 intel-microcode: update to 20180807a Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/intel-microcode | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 349f3667c..217bc9850 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 20180807 +VER = 20180807a THISAPP = microcode-$(VER) DL_FILE = $(THISAPP).tgz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 49f534f1079d3c5bc178a150c1c105aa +$(DL_FILE)_MD5 = b12f8680d87c81a302e8c85712ed1a80 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 973ffc2987afd070c95974bbebfd5c3973ca3db0
by Michael Tremer 24 Aug '18

24 Aug '18

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 973ffc2987afd070c95974bbebfd5c3973ca3db0 (commit) via db5360ee9a6d10483666c8ea6fd12b665b40f93d (commit) from b31d55a79d4c2771b36a209227da7cf99c8606a7 (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 973ffc2987afd070c95974bbebfd5c3973ca3db0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 12:25:59 2018 +0100 core124: Ship updated ntp package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit db5360ee9a6d10483666c8ea6fd12b665b40f93d Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Aug 23 21:07:04 2018 +0200 ntp: Update to 4.2.8p12 For details see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Best, Matthias 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/{oldcore/100 => core/124}/filelists/ntp | 0 config/rootfiles/core/124/update.sh | 1 + lfs/ntp | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/100 => core/124}/filelists/ntp (100%) Difference in files: diff --git a/config/rootfiles/core/124/filelists/ntp b/config/rootfiles/core/124/filelists/ntp new file mode 120000 index 000000000..7542d86cb --- /dev/null +++ b/config/rootfiles/core/124/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index d2954a00c..471667a12 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -48,6 +48,7 @@ ldconfig /usr/local/bin/update-lang-cache # Start services +/etc/init.d/ntp restart # Remove deprecated GRUB configuration option if [ -e "/etc/default/grub" ]; then diff --git a/lfs/ntp b/lfs/ntp index 9c5e772ac..8f845409c 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -24,7 +24,7 @@ include Config -VER = 4.2.8p11 +VER = 4.2.8p12 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 00950ca2855579541896513e78295361 +$(DL_FILE)_MD5 = 1522d66574bae14abb2622746dad2bdc install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b31d55a79d4c2771b36a209227da7cf99c8606a7
by Michael Tremer 24 Aug '18

24 Aug '18

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 b31d55a79d4c2771b36a209227da7cf99c8606a7 (commit) via 2754623fa9842d80cdd8341f06536b0940f4aeea (commit) from aec1925bea763d7dff55ed43d26bdb06acd2e07c (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 b31d55a79d4c2771b36a209227da7cf99c8606a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 11:45:44 2018 +0100 core124: Ship updated fwhosts.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2754623fa9842d80cdd8341f06536b0940f4aeea Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Fri Aug 24 10:06:30 2018 +0200 BUG11825: firewall: Renaming a network/host group doesn't update rules Code only changed field 6 of hash (target group) and not field 4 (source group). Also if using geoip it was only field 4 of hash (source group) and not field 6 of hash (target group) Added new code that changes both fields to reflect the change in the firewallrules immediately. fixes: #11825 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/filelists/files | 1 + html/cgi-bin/fwhosts.cgi | 2 ++ 2 files changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index eeb9048d9..7093d0de8 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 576701ac6..7315e79b6 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1258,6 +1258,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpname') } &General::writehasharray("$configgrp", \%customgrp ); #change name in FW Rules + &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4); &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6); } } @@ -1282,6 +1283,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname') &General::writehasharray("$configgeoipgrp", \%customgeoipgrp ); #change name in FW Rules &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,"geoip"); + &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6,"geoip"); } } &addgeoipgrp; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aec1925bea763d7dff55ed43d26bdb06acd2e07c
by Michael Tremer 23 Aug '18

23 Aug '18

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 aec1925bea763d7dff55ed43d26bdb06acd2e07c (commit) from 366b40c740bd61e412be23dcc987619b243b9c7b (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 aec1925bea763d7dff55ed43d26bdb06acd2e07c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 23 17:34:50 2018 +0100 IPsec: Show connected status for waiting connections that are active Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/filelists/files | 2 ++ html/cgi-bin/index.cgi | 7 ++++--- html/cgi-bin/vpnmain.cgi | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index ebebccdc1..eeb9048d9 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -6,6 +6,8 @@ etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/install-bootloader usr/local/bin/backupiso var/ipfire/backup/exclude diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index ef9da2389..03dc3574d 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -465,6 +465,10 @@ END my $activecolor = $Header::colourred; my $activestatus = $Lang::tr{'capsclosed'}; + if ($vpnconfig{$key}[33] eq "add") { + $activecolor = ${Header::colourorange}; + $activestatus = $Lang::tr{'vpn wait'}; + } if ($vpnconfig{$key}[0] eq 'off') { $activecolor = $Header::colourblue; $activestatus = $Lang::tr{'capsclosed'}; @@ -479,9 +483,6 @@ END } elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) { $activecolor = $Header::colourorange; $activestatus = $Lang::tr{'vpn on-demand'}; - } elsif ($vpnconfig{$key}[33] eq "add") { - $activecolor = ${Header::colourorange}; - $activestatus = $Lang::tr{'vpn wait'}; } } } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index e557122df..21fd1f4cd 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2844,8 +2844,11 @@ END } print "<td align='center' $col>$confighash{$key}[25]</td>"; my $col1="bgcolor='${Header::colourred}'"; - # get real state my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; + if ($confighash{$key}[33] eq "add") { + $col1="bgcolor='${Header::colourorange}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>"; + } foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { @@ -2857,9 +2860,6 @@ END } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) { $col1="bgcolor='${Header::colourorange}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>"; - } elsif ($confighash{$key}[33] eq "add") { - $col1="bgcolor='${Header::colourorange}'"; - $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>"; } } # move to blue if really down 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 August 2018