]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Feb 2021 17:37:26 +0000 (17:37 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Feb 2021 17:37:26 +0000 (17:37 +0000)
127 files changed:
config/rootfiles/common/aarch64/glibc
config/rootfiles/common/armv5tel/glibc
config/rootfiles/common/attr
config/rootfiles/common/autoconf
config/rootfiles/common/freetype
config/rootfiles/common/i586/glibc
config/rootfiles/common/lcms2
config/rootfiles/common/libxcrypt [new file with mode: 0644]
config/rootfiles/common/lz4
config/rootfiles/common/lzo
config/rootfiles/common/net-tools
config/rootfiles/common/pcre-compat [deleted file]
config/rootfiles/common/pcre2 [new file with mode: 0644]
config/rootfiles/common/qpdf
config/rootfiles/common/sysvinit
config/rootfiles/common/tcl
config/rootfiles/common/unbound
config/rootfiles/common/x86_64/glibc
config/rootfiles/core/155/exclude [moved from config/rootfiles/core/154/exclude with 100% similarity]
config/rootfiles/core/155/filelists/attr [new symlink]
config/rootfiles/core/155/filelists/collectd [new symlink]
config/rootfiles/core/155/filelists/files [new file with mode: 0644]
config/rootfiles/core/155/filelists/freetype [new symlink]
config/rootfiles/core/155/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/154/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/core/155/filelists/lcms2 [new symlink]
config/rootfiles/core/155/filelists/libxcrypt [new symlink]
config/rootfiles/core/155/filelists/lz4 [new symlink]
config/rootfiles/core/155/filelists/net-tools [new symlink]
config/rootfiles/core/155/filelists/openssl [moved from config/rootfiles/core/154/filelists/openssl with 100% similarity]
config/rootfiles/core/155/filelists/pcre2 [new symlink]
config/rootfiles/core/155/filelists/qpdf [new symlink]
config/rootfiles/core/155/filelists/release-files [new file with mode: 0644]
config/rootfiles/core/155/filelists/squid [new symlink]
config/rootfiles/core/155/filelists/sysvinit [new symlink]
config/rootfiles/core/155/filelists/tcl [new symlink]
config/rootfiles/core/155/filelists/unbound [moved from config/rootfiles/core/154/filelists/unbound with 100% similarity]
config/rootfiles/core/155/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/154/exclude [new file with mode: 0644]
config/rootfiles/oldcore/154/filelists/acl [moved from config/rootfiles/core/154/filelists/acl with 100% similarity]
config/rootfiles/oldcore/154/filelists/arping [moved from config/rootfiles/core/154/filelists/arping with 100% similarity]
config/rootfiles/oldcore/154/filelists/bind [moved from config/rootfiles/core/154/filelists/bind with 100% similarity]
config/rootfiles/oldcore/154/filelists/ca-certificates [moved from config/rootfiles/core/154/filelists/ca-certificates with 100% similarity]
config/rootfiles/oldcore/154/filelists/curl [moved from config/rootfiles/core/154/filelists/curl with 100% similarity]
config/rootfiles/oldcore/154/filelists/ddns [moved from config/rootfiles/core/154/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/154/filelists/dhcpcd [moved from config/rootfiles/core/154/filelists/dhcpcd with 100% similarity]
config/rootfiles/oldcore/154/filelists/dma [moved from config/rootfiles/core/154/filelists/dma with 100% similarity]
config/rootfiles/oldcore/154/filelists/etherwake [moved from config/rootfiles/core/154/filelists/etherwake with 100% similarity]
config/rootfiles/oldcore/154/filelists/fcron [moved from config/rootfiles/core/154/filelists/fcron with 100% similarity]
config/rootfiles/oldcore/154/filelists/files [moved from config/rootfiles/core/154/filelists/files with 100% similarity]
config/rootfiles/oldcore/154/filelists/findutils [moved from config/rootfiles/core/154/filelists/findutils with 100% similarity]
config/rootfiles/oldcore/154/filelists/fuse [moved from config/rootfiles/core/154/filelists/fuse with 100% similarity]
config/rootfiles/oldcore/154/filelists/i586/hyperscan [moved from config/rootfiles/core/154/filelists/i586/hyperscan with 100% similarity]
config/rootfiles/oldcore/154/filelists/iproute2 [moved from config/rootfiles/core/154/filelists/iproute2 with 100% similarity]
config/rootfiles/oldcore/154/filelists/ipset [moved from config/rootfiles/core/154/filelists/ipset with 100% similarity]
config/rootfiles/oldcore/154/filelists/iptables [moved from config/rootfiles/core/154/filelists/iptables with 100% similarity]
config/rootfiles/oldcore/154/filelists/iw [moved from config/rootfiles/core/154/filelists/iw with 100% similarity]
config/rootfiles/oldcore/154/filelists/kmod [moved from config/rootfiles/core/154/filelists/kmod with 100% similarity]
config/rootfiles/oldcore/154/filelists/knot [moved from config/rootfiles/core/154/filelists/knot with 100% similarity]
config/rootfiles/oldcore/154/filelists/less [moved from config/rootfiles/core/154/filelists/less with 100% similarity]
config/rootfiles/oldcore/154/filelists/libgcrypt [moved from config/rootfiles/core/154/filelists/libgcrypt with 100% similarity]
config/rootfiles/oldcore/154/filelists/libgpg-error [moved from config/rootfiles/core/154/filelists/libgpg-error with 100% similarity]
config/rootfiles/oldcore/154/filelists/libhtp [moved from config/rootfiles/core/154/filelists/libhtp with 100% similarity]
config/rootfiles/oldcore/154/filelists/libloc [moved from config/rootfiles/core/154/filelists/libloc with 100% similarity]
config/rootfiles/oldcore/154/filelists/logrotate [moved from config/rootfiles/core/154/filelists/logrotate with 100% similarity]
config/rootfiles/oldcore/154/filelists/logwatch [moved from config/rootfiles/core/154/filelists/logwatch with 100% similarity]
config/rootfiles/oldcore/154/filelists/lvm2 [moved from config/rootfiles/core/154/filelists/lvm2 with 100% similarity]
config/rootfiles/oldcore/154/filelists/lzip [moved from config/rootfiles/core/154/filelists/lzip with 100% similarity]
config/rootfiles/oldcore/154/filelists/newt [moved from config/rootfiles/core/154/filelists/newt with 100% similarity]
config/rootfiles/oldcore/154/filelists/pam [moved from config/rootfiles/core/154/filelists/pam with 100% similarity]
config/rootfiles/oldcore/154/filelists/pptp [moved from config/rootfiles/core/154/filelists/pptp with 100% similarity]
config/rootfiles/oldcore/154/filelists/procps [moved from config/rootfiles/core/154/filelists/procps with 100% similarity]
config/rootfiles/oldcore/154/filelists/sed [moved from config/rootfiles/core/154/filelists/sed with 100% similarity]
config/rootfiles/oldcore/154/filelists/setup [moved from config/rootfiles/core/154/filelists/setup with 100% similarity]
config/rootfiles/oldcore/154/filelists/sqlite [moved from config/rootfiles/core/154/filelists/sqlite with 100% similarity]
config/rootfiles/oldcore/154/filelists/sudo [moved from config/rootfiles/core/154/filelists/sudo with 100% similarity]
config/rootfiles/oldcore/154/filelists/tar [moved from config/rootfiles/core/154/filelists/tar with 100% similarity]
config/rootfiles/oldcore/154/filelists/tzdata [moved from config/rootfiles/core/154/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/154/filelists/unbound [new symlink]
config/rootfiles/oldcore/154/filelists/wpa_supplicant [moved from config/rootfiles/core/154/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/oldcore/154/filelists/x86_64/hyperscan [moved from config/rootfiles/core/154/filelists/x86_64/hyperscan with 100% similarity]
config/rootfiles/oldcore/154/update.sh [moved from config/rootfiles/core/154/update.sh with 100% similarity]
config/rootfiles/oldcore/27/update.sh
config/rootfiles/oldcore/45/exclude
config/rootfiles/packages/7zip
config/rootfiles/packages/dpfhack
config/rootfiles/packages/elfutils
config/rootfiles/packages/krb5
config/rootfiles/packages/netsnmpd
config/rootfiles/packages/python-xattr [deleted file]
config/rootfiles/packages/qemu
config/rootfiles/packages/squidclamav
config/rootfiles/packages/stress
html/cgi-bin/country.cgi
html/cgi-bin/wirelessclient.cgi
lfs/attr
lfs/autoconf
lfs/collectd
lfs/freetype
lfs/ghostscript
lfs/glibc
lfs/krb5
lfs/lcd4linux
lfs/lcms2
lfs/libxcrypt [moved from lfs/python-xattr with 83% similarity]
lfs/lz4
lfs/lzo
lfs/mpage
lfs/net-tools
lfs/pcre2 [moved from lfs/pcre-compat with 85% similarity]
lfs/qemu
lfs/qpdf
lfs/squid
lfs/sysvinit
lfs/tcl
lfs/unbound
make.sh
src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch [new file with mode: 0644]
src/patches/lz4-1.8.1.2_mod_install_path.patch [deleted file]
src/patches/lz4-1.9.3_mod_install_path.patch [moved from src/patches/lz4-1.9.2_mod_install_path.patch with 61% similarity]
src/patches/mpage25-config.patch
src/patches/net-tools-1.60-gcc34-3.patch [deleted file]
src/patches/net-tools-1.60-iphdr-redef.patch [deleted file]
src/patches/net-tools-1.60-kernel_headers-3.patch [deleted file]
src/patches/net-tools-1.60-mii_ioctl-1.patch [deleted file]
src/patches/net-tools-1.60-no-hostname.patch [deleted file]
src/patches/net-tools-2.10-no-hostname.patch [new file with mode: 0644]
src/patches/sysvinit-2.98_build_mountpoint.patch [new file with mode: 0644]

index 6a01217e0bdcc13780a3f41519839fc660724e84..9f295786662713510ee34c1d7dc430b218406f63 100644 (file)
@@ -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
index dce188845d95d372432984395b706b697bc279ee..27607f496f32ff23aa35f91b300af63cedd312cb 100644 (file)
@@ -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
index edfefa7e148609bdac058c80b38ada2d2a7724a5..ba3ed7db7513ef44f682bef2087df729911fa4b6 100644 (file)
@@ -1,24 +1,31 @@
 usr/bin/attr
 usr/bin/getfattr
 usr/bin/setfattr
+#usr/etc
+#usr/etc/xattr.conf
 #usr/include/attr
 #usr/include/attr/attributes.h
 #usr/include/attr/error_context.h
 #usr/include/attr/libattr.h
-#usr/include/attr/xattr.h
 #usr/lib/libattr.a
 #usr/lib/libattr.la
 #usr/lib/libattr.so
 usr/lib/libattr.so.1
-usr/lib/libattr.so.1.1.0
+usr/lib/libattr.so.1.1.2448
+#usr/lib/pkgconfig/libattr.pc
 #usr/share/doc/attr
-#usr/share/doc/attr/CHANGES.gz
+#usr/share/doc/attr/CHANGES
 #usr/share/doc/attr/COPYING
 #usr/share/doc/attr/COPYING.LGPL
 #usr/share/doc/attr/PORTING
-#usr/share/doc/attr/README
 #usr/share/locale/cs/LC_MESSAGES/attr.mo
 #usr/share/locale/de/LC_MESSAGES/attr.mo
+#usr/share/locale/en@boldquot
+#usr/share/locale/en@boldquot/LC_MESSAGES
+#usr/share/locale/en@boldquot/LC_MESSAGES/attr.mo
+#usr/share/locale/en@quot
+#usr/share/locale/en@quot/LC_MESSAGES
+#usr/share/locale/en@quot/LC_MESSAGES/attr.mo
 #usr/share/locale/es/LC_MESSAGES/attr.mo
 #usr/share/locale/fr/LC_MESSAGES/attr.mo
 #usr/share/locale/gl/LC_MESSAGES/attr.mo
@@ -28,18 +35,6 @@ usr/lib/libattr.so.1.1.0
 #usr/share/man/man1/attr.1
 #usr/share/man/man1/getfattr.1
 #usr/share/man/man1/setfattr.1
-#usr/share/man/man2/fgetxattr.2
-#usr/share/man/man2/flistxattr.2
-#usr/share/man/man2/fremovexattr.2
-#usr/share/man/man2/fsetxattr.2
-#usr/share/man/man2/getxattr.2
-#usr/share/man/man2/lgetxattr.2
-#usr/share/man/man2/listxattr.2
-#usr/share/man/man2/llistxattr.2
-#usr/share/man/man2/lremovexattr.2
-#usr/share/man/man2/lsetxattr.2
-#usr/share/man/man2/removexattr.2
-#usr/share/man/man2/setxattr.2
 #usr/share/man/man3/attr_get.3
 #usr/share/man/man3/attr_getf.3
 #usr/share/man/man3/attr_list.3
@@ -50,4 +45,3 @@ usr/lib/libattr.so.1.1.0
 #usr/share/man/man3/attr_removef.3
 #usr/share/man/man3/attr_set.3
 #usr/share/man/man3/attr_setf.3
-#usr/share/man/man5/attr.5
index 3e28ae7445b6f032c12c0d69d02814eb264ba451..c9aeb7a874c6bacba586f7efff8528967f28f1c4 100644 (file)
@@ -10,6 +10,7 @@
 #usr/share/autoconf/Autom4te/C4che.pm
 #usr/share/autoconf/Autom4te/ChannelDefs.pm
 #usr/share/autoconf/Autom4te/Channels.pm
+#usr/share/autoconf/Autom4te/Config.pm
 #usr/share/autoconf/Autom4te/Configure_ac.pm
 #usr/share/autoconf/Autom4te/FileUtils.pm
 #usr/share/autoconf/Autom4te/General.pm
@@ -37,6 +38,7 @@
 #usr/share/autoconf/autoconf/programs.m4
 #usr/share/autoconf/autoconf/specific.m4
 #usr/share/autoconf/autoconf/status.m4
+#usr/share/autoconf/autoconf/trailer.m4
 #usr/share/autoconf/autoconf/types.m4
 #usr/share/autoconf/autom4te.cfg
 #usr/share/autoconf/autoscan
 #usr/share/autoconf/autotest/autotest.m4f
 #usr/share/autoconf/autotest/general.m4
 #usr/share/autoconf/autotest/specific.m4
+#usr/share/autoconf/build-aux
+#usr/share/autoconf/build-aux/config.guess
+#usr/share/autoconf/build-aux/config.sub
+#usr/share/autoconf/build-aux/install-sh
 #usr/share/autoconf/m4sugar
 #usr/share/autoconf/m4sugar/foreach.m4
 #usr/share/autoconf/m4sugar/m4sh.m4
@@ -61,6 +67,4 @@
 #usr/share/man/man1/autoreconf.1
 #usr/share/man/man1/autoscan.1
 #usr/share/man/man1/autoupdate.1
-#usr/share/man/man1/config.guess.1
-#usr/share/man/man1/config.sub.1
 #usr/share/man/man1/ifnames.1
index 4d72ec35785b5f4e21bb2b9244b97bb4323581c5..194253601292ccebb6d9fd85b3723a724dfaa7e4 100644 (file)
@@ -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
 #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
index a397b906e15a46ea26a1d71f0dc34f97f7139446..256e9eefe710c611a64f60f95ec588ea56f86782 100644 (file)
@@ -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
index 2ea591550d3bd4423d847a1e094a0ae19d0becaf..5a7d2f276697ccc8287c72f6a2d6eab413a816ff 100644 (file)
@@ -5,11 +5,13 @@
 #usr/bin/transicc
 #usr/include/lcms2.h
 #usr/include/lcms2_plugin.h
-#usr/lib/liblcms2.a
 #usr/lib/liblcms2.la
 #usr/lib/liblcms2.so
 usr/lib/liblcms2.so.2
-usr/lib/liblcms2.so.2.0.8
+usr/lib/liblcms2.so.2.0.12
 #usr/lib/pkgconfig/lcms2.pc
 #usr/share/man/man1/jpgicc.1
+#usr/share/man/man1/linkicc.1
+#usr/share/man/man1/psicc.1
 #usr/share/man/man1/tificc.1
+#usr/share/man/man1/transicc.1
diff --git a/config/rootfiles/common/libxcrypt b/config/rootfiles/common/libxcrypt
new file mode 100644 (file)
index 0000000..c866c2d
--- /dev/null
@@ -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
index ab03c65f71fdb0c3ae949400b061085c33751d7b..9a8abcd2b6b165692e4f29d38d3891c7b9570169 100644 (file)
@@ -9,7 +9,7 @@ usr/bin/lz4
 #usr/lib/liblz4.a
 #usr/lib/liblz4.so
 usr/lib/liblz4.so.1
-usr/lib/liblz4.so.1.9.2
+usr/lib/liblz4.so.1.9.3
 #usr/lib/pkgconfig/liblz4.pc
 #usr/share/man/man1/lz4.1
 #usr/share/man/man1/lz4c.1
index 4ebc05cdbc8a4bf6e7e69169407f53915a8a2b4d..92e7327cadb6fbe5d75b30295822a94b57c14af5 100644 (file)
@@ -16,6 +16,7 @@
 usr/lib/liblzo2.so
 usr/lib/liblzo2.so.2
 usr/lib/liblzo2.so.2.0.0
+#usr/lib/pkgconfig/lzo2.pc
 #usr/share/doc/lzo-2.09
 #usr/share/doc/lzo-2.09/AUTHORS
 #usr/share/doc/lzo-2.09/COPYING
index 4860b2f0a8e8e103f05da8787a22979b4fb2b061..0578c1bc0a9259be72b425400ee6572cda4baac4 100644 (file)
@@ -1,17 +1,23 @@
+sbin/ifconfig
 bin/netstat
+sbin/route
 sbin/arp
-sbin/ifconfig
 #sbin/ipmaddr
 #sbin/iptunnel
 sbin/mii-tool
 sbin/nameif
 #sbin/plipconfig
 sbin/rarp
-sbin/route
 sbin/slattach
+#usr/share/man/man1/dnsdomainname.1
+#usr/share/man/man1/domainname.1
+#usr/share/man/man1/nisdomainname.1
+#usr/share/man/man1/ypdomainname.1
 #usr/share/man/man5/ethers.5
 #usr/share/man/man8/arp.8
 #usr/share/man/man8/ifconfig.8
+#usr/share/man/man8/ipmaddr.8
+#usr/share/man/man8/iptunnel.8
 #usr/share/man/man8/mii-tool.8
 #usr/share/man/man8/nameif.8
 #usr/share/man/man8/netstat.8
diff --git a/config/rootfiles/common/pcre-compat b/config/rootfiles/common/pcre-compat
deleted file mode 100644 (file)
index ff1b776..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/libpcre.so.0
-lib/libpcre.so.0.0.1
diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2
new file mode 100644 (file)
index 0000000..440af7b
--- /dev/null
@@ -0,0 +1,228 @@
+#usr/bin/pcre2-config
+#usr/bin/pcre2grep
+#usr/bin/pcre2test
+#usr/include/pcre2.h
+#usr/include/pcre2posix.h
+#usr/lib/libpcre2-16.la
+#usr/lib/libpcre2-16.so
+usr/lib/libpcre2-16.so.0
+usr/lib/libpcre2-16.so.0.10.1
+#usr/lib/libpcre2-32.la
+#usr/lib/libpcre2-32.so
+usr/lib/libpcre2-32.so.0
+usr/lib/libpcre2-32.so.0.10.1
+#usr/lib/libpcre2-8.la
+#usr/lib/libpcre2-8.so
+usr/lib/libpcre2-8.so.0
+usr/lib/libpcre2-8.so.0.10.1
+#usr/lib/libpcre2-posix.la
+#usr/lib/libpcre2-posix.so
+usr/lib/libpcre2-posix.so.2
+usr/lib/libpcre2-posix.so.2.0.3
+#usr/lib/pkgconfig/libpcre2-16.pc
+#usr/lib/pkgconfig/libpcre2-32.pc
+#usr/lib/pkgconfig/libpcre2-8.pc
+#usr/lib/pkgconfig/libpcre2-posix.pc
+#usr/share/doc/pcre-pcre2-10.36
+#usr/share/doc/pcre-pcre2-10.36/AUTHORS
+#usr/share/doc/pcre-pcre2-10.36/COPYING
+#usr/share/doc/pcre-pcre2-10.36/ChangeLog
+#usr/share/doc/pcre-pcre2-10.36/LICENCE
+#usr/share/doc/pcre-pcre2-10.36/NEWS
+#usr/share/doc/pcre-pcre2-10.36/README
+#usr/share/doc/pcre-pcre2-10.36/html
+#usr/share/doc/pcre-pcre2-10.36/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre2-10.36/html/README.txt
+#usr/share/doc/pcre-pcre2-10.36/html/index.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2-config.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_callout_enumerate.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_copy.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_copy_with_tables.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_code_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_copy.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_create.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_compile_context_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_config.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_copy.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_create.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_convert_context_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_converted_pattern_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_dfa_match.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_copy.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_create.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_general_context_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_error_message.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_mark.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_match_data_size.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_ovector_count.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_ovector_pointer.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_get_startchar.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_compile.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_free_unused_memory.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_match.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_assign.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_create.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_jit_stack_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_maketables.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_maketables_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_copy.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_create.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_context_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_create.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_create_from_pattern.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_match_data_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_pattern_convert.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_pattern_info.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_decode.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_encode.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_serialize_get_number_of_codes.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_bsr.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_callout.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_character_tables.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_compile_extra_options.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_compile_recursion_guard.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_depth_limit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_glob_escape.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_glob_separator.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_heap_limit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_match_limit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_max_pattern_length.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_newline.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_offset_limit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_parens_nest_limit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_recursion_limit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_recursion_memory_management.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_set_substitute_callout.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substitute.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_copy_byname.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_copy_bynumber.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_get_byname.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_get_bynumber.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_length_byname.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_length_bynumber.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_list_free.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_list_get.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_nametable_scan.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2_substring_number_from_name.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2api.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2build.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2callout.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2compat.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2convert.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2demo.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2grep.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2jit.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2limits.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2matching.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2partial.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2pattern.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2perform.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2posix.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2sample.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2serialize.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2syntax.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2test.html
+#usr/share/doc/pcre-pcre2-10.36/html/pcre2unicode.html
+#usr/share/doc/pcre-pcre2-10.36/pcre2-config.txt
+#usr/share/doc/pcre-pcre2-10.36/pcre2.txt
+#usr/share/doc/pcre-pcre2-10.36/pcre2grep.txt
+#usr/share/doc/pcre-pcre2-10.36/pcre2test.txt
+#usr/share/man/man1/pcre2-config.1
+#usr/share/man/man1/pcre2grep.1
+#usr/share/man/man1/pcre2test.1
+#usr/share/man/man3/pcre2.3
+#usr/share/man/man3/pcre2_callout_enumerate.3
+#usr/share/man/man3/pcre2_code_copy.3
+#usr/share/man/man3/pcre2_code_copy_with_tables.3
+#usr/share/man/man3/pcre2_code_free.3
+#usr/share/man/man3/pcre2_compile.3
+#usr/share/man/man3/pcre2_compile_context_copy.3
+#usr/share/man/man3/pcre2_compile_context_create.3
+#usr/share/man/man3/pcre2_compile_context_free.3
+#usr/share/man/man3/pcre2_config.3
+#usr/share/man/man3/pcre2_convert_context_copy.3
+#usr/share/man/man3/pcre2_convert_context_create.3
+#usr/share/man/man3/pcre2_convert_context_free.3
+#usr/share/man/man3/pcre2_converted_pattern_free.3
+#usr/share/man/man3/pcre2_dfa_match.3
+#usr/share/man/man3/pcre2_general_context_copy.3
+#usr/share/man/man3/pcre2_general_context_create.3
+#usr/share/man/man3/pcre2_general_context_free.3
+#usr/share/man/man3/pcre2_get_error_message.3
+#usr/share/man/man3/pcre2_get_mark.3
+#usr/share/man/man3/pcre2_get_match_data_size.3
+#usr/share/man/man3/pcre2_get_ovector_count.3
+#usr/share/man/man3/pcre2_get_ovector_pointer.3
+#usr/share/man/man3/pcre2_get_startchar.3
+#usr/share/man/man3/pcre2_jit_compile.3
+#usr/share/man/man3/pcre2_jit_free_unused_memory.3
+#usr/share/man/man3/pcre2_jit_match.3
+#usr/share/man/man3/pcre2_jit_stack_assign.3
+#usr/share/man/man3/pcre2_jit_stack_create.3
+#usr/share/man/man3/pcre2_jit_stack_free.3
+#usr/share/man/man3/pcre2_maketables.3
+#usr/share/man/man3/pcre2_maketables_free.3
+#usr/share/man/man3/pcre2_match.3
+#usr/share/man/man3/pcre2_match_context_copy.3
+#usr/share/man/man3/pcre2_match_context_create.3
+#usr/share/man/man3/pcre2_match_context_free.3
+#usr/share/man/man3/pcre2_match_data_create.3
+#usr/share/man/man3/pcre2_match_data_create_from_pattern.3
+#usr/share/man/man3/pcre2_match_data_free.3
+#usr/share/man/man3/pcre2_pattern_convert.3
+#usr/share/man/man3/pcre2_pattern_info.3
+#usr/share/man/man3/pcre2_serialize_decode.3
+#usr/share/man/man3/pcre2_serialize_encode.3
+#usr/share/man/man3/pcre2_serialize_free.3
+#usr/share/man/man3/pcre2_serialize_get_number_of_codes.3
+#usr/share/man/man3/pcre2_set_bsr.3
+#usr/share/man/man3/pcre2_set_callout.3
+#usr/share/man/man3/pcre2_set_character_tables.3
+#usr/share/man/man3/pcre2_set_compile_extra_options.3
+#usr/share/man/man3/pcre2_set_compile_recursion_guard.3
+#usr/share/man/man3/pcre2_set_depth_limit.3
+#usr/share/man/man3/pcre2_set_glob_escape.3
+#usr/share/man/man3/pcre2_set_glob_separator.3
+#usr/share/man/man3/pcre2_set_heap_limit.3
+#usr/share/man/man3/pcre2_set_match_limit.3
+#usr/share/man/man3/pcre2_set_max_pattern_length.3
+#usr/share/man/man3/pcre2_set_newline.3
+#usr/share/man/man3/pcre2_set_offset_limit.3
+#usr/share/man/man3/pcre2_set_parens_nest_limit.3
+#usr/share/man/man3/pcre2_set_recursion_limit.3
+#usr/share/man/man3/pcre2_set_recursion_memory_management.3
+#usr/share/man/man3/pcre2_set_substitute_callout.3
+#usr/share/man/man3/pcre2_substitute.3
+#usr/share/man/man3/pcre2_substring_copy_byname.3
+#usr/share/man/man3/pcre2_substring_copy_bynumber.3
+#usr/share/man/man3/pcre2_substring_free.3
+#usr/share/man/man3/pcre2_substring_get_byname.3
+#usr/share/man/man3/pcre2_substring_get_bynumber.3
+#usr/share/man/man3/pcre2_substring_length_byname.3
+#usr/share/man/man3/pcre2_substring_length_bynumber.3
+#usr/share/man/man3/pcre2_substring_list_free.3
+#usr/share/man/man3/pcre2_substring_list_get.3
+#usr/share/man/man3/pcre2_substring_nametable_scan.3
+#usr/share/man/man3/pcre2_substring_number_from_name.3
+#usr/share/man/man3/pcre2api.3
+#usr/share/man/man3/pcre2build.3
+#usr/share/man/man3/pcre2callout.3
+#usr/share/man/man3/pcre2compat.3
+#usr/share/man/man3/pcre2convert.3
+#usr/share/man/man3/pcre2demo.3
+#usr/share/man/man3/pcre2jit.3
+#usr/share/man/man3/pcre2limits.3
+#usr/share/man/man3/pcre2matching.3
+#usr/share/man/man3/pcre2partial.3
+#usr/share/man/man3/pcre2pattern.3
+#usr/share/man/man3/pcre2perform.3
+#usr/share/man/man3/pcre2posix.3
+#usr/share/man/man3/pcre2sample.3
+#usr/share/man/man3/pcre2serialize.3
+#usr/share/man/man3/pcre2syntax.3
+#usr/share/man/man3/pcre2unicode.3
index 9f6d18ee6730a3ab1b9846a78e6ba4187c82f4e8..581ba243fb69b57b6e2cc048e9cb24ddff51c037 100644 (file)
@@ -41,6 +41,7 @@ usr/bin/qpdf
 #usr/include/qpdf/QPDFPageDocumentHelper.hh
 #usr/include/qpdf/QPDFPageLabelDocumentHelper.hh
 #usr/include/qpdf/QPDFPageObjectHelper.hh
+#usr/include/qpdf/QPDFStreamFilter.hh
 #usr/include/qpdf/QPDFSystemError.hh
 #usr/include/qpdf/QPDFTokenizer.hh
 #usr/include/qpdf/QPDFWriter.hh
@@ -50,11 +51,10 @@ usr/bin/qpdf
 #usr/include/qpdf/RandomDataProvider.hh
 #usr/include/qpdf/Types.h
 #usr/include/qpdf/qpdf-c.h
-#usr/lib/libqpdf.a
 #usr/lib/libqpdf.la
 #usr/lib/libqpdf.so
 usr/lib/libqpdf.so.28
-usr/lib/libqpdf.so.28.0.1
+usr/lib/libqpdf.so.28.1.0
 #usr/lib/pkgconfig/libqpdf.pc
 #usr/share/doc/qpdf
 #usr/share/doc/qpdf/qpdf-manual.html
index ede5aa50d3935032867ee58c08f2b10abd4a4702..0b389a7c3710a51325e53314868ed9de09527e0c 100644 (file)
@@ -1,5 +1,6 @@
 bin/mountpoint
 bin/pidof
+#etc/inittab.d
 #sbin/bootlogd
 #sbin/fstab-decode
 sbin/halt
@@ -14,6 +15,7 @@ sbin/telinit
 usr/bin/last
 usr/bin/lastb
 usr/bin/mesg
+#usr/bin/readbootlog
 usr/bin/utmpdump
 usr/bin/wall
 #usr/include/initreq.h
@@ -21,8 +23,10 @@ usr/bin/wall
 #usr/share/man/man1/lastb.1
 #usr/share/man/man1/mesg.1
 #usr/share/man/man1/mountpoint.1
+#usr/share/man/man1/readbootlog.1
 #usr/share/man/man1/utmpdump.1
 #usr/share/man/man1/wall.1
+#usr/share/man/man5/initctl.5
 #usr/share/man/man5/initscript.5
 #usr/share/man/man5/inittab.5
 #usr/share/man/man8/bootlogd.8
index c4232d24442563b2839eefc26695c11775fc6a16..5ad0d658a7fee71239952917be9372aaf880f582 100644 (file)
@@ -25,20 +25,20 @@ usr/bin/tclsh8.6
 #usr/include/tdbc.h
 #usr/include/tdbcDecls.h
 #usr/include/tdbcInt.h
-#usr/lib/itcl4.0.5
-usr/lib/itcl4.0.5/itcl.tcl
-usr/lib/itcl4.0.5/itclConfig.sh
-usr/lib/itcl4.0.5/itclHullCmds.tcl
-usr/lib/itcl4.0.5/itclWidget.tcl
-usr/lib/itcl4.0.5/libitcl4.0.5.so
-usr/lib/itcl4.0.5/libitclstub4.0.5.a
-usr/lib/itcl4.0.5/pkgIndex.tcl
+#usr/lib/itcl4.2.1
+usr/lib/itcl4.2.1/itcl.tcl
+usr/lib/itcl4.2.1/itclConfig.sh
+usr/lib/itcl4.2.1/itclHullCmds.tcl
+usr/lib/itcl4.2.1/itclWidget.tcl
+usr/lib/itcl4.2.1/libitcl4.2.1.so
+usr/lib/itcl4.2.1/libitclstub4.2.1.a
+usr/lib/itcl4.2.1/pkgIndex.tcl
 usr/lib/libtcl8.6.so
 #usr/lib/libtclstub8.6.a
 #usr/lib/pkgconfig/tcl.pc
-#usr/lib/sqlite3.13.0
-usr/lib/sqlite3.13.0/libsqlite3.13.0.so
-usr/lib/sqlite3.13.0/pkgIndex.tcl
+#usr/lib/sqlite3.34.0
+usr/lib/sqlite3.34.0/libsqlite3.34.0.so
+usr/lib/sqlite3.34.0/pkgIndex.tcl
 #usr/lib/tcl8
 #usr/lib/tcl8.6
 usr/lib/tcl8.6/auto.tcl
@@ -267,40 +267,43 @@ usr/lib/tcl8.6/tm.tcl
 usr/lib/tcl8.6/word.tcl
 #usr/lib/tcl8/8.4
 usr/lib/tcl8/8.4/platform
-usr/lib/tcl8/8.4/platform-1.0.14.tm
+usr/lib/tcl8/8.4/platform-1.0.15.tm
 usr/lib/tcl8/8.4/platform/shell-1.1.4.tm
 #usr/lib/tcl8/8.5
-usr/lib/tcl8/8.5/msgcat-1.6.0.tm
-usr/lib/tcl8/8.5/tcltest-2.4.0.tm
+usr/lib/tcl8/8.5/msgcat-1.6.1.tm
+usr/lib/tcl8/8.5/tcltest-2.5.3.tm
 #usr/lib/tcl8/8.6
-usr/lib/tcl8/8.6/http-2.8.9.tm
+usr/lib/tcl8/8.6/http-2.9.5.tm
 usr/lib/tcl8/8.6/tdbc
-usr/lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm
+usr/lib/tcl8/8.6/tdbc/sqlite3-1.1.2.tm
 usr/lib/tclConfig.sh
 usr/lib/tclooConfig.sh
-#usr/lib/tdbc1.0.4
-usr/lib/tdbc1.0.4/libtdbc1.0.4.so
-usr/lib/tdbc1.0.4/libtdbcstub1.0.4.a
-usr/lib/tdbc1.0.4/pkgIndex.tcl
-usr/lib/tdbc1.0.4/tdbc.tcl
-usr/lib/tdbc1.0.4/tdbcConfig.sh
-#usr/lib/tdbcmysql1.0.4
-usr/lib/tdbcmysql1.0.4/libtdbcmysql1.0.4.so
-usr/lib/tdbcmysql1.0.4/pkgIndex.tcl
-usr/lib/tdbcmysql1.0.4/tdbcmysql.tcl
-#usr/lib/tdbcodbc1.0.4
-usr/lib/tdbcodbc1.0.4/libtdbcodbc1.0.4.so
-usr/lib/tdbcodbc1.0.4/pkgIndex.tcl
-usr/lib/tdbcodbc1.0.4/tdbcodbc.tcl
-#usr/lib/tdbcpostgres1.0.4
-usr/lib/tdbcpostgres1.0.4/libtdbcpostgres1.0.4.so
-usr/lib/tdbcpostgres1.0.4/pkgIndex.tcl
-usr/lib/tdbcpostgres1.0.4/tdbcpostgres.tcl
-#usr/lib/thread2.8.0
-usr/lib/thread2.8.0/libthread2.8.0.so
-usr/lib/thread2.8.0/pkgIndex.tcl
-usr/lib/thread2.8.0/ttrace.tcl
+#usr/lib/tdbc1.1.2
+usr/lib/tdbc1.1.2/libtdbc1.1.2.so
+usr/lib/tdbc1.1.2/libtdbcstub1.1.2.a
+usr/lib/tdbc1.1.2/pkgIndex.tcl
+usr/lib/tdbc1.1.2/tdbc.tcl
+usr/lib/tdbc1.1.2/tdbcConfig.sh
+#usr/lib/tdbcmysql1.1.2
+usr/lib/tdbcmysql1.1.2/libtdbcmysql1.1.2.so
+usr/lib/tdbcmysql1.1.2/pkgIndex.tcl
+usr/lib/tdbcmysql1.1.2/tdbcmysql.tcl
+#usr/lib/tdbcodbc1.1.2
+usr/lib/tdbcodbc1.1.2/libtdbcodbc1.1.2.so
+usr/lib/tdbcodbc1.1.2/pkgIndex.tcl
+usr/lib/tdbcodbc1.1.2/tdbcodbc.tcl
+#usr/lib/tdbcpostgres1.1.2
+usr/lib/tdbcpostgres1.1.2/libtdbcpostgres1.1.2.so
+usr/lib/tdbcpostgres1.1.2/pkgIndex.tcl
+usr/lib/tdbcpostgres1.1.2/tdbcpostgres.tcl
+#usr/lib/thread2.8.6
+usr/lib/thread2.8.6/libthread2.8.6.so
+usr/lib/thread2.8.6/pkgIndex.tcl
+usr/lib/thread2.8.6/ttrace.tcl
 #usr/man/man1/tclsh.1
+#usr/man/man3/DString.3
+#usr/man/man3/Notifier.3
+#usr/man/man3/RegExp.3
 #usr/man/man3/TCL_MEM_DEBUG.3
 #usr/man/man3/Tcl_Access.3
 #usr/man/man3/Tcl_AddErrorInfo.3
@@ -380,6 +383,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/man3/Tcl_CreateAliasObj.3
 #usr/man/man3/Tcl_CreateChannel.3
 #usr/man/man3/Tcl_CreateChannelHandler.3
+#usr/man/man3/Tcl_CreateChild.3
 #usr/man/man3/Tcl_CreateCloseHandler.3
 #usr/man/man3/Tcl_CreateCommand.3
 #usr/man/man3/Tcl_CreateEncoding.3
@@ -555,6 +559,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/man3/Tcl_GetChannelThread.3
 #usr/man/man3/Tcl_GetChannelType.3
 #usr/man/man3/Tcl_GetCharLength.3
+#usr/man/man3/Tcl_GetChild.3
 #usr/man/man3/Tcl_GetClassAsObject.3
 #usr/man/man3/Tcl_GetCommandFromObj.3
 #usr/man/man3/Tcl_GetCommandFullName.3
@@ -610,6 +615,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/man3/Tcl_GetObjectName.3
 #usr/man/man3/Tcl_GetObjectNamespace.3
 #usr/man/man3/Tcl_GetOpenFile.3
+#usr/man/man3/Tcl_GetParent.3
 #usr/man/man3/Tcl_GetPathType.3
 #usr/man/man3/Tcl_GetRange.3
 #usr/man/man3/Tcl_GetRegExpFromObj.3
@@ -948,6 +954,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/man3/Tcl_ZlibStreamGetCommandName.3
 #usr/man/man3/Tcl_ZlibStreamInit.3
 #usr/man/man3/Tcl_ZlibStreamPut.3
+#usr/man/man3/Thread.3
 #usr/man/man3/attemptckalloc.3
 #usr/man/man3/attemptckrealloc.3
 #usr/man/man3/ckalloc.3
@@ -1015,6 +1022,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/mann/join.n
 #usr/man/mann/lappend.n
 #usr/man/mann/lassign.n
+#usr/man/mann/library.n
 #usr/man/mann/lindex.n
 #usr/man/mann/linsert.n
 #usr/man/mann/list.n
@@ -1043,8 +1051,10 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/mann/oo_object.n
 #usr/man/mann/open.n
 #usr/man/mann/package.n
+#usr/man/mann/packagens.n
 #usr/man/mann/parray.n
 #usr/man/mann/pid.n
+#usr/man/mann/pkgMkIndex.n
 #usr/man/mann/pkg_create.n
 #usr/man/mann/pkg_mkIndex.n
 #usr/man/mann/platform.n
@@ -1095,6 +1105,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/man/mann/tell.n
 #usr/man/mann/throw.n
 #usr/man/mann/time.n
+#usr/man/mann/timerate.n
 #usr/man/mann/tm.n
 #usr/man/mann/trace.n
 #usr/man/mann/transchan.n
@@ -1136,6 +1147,7 @@ usr/lib/thread2.8.0/ttrace.tcl
 #usr/share/man/mann/tdbc_mapSqlState.n
 #usr/share/man/mann/tdbc_mysql.n
 #usr/share/man/mann/tdbc_odbc.n
+#usr/share/man/mann/tdbc_postgres.n
 #usr/share/man/mann/tdbc_resultset.n
 #usr/share/man/mann/tdbc_sqlite3.n
 #usr/share/man/mann/tdbc_statement.n
index 45fee4460a344282fe2c22a5897faa2c80d81b70..6d890daf0ced61caf741af76188c8b1efd2960a4 100644 (file)
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
 #usr/lib/libunbound.la
 #usr/lib/libunbound.so
 usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.1.11
+usr/lib/libunbound.so.8.1.12
 #usr/lib/pkgconfig/libunbound.pc
 usr/sbin/unbound
 usr/sbin/unbound-anchor
index b99f5221288d66acd6492602612ec63738825867..43f9afb873c1338f0beb9725b4862367e01fb0c4 100644 (file)
@@ -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/155/filelists/attr b/config/rootfiles/core/155/filelists/attr
new file mode 120000 (symlink)
index 0000000..c808017
--- /dev/null
@@ -0,0 +1 @@
+../../../common/attr
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/collectd b/config/rootfiles/core/155/filelists/collectd
new file mode 120000 (symlink)
index 0000000..871b32f
--- /dev/null
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files
new file mode 100644 (file)
index 0000000..722152c
--- /dev/null
@@ -0,0 +1,2 @@
+srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/wirelessclient.cgi
diff --git a/config/rootfiles/core/155/filelists/freetype b/config/rootfiles/core/155/filelists/freetype
new file mode 120000 (symlink)
index 0000000..79ec5c4
--- /dev/null
@@ -0,0 +1 @@
+../../../common/freetype
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/lcms2 b/config/rootfiles/core/155/filelists/lcms2
new file mode 120000 (symlink)
index 0000000..f72a394
--- /dev/null
@@ -0,0 +1 @@
+../../../common/lcms2
\ 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 (symlink)
index 0000000..ad93616
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libxcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/lz4 b/config/rootfiles/core/155/filelists/lz4
new file mode 120000 (symlink)
index 0000000..65c3180
--- /dev/null
@@ -0,0 +1 @@
+../../../common/lz4
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/net-tools b/config/rootfiles/core/155/filelists/net-tools
new file mode 120000 (symlink)
index 0000000..bac6b00
--- /dev/null
@@ -0,0 +1 @@
+../../../common/net-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/pcre2 b/config/rootfiles/core/155/filelists/pcre2
new file mode 120000 (symlink)
index 0000000..4482cae
--- /dev/null
@@ -0,0 +1 @@
+../../../common/pcre2
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/qpdf b/config/rootfiles/core/155/filelists/qpdf
new file mode 120000 (symlink)
index 0000000..2d6c43d
--- /dev/null
@@ -0,0 +1 @@
+../../../common/qpdf
\ 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 (file)
index 0000000..3a700fa
--- /dev/null
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+etc/os-release
+var/ipfire/langs
diff --git a/config/rootfiles/core/155/filelists/squid b/config/rootfiles/core/155/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/sysvinit b/config/rootfiles/core/155/filelists/sysvinit
new file mode 120000 (symlink)
index 0000000..f3fb330
--- /dev/null
@@ -0,0 +1 @@
+../../../common/sysvinit
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/tcl b/config/rootfiles/core/155/filelists/tcl
new file mode 120000 (symlink)
index 0000000..7f620c6
--- /dev/null
@@ -0,0 +1 @@
+../../../common/tcl
\ No newline at end of file
diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
new file mode 100644 (file)
index 0000000..f7b2e82
--- /dev/null
@@ -0,0 +1,73 @@
+#!/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
+rm -vf \
+       /lib/libpcre.so.0 \
+       /lib/libpcre.so.0.0.1
+
+# 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
+/etc/init.d/unbound restart
+/etc/init.d/collectd restart
+/etc/init.d/squid restart
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/154/exclude b/config/rootfiles/oldcore/154/exclude
new file mode 100644 (file)
index 0000000..818039f
--- /dev/null
@@ -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/oldcore/154/filelists/unbound b/config/rootfiles/oldcore/154/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
index 609edf32ce9a65c7266a459bb9d74f07eb2434f8..fd32d49e63186de8333e2155f8b1bd2b23a30b5a 100644 (file)
@@ -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
index 2cb97983d07245dd1361e37599380aabe3894d33..c38a12ce4e61009ad032f69e46d9292460d0c8f3 100644 (file)
@@ -1 +1 @@
-etc/snort/snort.conf
\ No newline at end of file
+etc/snort/snort.conf
index a5d5ed6071553757bb7a5dede98ed7ff976d0595..a0e8a80d154923239db6d9d43acba0236ee1a276 100644 (file)
@@ -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
index 27319b4cf2079d61b05c93ab0ccc65e5ef198979..b79791c906833e2c401a880eb036fa7e1a32f8d6 100644 (file)
@@ -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
index 05cb542ac8924e824bdb2206fa5ce201d6667a09..f7826ec11476fa51a8ff602792e32b5d80cea818 100644 (file)
@@ -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
index 9a68f1b87ac853341c1ed0e6e033e95d636029d9..2e6e0285e226111d4530243262b1beba1f1a01be 100644 (file)
@@ -171,3 +171,5 @@ usr/lib/libverto.so.0.0
 #usr/share/man/man8/krb5kdc.8
 #usr/share/man/man8/sserver.8
 var/lib/krb5kdc
+#var/lib/run
+#var/lib/run/krb5kdc
index 89b46c89b460554f0104acf37dc35dc11ecdb6f5..716d41638f8ac93231ab321176400f940153c17b 100644 (file)
@@ -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/python-xattr b/config/rootfiles/packages/python-xattr
deleted file mode 100644 (file)
index 747ff5c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info
-usr/lib/python2.7/site-packages/xattr.so
index ee4b9f736aa01cf2ae5808d0064c54502be598dc..3792e74799d97a9499509064a6dbaca7bb780ad5 100644 (file)
@@ -9,9 +9,11 @@ usr/bin/qemu-img
 usr/bin/qemu-io
 usr/bin/qemu-nbd
 usr/bin/qemu-pr-helper
+usr/bin/qemu-riscv64
 usr/bin/qemu-storage-daemon
 usr/bin/qemu-system-arm
 usr/bin/qemu-system-i386
+usr/bin/qemu-system-riscv64
 usr/bin/qemu-system-x86_64
 usr/bin/qemu-x86_64
 usr/libexec/qemu-bridge-helper
index 7538749fae8eb1a65db9364e4ac166e83d6f0cf4..5976a0c479531ff4d526c2f40aaf294322071da2 100644 (file)
@@ -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
index 2b0a0003a64ba8fb21ff9fcfe321eac61467e9ca..0f7224919346048ebf49190df5b2d3d0f08b586f 100644 (file)
@@ -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
index 6519aa26c2560c736df65c714342d887955ba168..30111dc21757439db90c73126d40884c8e5fb093 100644 (file)
@@ -100,7 +100,7 @@ print <<END
 <div align='center'>
 <table width='80%'>
 <tr>
-<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td>
+       <td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td>
 </tr>
 </table>
 </div>
index d8637ccd2aec092dccf1debbb7653470730f15e7..63218a02112acc5d28bd9342abccf3a07ac0b9ae 100644 (file)
@@ -604,11 +604,11 @@ sub showEditBox() {
                                        </td>
                                        <td width='40%'>
                                                <select name='PRIO'>
-                                                       <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option>
+                                                       <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'least preferred'})</option>
                                                        <option value="1" $selected{'PRIO'}{'1'}>1</option>
                                                        <option value="2" $selected{'PRIO'}{'2'}>2</option>
                                                        <option value="3" $selected{'PRIO'}{'3'}>3</option>
-                                                       <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option>
+                                                       <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'most preferred'})</option>
                                                </select>
                                        </td>
                                        <td colspan="2" width='40%'></td>
index bdae19a11f557c0be825387be31068c28aab7443..f31c0f2b4251120e75e5c02185622063db43d85a 100644 (file)
--- a/lfs/attr
+++ b/lfs/attr
 
 include Config
 
-VER        = 2.4.47
+VER        = 2.4.48
 
 THISAPP    = attr-$(VER)
-DL_FILE    = $(THISAPP).src.tar.gz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 84f58dec00b60f2dc8fd1c9709291cc7
+$(DL_FILE)_MD5 = bc1e5cb5c96d99b24886f1f527d3bb3d
 
 install : $(TARGET)
 
@@ -73,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && make install-lib
-       cd $(DIR_APP) && make install-dev
        chmod -v 755 /usr/lib/libattr.so
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index 4abc8353a02d0737a7c223731a5103b04bd249c2..ed77c46edc7c81e053f9f114f8f0d57a6e488dc0 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.69
+VER        = 2.71
 
 THISAPP    = autoconf-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -39,7 +39,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 50f97f4159805e374639a73e2636f22e
+$(DL_FILE)_MD5 = 12cfa1687ffa2606337efe1a64416106
 
 install : $(TARGET)
 
index 0f99c4ce7a18e6043c29e36e70f201777f3ae265..7c9744531923ba9dda9d2ccbc393d56f7178e737 100644 (file)
@@ -106,6 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch
+       cd $(DIR_APP) && autoupdate -v configure.in
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
        cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
@@ -116,7 +117,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
                --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
                --enable-{tcpconns,unixsock,users,wireless} \
-               --with-librrd=/usr/share/rrdtool-1.2.30
+               --with-librrd=/usr/share/rrdtool-1.2.30 \
+               --with-fp-layout=nothing
        cd $(DIR_APP) && make install #collectd-4 does not support parallel build
        cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
        mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
index 4106d22ee9976df08fa26b00bc54879121cb5181..8a93ad0e9841ab97040f47c18ca0b935d63f788e 100644 (file)
@@ -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)
 
