From: Michael Tremer Date: Mon, 29 Oct 2018 10:51:44 +0000 (+0000) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.21-core125~40 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=02776a0dc27051337ecaf0212a740c642b337378;hp=ca9c45b3f28aa497e4dec0e67cfc54cb69dc05a0 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc index 09bcb6b856..e100a79905 100644 --- a/config/rootfiles/common/aarch64/glibc +++ b/config/rootfiles/common/aarch64/glibc @@ -1,49 +1,47 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.27.so +lib/ld-2.28.so lib/ld-linux-aarch64.so.1 -lib/libBrokenLocale-2.27.so +lib/libBrokenLocale-2.28.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.27.so +lib/libanl-2.28.so lib/libanl.so.1 -lib/libc-2.27.so +lib/libc-2.28.so lib/libc.so.6 -lib/libcidn-2.27.so -lib/libcidn.so.1 -lib/libcrypt-2.27.so +lib/libcrypt-2.28.so lib/libcrypt.so.1 -lib/libdl-2.27.so +lib/libdl-2.28.so lib/libdl.so.2 -lib/libm-2.27.so +lib/libm-2.28.so lib/libm.so.6 #lib/libmemusage.so -lib/libnsl-2.27.so +lib/libnsl-2.28.so lib/libnsl.so.1 -lib/libnss_compat-2.27.so +lib/libnss_compat-2.28.so lib/libnss_compat.so.2 -lib/libnss_db-2.27.so +lib/libnss_db-2.28.so lib/libnss_db.so.2 -lib/libnss_dns-2.27.so +lib/libnss_dns-2.28.so lib/libnss_dns.so.2 -lib/libnss_files-2.27.so +lib/libnss_files-2.28.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.27.so +lib/libnss_hesiod-2.28.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.27.so +lib/libnss_nis-2.28.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.27.so +lib/libnss_nisplus-2.28.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.27.so +lib/libpthread-2.28.so lib/libpthread.so.0 -lib/libresolv-2.27.so +lib/libresolv-2.28.so lib/libresolv.so.2 -lib/librt-2.27.so +lib/librt-2.28.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.27.so +lib/libutil-2.28.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -64,7 +62,6 @@ usr/bin/locale #usr/bin/sprof #usr/bin/tzselect #usr/bin/xtrace -#usr/include/_G_config.h #usr/include/a.out.h #usr/include/aio.h #usr/include/aliases.h @@ -81,9 +78,7 @@ usr/bin/locale #usr/include/arpa/tftp.h #usr/include/assert.h #usr/include/bits -#usr/include/bits/_G_config.h #usr/include/bits/a.out.h -#usr/include/bits/byteswap-16.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h @@ -112,6 +107,7 @@ usr/bin/locale #usr/include/bits/getopt_posix.h #usr/include/bits/hwcap.h #usr/include/bits/in.h +#usr/include/bits/indirect-return.h #usr/include/bits/initspin.h #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h @@ -120,8 +116,6 @@ usr/bin/locale #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h #usr/include/bits/libc-header-start.h -#usr/include/bits/libio-ldbl.h -#usr/include/bits/libio.h #usr/include/bits/libm-simd-decl-stubs.h #usr/include/bits/link.h #usr/include/bits/local_lim.h @@ -130,6 +124,7 @@ usr/bin/locale #usr/include/bits/math-finite.h #usr/include/bits/math-vector.h #usr/include/bits/mathcalls-helper-functions.h +#usr/include/bits/mathcalls-narrow.h #usr/include/bits/mathcalls.h #usr/include/bits/mathdef.h #usr/include/bits/mathinline.h @@ -180,6 +175,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h #usr/include/bits/stdio-ldbl.h @@ -209,12 +205,16 @@ usr/bin/locale #usr/include/bits/types.h #usr/include/bits/types/FILE.h #usr/include/bits/types/__FILE.h +#usr/include/bits/types/__fpos64_t.h +#usr/include/bits/types/__fpos_t.h #usr/include/bits/types/__locale_t.h #usr/include/bits/types/__mbstate_t.h #usr/include/bits/types/__sigset_t.h #usr/include/bits/types/__sigval_t.h #usr/include/bits/types/clock_t.h #usr/include/bits/types/clockid_t.h +#usr/include/bits/types/cookie_io_functions_t.h +#usr/include/bits/types/error_t.h #usr/include/bits/types/locale_t.h #usr/include/bits/types/mbstate_t.h #usr/include/bits/types/res_state.h @@ -224,10 +224,12 @@ usr/bin/locale #usr/include/bits/types/sigset_t.h #usr/include/bits/types/sigval_t.h #usr/include/bits/types/stack_t.h +#usr/include/bits/types/struct_FILE.h #usr/include/bits/types/struct_iovec.h #usr/include/bits/types/struct_itimerspec.h #usr/include/bits/types/struct_osockaddr.h #usr/include/bits/types/struct_rusage.h +#usr/include/bits/types/struct_sched_param.h #usr/include/bits/types/struct_sigstack.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h @@ -240,7 +242,6 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h -#usr/include/bits/ustat.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -296,7 +297,6 @@ usr/bin/locale #usr/include/lastlog.h #usr/include/libgen.h #usr/include/libintl.h -#usr/include/libio.h #usr/include/limits.h #usr/include/link.h #usr/include/locale.h @@ -377,14 +377,12 @@ usr/bin/locale #usr/include/rpc/auth_des.h #usr/include/rpc/auth_unix.h #usr/include/rpc/clnt.h -#usr/include/rpc/des_crypt.h #usr/include/rpc/key_prot.h #usr/include/rpc/netdb.h #usr/include/rpc/pmap_clnt.h #usr/include/rpc/pmap_prot.h #usr/include/rpc/pmap_rmt.h #usr/include/rpc/rpc.h -#usr/include/rpc/rpc_des.h #usr/include/rpc/rpc_msg.h #usr/include/rpc/svc.h #usr/include/rpc/svc_auth.h @@ -522,7 +520,6 @@ usr/bin/locale #usr/include/sys/un.h #usr/include/sys/unistd.h #usr/include/sys/user.h -#usr/include/sys/ustat.h #usr/include/sys/utsname.h #usr/include/sys/vfs.h #usr/include/sys/vlimit.h @@ -538,13 +535,13 @@ usr/bin/locale #usr/include/termios.h #usr/include/tgmath.h #usr/include/thread_db.h +#usr/include/threads.h #usr/include/time.h #usr/include/ttyent.h #usr/include/uchar.h #usr/include/ucontext.h #usr/include/ulimit.h #usr/include/unistd.h -#usr/include/ustat.h #usr/include/utime.h #usr/include/utmp.h #usr/include/utmpx.h @@ -828,7 +825,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcidn.so #usr/lib/libcrypt.a #usr/lib/libcrypt.so #usr/lib/libdl.a @@ -848,7 +844,6 @@ usr/lib/gconv #usr/lib/libnss_nisplus.so #usr/lib/libpthread.a #usr/lib/libpthread.so -#usr/lib/libpthread_nonshared.a #usr/lib/libresolv.a #usr/lib/libresolv.so #usr/lib/librpcsvc.a @@ -2510,6 +2505,20 @@ usr/lib/locale #usr/lib/locale/doi_IN/LC_PAPER #usr/lib/locale/doi_IN/LC_TELEPHONE #usr/lib/locale/doi_IN/LC_TIME +#usr/lib/locale/dsb_DE +#usr/lib/locale/dsb_DE/LC_ADDRESS +#usr/lib/locale/dsb_DE/LC_COLLATE +#usr/lib/locale/dsb_DE/LC_CTYPE +#usr/lib/locale/dsb_DE/LC_IDENTIFICATION +#usr/lib/locale/dsb_DE/LC_MEASUREMENT +#usr/lib/locale/dsb_DE/LC_MESSAGES +#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/dsb_DE/LC_MONETARY +#usr/lib/locale/dsb_DE/LC_NAME +#usr/lib/locale/dsb_DE/LC_NUMERIC +#usr/lib/locale/dsb_DE/LC_PAPER +#usr/lib/locale/dsb_DE/LC_TELEPHONE +#usr/lib/locale/dsb_DE/LC_TIME #usr/lib/locale/dv_MV #usr/lib/locale/dv_MV/LC_ADDRESS #usr/lib/locale/dv_MV/LC_COLLATE @@ -6206,6 +6215,20 @@ usr/lib/locale #usr/lib/locale/sa_IN/LC_PAPER #usr/lib/locale/sa_IN/LC_TELEPHONE #usr/lib/locale/sa_IN/LC_TIME +#usr/lib/locale/sah_RU +#usr/lib/locale/sah_RU/LC_ADDRESS +#usr/lib/locale/sah_RU/LC_COLLATE +#usr/lib/locale/sah_RU/LC_CTYPE +#usr/lib/locale/sah_RU/LC_IDENTIFICATION +#usr/lib/locale/sah_RU/LC_MEASUREMENT +#usr/lib/locale/sah_RU/LC_MESSAGES +#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/sah_RU/LC_MONETARY +#usr/lib/locale/sah_RU/LC_NAME +#usr/lib/locale/sah_RU/LC_NUMERIC +#usr/lib/locale/sah_RU/LC_PAPER +#usr/lib/locale/sah_RU/LC_TELEPHONE +#usr/lib/locale/sah_RU/LC_TIME #usr/lib/locale/sat_IN #usr/lib/locale/sat_IN/LC_ADDRESS #usr/lib/locale/sat_IN/LC_COLLATE @@ -7956,6 +7979,7 @@ usr/lib/locale #usr/share/i18n/locales/de_LU #usr/share/i18n/locales/de_LU@euro #usr/share/i18n/locales/doi_IN +#usr/share/i18n/locales/dsb_DE #usr/share/i18n/locales/dv_MV #usr/share/i18n/locales/dz_BT #usr/share/i18n/locales/el_CY @@ -8139,6 +8163,7 @@ usr/lib/locale #usr/share/i18n/locales/ru_UA #usr/share/i18n/locales/rw_RW #usr/share/i18n/locales/sa_IN +#usr/share/i18n/locales/sah_RU #usr/share/i18n/locales/sat_IN #usr/share/i18n/locales/sc_IT #usr/share/i18n/locales/sd_IN diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index ba4f00a9ff..79ac99f996 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -1,5 +1,4 @@ #etc/mke2fs.conf -#etc/mke2fs.conf.e2fsprogs-new lib/libblkid.so.1 lib/libblkid.so.1.0 lib/libcom_err.so.2 @@ -19,19 +18,18 @@ sbin/dumpe2fs sbin/e2fsck sbin/e2image sbin/e2label +sbin/e2mmpstatus sbin/e2undo sbin/findfs sbin/fsck sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 -sbin/fsck.ext4dev #sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mkfs.ext4 -sbin/mkfs.ext4dev sbin/resize2fs sbin/tune2fs usr/bin/chattr @@ -56,10 +54,9 @@ usr/bin/uuidgen #usr/include/ext2fs/ext2_types.h #usr/include/ext2fs/ext2fs.h #usr/include/ext2fs/ext3_extents.h +#usr/include/ext2fs/hashmap.h #usr/include/ext2fs/qcow2.h #usr/include/ext2fs/tdb.h -#usr/include/quota -#usr/include/quota/mkquota.h #usr/include/ss #usr/include/ss/ss.h #usr/include/ss/ss_err.h @@ -74,7 +71,6 @@ usr/lib/libcom_err.so usr/lib/libe2p.so #usr/lib/libext2fs.a usr/lib/libext2fs.so -#usr/lib/libquota.a #usr/lib/libss.a usr/lib/libss.so #usr/lib/libuuid.a @@ -83,10 +79,10 @@ usr/lib/libuuid.so #usr/lib/pkgconfig/com_err.pc #usr/lib/pkgconfig/e2p.pc #usr/lib/pkgconfig/ext2fs.pc -#usr/lib/pkgconfig/quota.pc #usr/lib/pkgconfig/ss.pc #usr/lib/pkgconfig/uuid.pc usr/sbin/e2freefrag +usr/sbin/e4crypt usr/sbin/e4defrag usr/sbin/filefrag usr/sbin/mklost+found @@ -114,10 +110,10 @@ usr/sbin/uuidd #usr/share/man/man3/uuid_time.3 #usr/share/man/man3/uuid_unparse.3 #usr/share/man/man5/e2fsck.conf.5 -#usr/share/man/man5/mke2fs.conf.5 #usr/share/man/man5/ext2.5 #usr/share/man/man5/ext3.5 #usr/share/man/man5/ext4.5 +#usr/share/man/man5/mke2fs.conf.5 #usr/share/man/man8/badblocks.8 #usr/share/man/man8/blkid.8 #usr/share/man/man8/debugfs.8 @@ -126,7 +122,9 @@ usr/sbin/uuidd #usr/share/man/man8/e2fsck.8 #usr/share/man/man8/e2image.8 #usr/share/man/man8/e2label.8 +#usr/share/man/man8/e2mmpstatus.8 #usr/share/man/man8/e2undo.8 +#usr/share/man/man8/e4crypt.8 #usr/share/man/man8/e4defrag.8 #usr/share/man/man8/filefrag.8 #usr/share/man/man8/findfs.8 @@ -134,13 +132,11 @@ usr/sbin/uuidd #usr/share/man/man8/fsck.ext2.8 #usr/share/man/man8/fsck.ext3.8 #usr/share/man/man8/fsck.ext4.8 -#usr/share/man/man8/fsck.ext4dev.8 #usr/share/man/man8/logsave.8 #usr/share/man/man8/mke2fs.8 #usr/share/man/man8/mkfs.ext2.8 #usr/share/man/man8/mkfs.ext3.8 #usr/share/man/man8/mkfs.ext4.8 -#usr/share/man/man8/mkfs.ext4dev.8 #usr/share/man/man8/mklost+found.8 #usr/share/man/man8/resize2fs.8 #usr/share/man/man8/tune2fs.8 diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index 40bb8c63d5..f3019884c5 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -1,49 +1,47 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.27.so +lib/ld-2.28.so lib/ld-linux.so.2 -lib/libBrokenLocale-2.27.so +lib/libBrokenLocale-2.28.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.27.so +lib/libanl-2.28.so lib/libanl.so.1 -lib/libc-2.27.so +lib/libc-2.28.so lib/libc.so.6 -lib/libcidn-2.27.so -lib/libcidn.so.1 -lib/libcrypt-2.27.so +lib/libcrypt-2.28.so lib/libcrypt.so.1 -lib/libdl-2.27.so +lib/libdl-2.28.so lib/libdl.so.2 -lib/libm-2.27.so +lib/libm-2.28.so lib/libm.so.6 #lib/libmemusage.so -lib/libnsl-2.27.so +lib/libnsl-2.28.so lib/libnsl.so.1 -lib/libnss_compat-2.27.so +lib/libnss_compat-2.28.so lib/libnss_compat.so.2 -lib/libnss_db-2.27.so +lib/libnss_db-2.28.so lib/libnss_db.so.2 -lib/libnss_dns-2.27.so +lib/libnss_dns-2.28.so lib/libnss_dns.so.2 -lib/libnss_files-2.27.so +lib/libnss_files-2.28.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.27.so +lib/libnss_hesiod-2.28.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.27.so +lib/libnss_nis-2.28.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.27.so +lib/libnss_nisplus-2.28.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.27.so +lib/libpthread-2.28.so lib/libpthread.so.0 -lib/libresolv-2.27.so +lib/libresolv-2.28.so lib/libresolv.so.2 -lib/librt-2.27.so +lib/librt-2.28.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.27.so +lib/libutil-2.28.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -65,7 +63,6 @@ usr/bin/locale #usr/bin/sprof #usr/bin/tzselect #usr/bin/xtrace -#usr/include/_G_config.h #usr/include/a.out.h #usr/include/aio.h #usr/include/aliases.h @@ -82,9 +79,7 @@ usr/bin/locale #usr/include/arpa/tftp.h #usr/include/assert.h #usr/include/bits -#usr/include/bits/_G_config.h #usr/include/bits/a.out.h -#usr/include/bits/byteswap-16.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h @@ -113,6 +108,7 @@ usr/bin/locale #usr/include/bits/getopt_posix.h #usr/include/bits/hwcap.h #usr/include/bits/in.h +#usr/include/bits/indirect-return.h #usr/include/bits/initspin.h #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h @@ -121,8 +117,6 @@ usr/bin/locale #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h #usr/include/bits/libc-header-start.h -#usr/include/bits/libio-ldbl.h -#usr/include/bits/libio.h #usr/include/bits/libm-simd-decl-stubs.h #usr/include/bits/link.h #usr/include/bits/local_lim.h @@ -131,6 +125,7 @@ usr/bin/locale #usr/include/bits/math-finite.h #usr/include/bits/math-vector.h #usr/include/bits/mathcalls-helper-functions.h +#usr/include/bits/mathcalls-narrow.h #usr/include/bits/mathcalls.h #usr/include/bits/mathdef.h #usr/include/bits/mathinline.h @@ -181,6 +176,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h #usr/include/bits/stdio-ldbl.h @@ -210,12 +206,16 @@ usr/bin/locale #usr/include/bits/types.h #usr/include/bits/types/FILE.h #usr/include/bits/types/__FILE.h +#usr/include/bits/types/__fpos64_t.h +#usr/include/bits/types/__fpos_t.h #usr/include/bits/types/__locale_t.h #usr/include/bits/types/__mbstate_t.h #usr/include/bits/types/__sigset_t.h #usr/include/bits/types/__sigval_t.h #usr/include/bits/types/clock_t.h #usr/include/bits/types/clockid_t.h +#usr/include/bits/types/cookie_io_functions_t.h +#usr/include/bits/types/error_t.h #usr/include/bits/types/locale_t.h #usr/include/bits/types/mbstate_t.h #usr/include/bits/types/res_state.h @@ -225,10 +225,12 @@ usr/bin/locale #usr/include/bits/types/sigset_t.h #usr/include/bits/types/sigval_t.h #usr/include/bits/types/stack_t.h +#usr/include/bits/types/struct_FILE.h #usr/include/bits/types/struct_iovec.h #usr/include/bits/types/struct_itimerspec.h #usr/include/bits/types/struct_osockaddr.h #usr/include/bits/types/struct_rusage.h +#usr/include/bits/types/struct_sched_param.h #usr/include/bits/types/struct_sigstack.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h @@ -241,7 +243,6 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h -#usr/include/bits/ustat.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -297,7 +298,6 @@ usr/bin/locale #usr/include/lastlog.h #usr/include/libgen.h #usr/include/libintl.h -#usr/include/libio.h #usr/include/limits.h #usr/include/link.h #usr/include/locale.h @@ -378,14 +378,12 @@ usr/bin/locale #usr/include/rpc/auth_des.h #usr/include/rpc/auth_unix.h #usr/include/rpc/clnt.h -#usr/include/rpc/des_crypt.h #usr/include/rpc/key_prot.h #usr/include/rpc/netdb.h #usr/include/rpc/pmap_clnt.h #usr/include/rpc/pmap_prot.h #usr/include/rpc/pmap_rmt.h #usr/include/rpc/rpc.h -#usr/include/rpc/rpc_des.h #usr/include/rpc/rpc_msg.h #usr/include/rpc/svc.h #usr/include/rpc/svc_auth.h @@ -527,7 +525,6 @@ usr/bin/locale #usr/include/sys/un.h #usr/include/sys/unistd.h #usr/include/sys/user.h -#usr/include/sys/ustat.h #usr/include/sys/utsname.h #usr/include/sys/vfs.h #usr/include/sys/vlimit.h @@ -544,13 +541,13 @@ usr/bin/locale #usr/include/termios.h #usr/include/tgmath.h #usr/include/thread_db.h +#usr/include/threads.h #usr/include/time.h #usr/include/ttyent.h #usr/include/uchar.h #usr/include/ucontext.h #usr/include/ulimit.h #usr/include/unistd.h -#usr/include/ustat.h #usr/include/utime.h #usr/include/utmp.h #usr/include/utmpx.h @@ -837,7 +834,6 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcidn.so #usr/lib/libcrypt.a #usr/lib/libcrypt.so #usr/lib/libdl.a @@ -857,7 +853,6 @@ usr/lib/gconv #usr/lib/libnss_nisplus.so #usr/lib/libpthread.a #usr/lib/libpthread.so -#usr/lib/libpthread_nonshared.a #usr/lib/libresolv.a #usr/lib/libresolv.so #usr/lib/librpcsvc.a @@ -2519,6 +2514,20 @@ usr/lib/locale #usr/lib/locale/doi_IN/LC_PAPER #usr/lib/locale/doi_IN/LC_TELEPHONE #usr/lib/locale/doi_IN/LC_TIME +#usr/lib/locale/dsb_DE +#usr/lib/locale/dsb_DE/LC_ADDRESS +#usr/lib/locale/dsb_DE/LC_COLLATE +#usr/lib/locale/dsb_DE/LC_CTYPE +#usr/lib/locale/dsb_DE/LC_IDENTIFICATION +#usr/lib/locale/dsb_DE/LC_MEASUREMENT +#usr/lib/locale/dsb_DE/LC_MESSAGES +#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/dsb_DE/LC_MONETARY +#usr/lib/locale/dsb_DE/LC_NAME +#usr/lib/locale/dsb_DE/LC_NUMERIC +#usr/lib/locale/dsb_DE/LC_PAPER +#usr/lib/locale/dsb_DE/LC_TELEPHONE +#usr/lib/locale/dsb_DE/LC_TIME #usr/lib/locale/dv_MV #usr/lib/locale/dv_MV/LC_ADDRESS #usr/lib/locale/dv_MV/LC_COLLATE @@ -6215,6 +6224,20 @@ usr/lib/locale #usr/lib/locale/sa_IN/LC_PAPER #usr/lib/locale/sa_IN/LC_TELEPHONE #usr/lib/locale/sa_IN/LC_TIME +#usr/lib/locale/sah_RU +#usr/lib/locale/sah_RU/LC_ADDRESS +#usr/lib/locale/sah_RU/LC_COLLATE +#usr/lib/locale/sah_RU/LC_CTYPE +#usr/lib/locale/sah_RU/LC_IDENTIFICATION +#usr/lib/locale/sah_RU/LC_MEASUREMENT +#usr/lib/locale/sah_RU/LC_MESSAGES +#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/sah_RU/LC_MONETARY +#usr/lib/locale/sah_RU/LC_NAME +#usr/lib/locale/sah_RU/LC_NUMERIC +#usr/lib/locale/sah_RU/LC_PAPER +#usr/lib/locale/sah_RU/LC_TELEPHONE +#usr/lib/locale/sah_RU/LC_TIME #usr/lib/locale/sat_IN #usr/lib/locale/sat_IN/LC_ADDRESS #usr/lib/locale/sat_IN/LC_COLLATE @@ -7965,6 +7988,7 @@ usr/lib/locale #usr/share/i18n/locales/de_LU #usr/share/i18n/locales/de_LU@euro #usr/share/i18n/locales/doi_IN +#usr/share/i18n/locales/dsb_DE #usr/share/i18n/locales/dv_MV #usr/share/i18n/locales/dz_BT #usr/share/i18n/locales/el_CY @@ -8148,6 +8172,7 @@ usr/lib/locale #usr/share/i18n/locales/ru_UA #usr/share/i18n/locales/rw_RW #usr/share/i18n/locales/sa_IN +#usr/share/i18n/locales/sah_RU #usr/share/i18n/locales/sat_IN #usr/share/i18n/locales/sc_IT #usr/share/i18n/locales/sd_IN diff --git a/config/rootfiles/common/keyutils b/config/rootfiles/common/keyutils new file mode 100644 index 0000000000..10058de1c4 --- /dev/null +++ b/config/rootfiles/common/keyutils @@ -0,0 +1,50 @@ +bin/keyctl +etc/request-key.conf +etc/request-key.d +#lib/libkeyutils.so +lib/libkeyutils.so.1 +lib/libkeyutils.so.1.7 +sbin/key.dns_resolver +sbin/request-key +#usr/include/keyutils.h +#usr/share/keyutils +#usr/share/keyutils/request-key-debug.sh +#usr/share/man/man1/keyctl.1 +#usr/share/man/man3/find_key_by_type_and_name.3 +#usr/share/man/man3/keyctl.3 +#usr/share/man/man3/keyctl_assume_authority.3 +#usr/share/man/man3/keyctl_chown.3 +#usr/share/man/man3/keyctl_clear.3 +#usr/share/man/man3/keyctl_describe.3 +#usr/share/man/man3/keyctl_describe_alloc.3 +#usr/share/man/man3/keyctl_dh_compute.3 +#usr/share/man/man3/keyctl_dh_compute_alloc.3 +#usr/share/man/man3/keyctl_dh_compute_kdf.3 +#usr/share/man/man3/keyctl_get_keyring_ID.3 +#usr/share/man/man3/keyctl_get_persistent.3 +#usr/share/man/man3/keyctl_get_security.3 +#usr/share/man/man3/keyctl_get_security_alloc.3 +#usr/share/man/man3/keyctl_instantiate.3 +#usr/share/man/man3/keyctl_instantiate_iov.3 +#usr/share/man/man3/keyctl_invalidate.3 +#usr/share/man/man3/keyctl_join_session_keyring.3 +#usr/share/man/man3/keyctl_link.3 +#usr/share/man/man3/keyctl_negate.3 +#usr/share/man/man3/keyctl_read.3 +#usr/share/man/man3/keyctl_read_alloc.3 +#usr/share/man/man3/keyctl_reject.3 +#usr/share/man/man3/keyctl_restrict_keyring.3 +#usr/share/man/man3/keyctl_revoke.3 +#usr/share/man/man3/keyctl_search.3 +#usr/share/man/man3/keyctl_session_to_parent.3 +#usr/share/man/man3/keyctl_set_reqkey_keyring.3 +#usr/share/man/man3/keyctl_set_timeout.3 +#usr/share/man/man3/keyctl_setperm.3 +#usr/share/man/man3/keyctl_unlink.3 +#usr/share/man/man3/keyctl_update.3 +#usr/share/man/man3/recursive_key_scan.3 +#usr/share/man/man3/recursive_session_key_scan.3 +#usr/share/man/man5/request-key.conf.5 +#usr/share/man/man7/keyutils.7 +#usr/share/man/man8/key.dns_resolver.8 +#usr/share/man/man8/request-key.8 diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index 14e765477a..b3d45e25d5 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -5,9 +5,7 @@ sbin/lsmod sbin/modinfo sbin/modprobe sbin/rmmod -#usr/include/libkmod.h -#usr/lib/libkmod.la -usr/lib/libkmod.so +#usr/lib/libkmod.so usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.2.3 -#usr/lib/pkgconfig/libkmod.pc +usr/lib/libkmod.so.2.3.3 +#usr/share/bash-completion/completions/kmod diff --git a/config/rootfiles/common/libaio b/config/rootfiles/common/libaio new file mode 100644 index 0000000000..bc4ddf0deb --- /dev/null +++ b/config/rootfiles/common/libaio @@ -0,0 +1,5 @@ +#usr/include/libaio.h +#usr/lib/libaio.a +#usr/lib/libaio.so +usr/lib/libaio.so.1 +usr/lib/libaio.so.1.0.1 diff --git a/config/rootfiles/common/lvm2 b/config/rootfiles/common/lvm2 index 8ccafc79e0..db7f304e5c 100644 --- a/config/rootfiles/common/lvm2 +++ b/config/rootfiles/common/lvm2 @@ -1,10 +1,21 @@ #etc/lvm #etc/lvm/lvm.conf +#etc/lvm/lvmlocal.conf +#etc/lvm/profile +#etc/lvm/profile/cache-mq.profile +#etc/lvm/profile/cache-smq.profile +#etc/lvm/profile/command_profile_template.profile +#etc/lvm/profile/lvmdbusd.profile +#etc/lvm/profile/metadata_profile_template.profile +#etc/lvm/profile/thin-generic.profile +#etc/lvm/profile/thin-performance.profile #usr/include/libdevmapper.h #usr/lib/libdevmapper.so usr/lib/libdevmapper.so.1.02 #usr/lib/pkgconfig/devmapper.pc +#usr/sbin/blkdeactivate #usr/sbin/dmsetup +#usr/sbin/dmstats #usr/sbin/fsadm #usr/sbin/lvchange #usr/sbin/lvconvert @@ -12,8 +23,8 @@ usr/lib/libdevmapper.so.1.02 #usr/sbin/lvdisplay #usr/sbin/lvextend #usr/sbin/lvm -#usr/sbin/lvmchange #usr/sbin/lvmconf +#usr/sbin/lvmconfig #usr/sbin/lvmdiskscan #usr/sbin/lvmdump #usr/sbin/lvmsadc @@ -53,16 +64,27 @@ usr/lib/libdevmapper.so.1.02 #usr/sbin/vgscan #usr/sbin/vgsplit #usr/share/man/man5/lvm.conf.5 +#usr/share/man/man7/lvmcache.7 +#usr/share/man/man7/lvmraid.7 +#usr/share/man/man7/lvmreport.7 +#usr/share/man/man7/lvmsystemid.7 +#usr/share/man/man7/lvmthin.7 +#usr/share/man/man8/blkdeactivate.8 #usr/share/man/man8/dmsetup.8 +#usr/share/man/man8/dmstats.8 #usr/share/man/man8/fsadm.8 #usr/share/man/man8/lvchange.8 #usr/share/man/man8/lvconvert.8 #usr/share/man/man8/lvcreate.8 #usr/share/man/man8/lvdisplay.8 #usr/share/man/man8/lvextend.8 +#usr/share/man/man8/lvm-config.8 +#usr/share/man/man8/lvm-dumpconfig.8 +#usr/share/man/man8/lvm-fullreport.8 +#usr/share/man/man8/lvm-lvpoll.8 #usr/share/man/man8/lvm.8 -#usr/share/man/man8/lvmchange.8 #usr/share/man/man8/lvmconf.8 +#usr/share/man/man8/lvmconfig.8 #usr/share/man/man8/lvmdiskscan.8 #usr/share/man/man8/lvmdump.8 #usr/share/man/man8/lvmsadc.8 diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 44f13c389d..9e46d27316 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -1,14 +1,12 @@ bin/lowntfs-3g bin/ntfs-3g #lib/libntfs-3g.so -lib/libntfs-3g.so.85 -lib/libntfs-3g.so.85.0.0 +lib/libntfs-3g.so.88 +lib/libntfs-3g.so.88.0.0 sbin/mkfs.ntfs sbin/mount.lowntfs-3g sbin/mount.ntfs-3g usr/bin/ntfs-3g.probe -usr/bin/ntfs-3g.secaudit -usr/bin/ntfs-3g.usermap usr/bin/ntfscat usr/bin/ntfscluster usr/bin/ntfscmp @@ -29,10 +27,12 @@ usr/bin/ntfsls #usr/include/ntfs-3g/device.h #usr/include/ntfs-3g/device_io.h #usr/include/ntfs-3g/dir.h +#usr/include/ntfs-3g/ea.h #usr/include/ntfs-3g/efs.h #usr/include/ntfs-3g/endians.h #usr/include/ntfs-3g/index.h #usr/include/ntfs-3g/inode.h +#usr/include/ntfs-3g/ioctl.h #usr/include/ntfs-3g/layout.h #usr/include/ntfs-3g/lcnalloc.h #usr/include/ntfs-3g/logfile.h @@ -43,6 +43,7 @@ usr/bin/ntfsls #usr/include/ntfs-3g/ntfstime.h #usr/include/ntfs-3g/object_id.h #usr/include/ntfs-3g/param.h +#usr/include/ntfs-3g/plugin.h #usr/include/ntfs-3g/realpath.h #usr/include/ntfs-3g/reparse.h #usr/include/ntfs-3g/runlist.h @@ -55,7 +56,8 @@ usr/bin/ntfsls #usr/lib/libntfs-3g.a #usr/lib/libntfs-3g.la #usr/lib/libntfs-3g.so -usr/lib/pkgconfig/libntfs-3g.pc +#usr/lib/ntfs-3g +#usr/lib/pkgconfig/libntfs-3g.pc usr/sbin/mkntfs usr/sbin/ntfsclone usr/sbin/ntfscp @@ -70,17 +72,22 @@ usr/sbin/ntfsundelete #usr/share/man/man8/mount.ntfs-3g.8 #usr/share/man/man8/ntfs-3g.8 #usr/share/man/man8/ntfs-3g.probe.8 -#usr/share/man/man8/ntfs-3g.secaudit.8 -#usr/share/man/man8/ntfs-3g.usermap.8 #usr/share/man/man8/ntfscat.8 #usr/share/man/man8/ntfsclone.8 #usr/share/man/man8/ntfscluster.8 #usr/share/man/man8/ntfscmp.8 #usr/share/man/man8/ntfscp.8 +#usr/share/man/man8/ntfsdecrypt.8 +#usr/share/man/man8/ntfsfallocate.8 #usr/share/man/man8/ntfsfix.8 #usr/share/man/man8/ntfsinfo.8 #usr/share/man/man8/ntfslabel.8 #usr/share/man/man8/ntfsls.8 #usr/share/man/man8/ntfsprogs.8 +#usr/share/man/man8/ntfsrecover.8 #usr/share/man/man8/ntfsresize.8 +#usr/share/man/man8/ntfssecaudit.8 +#usr/share/man/man8/ntfstruncate.8 #usr/share/man/man8/ntfsundelete.8 +#usr/share/man/man8/ntfsusermap.8 +#usr/share/man/man8/ntfswipe.8 diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index 1ba82d044f..877a832a3a 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -1,102 +1,87 @@ bin/udevadm etc/modprobe.d/blacklist.conf etc/udev +etc/udev/hwdb.bin +etc/udev/hwdb.d +etc/udev/hwdb.d/20-OUI.hwdb +etc/udev/hwdb.d/20-acpi-vendor.hwdb +etc/udev/hwdb.d/20-bluetooth-vendor-product.hwdb +etc/udev/hwdb.d/20-net-ifname.hwdb +etc/udev/hwdb.d/20-pci-classes.hwdb +etc/udev/hwdb.d/20-pci-vendor-model.hwdb +etc/udev/hwdb.d/20-sdio-classes.hwdb +etc/udev/hwdb.d/20-sdio-vendor-model.hwdb +etc/udev/hwdb.d/20-usb-classes.hwdb +etc/udev/hwdb.d/20-usb-vendor-model.hwdb +etc/udev/hwdb.d/20-vmbus-class.hwdb +etc/udev/hwdb.d/60-evdev.hwdb +etc/udev/hwdb.d/60-keyboard.hwdb +etc/udev/hwdb.d/60-sensor.hwdb +etc/udev/hwdb.d/70-mouse.hwdb +etc/udev/hwdb.d/70-pointingstick.hwdb +etc/udev/hwdb.d/70-touchpad.hwdb #etc/udev/rules.d -#etc/udev/rules.d/55-lfs.rules -#etc/udev/rules.d/81-cdrom.rules -#etc/udev/rules.d/83-cdrom-symlinks.rules -#etc/udev/udev.conf -#lib/firmware +etc/udev/rules.d/55-lfs.rules +etc/udev/rules.d/81-cdrom.rules +etc/udev/rules.d/83-cdrom-symlinks.rules +etc/udev/udev.conf lib/libudev.so.1 -lib/libudev.so.1.3.2 +lib/libudev.so.1.6.3 lib/udev -#lib/udev/accelerometer -#lib/udev/ata_id -#lib/udev/cdrom_id -#lib/udev/collect -#lib/udev/devices -#lib/udev/devices/pts -#lib/udev/enable_codel -#lib/udev/hwdb.d -#lib/udev/hwdb.d/20-OUI.hwdb -#lib/udev/hwdb.d/20-acpi-vendor.hwdb -#lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb -#lib/udev/hwdb.d/20-pci-classes.hwdb -#lib/udev/hwdb.d/20-pci-vendor-model.hwdb -#lib/udev/hwdb.d/20-usb-classes.hwdb -#lib/udev/hwdb.d/20-usb-vendor-model.hwdb -#lib/udev/hwdb.d/60-keyboard.hwdb -#lib/udev/init-net-rules.sh -#lib/udev/mtd_probe -#lib/udev/network-hotplug-bridges -#lib/udev/network-hotplug-rename -#lib/udev/network-hotplug-vlan -#lib/udev/rule_generator.functions +lib/udev/ata_id +lib/udev/cdrom_id +lib/udev/collect +lib/udev/enable_codel +lib/udev/init-net-rules.sh +lib/udev/mtd_probe +lib/udev/network-hotplug-bridges +lib/udev/network-hotplug-rename +lib/udev/network-hotplug-vlan +lib/udev/rule_generator.functions #lib/udev/rules.d -#lib/udev/rules.d/25-alsa.rules -#lib/udev/rules.d/42-usb-hid-pm.rules -#lib/udev/rules.d/50-firmware.rules -#lib/udev/rules.d/50-udev-default.rules -#lib/udev/rules.d/60-cdrom_id.rules -#lib/udev/rules.d/60-keyboard.rules -#lib/udev/rules.d/60-net.rules -#lib/udev/rules.d/60-persistent-alsa.rules -#lib/udev/rules.d/60-persistent-input.rules -#lib/udev/rules.d/60-persistent-serial.rules -#lib/udev/rules.d/60-persistent-storage-tape.rules -#lib/udev/rules.d/60-persistent-storage.rules -#lib/udev/rules.d/60-persistent-v4l.rules -#lib/udev/rules.d/61-accelerometer.rules -#lib/udev/rules.d/64-btrfs.rules -#lib/udev/rules.d/75-net-description.rules -#lib/udev/rules.d/75-probe_mtd.rules -#lib/udev/rules.d/75-tty-description.rules -#lib/udev/rules.d/78-sound-card.rules -#lib/udev/rules.d/80-drivers.rules -#lib/udev/rules.d/80-net-name-slot.rules -#lib/udev/rules.d/90-hwrng.rules -#lib/udev/rules.d/95-udev-late.rules -#lib/udev/rules.d/99-codel.rules -#lib/udev/scsi_id -#lib/udev/udevd -#lib/udev/v4l_id -#lib/udev/write_cd_rules -#lib/udev/write_net_rules +lib/udev/rules.d/25-alsa.rules +lib/udev/rules.d/50-udev-default.rules +lib/udev/rules.d/60-block.rules +lib/udev/rules.d/60-cdrom_id.rules +lib/udev/rules.d/60-drm.rules +lib/udev/rules.d/60-evdev.rules +lib/udev/rules.d/60-input-id.rules +lib/udev/rules.d/60-net.rules +lib/udev/rules.d/60-persistent-alsa.rules +lib/udev/rules.d/60-persistent-input.rules +lib/udev/rules.d/60-persistent-storage-tape.rules +lib/udev/rules.d/60-persistent-storage.rules +lib/udev/rules.d/60-persistent-v4l.rules +lib/udev/rules.d/60-sensor.rules +lib/udev/rules.d/60-serial.rules +lib/udev/rules.d/64-btrfs.rules +lib/udev/rules.d/70-joystick.rules +lib/udev/rules.d/70-mouse.rules +lib/udev/rules.d/70-touchpad.rules +lib/udev/rules.d/75-net-description.rules +lib/udev/rules.d/75-probe_mtd.rules +lib/udev/rules.d/78-sound-card.rules +lib/udev/rules.d/80-drivers.rules +lib/udev/rules.d/90-hwrng.rules +lib/udev/rules.d/99-codel.rules +lib/udev/scsi_id +lib/udev/v4l_id +lib/udev/write_cd_rules +lib/udev/write_net_rules sbin/udevadm sbin/udevd #usr/include/libudev.h -#usr/lib/firmware -usr/lib/libudev.so +#usr/include/udev.h +#usr/lib/libudev.la +#usr/lib/libudev.so #usr/lib/pkgconfig/libudev.pc -#usr/lib/pkgconfig/udev.pc -#usr/share/doc/udev-208 -#usr/share/doc/udev-208/lfs -#usr/share/doc/udev-208/lfs/55-lfs.txt -#usr/share/doc/udev-208/lfs/README -#usr/share/doc/udev-208/libudev-overrides.txt -#usr/share/doc/udev-208/libudev-sections.txt -#usr/share/doc/udev-208/libudev.types -#usr/share/gtk-doc -#usr/share/gtk-doc/html -#usr/share/gtk-doc/html/libudev -#usr/share/gtk-doc/html/libudev/api-index-full.html -#usr/share/gtk-doc/html/libudev/ch01.html -#usr/share/gtk-doc/html/libudev/home.png -#usr/share/gtk-doc/html/libudev/index.html -#usr/share/gtk-doc/html/libudev/index.sgml -#usr/share/gtk-doc/html/libudev/left.png -#usr/share/gtk-doc/html/libudev/libudev-udev-device.html -#usr/share/gtk-doc/html/libudev/libudev-udev-enumerate.html -#usr/share/gtk-doc/html/libudev/libudev-udev-hwdb.html -#usr/share/gtk-doc/html/libudev/libudev-udev-list.html -#usr/share/gtk-doc/html/libudev/libudev-udev-monitor.html -#usr/share/gtk-doc/html/libudev/libudev-udev-queue.html -#usr/share/gtk-doc/html/libudev/libudev-udev-util.html -#usr/share/gtk-doc/html/libudev/libudev-udev.html -#usr/share/gtk-doc/html/libudev/libudev.devhelp2 -#usr/share/gtk-doc/html/libudev/right.png -#usr/share/gtk-doc/html/libudev/style.css -#usr/share/gtk-doc/html/libudev/up.png +#usr/share/doc/udev-20171102 +#usr/share/doc/udev-20171102/lfs +#usr/share/doc/udev-20171102/lfs/55-lfs.txt +#usr/share/doc/udev-20171102/lfs/README +#usr/share/man/man5/udev.conf.5 #usr/share/man/man7/udev.7 #usr/share/man/man8/udevadm.8 #usr/share/man/man8/udevd.8 +#usr/share/pkgconfig +#usr/share/pkgconfig/udev.pc diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc index 82bb3010ae..cc70e5ac39 100644 --- a/config/rootfiles/common/x86_64/glibc +++ b/config/rootfiles/common/x86_64/glibc @@ -1,51 +1,49 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.27.so +lib/ld-2.28.so lib/ld-linux-x86-64.so.2 -lib/libBrokenLocale-2.27.so +lib/libBrokenLocale-2.28.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.27.so +lib/libanl-2.28.so lib/libanl.so.1 -lib/libc-2.27.so +lib/libc-2.28.so lib/libc.so.6 -lib/libcidn-2.27.so -lib/libcidn.so.1 -lib/libcrypt-2.27.so +lib/libcrypt-2.28.so lib/libcrypt.so.1 -lib/libdl-2.27.so +lib/libdl-2.28.so lib/libdl.so.2 -lib/libm-2.27.so +lib/libm-2.28.so lib/libm.so.6 #lib/libmemusage.so -lib/libmvec-2.27.so +lib/libmvec-2.28.so lib/libmvec.so.1 -lib/libnsl-2.27.so +lib/libnsl-2.28.so lib/libnsl.so.1 -lib/libnss_compat-2.27.so +lib/libnss_compat-2.28.so lib/libnss_compat.so.2 -lib/libnss_db-2.27.so +lib/libnss_db-2.28.so lib/libnss_db.so.2 -lib/libnss_dns-2.27.so +lib/libnss_dns-2.28.so lib/libnss_dns.so.2 -lib/libnss_files-2.27.so +lib/libnss_files-2.28.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.27.so +lib/libnss_hesiod-2.28.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.27.so +lib/libnss_nis-2.28.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.27.so +lib/libnss_nisplus-2.28.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.27.so +lib/libpthread-2.28.so lib/libpthread.so.0 -lib/libresolv-2.27.so +lib/libresolv-2.28.so lib/libresolv.so.2 -lib/librt-2.27.so +lib/librt-2.28.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.27.so +lib/libutil-2.28.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -66,7 +64,6 @@ usr/bin/locale #usr/bin/sprof #usr/bin/tzselect #usr/bin/xtrace -#usr/include/_G_config.h #usr/include/a.out.h #usr/include/aio.h #usr/include/aliases.h @@ -83,9 +80,7 @@ usr/bin/locale #usr/include/arpa/tftp.h #usr/include/assert.h #usr/include/bits -#usr/include/bits/_G_config.h #usr/include/bits/a.out.h -#usr/include/bits/byteswap-16.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h @@ -114,6 +109,7 @@ usr/bin/locale #usr/include/bits/getopt_posix.h #usr/include/bits/hwcap.h #usr/include/bits/in.h +#usr/include/bits/indirect-return.h #usr/include/bits/initspin.h #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h @@ -122,8 +118,6 @@ usr/bin/locale #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h #usr/include/bits/libc-header-start.h -#usr/include/bits/libio-ldbl.h -#usr/include/bits/libio.h #usr/include/bits/libm-simd-decl-stubs.h #usr/include/bits/link.h #usr/include/bits/local_lim.h @@ -132,6 +126,7 @@ usr/bin/locale #usr/include/bits/math-finite.h #usr/include/bits/math-vector.h #usr/include/bits/mathcalls-helper-functions.h +#usr/include/bits/mathcalls-narrow.h #usr/include/bits/mathcalls.h #usr/include/bits/mathdef.h #usr/include/bits/mathinline.h @@ -182,6 +177,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h #usr/include/bits/stdio-ldbl.h @@ -211,12 +207,16 @@ usr/bin/locale #usr/include/bits/types.h #usr/include/bits/types/FILE.h #usr/include/bits/types/__FILE.h +#usr/include/bits/types/__fpos64_t.h +#usr/include/bits/types/__fpos_t.h #usr/include/bits/types/__locale_t.h #usr/include/bits/types/__mbstate_t.h #usr/include/bits/types/__sigset_t.h #usr/include/bits/types/__sigval_t.h #usr/include/bits/types/clock_t.h #usr/include/bits/types/clockid_t.h +#usr/include/bits/types/cookie_io_functions_t.h +#usr/include/bits/types/error_t.h #usr/include/bits/types/locale_t.h #usr/include/bits/types/mbstate_t.h #usr/include/bits/types/res_state.h @@ -226,10 +226,12 @@ usr/bin/locale #usr/include/bits/types/sigset_t.h #usr/include/bits/types/sigval_t.h #usr/include/bits/types/stack_t.h +#usr/include/bits/types/struct_FILE.h #usr/include/bits/types/struct_iovec.h #usr/include/bits/types/struct_itimerspec.h #usr/include/bits/types/struct_osockaddr.h #usr/include/bits/types/struct_rusage.h +#usr/include/bits/types/struct_sched_param.h #usr/include/bits/types/struct_sigstack.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h @@ -242,7 +244,6 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h -#usr/include/bits/ustat.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -298,7 +299,6 @@ usr/bin/locale #usr/include/lastlog.h #usr/include/libgen.h #usr/include/libintl.h -#usr/include/libio.h #usr/include/limits.h #usr/include/link.h #usr/include/locale.h @@ -379,14 +379,12 @@ usr/bin/locale #usr/include/rpc/auth_des.h #usr/include/rpc/auth_unix.h #usr/include/rpc/clnt.h -#usr/include/rpc/des_crypt.h #usr/include/rpc/key_prot.h #usr/include/rpc/netdb.h #usr/include/rpc/pmap_clnt.h #usr/include/rpc/pmap_prot.h #usr/include/rpc/pmap_rmt.h #usr/include/rpc/rpc.h -#usr/include/rpc/rpc_des.h #usr/include/rpc/rpc_msg.h #usr/include/rpc/svc.h #usr/include/rpc/svc_auth.h @@ -528,7 +526,6 @@ usr/bin/locale #usr/include/sys/un.h #usr/include/sys/unistd.h #usr/include/sys/user.h -#usr/include/sys/ustat.h #usr/include/sys/utsname.h #usr/include/sys/vfs.h #usr/include/sys/vlimit.h @@ -545,13 +542,13 @@ usr/bin/locale #usr/include/termios.h #usr/include/tgmath.h #usr/include/thread_db.h +#usr/include/threads.h #usr/include/time.h #usr/include/ttyent.h #usr/include/uchar.h #usr/include/ucontext.h #usr/include/ulimit.h #usr/include/unistd.h -#usr/include/ustat.h #usr/include/utime.h #usr/include/utmp.h #usr/include/utmpx.h @@ -835,13 +832,12 @@ usr/lib/gconv #usr/lib/libc.a #usr/lib/libc.so #usr/lib/libc_nonshared.a -#usr/lib/libcidn.so #usr/lib/libcrypt.a #usr/lib/libcrypt.so #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a -#usr/lib/libm-2.27.a +#usr/lib/libm-2.28.a #usr/lib/libm.a #usr/lib/libm.so #usr/lib/libmcheck.a @@ -859,7 +855,6 @@ usr/lib/gconv #usr/lib/libnss_nisplus.so #usr/lib/libpthread.a #usr/lib/libpthread.so -#usr/lib/libpthread_nonshared.a #usr/lib/libresolv.a #usr/lib/libresolv.so #usr/lib/librpcsvc.a @@ -2521,6 +2516,20 @@ usr/lib/locale #usr/lib/locale/doi_IN/LC_PAPER #usr/lib/locale/doi_IN/LC_TELEPHONE #usr/lib/locale/doi_IN/LC_TIME +#usr/lib/locale/dsb_DE +#usr/lib/locale/dsb_DE/LC_ADDRESS +#usr/lib/locale/dsb_DE/LC_COLLATE +#usr/lib/locale/dsb_DE/LC_CTYPE +#usr/lib/locale/dsb_DE/LC_IDENTIFICATION +#usr/lib/locale/dsb_DE/LC_MEASUREMENT +#usr/lib/locale/dsb_DE/LC_MESSAGES +#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/dsb_DE/LC_MONETARY +#usr/lib/locale/dsb_DE/LC_NAME +#usr/lib/locale/dsb_DE/LC_NUMERIC +#usr/lib/locale/dsb_DE/LC_PAPER +#usr/lib/locale/dsb_DE/LC_TELEPHONE +#usr/lib/locale/dsb_DE/LC_TIME #usr/lib/locale/dv_MV #usr/lib/locale/dv_MV/LC_ADDRESS #usr/lib/locale/dv_MV/LC_COLLATE @@ -6217,6 +6226,20 @@ usr/lib/locale #usr/lib/locale/sa_IN/LC_PAPER #usr/lib/locale/sa_IN/LC_TELEPHONE #usr/lib/locale/sa_IN/LC_TIME +#usr/lib/locale/sah_RU +#usr/lib/locale/sah_RU/LC_ADDRESS +#usr/lib/locale/sah_RU/LC_COLLATE +#usr/lib/locale/sah_RU/LC_CTYPE +#usr/lib/locale/sah_RU/LC_IDENTIFICATION +#usr/lib/locale/sah_RU/LC_MEASUREMENT +#usr/lib/locale/sah_RU/LC_MESSAGES +#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/sah_RU/LC_MONETARY +#usr/lib/locale/sah_RU/LC_NAME +#usr/lib/locale/sah_RU/LC_NUMERIC +#usr/lib/locale/sah_RU/LC_PAPER +#usr/lib/locale/sah_RU/LC_TELEPHONE +#usr/lib/locale/sah_RU/LC_TIME #usr/lib/locale/sat_IN #usr/lib/locale/sat_IN/LC_ADDRESS #usr/lib/locale/sat_IN/LC_COLLATE @@ -7967,6 +7990,7 @@ usr/lib/locale #usr/share/i18n/locales/de_LU #usr/share/i18n/locales/de_LU@euro #usr/share/i18n/locales/doi_IN +#usr/share/i18n/locales/dsb_DE #usr/share/i18n/locales/dv_MV #usr/share/i18n/locales/dz_BT #usr/share/i18n/locales/el_CY @@ -8150,6 +8174,7 @@ usr/lib/locale #usr/share/i18n/locales/ru_UA #usr/share/i18n/locales/rw_RW #usr/share/i18n/locales/sa_IN +#usr/share/i18n/locales/sah_RU #usr/share/i18n/locales/sat_IN #usr/share/i18n/locales/sc_IT #usr/share/i18n/locales/sd_IN diff --git a/config/rootfiles/common/xfsprogs b/config/rootfiles/common/xfsprogs index 4c445341bb..584ded0fef 100644 --- a/config/rootfiles/common/xfsprogs +++ b/config/rootfiles/common/xfsprogs @@ -3,14 +3,32 @@ lib/libhandle.so.1.0.3 sbin/fsck.xfs sbin/mkfs.xfs sbin/xfs_repair +sbin/xfs_scrub +sbin/xfs_scrub_all +#usr/include/xfs +#usr/include/xfs/handle.h +#usr/include/xfs/jdm.h +#usr/include/xfs/linux.h +#usr/include/xfs/xfs.h +#usr/include/xfs/xfs_arch.h +#usr/include/xfs/xfs_da_format.h +#usr/include/xfs/xfs_format.h +#usr/include/xfs/xfs_fs.h +#usr/include/xfs/xfs_log_format.h +#usr/include/xfs/xfs_types.h +#usr/include/xfs/xqm.h +#usr/lib/libhandle.a #usr/lib/libhandle.la #usr/lib/libhandle.so +#usr/lib/xfsprogs +#usr/lib/xfsprogs/xfs_scrub_all.cron usr/sbin/xfs_admin usr/sbin/xfs_bmap -usr/sbin/xfs_check usr/sbin/xfs_copy usr/sbin/xfs_db +usr/sbin/xfs_estimate usr/sbin/xfs_freeze +usr/sbin/xfs_fsr usr/sbin/xfs_growfs usr/sbin/xfs_info usr/sbin/xfs_io @@ -21,22 +39,39 @@ usr/sbin/xfs_mkfile usr/sbin/xfs_ncheck usr/sbin/xfs_quota usr/sbin/xfs_rtcp +usr/sbin/xfs_spaceman #usr/share/doc/xfsprogs #usr/share/doc/xfsprogs/CHANGES.gz -#usr/share/doc/xfsprogs/COPYING #usr/share/doc/xfsprogs/CREDITS -#usr/share/doc/xfsprogs/PORTING #usr/share/doc/xfsprogs/README +#usr/share/locale/de/LC_MESSAGES/xfsprogs.mo #usr/share/locale/pl/LC_MESSAGES/xfsprogs.mo +#usr/share/man/man2/ioctl_xfs_scrub_metadata.2 +#usr/share/man/man3/attr_list_by_handle.3 +#usr/share/man/man3/attr_multi_by_handle.3 +#usr/share/man/man3/fd_to_handle.3 +#usr/share/man/man3/free_handle.3 +#usr/share/man/man3/fssetdm_by_handle.3 +#usr/share/man/man3/getparentpaths_by_handle.3 +#usr/share/man/man3/getparents_by_handle.3 +#usr/share/man/man3/handle_to_fshandle.3 +#usr/share/man/man3/open_by_handle.3 +#usr/share/man/man3/path_to_fshandle.3 +#usr/share/man/man3/path_to_handle.3 +#usr/share/man/man3/readlink_by_handle.3 +#usr/share/man/man3/xfsctl.3 +#usr/share/man/man5/projects.5 +#usr/share/man/man5/projid.5 #usr/share/man/man5/xfs.5 #usr/share/man/man8/fsck.xfs.8 #usr/share/man/man8/mkfs.xfs.8 #usr/share/man/man8/xfs_admin.8 #usr/share/man/man8/xfs_bmap.8 -#usr/share/man/man8/xfs_check.8 #usr/share/man/man8/xfs_copy.8 #usr/share/man/man8/xfs_db.8 +#usr/share/man/man8/xfs_estimate.8 #usr/share/man/man8/xfs_freeze.8 +#usr/share/man/man8/xfs_fsr.8 #usr/share/man/man8/xfs_growfs.8 #usr/share/man/man8/xfs_info.8 #usr/share/man/man8/xfs_io.8 @@ -48,3 +83,6 @@ usr/sbin/xfs_rtcp #usr/share/man/man8/xfs_quota.8 #usr/share/man/man8/xfs_repair.8 #usr/share/man/man8/xfs_rtcp.8 +#usr/share/man/man8/xfs_scrub.8 +#usr/share/man/man8/xfs_scrub_all.8 +#usr/share/man/man8/xfs_spaceman.8 diff --git a/config/rootfiles/core/125/filelists/aarch64/glibc b/config/rootfiles/core/125/filelists/aarch64/glibc new file mode 120000 index 0000000000..d13849ff91 --- /dev/null +++ b/config/rootfiles/core/125/filelists/aarch64/glibc @@ -0,0 +1 @@ +../../../../common/aarch64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/collectd b/config/rootfiles/core/125/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/125/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/coreutils b/config/rootfiles/core/125/filelists/coreutils new file mode 120000 index 0000000000..7351ed2cf5 --- /dev/null +++ b/config/rootfiles/core/125/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/e2fsprogs b/config/rootfiles/core/125/filelists/e2fsprogs new file mode 120000 index 0000000000..37b55de698 --- /dev/null +++ b/config/rootfiles/core/125/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files index 47c0e77f3b..f2afb62fbf 100644 --- a/config/rootfiles/core/125/filelists/files +++ b/config/rootfiles/core/125/filelists/files @@ -5,5 +5,6 @@ etc/sysctl.conf srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/media.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi usr/local/bin/makegraphs var/ipfire/langs diff --git a/config/rootfiles/core/125/filelists/i586/glibc b/config/rootfiles/core/125/filelists/i586/glibc new file mode 120000 index 0000000000..943021f19a --- /dev/null +++ b/config/rootfiles/core/125/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/keyutils b/config/rootfiles/core/125/filelists/keyutils new file mode 120000 index 0000000000..4311917e57 --- /dev/null +++ b/config/rootfiles/core/125/filelists/keyutils @@ -0,0 +1 @@ +../../../common/keyutils \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/kmod b/config/rootfiles/core/125/filelists/kmod new file mode 120000 index 0000000000..0020e197e2 --- /dev/null +++ b/config/rootfiles/core/125/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/libaio b/config/rootfiles/core/125/filelists/libaio new file mode 120000 index 0000000000..9788a2bc1f --- /dev/null +++ b/config/rootfiles/core/125/filelists/libaio @@ -0,0 +1 @@ +../../../common/libaio \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/lvm2 b/config/rootfiles/core/125/filelists/lvm2 new file mode 120000 index 0000000000..d640870b75 --- /dev/null +++ b/config/rootfiles/core/125/filelists/lvm2 @@ -0,0 +1 @@ +../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/ntfs-3g b/config/rootfiles/core/125/filelists/ntfs-3g new file mode 120000 index 0000000000..d93adc2a18 --- /dev/null +++ b/config/rootfiles/core/125/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/parted b/config/rootfiles/core/125/filelists/parted new file mode 120000 index 0000000000..89195d8e89 --- /dev/null +++ b/config/rootfiles/core/125/filelists/parted @@ -0,0 +1 @@ +../../../common/parted \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/ppp b/config/rootfiles/core/125/filelists/ppp new file mode 120000 index 0000000000..4844a9b58c --- /dev/null +++ b/config/rootfiles/core/125/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/reiserfsprogs b/config/rootfiles/core/125/filelists/reiserfsprogs new file mode 120000 index 0000000000..008c3e8915 --- /dev/null +++ b/config/rootfiles/core/125/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/udev b/config/rootfiles/core/125/filelists/udev new file mode 120000 index 0000000000..e967a1c925 --- /dev/null +++ b/config/rootfiles/core/125/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/x86_64/glibc b/config/rootfiles/core/125/filelists/x86_64/glibc new file mode 120000 index 0000000000..1119099669 --- /dev/null +++ b/config/rootfiles/core/125/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/125/filelists/xfsprogs b/config/rootfiles/core/125/filelists/xfsprogs new file mode 120000 index 0000000000..91032964d5 --- /dev/null +++ b/config/rootfiles/core/125/filelists/xfsprogs @@ -0,0 +1 @@ +../../../common/xfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh index 0aad5b9cde..9d056f9210 100644 --- a/config/rootfiles/core/125/update.sh +++ b/config/rootfiles/core/125/update.sh @@ -50,6 +50,9 @@ ldconfig # Reload sysctl.conf sysctl -p +# restart init +telinit u + # This update needs a reboot... #touch /var/run/need_reboot diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt index afa167d122..30b9d1329e 100644 --- a/config/rootfiles/packages/libvirt +++ b/config/rootfiles/packages/libvirt @@ -8,6 +8,7 @@ etc/libvirt/libvirtd.conf #etc/libvirt/nwfilter/allow-dhcp.xml #etc/libvirt/nwfilter/allow-incoming-ipv4.xml #etc/libvirt/nwfilter/allow-ipv4.xml +#etc/libvirt/nwfilter/clean-traffic-gateway.xml #etc/libvirt/nwfilter/clean-traffic.xml #etc/libvirt/nwfilter/no-arp-ip-spoofing.xml #etc/libvirt/nwfilter/no-arp-mac-spoofing.xml @@ -61,19 +62,19 @@ usr/bin/virt-xml-validate #usr/lib/libvirt-admin.la #usr/lib/libvirt-admin.so usr/lib/libvirt-admin.so.0 -usr/lib/libvirt-admin.so.0.4000.0 +usr/lib/libvirt-admin.so.0.4006.0 #usr/lib/libvirt-lxc.la #usr/lib/libvirt-lxc.so usr/lib/libvirt-lxc.so.0 -usr/lib/libvirt-lxc.so.0.4000.0 +usr/lib/libvirt-lxc.so.0.4006.0 #usr/lib/libvirt-qemu.la #usr/lib/libvirt-qemu.so usr/lib/libvirt-qemu.so.0 -usr/lib/libvirt-qemu.so.0.4000.0 +usr/lib/libvirt-qemu.so.0.4006.0 #usr/lib/libvirt.la #usr/lib/libvirt.so usr/lib/libvirt.so.0 -usr/lib/libvirt.so.0.4000.0 +usr/lib/libvirt.so.0.4006.0 #usr/lib/libvirt/connection-driver #usr/lib/libvirt/connection-driver/libvirt_driver_interface.la usr/lib/libvirt/connection-driver/libvirt_driver_interface.so @@ -93,6 +94,9 @@ usr/lib/libvirt/lock-driver/lockd.so #usr/lib/libvirt/storage-backend #usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.la usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.so +#usr/lib/libvirt/storage-file +#usr/lib/libvirt/storage-file/libvirt_storage_file_fs.la +usr/lib/libvirt/storage-file/libvirt_storage_file_fs.so #usr/lib/pkgconfig/libvirt-admin.pc #usr/lib/pkgconfig/libvirt-lxc.pc #usr/lib/pkgconfig/libvirt-qemu.pc @@ -116,169 +120,171 @@ usr/sbin/virtlogd #usr/share/augeas/lenses/tests/test_virtlogd.aug #usr/share/augeas/lenses/virtlockd.aug #usr/share/augeas/lenses/virtlogd.aug -#usr/share/doc/libvirt-4.0.0 -#usr/share/doc/libvirt-4.0.0/html -#usr/share/doc/libvirt-4.0.0/html/32favicon.png -#usr/share/doc/libvirt-4.0.0/html/404.html -#usr/share/doc/libvirt-4.0.0/html/acl.html -#usr/share/doc/libvirt-4.0.0/html/aclpolkit.html -#usr/share/doc/libvirt-4.0.0/html/api.html -#usr/share/doc/libvirt-4.0.0/html/api_extension.html -#usr/share/doc/libvirt-4.0.0/html/apps.html -#usr/share/doc/libvirt-4.0.0/html/architecture.gif -#usr/share/doc/libvirt-4.0.0/html/architecture.html -#usr/share/doc/libvirt-4.0.0/html/auditlog.html -#usr/share/doc/libvirt-4.0.0/html/auth.html -#usr/share/doc/libvirt-4.0.0/html/bindings.html -#usr/share/doc/libvirt-4.0.0/html/bugs.html -#usr/share/doc/libvirt-4.0.0/html/cgroups.html -#usr/share/doc/libvirt-4.0.0/html/compiling.html -#usr/share/doc/libvirt-4.0.0/html/contact.html -#usr/share/doc/libvirt-4.0.0/html/contribute.html -#usr/share/doc/libvirt-4.0.0/html/csharp.html -#usr/share/doc/libvirt-4.0.0/html/devguide.html -#usr/share/doc/libvirt-4.0.0/html/docs.html -#usr/share/doc/libvirt-4.0.0/html/downloads.html -#usr/share/doc/libvirt-4.0.0/html/drivers.html -#usr/share/doc/libvirt-4.0.0/html/drvbhyve.html -#usr/share/doc/libvirt-4.0.0/html/drvesx.html -#usr/share/doc/libvirt-4.0.0/html/drvhyperv.html -#usr/share/doc/libvirt-4.0.0/html/drvlxc.html -#usr/share/doc/libvirt-4.0.0/html/drvnodedev.html -#usr/share/doc/libvirt-4.0.0/html/drvopenvz.html -#usr/share/doc/libvirt-4.0.0/html/drvphyp.html -#usr/share/doc/libvirt-4.0.0/html/drvqemu.html -#usr/share/doc/libvirt-4.0.0/html/drvremote.html -#usr/share/doc/libvirt-4.0.0/html/drvtest.html -#usr/share/doc/libvirt-4.0.0/html/drvuml.html -#usr/share/doc/libvirt-4.0.0/html/drvvbox.html -#usr/share/doc/libvirt-4.0.0/html/drvvirtuozzo.html -#usr/share/doc/libvirt-4.0.0/html/drvvmware.html -#usr/share/doc/libvirt-4.0.0/html/drvxen.html -#usr/share/doc/libvirt-4.0.0/html/errors.html -#usr/share/doc/libvirt-4.0.0/html/firewall.html -#usr/share/doc/libvirt-4.0.0/html/fonts -#usr/share/doc/libvirt-4.0.0/html/fonts/LICENSE.md -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-bold-italic.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-bold.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-italic.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-light-italic.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-light.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-bold.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-light.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-regular.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-semibold.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-regular.woff -#usr/share/doc/libvirt-4.0.0/html/fonts/stylesheet.css -#usr/share/doc/libvirt-4.0.0/html/format.html -#usr/share/doc/libvirt-4.0.0/html/formatcaps.html -#usr/share/doc/libvirt-4.0.0/html/formatdomain.html -#usr/share/doc/libvirt-4.0.0/html/formatdomaincaps.html -#usr/share/doc/libvirt-4.0.0/html/formatnetwork.html -#usr/share/doc/libvirt-4.0.0/html/formatnode.html -#usr/share/doc/libvirt-4.0.0/html/formatnwfilter.html -#usr/share/doc/libvirt-4.0.0/html/formatsecret.html -#usr/share/doc/libvirt-4.0.0/html/formatsnapshot.html -#usr/share/doc/libvirt-4.0.0/html/formatstorage.html -#usr/share/doc/libvirt-4.0.0/html/formatstorageencryption.html -#usr/share/doc/libvirt-4.0.0/html/generic.css -#usr/share/doc/libvirt-4.0.0/html/goals.html -#usr/share/doc/libvirt-4.0.0/html/governance.html -#usr/share/doc/libvirt-4.0.0/html/hacking.html -#usr/share/doc/libvirt-4.0.0/html/hooks.html -#usr/share/doc/libvirt-4.0.0/html/html -#usr/share/doc/libvirt-4.0.0/html/html/home.png -#usr/share/doc/libvirt-4.0.0/html/html/index.html -#usr/share/doc/libvirt-4.0.0/html/html/left.png -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-common.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-domain-snapshot.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-domain.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-event.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-host.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-interface.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-network.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-nodedev.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-nwfilter.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-secret.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-storage.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-stream.html -#usr/share/doc/libvirt-4.0.0/html/html/libvirt-virterror.html -#usr/share/doc/libvirt-4.0.0/html/html/right.png -#usr/share/doc/libvirt-4.0.0/html/html/up.png -#usr/share/doc/libvirt-4.0.0/html/hvsupport.html -#usr/share/doc/libvirt-4.0.0/html/index.html -#usr/share/doc/libvirt-4.0.0/html/internals -#usr/share/doc/libvirt-4.0.0/html/internals.html -#usr/share/doc/libvirt-4.0.0/html/internals/command.html -#usr/share/doc/libvirt-4.0.0/html/internals/eventloop.html -#usr/share/doc/libvirt-4.0.0/html/internals/locking.html -#usr/share/doc/libvirt-4.0.0/html/internals/oomtesting.html -#usr/share/doc/libvirt-4.0.0/html/internals/rpc.html -#usr/share/doc/libvirt-4.0.0/html/java.html -#usr/share/doc/libvirt-4.0.0/html/libvirt-daemon-arch.png -#usr/share/doc/libvirt-4.0.0/html/libvirt-driver-arch.png -#usr/share/doc/libvirt-4.0.0/html/libvirt-object-model.png -#usr/share/doc/libvirt-4.0.0/html/libvirt.css -#usr/share/doc/libvirt-4.0.0/html/locking-lockd.html -#usr/share/doc/libvirt-4.0.0/html/locking-sanlock.html -#usr/share/doc/libvirt-4.0.0/html/locking.html -#usr/share/doc/libvirt-4.0.0/html/logging.html -#usr/share/doc/libvirt-4.0.0/html/logos -#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-dark-256.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-dark-800.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-dark.svg -#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-light-256.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-light-800.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-light.svg -#usr/share/doc/libvirt-4.0.0/html/logos/logo-base.svg -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-128.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-192.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-256.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-96.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-128.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-192.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-256.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-96.png -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered.svg -#usr/share/doc/libvirt-4.0.0/html/logos/logo-square.svg -#usr/share/doc/libvirt-4.0.0/html/main.css -#usr/share/doc/libvirt-4.0.0/html/migration-managed-direct.png -#usr/share/doc/libvirt-4.0.0/html/migration-managed-p2p.png -#usr/share/doc/libvirt-4.0.0/html/migration-native.png -#usr/share/doc/libvirt-4.0.0/html/migration-tunnel.png -#usr/share/doc/libvirt-4.0.0/html/migration-unmanaged-direct.png -#usr/share/doc/libvirt-4.0.0/html/migration.html -#usr/share/doc/libvirt-4.0.0/html/mobile.css -#usr/share/doc/libvirt-4.0.0/html/news-2005.html -#usr/share/doc/libvirt-4.0.0/html/news-2006.html -#usr/share/doc/libvirt-4.0.0/html/news-2007.html -#usr/share/doc/libvirt-4.0.0/html/news-2008.html -#usr/share/doc/libvirt-4.0.0/html/news-2009.html -#usr/share/doc/libvirt-4.0.0/html/news-2010.html -#usr/share/doc/libvirt-4.0.0/html/news-2011.html -#usr/share/doc/libvirt-4.0.0/html/news-2012.html -#usr/share/doc/libvirt-4.0.0/html/news-2013.html -#usr/share/doc/libvirt-4.0.0/html/news-2014.html -#usr/share/doc/libvirt-4.0.0/html/news-2015.html -#usr/share/doc/libvirt-4.0.0/html/news-2016.html -#usr/share/doc/libvirt-4.0.0/html/news.html -#usr/share/doc/libvirt-4.0.0/html/node.gif -#usr/share/doc/libvirt-4.0.0/html/nss.html -#usr/share/doc/libvirt-4.0.0/html/pci-hotplug.html -#usr/share/doc/libvirt-4.0.0/html/php.html -#usr/share/doc/libvirt-4.0.0/html/python.html -#usr/share/doc/libvirt-4.0.0/html/remote.html -#usr/share/doc/libvirt-4.0.0/html/secureusage.html -#usr/share/doc/libvirt-4.0.0/html/securityprocess.html -#usr/share/doc/libvirt-4.0.0/html/storage.html -#usr/share/doc/libvirt-4.0.0/html/support.html -#usr/share/doc/libvirt-4.0.0/html/testapi.html -#usr/share/doc/libvirt-4.0.0/html/testsuites.html -#usr/share/doc/libvirt-4.0.0/html/testtck.html -#usr/share/doc/libvirt-4.0.0/html/todo.html -#usr/share/doc/libvirt-4.0.0/html/uri.html -#usr/share/doc/libvirt-4.0.0/html/virshcmdref.html -#usr/share/doc/libvirt-4.0.0/html/windows.html +#usr/share/doc/libvirt-4.6.0 +#usr/share/doc/libvirt-4.6.0/html +#usr/share/doc/libvirt-4.6.0/html/32favicon.png +#usr/share/doc/libvirt-4.6.0/html/404.html +#usr/share/doc/libvirt-4.6.0/html/acl.html +#usr/share/doc/libvirt-4.6.0/html/aclpolkit.html +#usr/share/doc/libvirt-4.6.0/html/api.html +#usr/share/doc/libvirt-4.6.0/html/api_extension.html +#usr/share/doc/libvirt-4.6.0/html/apps.html +#usr/share/doc/libvirt-4.6.0/html/architecture.gif +#usr/share/doc/libvirt-4.6.0/html/architecture.html +#usr/share/doc/libvirt-4.6.0/html/auditlog.html +#usr/share/doc/libvirt-4.6.0/html/auth.html +#usr/share/doc/libvirt-4.6.0/html/bindings.html +#usr/share/doc/libvirt-4.6.0/html/bugs.html +#usr/share/doc/libvirt-4.6.0/html/cgroups.html +#usr/share/doc/libvirt-4.6.0/html/compiling.html +#usr/share/doc/libvirt-4.6.0/html/contact.html +#usr/share/doc/libvirt-4.6.0/html/contribute.html +#usr/share/doc/libvirt-4.6.0/html/csharp.html +#usr/share/doc/libvirt-4.6.0/html/dbus.html +#usr/share/doc/libvirt-4.6.0/html/devguide.html +#usr/share/doc/libvirt-4.6.0/html/docs.html +#usr/share/doc/libvirt-4.6.0/html/downloads.html +#usr/share/doc/libvirt-4.6.0/html/drivers.html +#usr/share/doc/libvirt-4.6.0/html/drvbhyve.html +#usr/share/doc/libvirt-4.6.0/html/drvesx.html +#usr/share/doc/libvirt-4.6.0/html/drvhyperv.html +#usr/share/doc/libvirt-4.6.0/html/drvlxc.html +#usr/share/doc/libvirt-4.6.0/html/drvnodedev.html +#usr/share/doc/libvirt-4.6.0/html/drvopenvz.html +#usr/share/doc/libvirt-4.6.0/html/drvphyp.html +#usr/share/doc/libvirt-4.6.0/html/drvqemu.html +#usr/share/doc/libvirt-4.6.0/html/drvremote.html +#usr/share/doc/libvirt-4.6.0/html/drvtest.html +#usr/share/doc/libvirt-4.6.0/html/drvuml.html +#usr/share/doc/libvirt-4.6.0/html/drvvbox.html +#usr/share/doc/libvirt-4.6.0/html/drvvirtuozzo.html +#usr/share/doc/libvirt-4.6.0/html/drvvmware.html +#usr/share/doc/libvirt-4.6.0/html/drvxen.html +#usr/share/doc/libvirt-4.6.0/html/errors.html +#usr/share/doc/libvirt-4.6.0/html/firewall.html +#usr/share/doc/libvirt-4.6.0/html/fonts +#usr/share/doc/libvirt-4.6.0/html/fonts/LICENSE.md +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-bold-italic.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-bold.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-italic.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-light-italic.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-light.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-bold.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-light.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-regular.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-semibold.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-regular.woff +#usr/share/doc/libvirt-4.6.0/html/fonts/stylesheet.css +#usr/share/doc/libvirt-4.6.0/html/format.html +#usr/share/doc/libvirt-4.6.0/html/formatcaps.html +#usr/share/doc/libvirt-4.6.0/html/formatdomain.html +#usr/share/doc/libvirt-4.6.0/html/formatdomaincaps.html +#usr/share/doc/libvirt-4.6.0/html/formatnetwork.html +#usr/share/doc/libvirt-4.6.0/html/formatnode.html +#usr/share/doc/libvirt-4.6.0/html/formatnwfilter.html +#usr/share/doc/libvirt-4.6.0/html/formatsecret.html +#usr/share/doc/libvirt-4.6.0/html/formatsnapshot.html +#usr/share/doc/libvirt-4.6.0/html/formatstorage.html +#usr/share/doc/libvirt-4.6.0/html/formatstorageencryption.html +#usr/share/doc/libvirt-4.6.0/html/generic.css +#usr/share/doc/libvirt-4.6.0/html/goals.html +#usr/share/doc/libvirt-4.6.0/html/governance.html +#usr/share/doc/libvirt-4.6.0/html/hacking.html +#usr/share/doc/libvirt-4.6.0/html/hooks.html +#usr/share/doc/libvirt-4.6.0/html/html +#usr/share/doc/libvirt-4.6.0/html/html/home.png +#usr/share/doc/libvirt-4.6.0/html/html/index.html +#usr/share/doc/libvirt-4.6.0/html/html/left.png +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-common.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-domain-snapshot.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-domain.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-event.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-host.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-interface.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-network.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-nodedev.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-nwfilter.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-secret.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-storage.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-stream.html +#usr/share/doc/libvirt-4.6.0/html/html/libvirt-virterror.html +#usr/share/doc/libvirt-4.6.0/html/html/right.png +#usr/share/doc/libvirt-4.6.0/html/html/up.png +#usr/share/doc/libvirt-4.6.0/html/hvsupport.html +#usr/share/doc/libvirt-4.6.0/html/index.html +#usr/share/doc/libvirt-4.6.0/html/internals +#usr/share/doc/libvirt-4.6.0/html/internals.html +#usr/share/doc/libvirt-4.6.0/html/internals/command.html +#usr/share/doc/libvirt-4.6.0/html/internals/eventloop.html +#usr/share/doc/libvirt-4.6.0/html/internals/locking.html +#usr/share/doc/libvirt-4.6.0/html/internals/oomtesting.html +#usr/share/doc/libvirt-4.6.0/html/internals/rpc.html +#usr/share/doc/libvirt-4.6.0/html/java.html +#usr/share/doc/libvirt-4.6.0/html/libvirt-daemon-arch.png +#usr/share/doc/libvirt-4.6.0/html/libvirt-driver-arch.png +#usr/share/doc/libvirt-4.6.0/html/libvirt-object-model.png +#usr/share/doc/libvirt-4.6.0/html/libvirt.css +#usr/share/doc/libvirt-4.6.0/html/locking-lockd.html +#usr/share/doc/libvirt-4.6.0/html/locking-sanlock.html +#usr/share/doc/libvirt-4.6.0/html/locking.html +#usr/share/doc/libvirt-4.6.0/html/logging.html +#usr/share/doc/libvirt-4.6.0/html/logos +#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark-256.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark-800.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark.svg +#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light-256.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light-800.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light.svg +#usr/share/doc/libvirt-4.6.0/html/logos/logo-base.svg +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-128.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-192.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-256.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-96.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-128.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-192.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-256.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-96.png +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered.svg +#usr/share/doc/libvirt-4.6.0/html/logos/logo-square.svg +#usr/share/doc/libvirt-4.6.0/html/main.css +#usr/share/doc/libvirt-4.6.0/html/migration-managed-direct.png +#usr/share/doc/libvirt-4.6.0/html/migration-managed-p2p.png +#usr/share/doc/libvirt-4.6.0/html/migration-native.png +#usr/share/doc/libvirt-4.6.0/html/migration-tunnel.png +#usr/share/doc/libvirt-4.6.0/html/migration-unmanaged-direct.png +#usr/share/doc/libvirt-4.6.0/html/migration.html +#usr/share/doc/libvirt-4.6.0/html/mobile.css +#usr/share/doc/libvirt-4.6.0/html/news-2005.html +#usr/share/doc/libvirt-4.6.0/html/news-2006.html +#usr/share/doc/libvirt-4.6.0/html/news-2007.html +#usr/share/doc/libvirt-4.6.0/html/news-2008.html +#usr/share/doc/libvirt-4.6.0/html/news-2009.html +#usr/share/doc/libvirt-4.6.0/html/news-2010.html +#usr/share/doc/libvirt-4.6.0/html/news-2011.html +#usr/share/doc/libvirt-4.6.0/html/news-2012.html +#usr/share/doc/libvirt-4.6.0/html/news-2013.html +#usr/share/doc/libvirt-4.6.0/html/news-2014.html +#usr/share/doc/libvirt-4.6.0/html/news-2015.html +#usr/share/doc/libvirt-4.6.0/html/news-2016.html +#usr/share/doc/libvirt-4.6.0/html/news.html +#usr/share/doc/libvirt-4.6.0/html/node.gif +#usr/share/doc/libvirt-4.6.0/html/nss.html +#usr/share/doc/libvirt-4.6.0/html/pci-hotplug.html +#usr/share/doc/libvirt-4.6.0/html/php.html +#usr/share/doc/libvirt-4.6.0/html/platforms.html +#usr/share/doc/libvirt-4.6.0/html/python.html +#usr/share/doc/libvirt-4.6.0/html/remote.html +#usr/share/doc/libvirt-4.6.0/html/secureusage.html +#usr/share/doc/libvirt-4.6.0/html/securityprocess.html +#usr/share/doc/libvirt-4.6.0/html/storage.html +#usr/share/doc/libvirt-4.6.0/html/support.html +#usr/share/doc/libvirt-4.6.0/html/testapi.html +#usr/share/doc/libvirt-4.6.0/html/testsuites.html +#usr/share/doc/libvirt-4.6.0/html/testtck.html +#usr/share/doc/libvirt-4.6.0/html/todo.html +#usr/share/doc/libvirt-4.6.0/html/uri.html +#usr/share/doc/libvirt-4.6.0/html/virshcmdref.html +#usr/share/doc/libvirt-4.6.0/html/windows.html #usr/share/gtk-doc/html/libvirt #usr/share/gtk-doc/html/libvirt/general.html #usr/share/gtk-doc/html/libvirt/home.png @@ -309,6 +315,8 @@ usr/share/libvirt/schemas/network.rng usr/share/libvirt/schemas/networkcommon.rng usr/share/libvirt/schemas/nodedev.rng usr/share/libvirt/schemas/nwfilter.rng +usr/share/libvirt/schemas/nwfilter_params.rng +usr/share/libvirt/schemas/nwfilterbinding.rng usr/share/libvirt/schemas/secret.rng usr/share/libvirt/schemas/storagecommon.rng usr/share/libvirt/schemas/storagepool.rng @@ -325,7 +333,7 @@ usr/share/libvirt/schemas/storagevol.rng #usr/share/man/man7/virkeycode-atset3.7 #usr/share/man/man7/virkeycode-linux.7 #usr/share/man/man7/virkeycode-osx.7 -#usr/share/man/man7/virkeycode-rfb.7 +#usr/share/man/man7/virkeycode-qnum.7 #usr/share/man/man7/virkeycode-usb.7 #usr/share/man/man7/virkeycode-win32.7 #usr/share/man/man7/virkeycode-xtkbd.7 @@ -345,8 +353,9 @@ var/ipfire/backup/addons/includes/libvirt #var/lib/libvirt/lockd #var/lib/libvirt/lockd/files #var/lib/libvirt/qemu +#var/lib/libvirt/swtpm #var/log/libvirt -#var/log/libvirt/lxc #var/log/libvirt/qemu -#var/log/libvirt/uml - +var/log/swtpm +var/log/swtpm/libvirt +var/log/swtpm/libvirt/qemu diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index 08fcca9fce..0487626506 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -1,28 +1,17 @@ +etc/rc.d/init.d/nfs-server sbin/mount.nfs sbin/mount.nfs4 sbin/nfsdcltrack sbin/osd_login sbin/umount.nfs sbin/umount.nfs4 -#usr/include/nfsidmap.h -#usr/lib/libnfsidmap -#usr/lib/libnfsidmap.a -#usr/lib/libnfsidmap.la -usr/lib/libnfsidmap.so -usr/lib/libnfsidmap.so.0 -usr/lib/libnfsidmap.so.0.3.0 -#usr/lib/libnfsidmap/nsswitch.a -#usr/lib/libnfsidmap/nsswitch.la -usr/lib/libnfsidmap/nsswitch.so -#usr/lib/libnfsidmap/static.a -#usr/lib/libnfsidmap/static.la -usr/lib/libnfsidmap/static.so -#usr/lib/libnfsidmap/umich_ldap.a -#usr/lib/libnfsidmap/umich_ldap.la -usr/lib/libnfsidmap/umich_ldap.so -#usr/lib/pkgconfig/libnfsidmap.pc +#usr/include/nfsidmap_plugin.h +usr/lib/libnfsidmap.so.1 +usr/lib/libnfsidmap.so.1.0.0 usr/sbin/exportfs usr/sbin/mountstats +usr/sbin/nfsconf +usr/sbin/nfsidmap usr/sbin/nfsiostat usr/sbin/nfsstat usr/sbin/rpc.idmapd @@ -33,19 +22,21 @@ usr/sbin/rpcdebug usr/sbin/showmount usr/sbin/sm-notify usr/sbin/start-statd -#usr/share/man/man3/nfs4_uid_to_name.3 #usr/share/man/man5/exports.5 -#usr/share/man/man5/idmapd.conf.5 #usr/share/man/man5/nfs.5 +#usr/share/man/man5/nfs.conf.5 #usr/share/man/man5/nfsmount.conf.5 +#usr/share/man/man7/nfs.systemd.7 #usr/share/man/man7/nfsd.7 #usr/share/man/man8/exportfs.8 #usr/share/man/man8/idmapd.8 #usr/share/man/man8/mount.nfs.8 #usr/share/man/man8/mountd.8 #usr/share/man/man8/mountstats.8 +#usr/share/man/man8/nfsconf.8 #usr/share/man/man8/nfsd.8 #usr/share/man/man8/nfsdcltrack.8 +#usr/share/man/man8/nfsidmap.8 #usr/share/man/man8/nfsiostat.8 #usr/share/man/man8/nfsstat.8 #usr/share/man/man8/rpc.idmapd.8 @@ -64,6 +55,3 @@ var/lib/nfs/rmtab var/lib/nfs/sm var/lib/nfs/sm.bak var/lib/nfs/state -var/lib/nfs/xtab -etc/rc.d/init.d/nfs-server -var/ipfire/nfs/nfs-server diff --git a/doc/language_issues.de b/doc/language_issues.de index d99efac748..e9ca045485 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -494,6 +496,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.en b/doc/language_issues.en index 60b6cbb465..de3048a4c3 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.es b/doc/language_issues.es index a9bf73f69e..6a8acd6da8 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4aaf5d3fb0..271179cc69 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -430,6 +430,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -903,7 +906,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1111,7 +1113,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn warning rfc3280 diff --git a/doc/language_issues.it b/doc/language_issues.it index 448c96bb14..ac51eb07c8 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -493,6 +495,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.nl b/doc/language_issues.nl index a0216f0f7c..18307d5af8 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -258,6 +258,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -466,6 +467,7 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -490,6 +492,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a9bf73f69e..6a8acd6da8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cbcaca1ec8..3a7b6b95fb 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -424,6 +424,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -888,7 +891,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1096,7 +1098,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn warning rfc3280 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8a7ca44c17..7b5bc05591 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 79ff636c80..e6f3cda94a 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -278,20 +278,6 @@ print < END -&Header::closebox(); -&Header::openbox("100%", "center", "$Lang::tr{'settings'}"); - -print < - - - -
$Lang::tr{'basic options'}
$Lang::tr{'pakfire update daily'} - on | - off
- -END - &Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/lfs/Config b/lfs/Config index 516fb1cabb..76f279da96 100644 --- a/lfs/Config +++ b/lfs/Config @@ -37,10 +37,22 @@ ifeq "$(BUILD_ARCH)" "aarch64" IS_64BIT = 1 endif +ifeq "$(BUILD_ARCH)" "armv7hl" + IS_32BIT = 1 +endif + +ifeq "$(BUILD_ARCH)" "armv5tel" + IS_32BIT = 1 +endif + ifeq "$(BUILD_ARCH)" "x86_64" IS_64BIT = 1 endif +ifeq "$(BUILD_ARCH)" "i586" + IS_32BIT = 1 +endif + ifeq "$(TOOLCHAIN)" "1" PREFIX = $(TOOLS_DIR) else diff --git a/lfs/bison b/lfs/bison index e961a4956a..c1a6103cd0 100644 --- a/lfs/bison +++ b/lfs/bison @@ -24,7 +24,7 @@ include Config -VER = 3.0.4 +VER = 3.0.5 THISAPP = bison-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects =$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c342201de104cc9ce0a21e0ad10d4021 +$(DL_FILE)_MD5 = 3e54f20988ecd1b62044e25481e5f06b install : $(TARGET) @@ -75,6 +75,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 < $(DIR_SRC)/src/patches/bison-3.0.5-gnulib-fseterr.patch cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/collectd b/lfs/collectd index fd5dd946a2..9592ec95a3 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -104,6 +104,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch 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) && autoreconf -vfi + cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \ --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \ diff --git a/lfs/coreutils b/lfs/coreutils index 567298450d..2c282b194b 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -24,7 +24,7 @@ include Config -VER = 8.29 +VER = 8.30 THISAPP = coreutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -50,6 +50,11 @@ CONFIGURE_OPTIONS += \ CFLAGS += -fno-strict-aliasing +# Build with 32 bit time_t on 32 bit architectures +ifeq "$(IS_32BIT)" "1" + export TIME_T_32_BIT_OK=yes +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -58,7 +63,7 @@ objects =$(DL_FILE) $(DL_FILE)= $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 960cfe75a42c9907c71439f8eb436303 +$(DL_FILE)_MD5 = ab06d68949758971fe744db66b572816 install : $(TARGET) diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 9e7988b9bb..8fda71389f 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -24,7 +24,7 @@ include Config -VER = 1.42.13 +VER = 1.44.4 THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265 +$(DL_FILE)_MD5 = 156e94a6169ca1fa3f0c6749ae5921b9 install : $(TARGET) diff --git a/lfs/findutils b/lfs/findutils index 970ace3c2e..1ec69c99a5 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -80,6 +80,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(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) && sed -i gl/lib/mountlist.c \ + -e "/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include \n#endif\n" + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/findutils-4.6.0-glibc2.28.patch cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/gcc b/lfs/gcc index 77d1f264f2..6fdf2ea314 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -224,6 +224,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) @mkdir $(DIR_SRC)/gcc-build + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc-7-glibc-2.28-ustat.patch + cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in cd $(DIR_APP) && sed -i gcc/Makefile.in \ -e 's@\./fixinc\.sh@-c true@' \ diff --git a/lfs/glibc b/lfs/glibc index 1fd7b6ae1b..4530f2ddd6 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -24,7 +24,7 @@ include Config -VER = 2.27 +VER = 2.28 THISAPP = glibc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -93,7 +93,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 898cd5656519ffbc3a03fe811dd89e82 +$(DL_FILE)_MD5 = c81d2388896379997bc359d4f2084239 install : $(TARGET) diff --git a/lfs/gzip b/lfs/gzip index a10abdd0ad..eeea99dbe5 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -41,6 +41,11 @@ else EXTRA_CONFIG = --prefix=$(TOOLS_DIR) endif +# Build with 32 bit time_t on 32 bit architectures +ifeq "$(IS_32BIT)" "1" + export TIME_T_32_BIT_OK=yes +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -79,6 +84,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 < $(DIR_SRC)/src/patches/gzip-1.9-gnulib.patch cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/keyutils b/lfs/keyutils new file mode 100644 index 0000000000..67b6f44fa6 --- /dev/null +++ b/lfs/keyutils @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.5.11 + +THISAPP = keyutils-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = bcc0984181572461850a37c39f8b167a + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make NO_ARLIB=1 install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/kmod b/lfs/kmod index 38d5de9636..bb49fbb3c9 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -24,7 +24,7 @@ include Config -VER = 13 +VER = 25 THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d5aba43b9370cd52f3cb35e82a1aa595 +$(DL_FILE)_MD5 = 34f325cab568f842fdde4f8b2182f220 install : $(TARGET) @@ -74,9 +74,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ - --disable-manpages - -# --libdir=/lib \ + --disable-manpages \ + --with-zlib cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/libaio b/lfs/libaio new file mode 100644 index 0000000000..f71c58909b --- /dev/null +++ b/lfs/libaio @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.3.111 + +THISAPP = libaio-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = abb8f46d64b9bd3d0c6097e3a36639be + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -e "s@-nostdlib -nostartfiles@@g" -i src/Makefile + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make prefix=/usr install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libvirt b/lfs/libvirt index fe2fcecfe8..fce1d25ad4 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -24,7 +24,7 @@ include Config -VER = 4.0.0 +VER = 4.6.0 THISAPP = libvirt-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 15 +PAK_VER = 16 DEPS = "libpciaccess libyajl ncat qemu" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ff0dbdd8ec4ac1277588dfe3b245d0e9 +$(DL_FILE)_MD5 = 6ea17a8f004a4bcdfc4beaed91fcdddd install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) diff --git a/lfs/lvm2 b/lfs/lvm2 index 3e613e80be..fe69742797 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -24,7 +24,7 @@ include Config -VER = 2.02.95 +VER = 2.02.181 THISAPP = LVM2.$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bd470a802046c807603618a443732ea7 +$(DL_FILE)_MD5 = 7d6380d9a34981fd7b605eaa371295b3 install : $(TARGET) diff --git a/lfs/m4 b/lfs/m4 index 22610e887b..3aa503fc4b 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -77,6 +77,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 < $(DIR_SRC)/src/patches/m4-1.4.18-glibc-change-work-around.patch cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/nfs b/lfs/nfs index 2b4fe601b0..adfc1a232b 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -24,15 +24,15 @@ include Config -VER = 1.3.3 +VER = 2.3.3 THISAPP = nfs-utils-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 10 +PAK_VER = 11 DEPS = "rpcbind" @@ -48,7 +48,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz -$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665 +$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99 libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab install : $(TARGET) @@ -81,7 +81,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz $(UPDATE_AUTOMAKE) @@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP)/libnfsidmap* && make install - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/nfs-1.3.3-glibc-stdint.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 9199c2bc67..90498f7cfd 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -24,13 +24,13 @@ include Config -VER = 2014.2.15 +VER = 2017.3.23 THISAPP = ntfs-3g_ntfsprogs-$(VER) DL_FILE = $(THISAPP).tgz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f11d563816249d730a00498983485f3a +$(DL_FILE)_MD5 = d97474ae1954f772c6d2fa386a6f462c install : $(TARGET) @@ -73,7 +73,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/parted b/lfs/parted index bbaeff1a33..dc68ba8502 100644 --- a/lfs/parted +++ b/lfs/parted @@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-device-mapper.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-sysmacros.patch cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/perl b/lfs/perl index 4eee16b804..a151e765b4 100644 --- a/lfs/perl +++ b/lfs/perl @@ -90,10 +90,11 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install else - cd $(DIR_APP) && ./configure.gnu --prefix=$(TOOLS_DIR) -Dstatic_ext='Data/Dumper Fcntl IO' + cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR) \ + -Dlibs="-lm" -Uloclibpth -Ulocincpth cd $(DIR_APP) && sed -i 's/^0$$//' makefile cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile - cd $(DIR_APP) && make perl utilities + cd $(DIR_APP) && make cd $(DIR_APP) && cp -v perl pod/pod2man $(TOOLS_DIR)/bin cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER) cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER) diff --git a/lfs/ppp b/lfs/ppp index 45fc2caab9..f02864cc05 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp-2.4.7-openssl.patch cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)" diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs index 218796d1a9..eaa03d787a 100644 --- a/lfs/reiserfsprogs +++ b/lfs/reiserfsprogs @@ -24,7 +24,7 @@ include Config -VER = 3.6.25 +VER = 3.6.27 THISAPP = reiserfsprogs-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 027a598b055dccb8da3aea1378a19f3c +$(DL_FILE)_MD5 = 90c139542725efc6da3a6b1709695395 install : $(TARGET) @@ -70,6 +70,8 @@ $(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 < $(DIR_SRC)/src/patches/reiserfsprogs-3.6.27-loff_t.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/syslinux b/lfs/syslinux index eecf3aefa3..1670da27e6 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -75,6 +75,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + # Apply patches + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-sysmacros.patch + # Build cd $(DIR_APP) && make bios $(MAKETUNING) ifeq "$(BUILD_ARCH)" "x86_64" diff --git a/lfs/sysvinit b/lfs/sysvinit index 82c4fa9365..d85a3659b4 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -70,6 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @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) && sed -i src/mountpoint.c src/bootlogd.c \ + -e "/include.*sys\/stat.h/a#include \n" cd $(DIR_APP) && make $(MAKETUNING) -C src cd $(DIR_APP) && make -C src install @rm -rf $(DIR_APP) diff --git a/lfs/udev b/lfs/udev index d55dec4505..b578ab54cb 100644 --- a/lfs/udev +++ b/lfs/udev @@ -24,26 +24,26 @@ include Config -VER = 208 +VER = 3.2.6 +RULES_VER = 20171102 -THISAPP = udev-$(VER) -DL_FILE = systemd-$(VER).tar.xz +THISAPP = eudev-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/systemd-$(VER) +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) udev-lfs-208-1.tar.bz2 - +objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2 +udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2 -$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165 -udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7 +$(DL_FILE)_MD5 = 902c4cdc9235838067cc69978a780e72 +udev-lfs-$(RULES_VER).tar.bz2_MD5 = d92afb0c6e8e616792068ee4737b0d24 install : $(TARGET) @@ -73,27 +73,36 @@ $(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) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2 + cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2 - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208-fix_uint8_t.patch + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --bindir=/bin \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --libexecdir=/lib \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --enable-manpages \ + --disable-static - rm -rf /lib/udev/devices - install -dv /lib/firmware + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install - cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING) - cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install + # Generate hardware database + udevadm hwdb --update - # Make some compat symlinks - ln -sf /lib/udev/udevd /sbin/udevd - ln -sf /sbin/udevadm /bin/udevadm + # Install rules + cd $(DIR_APP) && make -f udev-lfs-$(RULES_VER)/Makefile.lfs install # Disable net generator rule. This does not work with the setup. rm -f /lib/udev/rules.d/75-persistent-net-generator.rules rm -f /lib/udev/rules.d/80-net-name-slot.rules # Blacklist some modules - cp -vf $(DIR_SRC)/config/udev/blacklist.conf /etc/modprobe.d/blacklist.conf + cp -vf $(DIR_SRC)/config/udev/blacklist.conf \ + /etc/modprobe.d/blacklist.conf # Install config file install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \ @@ -122,5 +131,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /lib/udev/rules.d install -m 755 $(DIR_SRC)/config/udev/enable_codel \ /lib/udev/enable_codel + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xfsprogs b/lfs/xfsprogs index c104e84903..b68e1b138f 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -24,10 +24,10 @@ include Config -VER = 2.9.4 +VER = 4.18.0 THISAPP = xfsprogs-$(VER) -DL_FILE = xfsprogs_$(VER)-1.tar.gz +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 = 174683e3b86b587ed59823fdbbb96ea4 +$(DL_FILE)_MD5 = 5f80b631b68df89a8b9283307e96d2e8 install : $(TARGET) @@ -72,13 +72,10 @@ $(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) && sed -i "/include/a #include " \ - libxfs/xfs_ialloc.c quota/quot.c mdrestore/xfs_mdrestore.c \ - rtcp/xfs_rtcp.c + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \ - LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" - cd $(DIR_APP) && make install + LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" + cd $(DIR_APP) && make install install-dev cd $(DIR_APP) && install -v -m755 -D libhandle/libhandle.la /usr/lib/libhandle.la chmod -v 755 /lib/libhandle.so* rm -f /lib/libhandle.{a,la,so} diff --git a/make.sh b/make.sh index c811f05731..b9558bc042 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=20180606 +TOOLCHAINVER=20181024 ############################################################################### # @@ -1083,6 +1083,9 @@ buildipfire() { lfsmake2 configroot lfsmake2 initscripts lfsmake2 backup + lfsmake2 openssl + [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' + lfsmake2 openssl-compat lfsmake2 popt lfsmake2 libusb lfsmake2 libusb-compat @@ -1101,6 +1104,7 @@ buildipfire() { lfsmake2 cpio lfsmake2 mdadm lfsmake2 dracut + lfsmake2 libaio lfsmake2 lvm2 lfsmake2 multipath-tools lfsmake2 freetype @@ -1169,9 +1173,6 @@ buildipfire() { esac lfsmake2 intel-microcode lfsmake2 xtables-addons USPACE="1" - lfsmake2 openssl - [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' - lfsmake2 openssl-compat lfsmake2 libgpg-error lfsmake2 libgcrypt lfsmake2 libassuan @@ -1378,6 +1379,7 @@ buildipfire() { lfsmake2 rsync lfsmake2 libtirpc lfsmake2 rpcbind + lfsmake2 keyutils lfsmake2 nfs lfsmake2 gnu-netcat lfsmake2 ncat diff --git a/src/patches/bison-3.0.5-gnulib-fseterr.patch b/src/patches/bison-3.0.5-gnulib-fseterr.patch new file mode 100644 index 0000000000..cd2a482896 --- /dev/null +++ b/src/patches/bison-3.0.5-gnulib-fseterr.patch @@ -0,0 +1,19 @@ +commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e +Author: Paul Eggert +Date: Mon Mar 5 10:56:29 2018 -0800 + + fflush: adjust to glibc 2.28 libio.h removal + (Only part of this commit was backported as needed.) + +diff -Nrup a/lib/fseterr.c b/lib/fseterr.c +--- a/lib/fseterr.c 2018-05-08 06:02:48.000000000 -0400 ++++ b/lib/fseterr.c 2018-08-14 16:06:19.636282264 -0400 +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ diff --git a/src/patches/collectd-4.10.9-xfs-compile-fix.patch b/src/patches/collectd-4.10.9-xfs-compile-fix.patch new file mode 100644 index 0000000000..f622104a71 --- /dev/null +++ b/src/patches/collectd-4.10.9-xfs-compile-fix.patch @@ -0,0 +1,28 @@ +--- collectd-4.10.9/src/utils_mount.c~ 2018-10-23 12:16:24.979393842 +0000 ++++ collectd-4.10.9/src/utils_mount.c 2018-10-23 12:18:44.473984419 +0000 +@@ -21,20 +21,22 @@ + * Niki W. Waibel + **/ + ++#define _GNU_SOURCE ++ + #if HAVE_CONFIG_H + # include "config.h" + #endif + + #include "common.h" ++#include "plugin.h" ++#include "utils_mount.h" ++ + #if HAVE_XFS_XQM_H + # include + #define XFS_SUPER_MAGIC_STR "XFSB" + #define XFS_SUPER_MAGIC2_STR "BSFX" + #endif + +-#include "plugin.h" +-#include "utils_mount.h" +- + #if HAVE_GETVFSSTAT + # if HAVE_SYS_TYPES_H + # include diff --git a/src/patches/findutils-4.6.0-glibc2.28.patch b/src/patches/findutils-4.6.0-glibc2.28.patch new file mode 100644 index 0000000000..651c2d2653 --- /dev/null +++ b/src/patches/findutils-4.6.0-glibc2.28.patch @@ -0,0 +1,335 @@ +Fix build failure on glibc-2.28: + fseeko.c: In function 'rpl_fseeko': + fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." + #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." + +Patch by milan hodoscek. + +https://bugs.gentoo.org/663242 +--- a/old/stdio-impl.h ++++ b/gl/lib/stdio-impl.h +@@ -1,5 +1,5 @@ + /* Implementation details of FILE streams. +- Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. + + 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 +@@ -12,12 +12,18 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program. If not, see . */ ++ along with this program. If not, see . */ + + /* Many stdio implementations have the same logic and therefore can share + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +@@ -29,10 +35,10 @@ + #include /* For detecting Plan9. */ + + #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + + # if defined __DragonFly__ /* DragonFly */ +- /* See . */ ++ /* See . */ + # define fp_ ((struct { struct __FILE_public pub; \ + struct { unsigned char *_base; int _size; } _bf; \ + void *cookie; \ +@@ -49,30 +55,84 @@ + fpos_t _offset; \ + /* More fields, not relevant here. */ \ + } *) fp) +- /* See . */ ++ /* See . */ + # define _p pub._p + # define _flags pub._flags + # define _r pub._r + # define _w pub._w ++# elif defined __ANDROID__ /* Android */ ++ /* Up to this commit from 2015-10-12 ++ ++ the innards of FILE were public, and fp_ub could be defined like for OpenBSD, ++ see ++ and . ++ After this commit, the innards of FILE are hidden. */ ++# define fp_ ((struct { unsigned char *_p; \ ++ int _r; \ ++ int _w; \ ++ int _flags; \ ++ int _file; \ ++ struct { unsigned char *_base; size_t _size; } _bf; \ ++ int _lbfsize; \ ++ void *_cookie; \ ++ void *_close; \ ++ void *_read; \ ++ void *_seek; \ ++ void *_write; \ ++ struct { unsigned char *_base; size_t _size; } _ext; \ ++ unsigned char *_up; \ ++ int _ur; \ ++ unsigned char _ubuf[3]; \ ++ unsigned char _nbuf[1]; \ ++ struct { unsigned char *_base; size_t _size; } _lb; \ ++ int _blksize; \ ++ fpos_t _offset; \ ++ /* More fields, not relevant here. */ \ ++ } *) fp) + # else + # define fp_ fp + # endif + +-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ ++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ + /* See +- and */ ++ and ++ and */ + struct __sfileext + { + struct __sbuf _ub; /* ungetc buffer */ + /* More fields, not relevant here. */ + }; + # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub +-# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ ++# elif defined __ANDROID__ /* Android */ ++ struct __sfileext ++ { ++ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ ++ /* More fields, not relevant here. */ ++ }; ++# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub ++# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ + # define fp_ub fp_->_ub + # endif + + # define HASUB(fp) (fp_ub._base != NULL) + ++# if defined __ANDROID__ /* Android */ ++ /* Needed after this commit from 2016-01-25 ++ */ ++# ifndef __SEOF ++# define __SLBF 1 ++# define __SNBF 2 ++# define __SRD 4 ++# define __SWR 8 ++# define __SRW 0x10 ++# define __SEOF 0x20 ++# define __SERR 0x40 ++# endif ++# ifndef __SOFF ++# define __SOFF 0x1000 ++# endif ++# endif ++ + #endif + + +@@ -81,7 +141,7 @@ + #ifdef __TANDEM /* NonStop Kernel */ + # ifndef _IOERR + /* These values were determined by the program 'stdioext-flags' at +- . */ ++ . */ + # define _IOERR 0x40 + # define _IOREAD 0x80 + # define _IOWRT 0x4 +@@ -99,6 +159,8 @@ + int _file; \ + unsigned int _flag; \ + } *) fp) ++# elif defined __VMS /* OpenVMS */ ++# define fp_ ((struct _iobuf *) fp) + # else + # define fp_ fp + # endif +@@ -110,4 +172,31 @@ + # define _flag __flag + # endif + ++#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ ++ ++/* does not define the innards of FILE any more. */ ++# define WINDOWS_OPAQUE_FILE ++ ++struct _gl_real_FILE ++{ ++ /* Note: Compared to older Windows and to mingw, it has the fields ++ _base and _cnt swapped. */ ++ unsigned char *_ptr; ++ unsigned char *_base; ++ int _cnt; ++ int _flag; ++ int _file; ++ int _charbuf; ++ int _bufsiz; ++}; ++# define fp_ ((struct _gl_real_FILE *) fp) ++ ++/* These values were determined by a program similar to the one at ++ . */ ++# define _IOREAD 0x1 ++# define _IOWRT 0x2 ++# define _IORW 0x4 ++# define _IOEOF 0x8 ++# define _IOERR 0x10 ++ + #endif +--- a/old/fseeko.c ++++ b/gl/lib/fseeko.c +@@ -1,5 +1,5 @@ + /* An fseeko() function that, together with fflush(), is POSIX compliant. +- Copyright (C) 2007-2015 Free Software Foundation, Inc. ++ Copyright (C) 2007-2018 Free Software Foundation, Inc. + + 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 +@@ -12,7 +12,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along +- with this program; if not, see . */ ++ with this program; if not, see . */ + + #include + +@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + #if _GL_WINDOWS_64_BIT_OFF_T + # undef fseeko +-# if HAVE__FSEEKI64 /* msvc, mingw64 */ ++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ + # define fseeko _fseeki64 +-# else /* mingw */ ++# else /* mingw before msvcrt8.0 */ + # define fseeko fseeko64 + # endif + #endif +@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + # if defined __SL64 && defined __SCLE /* Cygwin */ + if ((fp->_flags & __SL64) == 0) + { +@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #elif defined __minix /* Minix */ + if (fp_->_ptr == fp_->_buf + && (fp_->_ptr == NULL || fp_->_count == 0)) +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ ++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + if (fp_->_ptr == fp_->_base + && (fp_->_ptr == NULL || fp_->_cnt == 0)) + #elif defined __UCLIBC__ /* uClibc */ +@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence) + if (pos == -1) + { + #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + fp_->_flags &= ~__SOFF; + #endif + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ ++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else +@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence) + fp_->_flags &= ~__SEOF; + #elif defined __EMX__ /* emx+gcc */ + fp->_flags &= ~_IOEOF; +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ +- fp->_flag &= ~_IOEOF; ++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ ++ fp_->_flag &= ~_IOEOF; + #elif defined __MINT__ /* Atari FreeMiNT */ + fp->__offset = pos; + fp->__eof = 0; +--- a/old/freadahead.c ++++ b/gl/lib/freadahead.c +@@ -1,5 +1,5 @@ + /* Retrieve information about a FILE stream. +- Copyright (C) 2007-2015 Free Software Foundation, Inc. ++ Copyright (C) 2007-2018 Free Software Foundation, Inc. + + 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 +@@ -12,7 +12,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program. If not, see . */ ++ along with this program. If not, see . */ + + #include + +@@ -22,17 +22,26 @@ + #include + #include "stdio-impl.h" + ++#if defined __DragonFly__ ++/* Defined in libc, but not declared in . */ ++extern size_t __sreadahead (FILE *); ++#endif ++ ++/* This file is not used on systems that have the __freadahead function, ++ namely musl libc. */ ++ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) + + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base : + 0); + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) + return 0; + # if defined __DragonFly__ +@@ -53,7 +62,7 @@ freadahead (FILE *fp) + if ((fp_->_flags & _IOWRITING) != 0) + return 0; + return fp_->_count; +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ ++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + if ((fp_->_flag & _IOWRT) != 0) + return 0; + return fp_->_cnt; diff --git a/src/patches/gcc-7-glibc-2.28-ustat.patch b/src/patches/gcc-7-glibc-2.28-ustat.patch new file mode 100644 index 0000000000..7c56292d13 --- /dev/null +++ b/src/patches/gcc-7-glibc-2.28-ustat.patch @@ -0,0 +1,31 @@ +--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/04/25 07:39:32 259630 ++++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/05/24 20:07:25 260687 +@@ -157,7 +157,6 @@ + # include + #endif + #include +-#include + #include + #include + #include +@@ -250,7 +249,19 @@ + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/src/patches/gzip-1.9-gnulib.patch b/src/patches/gzip-1.9-gnulib.patch new file mode 100644 index 0000000000..68e8d518a7 --- /dev/null +++ b/src/patches/gzip-1.9-gnulib.patch @@ -0,0 +1,189 @@ +From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. +--- + ChangeLog | 23 +++++++++++++++++++++++ + lib/fbufmode.c | 2 +- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadable.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/fwritable.c | 2 +- + lib/fwriting.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 15 files changed, 45 insertions(+), 16 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 667f91663..beb835670 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert ++ ++ fflush: adjust to glibc 2.28 libio.h removal ++ Problem reported by Daniel P. Berrangé in: ++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html ++ * lib/fbufmode.c (fbufmode): ++ * lib/fflush.c (clear_ungetc_buffer_preserving_position) ++ (disable_seek_optimization, rpl_fflush): ++ * lib/fpending.c (__fpending): ++ * lib/fpurge.c (fpurge): ++ * lib/freadable.c (freadable): ++ * lib/freadahead.c (freadahead): ++ * lib/freading.c (freading): ++ * lib/freadptr.c (freadptr): ++ * lib/freadseek.c (freadptrinc): ++ * lib/fseeko.c (fseeko): ++ * lib/fseterr.c (fseterr): ++ * lib/fwritable.c (fwritable): ++ * lib/fwriting.c (fwriting): ++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. ++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: ++ Define if not already defined. ++ + 2018-01-07 Jim Meyering + + version 1.9 + * NEWS: Record release date. +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0ff..a6edfa105 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c7a..3aedcc373 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freading.c b/lib/freading.c +index 73c28acdd..c24d0c88a 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab55f..193f4e8ce 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 82649c3ac..adb637256 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.14.3 + diff --git a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch index ed685e8306..ff6cb629ac 100644 --- a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch +++ b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch @@ -4,15 +4,10 @@ Date: Mon, 6 Jun 2016 19:40:50 +0200 Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire Signed-off-by: Jonatan Schlag ---- - daemon/libvirtd.conf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf -index ac06cdd..1a41914 100644 ---- a/daemon/libvirtd.conf -+++ b/daemon/libvirtd.conf -@@ -87,14 +87,14 @@ +--- a/src/remote/libvirtd.conf~ 2018-10-24 09:12:31.045030419 +0100 ++++ b/src/remote/libvirtd.conf 2018-10-24 09:12:33.443109098 +0100 +@@ -82,14 +82,14 @@ # without becoming root. # # This is restricted to 'root' by default. @@ -29,7 +24,7 @@ index ac06cdd..1a41914 100644 # Set the UNIX socket permissions for the R/W socket. This is used # for full management of VMs -@@ -104,7 +104,7 @@ +@@ -99,7 +99,7 @@ # # If not using PolicyKit and setting group ownership for access # control, then you may want to relax this too. @@ -38,6 +33,3 @@ index ac06cdd..1a41914 100644 # Set the UNIX socket permissions for the admin interface socket. # --- -2.1.4 - diff --git a/src/patches/m4-1.4.18-glibc-change-work-around.patch b/src/patches/m4-1.4.18-glibc-change-work-around.patch new file mode 100644 index 0000000000..582ae9b536 --- /dev/null +++ b/src/patches/m4-1.4.18-glibc-change-work-around.patch @@ -0,0 +1,115 @@ +diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c +--- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200 ++++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200 +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c +--- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200 ++++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200 +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c +--- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200 ++++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200 +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c +--- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100 ++++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200 +@@ -25,7 +25,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c +--- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200 ++++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200 +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c +--- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200 ++++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200 +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h +--- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100 ++++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200 +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/src/patches/nfs-1.3.3-glibc-stdint.patch b/src/patches/nfs-1.3.3-glibc-stdint.patch deleted file mode 100644 index 9a65cd1f8a..0000000000 --- a/src/patches/nfs-1.3.3-glibc-stdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-utils-1.3.3/support/nsm/rpc.c~ 2018-02-11 17:01:31.137039166 +0000 -+++ nfs-utils-1.3.3/support/nsm/rpc.c 2018-02-11 17:01:45.683511380 +0000 -@@ -40,6 +40,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/src/patches/parted-3.2-sysmacros.patch b/src/patches/parted-3.2-sysmacros.patch new file mode 100644 index 0000000000..a29e7619b1 --- /dev/null +++ b/src/patches/parted-3.2-sysmacros.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/580022 + +From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 21 Jun 2016 15:01:08 -0400 +Subject: [PATCH] include sysmacros.h for major/minor/makedev + +Linux C libs are moving away from including this header implicitly via +sys/types.h, so include it explicitly. +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 326b95619d31..e5c168be3c68 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include + #include /* for uname() */ + #include +-- +2.8.2 + diff --git a/src/patches/ppp-2.4.7-openssl.patch b/src/patches/ppp-2.4.7-openssl.patch new file mode 100644 index 0000000000..cbb5857a7c --- /dev/null +++ b/src/patches/ppp-2.4.7-openssl.patch @@ -0,0 +1,110 @@ +From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= +Date: Fri, 6 Apr 2018 14:27:18 +0200 +Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped +libcrypt. The libxcrypt standalone package can be used instead, but +it dropped the old setkey/encrypt API which ppp uses for DES. There +is support for using openssl in pppcrypt.c, but it contains typos +preventing it from compiling and seems to be written for an ancient +openssl version. + +This updates the code to use current openssl. + +[paulus@ozlabs.org - wrote the commit description, fixed comment in + Makefile.linux.] + +Signed-off-by: Jaroslav Škarvada +Signed-off-by: Paul Mackerras +--- + pppd/Makefile.linux | 7 ++++--- + pppd/pppcrypt.c | 18 +++++++++--------- + 2 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux +index 36d2b036..8d5ce99d 100644 +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux +@@ -35,10 +35,10 @@ endif + COPTS = -O2 -pipe -Wall -g + LIBS = + +-# Uncomment the next 2 lines to include support for Microsoft's ++# Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. + CHAPMS=y +-USE_CRYPT=y ++#USE_CRYPT=y + # Don't use MSLANMAN unless you really know what you're doing. + #MSLANMAN=y + # Uncomment the next line to include support for MPPE. CHAPMS (above) must +@@ -137,7 +137,8 @@ endif + + ifdef NEEDDES + ifndef USE_CRYPT +-LIBS += -ldes $(LIBS) ++CFLAGS += -I/usr/include/openssl ++LIBS += -lcrypto + else + CFLAGS += -DUSE_CRYPT=1 + endif +diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c +index 8b85b132..6b35375e 100644 +--- a/pppd/pppcrypt.c ++++ b/pppd/pppcrypt.c +@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */ + des_key[7] = Get7Bits(key, 49); + + #ifndef USE_CRYPT +- des_set_odd_parity((des_cblock *)des_key); ++ DES_set_odd_parity((DES_cblock *)des_key); + #endif + } + +@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ + } + + #else /* USE_CRYPT */ +-static des_key_schedule key_schedule; ++static DES_key_schedule key_schedule; + + bool + DesSetkey(key) + u_char *key; + { +- des_cblock des_key; ++ DES_cblock des_key; + MakeKey(key, des_key); +- des_set_key(&des_key, key_schedule); ++ DES_set_key(&des_key, &key_schedule); + return (1); + } + + bool +-DesEncrypt(clear, key, cipher) ++DesEncrypt(clear, cipher) + u_char *clear; /* IN 8 octets */ + u_char *cipher; /* OUT 8 octets */ + { +- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, +- key_schedule, 1); ++ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, ++ &key_schedule, 1); + return (1); + } + +@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) + u_char *cipher; /* IN 8 octets */ + u_char *clear; /* OUT 8 octets */ + { +- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, +- key_schedule, 0); ++ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, ++ &key_schedule, 0); + return (1); + } + diff --git a/src/patches/reiserfsprogs-3.6.27-loff_t.patch b/src/patches/reiserfsprogs-3.6.27-loff_t.patch new file mode 100644 index 0000000000..9ab8519e77 --- /dev/null +++ b/src/patches/reiserfsprogs-3.6.27-loff_t.patch @@ -0,0 +1,16 @@ +glibc-2.28 did hide loff_t indef system-specific macros: + https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=663e7d784977f6b15c0cab73f754f9f39c9c0c2c + +This caused build failure: + ../include/reiserfs_lib.h:300:55: error: unknown type name 'loff_t'; did you mean 'off_t'? + +Re-enable extensions to pull loff_t back. + +https://bugs.gentoo.org/663930 +--- a/configure.ac ++++ b/configure.ac +@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET + AC_PROG_LIBTOOL ++dnl pull in loff_t from glibc ++AC_USE_SYSTEM_EXTENSIONS + diff --git a/src/patches/syslinux-6.03-sysmacros.patch b/src/patches/syslinux-6.03-sysmacros.patch new file mode 100644 index 0000000000..af464fe534 --- /dev/null +++ b/src/patches/syslinux-6.03-sysmacros.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/579928 + +From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 19 Apr 2016 01:56:41 -0400 +Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev + +These functions are defined in sys/sysmacros.h, so add the include to +main.c. This is already handled correctly in mountinfo.c. Otherwise +we get build failures like: + +main.o: In function 'find_device_sysfs': +extlinux/main.c:1131: undefined reference to 'minor' + +Signed-off-by: Mike Frysinger +--- + extlinux/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extlinux/main.c b/extlinux/main.c +index a7ebd49..ebff7ea 100644 +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.7.4 +