[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81f6550cfb8cfb566d9f85a98850d23b124992a1
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 81f6550cfb8cfb566d9f85a98850d23b124992a1 (commit) via 51141b150d5fd2a51ae75f32fe23ce2eb79558e6 (commit) via 3f3974b711391b6bbc05e5435398c1b3ee26c6e8 (commit) via d6b92a118e26af38793917cfbb4695e713462f76 (commit) via 1047805dba564994a96da0adbfb6559a8609ec11 (commit) via b3d2f86b877c1ad1b45370d1e96b520235854daf (commit) via 725396af2c8d180a687044ff9896d4eab3357998 (commit) via eea4969dffa0d3324084b5904dd18407707c2ace (commit) via bb3272dad36da7cbefbbd4a9b0b3d98b760fbd49 (commit) from 682a6b2dc8fb3e917e1d8927cd4caa022f4f23d8 (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 81f6550cfb8cfb566d9f85a98850d23b124992a1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 7 16:20:53 2017 +0000
core117: Ship updated routing.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 51141b150d5fd2a51ae75f32fe23ce2eb79558e6 Author: Alexander Marx alexander.marx@ipfire.org Date: Tue Nov 7 15:10:06 2017 +0100
BUG11466: fix routing.cgi the function call in routing.cgi was fixed to call the new "exact" function.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3f3974b711391b6bbc05e5435398c1b3ee26c6e8 Author: Alexander Marx alexander.marx@ipfire.org Date: Tue Nov 7 14:53:27 2017 +0100
Network-functions: add check if variables are defined
in function network_equal and network2bin a check for undefined variables were missing. added them.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d6b92a118e26af38793917cfbb4695e713462f76 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 7 16:16:50 2017 +0000
core117: Ship updated network-functions.pl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1047805dba564994a96da0adbfb6559a8609ec11 Author: Alexander Marx alexander.marx@ipfire.org Date: Tue Nov 7 14:17:27 2017 +0100
BUG11466: Fix network_equal function
The network_equal function only tested the subnet addresses of two given networks which lead to errormessages saying "This is the green network" The fix tests netwok and subnet IP's to fix this
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b3d2f86b877c1ad1b45370d1e96b520235854daf Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 6 18:11:49 2017 +0000
core117: Ship changed files of the webUI
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 725396af2c8d180a687044ff9896d4eab3357998 Author: Peter Müller peter.mueller@link38.eu Date: Mon Nov 6 18:12:48 2017 +0100
link to HTTPS version of www.ipfire.org in WebUI
Change links to www.ipfire.org in WebUI themes since the website now uses HTTPS.
Signed-off-by: Peter Müller peter.mueller@link38.eu Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eea4969dffa0d3324084b5904dd18407707c2ace Author: Peter Müller peter.mueller@link38.eu Date: Mon Nov 6 18:27:04 2017 +0100
Tor: Use relay mode as default setting
Set the default operating mode to "relay" in the Tor WebUI configuration page.
Running a Tor exit relay may cause legal trouble in some countries and should not be the default setting to prevent users from accidentally running an exit router.
Signed-off-by: Peter Müller peter.mueller@link38.eu Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bb3272dad36da7cbefbbd4a9b0b3d98b760fbd49 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 6 18:10:02 2017 +0000
Start Core Update 117
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/network-functions.pl | 16 ++++++++++++---- config/rootfiles/core/{116 => 117}/exclude | 0 .../rootfiles/{oldcore/93 => core/117}/filelists/files | 9 +++------ config/rootfiles/core/{116 => 117}/meta | 0 config/rootfiles/core/{116 => 117}/update.sh | 8 ++------ config/rootfiles/{core => oldcore}/116/exclude | 0 config/rootfiles/{core => oldcore}/116/filelists/apache2 | 0 config/rootfiles/{core => oldcore}/116/filelists/files | 0 .../{core => oldcore}/116/filelists/i586/openssl-sse2 | 0 config/rootfiles/{core => oldcore}/116/filelists/openssh | 0 config/rootfiles/{core => oldcore}/116/filelists/openssl | 0 config/rootfiles/{core => oldcore}/116/filelists/snort | 0 config/rootfiles/{core => oldcore}/116/filelists/wget | 0 config/rootfiles/{core => oldcore}/116/filelists/xz | 0 config/rootfiles/{core => oldcore}/116/meta | 0 config/rootfiles/{core => oldcore}/116/update.sh | 0 html/cgi-bin/routing.cgi | 2 +- html/cgi-bin/tor.cgi | 2 +- html/html/themes/darkdos/include/functions.pl | 2 +- html/html/themes/ipfire-legacy/include/functions.pl | 2 +- html/html/themes/ipfire/include/functions.pl | 6 +++--- html/html/themes/maniac/include/functions.pl | 2 +- lfs/tor | 2 +- make.sh | 2 +- 24 files changed, 27 insertions(+), 26 deletions(-) copy config/rootfiles/core/{116 => 117}/exclude (100%) copy config/rootfiles/{oldcore/93 => core/117}/filelists/files (63%) copy config/rootfiles/core/{116 => 117}/meta (100%) copy config/rootfiles/core/{116 => 117}/update.sh (94%) rename config/rootfiles/{core => oldcore}/116/exclude (100%) rename config/rootfiles/{core => oldcore}/116/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/116/filelists/files (100%) rename config/rootfiles/{core => oldcore}/116/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/116/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/116/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/116/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/116/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/116/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/116/meta (100%) rename config/rootfiles/{core => oldcore}/116/update.sh (100%)
Difference in files: diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 93b8190..2902aab 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -108,10 +108,14 @@ sub network_equal { my $network1 = shift; my $network2 = shift;
- my $bin1 = &network2bin($network1); - my $bin2 = &network2bin($network2); + my @bin1 = &network2bin($network1); + my @bin2 = &network2bin($network2);
- if ($bin1 eq $bin2) { + if (!defined $bin1 || !defined $bin2) { + return undef; + } + + if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) { return 1; }
@@ -133,6 +137,10 @@ sub network2bin($) { my $address_bin = &ip2bin($address); my $netmask_bin = &ip2bin($netmask);
+ if (!defined $address_bin || !defined $netmask_bin) { + return undef; + } + my $network_start = $address_bin & $netmask_bin;
return ($network_start, $netmask_bin); @@ -457,7 +465,7 @@ sub testsuite() { assert(!$result);
$result = &network_equal("192.168.0.1/24", "192.168.0.XXX/24"); - assert($result); + assert(!$result);
$result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8"); assert($result); diff --git a/config/rootfiles/core/116/exclude b/config/rootfiles/core/117/exclude similarity index 100% rename from config/rootfiles/core/116/exclude rename to config/rootfiles/core/117/exclude diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files new file mode 100644 index 0000000..6fef8c0 --- /dev/null +++ b/config/rootfiles/core/117/filelists/files @@ -0,0 +1,8 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/html/themes/darkdos/include/functions.pl +srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/functions.pl +var/ipfire/network-functions.pl diff --git a/config/rootfiles/core/116/meta b/config/rootfiles/core/117/meta similarity index 100% rename from config/rootfiles/core/116/meta rename to config/rootfiles/core/117/meta diff --git a/config/rootfiles/core/117/update.sh b/config/rootfiles/core/117/update.sh new file mode 100644 index 0000000..a8d83ba --- /dev/null +++ b/config/rootfiles/core/117/update.sh @@ -0,0 +1,62 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2017 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=117 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/116/exclude b/config/rootfiles/oldcore/116/exclude new file mode 100644 index 0000000..d6fd053 --- /dev/null +++ b/config/rootfiles/oldcore/116/exclude @@ -0,0 +1,30 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/116/filelists/apache2 b/config/rootfiles/oldcore/116/filelists/apache2 similarity index 100% rename from config/rootfiles/core/116/filelists/apache2 rename to config/rootfiles/oldcore/116/filelists/apache2 diff --git a/config/rootfiles/core/116/filelists/files b/config/rootfiles/oldcore/116/filelists/files similarity index 100% rename from config/rootfiles/core/116/filelists/files rename to config/rootfiles/oldcore/116/filelists/files diff --git a/config/rootfiles/core/116/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/116/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/116/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/116/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/116/filelists/openssh b/config/rootfiles/oldcore/116/filelists/openssh similarity index 100% rename from config/rootfiles/core/116/filelists/openssh rename to config/rootfiles/oldcore/116/filelists/openssh diff --git a/config/rootfiles/core/116/filelists/openssl b/config/rootfiles/oldcore/116/filelists/openssl similarity index 100% rename from config/rootfiles/core/116/filelists/openssl rename to config/rootfiles/oldcore/116/filelists/openssl diff --git a/config/rootfiles/core/116/filelists/snort b/config/rootfiles/oldcore/116/filelists/snort similarity index 100% rename from config/rootfiles/core/116/filelists/snort rename to config/rootfiles/oldcore/116/filelists/snort diff --git a/config/rootfiles/core/116/filelists/wget b/config/rootfiles/oldcore/116/filelists/wget similarity index 100% rename from config/rootfiles/core/116/filelists/wget rename to config/rootfiles/oldcore/116/filelists/wget diff --git a/config/rootfiles/core/116/filelists/xz b/config/rootfiles/oldcore/116/filelists/xz similarity index 100% rename from config/rootfiles/core/116/filelists/xz rename to config/rootfiles/oldcore/116/filelists/xz diff --git a/config/rootfiles/oldcore/116/meta b/config/rootfiles/oldcore/116/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/116/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/116/update.sh b/config/rootfiles/oldcore/116/update.sh similarity index 100% rename from config/rootfiles/core/116/update.sh rename to config/rootfiles/oldcore/116/update.sh diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 15989bd..f2014e2 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { last; } #Is the network part of an internal network? - $errormessage .= &General::check_net_internal($settings{'IP'}); + $errormessage .= &General::check_net_internal_exact($settings{'IP'}); last; }
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index fbad2d4..0d235c9 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -106,7 +106,7 @@ if (&Header::blue_used()) { }
$settings{'TOR_RELAY_ENABLED'} = 'off'; -$settings{'TOR_RELAY_MODE'} = 'exit'; +$settings{'TOR_RELAY_MODE'} = 'relay'; $settings{'TOR_RELAY_ADDRESS'} = ''; $settings{'TOR_RELAY_PORT'} = 9001; $settings{'TOR_RELAY_DIRPORT'} = 0; diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl index 7d803b6..ed3f546 100644 --- a/html/html/themes/darkdos/include/functions.pl +++ b/html/html/themes/darkdos/include/functions.pl @@ -227,7 +227,7 @@ END if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; } else { - print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />"; + print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />"; } print <<END <h2>+ $h2 +</h2> diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl index 5288253..26a8763 100644 --- a/html/html/themes/ipfire-legacy/include/functions.pl +++ b/html/html/themes/ipfire-legacy/include/functions.pl @@ -227,7 +227,7 @@ END if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; } else { - print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />"; + print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />"; } print <<END <h2>$h2</h2> diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 7f6000a..9aec774 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -152,7 +152,7 @@ print <<END <body> <div id="header" class="fixed"> <div id="logo"> - <a href="http://www.ipfire.org" style="text-decoration: none;"> + <a href="https://www.ipfire.org" style="text-decoration: none;"> <img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/> END ; @@ -205,8 +205,8 @@ print <<END;
<div id="footer" class='bigbox fixed'> <span class="pull-right"> - <a href="http://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> • - <a href="http://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a> + <a href="https://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> • + <a href="https://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a> </span>
<strong>$system_release</strong> diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 4866fcd..1c0aea1 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -227,7 +227,7 @@ END if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; } else { - print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />"; + print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />"; } print <<END <h2>+ $h2 +</h2> diff --git a/lfs/tor b/lfs/tor index 867f01f..6ca79f6 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 23 +PAK_VER = 24
DEPS = ""
diff --git a/make.sh b/make.sh index f4d474d..f8a2e5b 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="116" # Core Level (Filename) +CORE="117" # Core Level (Filename) PAKFIRE_CORE="116" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org