This update builds glibc with FORTIFY_SOURCE and disables building nscd which has been unused in IPFire.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/common/aarch64/glibc | 11 ++++++++++- config/rootfiles/common/riscv64/glibc | 7 ++++++- config/rootfiles/common/x86_64/glibc | 9 +++++++-- lfs/glibc | 11 +++++++---- 4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc index 019ea9cc0..f6cd12331 100644 --- a/config/rootfiles/common/aarch64/glibc +++ b/config/rootfiles/common/aarch64/glibc @@ -8,6 +8,7 @@ lib/libc.so.6 lib/libdl.so.2 lib/libm.so.6 #lib/libmemusage.so +lib/libmvec.so.1 lib/libnsl.so.1 lib/libnss_compat.so.2 lib/libnss_db.so.2 @@ -140,6 +141,7 @@ usr/bin/locale #usr/include/bits/resource.h #usr/include/bits/rseq.h #usr/include/bits/sched.h +#usr/include/bits/select-decl.h #usr/include/bits/select.h #usr/include/bits/select2.h #usr/include/bits/sem.h @@ -191,6 +193,7 @@ usr/bin/locale #usr/include/bits/struct_stat.h #usr/include/bits/struct_stat_time64_helper.h #usr/include/bits/syscall.h +#usr/include/bits/syslog-decl.h #usr/include/bits/syslog-ldbl.h #usr/include/bits/syslog-path.h #usr/include/bits/syslog.h @@ -265,6 +268,7 @@ usr/bin/locale #usr/include/bits/uintn-identity.h #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h +#usr/include/bits/unistd-decl.h #usr/include/bits/unistd.h #usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h @@ -804,9 +808,12 @@ usr/lib/gconv #usr/lib/libc_nonshared.a #usr/lib/libdl.a #usr/lib/libg.a +#usr/lib/libm-2.38.a #usr/lib/libm.a #usr/lib/libm.so #usr/lib/libmcheck.a +#usr/lib/libmvec.a +#usr/lib/libmvec.so #usr/lib/libnss_compat.so #usr/lib/libnss_db.so #usr/lib/libnss_hesiod.so @@ -7693,7 +7700,6 @@ usr/lib/locale #usr/lib/locale/zu_ZA/LC_TIME #usr/lib/rcrt1.o #usr/sbin/iconvconfig -#usr/sbin/nscd #usr/sbin/zic #usr/share/i18n #usr/share/i18n/charmaps @@ -8392,6 +8398,9 @@ usr/lib/locale #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo +#usr/share/locale/ro +#usr/share/locale/ro/LC_MESSAGES +#usr/share/locale/ro/LC_MESSAGES/libc.mo #usr/share/locale/ru #usr/share/locale/ru/LC_MESSAGES #usr/share/locale/ru/LC_MESSAGES/libc.mo diff --git a/config/rootfiles/common/riscv64/glibc b/config/rootfiles/common/riscv64/glibc index fd991b19e..cf1df065a 100644 --- a/config/rootfiles/common/riscv64/glibc +++ b/config/rootfiles/common/riscv64/glibc @@ -140,6 +140,7 @@ usr/bin/locale #usr/include/bits/resource.h #usr/include/bits/rseq.h #usr/include/bits/sched.h +#usr/include/bits/select-decl.h #usr/include/bits/select.h #usr/include/bits/select2.h #usr/include/bits/sem.h @@ -191,6 +192,7 @@ usr/bin/locale #usr/include/bits/struct_stat.h #usr/include/bits/struct_stat_time64_helper.h #usr/include/bits/syscall.h +#usr/include/bits/syslog-decl.h #usr/include/bits/syslog-ldbl.h #usr/include/bits/syslog-path.h #usr/include/bits/syslog.h @@ -265,6 +267,7 @@ usr/bin/locale #usr/include/bits/uintn-identity.h #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h +#usr/include/bits/unistd-decl.h #usr/include/bits/unistd.h #usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h @@ -7691,7 +7694,6 @@ usr/lib/locale #usr/lib/locale/zu_ZA/LC_TELEPHONE #usr/lib/locale/zu_ZA/LC_TIME #usr/sbin/iconvconfig -#usr/sbin/nscd #usr/sbin/zic #usr/share/i18n #usr/share/i18n/charmaps @@ -8390,6 +8392,9 @@ usr/lib/locale #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo +#usr/share/locale/ro +#usr/share/locale/ro/LC_MESSAGES +#usr/share/locale/ro/LC_MESSAGES/libc.mo #usr/share/locale/ru #usr/share/locale/ru/LC_MESSAGES #usr/share/locale/ru/LC_MESSAGES/libc.mo diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc index 8a55a4183..66d310e38 100644 --- a/config/rootfiles/common/x86_64/glibc +++ b/config/rootfiles/common/x86_64/glibc @@ -143,6 +143,7 @@ usr/bin/locale #usr/include/bits/resource.h #usr/include/bits/rseq.h #usr/include/bits/sched.h +#usr/include/bits/select-decl.h #usr/include/bits/select.h #usr/include/bits/select2.h #usr/include/bits/sem.h @@ -194,6 +195,7 @@ usr/bin/locale #usr/include/bits/struct_stat.h #usr/include/bits/struct_stat_time64_helper.h #usr/include/bits/syscall.h +#usr/include/bits/syslog-decl.h #usr/include/bits/syslog-ldbl.h #usr/include/bits/syslog-path.h #usr/include/bits/syslog.h @@ -268,6 +270,7 @@ usr/bin/locale #usr/include/bits/uintn-identity.h #usr/include/bits/uio-ext.h #usr/include/bits/uio_lim.h +#usr/include/bits/unistd-decl.h #usr/include/bits/unistd.h #usr/include/bits/unistd_ext.h #usr/include/bits/utmp.h @@ -813,7 +816,7 @@ usr/lib/gconv #usr/lib/libc_nonshared.a #usr/lib/libdl.a #usr/lib/libg.a -#usr/lib/libm-2.37.a +#usr/lib/libm-2.38.a #usr/lib/libm.a #usr/lib/libm.so #usr/lib/libmcheck.a @@ -7705,7 +7708,6 @@ usr/lib/locale #usr/lib/locale/zu_ZA/LC_TIME #usr/lib/rcrt1.o #usr/sbin/iconvconfig -#usr/sbin/nscd #usr/sbin/zic #usr/share/i18n #usr/share/i18n/charmaps @@ -8404,6 +8406,9 @@ usr/lib/locale #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo +#usr/share/locale/ro +#usr/share/locale/ro/LC_MESSAGES +#usr/share/locale/ro/LC_MESSAGES/libc.mo #usr/share/locale/ru #usr/share/locale/ru/LC_MESSAGES #usr/share/locale/ru/LC_MESSAGES/libc.mo diff --git a/lfs/glibc b/lfs/glibc index 05179fcc9..13f6cf16d 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -24,7 +24,7 @@
include Config
-VER = 2.37 +VER = 2.38
THISAPP = glibc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -56,12 +56,15 @@ endif # Add some general configuration flags EXTRA_CONFIG += \ --disable-profile \ - --enable-kernel=4.14.0 \ + --enable-kernel=5.4.0 \ --enable-add-ons \ --without-selinux \ --enable-experimental-malloc \ --enable-bind-now \ - --disable-crypt + --enable-fortify-source \ + --disable-crypt \ + --disable-build-nscd \ + --disable-nscd
ifeq "$(BUILD_ARCH)" "x86_64" EXTRA_CONFIG += --enable-cet @@ -79,7 +82,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8139cd977b2ed3bfdbde5ffb1cda8f759763dbb83071167272fef798cfbdc0d17cfd1ec893d126c52c91511b7961f3ad12eed34534b99412dfa04a1cdd5b4ea3 +$(DL_FILE)_BLAKE2 = f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4dd89af4d26fa5c4e4cf266f19c2746b44d797ce54739d86499e74cf334aaf311bcf6e30120fd7748453e653f
install : $(TARGET)