index edf019f5d46a8c916bfa335050c8d28ffbf824f0..696f95b29b1f453596963ca2666d4990a42e33a8 100644 (file)
@@ -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) && \
index 281c290dcd2b7d92d14138ff57cc45c8c60351b2..50217fab6e40ac52cf9f11e81a42b208fbe2160a 100644 (file)
--- 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
index 766dc8d05ae4f51e169f1ac19513d02a0715bada..c77e4fdfdee1eb60828e2034a047f70f992ec8a1 100644 (file)
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.18.3
+VER        = 1.19
 
 THISAPP    = krb5-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)/src
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = krb5
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a64e8018a7572e0b4bd477c745129ffc
+$(DL_FILE)_MD5 = aaf18447a5a014aa3b7e81814923f4c9
 
 install : $(TARGET)
 
index 198607e2538f8db8df27699de041f21e05b44222..9121e6fa0e55ece37c84da6163438c1c8d68a37a 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/lcd4linux
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcd4linux
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = dpfhack libmpdclient
 
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        $(UPDATE_AUTOMAKE)
+       cd $(DIR_APP) && autoreconf -v -i
+       cd $(DIR_APP) && autoupdate -v configure.in
        cd $(DIR_APP) && ./configure  --with-plugins=all,!qnaplog,!dbus --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
