From ae8e242bc161f5154e583179519fbee58e1d305f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 3 Nov 2017 14:22:19 +0100 Subject: [PATCH 01/81] core116: ship updated wget Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/116/filelists/wget | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/116/filelists/wget diff --git a/config/rootfiles/core/116/filelists/wget b/config/rootfiles/core/116/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/core/116/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file From 9843bb7b5ad2517884f601a527e391953845e569 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 3 Nov 2017 14:28:22 +0100 Subject: [PATCH 02/81] core116: replace apache restart by stop and start restart seems not work after replace apache... Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/116/update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/116/update.sh b/config/rootfiles/core/116/update.sh index 3e03bb33c..84a4bb0c0 100644 --- a/config/rootfiles/core/116/update.sh +++ b/config/rootfiles/core/116/update.sh @@ -44,7 +44,8 @@ ldconfig #/usr/local/bin/update-lang-cache # Start services -/etc/init.d/apache restart +/etc/init.d/apache stop +/etc/init.d/apache start /etc/init.d/snort start # This update need a reboot... From 5c8acc789b4756d942d5e465361eb6b8e3ebad4a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 3 Nov 2017 16:40:23 +0100 Subject: [PATCH 03/81] core116: stop apache before extracting updated files Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/116/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/116/update.sh b/config/rootfiles/core/116/update.sh index 84a4bb0c0..ebc98e111 100644 --- a/config/rootfiles/core/116/update.sh +++ b/config/rootfiles/core/116/update.sh @@ -33,6 +33,7 @@ done # Stop services /etc/init.d/snort stop +/etc/init.d/apache stop # Extract files extract_files @@ -44,7 +45,6 @@ ldconfig #/usr/local/bin/update-lang-cache # Start services -/etc/init.d/apache stop /etc/init.d/apache start /etc/init.d/snort start From ad1204e4eb397b4f7d10c3bdfa9214aa8c0a0575 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 6 Nov 2017 19:07:10 +0000 Subject: [PATCH 04/81] captive: One month is only 30 days instead of 210 Signed-off-by: Michael Tremer --- html/cgi-bin/captive.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 242549d33..113c29f41 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -42,7 +42,7 @@ my %session_times = ( 86400 => $Lang::tr{'24 hours'}, 604800 => $Lang::tr{'one week'}, 1209600 => $Lang::tr{'two weeks'}, - 18144000 => $Lang::tr{'one month'}, + 2592000 => $Lang::tr{'one month'}, 31536000 => $Lang::tr{'one year'}, 0 => "- $Lang::tr{'unlimited'} -", ); From 5190eea24f9822a63dc5d06d214b48f973b14f29 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 7 Nov 2017 15:23:59 +0100 Subject: [PATCH 05/81] make.sh: Determine how much memory the build host has Signed-off-by: Michael Tremer --- make.sh | 3 +++ tools/make-functions | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/make.sh b/make.sh index 11be8465e..948a24d39 100755 --- a/make.sh +++ b/make.sh @@ -65,6 +65,9 @@ mkdir $BASEDIR/log/ 2>/dev/null # Include funtions . tools/make-functions +# Get the amount of memory in this build system +HOST_MEM=$(system_memory) + if [ -f .config ]; then . .config fi diff --git a/tools/make-functions b/tools/make-functions index b419253fa..3b878fb00 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -60,6 +60,20 @@ WARN="\\033[1;35m" FAIL="\\033[1;31m" NORMAL="\\033[0;39m" +system_memory() { + local key val unit + + while read -r key val unit; do + case "${key}" in + MemTotal:*) + # Convert to MB + echo "$(( ${val} / 1024 ))" + break + ;; + esac + done < /proc/meminfo +} + configure_build() { local build_arch="${1}" From 7e1639a4810e5e70db94fdb0a0a98593d50d4290 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 7 Nov 2017 15:26:25 +0100 Subject: [PATCH 06/81] make.sh: Use -pipe in CFLAGS when host has >1GB of memory Signed-off-by: Michael Tremer --- tools/make-functions | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/make-functions b/tools/make-functions index 3b878fb00..1ff4613f3 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -138,7 +138,13 @@ configure_build() { # Enables hardening HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4" - CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" + CFLAGS="-O2 -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" + + # Run compiler and assembler simultaneously on systems that have enough memory + if [ ${HOST_MEM} -ge 1024 ]; then + CFLAGS="${CFLAGS} -pipe" + fi + CXXFLAGS="${CFLAGS}" } From 1445a5ac436b4e29f227059ad8a1a1ceda327a2e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 7 Nov 2017 15:25:11 +0100 Subject: [PATCH 07/81] make.sh: Add function to determine how many CPU cores the build host has Signed-off-by: Michael Tremer --- make.sh | 5 +---- tools/make-functions | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/make.sh b/make.sh index 948a24d39..d9f779a81 100755 --- a/make.sh +++ b/make.sh @@ -189,10 +189,7 @@ prepareenv() { set +h LC_ALL=POSIX if [ -z $MAKETUNING ]; then - CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)" - if [ -z "${CPU_COUNT}" ]; then - CPU_COUNT=1 - fi + CPU_COUNT="$(system_processors)" MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))" fi diff --git a/tools/make-functions b/tools/make-functions index 1ff4613f3..676b97101 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -60,6 +60,10 @@ WARN="\\033[1;35m" FAIL="\\033[1;31m" NORMAL="\\033[0;39m" +system_processors() { + getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1" +} + system_memory() { local key val unit From 4f1cce84fb8217589b67dd3244fd3f8ccbe14e3d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 7 Nov 2017 15:27:31 +0100 Subject: [PATCH 08/81] make.sh: Remove setting the EDITOR variable which we don't use Signed-off-by: Michael Tremer --- make.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/make.sh b/make.sh index d9f779a81..175db5191 100755 --- a/make.sh +++ b/make.sh @@ -81,18 +81,6 @@ else configure_build "default" fi -if [ -z $EDITOR ]; then - for i in nano emacs vi; do - EDITOR=$(which $i 2>/dev/null) - if ! [ -z $EDITOR ]; then - export EDITOR=$EDITOR - break - fi - done - [ -z $EDITOR ] && exiterror "You should have installed an editor." -fi - - prepareenv() { ############################################################################ # # From a98ab1d7fdba5d18d42faab43bf03662ca4d4261 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 7 Nov 2017 15:43:14 +0100 Subject: [PATCH 09/81] make.sh: Calculate MAKETUNING depending on available memory Signed-off-by: Michael Tremer --- make.sh | 14 +++++--------- tools/make-functions | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/make.sh b/make.sh index 175db5191..f4d474d36 100755 --- a/make.sh +++ b/make.sh @@ -62,16 +62,17 @@ export BASEDIR LOGFILE DIR_CHK=$BASEDIR/cache/check mkdir $BASEDIR/log/ 2>/dev/null +# Load configuration file +if [ -f .config ]; then + . .config +fi + # Include funtions . tools/make-functions # Get the amount of memory in this build system HOST_MEM=$(system_memory) -if [ -f .config ]; then - . .config -fi - if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" elif [ -n "${TARGET_ARCH}" ]; then @@ -176,11 +177,6 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - if [ -z $MAKETUNING ]; then - CPU_COUNT="$(system_processors)" - - MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))" - fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD diff --git a/tools/make-functions b/tools/make-functions index 676b97101..9cf2fcfb4 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -150,6 +150,26 @@ configure_build() { fi CXXFLAGS="${CFLAGS}" + + # Determine parallelism + if [ -z "${MAKETUNING}" ]; then + # We assume that each process consumes about + # 192MB of memory. Therefore we find out how + # many processes fit into memory. + local mem_max=$(( ${HOST_MEM} / 192 )) + + local processors="$(system_processors)" + local cpu_max=$(( ${processors} * 2 )) + + local parallelism + if [ ${mem_max} -lt ${cpu_max} ]; then + parallelism=${mem_max} + else + parallelism=${cpu_max} + fi + + MAKETUNING="-j${parallelism}" + fi } configure_build_guess() { From 682a6b2dc8fb3e917e1d8927cd4caa022f4f23d8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 7 Nov 2017 16:02:28 +0100 Subject: [PATCH 10/81] unbound: Silence error when upstream name servers cannot be read Signed-off-by: Michael Tremer --- src/initscripts/system/unbound | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index e5554d725..4e7e63e5f 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -61,7 +61,7 @@ read_name_servers() { local i for i in 1 2; do echo "$(/dev/null | xargs echo } config_header() { From bb3272dad36da7cbefbbd4a9b0b3d98b760fbd49 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 6 Nov 2017 18:10:02 +0000 Subject: [PATCH 11/81] Start Core Update 117 Signed-off-by: Michael Tremer --- config/rootfiles/core/{116 => 117}/exclude | 0 config/rootfiles/core/117/filelists/files | 2 + config/rootfiles/core/{116 => 117}/meta | 0 config/rootfiles/core/117/update.sh | 62 +++++++++++++++++++ config/rootfiles/oldcore/116/exclude | 30 +++++++++ .../{core => oldcore}/116/filelists/apache2 | 0 .../{core => oldcore}/116/filelists/files | 0 .../116/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/116/filelists/openssh | 0 .../{core => oldcore}/116/filelists/openssl | 0 .../{core => oldcore}/116/filelists/snort | 0 .../{core => oldcore}/116/filelists/wget | 0 .../{core => oldcore}/116/filelists/xz | 0 config/rootfiles/oldcore/116/meta | 1 + .../rootfiles/{core => oldcore}/116/update.sh | 0 make.sh | 2 +- 16 files changed, 96 insertions(+), 1 deletion(-) rename config/rootfiles/core/{116 => 117}/exclude (100%) create mode 100644 config/rootfiles/core/117/filelists/files rename config/rootfiles/core/{116 => 117}/meta (100%) create mode 100644 config/rootfiles/core/117/update.sh create mode 100644 config/rootfiles/oldcore/116/exclude 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%) create mode 100644 config/rootfiles/oldcore/116/meta rename config/rootfiles/{core => oldcore}/116/update.sh (100%) 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 000000000..409e5fe8a --- /dev/null +++ b/config/rootfiles/core/117/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue 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 000000000..a8d83baaf --- /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 . # +# # +############################################################################ +# +. /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 000000000..d6fd053b6 --- /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 000000000..d547fa86f --- /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/make.sh b/make.sh index f4d474d36..f8a2e5b34 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 From eea4969dffa0d3324084b5904dd18407707c2ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Mon, 6 Nov 2017 18:27:04 +0100 Subject: [PATCH 12/81] Tor: Use relay mode as default setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Michael Tremer --- html/cgi-bin/tor.cgi | 2 +- lfs/tor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index fbad2d4d9..0d235c949 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/lfs/tor b/lfs/tor index 867f01fb4..6ca79f68a 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 = "" From 725396af2c8d180a687044ff9896d4eab3357998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Mon, 6 Nov 2017 18:12:48 +0100 Subject: [PATCH 13/81] link to HTTPS version of www.ipfire.org in WebUI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change links to www.ipfire.org in WebUI themes since the website now uses HTTPS. Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- 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 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl index 7d803b6ad..ed3f546b0 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 "

$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}


"; } else { - print "

-= IPFire =-


"; + print "

-= IPFire =-


"; } print <+ $h2 + diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl index 528825329..26a8763c1 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 "

$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}


"; } else { - print "

IPFire


"; + print "

IPFire


"; } print <$h2 diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 7f6000a46..9aec77497 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -152,7 +152,7 @@ print <