From: Arkadiusz Miśkiewicz Date: Thu, 6 Aug 2020 21:35:55 +0000 (+0200) Subject: - up to 2.32 X-Git-Tag: auto/th/glibc-2.32-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=c01d56fc2a429fb76a47fce8ed346b4cb84b86c7;p=packages%2Fglibc.git - up to 2.32 --- diff --git a/branch.sh b/branch.sh index 7ff0c5e..05c3545 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.31 -branch=release/2.31/master +tag=glibc-2.32 +branch=release/2.32/master out=$package-git.patch repo=$package.git diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch index 00e985b..b0924a7 100644 --- a/glibc-locale_fixes.patch +++ b/glibc-locale_fixes.patch @@ -2344,16 +2344,16 @@ lang_name "emaitk" lang_term "sgs" lang_lib "sgs" ---- glibc-2.27/localedata/locales/shn_MM.orig 2018-02-01 17:17:18.000000000 +0100 -+++ glibc-2.27/localedata/locales/shn_MM 2018-02-03 19:47:54.728319785 +0100 -@@ -286,6 +286,7 @@ +--- glibc-2.32/localedata/locales/shn_MM~ 2020-08-05 04:17:00.000000000 +0200 ++++ glibc-2.32/localedata/locales/shn_MM 2020-08-06 09:42:57.106364077 +0200 +@@ -280,6 +280,7 @@ country_post "Myanmar" country_ab2 "MM" country_num 104 country_car "MYA" +country_isbn "99971" + % လိၵ်ႈတႆး lang_name "" lang_term "shn" - lang_lib "shn" --- glibc-2.27/localedata/locales/si_LK.orig 2018-02-02 19:23:56.252656078 +0100 +++ glibc-2.27/localedata/locales/si_LK 2018-02-03 19:49:28.281652052 +0100 @@ -190,6 +190,7 @@ diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch index c45af4e..843971c 100644 --- a/glibc-morelocales.patch +++ b/glibc-morelocales.patch @@ -1240,470 +1240,6 @@ diff -urN glibc-2.6.org/localedata/locales/oc_FR@euro glibc-2.6/localedata/local +LC_ADDRESS +copy "be_BY" +END LC_ADDRESS ---- glibc-2.14/localedata/locales/ckb_IQ.orig 1970-01-01 01:00:00.000000000 +0100 -+++ glibc-2.14/localedata/locales/ckb_IQ 2011-06-26 09:30:48.647902668 +0200 -@@ -0,0 +1,461 @@ -+comment_char % -+escape_char / -+% -+% -+%%%%%%%%%%%%%%%% local Definition ku_ckb | ckb_iq | ckb_ir %%%%%%%%%%%%%%%%%%%%%%% -+% Kurdish (Sorani) language locale for Iraq and Iran. -+% Contributed by Aras Noori -+% Filename: ckb_IQ -+% Locale name: ckb_IQ.UTF-8 -+% Language: kurdish sorani -+% Charset: UTF-8 -+% Creation Date: 2009-11-03 -+% History: -+% January 2009: Defining CKB locale -+% March 2009: Adding rule for CKB -+% October 2009: bug fixing and redefine -+% April 2010 fixing "not found category" problems -+% March 2011 fixing all bugs -+% Sept 2014: fixing alphabet and unicode bugs -+% Oct 2014: fixing Address and fmt_name issues -+ -+LC_IDENTIFICATION -+title "Kurdish language locale based on Arabic letters" -+source "Aras Noori" -+address "see e-mail" -+contact "Aras Noori" -+email "aras.noori@gmail.com" -+tel "+49 17629857380" -+fax "" -+language "Kurdish" -+territory "Iraq, Iran" -+revision "0.8" -+date "2014-09-20" -+ -+category "i18n:2012";LC_IDENTIFICATION -+category "i18n:2012";LC_CTYPE -+category "i18n:2012";LC_COLLATE -+category "i18n:2012";LC_MONETARY -+category "i18n:2012";LC_NUMERIC -+category "i18n:2012";LC_TIME -+category "i18n:2012";LC_MESSAGES -+category "i18n:2012";LC_PAPER -+category "i18n:2012";LC_NAME -+category "i18n:2012";LC_ADDRESS -+category "i18n:2012";LC_TELEPHONE -+category "i18n:2012";LC_MEASUREMENT -+ -+END LC_IDENTIFICATION -+ -+LC_CTYPE -+copy "i18n" -+END LC_CTYPE -+ -+LC_COLLATE -+% The Kurdish Sorani, Bahdini, and others dialects is mainly written using a modified (Arabic-based alphabet) with 33 letters. -+% Unlike the regular Arabic alphabet, which is an abjad, kurdish is an alphabet in which vowels are mandatory, making the script easy to read. -+% -+% The kurdish alphabet order is: -+% in Latin: a, b, c, ç, d, e, ê, f, g, h, i, î, j, k, l, ll, m, n, o, p, q, r, rr, s, sh, t, u, uu, v, w, x, y, z -+% vowels: A, E, I, O, U, UU -+% -+% Copy the template from ISO/IEC 14651 -+ -+order_start forward; forward -+% -+% Kurdish numeric characters. -+% -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+% -+% Characters from space to / and from : to ~ and nbsp. -+% -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+% -+% Kurish alphabet order. -+% -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+% -+ % -+ % English numeric characters. -+ % -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ % -+ % -+ % English alphabet. -+ % -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ ; -+ % -+ % -+ % Other control characters etc. upto order_end -+ % -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ IGNORE -+order_end -+ -+END LC_COLLATE -+ -+LC_MONETARY -+int_curr_symbol "IQD " -+currency_symbol ".." -+mon_decimal_point "." -+mon_thousands_sep "," -+mon_grouping 3 -+positive_sign "" -+negative_sign "-" -+int_frac_digits 3 -+frac_digits 3 -+p_cs_precedes 1 -+p_sep_by_space 1 -+n_cs_precedes 1 -+n_sep_by_space 1 -+p_sign_posn 1 -+n_sign_posn 2 -+ -+END LC_MONETARY -+ -+ -+LC_NUMERIC -+% This is the POSIX Locale definition for the LC_NUMERIC category. -+decimal_point "." -+thousands_sep "," -+grouping 3 -+END LC_NUMERIC -+ -+ -+LC_TIME -+% This is the POSIX Locale definition for the LC_TIME category. -+% These are generated based on XML base Locale difintion file -+% -+% Abbreviated weekday names -+abday "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Full weekday names -+day "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Abbreviated month names -+abmon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Full month names -+mon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Equivalent of AM PM -+am_pm "";"" -+% -+% Appropriate date and time representation -+d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" -+ -+% -+% Appropriate date representation(%x) -+% "%Oy/%Om/%Od" -+d_fmt "%d %b, %Y" -+% -+% Appropriate time representation -+% -+t_fmt "%Z %I:%M:%S " -+% -+% Appropriate 12 h time representation -+t_fmt_ampm "%Z %I:%M:%S %p" -+% -+% Appropriate date representation -+date_fmt "%a %b %e %H:%M:%s %Z %Y" -+ -+% FIXME: found in CLDR -+first_weekday 7 -+first_workday 7 -+cal_direction 3 -+END LC_TIME -+ -+ -+LC_MESSAGES -+yesexpr "" -+noexpr "" -+END LC_MESSAGES -+ -+ -+LC_PAPER -+% This is the ISO_IEC TR14652 Locale definition for the -+height 297 -+width 210 -+END LC_PAPER -+ -+ -+LC_NAME -+% This is the ISO_IEC TR14652 Locale definition for the -+% LC_NAME category. -+% -+name_fmt "%p%t%f%t%g" -+name_gen "-san" -+name_miss "" -+name_ms "" -+name_mrs "" -+name_mr "" -+END LC_NAME -+% -+LC_ADDRESS -+% This is the ISO_IEC TR14652 Locale definition for the -+postal_fmt "%z%c%T%s%b%e%r" -+country_ab2 "IQ" -+country_ab3 "IRQ" -+country_post "IRQ" -+country_name "" -+country_num 368 -+country_car "IRQ" -+% kurdî -+lang_name "" -+lang_ab "" -+lang_term "ckb" -+lang_lib "ckb" -+ -+END LC_ADDRESS -+ -+ -+LC_TELEPHONE -+% -+tel_int_fmt "+%c ;%a ;%l" -+tel_dom_fmt "%A%l" -+int_select "00" -+int_prefix "964" -+ -+END LC_TELEPHONE -+ -+ -+LC_MEASUREMENT -+% This is the ISO_IEC TR14652 Locale definition -+% -+measurement 1 -+ -+END LC_MEASUREMENT --- glibc-2.14/localedata/locales/kg_CD.orig 1970-01-01 01:00:00.000000000 +0100 +++ glibc-2.14/localedata/locales/kg_CD 2011-06-26 09:30:48.651236002 +0200 @@ -0,0 +1,180 @@ @@ -3070,15 +2606,6 @@ diff -urN glibc-2.6.org/localedata/locales/oc_FR@euro glibc-2.6/localedata/local bem_ZM/UTF-8 \ ber_DZ/UTF-8 \ ber_MA/UTF-8 \ -@@ -83,7 +87,8 @@ - ca_IT.UTF-8/UTF-8 \ - ca_IT/ISO-8859-15 \ - ce_RU/UTF-8 \ - chr_US/UTF-8 \ -+ckb_IQ/UTF-8 \ - cmn_TW/UTF-8 \ - crh_UA/UTF-8 \ - cs_CZ.UTF-8/UTF-8 \ @@ -193,11 +198,15 @@ eu_ES.UTF-8/UTF-8 \ eu_ES/ISO-8859-1 \ diff --git a/glibc-pt_pax.patch b/glibc-pt_pax.patch index 3bed03a..498fe97 100644 --- a/glibc-pt_pax.patch +++ b/glibc-pt_pax.patch @@ -1,9 +1,9 @@ --- elf/elf.h +++ elf/elf.h -@@ -568,6 +568,7 @@ - #define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ +@@ -722,6 +722,7 @@ typedef struct #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ + #define PT_GNU_PROPERTY 0x6474e553 /* GNU property */ +#define PT_PAX_FLAGS 0x65041580 /* Indicates PaX flag markings */ #define PT_LOSUNW 0x6ffffffa #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ diff --git a/glibc.spec b/glibc.spec index 1721b56..dbc5aef 100644 --- a/glibc.spec +++ b/glibc.spec @@ -31,7 +31,7 @@ %undefine with_cet %endif -%define core_version 2.31 +%define core_version 2.32 %define llh_version 7:2.6.32.1-1 Summary: GNU libc @@ -45,12 +45,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: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: 78a720f17412f3c3282be5a6f3363ec6 +# Source0-md5: 720c7992861c57cf97d66a2f36d8d1fa Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate @@ -62,7 +62,7 @@ Source7: %{name}-LD-path.c Source9: nscd.tmpfiles # use branch.sh to update glibc-git.patch Patch0: glibc-git.patch -# Patch0-md5: 144db12c89a8af1afbaa6517011511dc +# Patch0-md5: d41d8cd98f00b204e9800998ecf8427e # against GNU TP (libc domain) #Patch1: %{name}-pl.po-update.patch Patch2: %{name}-pld.patch @@ -437,39 +437,6 @@ Módulo hesiod NSS de glibc. %description -n nss_hesiod -l pl.UTF-8 Moduł glibc NSS (Name Service Switch) dostępu do baz danych. -%package -n nss_nis -Summary: NIS(YP) NSS glibc module -Summary(es.UTF-8): Módulo NIS(YP) NSS de glibc -Summary(pl.UTF-8): Moduł NIS(YP) NSS glibc -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_nis -glibc NSS (Name Service Switch) module for NIS(YP) databases access. - -%description -n nss_nis -l es.UTF-8 -Módulo NSS de glibc para acceder las bases de datos NIS(YP). - -%description -n nss_nis -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS(YP). - -%package -n nss_nisplus -Summary: NIS+ NSS module -Summary(es.UTF-8): Módulo NIS+ NSS -Summary(pl.UTF-8): Moduł NIS+ NSS -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_nisplus -glibc NSS (Name Service Switch) module for NIS+ databases access. - -%description -n nss_nisplus -l es.UTF-8 -Módulo NSS (Name Service Switch) de glibc para acceder las bases de -datos NIS+. - -%description -n nss_nisplus -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS+. - %package memusage Summary: Memory usage profiler Summary(pl.UTF-8): Narzędzie do profilowania zużycia pamięci @@ -946,7 +913,7 @@ echo "Minimal supported kernel is 3.2.0" >&2 exit 1 %endif -%patch0 -p1 +#%patch0 -p1 %patch2 -p1 %patch3 -p0 @@ -1007,7 +974,6 @@ AWK="gawk" \ --enable-kernel="%{min_kernel}" \ --enable-nss-crypt%{!?with_nss_crypt:=no} \ --enable-obsolete-nsl \ - --enable-obsolete-rpc \ --enable-profile \ --enable-stack-protector=strong \ --enable-stackguard-randomization \ @@ -1075,7 +1041,6 @@ PICFILES="libc_pic.a libc.map resolv/libresolv_pic.a" install -p $PICFILES $RPM_BUILD_ROOT%{_libdir} -install -p elf/soinit.os $RPM_BUILD_ROOT%{_libdir}/soinit.o install -p elf/sofini.os $RPM_BUILD_ROOT%{_libdir}/sofini.o # Include %{_libdir}/gconv/gconv-modules.cache @@ -1094,7 +1059,7 @@ for l in BrokenLocale anl crypt dl \ %ifarch %{x8664} x32 mvec \ %endif - nsl resolv rt thread_db util; do + resolv rt thread_db util; do test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib${l}.so ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so @@ -1497,7 +1462,6 @@ fi %attr(755,root,root) %{_bindir}/getent %attr(755,root,root) %{_bindir}/iconv %attr(755,root,root) %{_bindir}/locale -%attr(755,root,root) %{_bindir}/rpcgen %attr(755,root,root) %{_sbindir}/zdump %attr(755,root,root) %{_sbindir}/zic @@ -1511,7 +1475,6 @@ fi %{_mandir}/man1/getent.1* %{_mandir}/man1/iconv.1* %{_mandir}/man1/locale.1* -%{_mandir}/man1/rpcgen.1* %{_mandir}/man5/gai.conf.5* %{_mandir}/man5/locale.5* %{_mandir}/man5/nss.5* @@ -1618,7 +1581,6 @@ fi %lang(ja) %{_mandir}/ja/man1/getent.1* %lang(ja) %{_mandir}/ja/man1/iconv.1* %lang(ja) %{_mandir}/ja/man1/locale.1* -%lang(ja) %{_mandir}/ja/man1/rpcgen.1* %lang(ja) %{_mandir}/ja/man5/gai.conf.5* %lang(ja) %{_mandir}/ja/man5/locale.5* %lang(ja) %{_mandir}/ja/man5/nss.5* @@ -1685,7 +1647,6 @@ fi %lang(ru) %{_mandir}/ru/man1/getent.1* %lang(ru) %{_mandir}/ru/man1/iconv.1* %lang(ru) %{_mandir}/ru/man1/locale.1* -%lang(ru) %{_mandir}/ru/man1/rpcgen.1* %lang(ru) %{_mandir}/ru/man5/locale.5* %lang(ru) %{_mandir}/ru/man5/nsswitch.conf.5* %lang(ru) %{_mandir}/ru/man5/rpc.5* @@ -1847,16 +1808,6 @@ fi %attr(755,root,root) /%{_lib}/libnss_hesiod-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_hesiod.so.2 -%files -n nss_nis -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_nis-%{core_version}.so -%attr(755,root,root) /%{_lib}/libnss_nis.so.2 - -%files -n nss_nisplus -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_nisplus-%{core_version}.so -%attr(755,root,root) /%{_lib}/libnss_nisplus.so.2 - %if %{with memusage} %files memusage %defattr(644,root,root,755) @@ -1879,7 +1830,6 @@ fi %ifarch %{x8664} x32 %attr(755,root,root) %{_libdir}/libmvec.so %endif -%attr(755,root,root) %{_libdir}/libnsl.so %attr(755,root,root) %{_libdir}/libpcprofile.so %attr(755,root,root) %{_libdir}/libresolv.so %attr(755,root,root) %{_libdir}/librt.so @@ -1897,7 +1847,6 @@ fi %ifarch alpha ppc sparc %{_libdir}/libnldbl_nonshared.a %endif -%{_libdir}/librpcsvc.a %ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 aarch64 # ABI-dependent headers %{_includedir}/gnu/stubs-*.h @@ -1930,7 +1879,6 @@ fi %{_includedir}/nfs %{_includedir}/protocols %{_includedir}/rpc -%{_includedir}/rpcsvc %{_includedir}/scsi %{_includedir}/sys @@ -2040,7 +1988,6 @@ fi %{_libdir}/libm-%{core_version}.a %{_libdir}/libmvec.a %endif -%{_libdir}/libnsl.a %{_libdir}/libpthread.a %{_libdir}/libresolv.a %{_libdir}/librt.a @@ -2054,7 +2001,6 @@ fi %defattr(644,root,root,755) %{_libdir}/lib*_pic.a %{_libdir}/lib*.map -%{_libdir}/soinit.o %{_libdir}/sofini.o %files -n nscd