From 6e386cad2dbfadff70c07feb4eb50061d4a23629 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:23:29 +0100 Subject: [PATCH 001/188] sqlite: Update to 3.25.2.0 Signed-off-by: Michael Tremer --- lfs/sqlite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sqlite b/lfs/sqlite index 3b045e729..467e01805 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3080704 +VER = 3250200 THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 33bb8db0038317ce1b0480ca1185c7ba +$(DL_FILE)_MD5 = bfade31d59f58badc51aeaa6ae26a5de install : $(TARGET) From 7e2d7b98371fc203ccd764f76f35f57cc358ace4 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:28:33 +0100 Subject: [PATCH 002/188] Start Core Update 125 Signed-off-by: Michael Tremer --- config/rootfiles/core/{124 => 125}/exclude | 0 config/rootfiles/core/125/filelists/files | 2 + config/rootfiles/core/125/update.sh | 62 +++++++++++++++++++ config/rootfiles/oldcore/124/exclude | 28 +++++++++ .../124/filelists/aarch64/efibootmgr | 0 .../124/filelists/aarch64/efivar | 0 .../124/filelists/aarch64/files-aarch64 | 0 .../124/filelists/aarch64/grub | 0 .../124/filelists/aarch64/linux | 0 .../124/filelists/aarch64/linux-initrd | 0 .../124/filelists/armv5tel/files-armv5tel | 0 .../filelists/armv5tel/linux-initrd-kirkwood | 0 .../124/filelists/armv5tel/linux-initrd-multi | 0 .../124/filelists/armv5tel/linux-kirkwood | 0 .../124/filelists/armv5tel/linux-multi | 0 .../{core => oldcore}/124/filelists/bind | 0 .../124/filelists/ca-certificates | 0 .../{core => oldcore}/124/filelists/cdrkit | 0 .../{core => oldcore}/124/filelists/files | 0 .../{core => oldcore}/124/filelists/i586/grub | 0 .../124/filelists/i586/linux | 0 .../124/filelists/i586/linux-initrd | 0 .../{core => oldcore}/124/filelists/iproute2 | 0 .../{core => oldcore}/124/filelists/ntp | 0 .../{core => oldcore}/124/filelists/openssh | 0 .../{core => oldcore}/124/filelists/parted | 0 .../{core => oldcore}/124/filelists/pciutils | 0 .../{core => oldcore}/124/filelists/rng-tools | 0 .../{core => oldcore}/124/filelists/unbound | 0 .../124/filelists/x86_64/efibootmgr | 0 .../124/filelists/x86_64/efivar | 0 .../124/filelists/x86_64/grub | 0 .../124/filelists/x86_64/linux | 0 .../124/filelists/x86_64/linux-initrd | 0 .../rootfiles/{core => oldcore}/124/update.sh | 0 make.sh | 2 +- 36 files changed, 93 insertions(+), 1 deletion(-) rename config/rootfiles/core/{124 => 125}/exclude (100%) create mode 100644 config/rootfiles/core/125/filelists/files create mode 100644 config/rootfiles/core/125/update.sh create mode 100644 config/rootfiles/oldcore/124/exclude rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/efibootmgr (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/efivar (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/files-aarch64 (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/grub (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/124/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/files-armv5tel (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/124/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/124/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/124/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/124/filelists/cdrkit (100%) rename config/rootfiles/{core => oldcore}/124/filelists/files (100%) rename config/rootfiles/{core => oldcore}/124/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/124/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/124/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/124/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/124/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/124/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/124/filelists/parted (100%) rename config/rootfiles/{core => oldcore}/124/filelists/pciutils (100%) rename config/rootfiles/{core => oldcore}/124/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/124/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/efibootmgr (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/efivar (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/124/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/124/update.sh (100%) diff --git a/config/rootfiles/core/124/exclude b/config/rootfiles/core/125/exclude similarity index 100% rename from config/rootfiles/core/124/exclude rename to config/rootfiles/core/125/exclude diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files new file mode 100644 index 000000000..409e5fe8a --- /dev/null +++ b/config/rootfiles/core/125/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh new file mode 100644 index 000000000..eb468ac43 --- /dev/null +++ b/config/rootfiles/core/125/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=125 + +# 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 needs 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/124/exclude b/config/rootfiles/oldcore/124/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/124/exclude @@ -0,0 +1,28 @@ +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/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/124/filelists/aarch64/efibootmgr b/config/rootfiles/oldcore/124/filelists/aarch64/efibootmgr similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/efibootmgr rename to config/rootfiles/oldcore/124/filelists/aarch64/efibootmgr diff --git a/config/rootfiles/core/124/filelists/aarch64/efivar b/config/rootfiles/oldcore/124/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/efivar rename to config/rootfiles/oldcore/124/filelists/aarch64/efivar diff --git a/config/rootfiles/core/124/filelists/aarch64/files-aarch64 b/config/rootfiles/oldcore/124/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/files-aarch64 rename to config/rootfiles/oldcore/124/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/124/filelists/aarch64/grub b/config/rootfiles/oldcore/124/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/grub rename to config/rootfiles/oldcore/124/filelists/aarch64/grub diff --git a/config/rootfiles/core/124/filelists/aarch64/linux b/config/rootfiles/oldcore/124/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/linux rename to config/rootfiles/oldcore/124/filelists/aarch64/linux diff --git a/config/rootfiles/core/124/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/124/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/124/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel b/config/rootfiles/oldcore/124/filelists/armv5tel/files-armv5tel similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/files-armv5tel rename to config/rootfiles/oldcore/124/filelists/armv5tel/files-armv5tel diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/124/filelists/bind b/config/rootfiles/oldcore/124/filelists/bind similarity index 100% rename from config/rootfiles/core/124/filelists/bind rename to config/rootfiles/oldcore/124/filelists/bind diff --git a/config/rootfiles/core/124/filelists/ca-certificates b/config/rootfiles/oldcore/124/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/124/filelists/ca-certificates rename to config/rootfiles/oldcore/124/filelists/ca-certificates diff --git a/config/rootfiles/core/124/filelists/cdrkit b/config/rootfiles/oldcore/124/filelists/cdrkit similarity index 100% rename from config/rootfiles/core/124/filelists/cdrkit rename to config/rootfiles/oldcore/124/filelists/cdrkit diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/oldcore/124/filelists/files similarity index 100% rename from config/rootfiles/core/124/filelists/files rename to config/rootfiles/oldcore/124/filelists/files diff --git a/config/rootfiles/core/124/filelists/i586/grub b/config/rootfiles/oldcore/124/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/124/filelists/i586/grub rename to config/rootfiles/oldcore/124/filelists/i586/grub diff --git a/config/rootfiles/core/124/filelists/i586/linux b/config/rootfiles/oldcore/124/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/124/filelists/i586/linux rename to config/rootfiles/oldcore/124/filelists/i586/linux diff --git a/config/rootfiles/core/124/filelists/i586/linux-initrd b/config/rootfiles/oldcore/124/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/124/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/124/filelists/iproute2 b/config/rootfiles/oldcore/124/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/124/filelists/iproute2 rename to config/rootfiles/oldcore/124/filelists/iproute2 diff --git a/config/rootfiles/core/124/filelists/ntp b/config/rootfiles/oldcore/124/filelists/ntp similarity index 100% rename from config/rootfiles/core/124/filelists/ntp rename to config/rootfiles/oldcore/124/filelists/ntp diff --git a/config/rootfiles/core/124/filelists/openssh b/config/rootfiles/oldcore/124/filelists/openssh similarity index 100% rename from config/rootfiles/core/124/filelists/openssh rename to config/rootfiles/oldcore/124/filelists/openssh diff --git a/config/rootfiles/core/124/filelists/parted b/config/rootfiles/oldcore/124/filelists/parted similarity index 100% rename from config/rootfiles/core/124/filelists/parted rename to config/rootfiles/oldcore/124/filelists/parted diff --git a/config/rootfiles/core/124/filelists/pciutils b/config/rootfiles/oldcore/124/filelists/pciutils similarity index 100% rename from config/rootfiles/core/124/filelists/pciutils rename to config/rootfiles/oldcore/124/filelists/pciutils diff --git a/config/rootfiles/core/124/filelists/rng-tools b/config/rootfiles/oldcore/124/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/124/filelists/rng-tools rename to config/rootfiles/oldcore/124/filelists/rng-tools diff --git a/config/rootfiles/core/124/filelists/unbound b/config/rootfiles/oldcore/124/filelists/unbound similarity index 100% rename from config/rootfiles/core/124/filelists/unbound rename to config/rootfiles/oldcore/124/filelists/unbound diff --git a/config/rootfiles/core/124/filelists/x86_64/efibootmgr b/config/rootfiles/oldcore/124/filelists/x86_64/efibootmgr similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/efibootmgr rename to config/rootfiles/oldcore/124/filelists/x86_64/efibootmgr diff --git a/config/rootfiles/core/124/filelists/x86_64/efivar b/config/rootfiles/oldcore/124/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/efivar rename to config/rootfiles/oldcore/124/filelists/x86_64/efivar diff --git a/config/rootfiles/core/124/filelists/x86_64/grub b/config/rootfiles/oldcore/124/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/grub rename to config/rootfiles/oldcore/124/filelists/x86_64/grub diff --git a/config/rootfiles/core/124/filelists/x86_64/linux b/config/rootfiles/oldcore/124/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/linux rename to config/rootfiles/oldcore/124/filelists/x86_64/linux diff --git a/config/rootfiles/core/124/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/124/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/124/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/oldcore/124/update.sh similarity index 100% rename from config/rootfiles/core/124/update.sh rename to config/rootfiles/oldcore/124/update.sh diff --git a/make.sh b/make.sh index d8b7856cb..c811f0573 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="124" # Core Level (Filename) +CORE="125" # Core Level (Filename) PAKFIRE_CORE="124" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan From f9b7bc925940a87e7eee98ff607212d474ca7b0f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:29:23 +0100 Subject: [PATCH 003/188] Update list of contributors Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/files | 1 + html/cgi-bin/credits.cgi | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files index 409e5fe8a..0894d828f 100644 --- a/config/rootfiles/core/125/filelists/files +++ b/config/rootfiles/core/125/filelists/files @@ -1,2 +1,3 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/credits.cgi diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index eb76de72e..2b5d73f1d 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -68,10 +68,10 @@ Matthias Fischer, Stefan Schantl, Jan Paul Tuecking, Jonatan Schlag, -Dirk Wagner, -Marcel Lorenz, Erik Kapfer, +Dirk Wagner, Peter Müller, +Marcel Lorenz, Alf Høgemark, Ben Schweikert, Peter Pfeiffer, @@ -84,10 +84,10 @@ Marcus Scholz, Ersan Yildirim, Joern-Ingo Weigert, Alfred Haas, +Wolfgang Apolinarski, Lars Schuhmacher, Rene Zingel, Sascha Kilian, -Wolfgang Apolinarski, Ronald Wiesinger, Stephan Feddersen, Daniel Weismueller, From 551a554db67f06d16d4115603884653bbb6968e2 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:30:05 +0100 Subject: [PATCH 004/188] core125: Ship recently updated sqlite Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/sqlite | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/125/filelists/sqlite diff --git a/config/rootfiles/core/125/filelists/sqlite b/config/rootfiles/core/125/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/125/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file From 028eafe79f3cf3363ec3a48e6176f28c22e084d3 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sun, 23 Sep 2018 19:12:06 +0200 Subject: [PATCH 005/188] Apache: Update to 2.4.35 For details see: http://apache.mirror.digionline.de//httpd/CHANGES_2.4.35 Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- config/rootfiles/common/apache2 | 38 ++++++++++++++++++++++----------- lfs/apache2 | 4 ++-- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index d10c4f138..e1b1ca825 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -46,17 +46,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf #srv/web #srv/web/ipfire -#srv/web/ipfire/manual/howto/access.html.es -#srv/web/ipfire/manual/howto/auth.html.es -#srv/web/ipfire/manual/howto/cgi.html.es -#srv/web/ipfire/manual/howto/htaccess.html.es -#srv/web/ipfire/manual/howto/http2.html.es -#srv/web/ipfire/manual/howto/http2.html.fr -#srv/web/ipfire/manual/howto/index.html.es -#srv/web/ipfire/manual/howto/public_html.html.es -#srv/web/ipfire/manual/mod/directive-dict.html.es -#srv/web/ipfire/manual/mod/mod_brotli.html -#srv/web/ipfire/manual/mod/mod_brotli.html.en #srv/web/ipfire/cgi-bin #srv/web/ipfire/cgi-bin/printenv #srv/web/ipfire/cgi-bin/printenv.vbs @@ -452,42 +441,52 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/howto #srv/web/ipfire/manual/howto/access.html #srv/web/ipfire/manual/howto/access.html.en +#srv/web/ipfire/manual/howto/access.html.es #srv/web/ipfire/manual/howto/access.html.fr #srv/web/ipfire/manual/howto/auth.html #srv/web/ipfire/manual/howto/auth.html.en +#srv/web/ipfire/manual/howto/auth.html.es #srv/web/ipfire/manual/howto/auth.html.fr #srv/web/ipfire/manual/howto/auth.html.ja.utf8 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr #srv/web/ipfire/manual/howto/auth.html.tr.utf8 #srv/web/ipfire/manual/howto/cgi.html #srv/web/ipfire/manual/howto/cgi.html.en +#srv/web/ipfire/manual/howto/cgi.html.es #srv/web/ipfire/manual/howto/cgi.html.fr #srv/web/ipfire/manual/howto/cgi.html.ja.utf8 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html #srv/web/ipfire/manual/howto/htaccess.html.en +#srv/web/ipfire/manual/howto/htaccess.html.es #srv/web/ipfire/manual/howto/htaccess.html.fr #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html.pt-br #srv/web/ipfire/manual/howto/http2.html #srv/web/ipfire/manual/howto/http2.html.en +#srv/web/ipfire/manual/howto/http2.html.es +#srv/web/ipfire/manual/howto/http2.html.fr #srv/web/ipfire/manual/howto/index.html #srv/web/ipfire/manual/howto/index.html.en +#srv/web/ipfire/manual/howto/index.html.es #srv/web/ipfire/manual/howto/index.html.fr #srv/web/ipfire/manual/howto/index.html.ja.utf8 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr #srv/web/ipfire/manual/howto/index.html.zh-cn.utf8 #srv/web/ipfire/manual/howto/public_html.html #srv/web/ipfire/manual/howto/public_html.html.en +#srv/web/ipfire/manual/howto/public_html.html.es #srv/web/ipfire/manual/howto/public_html.html.fr #srv/web/ipfire/manual/howto/public_html.html.ja.utf8 #srv/web/ipfire/manual/howto/public_html.html.ko.euc-kr #srv/web/ipfire/manual/howto/public_html.html.tr.utf8 #srv/web/ipfire/manual/howto/reverse_proxy.html #srv/web/ipfire/manual/howto/reverse_proxy.html.en +#srv/web/ipfire/manual/howto/reverse_proxy.html.fr #srv/web/ipfire/manual/howto/ssi.html #srv/web/ipfire/manual/howto/ssi.html.en +#srv/web/ipfire/manual/howto/ssi.html.es #srv/web/ipfire/manual/howto/ssi.html.fr #srv/web/ipfire/manual/howto/ssi.html.ja.utf8 #srv/web/ipfire/manual/howto/ssi.html.ko.euc-kr @@ -575,6 +574,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/misc #srv/web/ipfire/manual/misc/index.html #srv/web/ipfire/manual/misc/index.html.en +#srv/web/ipfire/manual/misc/index.html.es #srv/web/ipfire/manual/misc/index.html.fr #srv/web/ipfire/manual/misc/index.html.ko.euc-kr #srv/web/ipfire/manual/misc/index.html.tr.utf8 @@ -606,6 +606,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/core.html.tr.utf8 #srv/web/ipfire/manual/mod/directive-dict.html #srv/web/ipfire/manual/mod/directive-dict.html.en +#srv/web/ipfire/manual/mod/directive-dict.html.es #srv/web/ipfire/manual/mod/directive-dict.html.fr #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr @@ -693,6 +694,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_authn_socache.html.fr #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.en +#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.fr #srv/web/ipfire/manual/mod/mod_authnz_ldap.html #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr @@ -730,6 +732,9 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8 +#srv/web/ipfire/manual/mod/mod_brotli.html +#srv/web/ipfire/manual/mod/mod_brotli.html.en +#srv/web/ipfire/manual/mod/mod_brotli.html.fr #srv/web/ipfire/manual/mod/mod_buffer.html #srv/web/ipfire/manual/mod/mod_buffer.html.en #srv/web/ipfire/manual/mod/mod_buffer.html.fr @@ -847,6 +852,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr #srv/web/ipfire/manual/mod/mod_http2.html #srv/web/ipfire/manual/mod/mod_http2.html.en +#srv/web/ipfire/manual/mod/mod_http2.html.fr #srv/web/ipfire/manual/mod/mod_ident.html #srv/web/ipfire/manual/mod/mod_ident.html.en #srv/web/ipfire/manual/mod/mod_ident.html.fr @@ -959,6 +965,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.en +#srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.fr #srv/web/ipfire/manual/mod/mod_proxy_html.html #srv/web/ipfire/manual/mod/mod_proxy_html.html.en #srv/web/ipfire/manual/mod/mod_proxy_html.html.fr @@ -967,6 +974,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr #srv/web/ipfire/manual/mod/mod_proxy_http2.html #srv/web/ipfire/manual/mod/mod_proxy_http2.html.en +#srv/web/ipfire/manual/mod/mod_proxy_http2.html.fr #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr @@ -974,6 +982,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en +#srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr #srv/web/ipfire/manual/mod/mod_ratelimit.html #srv/web/ipfire/manual/mod/mod_ratelimit.html.en #srv/web/ipfire/manual/mod/mod_ratelimit.html.fr @@ -1081,6 +1090,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_usertrack.html.fr #srv/web/ipfire/manual/mod/mod_version.html #srv/web/ipfire/manual/mod/mod_version.html.en +#srv/web/ipfire/manual/mod/mod_version.html.fr #srv/web/ipfire/manual/mod/mod_version.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_vhost_alias.html @@ -1089,6 +1099,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_vhost_alias.html.tr.utf8 #srv/web/ipfire/manual/mod/mod_watchdog.html #srv/web/ipfire/manual/mod/mod_watchdog.html.en +#srv/web/ipfire/manual/mod/mod_watchdog.html.fr #srv/web/ipfire/manual/mod/mod_xml2enc.html #srv/web/ipfire/manual/mod/mod_xml2enc.html.en #srv/web/ipfire/manual/mod/mod_xml2enc.html.fr @@ -1185,6 +1196,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/platform/perf-hp.html.ko.euc-kr #srv/web/ipfire/manual/platform/rpm.html #srv/web/ipfire/manual/platform/rpm.html.en +#srv/web/ipfire/manual/platform/rpm.html.fr #srv/web/ipfire/manual/platform/win_compiling.html #srv/web/ipfire/manual/platform/win_compiling.html.en #srv/web/ipfire/manual/platform/win_compiling.html.fr @@ -1260,6 +1272,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/programs/index.html.zh-cn.utf8 #srv/web/ipfire/manual/programs/log_server_status.html #srv/web/ipfire/manual/programs/log_server_status.html.en +#srv/web/ipfire/manual/programs/log_server_status.html.fr #srv/web/ipfire/manual/programs/logresolve.html #srv/web/ipfire/manual/programs/logresolve.html.en #srv/web/ipfire/manual/programs/logresolve.html.fr @@ -1277,8 +1290,10 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/programs/rotatelogs.html.tr.utf8 #srv/web/ipfire/manual/programs/split-logfile.html #srv/web/ipfire/manual/programs/split-logfile.html.en +#srv/web/ipfire/manual/programs/split-logfile.html.fr #srv/web/ipfire/manual/programs/suexec.html #srv/web/ipfire/manual/programs/suexec.html.en +#srv/web/ipfire/manual/programs/suexec.html.fr #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr #srv/web/ipfire/manual/programs/suexec.html.tr.utf8 #srv/web/ipfire/manual/rewrite @@ -1644,7 +1659,6 @@ usr/lib/apache/mod_version.so usr/lib/apache/mod_vhost_alias.so usr/lib/apache/mod_watchdog.so usr/lib/apache/mod_xml2enc.so -#usr/sbin/ab usr/sbin/apachectl #usr/sbin/checkgid #usr/sbin/envvars diff --git a/lfs/apache2 b/lfs/apache2 index 1ef6bdec0..d2175e71c 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.34 +VER = 2.4.35 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 818adca52f3be187fe45d6822755be95 +$(DL_FILE)_MD5 = 30c1cde80ffe814a8d16b4fdffda330a install : $(TARGET) From bb5f2c53ac519e7dc9289b431b36138a7148c85d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:33:23 +0100 Subject: [PATCH 006/188] core125: Ship updated apache Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/apache2 | 1 + config/rootfiles/core/125/update.sh | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/125/filelists/apache2 diff --git a/config/rootfiles/core/125/filelists/apache2 b/config/rootfiles/core/125/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/125/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh index eb468ac43..1c606a2ce 100644 --- a/config/rootfiles/core/125/update.sh +++ b/config/rootfiles/core/125/update.sh @@ -43,6 +43,7 @@ ldconfig #/usr/local/bin/update-lang-cache # Start services +/etc/init.d/apache restart # This update needs a reboot... #touch /var/run/need_reboot From f8348048ff816abbf704b652d6ff2a45782c094b Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Mon, 24 Sep 2018 18:34:38 +0200 Subject: [PATCH 007/188] bind: Update to 9.11.4-P2 For details see: http://ftp.isc.org/isc/bind9/9.11.4-P2/RELEASE-NOTES-bind-9.11.4-P2.html Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/bind | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/bind b/lfs/bind index 8b04037b7..085fa005b 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.4-P1 +VER = 9.11.4-P2 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b2c54d6c2003b693388041fd109e8b6b +$(DL_FILE)_MD5 = 3b831d1cb9dcb3e0868409cf98d4519b install : $(TARGET) From 7961b3c7e0d424339b366d175b88ae1f47762444 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:34:00 +0100 Subject: [PATCH 008/188] core125: Ship updated bind Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/bind | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/125/filelists/bind diff --git a/config/rootfiles/core/125/filelists/bind b/config/rootfiles/core/125/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/125/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file From dfb985caa97b19f00b6eaac8af37020230132acc Mon Sep 17 00:00:00 2001 From: Tim FitzGeorge Date: Tue, 25 Sep 2018 18:52:30 +0100 Subject: [PATCH 009/188] Allow kernel to swap memory on high demand Signed-off-by: Tim FitzGeorge Fixes: Bug 11839 Signed-off-by: Michael Tremer --- config/etc/sysctl.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 345f8f52a..4066af767 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -27,7 +27,7 @@ net.ipv4.conf.all.accept_source_route = 0 net.ipv4.conf.all.log_martians = 1 kernel.printk = 1 4 1 7 -vm.swappiness=0 +vm.swappiness=1 vm.mmap_min_addr = 4096 vm.min_free_kbytes = 8192 From 86e00f68b8c9549fbc72c8ef68a499a1c3e34c79 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:35:46 +0100 Subject: [PATCH 010/188] core125: Apply changed sysctl.conf immediately Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/files | 1 + config/rootfiles/core/125/update.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files index 0894d828f..c72b45b05 100644 --- a/config/rootfiles/core/125/filelists/files +++ b/config/rootfiles/core/125/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/issue +etc/sysctl.conf srv/web/ipfire/cgi-bin/credits.cgi diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh index 1c606a2ce..3da55e116 100644 --- a/config/rootfiles/core/125/update.sh +++ b/config/rootfiles/core/125/update.sh @@ -45,6 +45,9 @@ ldconfig # Start services /etc/init.d/apache restart +# Reload sysctl.conf +sysctl -p + # This update needs a reboot... #touch /var/run/need_reboot From 5747b6ebfbd81a71eaec8c2a688542c0245a243a Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Fri, 28 Sep 2018 18:58:20 +0200 Subject: [PATCH 011/188] gnutls: Update to 3.5.19 Hi, For changelogs since '3.5.15' see: https://lists.gnupg.org/pipermail/gnutls-devel/2017-October/008523.html https://lists.gnupg.org/pipermail/gnutls-devel/2018-January/008538.html https://lists.gnupg.org/pipermail/gnutls-devel/2018-February/008540.html https://lists.gnupg.org/pipermail/gnutls-devel/2018-July/008583.html Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- config/rootfiles/common/gnutls | 2 +- lfs/gnutls | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/gnutls b/config/rootfiles/common/gnutls index 8231c7588..137fbe124 100644 --- a/config/rootfiles/common/gnutls +++ b/config/rootfiles/common/gnutls @@ -33,7 +33,7 @@ usr/lib/libgnutls-dane.so.0.4.1 #usr/lib/libgnutls.la #usr/lib/libgnutls.so usr/lib/libgnutls.so.30 -usr/lib/libgnutls.so.30.14.7 +usr/lib/libgnutls.so.30.14.11 #usr/lib/libgnutlsxx.la #usr/lib/libgnutlsxx.so usr/lib/libgnutlsxx.so.28 diff --git a/lfs/gnutls b/lfs/gnutls index 5484d9821..8e6b54236 100644 --- a/lfs/gnutls +++ b/lfs/gnutls @@ -24,7 +24,7 @@ include Config -VER = 3.5.15 +VER = 3.5.19 THISAPP = gnutls-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bcdcbc65c50a7499617ad9f4d0058de9 +$(DL_FILE)_MD5 = 1002f4099ce11d785e9811099aaa59a6 install : $(TARGET) From b56a93e3c3d86c0894f291ed8208f01adead7f44 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:36:48 +0100 Subject: [PATCH 012/188] core125: Ship updated GnuTLS Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/gnutls | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/125/filelists/gnutls diff --git a/config/rootfiles/core/125/filelists/gnutls b/config/rootfiles/core/125/filelists/gnutls new file mode 120000 index 000000000..8dbe60bc3 --- /dev/null +++ b/config/rootfiles/core/125/filelists/gnutls @@ -0,0 +1 @@ +../../../common/gnutls \ No newline at end of file From e27f2aa69a4c714322d443d6d6f6fafa1ff3c2c1 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Thu, 4 Oct 2018 05:09:36 +0200 Subject: [PATCH 013/188] clamav: Update to 0.100.2 Hi, "This is a patch release to address several vulnerabilities..." For details see: https://blog.clamav.net/2018/10/clamav-01002-has-been-released.html Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/clamav | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/clamav b/lfs/clamav index c0612f1aa..ad89e1356 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.100.1 +VER = 0.100.2 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 39 +PAK_VER = 40 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0f653df0480eebcd828939e8db9f0443 +$(DL_FILE)_MD5 = 253dd79dd57da759567e42543a569c5c install : $(TARGET) From 7d5c5d11ea18b50a49a19ef9b80d9e45223356a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Thu, 4 Oct 2018 18:27:35 +0200 Subject: [PATCH 014/188] update OpenSSH default port in language files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #11881 Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6e3dba4db..c8d4c65e7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2153,7 +2153,7 @@ 'ssdmz pinholes' => 'DMZ-Schlupflöcher', 'ssh' => 'SSH', 'ssh access' => 'SSH-Zugriff', -'ssh access tip' => 'IPFire SSH läuft auf dem nicht-standard Port 222!', +'ssh access tip' => 'IPFire SSH läuft nicht auf dem Standardport 22!', 'ssh active sessions' => 'Aktive Benutzeranmeldungen', 'ssh fingerprint' => 'Fingerabdruck', 'ssh host keys' => 'SSH Host Schlüssel', @@ -2166,7 +2166,7 @@ 'ssh no active logins' => 'Keine aktiven Benutzeranmeldungen', 'ssh no auth' => 'Sie haben keinerlei Authentifizierungverfahren zugelassen; dies wird Ihre Anmeldung verhindern', 'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen', -'ssh port' => 'SSH Port auf 22 setzen (Standard ist 222)', +'ssh port' => 'SSH-Port auf 222 setzen (Standard ist 22)', 'ssh portfw' => 'TCP-Weiterleitung zulassen', 'ssh tempstart15' => 'SSH-Deamon in 15 Minuten beenden', 'ssh tempstart30' => 'SSH-Deamon in 30 Minuten beenden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3ec5af57e..b563e5685 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2191,7 +2191,7 @@ 'ssdmz pinholes' => 'DMZ Pinholes', 'ssh' => 'SSH', 'ssh access' => 'SSH Access', -'ssh access tip' => 'IPFire SSH is not using default port 222!', +'ssh access tip' => 'IPFire SSH is not using default port 22!', 'ssh active sessions' => 'Active logins', 'ssh fingerprint' => 'Fingerprint', 'ssh host keys' => 'SSH Host Keys', @@ -2204,7 +2204,7 @@ 'ssh no active logins' => 'No active logins', 'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in', 'ssh passwords' => 'Allow password based authentication', -'ssh port' => 'SSH port set to 22 (default is 222)', +'ssh port' => 'SSH port set to 222 (default is 22)', 'ssh portfw' => 'Allow TCP forwarding', 'ssh tempstart15' => 'Stop SSH demon in 15 minutes', 'ssh tempstart30' => 'Stop SSH demon in 30 minutes', From 4352b0897cfcca7b3ddc25f1a4c2a7ad9428e840 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Oct 2018 14:49:47 +0100 Subject: [PATCH 015/188] core125: Update language files Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/files | 1 + config/rootfiles/core/125/update.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files index c72b45b05..a54607a8b 100644 --- a/config/rootfiles/core/125/filelists/files +++ b/config/rootfiles/core/125/filelists/files @@ -2,3 +2,4 @@ etc/system-release etc/issue etc/sysctl.conf srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh index 3da55e116..06d09598a 100644 --- a/config/rootfiles/core/125/update.sh +++ b/config/rootfiles/core/125/update.sh @@ -40,7 +40,7 @@ extract_files ldconfig # Update Language cache -#/usr/local/bin/update-lang-cache +/usr/local/bin/update-lang-cache # Start services /etc/init.d/apache restart From f887bf5fbea267d7bbbb2e15efb24e1d14dbdac8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 6 Oct 2018 17:36:28 +0100 Subject: [PATCH 016/188] hostapd: Add support for 802.11ac Signed-off-by: Michael Tremer --- html/cgi-bin/wlanap.cgi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index bb40021cf..0abbf6d6e 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -73,6 +73,7 @@ $wlanapsettings{'SYSLOGLEVEL'} = '0'; $wlanapsettings{'DEBUG'} = '4'; $wlanapsettings{'DRIVER'} = 'NL80211'; $wlanapsettings{'HTCAPS'} = ''; +$wlanapsettings{'VHTCAPS'} = ''; &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -389,6 +390,7 @@ print<802.11g + END @@ -428,6 +430,7 @@ END ; print <HT Caps:  +VHT Caps:  Tx Power:  Loglevel (hostapd):  | - off - - -END - &Header::closebox(); &Header::closebigbox(); &Header::closepage(); From c809af109bf93656d7c661c2d5a85cf2f8a726ad Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 24 Oct 2018 11:23:00 +0100 Subject: [PATCH 054/188] Update langs Signed-off-by: Michael Tremer --- doc/language_issues.de | 5 +++++ doc/language_issues.en | 5 +++++ doc/language_issues.es | 5 +++-- doc/language_issues.fr | 5 +++-- doc/language_issues.it | 5 +++++ doc/language_issues.nl | 5 +++++ doc/language_issues.pl | 5 +++-- doc/language_issues.ru | 5 +++-- doc/language_issues.tr | 5 +++++ 9 files changed, 37 insertions(+), 8 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index d99efac74..e9ca04548 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -494,6 +496,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.en b/doc/language_issues.en index 60b6cbb46..de3048a4c 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.es b/doc/language_issues.es index a9bf73f69..6a8acd6da 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4aaf5d3fb..271179cc6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -430,6 +430,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -903,7 +906,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1111,7 +1113,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn warning rfc3280 diff --git a/doc/language_issues.it b/doc/language_issues.it index 448c96bb1..ac51eb07c 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -493,6 +495,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.nl b/doc/language_issues.nl index a0216f0f7..18307d5af 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -258,6 +258,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -466,6 +467,7 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -490,6 +492,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a9bf73f69..6a8acd6da 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cbcaca1ec..3a7b6b95f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -424,6 +424,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -888,7 +891,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1096,7 +1098,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn warning rfc3280 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8a7ca44c1..7b5bc0559 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key From b26071d3787edf24084bbf8fb810894e7de31f8e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 24 Oct 2018 17:27:10 +0100 Subject: [PATCH 055/188] Config: Set IS_32BIT when running on 32 bit Signed-off-by: Michael Tremer --- lfs/Config | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lfs/Config b/lfs/Config index 516fb1cab..76f279da9 100644 --- a/lfs/Config +++ b/lfs/Config @@ -37,10 +37,22 @@ ifeq "$(BUILD_ARCH)" "aarch64" IS_64BIT = 1 endif +ifeq "$(BUILD_ARCH)" "armv7hl" + IS_32BIT = 1 +endif + +ifeq "$(BUILD_ARCH)" "armv5tel" + IS_32BIT = 1 +endif + ifeq "$(BUILD_ARCH)" "x86_64" IS_64BIT = 1 endif +ifeq "$(BUILD_ARCH)" "i586" + IS_32BIT = 1 +endif + ifeq "$(TOOLCHAIN)" "1" PREFIX = $(TOOLS_DIR) else From fa9cfe5a02bb46c33268910192d2d353d35a9a2a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 24 Oct 2018 17:27:38 +0100 Subject: [PATCH 056/188] coreutils+gzip: Allow building with 32 bit time_t on 32 bit arches Signed-off-by: Michael Tremer --- lfs/coreutils | 5 +++++ lfs/gzip | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lfs/coreutils b/lfs/coreutils index fa2574ad0..2c282b194 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -50,6 +50,11 @@ CONFIGURE_OPTIONS += \ CFLAGS += -fno-strict-aliasing +# Build with 32 bit time_t on 32 bit architectures +ifeq "$(IS_32BIT)" "1" + export TIME_T_32_BIT_OK=yes +endif + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/gzip b/lfs/gzip index c7dea498f..eeea99dbe 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -41,6 +41,11 @@ else EXTRA_CONFIG = --prefix=$(TOOLS_DIR) endif +# Build with 32 bit time_t on 32 bit architectures +ifeq "$(IS_32BIT)" "1" + export TIME_T_32_BIT_OK=yes +endif + ############################################################################### # Top-level Rules ############################################################################### From adfa49e118b6315c1d37abafb75a2411649c682c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 24 Oct 2018 17:27:55 +0100 Subject: [PATCH 057/188] toolchain: Bump version Signed-off-by: Michael Tremer --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 5276c8fe4..b9558bc04 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=20180606 +TOOLCHAINVER=20181024 ############################################################################### # From ce48278b21167684ba7d2f8924defbacd1b19305 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 25 Oct 2018 19:50:28 +0100 Subject: [PATCH 058/188] perl: Fix build in toolchain Signed-off-by: Michael Tremer --- lfs/perl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lfs/perl b/lfs/perl index 4eee16b80..a151e765b 100644 --- a/lfs/perl +++ b/lfs/perl @@ -90,10 +90,11 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install else - cd $(DIR_APP) && ./configure.gnu --prefix=$(TOOLS_DIR) -Dstatic_ext='Data/Dumper Fcntl IO' + cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR) \ + -Dlibs="-lm" -Uloclibpth -Ulocincpth cd $(DIR_APP) && sed -i 's/^0$$//' makefile cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile - cd $(DIR_APP) && make perl utilities + cd $(DIR_APP) && make cd $(DIR_APP) && cp -v perl pod/pod2man $(TOOLS_DIR)/bin cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER) cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER) From b9e02ee6b38061786804ec6e694a3293e38b4e20 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 26 Oct 2018 11:31:40 +0100 Subject: [PATCH 059/188] libaio: Link against standard libraries This patch fixes a build error when stack smashing protecion is being enabled and __stack_chk_fail_local needs to be pulled from libc. Signed-off-by: Michael Tremer --- lfs/libaio | 1 + 1 file changed, 1 insertion(+) diff --git a/lfs/libaio b/lfs/libaio index 06c206b08..f71c58909 100644 --- a/lfs/libaio +++ b/lfs/libaio @@ -73,6 +73,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -e "s@-nostdlib -nostartfiles@@g" -i src/Makefile cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make prefix=/usr install @rm -rf $(DIR_APP) From 1a7db134068cc0ed6e599413090b18fa19743142 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 26 Oct 2018 11:23:55 +0000 Subject: [PATCH 060/188] json-c: New package Signed-off-by: Michael Tremer --- config/rootfiles/common/json-c | 21 +++++++++ lfs/json-c | 80 ++++++++++++++++++++++++++++++++++ make.sh | 2 + 3 files changed, 103 insertions(+) create mode 100644 config/rootfiles/common/json-c create mode 100644 lfs/json-c diff --git a/config/rootfiles/common/json-c b/config/rootfiles/common/json-c new file mode 100644 index 000000000..6be4bbe68 --- /dev/null +++ b/config/rootfiles/common/json-c @@ -0,0 +1,21 @@ +#usr/include/json-c +#usr/include/json-c/arraylist.h +#usr/include/json-c/bits.h +#usr/include/json-c/debug.h +#usr/include/json-c/json.h +#usr/include/json-c/json_c_version.h +#usr/include/json-c/json_config.h +#usr/include/json-c/json_inttypes.h +#usr/include/json-c/json_object.h +#usr/include/json-c/json_object_iterator.h +#usr/include/json-c/json_pointer.h +#usr/include/json-c/json_tokener.h +#usr/include/json-c/json_util.h +#usr/include/json-c/json_visit.h +#usr/include/json-c/linkhash.h +#usr/include/json-c/printbuf.h +#usr/lib/libjson-c.la +#usr/lib/libjson-c.so +usr/lib/libjson-c.so.4 +usr/lib/libjson-c.so.4.0.0 +#usr/lib/pkgconfig/json-c.pc diff --git a/lfs/json-c b/lfs/json-c new file mode 100644 index 000000000..51a20ccbf --- /dev/null +++ b/lfs/json-c @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.13.1 + +THISAPP = json-c-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 04969ad59cc37bddd83741a08b98f350 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d8b7856cb..47e8f3fc1 100755 --- a/make.sh +++ b/make.sh @@ -1176,6 +1176,7 @@ buildipfire() { lfsmake2 libgcrypt lfsmake2 libassuan lfsmake2 nettle + lfsmake2 json-c lfsmake2 libevent lfsmake2 libevent2 lfsmake2 expat @@ -1555,6 +1556,7 @@ buildipfire() { lfsmake2 lua lfsmake2 dnsdist lfsmake2 bird + lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog lfsmake2 rtpproxy From d823d5f07211e984489027d57c49ae16db66c7f2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 27 Oct 2018 09:55:19 +0200 Subject: [PATCH 061/188] hostapd: add switch to disable neigborhood scan this may violate regulatory rules because 40Mhz channels should disabled if there are other networks but nearly every commercial router ignore this. Signed-off-by: Arne Fitzenreiter --- html/cgi-bin/wlanap.cgi | 20 +++++++ langs/de/cgi-bin/de.pl | 2 + langs/en/cgi-bin/en.pl | 2 + lfs/hostapd | 2 + src/patches/hostapd/hostapd-2.6-noscan.patch | 62 ++++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 src/patches/hostapd/hostapd-2.6-noscan.patch diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 0abbf6d6e..72c9a1298 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -74,6 +74,7 @@ $wlanapsettings{'DEBUG'} = '4'; $wlanapsettings{'DRIVER'} = 'NL80211'; $wlanapsettings{'HTCAPS'} = ''; $wlanapsettings{'VHTCAPS'} = ''; +$wlanapsettings{'NOSCAN'} = 'off'; &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -247,6 +248,10 @@ $checked{'HIDESSID'}{'off'} = ''; $checked{'HIDESSID'}{'on'} = ''; $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'"; +$checked{'NOSCAN'}{'off'} = ''; +$checked{'NOSCAN'}{'on'} = ''; +$checked{'NOSCAN'}{$wlanapsettings{'NOSCAN'}} = "checked='checked'"; + $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; @@ -415,6 +420,7 @@ END ; } print<$Lang::tr{'wlanap neighbor scan'}: on | off$Lang::tr{'wlanap neighbor scan warning'}
$Lang::tr{'wlanap encryption'}: