commit 0b968348207e2153aae070fb7a45f8a7e3fad86a
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Mon Jul 22 18:39:19 2024 +0200
Up to 2.40
branch.sh | 4 ++--
glibc-autoconf.patch | 2 +-
glibc-locale_fixes.patch | 2 +-
glibc-morelocales.patch | 35 ++++++++++++++++++-----------------
glibc.spec | 12 ++++++++----
5 files changed, 30 insertions(+), 25 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 033ef94..75520bf 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -38,7 +38,7 @@
%define with_static_pie 1
%endif
-%define core_version 2.39
+%define core_version 2.40
%define llh_version 7:2.6.32.1-1
Summary: GNU libc
@@ -52,12 +52,12 @@ Summary(tr.UTF-8): GNU libc
Summary(uk.UTF-8): GNU libc версії
Name: glibc
Version: %{core_version}
-Release: 7
+Release: 1
Epoch: 6
License: LGPL v2.1+
Group: Libraries
Source0: https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: be81e87f72b5ea2c0ffe2bedfeb680c6
+# Source0-md5: b390feef233022114950317f10c4fa97
Source2: nscd.init
Source3: nscd.sysconfig
Source4: nscd.logrotate
@@ -69,7 +69,7 @@ Source7: %{name}-LD-path.c
Source9: nscd.tmpfiles
# use branch.sh to update glibc-git.patch
Patch0: glibc-git.patch
-# Patch0-md5: f03b7aadd7ead8bfa78cdf23e4cc7a44
+# Patch0-md5: 8d72c03094ec80cdfbbec87abb2f44ad
# against GNU TP (libc domain)
#Patch1: %{name}-pl.po-update.patch
Patch2: %{name}-pld.patch
@@ -952,8 +952,12 @@ AWK="gawk" \
--enable-cet \
%endif
--enable-bind-now \
+ --enable-fortify-source \
--enable-hidden-plt \
--enable-kernel="%{min_kernel}" \
+%ifarch aarch64
+ --enable-memory-tagging \
+%endif
--enable-obsolete-nsl \
--enable-profile \
--enable-stack-protector=strong \
diff --git a/branch.sh b/branch.sh
index 8ff0d40..0e0a72a 100755
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
set -e
url=git://sourceware.org/git/glibc.git
package=glibc
-tag=glibc-2.39
-branch=release/2.39/master
+tag=glibc-2.40
+branch=release/2.40/master
out=$package-git.patch
repo=$package.git
diff --git a/glibc-autoconf.patch b/glibc-autoconf.patch
index d327f55..dc1bb60 100644
--- a/glibc-autoconf.patch
+++ b/glibc-autoconf.patch
@@ -4,7 +4,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/aclocal.m4
glibc-2.33/aclocal.m4
@@ -3,11 +3,6 @@ dnl the internal functions defined and u
dnl match those expected by the fragments. When changing this version,
dnl install.texi also needs to be updated.
- m4_define([GLIBC_AUTOCONF_VERSION], [2.71])
+ m4_define([GLIBC_AUTOCONF_VERSION], [2.72])
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
- [m4_fatal(m4_flatten(
-Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have
diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index a06d185..dc69328 100644
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -641,7 +641,7 @@ diff -ur glibc-2.39.orig/localedata/locales/cv_RU
glibc-2.39/localedata/locales/
+country_car "RUS"
+country_isbn "5"
% Чӑвашла
- lang_name "Чӑвашла"
+ lang_name "чӑваш"
lang_ab "cv"
diff -ur glibc-2.39.orig/localedata/locales/da_DK
glibc-2.39/localedata/locales/da_DK
--- glibc-2.39.orig/localedata/locales/da_DK 2024-02-01 09:53:20.562394124
+0100
diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index 7d989d3..9eb01a2 100644
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -44,7 +44,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
af_ZA.UTF-8/UTF-8 \
af_ZA/ISO-8859-1 \
agr_PE/UTF-8 \
-@@ -50,6 +50,8 @@ ar_TN.UTF-8/UTF-8 \
+@@ -50,6 +51,8 @@ ar_TN.UTF-8/UTF-8 \
ar_TN/ISO-8859-6 \
ar_YE.UTF-8/UTF-8 \
ar_YE/ISO-8859-6 \
@@ -53,7 +53,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
ayc_PE/UTF-8 \
az_AZ/UTF-8 \
az_IR/UTF-8 \
-@@ -59,6 +61,8 @@ ast_ES/ISO-8859-15 \
+@@ -59,6 +62,8 @@ ast_ES/ISO-8859-15 \
be_BY.UTF-8/UTF-8 \
be_BY/CP1251 \
be_BY@latin/UTF-8 \
@@ -62,7 +62,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
bem_ZM/UTF-8 \
ber_DZ/UTF-8 \
ber_MA/UTF-8 \
-@@ -210,11 +214,15 @@ et_EE.ISO-8859-15/ISO-8859-15 \
+@@ -210,11 +215,15 @@ et_EE.ISO-8859-15/ISO-8859-15 \
eu_ES.UTF-8/UTF-8 \
eu_ES/ISO-8859-1 \
eu_ES@euro/ISO-8859-15 \
@@ -78,7 +78,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
fil_PH/UTF-8 \
fo_FO.UTF-8/UTF-8 \
fo_FO/ISO-8859-1 \
-@@ -231,8 +239,14 @@ fr_FR@euro/ISO-8859-15 \
+@@ -231,8 +240,14 @@ fr_FR@euro/ISO-8859-15 \
fr_LU.UTF-8/UTF-8 \
fr_LU/ISO-8859-1 \
fr_LU@euro/ISO-8859-15 \
@@ -93,7 +93,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
fy_DE/UTF-8 \
ga_IE.UTF-8/UTF-8 \
ga_IE/ISO-8859-1 \
-@@ -261,11 +275,13 @@ hr_HR/ISO-8859-2 \
+@@ -261,11 +276,13 @@ hr_HR/ISO-8859-2 \
hsb_DE/ISO-8859-2 \
hsb_DE.UTF-8/UTF-8 \
ht_HT/UTF-8 \
@@ -107,7 +107,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
id_ID.UTF-8/UTF-8 \
id_ID/ISO-8859-1 \
ig_NG/UTF-8 \
-@@ -280,9 +296,11 @@ it_IT@euro/ISO-8859-15 \
+@@ -280,9 +297,11 @@ it_IT@euro/ISO-8859-15 \
iu_CA/UTF-8 \
ja_JP.EUC-JP/EUC-JP \
ja_JP.UTF-8/UTF-8 \
@@ -119,7 +119,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
kk_KZ.UTF-8/UTF-8 \
kk_KZ/PT154 \
kl_GL.UTF-8/UTF-8 \
-@@ -298,14 +316,20 @@ ku_TR.UTF-8/UTF-8 \
+@@ -298,14 +317,20 @@ ku_TR.UTF-8/UTF-8 \
kv_RU/UTF-8 \
kw_GB.UTF-8/UTF-8 \
kw_GB/ISO-8859-1 \
@@ -140,7 +140,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
lo_LA/UTF-8 \
lt_LT.UTF-8/UTF-8 \
lt_LT/ISO-8859-13 \
-@@ -335,11 +359,17 @@ ms_MY/ISO-8859-1 \
+@@ -335,11 +360,17 @@ ms_MY/ISO-8859-1 \
mt_MT.UTF-8/UTF-8 \
mt_MT/ISO-8859-3 \
my_MM/UTF-8 \
@@ -158,7 +158,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
nds_NL/UTF-8 \
ne_NP/UTF-8 \
nhn_MX/UTF-8 \
-@@ -354,10 +384,13 @@ nl_NL/ISO-8859-1 \
+@@ -354,10 +385,13 @@ nl_NL/ISO-8859-1 \
nl_NL@euro/ISO-8859-15 \
nn_NO.UTF-8/UTF-8 \
nn_NO/ISO-8859-1 \
@@ -172,7 +172,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
om_ET/UTF-8 \
om_KE.UTF-8/UTF-8 \
om_KE/ISO-8859-1 \
-@@ -367,6 +400,7 @@ pa_IN/UTF-8 \
+@@ -367,6 +401,7 @@ pa_IN/UTF-8 \
pa_PK/UTF-8 \
pap_AW/UTF-8 \
pap_CW/UTF-8 \
@@ -180,7 +180,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
pl_PL.UTF-8/UTF-8 \
pl_PL/ISO-8859-2 \
ps_AF/UTF-8 \
-@@ -377,6 +411,9 @@ pt_PT/ISO-8859-1 \
+@@ -377,6 +412,9 @@ pt_PT/ISO-8859-1 \
quz_PE/UTF-8 \
raj_IN/UTF-8 \
rif_MA/UTF-8 \
@@ -190,7 +190,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
ro_RO.UTF-8/UTF-8 \
ro_RO/ISO-8859-2 \
ru_RU.KOI8-R/KOI8-R \
-@@ -384,13 +421,17 @@ ru_RU.UTF-8/UTF-8 \
+@@ -428,14 +428,18 @@ ru_RU.UTF-8/UTF-8 \
ru_RU/ISO-8859-5 \
ru_UA.UTF-8/UTF-8 \
ru_UA/KOI8-U \
@@ -202,13 +202,14 @@ diff -urNp -x '*.orig'
glibc-2.33.org/localedata/SUPPORTED glibc-2.33/localedata
+sc_IT.ISO-8859-1/ISO-8859-1 \
+sc_IT.ISO-8859-15/ISO-8859-15 \
sc_IT/UTF-8 \
+ scn_IT/UTF-8 \
sd_IN/UTF-8 \
sd_IN@devanagari/UTF-8 \
+sd_PK/UTF-8 \
se_NO/UTF-8 \
sgs_LT/UTF-8 \
shn_MM/UTF-8 \
-@@ -399,6 +440,7 @@ si_LK/UTF-8 \
+@@ -399,6 +441,7 @@ si_LK/UTF-8 \
sid_ET/UTF-8 \
sk_SK.UTF-8/UTF-8 \
sk_SK/ISO-8859-2 \
@@ -216,7 +217,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
sl_SI.UTF-8/UTF-8 \
sl_SI/ISO-8859-2 \
sm_WS/UTF-8 \
-@@ -412,27 +454,43 @@ so_SO/ISO-8859-1 \
+@@ -412,27 +455,43 @@ so_SO/ISO-8859-1 \
sq_MK/UTF-8 \
+sr_BA.ISO-8859-5@ijekavian/ISO-8859-5 \
+sr_BA@ijekavian/UTF-8 \
@@ -260,7 +261,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
th_TH.UTF-8/UTF-8 \
th_TH/TIS-620 \
the_NP/UTF-8 \
-@@ -441,6 +499,7 @@ tig_ER/UTF-8 \
+@@ -441,6 +500,7 @@ tig_ER/UTF-8 \
tk_TM/UTF-8 \
tl_PH.UTF-8/UTF-8 \
tl_PH/ISO-8859-1 \
@@ -268,7 +269,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
tn_ZA/UTF-8 \
to_TO/UTF-8 \
tok/UTF-8 \
-@@ -448,7 +507,10 @@ tr_CY.UTF-8/UTF-8 \
+@@ -448,7 +508,10 @@ tr_CY.UTF-8/UTF-8 \
tr_CY/ISO-8859-9 \
tr_TR.UTF-8/UTF-8 \
tr_TR/ISO-8859-9 \
@@ -279,7 +280,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED
glibc-2.33/localedata
tt_RU/UTF-8 \
tt_RU@iqtelif/UTF-8 \
ug_CN/UTF-8 \
-@@ -456,6 +518,7 @@ uk_UA.UTF-8/UTF-8 \
+@@ -456,6 +519,7 @@ uk_UA.UTF-8/UTF-8 \
uk_UA/KOI8-U \
unm_US/UTF-8 \
ur_IN/UTF-8 \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/0b968348207e2153aae070fb7a45f8a7e3fad86a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
