This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 4e412a00d30b1d4157565db0df239264f1c113e7 (commit) via b6632b766a713d99c890add0339943ba951ada3b (commit) via 29cb9e478af138614b8eb26a6838ddbd01335e47 (commit) via a9f381bd89d25c8f86bb6cabbe8cd1f444a993df (commit) from 6319c9315c8aa053745c2c6c83499d797740c6a7 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 4e412a00d30b1d4157565db0df239264f1c113e7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 22 19:10:46 2020 +0000

core143: add glibc

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit b6632b766a713d99c890add0339943ba951ada3b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 22 19:04:14 2020 +0000

vdr: fix build with glibc 2.31

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 29cb9e478af138614b8eb26a6838ddbd01335e47 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 5 11:45:46 2020 +0000

glibc: Update to 2.31

Fixes: #12288 Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit a9f381bd89d25c8f86bb6cabbe8cd1f444a993df Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 5 11:45:45 2020 +0000

qemu: Fix build against glibc >= 2.31

Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/aarch64/glibc | 78 +++++++++++++------- config/rootfiles/common/armv5tel/glibc | 78 +++++++++++++------- config/rootfiles/common/i586/glibc | 77 +++++++++++++------- config/rootfiles/common/x86_64/glibc | 82 +++++++++++++++------- .../125 => core/143}/filelists/aarch64/glibc | 0 .../100 => core/143}/filelists/armv5tel/glibc | 0 .../{oldcore/100 => core/143}/filelists/i586/glibc | 0 .../100 => core/143}/filelists/x86_64/glibc | 0 config/rootfiles/core/143/update.sh | 3 + lfs/glibc | 4 +- lfs/qemu | 1 + lfs/vdr | 4 +- src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch | 65 +++++++++++++++++ src/patches/vdr/vdr-2.4.1_replace_stime.patch | 47 +++++++++++++ 14 files changed, 336 insertions(+), 103 deletions(-) copy config/rootfiles/{oldcore/125 => core/143}/filelists/aarch64/glibc (100%) copy config/rootfiles/{oldcore/100 => core/143}/filelists/armv5tel/glibc (100%) copy config/rootfiles/{oldcore/100 => core/143}/filelists/i586/glibc (100%) copy config/rootfiles/{oldcore/100 => core/143}/filelists/x86_64/glibc (100%) create mode 100644 src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch create mode 100644 src/patches/vdr/vdr-2.4.1_replace_stime.patch

