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 93b0b7a9ed687f1ab296a62f2f4181e14f681c79 (commit) via a12507ba48bbc8249d3606b49283890613be53cf (commit) via cf6c8e67fbbcbd465748055992d4c0af83697884 (commit) via 83e6fa56a56e729390b50b6a339df40b2e365440 (commit) via c1dd8d251103c3a4839e48ee6761921191ab6410 (commit) via 5b5785e23a108f1b6af283ad8aec4e29958621d4 (commit) via f70fa093ec1e3b8da945dfbd74a636e896821929 (commit) via 68b5e6b1bb65c70f76899dc9fae7cdcde0645cd3 (commit) via eb53b56d3a61be12f474c5d426e6fe70ca3a1515 (commit) from 8e308e4eb2534c260a29a17bd66700f894a84cb9 (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 93b0b7a9ed687f1ab296a62f2f4181e14f681c79 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 7 13:45:23 2021 +0000
core155: Ship libxcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a12507ba48bbc8249d3606b49283890613be53cf Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 6 16:18:00 2021 +0000
sysvinit: Fix check for static version of libcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cf6c8e67fbbcbd465748055992d4c0af83697884 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 09:51:26 2021 -0500
glibc: Disable libcrypt and ship libxcrypt instead
libcrypt is deprecated in glibc, and is now explicitely disabled.
Instead we ship libxcrypt which is an alternative implemenation and can be used as a drop-in replacement.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 83e6fa56a56e729390b50b6a339df40b2e365440 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 17:08:21 2021 +0000
rootfiles: Fix any files that lack a newline at the end
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c1dd8d251103c3a4839e48ee6761921191ab6410 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 17:01:29 2021 +0000
Revert "dhcpcd: Update to 9.4.0"
This reverts commit 15194c7c52c2438611832cecf4dad24fec304322.
This version still fails to run on i586 without this patch.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5b5785e23a108f1b6af283ad8aec4e29958621d4 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 16:54:03 2021 +0000
core155: Ship freetype
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f70fa093ec1e3b8da945dfbd74a636e896821929 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 13:55:41 2021 +0100
ghostscript: Addition of patch to fix freetype problem
-Addition of patch to ghoscript as freetype version 2.10.3 and later have withdrawn a macro that ghostscript used. Confirmed that without the patch ghostscript failed to build due to the lack of the FT_CALLBACK_DEF() macro. The fix is to explicitly declare the callbacks file static. - Update lfs to apply patch - Add patch to src/patches
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 68b5e6b1bb65c70f76899dc9fae7cdcde0645cd3 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Feb 4 13:55:27 2021 +0100
freetype: Update to 2.10.4
- Update freetype from 2.10.2 to 2.10.4 - A heap buffer overflow has been found in the handling of embedded PNG bitmaps, introduced in FreeType version 2.6. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15999 If you use option FT_CONFIG_OPTION_USE_PNG you should upgrade immediately. - Version 2.10.3 and later breaks the build of ghostscript, due to ghostscripts use of a withdrawn freetype macro that wasn't for external usage. A patch has been created to fix this and is included in the connected ghostcript patch. - Updated rootfile - Changelog for version 2.10.3 release is too long to add here. This can be found in the changelog file in the tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eb53b56d3a61be12f474c5d426e6fe70ca3a1515 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 5 16:48:59 2021 +0000
Start Core Update 155
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/aarch64/glibc | 5 --- config/rootfiles/common/armv5tel/glibc | 5 --- config/rootfiles/common/freetype | 10 ++--- config/rootfiles/common/i586/glibc | 5 --- config/rootfiles/common/libxcrypt | 20 +++++++++ config/rootfiles/common/x86_64/glibc | 5 --- config/rootfiles/core/{154 => 155}/exclude | 0 .../lcdproc => rootfiles/core/155/filelists/files} | 0 .../{oldcore/110 => core/155}/filelists/freetype | 0 config/rootfiles/core/155/filelists/libxcrypt | 1 + .../files => core/155/filelists/release-files} | 3 +- .../rootfiles/{oldcore/152 => core/155}/update.sh | 4 +- config/rootfiles/{core => oldcore}/154/exclude | 0 .../rootfiles/{core => oldcore}/154/filelists/acl | 0 .../{core => oldcore}/154/filelists/arping | 0 .../rootfiles/{core => oldcore}/154/filelists/bind | 0 .../154/filelists/ca-certificates | 0 .../rootfiles/{core => oldcore}/154/filelists/curl | 0 .../rootfiles/{core => oldcore}/154/filelists/ddns | 0 .../{core => oldcore}/154/filelists/dhcpcd | 0 .../rootfiles/{core => oldcore}/154/filelists/dma | 0 .../{core => oldcore}/154/filelists/etherwake | 0 .../{core => oldcore}/154/filelists/fcron | 0 .../{core => oldcore}/154/filelists/files | 0 .../{core => oldcore}/154/filelists/findutils | 0 .../rootfiles/{core => oldcore}/154/filelists/fuse | 0 .../{core => oldcore}/154/filelists/i586/hyperscan | 0 .../{core => oldcore}/154/filelists/iproute2 | 0 .../{core => oldcore}/154/filelists/ipset | 0 .../{core => oldcore}/154/filelists/iptables | 0 .../rootfiles/{core => oldcore}/154/filelists/iw | 0 .../rootfiles/{core => oldcore}/154/filelists/kmod | 0 .../rootfiles/{core => oldcore}/154/filelists/knot | 0 .../rootfiles/{core => oldcore}/154/filelists/less | 0 .../{core => oldcore}/154/filelists/libgcrypt | 0 .../{core => oldcore}/154/filelists/libgpg-error | 0 .../{core => oldcore}/154/filelists/libhtp | 0 .../{core => oldcore}/154/filelists/libloc | 0 .../{core => oldcore}/154/filelists/logrotate | 0 .../{core => oldcore}/154/filelists/logwatch | 0 .../rootfiles/{core => oldcore}/154/filelists/lvm2 | 0 .../rootfiles/{core => oldcore}/154/filelists/lzip | 0 .../rootfiles/{core => oldcore}/154/filelists/newt | 0 .../rootfiles/{core => oldcore}/154/filelists/pam | 0 .../rootfiles/{core => oldcore}/154/filelists/pptp | 0 .../{core => oldcore}/154/filelists/procps | 0 .../rootfiles/{core => oldcore}/154/filelists/sed | 0 .../{core => oldcore}/154/filelists/setup | 0 .../{core => oldcore}/154/filelists/sqlite | 0 .../rootfiles/{core => oldcore}/154/filelists/sudo | 0 .../rootfiles/{core => oldcore}/154/filelists/tar | 0 .../{core => oldcore}/154/filelists/tzdata | 0 .../{core => oldcore}/154/filelists/unbound | 0 .../{core => oldcore}/154/filelists/wpa_supplicant | 0 .../154/filelists/x86_64/hyperscan | 0 config/rootfiles/{core => oldcore}/154/update.sh | 0 config/rootfiles/oldcore/27/update.sh | 2 +- config/rootfiles/oldcore/45/exclude | 2 +- config/rootfiles/packages/7zip | 2 +- config/rootfiles/packages/dpfhack | 2 +- config/rootfiles/packages/elfutils | 2 +- config/rootfiles/packages/netsnmpd | 2 +- config/rootfiles/packages/squidclamav | 2 +- config/rootfiles/packages/stress | 2 +- lfs/dhcpcd | 7 ++- lfs/freetype | 4 +- lfs/ghostscript | 3 +- lfs/glibc | 2 +- lfs/{bison => libxcrypt} | 20 ++++++--- lfs/sysvinit | 1 + make.sh | 10 +++-- ...86_for_SECCOMP_as_it_just_uses_socketcall.patch | 36 ++++++++++++++++ ...LLBACK_DEF-with-Freetype-2.10.3-and-later.patch | 50 ++++++++++++++++++++++ 73 files changed, 151 insertions(+), 56 deletions(-) create mode 100644 config/rootfiles/common/libxcrypt copy config/rootfiles/core/{154 => 155}/exclude (100%) copy config/{backup/includes/lcdproc => rootfiles/core/155/filelists/files} (100%) copy config/rootfiles/{oldcore/110 => core/155}/filelists/freetype (100%) create mode 120000 config/rootfiles/core/155/filelists/libxcrypt copy config/rootfiles/{oldcore/113/filelists/files => core/155/filelists/release-files} (51%) copy config/rootfiles/{oldcore/152 => core/155}/update.sh (97%) rename config/rootfiles/{core => oldcore}/154/exclude (100%) rename config/rootfiles/{core => oldcore}/154/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/154/filelists/arping (100%) rename config/rootfiles/{core => oldcore}/154/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/154/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/154/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/154/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/154/filelists/etherwake (100%) rename config/rootfiles/{core => oldcore}/154/filelists/fcron (100%) rename config/rootfiles/{core => oldcore}/154/filelists/files (100%) rename config/rootfiles/{core => oldcore}/154/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/154/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/154/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/154/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/154/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/154/filelists/less (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/154/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/154/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/154/filelists/lvm2 (100%) rename config/rootfiles/{core => oldcore}/154/filelists/lzip (100%) rename config/rootfiles/{core => oldcore}/154/filelists/newt (100%) rename config/rootfiles/{core => oldcore}/154/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/154/filelists/pptp (100%) rename config/rootfiles/{core => oldcore}/154/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sed (100%) rename config/rootfiles/{core => oldcore}/154/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/154/filelists/tar (100%) rename config/rootfiles/{core => oldcore}/154/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/154/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/154/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/154/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/154/update.sh (100%) copy lfs/{bison => libxcrypt} (89%) create mode 100644 src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch create mode 100644 src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch
Difference in files: diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc index 6a01217e0..9f2957866 100644 --- a/config/rootfiles/common/aarch64/glibc +++ b/config/rootfiles/common/aarch64/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -279,7 +277,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -794,8 +791,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index dce188845..27607f496 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -279,7 +277,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -796,8 +793,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index 4d72ec357..194253601 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -7,15 +7,16 @@ #usr/include/freetype2/freetype/config/ftmodule.h #usr/include/freetype2/freetype/config/ftoption.h #usr/include/freetype2/freetype/config/ftstdlib.h +#usr/include/freetype2/freetype/config/integer-types.h +#usr/include/freetype2/freetype/config/mac-support.h +#usr/include/freetype2/freetype/config/public-macros.h #usr/include/freetype2/freetype/freetype.h #usr/include/freetype2/freetype/ftadvanc.h -#usr/include/freetype2/freetype/ftautoh.h #usr/include/freetype2/freetype/ftbbox.h #usr/include/freetype2/freetype/ftbdf.h #usr/include/freetype2/freetype/ftbitmap.h #usr/include/freetype2/freetype/ftbzip2.h #usr/include/freetype2/freetype/ftcache.h -#usr/include/freetype2/freetype/ftcffdrv.h #usr/include/freetype2/freetype/ftchapters.h #usr/include/freetype2/freetype/ftcid.h #usr/include/freetype2/freetype/ftcolor.h @@ -47,20 +48,17 @@ #usr/include/freetype2/freetype/ftsynth.h #usr/include/freetype2/freetype/ftsystem.h #usr/include/freetype2/freetype/fttrigon.h -#usr/include/freetype2/freetype/ftttdrv.h #usr/include/freetype2/freetype/fttypes.h #usr/include/freetype2/freetype/ftwinfnt.h #usr/include/freetype2/freetype/t1tables.h #usr/include/freetype2/freetype/ttnameid.h #usr/include/freetype2/freetype/tttables.h #usr/include/freetype2/freetype/tttags.h -#usr/include/freetype2/freetype/ttunpat.h #usr/include/freetype2/ft2build.h -#usr/lib/libfreetype.a #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.17.2 +usr/lib/libfreetype.so.6.17.4 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index a397b906e..256e9eefe 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -280,7 +278,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -802,8 +799,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/common/libxcrypt b/config/rootfiles/common/libxcrypt new file mode 100644 index 000000000..c866c2ddb --- /dev/null +++ b/config/rootfiles/common/libxcrypt @@ -0,0 +1,20 @@ +#usr/include/crypt.h +#usr/include/xcrypt.h +#usr/lib/libcrypt.la +#usr/lib/libcrypt.so +usr/lib/libcrypt.so.1 +usr/lib/libcrypt.so.1.1.0 +#usr/lib/libowcrypt.so +#usr/lib/libowcrypt.so.1 +#usr/lib/libxcrypt.so +#usr/lib/pkgconfig/libcrypt.pc +#usr/lib/pkgconfig/libxcrypt.pc +#usr/share/man/man3/crypt_checksalt.3 +#usr/share/man/man3/crypt_gensalt.3 +#usr/share/man/man3/crypt_gensalt_ra.3 +#usr/share/man/man3/crypt_gensalt_rn.3 +#usr/share/man/man3/crypt_preferred_method.3 +#usr/share/man/man3/crypt_r.3 +#usr/share/man/man3/crypt_ra.3 +#usr/share/man/man3/crypt_rn.3 +#usr/share/man/man5/crypt.5 diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc index b99f52212..43f9afb87 100644 --- a/config/rootfiles/common/x86_64/glibc +++ b/config/rootfiles/common/x86_64/glibc @@ -9,8 +9,6 @@ lib/libanl-2.32.so lib/libanl.so.1 lib/libc-2.32.so lib/libc.so.6 -lib/libcrypt-2.32.so -lib/libcrypt.so.1 lib/libdl-2.32.so lib/libdl.so.2 lib/libm-2.32.so @@ -281,7 +279,6 @@ usr/bin/locale #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h -#usr/include/crypt.h #usr/include/ctype.h #usr/include/dirent.h #usr/include/dlfcn.h @@ -800,8 +797,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcrypt.a -#usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a diff --git a/config/rootfiles/core/154/exclude b/config/rootfiles/core/155/exclude similarity index 100% rename from config/rootfiles/core/154/exclude rename to config/rootfiles/core/155/exclude diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/155/filelists/freetype b/config/rootfiles/core/155/filelists/freetype new file mode 120000 index 000000000..79ec5c42e --- /dev/null +++ b/config/rootfiles/core/155/filelists/freetype @@ -0,0 +1 @@ +../../../common/freetype \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/libxcrypt b/config/rootfiles/core/155/filelists/libxcrypt new file mode 120000 index 000000000..ad93616b5 --- /dev/null +++ b/config/rootfiles/core/155/filelists/libxcrypt @@ -0,0 +1 @@ +../../../common/libxcrypt \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/release-files b/config/rootfiles/core/155/filelists/release-files new file mode 100644 index 000000000..3a700fab4 --- /dev/null +++ b/config/rootfiles/core/155/filelists/release-files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +etc/os-release +var/ipfire/langs diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh new file mode 100644 index 000000000..c2d92fd21 --- /dev/null +++ b/config/rootfiles/core/155/update.sh @@ -0,0 +1,67 @@ +#!/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) 2020 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=155 + +# 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 + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/154/exclude b/config/rootfiles/oldcore/154/exclude new file mode 100644 index 000000000..818039f4a --- /dev/null +++ b/config/rootfiles/oldcore/154/exclude @@ -0,0 +1,34 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +usr/share/xt_geoip +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/154/filelists/acl b/config/rootfiles/oldcore/154/filelists/acl similarity index 100% rename from config/rootfiles/core/154/filelists/acl rename to config/rootfiles/oldcore/154/filelists/acl diff --git a/config/rootfiles/core/154/filelists/arping b/config/rootfiles/oldcore/154/filelists/arping similarity index 100% rename from config/rootfiles/core/154/filelists/arping rename to config/rootfiles/oldcore/154/filelists/arping diff --git a/config/rootfiles/core/154/filelists/bind b/config/rootfiles/oldcore/154/filelists/bind similarity index 100% rename from config/rootfiles/core/154/filelists/bind rename to config/rootfiles/oldcore/154/filelists/bind diff --git a/config/rootfiles/core/154/filelists/ca-certificates b/config/rootfiles/oldcore/154/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/154/filelists/ca-certificates rename to config/rootfiles/oldcore/154/filelists/ca-certificates diff --git a/config/rootfiles/core/154/filelists/curl b/config/rootfiles/oldcore/154/filelists/curl similarity index 100% rename from config/rootfiles/core/154/filelists/curl rename to config/rootfiles/oldcore/154/filelists/curl diff --git a/config/rootfiles/core/154/filelists/ddns b/config/rootfiles/oldcore/154/filelists/ddns similarity index 100% rename from config/rootfiles/core/154/filelists/ddns rename to config/rootfiles/oldcore/154/filelists/ddns diff --git a/config/rootfiles/core/154/filelists/dhcpcd b/config/rootfiles/oldcore/154/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/154/filelists/dhcpcd rename to config/rootfiles/oldcore/154/filelists/dhcpcd diff --git a/config/rootfiles/core/154/filelists/dma b/config/rootfiles/oldcore/154/filelists/dma similarity index 100% rename from config/rootfiles/core/154/filelists/dma rename to config/rootfiles/oldcore/154/filelists/dma diff --git a/config/rootfiles/core/154/filelists/etherwake b/config/rootfiles/oldcore/154/filelists/etherwake similarity index 100% rename from config/rootfiles/core/154/filelists/etherwake rename to config/rootfiles/oldcore/154/filelists/etherwake diff --git a/config/rootfiles/core/154/filelists/fcron b/config/rootfiles/oldcore/154/filelists/fcron similarity index 100% rename from config/rootfiles/core/154/filelists/fcron rename to config/rootfiles/oldcore/154/filelists/fcron diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/oldcore/154/filelists/files similarity index 100% rename from config/rootfiles/core/154/filelists/files rename to config/rootfiles/oldcore/154/filelists/files diff --git a/config/rootfiles/core/154/filelists/findutils b/config/rootfiles/oldcore/154/filelists/findutils similarity index 100% rename from config/rootfiles/core/154/filelists/findutils rename to config/rootfiles/oldcore/154/filelists/findutils diff --git a/config/rootfiles/core/154/filelists/fuse b/config/rootfiles/oldcore/154/filelists/fuse similarity index 100% rename from config/rootfiles/core/154/filelists/fuse rename to config/rootfiles/oldcore/154/filelists/fuse diff --git a/config/rootfiles/core/154/filelists/i586/hyperscan b/config/rootfiles/oldcore/154/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/154/filelists/i586/hyperscan rename to config/rootfiles/oldcore/154/filelists/i586/hyperscan diff --git a/config/rootfiles/core/154/filelists/iproute2 b/config/rootfiles/oldcore/154/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/154/filelists/iproute2 rename to config/rootfiles/oldcore/154/filelists/iproute2 diff --git a/config/rootfiles/core/154/filelists/ipset b/config/rootfiles/oldcore/154/filelists/ipset similarity index 100% rename from config/rootfiles/core/154/filelists/ipset rename to config/rootfiles/oldcore/154/filelists/ipset diff --git a/config/rootfiles/core/154/filelists/iptables b/config/rootfiles/oldcore/154/filelists/iptables similarity index 100% rename from config/rootfiles/core/154/filelists/iptables rename to config/rootfiles/oldcore/154/filelists/iptables diff --git a/config/rootfiles/core/154/filelists/iw b/config/rootfiles/oldcore/154/filelists/iw similarity index 100% rename from config/rootfiles/core/154/filelists/iw rename to config/rootfiles/oldcore/154/filelists/iw diff --git a/config/rootfiles/core/154/filelists/kmod b/config/rootfiles/oldcore/154/filelists/kmod similarity index 100% rename from config/rootfiles/core/154/filelists/kmod rename to config/rootfiles/oldcore/154/filelists/kmod diff --git a/config/rootfiles/core/154/filelists/knot b/config/rootfiles/oldcore/154/filelists/knot similarity index 100% rename from config/rootfiles/core/154/filelists/knot rename to config/rootfiles/oldcore/154/filelists/knot diff --git a/config/rootfiles/core/154/filelists/less b/config/rootfiles/oldcore/154/filelists/less similarity index 100% rename from config/rootfiles/core/154/filelists/less rename to config/rootfiles/oldcore/154/filelists/less diff --git a/config/rootfiles/core/154/filelists/libgcrypt b/config/rootfiles/oldcore/154/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/154/filelists/libgcrypt rename to config/rootfiles/oldcore/154/filelists/libgcrypt diff --git a/config/rootfiles/core/154/filelists/libgpg-error b/config/rootfiles/oldcore/154/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/154/filelists/libgpg-error rename to config/rootfiles/oldcore/154/filelists/libgpg-error diff --git a/config/rootfiles/core/154/filelists/libhtp b/config/rootfiles/oldcore/154/filelists/libhtp similarity index 100% rename from config/rootfiles/core/154/filelists/libhtp rename to config/rootfiles/oldcore/154/filelists/libhtp diff --git a/config/rootfiles/core/154/filelists/libloc b/config/rootfiles/oldcore/154/filelists/libloc similarity index 100% rename from config/rootfiles/core/154/filelists/libloc rename to config/rootfiles/oldcore/154/filelists/libloc diff --git a/config/rootfiles/core/154/filelists/logrotate b/config/rootfiles/oldcore/154/filelists/logrotate similarity index 100% rename from config/rootfiles/core/154/filelists/logrotate rename to config/rootfiles/oldcore/154/filelists/logrotate diff --git a/config/rootfiles/core/154/filelists/logwatch b/config/rootfiles/oldcore/154/filelists/logwatch similarity index 100% rename from config/rootfiles/core/154/filelists/logwatch rename to config/rootfiles/oldcore/154/filelists/logwatch diff --git a/config/rootfiles/core/154/filelists/lvm2 b/config/rootfiles/oldcore/154/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/154/filelists/lvm2 rename to config/rootfiles/oldcore/154/filelists/lvm2 diff --git a/config/rootfiles/core/154/filelists/lzip b/config/rootfiles/oldcore/154/filelists/lzip similarity index 100% rename from config/rootfiles/core/154/filelists/lzip rename to config/rootfiles/oldcore/154/filelists/lzip diff --git a/config/rootfiles/core/154/filelists/newt b/config/rootfiles/oldcore/154/filelists/newt similarity index 100% rename from config/rootfiles/core/154/filelists/newt rename to config/rootfiles/oldcore/154/filelists/newt diff --git a/config/rootfiles/core/154/filelists/pam b/config/rootfiles/oldcore/154/filelists/pam similarity index 100% rename from config/rootfiles/core/154/filelists/pam rename to config/rootfiles/oldcore/154/filelists/pam diff --git a/config/rootfiles/core/154/filelists/pptp b/config/rootfiles/oldcore/154/filelists/pptp similarity index 100% rename from config/rootfiles/core/154/filelists/pptp rename to config/rootfiles/oldcore/154/filelists/pptp diff --git a/config/rootfiles/core/154/filelists/procps b/config/rootfiles/oldcore/154/filelists/procps similarity index 100% rename from config/rootfiles/core/154/filelists/procps rename to config/rootfiles/oldcore/154/filelists/procps diff --git a/config/rootfiles/core/154/filelists/sed b/config/rootfiles/oldcore/154/filelists/sed similarity index 100% rename from config/rootfiles/core/154/filelists/sed rename to config/rootfiles/oldcore/154/filelists/sed diff --git a/config/rootfiles/core/154/filelists/setup b/config/rootfiles/oldcore/154/filelists/setup similarity index 100% rename from config/rootfiles/core/154/filelists/setup rename to config/rootfiles/oldcore/154/filelists/setup diff --git a/config/rootfiles/core/154/filelists/sqlite b/config/rootfiles/oldcore/154/filelists/sqlite similarity index 100% rename from config/rootfiles/core/154/filelists/sqlite rename to config/rootfiles/oldcore/154/filelists/sqlite diff --git a/config/rootfiles/core/154/filelists/sudo b/config/rootfiles/oldcore/154/filelists/sudo similarity index 100% rename from config/rootfiles/core/154/filelists/sudo rename to config/rootfiles/oldcore/154/filelists/sudo diff --git a/config/rootfiles/core/154/filelists/tar b/config/rootfiles/oldcore/154/filelists/tar similarity index 100% rename from config/rootfiles/core/154/filelists/tar rename to config/rootfiles/oldcore/154/filelists/tar diff --git a/config/rootfiles/core/154/filelists/tzdata b/config/rootfiles/oldcore/154/filelists/tzdata similarity index 100% rename from config/rootfiles/core/154/filelists/tzdata rename to config/rootfiles/oldcore/154/filelists/tzdata diff --git a/config/rootfiles/core/154/filelists/unbound b/config/rootfiles/oldcore/154/filelists/unbound similarity index 100% rename from config/rootfiles/core/154/filelists/unbound rename to config/rootfiles/oldcore/154/filelists/unbound diff --git a/config/rootfiles/core/154/filelists/wpa_supplicant b/config/rootfiles/oldcore/154/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/154/filelists/wpa_supplicant rename to config/rootfiles/oldcore/154/filelists/wpa_supplicant diff --git a/config/rootfiles/core/154/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/154/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/154/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/154/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/154/update.sh b/config/rootfiles/oldcore/154/update.sh similarity index 100% rename from config/rootfiles/core/154/update.sh rename to config/rootfiles/oldcore/154/update.sh diff --git a/config/rootfiles/oldcore/27/update.sh b/config/rootfiles/oldcore/27/update.sh index 609edf32c..fd32d49e6 100644 --- a/config/rootfiles/oldcore/27/update.sh +++ b/config/rootfiles/oldcore/27/update.sh @@ -11,4 +11,4 @@ sysctl -p mv /etc/squid/cachemgr.conf /var/ipfire/proxy/cachemgr.conf ln -sf /var/ipfire/proxy/cachemgr.conf /etc/squid/cachemgr.conf chown nobody.nobody /var/ipfire/proxy/cachemgr.conf -/etc/init.d/squid start \ No newline at end of file +/etc/init.d/squid start diff --git a/config/rootfiles/oldcore/45/exclude b/config/rootfiles/oldcore/45/exclude index 2cb97983d..c38a12ce4 100644 --- a/config/rootfiles/oldcore/45/exclude +++ b/config/rootfiles/oldcore/45/exclude @@ -1 +1 @@ -etc/snort/snort.conf \ No newline at end of file +etc/snort/snort.conf diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index a5d5ed607..a0e8a80d1 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -110,4 +110,4 @@ usr/lib/p7zip/Codecs/Rar.so #usr/share/doc/p7zip-17.03/README #usr/share/man/man1/7z.1.gz #usr/share/man/man1/7za.1.gz -#usr/share/man/man1/7zr.1.gz \ No newline at end of file +#usr/share/man/man1/7zr.1.gz diff --git a/config/rootfiles/packages/dpfhack b/config/rootfiles/packages/dpfhack index 27319b4cf..b79791c90 100644 --- a/config/rootfiles/packages/dpfhack +++ b/config/rootfiles/packages/dpfhack @@ -1,3 +1,3 @@ #usr/include/dpf.h #usr/include/usbuser.h -usr/lib/libdpf.so \ No newline at end of file +usr/lib/libdpf.so diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils index 05cb542ac..f7826ec11 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/packages/elfutils @@ -53,4 +53,4 @@ usr/lib/libelf.so.1 #usr/share/man/man3/elf_begin.3 #usr/share/man/man3/elf_clone.3 #usr/share/man/man3/elf_getdata.3 -#usr/share/man/man3/elf_update.3 \ No newline at end of file +#usr/share/man/man3/elf_update.3 diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 89b46c89b..716d41638 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -636,4 +636,4 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle -var/ipfire/backup/addons/includes/netsnmpd \ No newline at end of file +var/ipfire/backup/addons/includes/netsnmpd diff --git a/config/rootfiles/packages/squidclamav b/config/rootfiles/packages/squidclamav index 7538749fa..5976a0c47 100644 --- a/config/rootfiles/packages/squidclamav +++ b/config/rootfiles/packages/squidclamav @@ -11,4 +11,4 @@ usr/bin/squidclamav #usr/share/squidclamav #usr/share/squidclamav/README var/ipfire/backup/addons/includes/squidclamav -srv/web/ipfire/html/clwarn.cgi \ No newline at end of file +srv/web/ipfire/html/clwarn.cgi diff --git a/config/rootfiles/packages/stress b/config/rootfiles/packages/stress index 2b0a0003a..0f7224919 100644 --- a/config/rootfiles/packages/stress +++ b/config/rootfiles/packages/stress @@ -1,3 +1,3 @@ usr/bin/stress #usr/share/info/stress.info -#usr/share/man/man1/stress.1 \ No newline at end of file +#usr/share/man/man1/stress.1 diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 352308692..4e34e19d5 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@
include Config
-VER = 9.4.0 +VER = 9.3.4
THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c36715fc629bc40aa94aae06fa1724c2 +$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db
install : $(TARGET)
@@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch + cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \ --dbdir=/var/ipfire/dhcpc \ --libexecdir=/var/ipfire/dhcpc \ diff --git a/lfs/freetype b/lfs/freetype index 4106d22ee..8a93ad0e9 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -24,7 +24,7 @@
include Config
-VER = 2.10.2 +VER = 2.10.4
THISAPP = freetype-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074 +$(DL_FILE)_MD5 = 0e6c0e9b218be3ba3e26e1d23b1c80dd
install : $(TARGET)
diff --git a/lfs/ghostscript b/lfs/ghostscript index edf019f5d..696f95b29 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ghostscript -PAK_VER = 6 +PAK_VER = 7
DEPS = cups dbus libtiff
@@ -83,6 +83,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch cd $(DIR_APP) && rm -rf expat freetype icclib jasper jpeg jpegxr \ lcms lcms2 libpng openjpeg zlib cups/libs cd $(DIR_APP) && \ diff --git a/lfs/glibc b/lfs/glibc index 281c290dc..50217fab6 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -69,7 +69,7 @@ EXTRA_CONFIG += \ --without-selinux \ --enable-experimental-malloc \ --enable-bind-now \ - --disable-nss-crypt + --disable-crypt
############################################################################### # Top-level Rules diff --git a/lfs/libxcrypt b/lfs/libxcrypt new file mode 100644 index 000000000..8fb937c9b --- /dev/null +++ b/lfs/libxcrypt @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@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/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 4.4.17 + +THISAPP = libxcrypt-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) + +ifeq "$(TOOLCHAIN)" "1" + TARGET = $(DIR_INFO)/$(THISAPP)-tools +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 12118d098ead971f9a8377cacfdd0da7 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && autoreconf -vfi + cd $(DIR_APP) && \ + ./configure \ + --prefix=$(PREFIX) \ + --disable-static \ + --enable-hashes=strong,glibc \ + --enable-obsolete-api \ + --disable-failure-tokens + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/sysvinit b/lfs/sysvinit index d85a3659b..0306b5518 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys/stat.h/a#include <sys/sysmacros.h>\n" + cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile cd $(DIR_APP) && make $(MAKETUNING) -C src cd $(DIR_APP) && make -C src install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 94bb86d5b..164fd7c72 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="154" # Core Level (Filename) +CORE="155" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop @@ -1031,6 +1031,7 @@ buildtoolchain() { lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 lfsmake1 zlib + lfsmake1 libxcrypt lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect @@ -1074,16 +1075,18 @@ buildbase() { lfsmake2 cleanup-toolchain lfsmake2 zlib lfsmake2 zstd + lfsmake2 autoconf + lfsmake2 automake + lfsmake2 libtool lfsmake2 binutils lfsmake2 gmp lfsmake2 gmp-compat lfsmake2 mpfr lfsmake2 libmpc + lfsmake2 libxcrypt lfsmake2 file lfsmake2 gcc lfsmake2 sed - lfsmake2 autoconf - lfsmake2 automake lfsmake2 berkeley lfsmake2 berkeley-compat lfsmake2 coreutils @@ -1091,7 +1094,6 @@ buildbase() { lfsmake2 m4 lfsmake2 bison lfsmake2 ncurses - lfsmake2 libtool lfsmake2 perl lfsmake2 readline lfsmake2 readline-compat diff --git a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch new file mode 100644 index 000000000..9efcde219 --- /dev/null +++ b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch @@ -0,0 +1,36 @@ +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 050a30cf..d31d720d 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -32,6 +32,7 @@ + + #include <linux/audit.h> + #include <linux/filter.h> ++#include <linux/net.h> + #include <linux/seccomp.h> + #include <linux/sockios.h> + +@@ -304,6 +305,23 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_sendto + SECCOMP_ALLOW(__NR_sendto), + #endif ++#ifdef __NR_socketcall ++ /* i386 needs this and demonstrates why SECCOMP ++ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4) ++ * as this is soooo tied to the kernel API which changes per arch ++ * and likely libc as well. */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN), ++#endif + #ifdef __NR_shutdown + SECCOMP_ALLOW(__NR_shutdown), + #endif diff --git a/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch b/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch new file mode 100644 index 000000000..78014667d --- /dev/null +++ b/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch @@ -0,0 +1,50 @@ +From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 +From: Chris Liddell chris.liddell@artifex.com +Date: Tue, 20 Oct 2020 09:49:45 +0100 +Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def + +From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what +we used when defining our callbacks from Freetype. + +No guidance forthcoming from the Freetype developer who made those changes, +so change to explicitly declaring the callbacks file static. + +Should fix the reported build failures. +--- + base/fapi_ft.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dcf4..21aef2f06 100644 +--- a/base/fapi_ft.c ++++ b/base/fapi_ft.c +@@ -125,7 +125,7 @@ static void + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + +-FT_CALLBACK_DEF(void *) ++static void * + FF_alloc(FT_Memory memory, long size) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) + return (gs_malloc(mem, size, 1, "FF_alloc")); + } + +-FT_CALLBACK_DEF(void *) ++static void * + FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) + return (tmp); + } + +-FT_CALLBACK_DEF(void) ++static void + FF_free(FT_Memory memory, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +-- +2.17.1 +
hooks/post-receive -- IPFire 2.x development tree