index d3173f3ffdf7dac1824a0b5a75a9728b755acb0f..d4c01cbac69470416ab041d93a18444b8caeb55c 100644 (file)
--- a/lfs/lcms2
+++ b/lfs/lcms2
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9
+VER        = 2.12
 
 THISAPP    = lcms2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8de1b7724f578d2995c8fdfa35c3ad0e
+$(DL_FILE)_MD5 = 8cb583c8447461896320b43ea9a688e0
 
 install : $(TARGET)
 
similarity index 83%
rename from lfs/python-xattr
rename to lfs/libxcrypt
index a77d22a9152bf081d764eacf2e718b336a066e48..8fb937c9b75cda3bfb0c243f9eee714cefffeff6 100644 (file)
 
 include Config
 
-VER        = 0.5.0
+VER        = 4.4.17
 
-THISAPP    = pyxattr-$(VER)
+THISAPP    = libxcrypt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = python-xattr
-PAK_VER    = 1
 
-DEPS       =
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84
+$(DL_FILE)_MD5 = 12118d098ead971f9a8377cacfdd0da7
 
 install : $(TARGET)
 
@@ -54,9 +55,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-       @$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -76,7 +74,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && python setup.py install
+       @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/lz4 b/lfs/lz4
index 17b10cfedda301d840025d5b2648932be9df3416..b09191c5e7a94d2e2abeb6f02b39fbb1ece901fb 100644 (file)
--- a/lfs/lz4
+++ b/lfs/lz4
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.9.2
+VER        = 1.9.3
 
 THISAPP    = lz4-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3898c56c82fb3d9455aefd48db48eaad