Difference in files: diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc index bf00e4140..7f0359dbc 100644 --- a/config/rootfiles/common/aarch64/glibc +++ b/config/rootfiles/common/aarch64/glibc @@ -1,47 +1,47 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.29.so +lib/ld-2.31.so lib/ld-linux-aarch64.so.1 -lib/libBrokenLocale-2.29.so +lib/libBrokenLocale-2.31.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.29.so +lib/libanl-2.31.so lib/libanl.so.1 -lib/libc-2.29.so +lib/libc-2.31.so lib/libc.so.6 -lib/libcrypt-2.29.so +lib/libcrypt-2.31.so lib/libcrypt.so.1 -lib/libdl-2.29.so +lib/libdl-2.31.so lib/libdl.so.2 -lib/libm-2.29.so +lib/libm-2.31.so lib/libm.so.6 #lib/libmemusage.so -lib/libnsl-2.29.so +lib/libnsl-2.31.so lib/libnsl.so.1 -lib/libnss_compat-2.29.so +lib/libnss_compat-2.31.so lib/libnss_compat.so.2 -lib/libnss_db-2.29.so +lib/libnss_db-2.31.so lib/libnss_db.so.2 -lib/libnss_dns-2.29.so +lib/libnss_dns-2.31.so lib/libnss_dns.so.2 -lib/libnss_files-2.29.so +lib/libnss_files-2.31.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.29.so +lib/libnss_hesiod-2.31.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.29.so +lib/libnss_nis-2.31.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.29.so +lib/libnss_nisplus-2.31.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.29.so +lib/libpthread-2.31.so lib/libpthread.so.0 -lib/libresolv-2.29.so +lib/libresolv-2.31.so lib/libresolv.so.2 -lib/librt-2.29.so +lib/librt-2.31.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.29.so +lib/libutil-2.31.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -79,17 +79,22 @@ usr/bin/locale #usr/include/assert.h #usr/include/bits #usr/include/bits/a.out.h +#usr/include/bits/argp-ldbl.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h +#usr/include/bits/dirent_ext.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h +#usr/include/bits/endianness.h #usr/include/bits/environments.h #usr/include/bits/epoll.h +#usr/include/bits/err-ldbl.h #usr/include/bits/errno.h +#usr/include/bits/error-ldbl.h #usr/include/bits/error.h #usr/include/bits/eventfd.h #usr/include/bits/fcntl-linux.h @@ -112,6 +117,7 @@ usr/bin/locale #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h #usr/include/bits/ioctls.h +#usr/include/bits/ipc-perm.h #usr/include/bits/ipc.h #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h @@ -121,7 +127,6 @@ usr/bin/locale #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h -#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 @@ -170,12 +175,14 @@ usr/bin/locale #usr/include/bits/siginfo-arch.h #usr/include/bits/siginfo-consts-arch.h #usr/include/bits/siginfo-consts.h +#usr/include/bits/signal_ext.h #usr/include/bits/signalfd.h #usr/include/bits/signum-generic.h #usr/include/bits/signum.h #usr/include/bits/sigstack.h #usr/include/bits/sigthread.h #usr/include/bits/sockaddr.h +#usr/include/bits/socket-constants.h #usr/include/bits/socket.h #usr/include/bits/socket2.h #usr/include/bits/socket_type.h @@ -184,6 +191,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx-generic.h #usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h @@ -197,7 +205,8 @@ usr/bin/locale #usr/include/bits/stdlib.h #usr/include/bits/string_fortified.h #usr/include/bits/strings_fortified.h -#usr/include/bits/stropts.h +#usr/include/bits/struct_mutex.h +#usr/include/bits/struct_rwlock.h #usr/include/bits/sys_errlist.h #usr/include/bits/syscall.h #usr/include/bits/sysctl.h @@ -251,6 +260,8 @@ usr/bin/locale #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_statx.h +#usr/include/bits/types/struct_statx_timestamp.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h #usr/include/bits/types/struct_tm.h @@ -262,6 +273,7 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h +#usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -273,7 +285,6 @@ usr/bin/locale #usr/include/bits/wctype-wchar.h #usr/include/bits/wordsize.h #usr/include/bits/xopen_lim.h -#usr/include/bits/xtitypes.h #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h @@ -291,6 +302,8 @@ usr/bin/locale #usr/include/fcntl.h #usr/include/features.h #usr/include/fenv.h +#usr/include/finclude +#usr/include/finclude/math-vector-fortran.h #usr/include/fmtmsg.h #usr/include/fnmatch.h #usr/include/fpu_control.h @@ -467,7 +480,6 @@ usr/bin/locale #usr/include/stdlib.h #usr/include/string.h #usr/include/strings.h -#usr/include/stropts.h #usr/include/sys #usr/include/sys/acct.h #usr/include/sys/auxv.h @@ -484,6 +496,7 @@ usr/bin/locale #usr/include/sys/fsuid.h #usr/include/sys/gmon.h #usr/include/sys/gmon_out.h +#usr/include/sys/ifunc.h #usr/include/sys/inotify.h #usr/include/sys/ioctl.h #usr/include/sys/ipc.h @@ -519,7 +532,6 @@ usr/bin/locale #usr/include/sys/stat.h #usr/include/sys/statfs.h #usr/include/sys/statvfs.h -#usr/include/sys/stropts.h #usr/include/sys/swap.h #usr/include/sys/syscall.h #usr/include/sys/sysctl.h @@ -5437,6 +5449,20 @@ usr/lib/locale #usr/lib/locale/mni_IN/LC_PAPER #usr/lib/locale/mni_IN/LC_TELEPHONE #usr/lib/locale/mni_IN/LC_TIME +#usr/lib/locale/mnw_MM +#usr/lib/locale/mnw_MM/LC_ADDRESS +#usr/lib/locale/mnw_MM/LC_COLLATE +#usr/lib/locale/mnw_MM/LC_CTYPE +#usr/lib/locale/mnw_MM/LC_IDENTIFICATION +#usr/lib/locale/mnw_MM/LC_MEASUREMENT +#usr/lib/locale/mnw_MM/LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MONETARY +#usr/lib/locale/mnw_MM/LC_NAME +#usr/lib/locale/mnw_MM/LC_NUMERIC +#usr/lib/locale/mnw_MM/LC_PAPER +#usr/lib/locale/mnw_MM/LC_TELEPHONE +#usr/lib/locale/mnw_MM/LC_TIME #usr/lib/locale/mr_IN #usr/lib/locale/mr_IN/LC_ADDRESS #usr/lib/locale/mr_IN/LC_COLLATE @@ -8141,6 +8167,7 @@ usr/lib/locale #usr/share/i18n/locales/ml_IN #usr/share/i18n/locales/mn_MN #usr/share/i18n/locales/mni_IN +#usr/share/i18n/locales/mnw_MM #usr/share/i18n/locales/mr_IN #usr/share/i18n/locales/ms_MY #usr/share/i18n/locales/mt_MT @@ -8362,6 +8389,9 @@ usr/lib/locale #usr/share/locale/pl #usr/share/locale/pl/LC_MESSAGES #usr/share/locale/pl/LC_MESSAGES/libc.mo +#usr/share/locale/pt +#usr/share/locale/pt/LC_MESSAGES +#usr/share/locale/pt/LC_MESSAGES/libc.mo #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 20f90134d..6c63154e3 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -1,47 +1,47 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.29.so +lib/ld-2.31.so lib/ld-linux.so.3 -lib/libBrokenLocale-2.29.so +lib/libBrokenLocale-2.31.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.29.so +lib/libanl-2.31.so lib/libanl.so.1 -lib/libc-2.29.so +lib/libc-2.31.so lib/libc.so.6 -lib/libcrypt-2.29.so +lib/libcrypt-2.31.so lib/libcrypt.so.1 -lib/libdl-2.29.so +lib/libdl-2.31.so lib/libdl.so.2 -lib/libm-2.29.so +lib/libm-2.31.so lib/libm.so.6 #lib/libmemusage.so -lib/libnsl-2.29.so +lib/libnsl-2.31.so lib/libnsl.so.1 -lib/libnss_compat-2.29.so +lib/libnss_compat-2.31.so lib/libnss_compat.so.2 -lib/libnss_db-2.29.so +lib/libnss_db-2.31.so lib/libnss_db.so.2 -lib/libnss_dns-2.29.so +lib/libnss_dns-2.31.so lib/libnss_dns.so.2 -lib/libnss_files-2.29.so +lib/libnss_files-2.31.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.29.so +lib/libnss_hesiod-2.31.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.29.so +lib/libnss_nis-2.31.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.29.so +lib/libnss_nisplus-2.31.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.29.so +lib/libpthread-2.31.so lib/libpthread.so.0 -lib/libresolv-2.29.so +lib/libresolv-2.31.so lib/libresolv.so.2 -lib/librt-2.29.so +lib/librt-2.31.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.29.so +lib/libutil-2.31.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -79,17 +79,22 @@ usr/bin/locale #usr/include/assert.h #usr/include/bits #usr/include/bits/a.out.h +#usr/include/bits/argp-ldbl.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h +#usr/include/bits/dirent_ext.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h +#usr/include/bits/endianness.h #usr/include/bits/environments.h #usr/include/bits/epoll.h +#usr/include/bits/err-ldbl.h #usr/include/bits/errno.h +#usr/include/bits/error-ldbl.h #usr/include/bits/error.h #usr/include/bits/eventfd.h #usr/include/bits/fcntl-linux.h @@ -112,6 +117,7 @@ usr/bin/locale #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h #usr/include/bits/ioctls.h +#usr/include/bits/ipc-perm.h #usr/include/bits/ipc.h #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h @@ -121,7 +127,6 @@ usr/bin/locale #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h -#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 @@ -170,12 +175,14 @@ usr/bin/locale #usr/include/bits/siginfo-arch.h #usr/include/bits/siginfo-consts-arch.h #usr/include/bits/siginfo-consts.h +#usr/include/bits/signal_ext.h #usr/include/bits/signalfd.h #usr/include/bits/signum-generic.h #usr/include/bits/signum.h #usr/include/bits/sigstack.h #usr/include/bits/sigthread.h #usr/include/bits/sockaddr.h +#usr/include/bits/socket-constants.h #usr/include/bits/socket.h #usr/include/bits/socket2.h #usr/include/bits/socket_type.h @@ -184,6 +191,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx-generic.h #usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h @@ -197,7 +205,8 @@ usr/bin/locale #usr/include/bits/stdlib.h #usr/include/bits/string_fortified.h #usr/include/bits/strings_fortified.h -#usr/include/bits/stropts.h +#usr/include/bits/struct_mutex.h +#usr/include/bits/struct_rwlock.h #usr/include/bits/sys_errlist.h #usr/include/bits/syscall.h #usr/include/bits/sysctl.h @@ -251,6 +260,8 @@ usr/bin/locale #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_statx.h +#usr/include/bits/types/struct_statx_timestamp.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h #usr/include/bits/types/struct_tm.h @@ -262,6 +273,7 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h +#usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -273,7 +285,6 @@ usr/bin/locale #usr/include/bits/wctype-wchar.h #usr/include/bits/wordsize.h #usr/include/bits/xopen_lim.h -#usr/include/bits/xtitypes.h #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h @@ -291,6 +302,8 @@ usr/bin/locale #usr/include/fcntl.h #usr/include/features.h #usr/include/fenv.h +#usr/include/finclude +#usr/include/finclude/math-vector-fortran.h #usr/include/fmtmsg.h #usr/include/fnmatch.h #usr/include/fpu_control.h @@ -467,7 +480,6 @@ usr/bin/locale #usr/include/stdlib.h #usr/include/string.h #usr/include/strings.h -#usr/include/stropts.h #usr/include/sys #usr/include/sys/acct.h #usr/include/sys/auxv.h @@ -485,7 +497,6 @@ usr/bin/locale #usr/include/sys/gmon.h #usr/include/sys/gmon_out.h #usr/include/sys/inotify.h -#usr/include/sys/io.h #usr/include/sys/ioctl.h #usr/include/sys/ipc.h #usr/include/sys/kd.h @@ -520,7 +531,6 @@ usr/bin/locale #usr/include/sys/stat.h #usr/include/sys/statfs.h #usr/include/sys/statvfs.h -#usr/include/sys/stropts.h #usr/include/sys/swap.h #usr/include/sys/syscall.h #usr/include/sys/sysctl.h @@ -5441,6 +5451,20 @@ usr/lib/locale #usr/lib/locale/mni_IN/LC_PAPER #usr/lib/locale/mni_IN/LC_TELEPHONE #usr/lib/locale/mni_IN/LC_TIME +#usr/lib/locale/mnw_MM +#usr/lib/locale/mnw_MM/LC_ADDRESS +#usr/lib/locale/mnw_MM/LC_COLLATE +#usr/lib/locale/mnw_MM/LC_CTYPE +#usr/lib/locale/mnw_MM/LC_IDENTIFICATION +#usr/lib/locale/mnw_MM/LC_MEASUREMENT +#usr/lib/locale/mnw_MM/LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MONETARY +#usr/lib/locale/mnw_MM/LC_NAME +#usr/lib/locale/mnw_MM/LC_NUMERIC +#usr/lib/locale/mnw_MM/LC_PAPER +#usr/lib/locale/mnw_MM/LC_TELEPHONE +#usr/lib/locale/mnw_MM/LC_TIME #usr/lib/locale/mr_IN #usr/lib/locale/mr_IN/LC_ADDRESS #usr/lib/locale/mr_IN/LC_COLLATE @@ -8145,6 +8169,7 @@ usr/lib/locale #usr/share/i18n/locales/ml_IN #usr/share/i18n/locales/mn_MN #usr/share/i18n/locales/mni_IN +#usr/share/i18n/locales/mnw_MM #usr/share/i18n/locales/mr_IN #usr/share/i18n/locales/ms_MY #usr/share/i18n/locales/mt_MT @@ -8366,6 +8391,9 @@ usr/lib/locale #usr/share/locale/pl #usr/share/locale/pl/LC_MESSAGES #usr/share/locale/pl/LC_MESSAGES/libc.mo +#usr/share/locale/pt +#usr/share/locale/pt/LC_MESSAGES +#usr/share/locale/pt/LC_MESSAGES/libc.mo #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index a21225297..e5afe3c88 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -1,47 +1,47 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.29.so +lib/ld-2.31.so lib/ld-linux.so.2 -lib/libBrokenLocale-2.29.so +lib/libBrokenLocale-2.31.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.29.so +lib/libanl-2.31.so lib/libanl.so.1 -lib/libc-2.29.so +lib/libc-2.31.so lib/libc.so.6 -lib/libcrypt-2.29.so +lib/libcrypt-2.31.so lib/libcrypt.so.1 -lib/libdl-2.29.so +lib/libdl-2.31.so lib/libdl.so.2 -lib/libm-2.29.so +lib/libm-2.31.so lib/libm.so.6 #lib/libmemusage.so -lib/libnsl-2.29.so +lib/libnsl-2.31.so lib/libnsl.so.1 -lib/libnss_compat-2.29.so +lib/libnss_compat-2.31.so lib/libnss_compat.so.2 -lib/libnss_db-2.29.so +lib/libnss_db-2.31.so lib/libnss_db.so.2 -lib/libnss_dns-2.29.so +lib/libnss_dns-2.31.so lib/libnss_dns.so.2 -lib/libnss_files-2.29.so +lib/libnss_files-2.31.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.29.so +lib/libnss_hesiod-2.31.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.29.so +lib/libnss_nis-2.31.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.29.so +lib/libnss_nisplus-2.31.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.29.so +lib/libpthread-2.31.so lib/libpthread.so.0 -lib/libresolv-2.29.so +lib/libresolv-2.31.so lib/libresolv.so.2 -lib/librt-2.29.so +lib/librt-2.31.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.29.so +lib/libutil-2.31.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -80,17 +80,22 @@ usr/bin/locale #usr/include/assert.h #usr/include/bits #usr/include/bits/a.out.h +#usr/include/bits/argp-ldbl.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h +#usr/include/bits/dirent_ext.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h +#usr/include/bits/endianness.h #usr/include/bits/environments.h #usr/include/bits/epoll.h +#usr/include/bits/err-ldbl.h #usr/include/bits/errno.h +#usr/include/bits/error-ldbl.h #usr/include/bits/error.h #usr/include/bits/eventfd.h #usr/include/bits/fcntl-linux.h @@ -113,6 +118,7 @@ usr/bin/locale #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h #usr/include/bits/ioctls.h +#usr/include/bits/ipc-perm.h #usr/include/bits/ipc.h #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h @@ -122,7 +128,6 @@ usr/bin/locale #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h -#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 @@ -171,12 +176,14 @@ usr/bin/locale #usr/include/bits/siginfo-arch.h #usr/include/bits/siginfo-consts-arch.h #usr/include/bits/siginfo-consts.h +#usr/include/bits/signal_ext.h #usr/include/bits/signalfd.h #usr/include/bits/signum-generic.h #usr/include/bits/signum.h #usr/include/bits/sigstack.h #usr/include/bits/sigthread.h #usr/include/bits/sockaddr.h +#usr/include/bits/socket-constants.h #usr/include/bits/socket.h #usr/include/bits/socket2.h #usr/include/bits/socket_type.h @@ -185,6 +192,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx-generic.h #usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h @@ -198,7 +206,8 @@ usr/bin/locale #usr/include/bits/stdlib.h #usr/include/bits/string_fortified.h #usr/include/bits/strings_fortified.h -#usr/include/bits/stropts.h +#usr/include/bits/struct_mutex.h +#usr/include/bits/struct_rwlock.h #usr/include/bits/sys_errlist.h #usr/include/bits/syscall.h #usr/include/bits/sysctl.h @@ -252,6 +261,8 @@ usr/bin/locale #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_statx.h +#usr/include/bits/types/struct_statx_timestamp.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h #usr/include/bits/types/struct_tm.h @@ -263,6 +274,7 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h +#usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -274,7 +286,6 @@ usr/bin/locale #usr/include/bits/wctype-wchar.h #usr/include/bits/wordsize.h #usr/include/bits/xopen_lim.h -#usr/include/bits/xtitypes.h #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h @@ -292,6 +303,8 @@ usr/bin/locale #usr/include/fcntl.h #usr/include/features.h #usr/include/fenv.h +#usr/include/finclude +#usr/include/finclude/math-vector-fortran.h #usr/include/fmtmsg.h #usr/include/fnmatch.h #usr/include/fpu_control.h @@ -468,7 +481,6 @@ usr/bin/locale #usr/include/stdlib.h #usr/include/string.h #usr/include/strings.h -#usr/include/stropts.h #usr/include/sys #usr/include/sys/acct.h #usr/include/sys/auxv.h @@ -524,7 +536,6 @@ usr/bin/locale #usr/include/sys/stat.h #usr/include/sys/statfs.h #usr/include/sys/statvfs.h -#usr/include/sys/stropts.h #usr/include/sys/swap.h #usr/include/sys/syscall.h #usr/include/sys/sysctl.h @@ -5446,6 +5457,20 @@ usr/lib/locale #usr/lib/locale/mni_IN/LC_PAPER #usr/lib/locale/mni_IN/LC_TELEPHONE #usr/lib/locale/mni_IN/LC_TIME +#usr/lib/locale/mnw_MM +#usr/lib/locale/mnw_MM/LC_ADDRESS +#usr/lib/locale/mnw_MM/LC_COLLATE +#usr/lib/locale/mnw_MM/LC_CTYPE +#usr/lib/locale/mnw_MM/LC_IDENTIFICATION +#usr/lib/locale/mnw_MM/LC_MEASUREMENT +#usr/lib/locale/mnw_MM/LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MONETARY +#usr/lib/locale/mnw_MM/LC_NAME +#usr/lib/locale/mnw_MM/LC_NUMERIC +#usr/lib/locale/mnw_MM/LC_PAPER +#usr/lib/locale/mnw_MM/LC_TELEPHONE +#usr/lib/locale/mnw_MM/LC_TIME #usr/lib/locale/mr_IN #usr/lib/locale/mr_IN/LC_ADDRESS #usr/lib/locale/mr_IN/LC_COLLATE @@ -8150,6 +8175,7 @@ usr/lib/locale #usr/share/i18n/locales/ml_IN #usr/share/i18n/locales/mn_MN #usr/share/i18n/locales/mni_IN +#usr/share/i18n/locales/mnw_MM #usr/share/i18n/locales/mr_IN #usr/share/i18n/locales/ms_MY #usr/share/i18n/locales/mt_MT @@ -8371,6 +8397,9 @@ usr/lib/locale #usr/share/locale/pl #usr/share/locale/pl/LC_MESSAGES #usr/share/locale/pl/LC_MESSAGES/libc.mo +#usr/share/locale/pt +#usr/share/locale/pt/LC_MESSAGES +#usr/share/locale/pt/LC_MESSAGES/libc.mo #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc index 5afb201a8..f2d142375 100644 --- a/config/rootfiles/common/x86_64/glibc +++ b/config/rootfiles/common/x86_64/glibc @@ -1,49 +1,49 @@ #etc/ld.so.cache etc/rpc -lib/ld-2.29.so +lib/ld-2.31.so lib/ld-linux-x86-64.so.2 -lib/libBrokenLocale-2.29.so +lib/libBrokenLocale-2.31.so lib/libBrokenLocale.so.1 #lib/libSegFault.so -lib/libanl-2.29.so +lib/libanl-2.31.so lib/libanl.so.1 -lib/libc-2.29.so +lib/libc-2.31.so lib/libc.so.6 -lib/libcrypt-2.29.so +lib/libcrypt-2.31.so lib/libcrypt.so.1 -lib/libdl-2.29.so +lib/libdl-2.31.so lib/libdl.so.2 -lib/libm-2.29.so +lib/libm-2.31.so lib/libm.so.6 #lib/libmemusage.so -lib/libmvec-2.29.so +lib/libmvec-2.31.so lib/libmvec.so.1 -lib/libnsl-2.29.so +lib/libnsl-2.31.so lib/libnsl.so.1 -lib/libnss_compat-2.29.so +lib/libnss_compat-2.31.so lib/libnss_compat.so.2 -lib/libnss_db-2.29.so +lib/libnss_db-2.31.so lib/libnss_db.so.2 -lib/libnss_dns-2.29.so +lib/libnss_dns-2.31.so lib/libnss_dns.so.2 -lib/libnss_files-2.29.so +lib/libnss_files-2.31.so lib/libnss_files.so.2 -lib/libnss_hesiod-2.29.so +lib/libnss_hesiod-2.31.so lib/libnss_hesiod.so.2 -lib/libnss_nis-2.29.so +lib/libnss_nis-2.31.so lib/libnss_nis.so.2 -lib/libnss_nisplus-2.29.so +lib/libnss_nisplus-2.31.so lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.29.so +lib/libpthread-2.31.so lib/libpthread.so.0 -lib/libresolv-2.29.so +lib/libresolv-2.31.so lib/libresolv.so.2 -lib/librt-2.29.so +lib/librt-2.31.so lib/librt.so.1 lib/libthread_db-1.0.so lib/libthread_db.so.1 -lib/libutil-2.29.so +lib/libutil-2.31.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -81,17 +81,22 @@ usr/bin/locale #usr/include/assert.h #usr/include/bits #usr/include/bits/a.out.h +#usr/include/bits/argp-ldbl.h #usr/include/bits/byteswap.h #usr/include/bits/cmathcalls.h #usr/include/bits/confname.h #usr/include/bits/cpu-set.h #usr/include/bits/dirent.h +#usr/include/bits/dirent_ext.h #usr/include/bits/dlfcn.h #usr/include/bits/elfclass.h #usr/include/bits/endian.h +#usr/include/bits/endianness.h #usr/include/bits/environments.h #usr/include/bits/epoll.h +#usr/include/bits/err-ldbl.h #usr/include/bits/errno.h +#usr/include/bits/error-ldbl.h #usr/include/bits/error.h #usr/include/bits/eventfd.h #usr/include/bits/fcntl-linux.h @@ -114,6 +119,7 @@ usr/bin/locale #usr/include/bits/inotify.h #usr/include/bits/ioctl-types.h #usr/include/bits/ioctls.h +#usr/include/bits/ipc-perm.h #usr/include/bits/ipc.h #usr/include/bits/ipctypes.h #usr/include/bits/iscanonical.h @@ -123,7 +129,6 @@ usr/bin/locale #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/long-double.h -#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 @@ -172,12 +177,14 @@ usr/bin/locale #usr/include/bits/siginfo-arch.h #usr/include/bits/siginfo-consts-arch.h #usr/include/bits/siginfo-consts.h +#usr/include/bits/signal_ext.h #usr/include/bits/signalfd.h #usr/include/bits/signum-generic.h #usr/include/bits/signum.h #usr/include/bits/sigstack.h #usr/include/bits/sigthread.h #usr/include/bits/sockaddr.h +#usr/include/bits/socket-constants.h #usr/include/bits/socket.h #usr/include/bits/socket2.h #usr/include/bits/socket_type.h @@ -186,6 +193,7 @@ usr/bin/locale #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/statx-generic.h #usr/include/bits/statx.h #usr/include/bits/stdint-intn.h #usr/include/bits/stdint-uintn.h @@ -199,7 +207,8 @@ usr/bin/locale #usr/include/bits/stdlib.h #usr/include/bits/string_fortified.h #usr/include/bits/strings_fortified.h -#usr/include/bits/stropts.h +#usr/include/bits/struct_mutex.h +#usr/include/bits/struct_rwlock.h #usr/include/bits/sys_errlist.h #usr/include/bits/syscall.h #usr/include/bits/sysctl.h @@ -253,6 +262,8 @@ usr/bin/locale #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_statx.h +#usr/include/bits/types/struct_statx_timestamp.h #usr/include/bits/types/struct_timespec.h #usr/include/bits/types/struct_timeval.h #usr/include/bits/types/struct_tm.h @@ -264,6 +275,7 @@ usr/bin/locale #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h #usr/include/bits/unistd.h +#usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h @@ -275,7 +287,6 @@ usr/bin/locale #usr/include/bits/wctype-wchar.h #usr/include/bits/wordsize.h #usr/include/bits/xopen_lim.h -#usr/include/bits/xtitypes.h #usr/include/byteswap.h #usr/include/complex.h #usr/include/cpio.h @@ -293,6 +304,8 @@ usr/bin/locale #usr/include/fcntl.h #usr/include/features.h #usr/include/fenv.h +#usr/include/finclude +#usr/include/finclude/math-vector-fortran.h #usr/include/fmtmsg.h #usr/include/fnmatch.h #usr/include/fpu_control.h @@ -469,7 +482,6 @@ usr/bin/locale #usr/include/stdlib.h #usr/include/string.h #usr/include/strings.h -#usr/include/stropts.h #usr/include/sys #usr/include/sys/acct.h #usr/include/sys/auxv.h @@ -525,7 +537,6 @@ usr/bin/locale #usr/include/sys/stat.h #usr/include/sys/statfs.h #usr/include/sys/statvfs.h -#usr/include/sys/stropts.h #usr/include/sys/swap.h #usr/include/sys/syscall.h #usr/include/sys/sysctl.h @@ -857,13 +868,12 @@ usr/lib/gconv #usr/lib/libdl.a #usr/lib/libdl.so #usr/lib/libg.a -#usr/lib/libm-2.29.a +#usr/lib/libm-2.31.a #usr/lib/libm.a #usr/lib/libm.so #usr/lib/libmcheck.a #usr/lib/libmvec.a #usr/lib/libmvec.so -#usr/lib/libmvec_nonshared.a #usr/lib/libnsl.a #usr/lib/libnsl.so #usr/lib/libnss_compat.so @@ -5448,6 +5458,20 @@ usr/lib/locale #usr/lib/locale/mni_IN/LC_PAPER #usr/lib/locale/mni_IN/LC_TELEPHONE #usr/lib/locale/mni_IN/LC_TIME +#usr/lib/locale/mnw_MM +#usr/lib/locale/mnw_MM/LC_ADDRESS +#usr/lib/locale/mnw_MM/LC_COLLATE +#usr/lib/locale/mnw_MM/LC_CTYPE +#usr/lib/locale/mnw_MM/LC_IDENTIFICATION +#usr/lib/locale/mnw_MM/LC_MEASUREMENT +#usr/lib/locale/mnw_MM/LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MESSAGES/SYS_LC_MESSAGES +#usr/lib/locale/mnw_MM/LC_MONETARY +#usr/lib/locale/mnw_MM/LC_NAME +#usr/lib/locale/mnw_MM/LC_NUMERIC +#usr/lib/locale/mnw_MM/LC_PAPER +#usr/lib/locale/mnw_MM/LC_TELEPHONE +#usr/lib/locale/mnw_MM/LC_TIME #usr/lib/locale/mr_IN #usr/lib/locale/mr_IN/LC_ADDRESS #usr/lib/locale/mr_IN/LC_COLLATE @@ -8152,6 +8176,7 @@ usr/lib/locale #usr/share/i18n/locales/ml_IN #usr/share/i18n/locales/mn_MN #usr/share/i18n/locales/mni_IN +#usr/share/i18n/locales/mnw_MM #usr/share/i18n/locales/mr_IN #usr/share/i18n/locales/ms_MY #usr/share/i18n/locales/mt_MT @@ -8373,6 +8398,9 @@ usr/lib/locale #usr/share/locale/pl #usr/share/locale/pl/LC_MESSAGES #usr/share/locale/pl/LC_MESSAGES/libc.mo +#usr/share/locale/pt +#usr/share/locale/pt/LC_MESSAGES +#usr/share/locale/pt/LC_MESSAGES/libc.mo #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo diff --git a/config/rootfiles/core/143/filelists/aarch64/glibc b/config/rootfiles/core/143/filelists/aarch64/glibc new file mode 120000 index 000000000..d13849ff9 --- /dev/null +++ b/config/rootfiles/core/143/filelists/aarch64/glibc @@ -0,0 +1 @@ +../../../../common/aarch64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/143/filelists/armv5tel/glibc b/config/rootfiles/core/143/filelists/armv5tel/glibc new file mode 120000 index 000000000..4c70d724b --- /dev/null +++ b/config/rootfiles/core/143/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/143/filelists/i586/glibc b/config/rootfiles/core/143/filelists/i586/glibc new file mode 120000 index 000000000..943021f19 --- /dev/null +++ b/config/rootfiles/core/143/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/143/filelists/x86_64/glibc b/config/rootfiles/core/143/filelists/x86_64/glibc new file mode 120000 index 000000000..111909966 --- /dev/null +++ b/config/rootfiles/core/143/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/143/update.sh b/config/rootfiles/core/143/update.sh index 1ac50f514..092b9c399 100644 --- a/config/rootfiles/core/143/update.sh +++ b/config/rootfiles/core/143/update.sh @@ -59,6 +59,9 @@ extract_files # update linker config ldconfig

