IPFire-SCM June 2018

ipfire-scm@lists.ipfire.org

1 participants
38 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core122, updated. 3694296e56ad3e3698f3c0a68d36226eb917794a
by git＠ipfire.org 29 Jun '18

29 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 updated via 3694296e56ad3e3698f3c0a68d36226eb917794a (commit) via 483803413129ae3999d334b8972bb3daa71f0c9e (commit) from 715ed18b2818628e8d4e650b2cfadb459a3ef320 (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 3694296e56ad3e3698f3c0a68d36226eb917794a Merge: 715ed18b2 483803413 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 29 17:07:39 2018 +0200 Merge remote-tracking branch 'origin/master' into core121 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/initscripts | 2 +- config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/core/122/filelists/files | 1 + config/rootfiles/core/122/update.sh | 2 ++ lfs/initscripts | 5 ++-- src/initscripts/system/random | 35 +++++++++++++++++++++------- 8 files changed, 35 insertions(+), 16 deletions(-) Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 9e9e1a71a..97ba5ad65 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -117,6 +117,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S11unbound @@ -130,7 +131,6 @@ etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 9e9e1a71a..97ba5ad65 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -117,6 +117,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S11unbound @@ -130,7 +131,6 @@ etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index cc0e4580d..ab8d4f108 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -116,6 +116,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S12acpid @@ -129,7 +130,6 @@ etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index cc0e4580d..ab8d4f108 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -116,6 +116,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S12acpid @@ -129,7 +130,6 @@ etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/core/122/filelists/files b/config/rootfiles/core/122/filelists/files index 104e52a0c..6ea35e46e 100644 --- a/config/rootfiles/core/122/filelists/files +++ b/config/rootfiles/core/122/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/console etc/rc.d/init.d/firstsetup etc/rc.d/init.d/leds etc/rc.d/init.d/partresize +etc/rc.d/init.d/random etc/rc.d/rc0.d/K87acpid etc/rc.d/rc3.d/S12acpid etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh index 3e8cab693..bb38696c4 100644 --- a/config/rootfiles/core/122/update.sh +++ b/config/rootfiles/core/122/update.sh @@ -117,6 +117,8 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi +mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random + case "$(uname -m)" in i?86) # Force (re)install pae kernel if pae is supported diff --git a/lfs/initscripts b/lfs/initscripts index 0d7f40cad..848540680 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # -############################################################################### ############################################################################### # Definitions @@ -131,7 +130,7 @@ $(TARGET) : ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S11unbound ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K79unbound ln -sf ../init.d/random /etc/rc.d/rc0.d/K45random - ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random + ln -sf ../init.d/random /etc/rc.d/rc3.d/S00random ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175 diff --git a/src/initscripts/system/random b/src/initscripts/system/random index 57aef99d4..1f825cd18 100644 --- a/src/initscripts/system/random +++ b/src/initscripts/system/random @@ -1,28 +1,45 @@ #!/bin/sh -# Begin $rc_base/init.d/random - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org -# Random script elements by Larry Lawrence - . /etc/sysconfig/rc . $rc_functions +if [ -e /proc/sys/kernel/random/poolsize ]; then + poolsize=$(</proc/sys/kernel/random/poolsize); + poolsize=$(expr $poolsize / 8 ); +else + poolsize=512; +fi + case "$1" in start) - boot_mesg "Initializing kernel random number generator..." + + #CRNG init need 128bit so wait until there is more) + avail=$(</proc/sys/kernel/random/entropy_avail) + while [ $avail -lt 130 ]; do + avail=$(</proc/sys/kernel/random/entropy_avail) + boot_mesg -n "\rWait for entropy: $avail/130 " + # Generate some disc access to gather entropy + echo avail > /var/tmp/random-tmpfile + sync + rm -f /var/tmp/random-tmpfile + done; + + boot_mesg "\rInitializing kernel random number generator..." if [ -f /var/tmp/random-seed ]; then /bin/cat /var/tmp/random-seed >/dev/urandom fi + touch /var/tmp/random-seed + chmod 600 /var/tmp/random-seed /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=4 &>/dev/null + count=1 bs=$poolsize &>/dev/null evaluate_retval ;; stop) boot_mesg "Saving random seed..." + touch /var/tmp/random-seed + chmod 600 /var/tmp/random-seed /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=4 &>/dev/null + count=1 bs=$poolsize &>/dev/null evaluate_retval ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 483803413129ae3999d334b8972bb3daa71f0c9e
by git＠ipfire.org 29 Jun '18

29 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 483803413129ae3999d334b8972bb3daa71f0c9e (commit) from 3069380c4189a1d875717441d88082286a85586b (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 483803413129ae3999d334b8972bb3daa71f0c9e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 28 20:36:32 2018 +0200 random: update initskript for machines with low entropy the script wait until crng is correct initialized before restore the random seed and make some disc io to work around low entropy at boot on some machines. Not really a fix but it should be better than reverting CVE-2018-1108 fixes from kernel. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/initscripts | 2 +- config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/core/122/filelists/files | 1 + config/rootfiles/core/122/update.sh | 2 ++ lfs/initscripts | 5 ++-- src/initscripts/system/random | 35 +++++++++++++++++++++------- 8 files changed, 35 insertions(+), 16 deletions(-) Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 9e9e1a71a..97ba5ad65 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -117,6 +117,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S11unbound @@ -130,7 +131,6 @@ etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 9e9e1a71a..97ba5ad65 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -117,6 +117,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S11unbound @@ -130,7 +131,6 @@ etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index cc0e4580d..ab8d4f108 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -116,6 +116,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S12acpid @@ -129,7 +130,6 @@ etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index cc0e4580d..ab8d4f108 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -116,6 +116,7 @@ etc/rc.d/rc0.d/S80mountfs etc/rc.d/rc0.d/S90swap etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d +etc/rc.d/rc3.d/S00random etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd etc/rc.d/rc3.d/S12acpid @@ -129,7 +130,6 @@ etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S25random etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron diff --git a/config/rootfiles/core/122/filelists/files b/config/rootfiles/core/122/filelists/files index f7c692d8b..d87145961 100644 --- a/config/rootfiles/core/122/filelists/files +++ b/config/rootfiles/core/122/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/collectd etc/rc.d/init.d/firstsetup etc/rc.d/init.d/leds etc/rc.d/init.d/partresize +etc/rc.d/init.d/random etc/rc.d/rc0.d/K87acpid etc/rc.d/rc3.d/S12acpid etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh index 3e8cab693..bb38696c4 100644 --- a/config/rootfiles/core/122/update.sh +++ b/config/rootfiles/core/122/update.sh @@ -117,6 +117,8 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi +mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random + case "$(uname -m)" in i?86) # Force (re)install pae kernel if pae is supported diff --git a/lfs/initscripts b/lfs/initscripts index 0d7f40cad..848540680 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # -############################################################################### ############################################################################### # Definitions @@ -131,7 +130,7 @@ $(TARGET) : ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S11unbound ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K79unbound ln -sf ../init.d/random /etc/rc.d/rc0.d/K45random - ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random + ln -sf ../init.d/random /etc/rc.d/rc3.d/S00random ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175 diff --git a/src/initscripts/system/random b/src/initscripts/system/random index 57aef99d4..1f825cd18 100644 --- a/src/initscripts/system/random +++ b/src/initscripts/system/random @@ -1,28 +1,45 @@ #!/bin/sh -# Begin $rc_base/init.d/random - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org -# Random script elements by Larry Lawrence - . /etc/sysconfig/rc . $rc_functions +if [ -e /proc/sys/kernel/random/poolsize ]; then + poolsize=$(</proc/sys/kernel/random/poolsize); + poolsize=$(expr $poolsize / 8 ); +else + poolsize=512; +fi + case "$1" in start) - boot_mesg "Initializing kernel random number generator..." + + #CRNG init need 128bit so wait until there is more) + avail=$(</proc/sys/kernel/random/entropy_avail) + while [ $avail -lt 130 ]; do + avail=$(</proc/sys/kernel/random/entropy_avail) + boot_mesg -n "\rWait for entropy: $avail/130 " + # Generate some disc access to gather entropy + echo avail > /var/tmp/random-tmpfile + sync + rm -f /var/tmp/random-tmpfile + done; + + boot_mesg "\rInitializing kernel random number generator..." if [ -f /var/tmp/random-seed ]; then /bin/cat /var/tmp/random-seed >/dev/urandom fi + touch /var/tmp/random-seed + chmod 600 /var/tmp/random-seed /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=4 &>/dev/null + count=1 bs=$poolsize &>/dev/null evaluate_retval ;; stop) boot_mesg "Saving random seed..." + touch /var/tmp/random-seed + chmod 600 /var/tmp/random-seed /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=4 &>/dev/null + count=1 bs=$poolsize &>/dev/null evaluate_retval ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 24e9b8ad8dabcfdff70af1ef52a6ce68034619fd
by git＠ipfire.org 28 Jun '18

