package/glibc: bump to 2.39

The 3 patches we had have all been merged upstream as of 2.39, so they
can be dropped.

The libcrypt library is gone from glibc, and therefore the
--enable-crypt option is also gone.

The LICENSES file has changed with the addition of a copyright notice
from IBM (some files contributed by IBM have been relicensed), and the
license is MIT, which is already listed in GLIBC_LICENSES, so no
changes are needed on our side.

Signed-off-by: Thomas Petazzoni <[email protected]>
[[email protected]:
  - also update localedef
  - rebase localedef patches
]
Signed-off-by: Yann E. MORIN <[email protected]>

package/glibc/glibc.hash

@@ -1,7 +1,7 @@
 # Locally calculated (fetched from Github)
-sha256  e38f4284d6909c6b5db7d79c6e450daeaf136a67e547290eec0b063a55eaaa42  glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0.tar.gz
+sha256  2ba018b344e0e8330dcadd6130f4174f0fc2502b2e032210345e0e5a2f7ed12e  glibc-2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
-sha256  b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc  LICENSES
+sha256  bba29819a3e938fae92674d6a88533e10605e389da8b51cdcba0a94f6221c5bc  LICENSES

package/glibc/glibc.mk

@@ -7,7 +7,7 @@
 # Generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
 # When updating the version, please also update localedef
-GLIBC_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0
+GLIBC_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e
 # Upstream doesn't officially provide an https download link.
 # There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
 # sometimes the connection times out. So use an unofficial github mirror.
@@ -195,7 +195,6 @@ define GLIBC_CONFIGURE_CMDS
 		--without-gd \
 		--with-headers=$(STAGING_DIR)/usr/include \
 		$(if $(BR2_aarch64)$(BR2_aarch64_be),--enable-mathvec) \
-		--enable-crypt \
 		$(GLIBC_CONF_OPTS))
 	$(GLIBC_ADD_MISSING_STUB_H)
 endef
@@ -206,7 +205,7 @@ endef
 #
 
 GLIBC_LIBS_LIB = \
-	ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \
+	ld*.so.* libanl.so.* libc.so.* libdl.so.* libgcc_s.so.* \
 	libm.so.* libpthread.so.* libresolv.so.* librt.so.* \
 	libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.*
 

package/localedef/0001-HACK-only-build-and-install-localedef.patch

@@ -9,6 +9,8 @@ Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-
 Signed-off-by: Peter Seiderer <[email protected]>
 [Romain: rebase on 2.38]
 Signed-off-by: Romain Naour <[email protected]>
+[[email protected]: rebase for 2.39]
+Signed-off-by: Yann E. MORIN <[email protected]>
 ---
  Rules           | 14 ++++++++++----
  locale/Makefile |  6 +++---
@@ -20,7 +22,7 @@ index 279ae490ac..1321956be6 100644
 +++ b/Rules
 @@ -221,10 +221,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
  				       $(binaries-all-notests))
- 
+
  ifneq "$(strip $(binaries-shared-notests))" ""
 -$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \
 -  $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
@@ -37,31 +39,36 @@ index 279ae490ac..1321956be6 100644
 +			   $(common-objpfx)libc% $(+postinit),$^) \
 +	      $(link-extra-libs)
  endif
- 
+
  ifneq "$(strip $(binaries-shared-tests))" ""
 diff --git a/locale/Makefile b/locale/Makefile
 index d7036b0855..68afdddc7f 100644
 --- a/locale/Makefile
 +++ b/locale/Makefile
-@@ -33,15 +33,15 @@ categories	= ctype messages monetary numeric time paper name \
- 		  address telephone measurement identification collate
- aux		= $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
- 		  xlocale localename global-locale coll-lookup
--others		= localedef locale
-+others		= localedef
- #others-static	= localedef locale
--install-bin	= localedef locale
-+install-bin	= localedef
- extra-objs	= $(localedef-modules:=.o) $(localedef-aux:=.o) \
- 		  $(locale-modules:=.o) $(lib-modules:=.o)
- generated 	+= C-translit.h
- before-compile	+= $(objpfx)C-translit.h
-
--extra-libs	= libBrokenLocale
-+#extra-libs	= libBrokenLocale
+@@ -76,7 +76,6 @@
+   xlocale \
+   # aux
+ others = \
+-  locale \
+   localedef \
+   # others
+ #others-static = \
+@@ -84,7 +83,6 @@
+ # locale \
+ # # others-static
+ install-bin = \
+-  locale \
+   localedef \
+   # install-bin
+ extra-objs = \
+@@ -96,7 +94,6 @@
+ generated += C-translit.h
+ before-compile += $(objpfx)C-translit.h
+
+-extra-libs = libBrokenLocale
  extra-libs-others = $(extra-libs)
- 
+
  libBrokenLocale-routines = broken_cur_max
--- 
+--
 2.41.0
 

package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch

@@ -28,6 +28,8 @@ Signed-off-by: Matthew Weber <[email protected]>
 Signed-off-by: Yann E. MORIN <[email protected]>
 [Romain: rebase on 2.38]
 Signed-off-by: Romain Naour <[email protected]>
+[[email protected]: rebase for 2.39]
+Signed-off-by: Yann E. MORIN <[email protected]>
 ---
  configure | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -36,24 +38,24 @@ diff --git a/configure b/configure
 index 4ef387146d..4c6f91117d 100755
 --- a/configure
 +++ b/configure
-@@ -5293,7 +5293,7 @@ printf %s "checking version of $LD... " >&6; }
+@@ -5157,7 +5157,7 @@ printf %s "checking version of $LD... " >&6; }
    ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
 -    2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*)
 +    2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*)
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5735,7 +5735,7 @@ int
+
+@@ -5599,7 +5599,7 @@ int
  main (void)
  {
- 
+
 -#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2)
 +#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)
  #error insufficient compiler
  #endif
    ;
--- 
+--
 2.41.0
 

package/localedef/localedef.mk

@@ -7,7 +7,7 @@
 # Use the same VERSION and SITE as target glibc
 # As in glibc.mk, generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
-LOCALEDEF_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0
+LOCALEDEF_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e
 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
 LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
 HOST_LOCALEDEF_DL_SUBDIR = glibc