+# restart init after glibc replace +telinit u + # remove dropped packages for package in bluetooth; do if [ -e /opt/pakfire/db/installed/meta-$package ]; then diff --git a/lfs/glibc b/lfs/glibc index 7d2d0cf65..f9959c6e3 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -24,7 +24,7 @@

include Config

-VER = 2.29 +VER = 2.31

THISAPP = glibc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -93,7 +93,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = e6c279d5b2f0736f740216f152acf974 +$(DL_FILE)_MD5 = 78a720f17412f3c3282be5a6f3363ec6

install : $(TARGET)

diff --git a/lfs/qemu b/lfs/qemu index 8259ff70f..967388ea6 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -78,6 +78,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/qemu-4.1.0-build-fix-glibc-2.31.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-kvm --disable-bluez --disable-attr \ --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ diff --git a/lfs/vdr b/lfs/vdr index d444ae935..d3958fda9 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -37,7 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 10 +PAK_VER = 11

DEPS = "vdr_streamdev"

@@ -98,6 +98,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + # stime was removed from glibc with version 2.31 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr/vdr-2.4.1_replace_stime.patch

# Compile main package. cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir diff --git a/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch b/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch new file mode 100644 index 000000000..37c744d3b --- /dev/null +++ b/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch @@ -0,0 +1,65 @@ +From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 +From: Laurent Vivier laurent@vivier.eu +Date: Tue, 12 Nov 2019 15:25:56 +0100 +Subject: [PATCH] linux-user: remove host stime() syscall + +stime() has been withdrawn from glibc +(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") + +Implement the target stime() syscall using host +clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. + +Tested qemu-ppc/x86_64 with: + + #include <time.h> + #include <stdio.h> + + int main(void) + { + time_t t; + int ret; + + /* date -u -d"2019-11-12T15:11:00" "+%s" */ + t = 1573571460; + ret = stime(&t); + printf("ret %d\n", ret); + return 0; + } + + # date; ./stime; date + Tue Nov 12 14:18:32 UTC 2019 + ret 0 + Tue Nov 12 15:11:00 UTC 2019 + +Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 +Reported-by: Cole Robinson crobinso@redhat.com +Signed-off-by: Laurent Vivier laurent@vivier.eu +Reviewed-by: Peter Maydell peter.maydell@linaro.org +Message-Id: 20191112142556.6335-1-laurent@vivier.eu +--- + linux-user/syscall.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 4e97bcf..ce399a5 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -7764,10 +7764,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, + #ifdef TARGET_NR_stime /* not on alpha */ + case TARGET_NR_stime: + { +- time_t host_time; +- if (get_user_sal(host_time, arg1)) ++ struct timespec ts; ++ ts.tv_nsec = 0; ++ if (get_user_sal(ts.tv_sec, arg1)) { + return -TARGET_EFAULT; +- return get_errno(stime(&host_time)); ++ } ++ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); + } + #endif + #ifdef TARGET_NR_alarm /* not on alpha */ +-- +1.8.3.1 + diff --git a/src/patches/vdr/vdr-2.4.1_replace_stime.patch b/src/patches/vdr/vdr-2.4.1_replace_stime.patch new file mode 100644 index 000000000..e0d1c1def --- /dev/null +++ b/src/patches/vdr/vdr-2.4.1_replace_stime.patch @@ -0,0 +1,47 @@ +From dcfa8ba29f4c95edbdceb0f1bbae0e62fa40c4e2 Mon Sep 17 00:00:00 2001 +From: Manuel Reimer manuel.reimer@gmx.de +Date: Sat, 14 Dec 2019 12:01:13 +0100 +Subject: [PATCH 1/2] Replace obsolete stime() function with clock_settime() + +--- + eit.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/eit.c b/eit.c +index 50d8229..82294dc 100644 +--- a/eit.c ++++ b/eit.c +@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) + if (abs(diff) > MAX_TIME_DIFF) { + mutex.Lock(); + if (abs(diff) > MAX_ADJ_DIFF) { +- if (stime(&dvbtim) == 0) ++ timespec ts = {0}; ++ ts.tv_sec = dvbtim; ++ if (clock_settime(CLOCK_REALTIME, &ts) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + else + esyslog("ERROR while setting system time: %m"); + +From 3395a81a07416f54b0aa94ba709b902d72dacce7 Mon Sep 17 00:00:00 2001 +From: Manuel Reimer manuel.reimer@gmx.de +Date: Sun, 15 Dec 2019 11:26:42 +0100 +Subject: [PATCH 2/2] Fix "struct timespec has more than one member" warning + +--- + eit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eit.c b/eit.c +index 82294dc..098e627 100644 +--- a/eit.c ++++ b/eit.c +@@ -391,7 +391,7 @@ cTDT::cTDT(const u_char *Data) + if (abs(diff) > MAX_TIME_DIFF) { + mutex.Lock(); + if (abs(diff) > MAX_ADJ_DIFF) { +- timespec ts = {0}; ++ timespec ts = {}; + ts.tv_sec = dvbtim; + if (clock_settime(CLOCK_REALTIME, &ts) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);

hooks/post-receive -- IPFire 2.x development tree