28 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 3.x development tree". The branch, master has been updated via 24e9b8ad8dabcfdff70af1ef52a6ce68034619fd (commit) via 4609ee24cd4243f47360856a1e01bbf174dd99c0 (commit) from 46ad8236e7cda033d43d9132bc72881f87b09fb1 (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 24e9b8ad8dabcfdff70af1ef52a6ce68034619fd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 28 12:52:51 2018 +0100 glibc: Update to 2.27 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4609ee24cd4243f47360856a1e01bbf174dd99c0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 28 12:37:23 2018 +0100 coreutils: Update to 8.29 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: coreutils/coreutils.nm | 23 +- glibc/glibc.nm | 5 +- glibc/patches/glibc-2.10.1-arc4random.patch | 541 --------------------- glibc/patches/glibc-2.10.1-pt_pax-1.patch | 40 -- glibc/patches/glibc-2.17-hardened-pie.patch | 42 -- glibc/patches/glibc-arm-hardfloat-3.patch | 20 - .../glibc-compile-fix-for-memcpy-ssse3.patch | 67 --- .../glibc-fedora-__libc_multiple_libcs.patch | 79 --- glibc/patches/glibc-fedora-localedef.patch | 11 - glibc/patches/glibc-fedora-locarchive.patch | 51 -- glibc/patches/glibc-fedora-nscd.patch | 12 - glibc/patches/glibc-rh1070416.patch | 29 -- 12 files changed, 7 insertions(+), 913 deletions(-) delete mode 100644 glibc/patches/glibc-2.10.1-arc4random.patch delete mode 100644 glibc/patches/glibc-2.10.1-pt_pax-1.patch delete mode 100644 glibc/patches/glibc-2.17-hardened-pie.patch delete mode 100644 glibc/patches/glibc-arm-hardfloat-3.patch delete mode 100644 glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch delete mode 100644 glibc/patches/glibc-fedora-__libc_multiple_libcs.patch delete mode 100644 glibc/patches/glibc-fedora-localedef.patch delete mode 100644 glibc/patches/glibc-fedora-locarchive.patch delete mode 100644 glibc/patches/glibc-fedora-nscd.patch delete mode 100644 glibc/patches/glibc-rh1070416.patch Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index e9c4fa4a9..9e3db3f30 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = coreutils -version = 8.26 +version = 8.29 release = 1 groups = System/Base @@ -17,7 +17,7 @@ description the old GNU fileutils, sh-utils, and textutils packages. end -source_dl = http://ftp.gnu.org/gnu/coreutils/ +source_dl = https://ftp.gnu.org/gnu/coreutils/ sources = %{thisapp}.tar.xz build @@ -34,34 +34,19 @@ build texinfo end - CFLAGS += \ - -D_GNU_SOURCE=1 \ - -fno-strict-aliasing \ - -fpic - configure_options += \ FORCE_UNSAFE_CONFIGURE=1 \ --enable-dependency-tracking \ --libexecdir=%{libdir} \ --enable-largefile \ - --disable-rpath \ --enable-install-program=arch \ --enable-no-install-program=hostname,kill,uptime \ - --with-tty-group \ - - prepare_cmds - autoreconf -vfi - end - - make_build_targets += \ - V=1 + --with-tty-group test - make check || true + make check RUN_VERY_EXPENSIVE_TESTS=yes || true end - make_install_targets += install-man - install_cmds mkdir -pv %{BUILDROOT}%{sbindir} mv -v %{BUILDROOT}/usr/bin/chroot %{BUILDROOT}%{sbindir} diff --git a/glibc/glibc.nm b/glibc/glibc.nm index c17c336a7..2143693dd 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ############################################################################### name = glibc -version = 2.26 -release = 3 +version = 2.27 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -34,6 +34,7 @@ build autoconf automake binutils >= 2.27 + bison gcc >= 4.9 gettext kernel-headers >= %{OPTIMIZED_KERNEL} diff --git a/glibc/patches/glibc-2.10.1-arc4random.patch b/glibc/patches/glibc-2.10.1-arc4random.patch deleted file mode 100644 index c877c8c86..000000000 --- a/glibc/patches/glibc-2.10.1-arc4random.patch +++ /dev/null @@ -1,541 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2006-01-01 -Initial Package Version: 2.3.6 -Upstream Status: Not submitted -Origin: http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/crypt/arc4random.c -Description: This patch adds the arc4random() and arc4randomII() functions -to Glibc, and hooks so mktemp(3) can use arc4randomII(). - -Also see: -http://www.linuxfromscratch.org/hlfs/ -http://www.linuxfromscratch.org/hints/downloads/files/entropy.txt - -diff -Naur glibc-2.3.6.orig/manual/arc4random.3 glibc-2.3.6/manual/arc4random.3 ---- glibc-2.3.6.orig/manual/arc4random.3 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.3.6/manual/arc4random.3 2006-01-01 07:48:48.000000000 +0000 -@@ -0,0 +1,74 @@ -+.TH ARC4RANDOM 3 "February 11, 2005" -+.SH NAME -+arc4random - arc4 random number generator -+.SH SYNOPSIS -+.nf -+.B #include <stdlib.h> -+.sp -+.I u_int32_t -+.B arc4random(void); -+.sp -+.I u_int32_t -+.B arc4randomII(void); -+.fi -+.SH DESCRIPTION -+The \fBarc4random()\fP function generates a pseudo-random number using the -+ARC4 cipher key stream generator. ARCFOUR uses 8*8 8 bit S-Boxes, and can -+be in about (2**1700) states. -+ -+The \fBarc4random()\fP function is seeded automatically from /dev/urandom, -+or from sysctl \fBurandom\fP if /dev/urandom is not accessible (chroot), or from -+sysctl random.uuid if sysctl \fBurandom\fP is not accessible. \fBgettimeofday(2)\fP -+is always included when initializing the state of \fBarc4random()\fP, this makes -+it impossible to generate the same random sequence twice. \fBarc4random()\fP -+is intended to be safe to use with encryption software to provide entropy. -+ -+The \fBarc4randomII()\fP function is identical to \fBarc4random()\fP except -+that \fBarc4randomII()\fP is seeded automatically from /dev/erandom, and -+sysctl erandom. \fBarc4randomII()\fP is NOT intended for cryptography, but is -+ideal for \fBmktemp(3)\fP, and other functions with a short lifespan. -+\fBarc4randomII()\fP and erandom do not consume any kernel entropy. -+ -+Sysctl urandom, and erandom require a modified kernel. See: -+http://www.linuxfromscratch.org/hlfs/ -+ -+.SH EXAMPLES -+.TP -+Return a random number between 0 and 100. -+.sp -+arc4random() % 100; -+.TP -+Return any random number. -+.sp -+arc4random(); -+.TP -+.nf -+Sample program; this will display a number between 0 and 65536. -+ -+#include <stdlib.h> -+#include <stdio.h> -+ -+int main(void) { -+ int random_number; -+ random_number = arc4random() % 65536; -+ printf("%d\n", random_number); -+ return 0; -+} -+.fi -+.SH "SEE ALSO" -+.BR random (3), -+.BR gettimeofday (2), -+.BR mktemp (3) -+ -+.SH HISTORY -+An algorithm called RC4 was designed by RSA Data Security, Inc. It was -+considered a trade secret, but not trademarked. Because it was a trade -+secret, it obviously could not be patented. A clone of this was posted -+anonymously to USENET and confirmed to be equivalent by several sources -+who had access to the original cipher. Because of the trade secret situation, -+RSA Data Security, Inc. can do nothing about the release of the -+ARC4 algorithm. Since RC4 used to be a trade secret, the cipher is now -+referred to as ARC4 (Another RC4). -+ -+These functions first appeared in OpenBSD 2.1. -+ -diff -Naur glibc-2.3.6.orig/stdlib/Makefile glibc-2.3.6/stdlib/Makefile ---- glibc-2.3.6.orig/stdlib/Makefile 2005-02-16 11:23:58.000000000 +0000 -+++ glibc-2.3.6/stdlib/Makefile 2006-01-01 07:48:48.000000000 +0000 -@@ -27,7 +27,7 @@ - - routines := \ - atof atoi atol atoll \ -- abort \ -+ abort arc4random arc4randomII \ - bsearch qsort msort \ - getenv putenv setenv secure-getenv \ - exit on_exit atexit cxa_atexit cxa_finalize old_atexit \ -diff -Naur glibc-2.3.6.orig/stdlib/Versions glibc-2.3.6/stdlib/Versions ---- glibc-2.3.6.orig/stdlib/Versions 2004-05-03 21:25:53.000000000 +0000 -+++ glibc-2.3.6/stdlib/Versions 2006-01-01 07:50:28.000000000 +0000 -@@ -11,6 +11,8 @@ - - # a* - a64l; abort; abs; atexit; atof; atoi; atol; atoll; -+ arc4random_stir; arc4random_addrandom; arc4random; -+ arc4random_stirII; arc4random_addrandomII; arc4randomII; - - # b* - bsearch; -diff -Naur glibc-2.3.6.orig/stdlib/arc4random.c glibc-2.3.6/stdlib/arc4random.c ---- glibc-2.3.6.orig/stdlib/arc4random.c 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.3.6/stdlib/arc4random.c 2006-01-01 07:48:48.000000000 +0000 -@@ -0,0 +1,205 @@ -+/* -+ * Arc4 random number generator for OpenBSD. -+ * Copyright 1996 David Mazieres <dm(a)lcs.mit.edu>. -+ * -+ * Modification and redistribution in source and binary forms is -+ * permitted provided that due credit is given to the author and the -+ * OpenBSD project by leaving this copyright notice intact. -+ */ -+ -+/* -+ * This code is derived from section 17.1 of Applied Cryptography, -+ * second edition, which describes a stream cipher allegedly -+ * compatible with RSA Labs "RC4" cipher (the actual description of -+ * which is a trade secret). The same algorithm is used as a stream -+ * cipher called "arcfour" in Tatu Ylonen's ssh package. -+ * -+ * Here the stream cipher has been modified always to include the time -+ * when initializing the state. That makes it impossible to -+ * regenerate the same random sequence twice, so this can't be used -+ * for encryption, but will generate good random numbers. -+ * -+ * RC4 is a registered trademark of RSA Laboratories. -+ */ -+ -+/* -+ * Modified by Robert Connolly from OpenBSD lib/libc/crypt/arc4random.c v1.11. -+ * This is arc4random(3) using urandom. -+ */ -+ -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/param.h> -+#include <sys/time.h> -+#include <sys/sysctl.h> -+ -+#ifdef __GNUC__ -+#define inline __inline -+#else /* !__GNUC__ */ -+#define inline -+#endif /* !__GNUC__ */ -+ -+struct arc4_stream { -+ u_int8_t i; -+ u_int8_t j; -+ u_int8_t s[256]; -+}; -+ -+static int rs_initialized; -+static struct arc4_stream rs; -+static pid_t arc4_stir_pid; -+ -+static inline u_int8_t arc4_getbyte(struct arc4_stream *); -+ -+static inline void -+arc4_init(struct arc4_stream *as) -+{ -+ int n; -+ -+ for (n = 0; n < 256; n++) -+ as->s[n] = n; -+ as->i = 0; -+ as->j = 0; -+} -+ -+static inline void -+arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen) -+{ -+ int n; -+ u_int8_t si; -+ -+ as->i--; -+ for (n = 0; n < 256; n++) { -+ as->i = (as->i + 1); -+ si = as->s[as->i]; -+ as->j = (as->j + si + dat[n % datlen]); -+ as->s[as->i] = as->s[as->j]; -+ as->s[as->j] = si; -+ } -+ as->j = as->i; -+} -+ -+static void -+arc4_stir(struct arc4_stream *as) -+{ -+ int n, fd; -+ struct { -+ struct timeval tv; -+ u_int rnd[(128 - sizeof(struct timeval)) / sizeof(u_int)]; -+ } rdat; -+ -+ gettimeofday(&rdat.tv, NULL); -+ -+ /* /dev/urandom is a multithread interface, sysctl is not. */ -+ /* Try to use /dev/urandom before sysctl. */ -+ fd = open("/dev/urandom", O_RDONLY); -+ if (fd != -1) { -+ read(fd, rdat.rnd, sizeof(rdat.rnd)); -+ close(fd); -+ } -+ -+#if defined(SYSCTL_URANDOM) -+ else { -+ /* /dev/urandom failed? Maybe we're in a chroot. */ -+ int mib[]={CTL_KERN, KERN_RANDOM, RANDOM_URANDOM}; -+ u_int i; -+ size_t len; -+ -+ for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) { -+ len = sizeof(u_int); -+ if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1) -+ break; -+ } -+ if (i < sizeof(rdat.rnd) / 4) { -+ /* Sysctl urandom failed? Maybe we're running a vanilla kernel. */ -+ mib[2] = RANDOM_UUID; -+ for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) { -+ len = sizeof(u_int); -+ if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1) -+ break; -+ } -+ } -+ } -+#endif -+ -+ arc4_stir_pid = getpid(); -+ /* -+ * Time to give up. If no entropy could be found then we will just -+ * use gettimeofday. -+ */ -+ arc4_addrandom(as, (void *)&rdat, sizeof(rdat)); -+ -+ /* -+ * Discard early keystream, as per recommendations in: -+ * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps -+ * We discard 256 words. A long word is 4 bytes. -+ */ -+ for (n = 0; n < 256 * 4; n ++) -+ arc4_getbyte(as); -+} -+ -+static inline u_int8_t -+arc4_getbyte(struct arc4_stream *as) -+{ -+ u_int8_t si, sj; -+ -+ as->i = (as->i + 1); -+ si = as->s[as->i]; -+ as->j = (as->j + si); -+ sj = as->s[as->j]; -+ as->s[as->i] = sj; -+ as->s[as->j] = si; -+ return (as->s[(si + sj) & 0xff]); -+} -+ -+static inline u_int32_t -+arc4_getword(struct arc4_stream *as) -+{ -+ u_int32_t val; -+ val = arc4_getbyte(as) << 24; -+ val |= arc4_getbyte(as) << 16; -+ val |= arc4_getbyte(as) << 8; -+ val |= arc4_getbyte(as); -+ return val; -+} -+ -+void -+arc4random_stir(void) -+{ -+ if (!rs_initialized) { -+ arc4_init(&rs); -+ rs_initialized = 1; -+ } -+ arc4_stir(&rs); -+} -+ -+void -+arc4random_addrandom(u_char *dat, int datlen) -+{ -+ if (!rs_initialized) -+ arc4random_stir(); -+ arc4_addrandom(&rs, dat, datlen); -+} -+ -+u_int32_t -+arc4random(void) -+{ -+ if (!rs_initialized || arc4_stir_pid != getpid()) -+ arc4random_stir(); -+ return arc4_getword(&rs); -+} -+ -+#if 0 -+/*-------- Test code --------*/ -+#include <stdlib.h> -+#include <stdio.h> -+ -+int main(void) { -+ int random_number; -+ random_number = arc4random() % 65536; -+ printf("A random number between 0 and 65536 is %d\n", random_number); -+ return 0; -+} -+#endif -diff -Naur glibc-2.3.6.orig/stdlib/arc4randomII.c glibc-2.3.6/stdlib/arc4randomII.c ---- glibc-2.3.6.orig/stdlib/arc4randomII.c 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.3.6/stdlib/arc4randomII.c 2006-01-01 07:48:48.000000000 +0000 -@@ -0,0 +1,196 @@ -+/* -+ * Arc4 random number generator for OpenBSD. -+ * Copyright 1996 David Mazieres <dm(a)lcs.mit.edu>. -+ * -+ * Modification and redistribution in source and binary forms is -+ * permitted provided that due credit is given to the author and the -+ * OpenBSD project by leaving this copyright notice intact. -+ */ -+ -+/* -+ * This code is derived from section 17.1 of Applied Cryptography, -+ * second edition, which describes a stream cipher allegedly -+ * compatible with RSA Labs "RC4" cipher (the actual description of -+ * which is a trade secret). The same algorithm is used as a stream -+ * cipher called "arcfour" in Tatu Ylonen's ssh package. -+ * -+ * Here the stream cipher has been modified always to include the time -+ * when initializing the state. That makes it impossible to -+ * regenerate the same random sequence twice, so this can't be used -+ * for encryption, but will generate good random numbers. -+ * -+ * RC4 is a registered trademark of RSA Laboratories. -+ */ -+ -+/* -+ * Modified by Robert Connolly from OpenBSD lib/libc/crypt/arc4random.c v1.11. -+ * This is arc4randomII(3) using erandom. -+ */ -+ -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/param.h> -+#include <sys/time.h> -+#include <sys/sysctl.h> -+ -+#ifdef __GNUC__ -+#define inline __inline -+#else /* !__GNUC__ */ -+#define inline -+#endif /* !__GNUC__ */ -+ -+struct arc4_streamII { -+ u_int8_t i; -+ u_int8_t j; -+ u_int8_t s[256]; -+}; -+ -+static int rs_initializedII; -+static struct arc4_streamII rs; -+static pid_t arc4_stir_pidII; -+ -+static inline u_int8_t arc4_getbyteII(struct arc4_streamII *); -+ -+static inline void -+arc4_initII(struct arc4_streamII *as) -+{ -+ int n; -+ -+ for (n = 0; n < 256; n++) -+ as->s[n] = n; -+ as->i = 0; -+ as->j = 0; -+} -+ -+static inline void -+arc4_addrandomII(struct arc4_streamII *as, u_char *dat, int datlen) -+{ -+ int n; -+ u_int8_t si; -+ -+ as->i--; -+ for (n = 0; n < 256; n++) { -+ as->i = (as->i + 1); -+ si = as->s[as->i]; -+ as->j = (as->j + si + dat[n % datlen]); -+ as->s[as->i] = as->s[as->j]; -+ as->s[as->j] = si; -+ } -+ as->j = as->i; -+} -+ -+static void -+arc4_stirII(struct arc4_streamII *as) -+{ -+ int n, fd; -+ struct { -+ struct timeval tv; -+ u_int rnd[(128 - sizeof(struct timeval)) / sizeof(u_int)]; -+ } rdat; -+ -+ gettimeofday(&rdat.tv, NULL); -+ -+ /* /dev/urandom is a multithread interface, sysctl is not. */ -+ /* Try to use /dev/urandom before sysctl. */ -+ fd = open("/dev/erandom", O_RDONLY); -+ if (fd != -1) { -+ read(fd, rdat.rnd, sizeof(rdat.rnd)); -+ close(fd); -+ } -+ -+#if defined(SYSCTL_ERANDOM) -+ else { -+ /* /dev/urandom failed? Maybe we're in a chroot. */ -+ int mib[]={CTL_KERN, KERN_RANDOM, RANDOM_ERANDOM}; -+ u_int i; -+ size_t len; -+ -+ for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i++) { -+ len = sizeof(u_int); -+ if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1) -+ break; -+ } -+ } -+#endif -+ -+ arc4_stir_pidII = getpid(); -+ /* -+ * Time to give up. If no entropy could be found then we will just -+ * use gettimeofday. -+ */ -+ arc4_addrandomII(as, (void *)&rdat, sizeof(rdat)); -+ -+ /* -+ * Discard early keystream, as per recommendations in: -+ * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps -+ * We discard 256 words. A long word is 4 bytes. -+ */ -+ for (n = 0; n < 256 * 4; n ++) -+ arc4_getbyteII(as); -+} -+ -+static inline u_int8_t -+arc4_getbyteII(struct arc4_streamII *as) -+{ -+ u_int8_t si, sj; -+ -+ as->i = (as->i + 1); -+ si = as->s[as->i]; -+ as->j = (as->j + si); -+ sj = as->s[as->j]; -+ as->s[as->i] = sj; -+ as->s[as->j] = si; -+ return (as->s[(si + sj) & 0xff]); -+} -+ -+static inline u_int32_t -+arc4_getwordII(struct arc4_streamII *as) -+{ -+ u_int32_t val; -+ val = arc4_getbyteII(as) << 24; -+ val |= arc4_getbyteII(as) << 16; -+ val |= arc4_getbyteII(as) << 8; -+ val |= arc4_getbyteII(as); -+ return val; -+} -+ -+void -+arc4random_stirII(void) -+{ -+ if (!rs_initializedII) { -+ arc4_initII(&rs); -+ rs_initializedII = 1; -+ } -+ arc4_stirII(&rs); -+} -+ -+void -+arc4random_addrandomII(u_char *dat, int datlen) -+{ -+ if (!rs_initializedII) -+ arc4random_stirII(); -+ arc4_addrandomII(&rs, dat, datlen); -+} -+ -+u_int32_t -+arc4randomII(void) -+{ -+ if (!rs_initializedII || arc4_stir_pidII != getpid()) -+ arc4random_stirII(); -+ return arc4_getwordII(&rs); -+} -+ -+#if 0 -+/*-------- Test code --------*/ -+#include <stdlib.h> -+#include <stdio.h> -+ -+int main(void) { -+ int random_number; -+ random_number = arc4randomII() % 65536; -+ printf("A random number between 0 and 65536 is %d\n", random_number); -+ return 0; -+} -+#endif -diff -Naur glibc-2.3.6.orig/stdlib/stdlib.h glibc-2.3.6/stdlib/stdlib.h ---- glibc-2.3.6.orig/stdlib/stdlib.h 2005-07-18 01:15:30.000000000 +0000 -+++ glibc-2.3.6/stdlib/stdlib.h 2006-01-01 07:48:48.000000000 +0000 -@@ -572,6 +572,15 @@ - extern int lcong48_r (unsigned short int __param[7], - struct drand48_data *__buffer) - __THROW __nonnull ((1, 2)); -+ -+#define LIBC_HAS_ARC4RANDOM -+u_int32_t arc4random(void); -+void arc4random_stir(void); -+void arc4random_addrandom(unsigned char *, int); -+u_int32_t arc4randomII(void); -+void arc4random_stirII(void); -+void arc4random_addrandomII(unsigned char *, int); -+ - # endif /* Use misc. */ - #endif /* Use SVID or X/Open. */ diff --git a/glibc/patches/glibc-2.10.1-pt_pax-1.patch b/glibc/patches/glibc-2.10.1-pt_pax-1.patch deleted file mode 100644 index 1d6958829..000000000 --- a/glibc/patches/glibc-2.10.1-pt_pax-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2006-10-11 -Initial Package Version: 2.5 -Upstream Status: Not submitted - PaX specific. Will not be accepted upstream. -Origin: http://www.gtlib.cc.gatech.edu/pub/gentoo/gentoo-x86-portage/sys-libs/ \ - glibc/files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff -Description: This is needed for Pax. http://pax.grsecurity.net/ -Also see: -http://www.linuxfromscratch.org/hlfs/ - -diff -Naur glibc-2.5.orig/elf/elf.h glibc-2.5/elf/elf.h ---- glibc-2.5.orig/elf/elf.h 2006-07-10 21:54:02.000000000 +0000 -+++ glibc-2.5/elf/elf.h 2006-10-11 21:30:02.000000000 +0000 -@@ -569,6 +569,7 @@ - #define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ - #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ - #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ -+#define PT_PAX_FLAGS 0x65041580 /* Indicates PaX flag markings */ - #define PT_LOSUNW 0x6ffffffa - #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ - #define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ -@@ -582,6 +583,18 @@ - #define PF_X (1 << 0) /* Segment is executable */ - #define PF_W (1 << 1) /* Segment is writable */ - #define PF_R (1 << 2) /* Segment is readable */ -+#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ -+#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ -+#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ -+#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ -+#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ -+#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ -+#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ -+#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ -+#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ -+#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ -+#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ -+#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ - #define PF_MASKOS 0x0ff00000 /* OS-specific */ - #define PF_MASKPROC 0xf0000000 /* Processor-specific */ - diff --git a/glibc/patches/glibc-2.17-hardened-pie.patch b/glibc/patches/glibc-2.17-hardened-pie.patch deleted file mode 100644 index da4fb8253..000000000 --- a/glibc/patches/glibc-2.17-hardened-pie.patch +++ /dev/null @@ -1,42 +0,0 @@ -2012-11-11 Magnus Granberg <zorry(a)gentoo.org> - - #442712 - * Makeconfig (+link): Set to +link-pie. - (+link-static-before-libc): Change $(static-start-installed-name) to - S$(static-start-installed-name). - (+prector): Set to +prectorS. - (+postctor): Set to +postctorS. - ---- libc/Makeconfig -+++ libc/Makeconfig -@@ -447,11 +447,12 @@ - $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) - endif -++link = $(+link-pie) - # Command for statically linking programs with the C library. - ifndef +link-static - +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \ - $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ -- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ - $(+preinit) $(+prectorT) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -549,11 +550,10 @@ - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) - +postinit = $(addprefix $(csu-objpfx),crtn.o) --+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o` --+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` --# Variants of the two previous definitions for linking PIE programs. - +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o` - +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o` -++prector = $(+prectorS) -++postctor = $(+postctorS) - # Variants of the two previous definitions for statically linking programs. - +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o` - +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` - +interp = $(addprefix $(elf-objpfx),interp.os) - endif - csu-objpfx = $(common-objpfx)csu/ diff --git a/glibc/patches/glibc-arm-hardfloat-3.patch b/glibc/patches/glibc-arm-hardfloat-3.patch deleted file mode 100644 index ff4997e51..000000000 --- a/glibc/patches/glibc-arm-hardfloat-3.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nrup a/elf/dl-load.c b/elf/dl-load.c ---- a/elf/dl-load.c 2012-06-06 13:07:41.727524312 -0600 -+++ b/elf/dl-load.c 2012-06-06 13:11:19.308681002 -0600 -@@ -2093,10 +2093,14 @@ _dl_map_object (struct link_map *loader, - soname = ((const char *) D_PTR (l, l_info[DT_STRTAB]) - + l->l_info[DT_SONAME]->d_un.d_val); - if (strcmp (name, soname) != 0) -- continue; -+#ifdef __arm__ -+ if (strcmp (name, "ld-linux.so.3") -+ || strcmp (soname, "ld-linux-armhf.so.3")) -+#endif -+ continue; - - /* We have a match on a new name -- cache it. */ -- add_name_to_object (l, soname); -+ add_name_to_object (l, name); - l->l_soname_added = 1; - } - diff --git a/glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch b/glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch deleted file mode 100644 index 1bc1a0641..000000000 --- a/glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S -index b4890f4..4b717d9 100644 ---- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S -+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S -@@ -48,8 +48,10 @@ - .section .text.ssse3,"ax",@progbits - #if !defined USE_AS_MEMPCPY && !defined USE_AS_MEMMOVE - ENTRY (MEMPCPY_CHK) -+#ifdef _FORTIFY_SOURCE - cmpq %rdx, %rcx - jb HIDDEN_JUMPTARGET (__chk_fail) -+#endif - END (MEMPCPY_CHK) - - ENTRY (MEMPCPY) -@@ -61,8 +63,10 @@ END (MEMPCPY) - - #if !defined USE_AS_BCOPY - ENTRY (MEMCPY_CHK) -+#ifdef _FORTIFY_SOURCE - cmpq %rdx, %rcx - jb HIDDEN_JUMPTARGET (__chk_fail) -+#endif - END (MEMCPY_CHK) - #endif - -diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S -index 1ca88c0..a2f140b 100644 ---- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S -+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S -@@ -48,8 +48,10 @@ - .section .text.ssse3,"ax",@progbits - #if !defined USE_AS_MEMPCPY && !defined USE_AS_MEMMOVE - ENTRY (MEMPCPY_CHK) -+#ifdef _FORTIFY_SOURCE - cmpq %rdx, %rcx - jb HIDDEN_JUMPTARGET (__chk_fail) -+#endif - END (MEMPCPY_CHK) - - ENTRY (MEMPCPY) -@@ -61,8 +63,10 @@ END (MEMPCPY) - - #if !defined USE_AS_BCOPY - ENTRY (MEMCPY_CHK) -+#ifdef _FORTIFY_SOURCE - cmpq %rdx, %rcx - jb HIDDEN_JUMPTARGET (__chk_fail) -+#endif - END (MEMCPY_CHK) - #endif - -diff --git a/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S -index 9687df0..2d0abee 100644 ---- a/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S -+++ b/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S -@@ -29,8 +29,10 @@ - .section .text.avx512,"ax",@progbits - #if defined PIC - ENTRY (MEMSET_CHK) -+#ifdef _FORTIFY_SOURCE - cmpq %rdx, %rcx - jb HIDDEN_JUMPTARGET (__chk_fail) -+#endif - END (MEMSET_CHK) - #endif - diff --git a/glibc/patches/glibc-fedora-__libc_multiple_libcs.patch b/glibc/patches/glibc-fedora-__libc_multiple_libcs.patch deleted file mode 100644 index 945a9551c..000000000 --- a/glibc/patches/glibc-fedora-__libc_multiple_libcs.patch +++ /dev/null @@ -1,79 +0,0 @@ -# -# Upstream discussions: -# https://sourceware.org/ml/libc-alpha/2014-02/msg00580.html -# -# Based on the following commit: -# -# From 16552c01a66633c9e412984d9d92616bd4e5303c Mon Sep 17 00:00:00 2001 -# From: Andreas Schwab <schwab(a)redhat.com> -# Date: Fri, 11 Jun 2010 11:04:11 +0200 -# Subject: [PATCH] Properly set __libc_multiple_libcs -# -# * elf/rtld.c (_dl_starting_up): Always define. -# (dl_main): Always set _dl_starting_up. -# * elf/dl-support.c (_dl_starting_up): Always define. -# * elf/dl-init.c (_dl_init): Always clear _dl_starting_up. -# -# --- -# ChangeLog | 7 +++++++ -# elf/dl-init.c | 4 ---- -# elf/dl-support.c | 2 -- -# elf/rtld.c | 4 ---- -# 4 files changed, 7 insertions(+), 10 deletions(-) -# -diff -urN glibc-2.20-205-ga39208b/elf/dl-init.c glibc-2.20-205-ga39208b.mod/elf/dl-init.c ---- glibc-2.20-205-ga39208b/elf/dl-init.c 2014-11-21 16:08:32.744913590 -0500 -+++ glibc-2.20-205-ga39208b.mod/elf/dl-init.c 2014-11-21 16:09:42.485708197 -0500 -@@ -119,8 +119,6 @@ - while (i-- > 0) - call_init (main_map->l_initfini[i], argc, argv, env); - --#ifndef HAVE_INLINED_SYSCALLS - /* Finished starting up. */ - _dl_starting_up = 0; --#endif - } -diff -urN glibc-2.20-205-ga39208b/elf/dl-support.c glibc-2.20-205-ga39208b.mod/elf/dl-support.c ---- glibc-2.20-205-ga39208b/elf/dl-support.c 2014-11-19 14:35:03.000000000 -0500 -+++ glibc-2.20-205-ga39208b.mod/elf/dl-support.c 2014-11-21 16:09:54.829671843 -0500 -@@ -118,10 +118,8 @@ - .r_nlist = 1, - }; - --#ifndef HAVE_INLINED_SYSCALLS - /* Nonzero during startup. */ - int _dl_starting_up = 1; --#endif - - /* Random data provided by the kernel. */ - void *_dl_random; -diff -urN glibc-2.20-205-ga39208b/elf/rtld.c glibc-2.20-205-ga39208b.mod/elf/rtld.c ---- glibc-2.20-205-ga39208b/elf/rtld.c 2014-11-21 16:08:32.745913587 -0500 -+++ glibc-2.20-205-ga39208b.mod/elf/rtld.c 2014-11-21 16:09:05.614816785 -0500 -@@ -107,7 +107,6 @@ - struct audit_list *next; - } *audit_list; - --#ifndef HAVE_INLINED_SYSCALLS - /* Set nonzero during loading and initialization of executable and - libraries, cleared before the executable's entry point runs. This - must not be initialized to nonzero, because the unused dynamic -@@ -117,7 +116,6 @@ - never be called. */ - int _dl_starting_up = 0; - rtld_hidden_def (_dl_starting_up) --#endif - - /* This is the structure which defines all variables global to ld.so - (except those which cannot be added for some reason). */ -@@ -776,10 +774,8 @@ - /* Process the environment variable which control the behaviour. */ - process_envvars (&mode); - --#ifndef HAVE_INLINED_SYSCALLS - /* Set up a flag which tells we are just starting. */ - _dl_starting_up = 1; --#endif - - if (*user_entry == (ElfW(Addr)) ENTRY_POINT) - { diff --git a/glibc/patches/glibc-fedora-localedef.patch b/glibc/patches/glibc-fedora-localedef.patch deleted file mode 100644 index ee1463a2e..000000000 --- a/glibc/patches/glibc-fedora-localedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrup a/localedata/Makefile b/localedata/Makefile ---- a/localedata/Makefile 2012-06-05 07:42:49.000000000 -0600 -+++ b/localedata/Makefile 2012-06-07 12:15:21.776318827 -0600 -@@ -211,6 +211,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo - echo -n '...'; \ - input=`echo $$locale | sed 's/$[^.]*$[^(a)]*$.*$/\1\2/'`; \ - $(LOCALEDEF) --alias-file=../intl/locale.alias \ -+ --no-archive \ - -i locales/$$input -c -f charmaps/$$charset \ - $(addprefix --prefix=,$(install_root)) $$locale; \ - echo ' done'; \ diff --git a/glibc/patches/glibc-fedora-locarchive.patch b/glibc/patches/glibc-fedora-locarchive.patch deleted file mode 100644 index 9a702af55..000000000 --- a/glibc/patches/glibc-fedora-locarchive.patch +++ /dev/null @@ -1,51 +0,0 @@ -This is a part of commit glibc-2.3.3-1492-ga891c7b, -needed for fedora/build-locale-archive.c only. - -diff -Nrup a/ChangeLog.17 b/ChangeLog.17 ---- a/ChangeLog.17 2012-06-05 07:42:49.000000000 -0600 -+++ b/ChangeLog.17 2012-06-07 12:15:21.564319619 -0600 -@@ -11818,6 +11829,10 @@ d2009-10-30 Ulrich Drepper <drepper@re - [BZ #4368] - * stdlib/stdlib.h: Remove obsolete part of comment for realpath. - -+2007-04-16 Jakub Jelinek <jakub(a)redhat.com> -+ -+ * locale/programs/locarchive.c (add_alias, insert_name): Remove static. -+ - 2007-04-16 Ulrich Drepper <drepper(a)redhat.com> - - [BZ #4364] -diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c ---- a/locale/programs/locarchive.c 2012-06-05 07:42:49.000000000 -0600 -+++ b/locale/programs/locarchive.c 2012-06-07 12:15:21.585319540 -0600 -@@ -252,9 +252,9 @@ oldlocrecentcmp (const void *a, const vo - /* forward decls for below */ - static uint32_t add_locale (struct locarhandle *ah, const char *name, - locale_data_t data, bool replace); --static void add_alias (struct locarhandle *ah, const char *alias, -- bool replace, const char *oldname, -- uint32_t *locrec_offset_p); -+void add_alias (struct locarhandle *ah, const char *alias, -+ bool replace, const char *oldname, -+ uint32_t *locrec_offset_p); - - - static bool -@@ -635,7 +635,7 @@ close_archive (struct locarhandle *ah) - #include "../../intl/explodename.c" - #include "../../intl/l10nflist.c" - --static struct namehashent * -+struct namehashent * - insert_name (struct locarhandle *ah, - const char *name, size_t name_len, bool replace) - { -@@ -693,7 +693,7 @@ insert_name (struct locarhandle *ah, - return &namehashtab[idx]; - } - --static void -+void - add_alias (struct locarhandle *ah, const char *alias, bool replace, - const char *oldname, uint32_t *locrec_offset_p) - { diff --git a/glibc/patches/glibc-fedora-nscd.patch b/glibc/patches/glibc-fedora-nscd.patch deleted file mode 100644 index a26b9283d..000000000 --- a/glibc/patches/glibc-fedora-nscd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf ---- a/nscd/nscd.conf 2012-06-05 07:42:49.000000000 -0600 -+++ b/nscd/nscd.conf 2012-06-07 12:15:21.818318670 -0600 -@@ -33,7 +33,7 @@ - # logfile /var/log/nscd.log - # threads 4 - # max-threads 32 --# server-user nobody -+ server-user nscd - # stat-user somebody - debug-level 0 - # reload-count 5 diff --git a/glibc/patches/glibc-rh1070416.patch b/glibc/patches/glibc-rh1070416.patch deleted file mode 100644 index 7e4235e28..000000000 --- a/glibc/patches/glibc-rh1070416.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/nscd/nscd.service -+++ b/nscd/nscd.service -@@ -2,6 +2,7 @@ - - [Unit] - Description=Name Service Cache Daemon -+After=syslog.target - - [Service] - Type=forking -@@ -17,3 +18,4 @@ - - [Install] - WantedBy=multi-user.target -+Also=nscd.socket -diff --git a/nscd/nscd.socket b/nscd/nscd.socket -new file mode 100644 -index 0000000..7e512d5 ---- /dev/null -+++ b/nscd/nscd.socket -@@ -0,0 +1,8 @@ -+[Unit] -+Description=Name Service Cache Daemon Socket -+ -+[Socket] -+ListenDatagram=/var/run/nscd/socket -+ -+[Install] -+WantedBy=sockets.target hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 46ad8236e7cda033d43d9132bc72881f87b09fb1
by git＠ipfire.org 25 Jun '18

