IPFire-SCM June 2018

ipfire-scm@lists.ipfire.org

1 participants
38 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core122, created. 3069380c4189a1d875717441d88082286a85586b
by git＠ipfire.org 19 Jun '18

19 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core122 has been created at 3069380c4189a1d875717441d88082286a85586b (commit) - Log ----------------------------------------------------------------- commit 3069380c4189a1d875717441d88082286a85586b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 11:11:08 2018 +0200 installer: update number of files Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 77350828e8b6e056ce08845e763d2cd9e47ea637 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 11:04:27 2018 +0200 finish core122 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9f73293568ebec9c51961b39619c0c01663dec96 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 11:02:51 2018 +0200 core122: run sensors-detect with new kernel Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d2f0bae8cb5af8e8f7557aa5a40759932d2c87e8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 10:58:47 2018 +0200 core121/122: update needed diskspace Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a9300d08658dad8849b3882f98cc77cc45130d74 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 17 17:42:13 2018 +0200 kernel: update to 4.14.50 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a45c7981df91c0ef7740fb96d116b3742752f226 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 16 15:44:11 2018 +0200 core122: update space req for pae kernel Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8c67e13fab4dd404cb11f219b56115818049bf42 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 16 13:26:54 2018 +0200 core122: install updated grub Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 99c2ca36b80c85bd1d2d5c5fcb5f05b29f6e1a85 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 16 13:14:54 2018 +0200 linux-pae: bump package version Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 78aaf71665bfc73015c8a9cdfeea64ff064e6084 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 16 11:45:32 2018 +0200 core122: add missing "then" at microcode reload Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 458c7d36cce61af5e2e25d247b46c491627b45fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 16 11:36:06 2018 +0200 core-updates: don't restart pakfire at error Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 98f0446e94935611f1b3f6395ba84091ba17ecca Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 16 10:19:44 2018 +0200 core-update: disable compression for outside tar this files are already xz compressend in the inner tar so they are not further compressable and this is only a time waste. Signew-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a97d2fb794f33875a6211a4b337e39f02df4af75 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 15 09:24:50 2018 +0200 core122: add code needed for kernel update force reinstall pae kernel, update /boot/uenv.txt Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 407f18cdbb7006f13f733c9aece62826a85ffde6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 15 09:12:23 2018 +0200 core121: add files for version update setup and pakfire conf needed to ship and pakfire needs to rerun after the version change to use the new pakfire trees and load core122. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8b297455a580260c50cf6d9d8e11c5952cb32b9b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 15 08:56:23 2018 +0200 core122: remove arm check The update will not pushed to old arm trees so the check is useless Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 015b3e08d87a09b1cc93ca1fa5783205d0acdd91 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 15 08:52:51 2018 +0200 core121: split into core121 and 122 linux firmware and kernel is too large for one core update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e701e24fb29854f609ccf72680e88e3041c2fa6e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 6 16:20:36 2018 +0100 make.sh: Bump toolchain date Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9d5737f048219937b9bc533f0a1d224ef96543b8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 14 07:43:03 2018 +0200 kernel: update to 4.14.49 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a1fdcfcd0e699de8e9bbcf1557c01ac41a50f6b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 12 17:15:43 2018 +0100 core121: Reload microcode after installing the core update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3069380c4189a1d875717441d88082286a85586b
by git＠ipfire.org 19 Jun '18

