From 4928f17403ba81b0cb08076fa0271c0c2a94c2ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 2 Feb 2018 11:56:36 +0100 Subject: [PATCH] - up to 2.27 (but ugly locale patches still need update) --- branch.sh | 4 +- glibc-morelocales.patch | 584 ++--------------------------------- glibc-new-charsets.patch | 18 +- glibc-no-bash-nls.patch | 8 +- glibc-nss_include_dirs.patch | 7 +- glibc.spec | 30 +- 6 files changed, 53 insertions(+), 598 deletions(-) diff --git a/branch.sh b/branch.sh index 3db5e65..5d6ee82 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.26 -branch=release/2.26/master +tag=glibc-2.27 +branch=release/2.27/master out=$package-git.patch repo=$package.git diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch index 2463c3d..a4f4f78 100644 --- a/glibc-morelocales.patch +++ b/glibc-morelocales.patch @@ -2303,334 +2303,6 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw +LC_TELEPHONE +copy "ru_RU" +END LC_TELEPHONE -diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM ---- glibc/localedata/locales.orig/shn_MM 1970-01-01 01:00:00.000000000 +0100 -+++ glibc/localedata/locales/shn_MM 2012-10-07 16:31:46.646361128 +0200 -@@ -0,0 +1,324 @@ -+escape_char / -+comment_char % -+% This is the locale definition file for Myanmar Shan -+% It is derived from the locale by Ngwe TUn and -+% Members of the Solveware SolUtion Team. http://www.myazedi.com -+% It was Updated to Unicode 5.1 with some modifications by -+% Bone Pyae Sone http://www.ubuntu-mm.net -+ -+LC_IDENTIFICATION -+title "Shan language locale for Myanmar" -+source "ubuntu Myanmar LoCo Team http://www.ubuntu-mm.net" -+address "Yangon, Myanmar" -+contact "Bone Pyae Sone" -+email "bone.burma@mail.com" -+tel "" -+fax "" -+language "Shan" -+territory "Myanmar" -+revision "1.3" -+date "2012-07-01" -+ -+category "i18n:2012";LC_IDENTIFICATION -+category "i18n:2012";LC_COLLATE -+category "i18n:2012";LC_CTYPE -+category "i18n:2012";LC_MESSAGES -+category "i18n:2012";LC_MONETARY -+category "i18n:2012";LC_NUMERIC -+category "i18n:2012";LC_TIME -+category "i18n:2012";LC_PAPER -+category "i18n:2012";LC_MEASUREMENT -+category "i18n:2012";LC_TELEPHONE -+category "i18n:2012";LC_ADDRESS -+category "i18n:2012";LC_NAME -+END LC_IDENTIFICATION -+ -+ -+LC_CTYPE -+copy "i18n" -+outdigit .. -+map to_inpunct; / -+ (,); / -+ (,); / -+ (,); / -+ (,); / -+ (,); / -+ (,); / -+ (,); / -+ (,); / -+ (,); / -+ (,); -+ -+END LC_CTYPE -+ -+LC_COLLATE -+ -+% Copy the template from ISO/IEC 14651 -+copy "iso14651_t1" -+ -+END LC_COLLATE -+ -+ -+LC_MONETARY -+% "" -+int_curr_symbol "" -+% Kyat in burmese - it would be better to Use this if Myanmar digits are Used -+% currency_symbol "" -+% "" -+currency_symbol "" -+mon_decimal_point "" -+mon_thousands_sep "" -+mon_grouping 3;3 -+positive_sign "" -+negative_sign "" -+int_frac_digits 2 -+frac_digits 2 -+p_cs_precedes 0 -+p_sep_by_space 0 -+n_cs_precedes 0 -+n_sep_by_space 0 -+p_sign_posn 1 -+n_sign_posn 1 -+% -+END LC_MONETARY -+ -+LC_NUMERIC -+% This is the POSIX Locale definition for the LC_NUMERIC category -+% generated by IBM Basic Country Transformer. -+% These are generated based on XML base Locale defintion file -+% for IBM Class for Unicode. -+% -+decimal_point "" -+thousands_sep "" -+grouping 3;3 -+% -+END LC_NUMERIC -+ -+ -+LC_TIME -+% This is the POSIX Locale definition for the LC_TIME category -+% generated by IBM Basic Country Pack Transformer. -+% These are generated based on XML base Locale definition file -+% for IBM Class for Unicode. -+% -+% Abbreviated weekday names (%a) -+abday "";"";/ -+ "";"";/ -+ "";"";/ -+ "" -+ -+ -+% -+% FUll weekday names (%A) -+day "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+ -+% Abbreviated month names (%b) -+abmon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+ -+% FUll month names (%B) -+mon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+ -+am_pm "";"" -+% %OC%Oy %b %Od %A %OI:%OM:%OS %Op %Z -+d_t_fmt "" -+% Note: the Use of %OC reqUires a patch to strftime_l.h -+% %OC%Oy %b %Od %A -+d_fmt "" -+% %OH:%OM:%OS %p -+t_fmt "" -+% %OI:%OM:%OS %p -+t_fmt_ampm "" -+ -+% MMT-6.5MMT-6.5 -+timezone "" -+ -+alt_digits "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+ -+END LC_TIME -+ -+ -+LC_MESSAGES -+% ^[yY\x{101F}].* -+yesexpr "" -+% ^[nN\x{1019}].* -+noexpr "" -+yesstr "" -+nostr "" -+END LC_MESSAGES -+ -+ -+% Metric MeasUrement system (ISO 1000) -+LC_MEASUREMENT -+measurement 1 -+END LC_MEASUREMENT -+ -+% Default paper: A4 -+LC_PAPER -+height 297 -+width 210 -+END LC_PAPER -+ -+LC_TELEPHONE -+% +%c %a %l -+tel_int_fmt "" -+% %a %l -+tel_dom_fmt "" -+int_select "" -+int_prefix "" -+END LC_TELEPHONE -+ -+LC_NAME -+% [profession] Given_Name [middle_name] Family_Name -+% %p%t%g%t%m%t%f -+name_fmt "" -+name_gen "" -+% name_gen "" -+%name_mr "" -+% name_mr "" -+%name_mrs "" -+%name_ms "" -+%name_miss "" -+END LC_NAME -+ -+LC_ADDRESS -+postal_fmt "" -+country_name "" -+country_post "" -+country_ab2 "" -+country_num 104 -+% BA -+country_car "" -+% 99971 -+country_isbn "" -+lang_ab "" -+lang_name "" -+lang_term "" -+lang_lib "" -+END LC_ADDRESS --- glibc-2.17/localedata/locales/sr_ME@latin.orig 1970-01-01 01:00:00.000000000 +0100 +++ glibc-2.17/localedata/locales/sr_ME@latin 2013-01-04 15:59:23.574814992 +0100 @@ -0,0 +1,151 @@ @@ -3298,207 +2970,6 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM +% 381 +int_prefix "" +END LC_TELEPHONE ---- glibc-2.18/localedata/locales/mjw_IN.orig 1970-01-01 01:00:00.000000000 +0100 -+++ glibc-2.18/localedata/locales/mjw_IN 2013-08-24 08:21:01.228215722 +0200 -@@ -0,0 +1,198 @@ -+comment_char % -+escape_char / -+ -+% Karbi Language Locale for India -+% Language: mjw -+% Territory: IN -+% Revision: 1.1 -+% Date: 2013-08-08 -+% Application: general -+% Users: general -+ -+ -+LC_IDENTIFICATION -+title "Karbi language locale for India" -+source "Jor Teron" -+address "" -+contact "" -+email "" -+tel "" -+fax "" -+language "Karbi" -+territory "India" -+revision "1.1" -+date "2013-08-08" -+ -+category "i18n:2012";LC_IDENTIFICATION -+category "i18n:2012";LC_CTYPE -+category "i18n:2012";LC_COLLATE -+category "i18n:2012";LC_TIME -+category "i18n:2012";LC_NUMERIC -+category "i18n:2012";LC_MONETARY -+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 -+END LC_IDENTIFICATION -+ -+ -+LC_COLLATE -+% Copy the template from ISO/IEC 14651 -+copy "iso14651_t1" -+END LC_COLLATE -+ -+LC_CTYPE -+copy "en_GB" -+END LC_CTYPE -+ -+LC_MONETARY -+copy "hi_IN" -+END LC_MONETARY -+ -+LC_NUMERIC -+decimal_point "" -+thousands_sep "" -+grouping 3;2 -+END LC_NUMERIC -+ -+LC_MESSAGES -+% ^[yY] -+yesexpr "" -+ -+% ^[nN] -+noexpr "" -+ -+% There are no exact or fixed words for 'Yes' and 'No'. -+% The closest words are 'Chok', 'Chokche' and 'Kalang', 'Kali' respectively. They both are also translate as 'True', 'False' respectively. -+% 'Kali' is also interpreted as 'Not'. -+% 'Chok' is also interpreted as 'Correct' and 'Ok'. -+% 'Chokche' is interpreted as 'Incorrect' and 'Not Ok'. -+% While 'Ahok' is the word for 'True', there is no word for 'False' and is compensated with 'Ahok Kali', which translate to 'Not True'. -+% In these situation 'Yes' and 'No' will be the correct string. -+ -+% Yes -+yesstr "" -+ -+% No -+nostr "" -+END LC_MESSAGES -+ -+LC_TIME -+% Bhom, Ur, Dur, Thel, Them, Bhta, Bhti -+abday "";"";/ -+ "";"";/ -+ "";"";/ -+ "" -+ -+% Bhomkuru, Urmi, Durmi, Thelang, Theman, Bhomta, Bhomti -+day "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+ -+% Ark, Thang, The, Jang, Aru, Vos, Jak, Pai, Chi, Phe, Phai, Mati -+abmon "";"";/ -+ "";"";/ -+ "";"";/ -+ "";"";/ -+ "";"";/ -+ "";"" -+ -+% Arkoi, Thangthang, There, Jangmi, Aru, Vosik, Jakhong, Paipai, Chiti, Phere, Phaikuni, Matijong -+mon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+ -+% Equivalent of AM PM -+am_pm "";"" -+ -+% Appropriate date and time representation -+% %A %d %B %Y %I:%M:%S %Z -+d_t_fmt "" -+ -+% Appropriate date representation -+% %A %d %B %Y -+d_fmt "" -+ -+% Appropriate time representation -+% %I:%M:%S %Z -+t_fmt "" -+ -+% Appropriate 12 h time representation (%r) -+t_fmt_ampm "" -+ -+first_weekday 1 -+END LC_TIME -+ -+LC_PAPER -+copy "hi_IN" -+END LC_PAPER -+ -+LC_TELEPHONE -+copy "hi_IN" -+END LC_TELEPHONE -+ -+LC_MEASUREMENT -+copy "hi_IN" -+END LC_MEASUREMENT -+ -+LC_NAME -+% Format for addressing a person. -+name_fmt "/ -+" -+% "%d%t%g%t%m%t%f" -+% "Salutation", -+% "Empty string, or ", -+% "First given name", -+% "Empty string, or ", -+% "Middle names", -+% "Empty string, or ", -+% "Clan names" -+ -+% General salutation for any sex - "" -+name_gen "" -+ -+% Salutation for unmarried females - "Sami" -+name_miss "" -+ -+% FIXME: Salutation for unmarried males - "Thare" -+% name_mr "" -+ -+% FIXME: Salutation for married males - "Sangho" -+% name_mr "" -+ -+% Salutation for married females - "Sangpi" -+name_mrs "" -+ -+% Salutation valid for all females - "" (no term) -+name_ms "" -+END LC_NAME -+ -+LC_ADDRESS -+postal_fmt "/ -+" -+country_ab2 "" -+country_ab3 "" -+country_num 356 -+% IND -+country_car "" -+% 81,93 -+country_isbn "" -+% mjw -+lang_term "" -+% mjw -+lang_lib "" -+END LC_ADDRESS --- glibc-2.19/localedata/locales/sd_PK.orig 1970-01-01 01:00:00.000000000 +0100 +++ glibc-2.19/localedata/locales/sd_PK 2015-01-09 21:19:09.722522624 +0100 @@ -0,0 +1,227 @@ @@ -3803,15 +3274,14 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM id_ID.UTF-8/UTF-8 \ id_ID/ISO-8859-1 \ ig_NG/UTF-8 \ -@@ -260,10 +277,12 @@ - it_IT/ISO-8859-1 \ - it_IT@euro/ISO-8859-15 \ +@@ -295,9 +295,11 @@ it_IT@euro/ISO-8859-15 \ iu_CA/UTF-8 \ ja_JP.EUC-JP/EUC-JP \ ja_JP.UTF-8/UTF-8 \ +ka_GE.GEORGIAN-ACADEMY/GEORGIAN-ACADEMY \ ka_GE.UTF-8/UTF-8 \ ka_GE/GEORGIAN-PS \ + kab_DZ/UTF-8 \ +kg_CD/UTF-8 \ kk_KZ.UTF-8/UTF-8 \ kk_KZ/PT154 \ @@ -3836,15 +3306,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM +lo_LA.MULELAO-1/MULELAO-1 \ lo_LA/UTF-8 \ lt_LT.UTF-8/UTF-8 \ -@@ -301,6 +326,7 @@ - mhr_RU/UTF-8 \ - mi_NZ.UTF-8/UTF-8 \ - mi_NZ/ISO-8859-13 \ -+mjw_IN/UTF-8 \ - mk_MK.UTF-8/UTF-8 \ - mk_MK/ISO-8859-5 \ - ml_IN/UTF-8 \ -@@ -312,11 +338,17 @@ +@@ -312,11 +337,17 @@ mt_MT.UTF-8/UTF-8 \ mt_MT/ISO-8859-3 \ my_MM/UTF-8 \ @@ -3862,7 +3324,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM nds_NL/UTF-8 \ ne_NP/UTF-8 \ nhn_MX/UTF-8 \ -@@ -331,10 +363,13 @@ +@@ -331,10 +362,13 @@ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -3876,7 +3338,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM om_ET/UTF-8 \ om_KE.UTF-8/UTF-8 \ om_KE/ISO-8859-1 \ -@@ -344,6 +379,7 @@ +@@ -344,6 +378,7 @@ pa_PK/UTF-8 \ pap_AW/UTF-8 \ pap_CW/UTF-8 \ @@ -3884,7 +3346,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM pl_PL.UTF-8/UTF-8 \ pl_PL/ISO-8859-2 \ ps_AF/UTF-8 \ -@@ -354,7 +390,10 @@ +@@ -354,7 +389,10 @@ pt_PT/ISO-8859-1 \ pt_PT@euro/ISO-8859-15 \ quz_PE/UTF-8 \ @@ -3895,7 +3357,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM ro_RO.UTF-8/UTF-8 \ ro_RO/ISO-8859-2 \ ru_RU.KOI8-R/KOI8-R \ -@@ -361,19 +400,25 @@ +@@ -419,12 +419,16 @@ ru_RU.UTF-8/UTF-8 \ ru_RU/ISO-8859-5 \ ru_UA.UTF-8/UTF-8 \ ru_UA/KOI8-U \ @@ -3911,17 +3373,16 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM +sd_PK/UTF-8 \ se_NO/UTF-8 \ sgs_LT/UTF-8 \ - shs_CA/UTF-8 \ -+shn_MM/UTF-8 \ - si_LK/UTF-8 \ + shn_MM/UTF-8 \ +@@ -433,6 +437,7 @@ si_LK/UTF-8 \ sid_ET/UTF-8 \ sk_SK.UTF-8/UTF-8 \ sk_SK/ISO-8859-2 \ +sl_SI.ISO-8859-16/ISO-8859-16 \ sl_SI.UTF-8/UTF-8 \ sl_SI/ISO-8859-2 \ - so_DJ.UTF-8/UTF-8 \ -@@ -385,9 +430,19 @@ + sm_WS/UTF-8 \ +@@ -385,9 +428,19 @@ sq_AL.UTF-8/UTF-8 \ sq_AL/ISO-8859-1 \ sq_MK/UTF-8 \ @@ -3933,15 +3394,15 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM sr_ME/UTF-8 \ +sr_ME@latin.ISO-8859-16/ISO-8859-16 \ +sr_ME@latin/UTF-8 \ -+sr_RS.ISO-8859-5/ISO-8859-5 \ sr_RS/UTF-8 \ +sr_RS.ISO-8859-2@latin/ISO-8859-2 \ ++sr_RS.ISO-8859-5/ISO-8859-5 \ sr_RS@latin/UTF-8 \ -+ss_ZA.ISO-8859-1/ISO-8859-1 \ ss_ZA/UTF-8 \ st_ZA.UTF-8/UTF-8 \ ++ss_ZA.ISO-8859-1/ISO-8859-1 \ st_ZA/ISO-8859-1 \ -@@ -396,15 +451,21 @@ +@@ -396,15 +449,21 @@ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -3963,7 +3424,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM th_TH.UTF-8/UTF-8 \ th_TH/TIS-620 \ the_NP/UTF-8 \ -@@ -490,6 +490,7 @@ tig_ER/UTF-8 \ +@@ -490,6 +549,7 @@ tig_ER/UTF-8 \ tk_TM/UTF-8 \ tl_PH.UTF-8/UTF-8 \ tl_PH/ISO-8859-1 \ @@ -3971,7 +3432,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM tn_ZA/UTF-8 \ to_TO/UTF-8 \ tpi_PG/UTF-8 \ -@@ -497,7 +498,10 @@ tr_CY.UTF-8/UTF-8 \ +@@ -497,7 +557,10 @@ tr_CY.UTF-8/UTF-8 \ tr_CY/ISO-8859-9 \ tr_TR.UTF-8/UTF-8 \ tr_TR/ISO-8859-9 \ @@ -3982,7 +3443,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM tt_RU/UTF-8 \ tt_RU@iqtelif/UTF-8 \ ug_CN/UTF-8 \ -@@ -426,8 +491,9 @@ +@@ -426,8 +489,9 @@ uk_UA/KOI8-U \ unm_US/UTF-8 \ ur_IN/UTF-8 \ @@ -3992,13 +3453,4 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM uz_UZ/ISO-8859-1 \ uz_UZ@cyrillic/UTF-8 \ ve_ZA/UTF-8 \ ---- glibc-2.19/locale/iso-639.def.orig 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/locale/iso-639.def 2014-02-13 20:30:45.341452266 +0100 -@@ -238,6 +238,7 @@ - DEFINE_LANGUAGE_CODE ("Kanuri", kr, kau, kau) - DEFINE_LANGUAGE_CODE3 ("Kara-Kalpak", kaa, kaa) - DEFINE_LANGUAGE_CODE3 ("Karachay-Balkar", krc, krc) -+DEFINE_LANGUAGE_CODE3 ("Karbi", mjw, mjw) - DEFINE_LANGUAGE_CODE3 ("Karelian", krl, krl) - DEFINE_LANGUAGE_CODE3 ("Karen", kar, kar) - DEFINE_LANGUAGE_CODE ("Kashmiri", ks, kas, kas) + diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch index 69554ea..8109d57 100644 --- a/glibc-new-charsets.patch +++ b/glibc-new-charsets.patch @@ -19,15 +19,17 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290 \ -@@ -232,6 +238,8 @@ - ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004 \ - ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254 \ - cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \ +@@ -172,7 +172,9 @@ gen-8bit-gap-modules := koi8-r latin-gre + mac-centraleurope koi8-ru hp-roman8 hp-roman9 \ + ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk \ + iso8859-16 viscii iso8859-9e hp-turkish8 \ +- hp-thai8 hp-greek8 cp770 cp771 cp772 cp773 cp774 ++ hp-thai8 hp-greek8 cp770 cp771 cp772 cp773 cp774 \ + iscii-dev khmer-ns mulelao-1 tatar-cyr \ -+ koi8-k koi8-ru iso8859-7-euro \ - iso8859-10 macintosh iec_p27-1 asmo_449 \ - csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \ - greek-ccitt greek7 greek7-old inis inis-8 \ ++ koi8-k koi8-ru iso8859-7-euro + + + gen-special-modules := iso8859-7jp --- glibc-2.7/iconvdata/gconv-modules.orig 2007-09-30 06:00:14.000000000 +0200 +++ glibc-2.7/iconvdata/gconv-modules 2007-10-23 20:47:36.423123001 +0200 @@ -356,23 +356,28 @@ diff --git a/glibc-no-bash-nls.patch b/glibc-no-bash-nls.patch index 8156ceb..c294ea1 100644 --- a/glibc-no-bash-nls.patch +++ b/glibc-no-bash-nls.patch @@ -3,7 +3,7 @@ @@ -1,4 +1,4 @@ -#! @BASH@ +#!/bin/sh - # Copyright (C) 1996-2017 Free Software Foundation, Inc. + # Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -35,16 +35,16 @@ while test $# -gt 0; do @@ -14,7 +14,7 @@ + printf "Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - " "2017" + " "2018" - printf $"Written by %s and %s. + printf "Written by %s and %s. " "Roland McGrath" "Ulrich Drepper" @@ -111,7 +111,7 @@ @@ -1,4 +1,4 @@ -#! @BASH@ +#!/bin/sh - # Copyright (C) 2011-2017 Free Software Foundation, Inc. + # Copyright (C) 2011-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -72,18 +72,18 @@ while test $# -gt 0; do @@ -122,7 +122,7 @@ + printf "Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - " "2017" + " "2018" - printf $"Written by %s.\n" "Ulrich Drepper" + printf "Written by %s.\n" "Ulrich Drepper" exit 0 diff --git a/glibc-nss_include_dirs.patch b/glibc-nss_include_dirs.patch index 8090f1c..1e4949c 100644 --- a/glibc-nss_include_dirs.patch +++ b/glibc-nss_include_dirs.patch @@ -24,6 +24,7 @@ nss-cpp-flags := -DUSE_NSS \ - -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir) + -I/usr/include/nss -I/usr/include/nspr - CPPFLAGS-sha256-crypt.c = $(nss-cpp-flags) - CPPFLAGS-sha512-crypt.c = $(nss-cpp-flags) - CPPFLAGS-md5-crypt.c = $(nss-cpp-flags) + CPPFLAGS-sha256-crypt.c += $(nss-cpp-flags) + CPPFLAGS-sha512-crypt.c += $(nss-cpp-flags) + CPPFLAGS-md5-crypt.c += $(nss-cpp-flags) + diff --git a/glibc.spec b/glibc.spec index c5a8243..fb51887 100644 --- a/glibc.spec +++ b/glibc.spec @@ -27,7 +27,7 @@ %undefine with_memusage %endif -%define core_version 2.26 +%define core_version 2.27 %define llh_version 7:2.6.32.1-1 Summary: GNU libc @@ -41,12 +41,12 @@ Summary(tr.UTF-8): GNU libc Summary(uk.UTF-8): GNU libc версії Name: glibc Version: %{core_version} -Release: 13 +Release: 0.1 Epoch: 6 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: 102f637c3812f81111f48f2427611be1 +# Source0-md5: 898cd5656519ffbc3a03fe811dd89e82 Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate @@ -58,7 +58,7 @@ Source7: %{name}-LD-path.c Source9: nscd.tmpfiles # use branch.sh to update glibc-git.patch Patch0: glibc-git.patch -# Patch0-md5: 2bd490c730eb363719e39c716995e69b +# Patch0-md5: d41d8cd98f00b204e9800998ecf8427e # against GNU TP (libc domain) #Patch1: %{name}-pl.po-update.patch Patch2: %{name}-pld.patch @@ -92,11 +92,8 @@ URL: http://www.gnu.org/software/libc/ %{?with_selinux:BuildRequires: audit-libs-devel} BuildRequires: autoconf >= 2.69 BuildRequires: automake -%ifarch alpha -BuildRequires: binutils >= 2:2.17.50.0.7 -%else -BuildRequires: binutils >= 2:2.15.90.0.3 -%endif +BuildRequires: binutils >= 2:2.29 +BuildRequires: bison >= 2.7 %{!?with_cross:BuildRequires: dietlibc-static} BuildRequires: gawk BuildRequires: gcc >= 6:4.7 @@ -968,8 +965,10 @@ exit 1 %patch14 -p0 %patch15 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 +# ENABLE WHEN "[error] circular dependencies between locale definitions" is fixed +#%patch17 -p1 +# FIXME +#%patch18 -p1 %patch19 -p1 %patch23 -p0 @@ -1017,6 +1016,7 @@ AWK="gawk" \ --enable-profile \ --enable-stack-protector=strong \ --enable-stackguard-randomization \ + --enable-static-pie \ --enable-tunables \ --with-binutils=$(pwd)/alt-tools \ --with-bugurl=http://bugs.pld-linux.org/ \ @@ -1129,7 +1129,7 @@ cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf rm -rf documentation install -d documentation -for f in ChangeLog.old DESIGN-systemtap-probes.txt TODO{,-kernel,-testing}; do +for f in DESIGN-systemtap-probes.txt TODO{,-kernel,-testing}; do cp -af nptl/$f documentation/$f.nptl done cp -af crypt/README.ufc-crypt ChangeLog* documentation @@ -1381,7 +1381,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc README NEWS BUGS CONFORMANCE +%doc README NEWS %if %{without cross} %attr(755,root,root) /sbin/glibc-postinst %endif @@ -1833,7 +1833,8 @@ fi %attr(755,root,root) %{_libdir}/libthread_db.so %attr(755,root,root) %{_libdir}/libutil.so %{_libdir}/crt[1in].o -%{_libdir}/[MSg]crt1.o +%{_libdir}/[MSgr]crt1.o +%{_libdir}/grcrt1.o # ld scripts %{_libdir}/libc.so %{_libdir}/libpthread.so @@ -1843,7 +1844,6 @@ fi %endif %{_libdir}/libc_nonshared.a %{_libdir}/libg.a -%{_libdir}/libieee.a %ifarch alpha ppc sparc %{_libdir}/libnldbl_nonshared.a %endif -- 2.44.0