+$(DL_FILE)_MD5 = 3a1ab1684e14fc1afc66228ce61b2db3
 
 install : $(TARGET)
 
@@ -74,7 +74,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.2_mod_install_path.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.3_mod_install_path.patch
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
diff --git a/lfs/lzo b/lfs/lzo
index 58f25577dabdaf334838f66afd6a369865e8358d..93fe66d5cb0b53521440904a31cfec98301d6563 100644 (file)
--- a/lfs/lzo
+++ b/lfs/lzo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.09
+VER        = 2.10
 
 THISAPP    = lzo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c7ffc9a103afe2d1bba0b015e7aa887f
+$(DL_FILE)_MD5 = 39d3f3f9c55c87b1e5d6888e1420f4b5
 
 install : $(TARGET)
 
index 55a1eac65396f8398d78a7d19c5e652d8946365b..e4376619c35ecfc4ef9af06aaa07c04ed9b6c327 100644 (file)
--- a/lfs/mpage
+++ b/lfs/mpage
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.5.6
+VER        = 2.5.7
 
 THISAPP    = mpage-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 489663c9246e47915cea931348e5175d
+$(DL_FILE)_MD5 = 8d94338445345a554fd3bc664d48525a
 
 install : $(TARGET)
 
index 3fde55e2d28c2d9d631116c6d42d918849c202c9..7a568a2605c3b962d7675a41ec0babef28ae9a40 100644 (file)
 
 include Config
 