19 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 3069380c4189a1d875717441d88082286a85586b (commit) via 77350828e8b6e056ce08845e763d2cd9e47ea637 (commit) via 9f73293568ebec9c51961b39619c0c01663dec96 (commit) via d2f0bae8cb5af8e8f7557aa5a40759932d2c87e8 (commit) from a9300d08658dad8849b3882f98cc77cc45130d74 (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 3069380c4189a1d875717441d88082286a85586b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 11:11:08 2018 +0200 installer: update number of files Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 77350828e8b6e056ce08845e763d2cd9e47ea637 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 11:04:27 2018 +0200 finish core122 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9f73293568ebec9c51961b39619c0c01663dec96 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 11:02:51 2018 +0200 core122: run sensors-detect with new kernel Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d2f0bae8cb5af8e8f7557aa5a40759932d2c87e8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 19 10:58:47 2018 +0200 core121/122: update needed diskspace Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/121/update.sh | 18 ++++++++++++++++++ config/rootfiles/core/122/update.sh | 3 ++- make.sh | 2 +- src/installer/main.c | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh index 4d19e48f5..18019c1d7 100644 --- a/config/rootfiles/core/121/update.sh +++ b/config/rootfiles/core/121/update.sh @@ -41,6 +41,23 @@ for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 220000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi # Stop services @@ -95,3 +112,4 @@ sync # Don't report the exitcode last command exit 0 + diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh index 925886e27..3e8cab693 100644 --- a/config/rootfiles/core/122/update.sh +++ b/config/rootfiles/core/122/update.sh @@ -61,7 +61,7 @@ esac # Check diskspace on root ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` -if [ $ROOTSPACE -lt 100000 ]; then +if [ $ROOTSPACE -lt 80000 ]; then exit_with_error "ERROR cannot update because not enough free space on root." 2 exit 2 fi @@ -77,6 +77,7 @@ rm -rf /boot/zImage-ipfire-* rm -rf /boot/uInit-ipfire-* rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules +rm -f /etc/sysconfig/lm_sensors # Stop services diff --git a/make.sh b/make.sh index d9752756a..b03bd77e4 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number CORE="122" # Core Level (Filename) -PAKFIRE_CORE="120" # Core Level (PAKFIRE) +PAKFIRE_CORE="122" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/installer/main.c b/src/installer/main.c index 116f52b05..5572a4da4 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -23,7 +23,7 @@ #include <libintl.h> #define _(x) dgettext("installer", x) -#define INST_FILECOUNT 21000 +#define INST_FILECOUNT 24800 #define LICENSE_FILE "/cdrom/COPYING" #define SOURCE_TEMPFILE "/tmp/downloads/image.iso" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. beac479f2d1f4ad3e758df2346b6d5f0334458ea
by git＠ipfire.org 18 Jun '18

18 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via beac479f2d1f4ad3e758df2346b6d5f0334458ea (commit) from 28aacf565b1fc5c38f757c931cdfd42fa6e63051 (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 beac479f2d1f4ad3e758df2346b6d5f0334458ea Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 17:32:57 2018 +0200 OpenVPN: Prevent that a Roadwarrior name will be set two times Fixes bug #11307 Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 10 ++++++++++ 1 file changed, 10 insertions(+) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 947cbe9e7..0bc28cefe 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4180,6 +4180,16 @@ if ($cgiparams{'TYPE'} eq 'net') { } } + # Check for RW if client name is already set + if ($cgiparams{'TYPE'} eq 'host') { + foreach my $key (keys %confighash) { + if ($confighash{$key}[1] eq $cgiparams{'NAME'}) { + $errormessage = $Lang::tr{'a connection with this name already exists'}; + goto VPNCONF_ERROR; + } + } + } + # Replace empty strings with a . (my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/\./; (my $city = $cgiparams{'CERT_CITY'}) =~ s/^\s*$/\./; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 28aacf565b1fc5c38f757c931cdfd42fa6e63051
by git＠ipfire.org 18 Jun '18

18 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 28aacf565b1fc5c38f757c931cdfd42fa6e63051 (commit) via 87ea30ff5669c0174af3a481f31aba9f868101c6 (commit) from c0a7c9b2784629292db45763ae02b76023018c16 (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 28aacf565b1fc5c38f757c931cdfd42fa6e63051 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 18 16:43:04 2018 +0100 Start Core Update 123 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 87ea30ff5669c0174af3a481f31aba9f868101c6 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 17:10:37 2018 +0200 OpenVPN: Fix upload check for root and host certificate Fix for #11766 . Since the new OpenSSL output differs in the 'Subject' section, the regex needed to be adapted. Old and new output should now be possible. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{121 => 123}/exclude | 0 config/rootfiles/{oldcore/103 => core/123}/filelists/coreutils | 0 config/rootfiles/{oldcore/58 => core/123}/filelists/files | 3 +-- config/rootfiles/{oldcore/106 => core/123}/filelists/ipset | 0 config/rootfiles/{oldcore/105 => core/123}/filelists/libgcrypt | 0 config/rootfiles/{oldcore/100 => core/123}/filelists/tzdata | 0 config/rootfiles/core/{121 => 123}/filelists/unbound | 0 config/rootfiles/{oldcore/112 => core/123}/update.sh | 10 +++------- config/rootfiles/{core => oldcore}/121/exclude | 0 config/rootfiles/{core => oldcore}/121/filelists/acpid | 0 config/rootfiles/{core => oldcore}/121/filelists/apache2 | 0 config/rootfiles/{core => oldcore}/121/filelists/apr | 0 config/rootfiles/{core => oldcore}/121/filelists/aprutil | 0 .../rootfiles/{core => oldcore}/121/filelists/armv5tel/files | 0 .../121/filelists/armv5tel/linux-initrd-kirkwood | 0 .../121/filelists/armv5tel/linux-initrd-multi | 0 .../{core => oldcore}/121/filelists/armv5tel/linux-initrd-rpi | 0 .../{core => oldcore}/121/filelists/armv5tel/linux-kirkwood | 0 .../{core => oldcore}/121/filelists/armv5tel/linux-multi | 0 .../{core => oldcore}/121/filelists/armv5tel/linux-rpi | 0 .../{core => oldcore}/121/filelists/armv5tel/rpi-firmware | 0 .../rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot | 0 .../{core => oldcore}/121/filelists/armv5tel/u-boot-kirkwood | 0 .../{core => oldcore}/121/filelists/armv5tel/u-boot-mkimage | 0 config/rootfiles/{core => oldcore}/121/filelists/beep | 0 .../rootfiles/{core => oldcore}/121/filelists/ca-certificates | 0 config/rootfiles/{core => oldcore}/121/filelists/cmake | 0 config/rootfiles/{core => oldcore}/121/filelists/crda | 0 config/rootfiles/{core => oldcore}/121/filelists/dhcp | 0 config/rootfiles/{core => oldcore}/121/filelists/files | 0 config/rootfiles/{core => oldcore}/121/filelists/flex | 0 config/rootfiles/{core => oldcore}/121/filelists/i586/grub | 0 .../{core => oldcore}/121/filelists/i586/intel-microcode | 0 config/rootfiles/{core => oldcore}/121/filelists/i586/linux | 0 .../{core => oldcore}/121/filelists/i586/linux-initrd | 0 config/rootfiles/{core => oldcore}/121/filelists/iw | 0 config/rootfiles/{core => oldcore}/121/filelists/jwhois | 0 config/rootfiles/{core => oldcore}/121/filelists/libidn | 0 .../rootfiles/{core => oldcore}/121/filelists/linux-firmware | 0 .../rootfiles/{core => oldcore}/121/filelists/multipath-tools | 0 config/rootfiles/{core => oldcore}/121/filelists/openssl | 0 config/rootfiles/{core => oldcore}/121/filelists/pcre | 0 config/rootfiles/{core => oldcore}/121/filelists/rng-tools | 0 config/rootfiles/{core => oldcore}/121/filelists/tar | 0 config/rootfiles/{core => oldcore}/121/filelists/unbound | 0 config/rootfiles/{core => oldcore}/121/filelists/wget | 0 config/rootfiles/{core => oldcore}/121/filelists/x86_64/grub | 0 .../{core => oldcore}/121/filelists/x86_64/intel-microcode | 0 config/rootfiles/{core => oldcore}/121/filelists/x86_64/linux | 0 .../{core => oldcore}/121/filelists/x86_64/linux-initrd | 0 .../rootfiles/{core => oldcore}/121/filelists/xr819-firmware | 0 .../rootfiles/{core => oldcore}/121/filelists/xtables-addons | 0 config/rootfiles/{core => oldcore}/121/filelists/xz | 0 config/rootfiles/{core => oldcore}/121/meta | 0 config/rootfiles/{core => oldcore}/121/update.sh | 0 html/cgi-bin/ovpnmain.cgi | 4 ++-- make.sh | 4 ++-- 57 files changed, 8 insertions(+), 13 deletions(-) copy config/rootfiles/core/{121 => 123}/exclude (100%) copy config/rootfiles/{oldcore/103 => core/123}/filelists/coreutils (100%) copy config/rootfiles/{oldcore/58 => core/123}/filelists/files (73%) copy config/rootfiles/{oldcore/106 => core/123}/filelists/ipset (100%) copy config/rootfiles/{oldcore/105 => core/123}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/100 => core/123}/filelists/tzdata (100%) copy config/rootfiles/core/{121 => 123}/filelists/unbound (100%) copy config/rootfiles/{oldcore/112 => core/123}/update.sh (95%) rename config/rootfiles/{core => oldcore}/121/exclude (100%) rename config/rootfiles/{core => oldcore}/121/filelists/acpid (100%) rename config/rootfiles/{core => oldcore}/121/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/121/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/121/filelists/aprutil (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/files (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-initrd-rpi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/rpi-firmware (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot-kirkwood (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot-mkimage (100%) rename config/rootfiles/{core => oldcore}/121/filelists/beep (100%) rename config/rootfiles/{core => oldcore}/121/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/121/filelists/cmake (100%) rename config/rootfiles/{core => oldcore}/121/filelists/crda (100%) rename config/rootfiles/{core => oldcore}/121/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/121/filelists/files (100%) rename config/rootfiles/{core => oldcore}/121/filelists/flex (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/121/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/121/filelists/jwhois (100%) rename config/rootfiles/{core => oldcore}/121/filelists/libidn (100%) rename config/rootfiles/{core => oldcore}/121/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/121/filelists/multipath-tools (100%) rename config/rootfiles/{core => oldcore}/121/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/121/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/121/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/121/filelists/tar (100%) rename config/rootfiles/{core => oldcore}/121/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/121/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/121/filelists/xr819-firmware (100%) rename config/rootfiles/{core => oldcore}/121/filelists/xtables-addons (100%) rename config/rootfiles/{core => oldcore}/121/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/121/meta (100%) rename config/rootfiles/{core => oldcore}/121/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/121/exclude b/config/rootfiles/core/123/exclude similarity index 100% rename from config/rootfiles/core/121/exclude rename to config/rootfiles/core/123/exclude diff --git a/config/rootfiles/core/123/filelists/coreutils b/config/rootfiles/core/123/filelists/coreutils new file mode 120000 index 000000000..7351ed2cf --- /dev/null +++ b/config/rootfiles/core/123/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files new file mode 100644 index 000000000..2e8d7961f --- /dev/null +++ b/config/rootfiles/core/123/filelists/files @@ -0,0 +1,6 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/123/filelists/ipset b/config/rootfiles/core/123/filelists/ipset new file mode 120000 index 000000000..2b43691f2 --- /dev/null +++ b/config/rootfiles/core/123/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/libgcrypt b/config/rootfiles/core/123/filelists/libgcrypt new file mode 120000 index 000000000..2df12a20e --- /dev/null +++ b/config/rootfiles/core/123/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/tzdata b/config/rootfiles/core/123/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/core/123/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/unbound b/config/rootfiles/core/123/filelists/unbound similarity index 100% rename from config/rootfiles/core/121/filelists/unbound rename to config/rootfiles/core/123/filelists/unbound diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh new file mode 100644 index 000000000..1e9b1d193 --- /dev/null +++ b/config/rootfiles/core/123/update.sh @@ -0,0 +1,63 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=123 + +# 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 +/etc/init.d/unbound restart + +# 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/121/exclude b/config/rootfiles/oldcore/121/exclude new file mode 100644 index 000000000..d6fd053b6 --- /dev/null +++ b/config/rootfiles/oldcore/121/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/121/filelists/acpid b/config/rootfiles/oldcore/121/filelists/acpid similarity index 100% rename from config/rootfiles/core/121/filelists/acpid rename to config/rootfiles/oldcore/121/filelists/acpid diff --git a/config/rootfiles/core/121/filelists/apache2 b/config/rootfiles/oldcore/121/filelists/apache2 similarity index 100% rename from config/rootfiles/core/121/filelists/apache2 rename to config/rootfiles/oldcore/121/filelists/apache2 diff --git a/config/rootfiles/core/121/filelists/apr b/config/rootfiles/oldcore/121/filelists/apr similarity index 100% rename from config/rootfiles/core/121/filelists/apr rename to config/rootfiles/oldcore/121/filelists/apr diff --git a/config/rootfiles/core/121/filelists/aprutil b/config/rootfiles/oldcore/121/filelists/aprutil similarity index 100% rename from config/rootfiles/core/121/filelists/aprutil rename to config/rootfiles/oldcore/121/filelists/aprutil diff --git a/config/rootfiles/core/121/filelists/armv5tel/files b/config/rootfiles/oldcore/121/filelists/armv5tel/files similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/files rename to config/rootfiles/oldcore/121/filelists/armv5tel/files diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware b/config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/rpi-firmware rename to config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/121/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot rename to config/rootfiles/oldcore/121/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood b/config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood rename to config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage b/config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage rename to config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage diff --git a/config/rootfiles/core/121/filelists/beep b/config/rootfiles/oldcore/121/filelists/beep similarity index 100% rename from config/rootfiles/core/121/filelists/beep rename to config/rootfiles/oldcore/121/filelists/beep diff --git a/config/rootfiles/core/121/filelists/ca-certificates b/config/rootfiles/oldcore/121/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/121/filelists/ca-certificates rename to config/rootfiles/oldcore/121/filelists/ca-certificates diff --git a/config/rootfiles/core/121/filelists/cmake b/config/rootfiles/oldcore/121/filelists/cmake similarity index 100% rename from config/rootfiles/core/121/filelists/cmake rename to config/rootfiles/oldcore/121/filelists/cmake diff --git a/config/rootfiles/core/121/filelists/crda b/config/rootfiles/oldcore/121/filelists/crda similarity index 100% rename from config/rootfiles/core/121/filelists/crda rename to config/rootfiles/oldcore/121/filelists/crda diff --git a/config/rootfiles/core/121/filelists/dhcp b/config/rootfiles/oldcore/121/filelists/dhcp similarity index 100% rename from config/rootfiles/core/121/filelists/dhcp rename to config/rootfiles/oldcore/121/filelists/dhcp diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/oldcore/121/filelists/files similarity index 100% rename from config/rootfiles/core/121/filelists/files rename to config/rootfiles/oldcore/121/filelists/files diff --git a/config/rootfiles/core/121/filelists/flex b/config/rootfiles/oldcore/121/filelists/flex similarity index 100% rename from config/rootfiles/core/121/filelists/flex rename to config/rootfiles/oldcore/121/filelists/flex diff --git a/config/rootfiles/core/121/filelists/i586/grub b/config/rootfiles/oldcore/121/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/121/filelists/i586/grub rename to config/rootfiles/oldcore/121/filelists/i586/grub diff --git a/config/rootfiles/core/121/filelists/i586/intel-microcode b/config/rootfiles/oldcore/121/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/121/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/121/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/121/filelists/i586/linux b/config/rootfiles/oldcore/121/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/121/filelists/i586/linux rename to config/rootfiles/oldcore/121/filelists/i586/linux diff --git a/config/rootfiles/core/121/filelists/i586/linux-initrd b/config/rootfiles/oldcore/121/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/121/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/121/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/121/filelists/iw b/config/rootfiles/oldcore/121/filelists/iw similarity index 100% rename from config/rootfiles/core/121/filelists/iw rename to config/rootfiles/oldcore/121/filelists/iw diff --git a/config/rootfiles/core/121/filelists/jwhois b/config/rootfiles/oldcore/121/filelists/jwhois similarity index 100% rename from config/rootfiles/core/121/filelists/jwhois rename to config/rootfiles/oldcore/121/filelists/jwhois diff --git a/config/rootfiles/core/121/filelists/libidn b/config/rootfiles/oldcore/121/filelists/libidn similarity index 100% rename from config/rootfiles/core/121/filelists/libidn rename to config/rootfiles/oldcore/121/filelists/libidn diff --git a/config/rootfiles/core/121/filelists/linux-firmware b/config/rootfiles/oldcore/121/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/linux-firmware rename to config/rootfiles/oldcore/121/filelists/linux-firmware diff --git a/config/rootfiles/core/121/filelists/multipath-tools b/config/rootfiles/oldcore/121/filelists/multipath-tools similarity index 100% rename from config/rootfiles/core/121/filelists/multipath-tools rename to config/rootfiles/oldcore/121/filelists/multipath-tools diff --git a/config/rootfiles/core/121/filelists/openssl b/config/rootfiles/oldcore/121/filelists/openssl similarity index 100% rename from config/rootfiles/core/121/filelists/openssl rename to config/rootfiles/oldcore/121/filelists/openssl diff --git a/config/rootfiles/core/121/filelists/pcre b/config/rootfiles/oldcore/121/filelists/pcre similarity index 100% rename from config/rootfiles/core/121/filelists/pcre rename to config/rootfiles/oldcore/121/filelists/pcre diff --git a/config/rootfiles/core/121/filelists/rng-tools b/config/rootfiles/oldcore/121/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/121/filelists/rng-tools rename to config/rootfiles/oldcore/121/filelists/rng-tools diff --git a/config/rootfiles/core/121/filelists/tar b/config/rootfiles/oldcore/121/filelists/tar similarity index 100% rename from config/rootfiles/core/121/filelists/tar rename to config/rootfiles/oldcore/121/filelists/tar diff --git a/config/rootfiles/oldcore/121/filelists/unbound b/config/rootfiles/oldcore/121/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/oldcore/121/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/wget b/config/rootfiles/oldcore/121/filelists/wget similarity index 100% rename from config/rootfiles/core/121/filelists/wget rename to config/rootfiles/oldcore/121/filelists/wget diff --git a/config/rootfiles/core/121/filelists/x86_64/grub b/config/rootfiles/oldcore/121/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/grub rename to config/rootfiles/oldcore/121/filelists/x86_64/grub diff --git a/config/rootfiles/core/121/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/121/filelists/x86_64/linux b/config/rootfiles/oldcore/121/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/linux rename to config/rootfiles/oldcore/121/filelists/x86_64/linux diff --git a/config/rootfiles/core/121/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/121/filelists/xr819-firmware b/config/rootfiles/oldcore/121/filelists/xr819-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/xr819-firmware rename to config/rootfiles/oldcore/121/filelists/xr819-firmware diff --git a/config/rootfiles/core/121/filelists/xtables-addons b/config/rootfiles/oldcore/121/filelists/xtables-addons similarity index 100% rename from config/rootfiles/core/121/filelists/xtables-addons rename to config/rootfiles/oldcore/121/filelists/xtables-addons diff --git a/config/rootfiles/core/121/filelists/xz b/config/rootfiles/oldcore/121/filelists/xz similarity index 100% rename from config/rootfiles/core/121/filelists/xz rename to config/rootfiles/oldcore/121/filelists/xz diff --git a/config/rootfiles/core/121/meta b/config/rootfiles/oldcore/121/meta similarity index 100% rename from config/rootfiles/core/121/meta rename to config/rootfiles/oldcore/121/meta diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/oldcore/121/update.sh similarity index 100% rename from config/rootfiles/core/121/update.sh rename to config/rootfiles/oldcore/121/update.sh diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b3122a49c..947cbe9e7 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4045,7 +4045,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } my $temp = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`; - $temp =~ /Subject:.*CN=(.*)[\n]/; + $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/; $temp = $1; $temp =~ s+/Email+, E+; $temp =~ s/ ST=/ S=/; @@ -4099,7 +4099,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } my $temp = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`; - $temp =~ /Subject:.*CN=(.*)[\n]/; + $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/; $temp = $1; $temp =~ s+/Email+, E+; $temp =~ s/ ST=/ S=/; diff --git a/make.sh b/make.sh index e8591f363..0238cc387 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="121" # Core Level (Filename) -PAKFIRE_CORE="120" # Core Level (PAKFIRE) +CORE="123" # Core Level (Filename) +PAKFIRE_CORE="122" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, created. ff8df1917efdd6f935fdea4a58ff8f97fda853cc
by git＠ipfire.org 18 Jun '18

18 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, efi has been created at ff8df1917efdd6f935fdea4a58ff8f97fda853cc (commit) - Log ----------------------------------------------------------------- commit ff8df1917efdd6f935fdea4a58ff8f97fda853cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 22:49:14 2018 +0100 syslinux: Update to 6.04-pre1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2271b4b336fbae420d0392ff86411c1655e79820 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:18:25 2018 +0100 installer: Install GRUB in removable mode as well This allows that a system will boot IPFire even when no boot entry is configured in the EFI BIOS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f2b483fdeb7799ce77dec12df76ed85a658e0f76 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:16:26 2018 +0100 installer: Always install EFI bootloader on x86_64 and aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a81e3b82a77e4d16f386974d5c9fa0d5e0cfd0af Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:15:08 2018 +0100 installer: Create a flag that marks if EFI support is available Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 39b86408a5474e3676df460cf767f5461248f33e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 23:21:58 2018 +0100 flash-image+cdrom: Execute ARMv5-specific code on ARMv5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee112f6526a262687eb0bd32dfb7d772b8894413 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 23:05:44 2018 +0100 Rootfile update for parted Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 959c57965919252bf9e1d2c9bb4bbadb54f5d804 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 18:32:42 2018 +0100 Build GRUB on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e1db2cfa721e012c5582a8f636e15503b3b649a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 17:13:40 2018 +0100 make.sh: Build popt earlier efivars depends on it and since it is a very common library without any dependencies, we can build it very early Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71dfdac27d38084a5e4b5faa3891fc3f86293c2e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:32:28 2018 +0100 grub: Don't explicitely set the font Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 581dbe7978e24adb2e566653a272eedb21a2e82c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:31:29 2018 +0100 installer: Add support to install on EFI systems Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9d14546bcc1f89453bd3bc44af438676ff5da081 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:17:54 2018 +0100 parted: Update to 3.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 257b15303ecc6f8c17db422bb25730659af043d2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 23:31:13 2018 +0100 flash-images: Make EFI partition 32MB Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 87228b02965cbc3636e19587ee1c39adb6924bd4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 23:18:08 2018 +0100 flash-images: Cleanup partitioning code No functional changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dbac22550ac7b7f7189647f195fa2212b07de898 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:22:02 2018 +0100 flash-images: Mark the /boot partition as bootable Before, the ESP was marked as bootable which isn't necessary Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5782d7bb250ac47f633eb780f3ba8cf4c922d73 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:18:32 2018 +0100 flash-image: Use grub-install to install GRUB in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 54291194b3ebfa2b77f6a86a58402b4a5c740464 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:17:34 2018 +0100 flash-image: Mark the EFI system partition as such Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 922b79b5c664708ec137a10e2344ec0bc5506f8b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:17:05 2018 +0100 flash-image: Remove any other GRUB configuration files in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6c0a1d20e1222bb35f5ebde575d37d5f57d09a2d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:15:58 2018 +0100 grub: Don't install an empty EFI configuration file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fbb82a6cd801dde0b2ab6baf64140e019e0ff747 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 15:33:48 2018 +0100 Add efibootmgr and efivar These packages are required to manage EFI boot options Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eea4e313d276e229b98e6f0b3caa41f1bc79b8cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:24:51 2018 +0100 cdrom: Select installation as default Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 82edf9a5909b5d1bb429a71fe1a955ebf0253ca0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:24:39 2018 +0100 installer: Detect if we are running in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3ac7d833873d7714347b9c5e21b4b663072deffe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:08:53 2018 +0100 cdrom: Keep the EFI image on the ISO9660 file system as well This allows systems to boot the EFI bootloader from the CDROM file system instead of using the FAT filesystem which is for USB keys. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 094eebb0be7bb86624eefe47d75b698dcb8030f2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 14:57:12 2018 +0100 cdrom: Add grub.cfg that allows to install IPFire Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7f35eb654098ae99bc2e495e7ae683b1def116e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 13:47:47 2018 +0100 Enable EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3d7a738cfc646c02aa214f52e7d3285336db70bf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 13:46:56 2018 +0100 cdrom: Install GRUB into EFI image This will start GRUB on EFI systems when booting from CD Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c0a43ff322f72298e3bd58a150af5dd0a76bed0b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 12:46:01 2018 +0100 Fix syntax error in lfs/cdrom Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 88fc5968d7469fe1713593cf05074285afb558c8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 11:01:08 2018 +0100 syslinux: FTBFS with newer ld Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5c6d1b646d0dfa407764b2e9244858140ce134cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 11:00:43 2018 +0100 make.sh: cdrkit required cmake to build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 03ae5418daf66e96f689171053312736aaeb55e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 30 15:43:30 2018 +0100 grub: Build new version in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 20eda0f5b50eea0a6a27e50db4bb70ea3542fa8a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 30 15:23:57 2018 +0100 Adjust variables that have been renamed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 01c898a93e3a403a22ea3077727e08f33e8acd81 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 29 20:14:59 2018 +0100 cdrom: Simplify commands that author the ISO image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ac1cfa568456c8bcba5b23c7781c96e4cf982c98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:57:18 2015 +0200 cdrom: Build EFI-enabled ISO image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d43a488aac17d4d61aed336f71d49ce46eaa3c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:56:45 2015 +0200 Config: Have a simple configuration variable that enables EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 79fb3b7e3e8491659b9605e366443cb783c3e83a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:52:09 2015 +0200 syslinux: Update to 6.03 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 947185b2897840739300632234100ab7f94086ea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 21:32:12 2015 +0200 Remove dvdrtools for cdrkit Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d1446c6258187cf8dbe74fed2efc06c12e6f4c68 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 20:25:34 2015 +0200 ipfire-netboot: Ship EFI image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 893d12593dde16b6c9520a569f2597af8fcc5c9a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 19 23:17:02 2015 +0200 Enable EFI on x86_64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fbe731ae3f655cd13cf719799517093b7850d967 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 22 21:18:18 2015 +0100 Enhance the flash image to support EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c0a7c9b2784629292db45763ae02b76023018c16
by git＠ipfire.org 18 Jun '18

18 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c0a7c9b2784629292db45763ae02b76023018c16 (commit) from 7ea54fee01f1fa8c206dfaab20e434a545189a9a (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 c0a7c9b2784629292db45763ae02b76023018c16 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 16:41:27 2018 +0200 OpenVPN: Set default of 730 days for client certificate validity Since OpenSSL 1.1.0x it is required to set a value for the 'valid til (days)' field. The WUI delivers now a guide value of two years. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 1c2a81002..b3122a49c 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4451,7 +4451,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $cgiparams{'CERT_CITY'} = $vpnsettings{'ROOTCERT_CITY'}; $cgiparams{'CERT_STATE'} = $vpnsettings{'ROOTCERT_STATE'}; $cgiparams{'CERT_COUNTRY'} = $vpnsettings{'ROOTCERT_COUNTRY'}; - $cgiparams{'DAYS_VALID'} = $vpnsettings{'DAYS_VALID'}; + $cgiparams{'DAYS_VALID'} = $vpnsettings{'DAYS_VALID'} = '730'; } VPNCONF_ERROR: hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ea54fee01f1fa8c206dfaab20e434a545189a9a
by git＠ipfire.org 18 Jun '18

18 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 7ea54fee01f1fa8c206dfaab20e434a545189a9a (commit) via 425465ede9a9206efb00aabd954373d780710366 (commit) from 35db8d06fa7d0c625395c4051c659cfcdd48fabf (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 7ea54fee01f1fa8c206dfaab20e434a545189a9a Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 16:01:34 2018 +0200 ipset: Update to 6.38 Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 425465ede9a9206efb00aabd954373d780710366 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Fri Jun 15 08:35:13 2018 +0200 OpenVPN: Valid til days is required with OpenVPN-2.4.x Check has been integrated that the OpenSSL maximum of '999999' valid days can not be exceeded. Check for needed entry in 'Valid til days' field has been integrated. Asterisk for 'Valid til days' field has been set to mark it as required field. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ipset | 5 +++-- html/cgi-bin/ovpnmain.cgi | 24 +++++++++++++++++++++--- lfs/ipset | 6 +++--- 3 files changed, 27 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset index 50ebed59b..24f5e95f5 100644 --- a/config/rootfiles/common/ipset +++ b/config/rootfiles/common/ipset @@ -1,5 +1,6 @@ etc/ipset #usr/include/libipset +#usr/include/libipset/args.h #usr/include/libipset/data.h #usr/include/libipset/errcode.h #usr/include/libipset/linux_ip_set.h @@ -19,8 +20,8 @@ etc/ipset #usr/include/libipset/utils.h #usr/lib/libipset.la #usr/lib/libipset.so -usr/lib/libipset.so.3 -usr/lib/libipset.so.3.6.0 +usr/lib/libipset.so.11 +usr/lib/libipset.so.11.1.0 #usr/lib/pkgconfig/libipset.pc usr/sbin/ipset #usr/share/man/man8/ipset.8 diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index bf8c8bf2f..1c2a81002 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3980,6 +3980,16 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } + # Check for N2N that OpenSSL maximum of valid days will not be exceeded + if ($cgiparams{'TYPE'} eq 'net') { + if ($cgiparams{'DAYS_VALID'} >= '999999') { + $errormessage = $Lang::tr{'invalid input for valid till days'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + } + if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { $errormessage = $Lang::tr{'invalid input'}; goto VPNCONF_ERROR; @@ -4157,11 +4167,19 @@ if ($cgiparams{'TYPE'} eq 'net') { $errormessage = $Lang::tr{'passwords do not match'}; goto VPNCONF_ERROR; } - if ($cgiparams{'DAYS_VALID'} ne '' && $cgiparams{'DAYS_VALID'} !~ /^[0-9]+$/) { + if ($cgiparams{'DAYS_VALID'} eq '' && $cgiparams{'DAYS_VALID'} !~ /^[0-9]+$/) { $errormessage = $Lang::tr{'invalid input for valid till days'}; goto VPNCONF_ERROR; } + # Check for RW that OpenSSL maximum of valid days will not be exceeded + if ($cgiparams{'TYPE'} eq 'host') { + if ($cgiparams{'DAYS_VALID'} >= '999999') { + $errormessage = $Lang::tr{'invalid input for valid till days'}; + goto VPNCONF_ERROR; + } + } + # Replace empty strings with a . (my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/\./; (my $city = $cgiparams{'CERT_CITY'}) =~ s/^\s*$/\./; @@ -4813,7 +4831,7 @@ END if ($cgiparams{'TYPE'} eq 'host') { print <<END; </select></td></tr> - <td> </td><td class='base'>$Lang::tr{'valid till'} (days):</td> + <td> </td><td class='base'>$Lang::tr{'valid till'} (days): <img src='/blob.gif' alt='*' /</td> <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td> <td class='base'>$Lang::tr{'pkcs12 file password'}:</td> @@ -4828,7 +4846,7 @@ END }else{ print <<END; </select></td></tr> - <td> </td><td class='base'>$Lang::tr{'valid till'} (days):</td> + <td> </td><td class='base'>$Lang::tr{'valid till'} (days): <img src='/blob.gif' alt='*' /</td> <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td><td> </td><td> </td></tr> <tr><td> </td><td> </td><td> </td></tr> diff --git a/lfs/ipset b/lfs/ipset index 7c43b308c..62d683d99 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 6.32 +VER = 6.38 THISAPP = ipset-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 857a5c6a6d645196865a82bf6fd7f567 +$(DL_FILE)_MD5 = 0e5d9c85f6b78e7dff0c996e2900574b install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 35db8d06fa7d0c625395c4051c659cfcdd48fabf
by git＠ipfire.org 18 Jun '18

18 Jun '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5f12becaa703f2a6cff4f181d63c34e31beb3a11
by git＠ipfire.org 18 Jun '18

18 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5f12becaa703f2a6cff4f181d63c34e31beb3a11 (commit) from 1f606aefce745eca789014668c2fb3691f29dbc8 (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 5f12becaa703f2a6cff4f181d63c34e31beb3a11 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 18 14:11:39 2018 +0100 ovpnmain.cgi: Add missing closing bracket Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index eac962e6c..bf8c8bf2f 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1973,7 +1973,7 @@ END </select></td> <tr><td class='base'>$Lang::tr{'ovpn dh'}:</td> <td class='base'><select name='DHLENGHT'> - <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'}</option> + <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'})</option> <option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option> <option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option> <option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1f606aefce745eca789014668c2fb3691f29dbc8
by git＠ipfire.org 17 Jun '18

17 Jun '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1f606aefce745eca789014668c2fb3691f29dbc8 (commit) via dec940e1570c6095d08a7481683cb26aa18b2df4 (commit) via c069312790123dcabba9c6826daa2f20c027ccc9 (commit) via ba05c8af807808bd7db091e564f530af1bb56e36 (commit) via 770b4587662cf27110e38c650a342ade8c5e41a0 (commit) via f610f1b1cd4f169791f5aa788f74a9a9c0ced8cd (commit) via 44b507c9e99efbc33d5abbc49c365dc53fe113a1 (commit) via 7a3772381f39dabfd69c05d40ccfa9ec178e3929 (commit) from 595d86de051a0b55323e448130f32706c6dc050d (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 1f606aefce745eca789014668c2fb3691f29dbc8 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 18:58:32 2018 +0200 validate certificates in ids.cgi Fixes #11770. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dec940e1570c6095d08a7481683cb26aa18b2df4 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 14:32:38 2018 +0200 tzdata: update to 2018e Some lines in the rootfile were sort incorrectly, this has been fixed. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c069312790123dcabba9c6826daa2f20c027ccc9 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 12:21:01 2018 +0200 coreutils: update to 8.29 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ba05c8af807808bd7db091e564f530af1bb56e36 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 11:23:52 2018 +0200 libgcrypt: update to 1.8.2 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 770b4587662cf27110e38c650a342ade8c5e41a0 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 10:59:40 2018 +0200 attr: fix rootfile There was a man page missing in the attr rootfile. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f610f1b1cd4f169791f5aa788f74a9a9c0ced8cd Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 10:31:41 2018 +0200 tor: update to 0.3.3.7 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 44b507c9e99efbc33d5abbc49c365dc53fe113a1 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 10:18:10 2018 +0200 postfix: update to 3.2.6 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7a3772381f39dabfd69c05d40ccfa9ec178e3929 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sun Jun 17 10:16:28 2018 +0200 unbound: update to 1.7.2 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/attr | 1 + config/rootfiles/common/coreutils | 21 +-- config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/common/tzdata | 277 ++++++++++++++++++++------------------ config/rootfiles/common/unbound | 2 +- html/cgi-bin/ids.cgi | 4 +- lfs/coreutils | 4 +- lfs/libgcrypt | 4 +- lfs/postfix | 6 +- lfs/tor | 6 +- lfs/tzdata | 6 +- lfs/unbound | 4 +- 12 files changed, 173 insertions(+), 164 deletions(-) Difference in files: diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index 68b758071..e8c2055fb 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -36,6 +36,7 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man2/llistxattr.2 #usr/share/man/man2/lremovexattr.2 #usr/share/man/man2/removexattr.2 +#usr/share/man/man2/lsetxattr.2 #usr/share/man/man3/attr_get.3 #usr/share/man/man3/attr_getf.3 #usr/share/man/man3/attr_list.3 diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils index 32fc103bf..5bd787cbf 100644 --- a/config/rootfiles/common/coreutils +++ b/config/rootfiles/common/coreutils @@ -22,6 +22,8 @@ bin/uname etc/DIR_COLORS usr/bin/[ usr/bin/arch +usr/bin/b2sum +usr/bin/base32 usr/bin/base64 usr/bin/basename usr/bin/chcon @@ -128,8 +130,6 @@ usr/sbin/chroot #usr/share/locale/el/LC_MESSAGES/coreutils.mo #usr/share/locale/el/LC_TIME #usr/share/locale/el/LC_TIME/coreutils.mo -#usr/share/locale/eo -#usr/share/locale/eo/LC_MESSAGES #usr/share/locale/eo/LC_MESSAGES/coreutils.mo #usr/share/locale/eo/LC_TIME #usr/share/locale/eo/LC_TIME/coreutils.mo @@ -152,8 +152,6 @@ usr/sbin/chroot #usr/share/locale/fr/LC_MESSAGES/coreutils.mo #usr/share/locale/fr/LC_TIME #usr/share/locale/fr/LC_TIME/coreutils.mo -#usr/share/locale/ga -#usr/share/locale/ga/LC_MESSAGES #usr/share/locale/ga/LC_MESSAGES/coreutils.mo #usr/share/locale/ga/LC_TIME #usr/share/locale/ga/LC_TIME/coreutils.mo @@ -166,8 +164,6 @@ usr/sbin/chroot #usr/share/locale/hu/LC_MESSAGES/coreutils.mo #usr/share/locale/hu/LC_TIME #usr/share/locale/hu/LC_TIME/coreutils.mo -#usr/share/locale/ia -#usr/share/locale/ia/LC_MESSAGES #usr/share/locale/ia/LC_MESSAGES/coreutils.mo #usr/share/locale/ia/LC_TIME #usr/share/locale/ia/LC_TIME/coreutils.mo @@ -196,8 +192,6 @@ usr/sbin/chroot #usr/share/locale/lt/LC_MESSAGES/coreutils.mo #usr/share/locale/lt/LC_TIME #usr/share/locale/lt/LC_TIME/coreutils.mo -#usr/share/locale/ms -#usr/share/locale/ms/LC_MESSAGES #usr/share/locale/ms/LC_MESSAGES/coreutils.mo #usr/share/locale/ms/LC_TIME #usr/share/locale/ms/LC_TIME/coreutils.mo @@ -218,8 +212,6 @@ usr/sbin/chroot #usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo #usr/share/locale/pt_BR/LC_TIME #usr/share/locale/pt_BR/LC_TIME/coreutils.mo -#usr/share/locale/ro -#usr/share/locale/ro/LC_MESSAGES #usr/share/locale/ro/LC_MESSAGES/coreutils.mo #usr/share/locale/ro/LC_TIME #usr/share/locale/ro/LC_TIME/coreutils.mo @@ -229,19 +221,18 @@ usr/sbin/chroot #usr/share/locale/sk/LC_MESSAGES/coreutils.mo #usr/share/locale/sk/LC_TIME #usr/share/locale/sk/LC_TIME/coreutils.mo -#usr/share/locale/sl -#usr/share/locale/sl/LC_MESSAGES #usr/share/locale/sl/LC_MESSAGES/coreutils.mo #usr/share/locale/sl/LC_TIME #usr/share/locale/sl/LC_TIME/coreutils.mo +#usr/share/locale/sr/LC_MESSAGES/coreutils.mo +#usr/share/locale/sr/LC_TIME +#usr/share/locale/sr/LC_TIME/coreutils.mo #usr/share/locale/sv/LC_MESSAGES/coreutils.mo #usr/share/locale/sv/LC_TIME #usr/share/locale/sv/LC_TIME/coreutils.mo #usr/share/locale/tr/LC_MESSAGES/coreutils.mo #usr/share/locale/tr/LC_TIME #usr/share/locale/tr/LC_TIME/coreutils.mo -#usr/share/locale/uk -#usr/share/locale/uk/LC_MESSAGES #usr/share/locale/uk/LC_MESSAGES/coreutils.mo #usr/share/locale/uk/LC_TIME #usr/share/locale/uk/LC_TIME/coreutils.mo @@ -255,6 +246,8 @@ usr/sbin/chroot #usr/share/locale/zh_TW/LC_TIME #usr/share/locale/zh_TW/LC_TIME/coreutils.mo #usr/share/man/man1/arch.1 +#usr/share/man/man1/b2sum.1 +#usr/share/man/man1/base32.1 #usr/share/man/man1/base64.1 #usr/share/man/man1/basename.1 #usr/share/man/man1/cat.1 diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 5ecf1b70f..e67fae932 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.2.0 +usr/lib/libgcrypt.so.20.2.2 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/man/man1/hmac256.1 diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index c44ad4abf..fb118efea 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -114,9 +114,9 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Eirunepe #usr/share/zoneinfo/America/El_Salvador #usr/share/zoneinfo/America/Ensenada +#usr/share/zoneinfo/America/Fortaleza #usr/share/zoneinfo/America/Fort_Nelson #usr/share/zoneinfo/America/Fort_Wayne -#usr/share/zoneinfo/America/Fortaleza #usr/share/zoneinfo/America/Glace_Bay #usr/share/zoneinfo/America/Godthab #usr/share/zoneinfo/America/Goose_Bay @@ -134,11 +134,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Indiana/Knox #usr/share/zoneinfo/America/Indiana/Marengo #usr/share/zoneinfo/America/Indiana/Petersburg +#usr/share/zoneinfo/America/Indianapolis #usr/share/zoneinfo/America/Indiana/Tell_City #usr/share/zoneinfo/America/Indiana/Vevay #usr/share/zoneinfo/America/Indiana/Vincennes #usr/share/zoneinfo/America/Indiana/Winamac -#usr/share/zoneinfo/America/Indianapolis #usr/share/zoneinfo/America/Inuvik #usr/share/zoneinfo/America/Iqaluit #usr/share/zoneinfo/America/Jamaica @@ -187,10 +187,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Paramaribo #usr/share/zoneinfo/America/Phoenix #usr/share/zoneinfo/America/Port-au-Prince -#usr/share/zoneinfo/America/Port_of_Spain #usr/share/zoneinfo/America/Porto_Acre +#usr/share/zoneinfo/America/Port_of_Spain #usr/share/zoneinfo/America/Porto_Velho #usr/share/zoneinfo/America/Puerto_Rico +#usr/share/zoneinfo/America/Punta_Arenas #usr/share/zoneinfo/America/Rainy_River #usr/share/zoneinfo/America/Rankin_Inlet #usr/share/zoneinfo/America/Recife @@ -249,6 +250,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Aqtobe #usr/share/zoneinfo/Asia/Ashgabat #usr/share/zoneinfo/Asia/Ashkhabad +#usr/share/zoneinfo/Asia/Atyrau #usr/share/zoneinfo/Asia/Baghdad #usr/share/zoneinfo/Asia/Bahrain #usr/share/zoneinfo/Asia/Baku @@ -269,6 +271,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Dili #usr/share/zoneinfo/Asia/Dubai #usr/share/zoneinfo/Asia/Dushanbe +#usr/share/zoneinfo/Asia/Famagusta #usr/share/zoneinfo/Asia/Gaza #usr/share/zoneinfo/Asia/Harbin #usr/share/zoneinfo/Asia/Hebron @@ -334,6 +337,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Vientiane #usr/share/zoneinfo/Asia/Vladivostok #usr/share/zoneinfo/Asia/Yakutsk +#usr/share/zoneinfo/Asia/Yangon #usr/share/zoneinfo/Asia/Yekaterinburg #usr/share/zoneinfo/Asia/Yerevan #usr/share/zoneinfo/Atlantic @@ -347,8 +351,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/Atlantic/Madeira #usr/share/zoneinfo/Atlantic/Reykjavik #usr/share/zoneinfo/Atlantic/South_Georgia -#usr/share/zoneinfo/Atlantic/St_Helena #usr/share/zoneinfo/Atlantic/Stanley +#usr/share/zoneinfo/Atlantic/St_Helena #usr/share/zoneinfo/Australia #usr/share/zoneinfo/Australia/ACT #usr/share/zoneinfo/Australia/Adelaide @@ -363,8 +367,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/Australia/Lindeman #usr/share/zoneinfo/Australia/Lord_Howe #usr/share/zoneinfo/Australia/Melbourne -#usr/share/zoneinfo/Australia/NSW #usr/share/zoneinfo/Australia/North +#usr/share/zoneinfo/Australia/NSW #usr/share/zoneinfo/Australia/Perth #usr/share/zoneinfo/Australia/Queensland #usr/share/zoneinfo/Australia/South @@ -378,62 +382,62 @@ usr/share/zoneinfo #usr/share/zoneinfo/Brazil/DeNoronha #usr/share/zoneinfo/Brazil/East #usr/share/zoneinfo/Brazil/West -#usr/share/zoneinfo/CET -#usr/share/zoneinfo/CST6CDT #usr/share/zoneinfo/Canada #usr/share/zoneinfo/Canada/Atlantic #usr/share/zoneinfo/Canada/Central -#usr/share/zoneinfo/Canada/East-Saskatchewan #usr/share/zoneinfo/Canada/Eastern +#usr/share/zoneinfo/Canada/East-Saskatchewan #usr/share/zoneinfo/Canada/Mountain #usr/share/zoneinfo/Canada/Newfoundland #usr/share/zoneinfo/Canada/Pacific #usr/share/zoneinfo/Canada/Saskatchewan #usr/share/zoneinfo/Canada/Yukon +#usr/share/zoneinfo/CET #usr/share/zoneinfo/Chile #usr/share/zoneinfo/Chile/Continental #usr/share/zoneinfo/Chile/EasterIsland +#usr/share/zoneinfo/CST6CDT #usr/share/zoneinfo/Cuba #usr/share/zoneinfo/EET -#usr/share/zoneinfo/EST -#usr/share/zoneinfo/EST5EDT #usr/share/zoneinfo/Egypt #usr/share/zoneinfo/Eire +#usr/share/zoneinfo/EST +#usr/share/zoneinfo/EST5EDT #usr/share/zoneinfo/Etc #usr/share/zoneinfo/Etc/GMT -#usr/share/zoneinfo/Etc/GMT+0 -#usr/share/zoneinfo/Etc/GMT+1 -#usr/share/zoneinfo/Etc/GMT+10 -#usr/share/zoneinfo/Etc/GMT+11 -#usr/share/zoneinfo/Etc/GMT+12 -#usr/share/zoneinfo/Etc/GMT+2 -#usr/share/zoneinfo/Etc/GMT+3 -#usr/share/zoneinfo/Etc/GMT+4 -#usr/share/zoneinfo/Etc/GMT+5 -#usr/share/zoneinfo/Etc/GMT+6 -#usr/share/zoneinfo/Etc/GMT+7 -#usr/share/zoneinfo/Etc/GMT+8 -#usr/share/zoneinfo/Etc/GMT+9 +#usr/share/zoneinfo/Etc/GMT0 #usr/share/zoneinfo/Etc/GMT-0 +#usr/share/zoneinfo/Etc/GMT+0 #usr/share/zoneinfo/Etc/GMT-1 +#usr/share/zoneinfo/Etc/GMT+1 #usr/share/zoneinfo/Etc/GMT-10 +#usr/share/zoneinfo/Etc/GMT+10 #usr/share/zoneinfo/Etc/GMT-11 +#usr/share/zoneinfo/Etc/GMT+11 #usr/share/zoneinfo/Etc/GMT-12 +#usr/share/zoneinfo/Etc/GMT+12 #usr/share/zoneinfo/Etc/GMT-13 #usr/share/zoneinfo/Etc/GMT-14 #usr/share/zoneinfo/Etc/GMT-2 +#usr/share/zoneinfo/Etc/GMT+2 #usr/share/zoneinfo/Etc/GMT-3 +#usr/share/zoneinfo/Etc/GMT+3 #usr/share/zoneinfo/Etc/GMT-4 +#usr/share/zoneinfo/Etc/GMT+4 #usr/share/zoneinfo/Etc/GMT-5 +#usr/share/zoneinfo/Etc/GMT+5 #usr/share/zoneinfo/Etc/GMT-6 +#usr/share/zoneinfo/Etc/GMT+6 #usr/share/zoneinfo/Etc/GMT-7 +#usr/share/zoneinfo/Etc/GMT+7 #usr/share/zoneinfo/Etc/GMT-8 +#usr/share/zoneinfo/Etc/GMT+8 #usr/share/zoneinfo/Etc/GMT-9 -#usr/share/zoneinfo/Etc/GMT0 +#usr/share/zoneinfo/Etc/GMT+9 #usr/share/zoneinfo/Etc/Greenwich #usr/share/zoneinfo/Etc/UCT -#usr/share/zoneinfo/Etc/UTC #usr/share/zoneinfo/Etc/Universal +#usr/share/zoneinfo/Etc/UTC #usr/share/zoneinfo/Etc/Zulu #usr/share/zoneinfo/Europe #usr/share/zoneinfo/Europe/Amsterdam @@ -480,6 +484,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Europe/Samara #usr/share/zoneinfo/Europe/San_Marino #usr/share/zoneinfo/Europe/Sarajevo +#usr/share/zoneinfo/Europe/Saratov #usr/share/zoneinfo/Europe/Simferopol #usr/share/zoneinfo/Europe/Skopje #usr/share/zoneinfo/Europe/Sofia @@ -501,12 +506,12 @@ usr/share/zoneinfo #usr/share/zoneinfo/GB #usr/share/zoneinfo/GB-Eire #usr/share/zoneinfo/GMT -#usr/share/zoneinfo/GMT+0 -#usr/share/zoneinfo/GMT-0 #usr/share/zoneinfo/GMT0 +#usr/share/zoneinfo/GMT-0 +#usr/share/zoneinfo/GMT+0 #usr/share/zoneinfo/Greenwich -#usr/share/zoneinfo/HST #usr/share/zoneinfo/Hongkong +#usr/share/zoneinfo/HST #usr/share/zoneinfo/Iceland #usr/share/zoneinfo/Indian #usr/share/zoneinfo/Indian/Antananarivo @@ -521,23 +526,22 @@ usr/share/zoneinfo #usr/share/zoneinfo/Indian/Mayotte #usr/share/zoneinfo/Indian/Reunion #usr/share/zoneinfo/Iran +#usr/share/zoneinfo/iso3166.tab #usr/share/zoneinfo/Israel #usr/share/zoneinfo/Jamaica #usr/share/zoneinfo/Japan #usr/share/zoneinfo/Kwajalein #usr/share/zoneinfo/Libya #usr/share/zoneinfo/MET -#usr/share/zoneinfo/MST -#usr/share/zoneinfo/MST7MDT #usr/share/zoneinfo/Mexico #usr/share/zoneinfo/Mexico/BajaNorte #usr/share/zoneinfo/Mexico/BajaSur #usr/share/zoneinfo/Mexico/General +#usr/share/zoneinfo/MST +#usr/share/zoneinfo/MST7MDT +#usr/share/zoneinfo/Navajo #usr/share/zoneinfo/NZ #usr/share/zoneinfo/NZ-CHAT -#usr/share/zoneinfo/Navajo -#usr/share/zoneinfo/PRC -#usr/share/zoneinfo/PST8PDT #usr/share/zoneinfo/Pacific #usr/share/zoneinfo/Pacific/Apia #usr/share/zoneinfo/Pacific/Auckland @@ -584,31 +588,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/Pacific/Yap #usr/share/zoneinfo/Poland #usr/share/zoneinfo/Portugal -#usr/share/zoneinfo/ROC -#usr/share/zoneinfo/ROK -#usr/share/zoneinfo/Singapore -#usr/share/zoneinfo/Turkey -#usr/share/zoneinfo/UCT -#usr/share/zoneinfo/US -#usr/share/zoneinfo/US/Alaska -#usr/share/zoneinfo/US/Aleutian -#usr/share/zoneinfo/US/Arizona -#usr/share/zoneinfo/US/Central -#usr/share/zoneinfo/US/East-Indiana -#usr/share/zoneinfo/US/Eastern -#usr/share/zoneinfo/US/Hawaii -#usr/share/zoneinfo/US/Indiana-Starke -#usr/share/zoneinfo/US/Michigan -#usr/share/zoneinfo/US/Mountain -#usr/share/zoneinfo/US/Pacific -#usr/share/zoneinfo/US/Pacific-New -#usr/share/zoneinfo/US/Samoa -#usr/share/zoneinfo/UTC -#usr/share/zoneinfo/Universal -#usr/share/zoneinfo/W-SU -#usr/share/zoneinfo/WET -#usr/share/zoneinfo/Zulu -#usr/share/zoneinfo/iso3166.tab #usr/share/zoneinfo/posix #usr/share/zoneinfo/posix/Africa #usr/share/zoneinfo/posix/Africa/Abidjan @@ -724,9 +703,9 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Eirunepe #usr/share/zoneinfo/posix/America/El_Salvador #usr/share/zoneinfo/posix/America/Ensenada +#usr/share/zoneinfo/posix/America/Fortaleza #usr/share/zoneinfo/posix/America/Fort_Nelson #usr/share/zoneinfo/posix/America/Fort_Wayne -#usr/share/zoneinfo/posix/America/Fortaleza #usr/share/zoneinfo/posix/America/Glace_Bay #usr/share/zoneinfo/posix/America/Godthab #usr/share/zoneinfo/posix/America/Goose_Bay @@ -744,11 +723,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Indiana/Knox #usr/share/zoneinfo/posix/America/Indiana/Marengo #usr/share/zoneinfo/posix/America/Indiana/Petersburg +#usr/share/zoneinfo/posix/America/Indianapolis #usr/share/zoneinfo/posix/America/Indiana/Tell_City #usr/share/zoneinfo/posix/America/Indiana/Vevay #usr/share/zoneinfo/posix/America/Indiana/Vincennes #usr/share/zoneinfo/posix/America/Indiana/Winamac -#usr/share/zoneinfo/posix/America/Indianapolis #usr/share/zoneinfo/posix/America/Inuvik #usr/share/zoneinfo/posix/America/Iqaluit #usr/share/zoneinfo/posix/America/Jamaica @@ -797,10 +776,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Paramaribo #usr/share/zoneinfo/posix/America/Phoenix #usr/share/zoneinfo/posix/America/Port-au-Prince -#usr/share/zoneinfo/posix/America/Port_of_Spain #usr/share/zoneinfo/posix/America/Porto_Acre +#usr/share/zoneinfo/posix/America/Port_of_Spain #usr/share/zoneinfo/posix/America/Porto_Velho #usr/share/zoneinfo/posix/America/Puerto_Rico +#usr/share/zoneinfo/posix/America/Punta_Arenas #usr/share/zoneinfo/posix/America/Rainy_River #usr/share/zoneinfo/posix/America/Rankin_Inlet #usr/share/zoneinfo/posix/America/Recife @@ -859,6 +839,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Aqtobe #usr/share/zoneinfo/posix/Asia/Ashgabat #usr/share/zoneinfo/posix/Asia/Ashkhabad +#usr/share/zoneinfo/posix/Asia/Atyrau #usr/share/zoneinfo/posix/Asia/Baghdad #usr/share/zoneinfo/posix/Asia/Bahrain #usr/share/zoneinfo/posix/Asia/Baku @@ -879,6 +860,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Dili #usr/share/zoneinfo/posix/Asia/Dubai #usr/share/zoneinfo/posix/Asia/Dushanbe +#usr/share/zoneinfo/posix/Asia/Famagusta #usr/share/zoneinfo/posix/Asia/Gaza #usr/share/zoneinfo/posix/Asia/Harbin #usr/share/zoneinfo/posix/Asia/Hebron @@ -944,6 +926,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Vientiane #usr/share/zoneinfo/posix/Asia/Vladivostok #usr/share/zoneinfo/posix/Asia/Yakutsk +#usr/share/zoneinfo/posix/Asia/Yangon #usr/share/zoneinfo/posix/Asia/Yekaterinburg #usr/share/zoneinfo/posix/Asia/Yerevan #usr/share/zoneinfo/posix/Atlantic @@ -957,8 +940,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Atlantic/Madeira #usr/share/zoneinfo/posix/Atlantic/Reykjavik #usr/share/zoneinfo/posix/Atlantic/South_Georgia -#usr/share/zoneinfo/posix/Atlantic/St_Helena #usr/share/zoneinfo/posix/Atlantic/Stanley +#usr/share/zoneinfo/posix/Atlantic/St_Helena #usr/share/zoneinfo/posix/Australia #usr/share/zoneinfo/posix/Australia/ACT #usr/share/zoneinfo/posix/Australia/Adelaide @@ -973,8 +956,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Australia/Lindeman #usr/share/zoneinfo/posix/Australia/Lord_Howe #usr/share/zoneinfo/posix/Australia/Melbourne -#usr/share/zoneinfo/posix/Australia/NSW #usr/share/zoneinfo/posix/Australia/North +#usr/share/zoneinfo/posix/Australia/NSW #usr/share/zoneinfo/posix/Australia/Perth #usr/share/zoneinfo/posix/Australia/Queensland #usr/share/zoneinfo/posix/Australia/South @@ -988,62 +971,62 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Brazil/DeNoronha #usr/share/zoneinfo/posix/Brazil/East #usr/share/zoneinfo/posix/Brazil/West -#usr/share/zoneinfo/posix/CET -#usr/share/zoneinfo/posix/CST6CDT #usr/share/zoneinfo/posix/Canada #usr/share/zoneinfo/posix/Canada/Atlantic #usr/share/zoneinfo/posix/Canada/Central -#usr/share/zoneinfo/posix/Canada/East-Saskatchewan #usr/share/zoneinfo/posix/Canada/Eastern +#usr/share/zoneinfo/posix/Canada/East-Saskatchewan #usr/share/zoneinfo/posix/Canada/Mountain #usr/share/zoneinfo/posix/Canada/Newfoundland #usr/share/zoneinfo/posix/Canada/Pacific #usr/share/zoneinfo/posix/Canada/Saskatchewan #usr/share/zoneinfo/posix/Canada/Yukon +#usr/share/zoneinfo/posix/CET #usr/share/zoneinfo/posix/Chile #usr/share/zoneinfo/posix/Chile/Continental #usr/share/zoneinfo/posix/Chile/EasterIsland +#usr/share/zoneinfo/posix/CST6CDT #usr/share/zoneinfo/posix/Cuba #usr/share/zoneinfo/posix/EET -#usr/share/zoneinfo/posix/EST -#usr/share/zoneinfo/posix/EST5EDT #usr/share/zoneinfo/posix/Egypt #usr/share/zoneinfo/posix/Eire +#usr/share/zoneinfo/posix/EST +#usr/share/zoneinfo/posix/EST5EDT #usr/share/zoneinfo/posix/Etc #usr/share/zoneinfo/posix/Etc/GMT -#usr/share/zoneinfo/posix/Etc/GMT+0 -#usr/share/zoneinfo/posix/Etc/GMT+1 -#usr/share/zoneinfo/posix/Etc/GMT+10 -#usr/share/zoneinfo/posix/Etc/GMT+11 -#usr/share/zoneinfo/posix/Etc/GMT+12 -#usr/share/zoneinfo/posix/Etc/GMT+2 -#usr/share/zoneinfo/posix/Etc/GMT+3 -#usr/share/zoneinfo/posix/Etc/GMT+4 -#usr/share/zoneinfo/posix/Etc/GMT+5 -#usr/share/zoneinfo/posix/Etc/GMT+6 -#usr/share/zoneinfo/posix/Etc/GMT+7 -#usr/share/zoneinfo/posix/Etc/GMT+8 -#usr/share/zoneinfo/posix/Etc/GMT+9 +#usr/share/zoneinfo/posix/Etc/GMT0 #usr/share/zoneinfo/posix/Etc/GMT-0 +#usr/share/zoneinfo/posix/Etc/GMT+0 #usr/share/zoneinfo/posix/Etc/GMT-1 +#usr/share/zoneinfo/posix/Etc/GMT+1 #usr/share/zoneinfo/posix/Etc/GMT-10 +#usr/share/zoneinfo/posix/Etc/GMT+10 #usr/share/zoneinfo/posix/Etc/GMT-11 +#usr/share/zoneinfo/posix/Etc/GMT+11 #usr/share/zoneinfo/posix/Etc/GMT-12 +#usr/share/zoneinfo/posix/Etc/GMT+12 #usr/share/zoneinfo/posix/Etc/GMT-13 #usr/share/zoneinfo/posix/Etc/GMT-14 #usr/share/zoneinfo/posix/Etc/GMT-2 +#usr/share/zoneinfo/posix/Etc/GMT+2 #usr/share/zoneinfo/posix/Etc/GMT-3 +#usr/share/zoneinfo/posix/Etc/GMT+3 #usr/share/zoneinfo/posix/Etc/GMT-4 +#usr/share/zoneinfo/posix/Etc/GMT+4 #usr/share/zoneinfo/posix/Etc/GMT-5 +#usr/share/zoneinfo/posix/Etc/GMT+5 #usr/share/zoneinfo/posix/Etc/GMT-6 +#usr/share/zoneinfo/posix/Etc/GMT+6 #usr/share/zoneinfo/posix/Etc/GMT-7 +#usr/share/zoneinfo/posix/Etc/GMT+7 #usr/share/zoneinfo/posix/Etc/GMT-8 +#usr/share/zoneinfo/posix/Etc/GMT+8 #usr/share/zoneinfo/posix/Etc/GMT-9 -#usr/share/zoneinfo/posix/Etc/GMT0 +#usr/share/zoneinfo/posix/Etc/GMT+9 #usr/share/zoneinfo/posix/Etc/Greenwich #usr/share/zoneinfo/posix/Etc/UCT -#usr/share/zoneinfo/posix/Etc/UTC #usr/share/zoneinfo/posix/Etc/Universal +#usr/share/zoneinfo/posix/Etc/UTC #usr/share/zoneinfo/posix/Etc/Zulu #usr/share/zoneinfo/posix/Europe #usr/share/zoneinfo/posix/Europe/Amsterdam @@ -1090,6 +1073,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Samara #usr/share/zoneinfo/posix/Europe/San_Marino #usr/share/zoneinfo/posix/Europe/Sarajevo +#usr/share/zoneinfo/posix/Europe/Saratov #usr/share/zoneinfo/posix/Europe/Simferopol #usr/share/zoneinfo/posix/Europe/Skopje #usr/share/zoneinfo/posix/Europe/Sofia @@ -1111,12 +1095,12 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/GB #usr/share/zoneinfo/posix/GB-Eire #usr/share/zoneinfo/posix/GMT -#usr/share/zoneinfo/posix/GMT+0 -#usr/share/zoneinfo/posix/GMT-0 #usr/share/zoneinfo/posix/GMT0 +#usr/share/zoneinfo/posix/GMT-0 +#usr/share/zoneinfo/posix/GMT+0 #usr/share/zoneinfo/posix/Greenwich -#usr/share/zoneinfo/posix/HST #usr/share/zoneinfo/posix/Hongkong +#usr/share/zoneinfo/posix/HST #usr/share/zoneinfo/posix/Iceland #usr/share/zoneinfo/posix/Indian #usr/share/zoneinfo/posix/Indian/Antananarivo @@ -1137,17 +1121,15 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Kwajalein #usr/share/zoneinfo/posix/Libya #usr/share/zoneinfo/posix/MET -#usr/share/zoneinfo/posix/MST -#usr/share/zoneinfo/posix/MST7MDT #usr/share/zoneinfo/posix/Mexico #usr/share/zoneinfo/posix/Mexico/BajaNorte #usr/share/zoneinfo/posix/Mexico/BajaSur #usr/share/zoneinfo/posix/Mexico/General +#usr/share/zoneinfo/posix/MST +#usr/share/zoneinfo/posix/MST7MDT +#usr/share/zoneinfo/posix/Navajo #usr/share/zoneinfo/posix/NZ #usr/share/zoneinfo/posix/NZ-CHAT -#usr/share/zoneinfo/posix/Navajo -#usr/share/zoneinfo/posix/PRC -#usr/share/zoneinfo/posix/PST8PDT #usr/share/zoneinfo/posix/Pacific #usr/share/zoneinfo/posix/Pacific/Apia #usr/share/zoneinfo/posix/Pacific/Auckland @@ -1194,18 +1176,22 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Pacific/Yap #usr/share/zoneinfo/posix/Poland #usr/share/zoneinfo/posix/Portugal +#usr/share/zoneinfo/posix/PRC +#usr/share/zoneinfo/posix/PST8PDT #usr/share/zoneinfo/posix/ROC #usr/share/zoneinfo/posix/ROK +#usr/share/zoneinfo/posixrules #usr/share/zoneinfo/posix/Singapore #usr/share/zoneinfo/posix/Turkey #usr/share/zoneinfo/posix/UCT +#usr/share/zoneinfo/posix/Universal #usr/share/zoneinfo/posix/US #usr/share/zoneinfo/posix/US/Alaska #usr/share/zoneinfo/posix/US/Aleutian #usr/share/zoneinfo/posix/US/Arizona #usr/share/zoneinfo/posix/US/Central -#usr/share/zoneinfo/posix/US/East-Indiana #usr/share/zoneinfo/posix/US/Eastern +#usr/share/zoneinfo/posix/US/East-Indiana #usr/share/zoneinfo/posix/US/Hawaii #usr/share/zoneinfo/posix/US/Indiana-Starke #usr/share/zoneinfo/posix/US/Michigan @@ -1214,11 +1200,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/US/Pacific-New #usr/share/zoneinfo/posix/US/Samoa #usr/share/zoneinfo/posix/UTC -#usr/share/zoneinfo/posix/Universal -#usr/share/zoneinfo/posix/W-SU #usr/share/zoneinfo/posix/WET +#usr/share/zoneinfo/posix/W-SU #usr/share/zoneinfo/posix/Zulu -#usr/share/zoneinfo/posixrules +#usr/share/zoneinfo/PRC +#usr/share/zoneinfo/PST8PDT #usr/share/zoneinfo/right #usr/share/zoneinfo/right/Africa #usr/share/zoneinfo/right/Africa/Abidjan @@ -1334,9 +1320,9 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Eirunepe #usr/share/zoneinfo/right/America/El_Salvador #usr/share/zoneinfo/right/America/Ensenada +#usr/share/zoneinfo/right/America/Fortaleza #usr/share/zoneinfo/right/America/Fort_Nelson #usr/share/zoneinfo/right/America/Fort_Wayne -#usr/share/zoneinfo/right/America/Fortaleza #usr/share/zoneinfo/right/America/Glace_Bay #usr/share/zoneinfo/right/America/Godthab #usr/share/zoneinfo/right/America/Goose_Bay @@ -1354,11 +1340,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Indiana/Knox #usr/share/zoneinfo/right/America/Indiana/Marengo #usr/share/zoneinfo/right/America/Indiana/Petersburg +#usr/share/zoneinfo/right/America/Indianapolis #usr/share/zoneinfo/right/America/Indiana/Tell_City #usr/share/zoneinfo/right/America/Indiana/Vevay #usr/share/zoneinfo/right/America/Indiana/Vincennes #usr/share/zoneinfo/right/America/Indiana/Winamac -#usr/share/zoneinfo/right/America/Indianapolis #usr/share/zoneinfo/right/America/Inuvik #usr/share/zoneinfo/right/America/Iqaluit #usr/share/zoneinfo/right/America/Jamaica @@ -1407,10 +1393,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Paramaribo #usr/share/zoneinfo/right/America/Phoenix #usr/share/zoneinfo/right/America/Port-au-Prince -#usr/share/zoneinfo/right/America/Port_of_Spain #usr/share/zoneinfo/right/America/Porto_Acre +#usr/share/zoneinfo/right/America/Port_of_Spain #usr/share/zoneinfo/right/America/Porto_Velho #usr/share/zoneinfo/right/America/Puerto_Rico +#usr/share/zoneinfo/right/America/Punta_Arenas #usr/share/zoneinfo/right/America/Rainy_River #usr/share/zoneinfo/right/America/Rankin_Inlet #usr/share/zoneinfo/right/America/Recife @@ -1469,6 +1456,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Aqtobe #usr/share/zoneinfo/right/Asia/Ashgabat #usr/share/zoneinfo/right/Asia/Ashkhabad +#usr/share/zoneinfo/right/Asia/Atyrau #usr/share/zoneinfo/right/Asia/Baghdad #usr/share/zoneinfo/right/Asia/Bahrain #usr/share/zoneinfo/right/Asia/Baku @@ -1489,6 +1477,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Dili #usr/share/zoneinfo/right/Asia/Dubai #usr/share/zoneinfo/right/Asia/Dushanbe +#usr/share/zoneinfo/right/Asia/Famagusta #usr/share/zoneinfo/right/Asia/Gaza #usr/share/zoneinfo/right/Asia/Harbin #usr/share/zoneinfo/right/Asia/Hebron @@ -1554,6 +1543,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Vientiane #usr/share/zoneinfo/right/Asia/Vladivostok #usr/share/zoneinfo/right/Asia/Yakutsk +#usr/share/zoneinfo/right/Asia/Yangon #usr/share/zoneinfo/right/Asia/Yekaterinburg #usr/share/zoneinfo/right/Asia/Yerevan #usr/share/zoneinfo/right/Atlantic @@ -1567,8 +1557,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Atlantic/Madeira #usr/share/zoneinfo/right/Atlantic/Reykjavik #usr/share/zoneinfo/right/Atlantic/South_Georgia -#usr/share/zoneinfo/right/Atlantic/St_Helena #usr/share/zoneinfo/right/Atlantic/Stanley +#usr/share/zoneinfo/right/Atlantic/St_Helena #usr/share/zoneinfo/right/Australia #usr/share/zoneinfo/right/Australia/ACT #usr/share/zoneinfo/right/Australia/Adelaide @@ -1583,8 +1573,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Australia/Lindeman #usr/share/zoneinfo/right/Australia/Lord_Howe #usr/share/zoneinfo/right/Australia/Melbourne -#usr/share/zoneinfo/right/Australia/NSW #usr/share/zoneinfo/right/Australia/North +#usr/share/zoneinfo/right/Australia/NSW #usr/share/zoneinfo/right/Australia/Perth #usr/share/zoneinfo/right/Australia/Queensland #usr/share/zoneinfo/right/Australia/South @@ -1598,62 +1588,62 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Brazil/DeNoronha #usr/share/zoneinfo/right/Brazil/East #usr/share/zoneinfo/right/Brazil/West -#usr/share/zoneinfo/right/CET -#usr/share/zoneinfo/right/CST6CDT #usr/share/zoneinfo/right/Canada #usr/share/zoneinfo/right/Canada/Atlantic #usr/share/zoneinfo/right/Canada/Central -#usr/share/zoneinfo/right/Canada/East-Saskatchewan #usr/share/zoneinfo/right/Canada/Eastern +#usr/share/zoneinfo/right/Canada/East-Saskatchewan #usr/share/zoneinfo/right/Canada/Mountain #usr/share/zoneinfo/right/Canada/Newfoundland #usr/share/zoneinfo/right/Canada/Pacific #usr/share/zoneinfo/right/Canada/Saskatchewan #usr/share/zoneinfo/right/Canada/Yukon +#usr/share/zoneinfo/right/CET #usr/share/zoneinfo/right/Chile #usr/share/zoneinfo/right/Chile/Continental #usr/share/zoneinfo/right/Chile/EasterIsland +#usr/share/zoneinfo/right/CST6CDT #usr/share/zoneinfo/right/Cuba #usr/share/zoneinfo/right/EET -#usr/share/zoneinfo/right/EST -#usr/share/zoneinfo/right/EST5EDT #usr/share/zoneinfo/right/Egypt #usr/share/zoneinfo/right/Eire +#usr/share/zoneinfo/right/EST +#usr/share/zoneinfo/right/EST5EDT #usr/share/zoneinfo/right/Etc #usr/share/zoneinfo/right/Etc/GMT -#usr/share/zoneinfo/right/Etc/GMT+0 -#usr/share/zoneinfo/right/Etc/GMT+1 -#usr/share/zoneinfo/right/Etc/GMT+10 -#usr/share/zoneinfo/right/Etc/GMT+11 -#usr/share/zoneinfo/right/Etc/GMT+12 -#usr/share/zoneinfo/right/Etc/GMT+2 -#usr/share/zoneinfo/right/Etc/GMT+3 -#usr/share/zoneinfo/right/Etc/GMT+4 -#usr/share/zoneinfo/right/Etc/GMT+5 -#usr/share/zoneinfo/right/Etc/GMT+6 -#usr/share/zoneinfo/right/Etc/GMT+7 -#usr/share/zoneinfo/right/Etc/GMT+8 -#usr/share/zoneinfo/right/Etc/GMT+9 +#usr/share/zoneinfo/right/Etc/GMT0 #usr/share/zoneinfo/right/Etc/GMT-0 +#usr/share/zoneinfo/right/Etc/GMT+0 #usr/share/zoneinfo/right/Etc/GMT-1 +#usr/share/zoneinfo/right/Etc/GMT+1 #usr/share/zoneinfo/right/Etc/GMT-10 +#usr/share/zoneinfo/right/Etc/GMT+10 #usr/share/zoneinfo/right/Etc/GMT-11 +#usr/share/zoneinfo/right/Etc/GMT+11 #usr/share/zoneinfo/right/Etc/GMT-12 +#usr/share/zoneinfo/right/Etc/GMT+12 #usr/share/zoneinfo/right/Etc/GMT-13 #usr/share/zoneinfo/right/Etc/GMT-14 #usr/share/zoneinfo/right/Etc/GMT-2 +#usr/share/zoneinfo/right/Etc/GMT+2 #usr/share/zoneinfo/right/Etc/GMT-3 +#usr/share/zoneinfo/right/Etc/GMT+3 #usr/share/zoneinfo/right/Etc/GMT-4 +#usr/share/zoneinfo/right/Etc/GMT+4 #usr/share/zoneinfo/right/Etc/GMT-5 +#usr/share/zoneinfo/right/Etc/GMT+5 #usr/share/zoneinfo/right/Etc/GMT-6 +#usr/share/zoneinfo/right/Etc/GMT+6 #usr/share/zoneinfo/right/Etc/GMT-7 +#usr/share/zoneinfo/right/Etc/GMT+7 #usr/share/zoneinfo/right/Etc/GMT-8 +#usr/share/zoneinfo/right/Etc/GMT+8 #usr/share/zoneinfo/right/Etc/GMT-9 -#usr/share/zoneinfo/right/Etc/GMT0 +#usr/share/zoneinfo/right/Etc/GMT+9 #usr/share/zoneinfo/right/Etc/Greenwich #usr/share/zoneinfo/right/Etc/UCT -#usr/share/zoneinfo/right/Etc/UTC #usr/share/zoneinfo/right/Etc/Universal +#usr/share/zoneinfo/right/Etc/UTC #usr/share/zoneinfo/right/Etc/Zulu #usr/share/zoneinfo/right/Europe #usr/share/zoneinfo/right/Europe/Amsterdam @@ -1700,6 +1690,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Samara #usr/share/zoneinfo/right/Europe/San_Marino #usr/share/zoneinfo/right/Europe/Sarajevo +#usr/share/zoneinfo/right/Europe/Saratov #usr/share/zoneinfo/right/Europe/Simferopol #usr/share/zoneinfo/right/Europe/Skopje #usr/share/zoneinfo/right/Europe/Sofia @@ -1721,12 +1712,12 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/GB #usr/share/zoneinfo/right/GB-Eire #usr/share/zoneinfo/right/GMT -#usr/share/zoneinfo/right/GMT+0 -#usr/share/zoneinfo/right/GMT-0 #usr/share/zoneinfo/right/GMT0 +#usr/share/zoneinfo/right/GMT-0 +#usr/share/zoneinfo/right/GMT+0 #usr/share/zoneinfo/right/Greenwich -#usr/share/zoneinfo/right/HST #usr/share/zoneinfo/right/Hongkong +#usr/share/zoneinfo/right/HST #usr/share/zoneinfo/right/Iceland #usr/share/zoneinfo/right/Indian #usr/share/zoneinfo/right/Indian/Antananarivo @@ -1747,17 +1738,15 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Kwajalein #usr/share/zoneinfo/right/Libya #usr/share/zoneinfo/right/MET -#usr/share/zoneinfo/right/MST -#usr/share/zoneinfo/right/MST7MDT #usr/share/zoneinfo/right/Mexico #usr/share/zoneinfo/right/Mexico/BajaNorte #usr/share/zoneinfo/right/Mexico/BajaSur #usr/share/zoneinfo/right/Mexico/General +#usr/share/zoneinfo/right/MST +#usr/share/zoneinfo/right/MST7MDT +#usr/share/zoneinfo/right/Navajo #usr/share/zoneinfo/right/NZ #usr/share/zoneinfo/right/NZ-CHAT -#usr/share/zoneinfo/right/Navajo -#usr/share/zoneinfo/right/PRC -#usr/share/zoneinfo/right/PST8PDT #usr/share/zoneinfo/right/Pacific #usr/share/zoneinfo/right/Pacific/Apia #usr/share/zoneinfo/right/Pacific/Auckland @@ -1804,18 +1793,21 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Pacific/Yap #usr/share/zoneinfo/right/Poland #usr/share/zoneinfo/right/Portugal +#usr/share/zoneinfo/right/PRC +#usr/share/zoneinfo/right/PST8PDT #usr/share/zoneinfo/right/ROC #usr/share/zoneinfo/right/ROK #usr/share/zoneinfo/right/Singapore #usr/share/zoneinfo/right/Turkey #usr/share/zoneinfo/right/UCT +#usr/share/zoneinfo/right/Universal #usr/share/zoneinfo/right/US #usr/share/zoneinfo/right/US/Alaska #usr/share/zoneinfo/right/US/Aleutian #usr/share/zoneinfo/right/US/Arizona #usr/share/zoneinfo/right/US/Central -#usr/share/zoneinfo/right/US/East-Indiana #usr/share/zoneinfo/right/US/Eastern +#usr/share/zoneinfo/right/US/East-Indiana #usr/share/zoneinfo/right/US/Hawaii #usr/share/zoneinfo/right/US/Indiana-Starke #usr/share/zoneinfo/right/US/Michigan @@ -1824,8 +1816,31 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/US/Pacific-New #usr/share/zoneinfo/right/US/Samoa #usr/share/zoneinfo/right/UTC -#usr/share/zoneinfo/right/Universal -#usr/share/zoneinfo/right/W-SU #usr/share/zoneinfo/right/WET +#usr/share/zoneinfo/right/W-SU #usr/share/zoneinfo/right/Zulu +#usr/share/zoneinfo/ROC +#usr/share/zoneinfo/ROK +#usr/share/zoneinfo/Singapore +#usr/share/zoneinfo/Turkey +#usr/share/zoneinfo/UCT +#usr/share/zoneinfo/Universal +#usr/share/zoneinfo/US +#usr/share/zoneinfo/US/Alaska +#usr/share/zoneinfo/US/Aleutian +#usr/share/zoneinfo/US/Arizona +#usr/share/zoneinfo/US/Central +#usr/share/zoneinfo/US/Eastern +#usr/share/zoneinfo/US/East-Indiana +#usr/share/zoneinfo/US/Hawaii +#usr/share/zoneinfo/US/Indiana-Starke +#usr/share/zoneinfo/US/Michigan +#usr/share/zoneinfo/US/Mountain +#usr/share/zoneinfo/US/Pacific +#usr/share/zoneinfo/US/Pacific-New +#usr/share/zoneinfo/US/Samoa +#usr/share/zoneinfo/UTC +#usr/share/zoneinfo/WET +#usr/share/zoneinfo/W-SU #usr/share/zoneinfo/zone.tab +#usr/share/zoneinfo/Zulu diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index db0ab1b94..af089054c 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.2 -usr/lib/libunbound.so.2.5.9 +usr/lib/libunbound.so.2.5.10 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 17cb23292..9863251e2 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -692,8 +692,8 @@ sub downloadrulesfile { } if ($peer) { - system("wget -r --proxy=on --proxy-user=$proxysettings{'UPSTREAM_USER'} --proxy-passwd=$proxysettings{'UPSTREAM_PASSWORD'} -e http_proxy=http://$peer:$peerport/ -o /var/tmp/log --no-check-certificate --output-document=/var/tmp/snortrules.tar.gz $url"); + system("wget -r --proxy=on --proxy-user=$proxysettings{'UPSTREAM_USER'} --proxy-passwd=$proxysettings{'UPSTREAM_PASSWORD'} -e http_proxy=http://$peer:$peerport/ -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url"); } else { - system("wget -r --no-check-certificate -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url"); + system("wget -r -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url"); } } diff --git a/lfs/coreutils b/lfs/coreutils index 26482aa0f..66a63a9c8 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -24,7 +24,7 @@ include Config -VER = 8.27 +VER = 8.29 THISAPP = coreutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -58,7 +58,7 @@ objects =$(DL_FILE) $(DL_FILE)= $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 502795792c212932365e077946d353ae +$(DL_FILE)_MD5 = 960cfe75a42c9907c71439f8eb436303 install : $(TARGET) diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 997bc063b..3fba2797d 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -24,7 +24,7 @@ include Config -VER = 1.8.0 +VER = 1.8.2 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 530db74602b558209f9ad7356a680971 +$(DL_FILE)_MD5 = cfb0b5c79eab07686b6898160a407139 install : $(TARGET) diff --git a/lfs/postfix b/lfs/postfix index 42e626c8f..0fe4dfe08 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,7 +24,7 @@ include Config -VER = 3.2.4 +VER = 3.2.6 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 14 +PAK_VER = 15 DEPS = "" @@ -66,7 +66,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 60d8418278ef9f3c7d1251480ea84a42 +$(DL_FILE)_MD5 = d10f1fb551be86f6e48c2908dd8a12ff install : $(TARGET) diff --git a/lfs/tor b/lfs/tor index f78e017eb..c646e738d 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.3.2.10 +VER = 0.3.3.7 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 28 +PAK_VER = 29 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a8b8b3db93f87a5c061109dbd8cd5309 +$(DL_FILE)_MD5 = 5288d8de30c516073ad13fee44f6fdf3 install : $(TARGET) diff --git a/lfs/tzdata b/lfs/tzdata index 7f140c097..2d1293ce8 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -24,7 +24,7 @@ include Config -VER = 2016d +VER = 2018e TZDATA_VER = $(VER) TZCODE_VER = $(VER) @@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz -tzdata$(TZDATA_VER).tar.gz_MD5 = 14bf84b6c2cdab0a9428991e0150ebe6 -tzcode$(TZCODE_VER).tar.gz_MD5 = 06fc6fc111cd8dd681abdc5326529afd +tzdata$(TZDATA_VER).tar.gz_MD5 = 97d654f4d7253173b3eeb76a836dd65e +tzcode$(TZCODE_VER).tar.gz_MD5 = c4d7df0fff7ba5588b32c5f27e2caf97 install : $(TARGET) diff --git a/lfs/unbound b/lfs/unbound index ac0c8fd57..4adc1a00c 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.7.1 +VER = 1.7.2 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e3614d9746e1fd45f191a2b88ad8df04 +$(DL_FILE)_MD5 = 1f4fd7e5032a9c5658cbde2c83f5f3be install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2018