25 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 3.x development tree". The branch, master has been updated via 46ad8236e7cda033d43d9132bc72881f87b09fb1 (commit) via 5d17c06060b206bb8043f355fa9f21f23995c0ef (commit) via 8c785caba7469a9db7700c7217411dada93107e0 (commit) from 2dfd22f3bf1c09ebff3044c797f9ed4f899aaeee (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 46ad8236e7cda033d43d9132bc72881f87b09fb1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 25 11:50:27 2018 +0100 iptables: New package This patch brings back the userspace tools for iptables Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d17c06060b206bb8043f355fa9f21f23995c0ef Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 25 11:49:28 2018 +0100 kernel: Re-enable support for iptables This patch re-enabled iptables for IPv6 and IPv4 and removes support for nftables. nftables is likely to be discontinued by the kernel developers in favour of bpfilter. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c785caba7469a9db7700c7217411dada93107e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 25 11:16:54 2018 +0100 nftables: Drop package nftables is likely to be discontinued in favour of bpfilter Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libnftnl/libnftnl.nm => iptables/iptables.nm | 30 ++++---- kernel/config-generic | 105 +++++++++++++-------------- kernel/kernel.nm | 2 +- nftables/nftables.nm | 51 ------------- 4 files changed, 69 insertions(+), 119 deletions(-) rename libnftnl/libnftnl.nm => iptables/iptables.nm (53%) delete mode 100644 nftables/nftables.nm Difference in files: diff --git a/libnftnl/libnftnl.nm b/iptables/iptables.nm similarity index 53% rename from libnftnl/libnftnl.nm rename to iptables/iptables.nm index 3ad24a941..ca62d0264 100644 --- a/libnftnl/libnftnl.nm +++ b/iptables/iptables.nm @@ -3,33 +3,35 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -name = libnftnl -version = 1.0.6 +name = iptables +version = 1.6.2 release = 1 -thisapp = %{name}-%{version} groups = Networking/Tools -url = http://netfilter.org/projects/libnftnl -license = GPLv2 -summary = Library for low-level interaction with nftables +url = http://www.netfilter.org +license = GPL+ +summary = Tools for managing Linux kernel packet filtering capabilities description - Library for low-level interaction with nftables Netlink's API over - libmnl. + The iptables utility controls the network packet filtering code + in the Linux kernel. end -source_dl = http://ftp.netfilter.org/pub/libnftnl/ +source_dl = http://ftp.netfilter.org/pub/iptables/ sources = %{thisapp}.tar.bz2 build requires - autoconf - autogen - automake - libmnl-devel - libtool + libnfnetlink-devel end + configure_options += \ + --disable-nftables + + install_cmds + # Remove absolute symlink + ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml + end end packages diff --git a/kernel/config-generic b/kernel/config-generic index 876ef6b07..f82742647 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -623,6 +623,7 @@ CONFIG_NF_LOG_COMMON=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y @@ -658,35 +659,8 @@ CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NF_NAT_REDIRECT=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_INET=m -CONFIG_NF_TABLES_NETDEV=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m -CONFIG_NFT_RT=m -CONFIG_NFT_NUMGEN=m -CONFIG_NFT_CT=m -CONFIG_NFT_SET_RBTREE=m -CONFIG_NFT_SET_HASH=m -CONFIG_NFT_SET_BITMAP=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_MASQ=m -CONFIG_NFT_REDIR=m -CONFIG_NFT_NAT=m -CONFIG_NFT_OBJREF=m -CONFIG_NFT_QUEUE=m -CONFIG_NFT_QUOTA=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_REJECT_INET=m -# CONFIG_NFT_COMPAT is not set -CONFIG_NFT_HASH=m -CONFIG_NFT_FIB=m -CONFIG_NFT_FIB_INET=m -CONFIG_NF_DUP_NETDEV=m -CONFIG_NFT_DUP_NETDEV=m -CONFIG_NFT_FWD_NETDEV=m +CONFIG_NETFILTER_SYNPROXY=m +# CONFIG_NF_TABLES is not set CONFIG_NETFILTER_XTABLES=y # @@ -699,9 +673,13 @@ CONFIG_NETFILTER_XT_SET=m # # Xtables targets # +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_HMARK=m CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m @@ -711,11 +689,15 @@ CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # # Xtables matches @@ -741,7 +723,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPCOMP=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -# CONFIG_NETFILTER_XT_MATCH_IPVS is not set +CONFIG_NETFILTER_XT_MATCH_IPVS=m CONFIG_NETFILTER_XT_MATCH_L2TP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m @@ -833,26 +815,34 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_REJECT_IPV4=m -CONFIG_NFT_DUP_IPV4=m -CONFIG_NFT_FIB_IPV4=m -CONFIG_NF_TABLES_ARP=m CONFIG_NF_DUP_IPV4=m CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m CONFIG_NF_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NF_NAT_MASQUERADE_IPV4=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_REDIR_IPV4=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_GRE=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m @@ -863,24 +853,31 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_REJECT_IPV6=m -CONFIG_NFT_DUP_IPV6=m -CONFIG_NFT_FIB_IPV6=m CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m -# CONFIG_IP6_NF_IPTABLES is not set -CONFIG_NF_TABLES_BRIDGE=m -CONFIG_NFT_BRIDGE_META=m -CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NF_LOG_BRIDGE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1015,6 +1012,7 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1022,6 +1020,7 @@ CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_ACT_VLAN=m CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_SKBMOD=m CONFIG_NET_ACT_IFE=m CONFIG_NET_ACT_TUNNEL_KEY=m diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 11f7fabe3..200a3f2c8 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 4.13.3 -release = 1 +release = 2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> diff --git a/nftables/nftables.nm b/nftables/nftables.nm deleted file mode 100644 index f8a97d053..000000000 --- a/nftables/nftables.nm +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = nftables -version = 0.100 -snapshot = 20160602 -release = 1.%{snapshot} -thisapp = %{name}-%{snapshot} - -groups = Networking/Tools -url = http://netfilter.org/projects/nftables/ -license = GPLv2 -summary = Netfilter Tables userspace utillites - -description - %{summary} -end - -source_dl = http://ftp.netfilter.org/pub/nftables/snapshot/ -sources = %{thisapp}.tar.bz2 - -build - requires - autoconf - autogen - automake - bison - docbook2X - docbook-xsl - flex - gmp-devel - libtool - libmnl-devel - libnftnl-devel >= 1.0.5 - readline-devel - end - - prepare_cmds - ./autogen.sh - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core122, updated. 715ed18b2818628e8d4e650b2cfadb459a3ef320
by git＠ipfire.org 22 Jun '18