-VER        = 1.60
+VER        = 2.10
 
 THISAPP    = net-tools-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -39,7 +39,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                        = 888774accab40217dde927e21979c165
+$(DL_FILE)_MD5                        = 78aae762c95e2d731faf88d482e4cde5
 
 install : $(TARGET)
 
@@ -68,12 +68,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-iphdr-redef.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-2.10-no-hostname.patch
        cd $(DIR_APP) && yes "" | make config
        cd $(DIR_APP) && sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \
                                -e 's|HAVE_HWSTRIP 1|HAVE_HWSTRIP 0|g' \
@@ -82,6 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                -e 's|HAVE_HWSTRIP 1|HAVE_HWSTRIP 0|g' \
                                        -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make
        cd $(DIR_APP) && make
-       cd $(DIR_APP) && make update
+       cd $(DIR_APP) && make install
+
+       # Version 2.10 has moved ifconfig and route from sbin to bin
+       # Move these tools back to sbin to align with previous status in case anyone has
+       # scripts using these tools with the full pathname defined.
+       mv -v /bin/{ifconfig,route} /sbin
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
similarity index 85%
rename from lfs/pcre-compat
rename to lfs/pcre2
index 5709a477b0f94c87f324fd89d9046c9210971666..d5d6c8e950609d71b389209dc825a4e78b06d085 100644 (file)
+++ b/lfs/pcre2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
 
 include Config
 
