From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0BwoGJVNcmXtKQEAauVa8A:P1 (envelope-from ) for ; Thu, 07 Dec 2023 23:56:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0BwoGJVNcmXtKQEAauVa8A (envelope-from ) for ; Thu, 07 Dec 2023 23:56:21 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EAD8C57E45 for ; Thu, 7 Dec 2023 23:56:20 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=klSKgPN4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701989781; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=1cr7OUbH5rWQcrwPnpVw3AyzO3DCWYeAU328iKIflpY=; b=OZ6cR5xLtvchPSXmCflaU2ZFA4USIajMwe+J8F5sC+Jxa7NqLf05KyltPC1ZCHPsyUpK3d uopWqU4PGyFZlihacshz0AWz9SkszigsjnKPv+Su1XiEz7yrzINBXYdKR823GkgkGKASVV Wy+19eo0V4N9g/yWWKBgJD+GYt10jcif86QO+WXJkrgrnMujKTVErdesUHuO5u6yG0BcDE dPGZZqTckmzpzJjDBrfFgpZnz1/nFM1CH/x6VnmynxgulCEc1pUiTtNpIGyZ8TbaQ9w8B6 CLNiqR9dkADobHCcia3F3xwAfJ4ygwfsLNmmQ184GRMrUxLmsLV9votR0g4oZw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701989781; a=rsa-sha256; cv=none; b=htHvEp8ScanKd3FR1S3tajISGZnLNanVm9Ce0tmYMYKOP5igC+uHhD6uzfxDu5psPhfcJL ES5oNluqRqebA3HCw3JJKdaaoLSKaTNCntv0bXuRLm2rB41W9DHsu6S7iJ8oB+DI2PsR2K vRoGR8RetDFnD1p44i1VIi6crn0wFmo6b2laL8Sh78+4xUQW08BId43xWYB0ajrHiCQdT4 qpWH7Fdzl+3j5EiYDkeT9v63jaETOI1lhXJUtyuJhyc7jVKp30PIsFv227Jh1KqmLwZcUO glTCa/vID8DLkdut89SzIVIxUaTFKg2iWzs1dO6m7i6dzHZPojQmV2XZRU7XlQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=klSKgPN4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBNHi-0000ZC-QR; Thu, 07 Dec 2023 17:55:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNHc-0000QE-PF for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBNHb-0002fV-Bd for guix-patches@gnu.org; Thu, 07 Dec 2023 17:55:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBNHn-0006tB-Tl for guix-patches@gnu.org; Thu, 07 Dec 2023 17:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates v2 4/7] DRAFT gnu: glibc: Update to 2.38. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 22:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67686@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170198971526327 (code B ref 67686); Thu, 07 Dec 2023 22:56:03 +0000 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 22:55:15 +0000 Received: from localhost ([127.0.0.1]:43349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNH0-0006qT-6E for submit@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBNGu-0006or-Uf for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 17:55:10 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNGd-0002Jf-2C; Thu, 07 Dec 2023 17:54:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=vcgqI7WrHhxCZsDjAtiU/MmN5Sg7UTDA/sbIjRyHthc=; b=klSKgPN4Z2rCTXtc+xWV lORpxGJMaSY/dQfEbXVmIog4JHRNr3MhkPQdpnqZwNiL9nZMbfK/FfCRBGIJoeNres3Rti//o08oV MfZnDi73LA6AZuxUfaBli1v36C5XMr2kry6BFBGRZUfxsZqKihehOF7Byo1SoFIDRPUtVut9oz5fb g+Y+7EBnv4aLmM7tDMmQRAzGXmCe8PHYOlz2EEik+dKpvue4UyTuCWDufCr3kEuKWsmiChj+C219P RFeFox56OngsUSjcxS9KdrrMr6WLdshBZ+ID9OdYcmnVtGli4q+x8/pU6FfWsDh0TvtlH4MPv3204 vb45nM8DetpyAQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 7 Dec 2023 23:54:07 +0100 Message-ID: <739f88b862b034289764f75e77fa6b438116d767.1701989279.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -5.85 X-Spam-Score: -5.85 X-Migadu-Queue-Id: EAD8C57E45 X-TUID: OQuw0EkZ79jI DRAFT: Two questions: 1. Can we abandon ‘glibc-allow-kernel-2.6.32’ (CentOS 6)? 2. Check cross-compilation. * gnu/packages/patches/glibc-2.38-ldd-x86_64.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc): Update to 2.38. [source]: Adjust list of patches. [arguments]: Add ‘--enable-crypt’. (glibc-2.35): New variable. Change-Id: I040b724c47d2ee5f90f2deb03a4828e79d1bfc4e --- gnu/local.mk | 1 + gnu/packages/base.scm | 47 +++++++++++++++---- .../glibc-2.37-versioned-locpath.patch | 35 +++----------- .../patches/glibc-2.38-ldd-x86_64.patch | 8 ++++ 4 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.38-ldd-x86_64.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce850c9f7e..231488a1be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1305,6 +1305,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \ %D%/packages/patches/glibc-2.37-versioned-locpath.patch \ + %D%/packages/patches/glibc-2.38-ldd-x86_64.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f95ae1b679..c5eac8a2da 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -795,26 +795,25 @@ (define-public glibc ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - (version "2.35") + (version "2.38") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) + "1lizxxqbfma5zgmcj0gk5iyk171f2nfvdhbv8rjrkcmjk24rk0pv")) (patches (search-patches "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" + "glibc-2.38-ldd-x86_64.patch" "glibc-dl-cache.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" + "glibc-2.37-versioned-locpath.patch" + ;; "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" "glibc-supported-locales.patch" - "glibc-cross-objdump.patch" - "glibc-cross-objcopy.patch" ;must come 2nd - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-2.37-hurd-clock_t_centiseconds.patch" + "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))) + "glibc-hurd-gettyent.patch" + "glibc-hurd-getauxval.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -876,6 +875,10 @@ (define-public glibc "kernel-headers") "/include") + ;; Libcrypt and are deprecated in glibc 2.38 and not + ;; built by default. Build it to reduce application breakage. + "--enable-crypt" + ;; This is the default for most architectures as of GNU libc 2.26, ;; but we specify it explicitly for clarity and consistency. See ;; "kernel-features.h" in the GNU libc for details. @@ -1083,6 +1086,30 @@ (define-public glibc-for-fhs ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.35 + (package + (inherit glibc) + (version "2.35") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) + (patches (search-patches "glibc-ldd-powerpc.patch" + "glibc-ldd-x86_64.patch" + "glibc-dl-cache.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch" + "glibc-cross-objdump.patch" + "glibc-cross-objcopy.patch" ;must come 2nd + "glibc-hurd-clock_t_centiseconds.patch" + "glibc-hurd-clock_gettime_monotonic.patch" + "glibc-hurd-mach-print.patch" + "glibc-hurd-gettyent.patch")))))) + (define-public glibc-2.33 (package (inherit glibc) diff --git a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch index 0acaeb1e46..8685f2c3b7 100644 --- a/gnu/packages/patches/glibc-2.37-versioned-locpath.patch +++ b/gnu/packages/patches/glibc-2.37-versioned-locpath.patch @@ -1,11 +1,3 @@ -From d73ba2caa10b8e9f51ff4239cc32eeb4e0de4279 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Josselin Poiret -Date: Sat, 13 May 2023 14:10:43 +0200 -Subject: [PATCH] Add versioned locpath - -From: Josselin Poiret - The format of locale data can be incompatible between libc versions, and loading incompatible data can lead to 'setlocale' returning EINVAL at best or triggering an assertion failure at worst. See @@ -20,20 +12,8 @@ that variable. So, if GUIX_LOCPATH=/foo:/bar, locale data is searched for in That way, a single 'GUIX_LOCPATH' setting can work even if different libc versions coexist on the system. - -This patch is adapted from the 2.35 patch. - ---- - locale/newlocale.c | 15 ++-------- - locale/setlocale.c | 68 +++++++++++++++++++++++++++++++++++++------- - string/Makefile | 1 + - string/argz-suffix.c | 56 ++++++++++++++++++++++++++++++++++++ - string/argz.h | 10 +++++++ - 5 files changed, 127 insertions(+), 23 deletions(-) - create mode 100644 string/argz-suffix.c - diff --git a/locale/newlocale.c b/locale/newlocale.c -index 108d2428bf..6218e0fa77 100644 +index 108d2428..6218e0fa 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -29,6 +29,7 @@ @@ -73,7 +53,7 @@ index 108d2428bf..6218e0fa77 100644 /* Get the names for the locales we are interested in. We either allow a composite name or a single name. */ diff --git a/locale/setlocale.c b/locale/setlocale.c -index dd73fa4248..d8eb799384 100644 +index 6a902faa..2d07a644 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -213,12 +213,65 @@ setdata (int category, struct __locale_data *data) @@ -143,7 +123,7 @@ index dd73fa4248..d8eb799384 100644 char *composite; /* Sanity check for CATEGORY argument. */ -@@ -249,17 +302,10 @@ setlocale (int category, const char *locale) +@@ -249,17 +308,10 @@ setlocale (int category, const char *locale) locale_path = NULL; locale_path_len = 0; @@ -165,7 +145,7 @@ index dd73fa4248..d8eb799384 100644 if (category == LC_ALL) diff --git a/string/Makefile b/string/Makefile -index 3eced0d027..a7e68729ad 100644 +index 8cdfd5b0..6b0d606d 100644 --- a/string/Makefile +++ b/string/Makefile @@ -51,6 +51,7 @@ routines := \ @@ -178,7 +158,7 @@ index 3eced0d027..a7e68729ad 100644 bzero \ diff --git a/string/argz-suffix.c b/string/argz-suffix.c new file mode 100644 -index 0000000000..505b0f248c +index 00000000..505b0f24 --- /dev/null +++ b/string/argz-suffix.c @@ -0,0 +1,56 @@ @@ -239,7 +219,7 @@ index 0000000000..505b0f248c +} +weak_alias (__argz_suffix_entries, argz_suffix_entries) diff --git a/string/argz.h b/string/argz.h -index cbc588a8e6..bc6e484c9d 100644 +index cbc588a8..bc6e484c 100644 --- a/string/argz.h +++ b/string/argz.h @@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz, @@ -259,6 +239,3 @@ index cbc588a8e6..bc6e484c9d 100644 /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there are no more. If entry is NULL, then the first entry is returned. This --- -2.40.1 - diff --git a/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch new file mode 100644 index 0000000000..9db412b5f2 --- /dev/null +++ b/gnu/packages/patches/glibc-2.38-ldd-x86_64.patch @@ -0,0 +1,8 @@ +By default, 'RTDLLIST' in 'ldd' refers to 'lib64/ld-linux-x86-64.so', whereas +it's in 'lib/' for us. This patch fixes that. + +--- glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed ++++ glibc-2.38/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed +@@ -1 +1 @@ +-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ ++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_ -- 2.41.0