22 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 updated via 715ed18b2818628e8d4e650b2cfadb459a3ef320 (commit) from 1e23f83876777ec293dcc417bdff372d0546ceef (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 715ed18b2818628e8d4e650b2cfadb459a3ef320 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 22 16:20:06 2018 +0200 core122: add new console settings Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/122/filelists/files | 3 +++ 1 file changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/122/filelists/files b/config/rootfiles/core/122/filelists/files index f7c692d8b..104e52a0c 100644 --- a/config/rootfiles/core/122/filelists/files +++ b/config/rootfiles/core/122/filelists/files @@ -1,13 +1,16 @@ etc/system-release etc/issue +etc/inittab etc/rc.d/init.d/acpid etc/rc.d/init.d/collectd +etc/rc.d/init.d/console etc/rc.d/init.d/firstsetup etc/rc.d/init.d/leds etc/rc.d/init.d/partresize etc/rc.d/rc0.d/K87acpid etc/rc.d/rc3.d/S12acpid etc/rc.d/rc6.d/K87acpid +etc/securetty srv/web/ipfire/cgi-bin/entropy.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, aarch64, updated. 9eca93eaa0b4d6a4083dc71738c4536caee8a21e
by git＠ipfire.org 22 Jun '18

22 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, aarch64 has been updated via 9eca93eaa0b4d6a4083dc71738c4536caee8a21e (commit) from 5b17da41c1f827230088823d9c1533e0b710813f (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 9eca93eaa0b4d6a4083dc71738c4536caee8a21e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 22 06:40:32 2018 +0200 kernel: fix dtb installation on 32bit arm Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 4355daa9f..4120a08ce 100644 --- a/lfs/linux +++ b/lfs/linux @@ -197,11 +197,13 @@ endif ifeq "$(BUILD_PLATFORM)" "arm" cd $(DIR_APP) && make $(MAKETUNING) dtbs - mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) - cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \ - cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \ - chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \ + rm -rf /boot/dts /boot/dtb-$(VER)-$(VERSUFIX) + mkdir -p /boot/dts + cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/ && for f in $$(find -name *.dtb); do \ + cp -v --parents $$f /boot/ ; \ + chmod 644 /boot/$$f ; \ done + mv /boot/dts /boot/dtb-$(VER)-$(VERSUFIX) endif ifeq "$(LASTKERNEL)" "1" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. debf78c1d4dee213e4e03c2fc8baedf4faee1466
by git＠ipfire.org 21 Jun '18

21 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 updated via debf78c1d4dee213e4e03c2fc8baedf4faee1466 (commit) from ff8df1917efdd6f935fdea4a58ff8f97fda853cc (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 debf78c1d4dee213e4e03c2fc8baedf4faee1466 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 21 15:53:38 2018 +0100 Build efibootmgr and efivars only for x86_64 and aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/{ => aarch64}/efibootmgr | 0 config/rootfiles/common/{ => aarch64}/efivar | 0 config/rootfiles/common/{ => x86_64}/efibootmgr | 0 config/rootfiles/common/{ => x86_64}/efivar | 0 lfs/efibootmgr | 1 + lfs/efivar | 1 + 6 files changed, 2 insertions(+) copy config/rootfiles/common/{ => aarch64}/efibootmgr (100%) copy config/rootfiles/common/{ => aarch64}/efivar (100%) rename config/rootfiles/common/{ => x86_64}/efibootmgr (100%) rename config/rootfiles/common/{ => x86_64}/efivar (100%) Difference in files: diff --git a/config/rootfiles/common/efibootmgr b/config/rootfiles/common/aarch64/efibootmgr similarity index 100% rename from config/rootfiles/common/efibootmgr rename to config/rootfiles/common/aarch64/efibootmgr diff --git a/config/rootfiles/common/efivar b/config/rootfiles/common/aarch64/efivar similarity index 100% rename from config/rootfiles/common/efivar rename to config/rootfiles/common/aarch64/efivar diff --git a/config/rootfiles/common/x86_64/efibootmgr b/config/rootfiles/common/x86_64/efibootmgr new file mode 100644 index 000000000..56a0eb149 --- /dev/null +++ b/config/rootfiles/common/x86_64/efibootmgr @@ -0,0 +1,4 @@ +usr/sbin/efibootdump +usr/sbin/efibootmgr +#usr/share/man/man8/efibootdump.8 +#usr/share/man/man8/efibootmgr.8 diff --git a/config/rootfiles/common/x86_64/efivar b/config/rootfiles/common/x86_64/efivar new file mode 100644 index 000000000..4018e4c08 --- /dev/null +++ b/config/rootfiles/common/x86_64/efivar @@ -0,0 +1,46 @@ +usr/bin/efivar +#usr/include/efivar +#usr/include/efivar/efiboot-creator.h +#usr/include/efivar/efiboot-loadopt.h +#usr/include/efivar/efiboot.h +#usr/include/efivar/efivar-dp.h +#usr/include/efivar/efivar-guids.h +#usr/include/efivar/efivar.h +#usr/lib/libefiboot.so +usr/lib/libefiboot.so.1 +usr/lib/libefiboot.so.1.35 +#usr/lib/libefivar.so +usr/lib/libefivar.so.1 +usr/lib/libefivar.so.1.35 +#usr/lib/pkgconfig/efiboot.pc +#usr/lib/pkgconfig/efivar.pc +#usr/share/man/man1/efivar.1 +#usr/share/man/man3/efi_append_variable.3 +#usr/share/man/man3/efi_del_variable.3 +#usr/share/man/man3/efi_get_next_variable_name.3 +#usr/share/man/man3/efi_get_variable.3 +#usr/share/man/man3/efi_get_variable_attributes.3 +#usr/share/man/man3/efi_get_variable_size.3 +#usr/share/man/man3/efi_guid_to_id_guid.3 +#usr/share/man/man3/efi_guid_to_name.3 +#usr/share/man/man3/efi_guid_to_str.3 +#usr/share/man/man3/efi_guid_to_symbol.3 +#usr/share/man/man3/efi_name_to_guid.3 +#usr/share/man/man3/efi_set_variable.3 +#usr/share/man/man3/efi_str_to_guid.3 +#usr/share/man/man3/efi_symbol_to_guid.3 +#usr/share/man/man3/efi_variable_alloc.3 +#usr/share/man/man3/efi_variable_export.3 +#usr/share/man/man3/efi_variable_free.3 +#usr/share/man/man3/efi_variable_get_attributes.3 +#usr/share/man/man3/efi_variable_get_data.3 +#usr/share/man/man3/efi_variable_get_guid.3 +#usr/share/man/man3/efi_variable_get_name.3 +#usr/share/man/man3/efi_variable_import.3 +#usr/share/man/man3/efi_variable_realize.3 +#usr/share/man/man3/efi_variable_set_attributes.3 +#usr/share/man/man3/efi_variable_set_data.3 +#usr/share/man/man3/efi_variable_set_guid.3 +#usr/share/man/man3/efi_variable_set_name.3 +#usr/share/man/man3/efi_variable_t.3 +#usr/share/man/man3/efi_variables_supported.3 diff --git a/lfs/efibootmgr b/lfs/efibootmgr index 0503b6b1b..9a2a91779 100644 --- a/lfs/efibootmgr +++ b/lfs/efibootmgr @@ -31,6 +31,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = aarch64 x86_64 ############################################################################### # Top-level Rules diff --git a/lfs/efivar b/lfs/efivar index 1362c625b..90d4c57e7 100644 --- a/lfs/efivar +++ b/lfs/efivar @@ -31,6 +31,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = aarch64 x86_64 ############################################################################### # Top-level Rules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, aarch64, created. 5b17da41c1f827230088823d9c1533e0b710813f
by git＠ipfire.org 21 Jun '18

21 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, aarch64 has been created at 5b17da41c1f827230088823d9c1533e0b710813f (commit) - Log ----------------------------------------------------------------- commit 5b17da41c1f827230088823d9c1533e0b710813f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 21 06:20:35 2018 +0100 kernel: add config for aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit c8dfbfabf58c16d97156b3fe02b62f4edc8bb3af Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 21 06:18:49 2018 +0100 collectd: initskript: dont run sensors-detect on aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2bd9316d9d0b15d9a72e59a65df2b6c5a1b082e1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 21 06:17:49 2018 +0100 rpi-firmware: build for aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 963f6e973ab186d54506f6a522d291a8f332fa77 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 21 06:11:25 2018 +0100 u-boot: add config for aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core122, updated. 1e23f83876777ec293dcc417bdff372d0546ceef
by git＠ipfire.org 20 Jun '18

20 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 updated via 1e23f83876777ec293dcc417bdff372d0546ceef (commit) from 3069380c4189a1d875717441d88082286a85586b (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 1e23f83876777ec293dcc417bdff372d0546ceef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 20 13:20:41 2018 +0200 core122: exclude uEnv.txt and uboot.env Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/122/exclude | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/core/122/exclude b/config/rootfiles/core/122/exclude index d6fd053b6..f94cfef6b 100644 --- a/config/rootfiles/core/122/exclude +++ b/config/rootfiles/core/122/exclude @@ -1,6 +1,8 @@ boot/config.txt boot/grub/grub.cfg boot/grub/grubenv +boot/uEnv.txt +boot/uboot.env etc/alternatives etc/collectd.custom etc/default/grub hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bc91a66281193d7fca60858e5efed5ec73ad9fe0
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, next has been updated via bc91a66281193d7fca60858e5efed5ec73ad9fe0 (commit) via 319aedce97f16d62e8ceba24f8595f84f5bbab57 (commit) via 823c6d270af23019d00ded527120d5391a6ea810 (commit) via e3dda65eba58c6d168fcb1c98573a08d8c79703a (commit) via 1feef6be7c3e62be8489be3ee265217bb12c58f8 (commit) via 291bfda71eb40a20dd4db77bacef84717ad69e82 (commit) via b1f4acaddec5da3db7317b236fb759f95ff3ebe8 (commit) via e4529a9bc0db6882c102047dad9455c07ff74b20 (commit) from beac479f2d1f4ad3e758df2346b6d5f0334458ea (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 bc91a66281193d7fca60858e5efed5ec73ad9fe0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 19 11:34:38 2018 +0100 core123: Ship updated iana-etc Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 319aedce97f16d62e8ceba24f8595f84f5bbab57 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Jun 18 20:15:14 2018 +0200 iana-etc: update to 2.30 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 823c6d270af23019d00ded527120d5391a6ea810 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 19:57:56 2018 +0200 libstatgrab: Update tp 0.91 Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e3dda65eba58c6d168fcb1c98573a08d8c79703a Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 19:16:36 2018 +0200 OpenVPN: Delete 1024 bit DH-parameter from menu Since OpenVPN-2.4.x do not accepts 1024 bit DH-parameter for security concerns anymore, it has been removed from the menu. Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1feef6be7c3e62be8489be3ee265217bb12c58f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 19 11:31:01 2018 +0100 core123: Ship /var/ipfire/backup/exclude Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 291bfda71eb40a20dd4db77bacef84717ad69e82 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 18 19:05:56 2018 +0200 backup: Exclude OpenVPNs ovpn.cnf from backup This fixes also bug #11773 Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b1f4acaddec5da3db7317b236fb759f95ff3ebe8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 19 11:30:26 2018 +0100 core123: Ship updated gnupg Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e4529a9bc0db6882c102047dad9455c07ff74b20 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Jun 18 18:46:54 2018 +0200 gnupg: update to 1.4.23 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/backup/exclude | 1 + config/rootfiles/core/123/filelists/files | 1 + .../{oldcore/106 => core/123}/filelists/gnupg | 0 config/rootfiles/core/123/filelists/iana-etc | 1 + config/rootfiles/packages/libstatgrab | 96 +++++++++++++++++++++- html/cgi-bin/ovpnmain.cgi | 2 - lfs/gnupg | 4 +- lfs/iana-etc | 4 +- lfs/libstatgrab | 28 +++++-- 9 files changed, 122 insertions(+), 15 deletions(-) copy config/rootfiles/{oldcore/106 => core/123}/filelists/gnupg (100%) create mode 120000 config/rootfiles/core/123/filelists/iana-etc Difference in files: diff --git a/config/backup/exclude b/config/backup/exclude index 6f09a1f9c..7ca9d10b2 100644 --- a/config/backup/exclude +++ b/config/backup/exclude @@ -2,6 +2,7 @@ /etc/sysconfig/lm_sensors /var/ipfire/ethernet/settings /var/ipfire/firewall/bin/* +/var/ipfire/ovpn/openssl/* /var/ipfire/proxy/calamaris/bin/* /var/ipfire/qos/bin/qos.pl /var/ipfire/urlfilter/blacklists/*/*.db diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files index 2e8d7961f..718af9eda 100644 --- a/config/rootfiles/core/123/filelists/files +++ b/config/rootfiles/core/123/filelists/files @@ -3,4 +3,5 @@ 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/backup/exclude var/ipfire/langs diff --git a/config/rootfiles/core/123/filelists/gnupg b/config/rootfiles/core/123/filelists/gnupg new file mode 120000 index 000000000..a1a156447 --- /dev/null +++ b/config/rootfiles/core/123/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/iana-etc b/config/rootfiles/core/123/filelists/iana-etc new file mode 120000 index 000000000..1f3d54dbd --- /dev/null +++ b/config/rootfiles/core/123/filelists/iana-etc @@ -0,0 +1 @@ +../../../common/iana-etc \ No newline at end of file diff --git a/config/rootfiles/packages/libstatgrab b/config/rootfiles/packages/libstatgrab index 2c6141163..cebfb4afe 100644 --- a/config/rootfiles/packages/libstatgrab +++ b/config/rootfiles/packages/libstatgrab @@ -3,33 +3,123 @@ usr/bin/statgrab #usr/bin/statgrab-make-mrtg-config #usr/bin/statgrab-make-mrtg-index #usr/include/statgrab.h -#usr/include/statgrab_deprecated.h #usr/lib/libstatgrab.a #usr/lib/libstatgrab.la #usr/lib/libstatgrab.so -usr/lib/libstatgrab.so.6 -usr/lib/libstatgrab.so.6.2.3 +usr/lib/libstatgrab.so.10 +usr/lib/libstatgrab.so.10.0.0 #usr/lib/pkgconfig/libstatgrab.pc +#usr/share/doc/libstatgrab +#usr/share/doc/libstatgrab/AUTHORS +#usr/share/doc/libstatgrab/COPYING +#usr/share/doc/libstatgrab/COPYING.LGPL +#usr/share/doc/libstatgrab/NEWS +#usr/share/doc/libstatgrab/PLATFORMS +#usr/share/doc/libstatgrab/README #usr/share/man/man1/saidar.1 #usr/share/man/man1/statgrab-make-mrtg-config.1 #usr/share/man/man1/statgrab-make-mrtg-index.1 #usr/share/man/man1/statgrab.1 +#usr/share/man/man3/libstatgrab.3 +#usr/share/man/man3/sg_clear_error.3 +#usr/share/man/man3/sg_comp_destroy.3 +#usr/share/man/man3/sg_comp_get_tls.3 +#usr/share/man/man3/sg_comp_init.3 +#usr/share/man/man3/sg_disk_io_compare_name.3 +#usr/share/man/man3/sg_disk_io_compare_traffic.3 +#usr/share/man/man3/sg_drop_privileges.3 +#usr/share/man/man3/sg_free_cpu_stats.3 +#usr/share/man/man3/sg_free_disk_io_stats.3 +#usr/share/man/man3/sg_free_fs_stats.3 +#usr/share/man/man3/sg_free_host_info.3 +#usr/share/man/man3/sg_free_load_stats.3 +#usr/share/man/man3/sg_free_mem_stats.3 +#usr/share/man/man3/sg_free_network_iface_stats.3 +#usr/share/man/man3/sg_free_network_io_stats.3 +#usr/share/man/man3/sg_free_page_stats.3 +#usr/share/man/man3/sg_free_process_count.3 +#usr/share/man/man3/sg_free_stats_buf.3 +#usr/share/man/man3/sg_free_swap_stats.3 +#usr/share/man/man3/sg_free_user_stats.3 +#usr/share/man/man3/sg_fs_compare_device_name.3 +#usr/share/man/man3/sg_fs_compare_mnt_point.3 #usr/share/man/man3/sg_get_cpu_percents.3 +#usr/share/man/man3/sg_get_cpu_percents_of.3 +#usr/share/man/man3/sg_get_cpu_percents_r.3 #usr/share/man/man3/sg_get_cpu_stats.3 #usr/share/man/man3/sg_get_cpu_stats_diff.3 +#usr/share/man/man3/sg_get_cpu_stats_diff_between.3 +#usr/share/man/man3/sg_get_cpu_stats_r.3 #usr/share/man/man3/sg_get_disk_io_stats.3 #usr/share/man/man3/sg_get_disk_io_stats_diff.3 +#usr/share/man/man3/sg_get_disk_io_stats_diff_between.3 +#usr/share/man/man3/sg_get_disk_io_stats_r.3 +#usr/share/man/man3/sg_get_error.3 +#usr/share/man/man3/sg_get_error_arg.3 +#usr/share/man/man3/sg_get_error_details.3 +#usr/share/man/man3/sg_get_error_errno.3 #usr/share/man/man3/sg_get_fs_stats.3 +#usr/share/man/man3/sg_get_fs_stats_diff.3 +#usr/share/man/man3/sg_get_fs_stats_diff_between.3 +#usr/share/man/man3/sg_get_fs_stats_r.3 #usr/share/man/man3/sg_get_host_info.3 +#usr/share/man/man3/sg_get_host_info_r.3 #usr/share/man/man3/sg_get_load_stats.3 +#usr/share/man/man3/sg_get_load_stats_r.3 #usr/share/man/man3/sg_get_mem_stats.3 +#usr/share/man/man3/sg_get_mem_stats_r.3 +#usr/share/man/man3/sg_get_nelements.3 #usr/share/man/man3/sg_get_network_iface_stats.3 +#usr/share/man/man3/sg_get_network_iface_stats_r.3 #usr/share/man/man3/sg_get_network_io_stats.3 #usr/share/man/man3/sg_get_network_io_stats_diff.3 +#usr/share/man/man3/sg_get_network_io_stats_diff_between.3 +#usr/share/man/man3/sg_get_network_io_stats_r.3 #usr/share/man/man3/sg_get_page_stats.3 #usr/share/man/man3/sg_get_page_stats_diff.3 +#usr/share/man/man3/sg_get_page_stats_diff_between.3 +#usr/share/man/man3/sg_get_page_stats_r.3 #usr/share/man/man3/sg_get_process_count.3 +#usr/share/man/man3/sg_get_process_count_of.3 +#usr/share/man/man3/sg_get_process_count_r.3 #usr/share/man/man3/sg_get_process_stats.3 +#usr/share/man/man3/sg_get_process_stats_r.3 #usr/share/man/man3/sg_get_swap_stats.3 +#usr/share/man/man3/sg_get_swap_stats_r.3 #usr/share/man/man3/sg_get_user_stats.3 +#usr/share/man/man3/sg_get_user_stats_r.3 +#usr/share/man/man3/sg_get_valid_filesystems.3 +#usr/share/man/man3/sg_global_lock.3 +#usr/share/man/man3/sg_global_unlock.3 +#usr/share/man/man3/sg_init.3 +#usr/share/man/man3/sg_internal-intro.3 +#usr/share/man/man3/sg_intro.3 +#usr/share/man/man3/sg_lock_mutex.3 +#usr/share/man/man3/sg_network_iface_compare_name.3 +#usr/share/man/man3/sg_network_io_compare_name.3 +#usr/share/man/man3/sg_process_compare_cpu.3 +#usr/share/man/man3/sg_process_compare_gid.3 +#usr/share/man/man3/sg_process_compare_name.3 +#usr/share/man/man3/sg_process_compare_pid.3 +#usr/share/man/man3/sg_process_compare_res.3 +#usr/share/man/man3/sg_process_compare_size.3 +#usr/share/man/man3/sg_process_compare_time.3 +#usr/share/man/man3/sg_process_compare_uid.3 +#usr/share/man/man3/sg_prove_vector.3 +#usr/share/man/man3/sg_set_error.3 +#usr/share/man/man3/sg_set_error_with_errno.3 +#usr/share/man/man3/sg_set_error_with_errno_code.3 +#usr/share/man/man3/sg_set_valid_filesystems.3 +#usr/share/man/man3/sg_shutdown.3 +#usr/share/man/man3/sg_snapshot.3 +#usr/share/man/man3/sg_str_error.3 +#usr/share/man/man3/sg_strperror.3 +#usr/share/man/man3/sg_unlock_mutex.3 +#usr/share/man/man3/sg_vector_clear.3 +#usr/share/man/man3/sg_vector_clone.3 +#usr/share/man/man3/sg_vector_clone_into.3 +#usr/share/man/man3/sg_vector_compute_diff.3 +#usr/share/man/man3/sg_vector_create.3 +#usr/share/man/man3/sg_vector_free.3 +#usr/share/man/man3/sg_vector_resize.3 #usr/share/man/man3/statgrab.3 diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 0bc28cefe..4bc3473ab 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1291,7 +1291,6 @@ END <form method='post'><input type='hidden' name='AREUSURE' value='yes' /> <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' /> <select name='DHLENGHT'> - <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> @@ -1973,7 +1972,6 @@ 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='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> diff --git a/lfs/gnupg b/lfs/gnupg index f131d2b08..fc6583110 100644 --- a/lfs/gnupg +++ b/lfs/gnupg @@ -24,7 +24,7 @@ include Config -VER = 1.4.22 +VER = 1.4.23 THISAPP = gnupg-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 082bda3951a94743e76b83fcf3627547 +$(DL_FILE)_MD5 = b1df02c73572f27bc859ac05ff2259ab install : $(TARGET) diff --git a/lfs/iana-etc b/lfs/iana-etc index 6bcbf3438..2708b1b0d 100644 --- a/lfs/iana-etc +++ b/lfs/iana-etc @@ -24,7 +24,7 @@ include Config -VER = 2.10 +VER = 2.30 THISAPP = iana-etc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 53dea53262b281322143c744ca60ffbb +$(DL_FILE)_MD5 = 3ba3afb1d1b261383d247f46cb135ee8 install : $(TARGET) diff --git a/lfs/libstatgrab b/lfs/libstatgrab index 2e673eeb1..8e62b4149 100644 --- a/lfs/libstatgrab +++ b/lfs/libstatgrab @@ -1,6 +1,21 @@ ############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# # +# IPFire.org - A linux based firewall # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # ############################################################################### ############################################################################### @@ -9,7 +24,7 @@ include Config -VER = 0.17 +VER = 0.91 THISAPP = libstatgrab-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -17,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libstatgrab -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -29,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 58385c9392898be3b09ffc5e3ebe8717 +$(DL_FILE)_MD5 = b906d312076ca9be3d5188edfe07f496 install : $(TARGET) @@ -62,9 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) @$(POSTBUILD) 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