-VER        = 7.7
+VER        = 10.36
 
-THISAPP    = pcre-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = pcre2-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4b2e9cde1f7227448dddba59843efa0b
+$(DL_FILE)_MD5 = a5d9aa7d18b61b0226696510e60c9582
 
 install : $(TARGET)
 
@@ -69,12 +69,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       $(UPDATE_AUTOMAKE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --disable-static \
+               --enable-unicode \
+               --enable-jit \
+               --enable-pcre2-16 \
+               --enable-pcre2-32 \
+               --docdir=/usr/share/doc/pcre-$(THISAPP)
        cd $(DIR_APP) && make $(MAKETUNING)
-
-       install -m 755 $(DIR_APP)/.libs/libpcre.so.0.0.1 /lib
-       ln -svf libpcre.so.0.0.1 /lib/libpcre.so.0
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index 2ab1bf8c015fc89f1435e8bda5b76bc6195a5b6e..aa09fa0ca5682202638dc6c616ab3ed38a975dd2 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,10 +33,20 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 29
+PAK_VER    = 30
 
 DEPS       = libusbredir spice libseccomp
 
+TARGETS    = \
+       i386-linux-user \
+       x86_64-linux-user \
+       arm-linux-user \
+       riscv64-linux-user \
+       i386-softmmu \
+       x86_64-softmmu \
+       arm-softmmu \
+       riscv64-softmmu
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -84,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --localstatedir=/var \
                --enable-kvm \
                --disable-attr \
-               --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
+               --target-list="$(TARGETS)" \
                --extra-cflags="$(CFLAGS)" \
                --enable-spice \
                --enable-usb-redir \
index 600454bc393d88d5301d6c41efab3a5f2554f79b..af934c647f564a456993b3fd9ae1583b5587a8b7 100644 (file)
--- a/lfs/qpdf
+++ b/lfs/qpdf
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 10.0.1
+VER        = 10.1.0
 
 THISAPP    = qpdf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = eb7fb7c6cd5d3036bf4f7a5e3f44d995
+$(DL_FILE)_MD5 = 6d72264ff68a9807418af4d7fc613e95
 
 install : $(TARGET)
 
index 3a53315d772db5195c5c9c9fcf763e51275e26f8..d1e91b8ae4de530430362e401436551546d99779 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.13
+VER        = 4.14
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 492e54afc15821141ff1d1d9903854d6
+$(DL_FILE)_MD5 = 7d9ba82703cd770b2ede169a0c1de94a
 
 install : $(TARGET)
 
index d85a3659b4767b45816473004a3cd60778c19651..e7b715ea433f045e007f7b925217f73a2669e002 100644 (file)
 
 include Config
 
-VER        = 2.88dsf
+VER        = 2.98
 
 THISAPP    = sysvinit-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f
+$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59
 
 install : $(TARGET)
 
@@ -72,8 +72,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        # Newer C libraries omit this include from sys/types.h.
        # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch
        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/lfs/tcl b/lfs/tcl
index bb2e3cdadc56c4bd790ba4f26e1afeaf21c94b8e..e4b15c7fb2473e04109e41eaabb42f05133c9cd1 100644 (file)
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.6.6
+VER        = 8.6.11
 
 THISAPP    = tcl$(VER)
 DL_FILE    = $(THISAPP)-src.tar.gz
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5193aea8107839a79df8ac709552ecb7
+$(DL_FILE)_MD5 = 8a4c004f48984a03a7747e9ba06e4da4
 
 install : $(TARGET)
 
index 69cb91d738287eafb96637d5636a71b26dbb9c99..0bd437481d9c5ab2c0a43484bca014cca7234624 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.13.0
+VER        = 1.13.1
 
 THISAPP    = unbound-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5a522f10c65332efe627098d2d24f947
+$(DL_FILE)_MD5 = 0cd660a40d733acc6e7cce43731cac62
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 94bb86d5b95a23107082d5c1dc091a9464b189c9..a0c71ce73763130022901002f9b40494e9bc2bc6 100755 (executable)
--- 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
@@ -1027,6 +1027,7 @@ buildtoolchain() {
        lfsmake1 gcc                    PASS=1
        lfsmake1 linux                  KCFG="-headers"
        lfsmake1 glibc
+       lfsmake1 libxcrypt
        lfsmake1 gcc                    PASS=L
        lfsmake1 binutils                       PASS=2
        lfsmake1 gcc                    PASS=2
@@ -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
@@ -1099,7 +1101,7 @@ buildbase() {
        lfsmake2 xz
        lfsmake2 lzip
        lfsmake2 pcre
-       lfsmake2 pcre-compat
+       lfsmake2 pcre2
        lfsmake2 gettext
        lfsmake2 attr
        lfsmake2 acl
@@ -1550,7 +1552,6 @@ buildipfire() {
   lfsmake2 python-distutils-extra
   lfsmake2 python-lzma
   lfsmake2 python-progressbar
-  lfsmake2 python-xattr
   lfsmake2 ddns
   lfsmake2 python3-setuptools
   lfsmake2 python3-setuptools-scm
@@ -1815,9 +1816,9 @@ clean)
        for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do
                $LOSETUP -d $i 2>/dev/null
        done
-       for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
-               umount $i
-       done
+       #for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
+       #       umount $i
+       #done
        stdumount
        for i in `seq 0 7`; do
                if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
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 (file)
index 0000000..7801466
--- /dev/null
@@ -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
+
diff --git a/src/patches/lz4-1.8.1.2_mod_install_path.patch b/src/patches/lz4-1.8.1.2_mod_install_path.patch
deleted file mode 100644 (file)
index 8b9646e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur lz4-1.8.1.2.orig/lib/Makefile lz4-1.8.1.2/lib/Makefile
---- lz4-1.8.1.2.orig/lib/Makefile      2018-01-21 07:24:41.881357925 +0000
-+++ lz4-1.8.1.2/lib/Makefile   2018-01-21 07:25:44.823444081 +0000
-@@ -120,7 +120,7 @@
- # directory variables : GNU conventions prefer lowercase
- # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
- # support both lower and uppercase (BSD), use uppercase in script
--prefix      ?= /usr/local
-+prefix      ?= /usr
- PREFIX      ?= $(prefix)
- exec_prefix ?= $(PREFIX)
- libdir      ?= $(exec_prefix)/lib
-diff -Nur lz4-1.8.1.2.orig/NEWS lz4-1.8.1.2/NEWS
---- lz4-1.8.1.2.orig/NEWS      2018-01-21 07:24:41.809360114 +0000
-+++ lz4-1.8.1.2/NEWS   2018-01-21 07:26:00.838957106 +0000
-@@ -96,7 +96,7 @@
- New    : lz4 cli supports long commands (suggested by Takayuki Matsuoka)
- New    : lz4frame & lz4cli frame content size support
- New    : lz4frame supports skippable frames, as requested by Sergey Cherepanov
--Changed: Default "make install" directory is /usr/local, as notified by Ron Johnson
-+Changed: Default "make install" directory is /usr, as notified by Ron Johnson
- New    : lz4 cli supports "pass-through" mode, requested by Neil Wilson
- New    : datagen can generate sparse files
- New    : scan-build tests, thanks to kind help by Takayuki Matsuoka
-diff -Nur lz4-1.8.1.2.orig/programs/Makefile lz4-1.8.1.2/programs/Makefile
---- lz4-1.8.1.2.orig/programs/Makefile 2018-01-21 07:24:41.881357925 +0000
-+++ lz4-1.8.1.2/programs/Makefile      2018-01-21 07:26:24.562235766 +0000
-@@ -121,7 +121,7 @@
- # directory variables : GNU conventions prefer lowercase
- # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
- # support both lower and uppercase (BSD), use uppercase in script
--prefix      ?= /usr/local
-+prefix      ?= /usr
- PREFIX      ?= $(prefix)
- exec_prefix ?= $(PREFIX)
- bindir      ?= $(exec_prefix)/bin
similarity index 61%
rename from src/patches/lz4-1.9.2_mod_install_path.patch
rename to src/patches/lz4-1.9.3_mod_install_path.patch
index 2eee0462ec87678d0ecb1ee2ca19f5a0e9af1e9c..3b674c4d8e10b128c8d421c8b07b74bbc365b446 100644 (file)
@@ -1,6 +1,6 @@
-diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile
---- lz4-1.9.2.orig/lib/Makefile        2019-10-29 08:14:03.167415441 +0000
-+++ lz4-1.9.2/lib/Makefile     2019-10-29 08:14:43.243864994 +0000
+diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile
+--- lz4-1.9.3/lib/Makefile.orig        2020-11-16 05:59:35.000000000 +0100
++++ lz4-1.9.3/lib/Makefile     2021-02-08 13:05:10.478443593 +0100
 @@ -144,7 +144,7 @@
  # directory variables : GNU conventions prefer lowercase
  # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
@@ -10,10 +10,10 @@ diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile
  prefix      ?= $(PREFIX)
  EXEC_PREFIX ?= $(prefix)
  exec_prefix ?= $(EXEC_PREFIX)
-diff -Nur lz4-1.9.2.orig/programs/Makefile lz4-1.9.2/programs/Makefile
---- lz4-1.9.2.orig/programs/Makefile   2019-10-29 08:14:03.177415386 +0000
-+++ lz4-1.9.2/programs/Makefile        2019-10-29 08:14:30.267268628 +0000
-@@ -132,7 +132,7 @@
+diff -au lz4-1.9.3/programs/Makefile.orig lz4-1.9.3/programs/Makefile
+--- lz4-1.9.3/programs/Makefile.orig   2020-11-16 05:59:35.000000000 +0100
++++ lz4-1.9.3/programs/Makefile        2021-02-08 13:05:55.475676260 +0100
+@@ -146,7 +146,7 @@
  # directory variables : GNU conventions prefer lowercase
  # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
  # support both lower and uppercase (BSD), use lowercase in script
index fefc547664148e5e4e1469a6fad36949ac58e540..55bf34caf3459a5ace1e974382bc33fe69790f85 100644 (file)
@@ -1,7 +1,7 @@
-diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
---- mpage-2.5.6/Makefile.config        2004-05-30 21:38:31.000000000 +0200
-+++ mpage-2.5.6/Makefile       2009-03-27 11:11:14.652186064 +0100
-@@ -40,7 +40,7 @@ CC=gcc
+diff -aup mpage-2.5.7/Makefile.orig mpage-2.5.7/Makefile
+--- mpage-2.5.7/Makefile.orig  2017-06-28 10:07:41.000000000 +0200
++++ mpage-2.5.7/Makefile       2021-02-08 13:35:23.219223469 +0100
+@@ -48,7 +48,7 @@ CC=gcc
  #  See glob.c for all possibilities
  #
  # PAGESIZE=Letter
@@ -10,7 +10,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
  
  #
  # Define your spooler type
-@@ -50,7 +50,7 @@ PAGESIZE=A4
+@@ -58,7 +58,7 @@ PAGESIZE=A4
  SPOOL_TYPE=BSD_SPOOLER
  
  # PREFIX=e:/usr               # OS/2 type
@@ -19,7 +19,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
  #PREFIX=/usr
  BINDIR=$(PREFIX)/bin
  LIBDIR=$(PREFIX)/share
-@@ -73,7 +73,7 @@ SHEETMARGIN=18 
+@@ -81,7 +81,7 @@ SHEETMARGIN=18
  #
  DEFAULT_DUPLEX=0
  
@@ -28,7 +28,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
  
  
  ############################################################################
-@@ -107,7 +107,7 @@ O = .o
+@@ -115,7 +115,7 @@ O = .o
  # If you are using gcc, you probably don't need to change anything here.
  
  # Linux:
@@ -37,7 +37,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
  
  # AIX (xlC on aix 4):
  #CFLAGS = -O2 -s $(DEFS)
-@@ -183,5 +183,4 @@ install:
+@@ -191,5 +191,4 @@ install:
        if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
        cp mpage$(E) $(BINDIR)
        cp mpage.1 $(MANDIR)
diff --git a/src/patches/net-tools-1.60-gcc34-3.patch b/src/patches/net-tools-1.60-gcc34-3.patch
deleted file mode 100644 (file)
index e6ec253..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org>
-Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org>
-Date: 2004-06-23
-Initial Package Version: 1.60
-Origin: N/A
-Upstream Status: N/A
-Description: Fix some occurrences of syntax that GCC 3.4 doesn't like.
-diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
---- net-tools-1.60.orig/hostname.c     2001-04-08 17:04:23.000000000 +0000
-+++ net-tools-1.60/hostname.c  2004-06-24 06:22:16.913258663 +0000
-@@ -78,6 +78,7 @@
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+          ((void)0);
-         }
-       exit(1);
-     }
-@@ -98,6 +99,7 @@
-           fprintf(stderr, _("%s: name too long\n"), program_name);
-           break;
-       default:
-+          ((void)0);
-       }
-       exit(1);
-     };
-@@ -117,6 +119,7 @@
-           fprintf(stderr, _("%s: name too long\n"), program_name);
-           break;
-       default:
-+          ((void)0);
-       }
-       exit(1);
-     };
-@@ -174,6 +177,7 @@
-       printf("%s\n", hp->h_name);
-       break;
-     default:
-+      ((void)0);
-     }
- }
-diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
---- net-tools-1.60.orig/lib/inet_sr.c  2000-02-20 21:46:45.000000000 +0000
-+++ net-tools-1.60/lib/inet_sr.c       2004-06-24 06:22:01.967840446 +0000
-@@ -105,6 +105,7 @@
-     case 2:
-        isnet = 0; break;
-     default:
-+       ((void)0);
-     }
-     /* Fill in the other fields. */
-diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c
---- net-tools-1.60.orig/mii-tool.c     2000-05-21 14:31:17.000000000 +0000
-+++ net-tools-1.60/mii-tool.c  2004-06-24 06:22:01.971839755 +0000
-@@ -379,17 +379,17 @@
- /*--------------------------------------------------------------------*/
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
--       (to advertise both HD and FD) 100baseTx, 10baseT\n";
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
-+"       -V, --version               display version information\n"
-+"       -v, --verbose               more verbose output\n"
-+"       -R, --reset                 reset MII to poweron state\n"
-+"       -r, --restart               restart autonegotiation\n"
-+"       -w, --watch                 monitor for link status changes\n"
-+"       -l, --log                   with -w, write events to syslog\n"
-+"       -A, --advertise=media,...   advertise only specified media\n"
-+"       -F, --force=media           force specified media technology\n"
-+"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
-+"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
- int main(int argc, char **argv)
- {
diff --git a/src/patches/net-tools-1.60-iphdr-redef.patch b/src/patches/net-tools-1.60-iphdr-redef.patch
deleted file mode 100644 (file)
index 23b6dfe..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur net-tools-1.60.org/iptunnel.c net-tools-1.60/iptunnel.c
---- net-tools-1.60.org/iptunnel.c      2001-04-08 19:04:23.000000000 +0200
-+++ net-tools-1.60/iptunnel.c  2017-02-07 17:37:17.956405434 +0100
-@@ -26,7 +26,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <netinet/in.h>
--#include <netinet/ip.h>
-+#include <linux/ip.h>
- #include <arpa/inet.h>
- #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
- #include <net/if.h>
diff --git a/src/patches/net-tools-1.60-kernel_headers-3.patch b/src/patches/net-tools-1.60-kernel_headers-3.patch
deleted file mode 100644 (file)
index 89988f0..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur net-tools-1.60.org/hostname.c net-tools-1.60/hostname.c
---- net-tools-1.60.org/hostname.c      2001-04-08 19:04:23.000000000 +0200
-+++ net-tools-1.60/hostname.c  2013-08-26 11:56:50.131844273 +0200
-@@ -42,10 +42,16 @@
- #include "config.h"
- #include "version.h"
- #include "../intl.h"
-+#include <linux/version.h>
- #if HAVE_AFDECnet
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
- #include <netdnet/dn.h>
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+#include <linux/dn.h>
-+#endif
-+#endif
- char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";
-diff -Naur net-tools-1.60.org/lib/tr.c net-tools-1.60/lib/tr.c
---- net-tools-1.60.org/lib/tr.c        2000-02-20 22:46:45.000000000 +0100
-+++ net-tools-1.60/lib/tr.c    2013-08-26 11:57:33.675175033 +0200
-@@ -20,7 +20,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if_arp.h>
--#include <linux/if_tr.h>
-+#include <netinet/if_tr.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
-diff -Naur net-tools-1.60.org/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
---- net-tools-1.60.org/lib/x25_sr.c    2000-05-20 15:38:10.000000000 +0200
-+++ net-tools-1.60/lib/x25_sr.c        2013-08-26 11:56:50.131844273 +0200
-@@ -22,6 +22,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/x25.h>
-+#include <linux/version.h>
- #include <ctype.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -77,7 +78,11 @@
-   rt.sigdigits=sigdigits;
-   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-   memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+#else
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
-+#endif
-   while (*args) {
-       if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/src/patches/net-tools-1.60-mii_ioctl-1.patch b/src/patches/net-tools-1.60-mii_ioctl-1.patch
deleted file mode 100644 (file)
index ca8582d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2004-08-27
-Initial Package Version: 1.60
-Upstream Status:         N/A (package is unmaintained)
-Origin:                  From Fedora Core (submitted to LFS-Hackers by Kevin White)
-Description:             Fixes mii-tool when compiled using Linux-2.6.x
-
-$LastChangedBy: randy $
-$Date: 2004-08-27 21:04:05 -0600 (Fri, 27 Aug 2004) $
-
---- net-tools-1.60/include/mii.h.bar   Tue Jul 31 11:49:39 2001
-+++ net-tools-1.60/include/mii.h       Tue Jul 31 11:49:33 2001
-@@ -11,11 +11,9 @@
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
--#define SIOCGMIIPHY (SIOCDEVPRIVATE)  /* Read from current PHY */
--#define SIOCGMIIREG (SIOCDEVPRIVATE+1)        /* Read any PHY register */
--#define SIOCSMIIREG (SIOCDEVPRIVATE+2)        /* Write any PHY register */
--#define SIOCGPARAMS (SIOCDEVPRIVATE+3)        /* Read operational parameters */
--#define SIOCSPARAMS (SIOCDEVPRIVATE+4)        /* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947    /* Read from current PHY */
-+#define SIOCGMIIREG 0x8948    /* Read any PHY register */
-+#define SIOCSMIIREG 0x8949    /* Write any PHY register */
- #endif
- #include <linux/types.h>
diff --git a/src/patches/net-tools-1.60-no-hostname.patch b/src/patches/net-tools-1.60-no-hostname.patch
deleted file mode 100644 (file)
index e2e34a1..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/Makefile.bak     2014-06-03 19:01:39.758845492 +0000
-+++ b/Makefile 2014-06-03 19:02:34.119171419 +0000
-@@ -76,7 +76,7 @@
- NET_LIB_PATH = lib
- NET_LIB_NAME = net-tools
--PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif
-+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif
- -include config.make
- ifeq ($(HAVE_IP_TOOLS),1)
-@@ -190,9 +190,6 @@
- nameif:       nameif.o
-               $(CC) $(LDFLAGS) -o nameif nameif.o 
--hostname:     hostname.o
--              $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB)
--
- route:                $(NET_LIB) route.o
-               $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB)
-@@ -224,7 +221,6 @@
-       install -m 0755 -d ${BASEDIR}/sbin
-       install -m 0755 -d ${BASEDIR}/bin
-       install -m 0755 arp        ${BASEDIR}/sbin
--      install -m 0755 hostname   ${BASEDIR}/bin
-       install -m 0755 ifconfig   ${BASEDIR}/sbin
-       install -m 0755 nameif     ${BASEDIR}/sbin
-       install -m 0755 netstat    ${BASEDIR}/bin
-@@ -239,21 +235,11 @@
- ifeq ($(HAVE_MII),1)
-       install -m 0755 mii-tool   $(BASEDIR)/sbin
- endif
--      ln -fs hostname $(BASEDIR)/bin/dnsdomainname
--      ln -fs hostname $(BASEDIR)/bin/ypdomainname
--      ln -fs hostname $(BASEDIR)/bin/nisdomainname
--      ln -fs hostname $(BASEDIR)/bin/domainname
--ifeq ($(HAVE_AFDECnet),1)
--      ln -fs hostname $(BASEDIR)/bin/nodename
--endif
- savebin:
-       @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
-                  ${BASEDIR}/bin/netstat \
--               ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \
--               ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
--                 ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
--               ${BASEDIR}/bin/domainname ; do \
-+               ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \
-                [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
- installdata:
diff --git a/src/patches/net-tools-2.10-no-hostname.patch b/src/patches/net-tools-2.10-no-hostname.patch
new file mode 100644 (file)
index 0000000..c96c798
--- /dev/null
@@ -0,0 +1,41 @@
+--- net-tools-2.10/Makefile.orig       2021-01-07 00:22:35.000000000 +0100
++++ net-tools-2.10/Makefile    2021-02-06 19:30:07.104393812 +0100
+@@ -39,9 +39,6 @@
+ ifeq ($(HAVE_ARP_TOOLS),1)
+ PROGS += arp rarp
+ endif
+-ifeq ($(HAVE_HOSTNAME_TOOLS),1)
+-PROGS += hostname
+-endif
+ ifeq ($(HAVE_IP_TOOLS),1)
+ PROGS   += iptunnel ipmaddr
+ endif
+@@ -173,9 +170,6 @@
+ nameif:               $(NET_LIB) nameif.o
+               $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(LDLIBS)
+-hostname:     hostname.o
+-              $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) $(LDLIBS)
+-
+ route:                $(NET_LIB) route.o
+               $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(LDLIBS)
+@@ -219,18 +213,6 @@
+       install -m 0755 arp        ${BASEDIR}${SBINDIR}
+       install -m 0755 rarp       ${BASEDIR}${SBINDIR}
+ endif
+-ifeq ($(HAVE_HOSTNAME_TOOLS),1)
+-      install -m 0755 hostname   ${BASEDIR}${BINDIR}
+-      ln -fs hostname $(BASEDIR)${BINDIR}/dnsdomainname
+-ifeq ($(HAVE_HOSTNAME_SYMLINKS),1)
+-      ln -fs hostname $(BASEDIR)${BINDIR}/ypdomainname
+-      ln -fs hostname $(BASEDIR)${BINDIR}/nisdomainname
+-      ln -fs hostname $(BASEDIR)${BINDIR}/domainname
+-endif
+-ifeq ($(HAVE_AFDECnet),1)
+-      ln -fs hostname $(BASEDIR)${BINDIR}/nodename
+-endif
+-endif
+ ifeq ($(HAVE_IP_TOOLS),1)
+       install -m 0755 ipmaddr    $(BASEDIR)${SBINDIR}
+       install -m 0755 iptunnel   $(BASEDIR)${SBINDIR}
diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-2.98_build_mountpoint.patch
new file mode 100644 (file)
index 0000000..719eff5
--- /dev/null
@@ -0,0 +1,12 @@
+diff -aup sysvinit-2.98/src/Makefile.orig sysvinit-2.98/src/Makefile
+--- sysvinit-2.98/src/Makefile.orig    2021-02-12 14:31:56.325112868 +0100
++++ sysvinit-2.98/src/Makefile 2021-02-12 14:31:56.257086870 +0100
+@@ -19,7 +19,7 @@ MANDB        := s@^\('\\\\\"\)[^\*-]*-\*- codin
+ # Leave empty if the mountpoint(1) command from util-linux 2.20
+ # and above should be used, otherwise set it to yes.
+ #
+-MNTPOINT=
++MNTPOINT=yes
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN   =