- update to 2.26 (locale patch left; nightmare that upstream ignores?)

diff --git a/1055_all_glibc-resolv-dynamic.patch b/1055_all_glibc-resolv-dynamic.patch
deleted file mode 100644 (file)
index 5928b2f..0000000
--- a/1055_all_glibc-resolv-dynamic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
---- libc/resolv/res_libc.c
-+++ libc/resolv/res_libc.c
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -101,6 +102,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
-       if (resp->options & RES_INIT) {
-+              static time_t last_mtime, last_check;
-+              time_t now;
-+              struct stat statbuf;
-+              
-+              time (&now);
-+              if (now != last_check) {
-+                      last_check = now;
-+                      if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+                              last_mtime = statbuf.st_mtime;
-+                              atomicinclock (lock);
-+                              atomicinc (__res_initstamp);
-+                              atomicincunlock (lock);
-+                      }
-+              }
-               if (__res_initstamp != resp->_u._ext.initstamp) {
-                       if (resp->nscount > 0) {
-                               __res_nclose (resp);

diff --git a/branch.sh b/branch.sh
index 357a98197f936e039bc6dcb4235e857be68e7151..3db5e653674668df7b6068442de52a7aa09f3035 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://sourceware.org/git/glibc.git
 package=glibc
-tag=glibc-2.25
-branch=release/2.25/master
+tag=glibc-2.26
+branch=release/2.26/master
 out=$package-git.patch
 repo=$package.git
 

diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index ee2b7443cf388e6d91eb1e63305dbf53ce77d557..2463c3dfe055123889ffe8a137329302c3709ba3 100644 (file)
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -3298,300 +3298,6 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
 +% 381
 +int_prefix  "<U0033><U0038><U0031>"
 +END LC_TELEPHONE
---- glibc-2.18/localedata/locales/az_IR.orig   1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.18/localedata/locales/az_IR        2013-08-24 08:21:01.181549057 +0200
-@@ -0,0 +1,291 @@
-+comment_char %
-+escape_char  /
-+%
-+% Azerbaijani Turkic Language Locale for Iran
-+% Source:
-+% Contact: Mousa Moradi
-+% Email: <mousamk@gmail.com>
-+% Language: az
-+% Territory: IR
-+% Revision: 0.1
-+% Date: 2012-05-23
-+% Application: general
-+% Users: general
-+% Charset: UTF-8
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+% FIXME: Azerbaijani O in the arabic script which should have a circle above WAW,
-+% was not found in the unicode table, so we're using the simple WAW and the Sukun
-+% after that. This should be changed if they add the unified character to table.
-+
-+% NOTE: Azerbaijani dotless 'i' in the arabic script exists in the Unicode table by
-+% code U063D, but according to arthography rules, it should not be used in usual
-+% texts and can be used just in kids' learning books and whenever there is ambiguity,
-+% so here in the words that have it like 'Xanim' it's not been used.
-+
-+LC_IDENTIFICATION
-+title "Azerbaijani Turkic language locale for Iran"
-+source ""
-+address ""
-+contact "Mousa Moradi"
-+email "mousamk@gmail.com"
-+tel "(+98) 914 492 1058"
-+fax ""
-+language "Azerbaijani Turkic"
-+territory "Iran"
-+revision "0.1"
-+date "2012-05-23"
-+
-+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_PAPER
-+category "i18n:2012";LC_TELEPHONE
-+category "i18n:2012";LC_MEASUREMENT
-+category "i18n:2012";LC_ADDRESS
-+category "i18n:2012";LC_MONETARY
-+category "i18n:2012";LC_MESSAGES
-+
-+END LC_IDENTIFICATION
-+
-+%
-+% TODO: check LC_COLLATE
-+
-+LC_COLLATE
-+% FIXME: For now we're going with persian collation, but the few Azerbaijani specific
-+% characters need to be considered too.
-+copy "fa_IR"
-+
-+% Azerbaijani letters can be ordered like this:
-+% ALEF WITH MADDA ABOVE, ALEF, ALEF WITH HAMZA ABOVE, ALEF WITH HAMZA BELOW,
-+% BEH, PEH, TEH, THEH, JIM, CHEH, HHEH, KHEH, DAL, ZAL, REH, ZEH, JEH, SIN,
-+% SHIN, SAD, ZAD, TAH, ZAH, AYN, GHAYN, FEH, QAF, KAF, GAF, LAM, MIM, NUN, WAW,
-+% WAW WITH SOKUN ABOVE (O in latic script - It's not in unicode table yet),
-+% WAW WITH HAMZA ABOVE (O with two dots above in latin script), WAW WITH LITTLE
-+% WAW ABOVE (U in latic script), WAW WITH LITTLE V ABOVE (U with two dots
-+% above in latin script), HEH, YEH WITH HAMZA ABOVE (E in latin script), YEH
-+% WITH LITTLE INVERTED V ABOVE (Dotless i in latic script), YEH
-+
-+% collating-symbol <az_ar_oe>     % O with two dots above in latic script
-+% collating-symbol <az_ar_u>      % U in latic script
-+% collating-symbol <az_ar_ue>     % U with two dots above in latic script
-+% collating-symbol <az_ar_e>      % E in latic script
-+% collating-symbol <az_ar_ih>     % dotless I in latic script
-+
-+% collating-element <az_ar_o> from "<U0648><U0652>"     % O in latic script
-+% ...
-+
-+END LC_COLLATE
-+
-+LC_CTYPE
-+copy "fa_IR"
-+END LC_CTYPE
-+
-+LC_MESSAGES
-+% This is "^[yY<HEH><BEH>].*"
-+yesexpr "<U005E><U005B><U0079><U0059><U0647><U0628><U005D><U002E><U002A>"
-+% This is "^[nN<YEH><KHEH>].*"
-+noexpr  "<U005E><U005B><U006E><U004E><U06CC><U062E><U005D><U002E><U002A>"
-+% This is "Hen":
-+yesstr  "<U0647><U0646>"
-+% This is "Yox":
-+nostr   "<U06CC><U0648><U0652><U062E>"
-+END LC_MESSAGES
-+
-+LC_MONETARY
-+copy "fa_IR"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "fa_IR"
-+END LC_NUMERIC
-+
-+LC_TIME
-+% copied from "fa_IR"
-+% Alternative digits are used for Persian numerals in date and time. This is
-+% a hack, until a new prefix is defined for alternative digits.
-+alt_digits      "<U06F0><U06F0>";"<U06F0><U06F1>";/
-+                "<U06F0><U06F2>";"<U06F0><U06F3>";/
-+                "<U06F0><U06F4>";"<U06F0><U06F5>";/
-+                "<U06F0><U06F6>";"<U06F0><U06F7>";/
-+                "<U06F0><U06F8>";"<U06F0><U06F9>";/
-+                "<U06F1><U06F0>";"<U06F1><U06F1>";/
-+                "<U06F1><U06F2>";"<U06F1><U06F3>";/
-+                "<U06F1><U06F4>";"<U06F1><U06F5>";/
-+                "<U06F1><U06F6>";"<U06F1><U06F7>";/
-+                "<U06F1><U06F8>";"<U06F1><U06F9>";/
-+                "<U06F2><U06F0>";"<U06F2><U06F1>";/
-+                "<U06F2><U06F2>";"<U06F2><U06F3>";/
-+                "<U06F2><U06F4>";"<U06F2><U06F5>";/
-+                "<U06F2><U06F6>";"<U06F2><U06F7>";/
-+                "<U06F2><U06F8>";"<U06F2><U06F9>";/
-+                "<U06F3><U06F0>";"<U06F3><U06F1>";/
-+                "<U06F3><U06F2>";"<U06F3><U06F3>";/
-+                "<U06F3><U06F4>";"<U06F3><U06F5>";/
-+                "<U06F3><U06F6>";"<U06F3><U06F7>";/
-+                "<U06F3><U06F8>";"<U06F3><U06F9>";/
-+                "<U06F4><U06F0>";"<U06F4><U06F1>";/
-+                "<U06F4><U06F2>";"<U06F4><U06F3>";/
-+                "<U06F4><U06F4>";"<U06F4><U06F5>";/
-+                "<U06F4><U06F6>";"<U06F4><U06F7>";/
-+                "<U06F4><U06F8>";"<U06F4><U06F9>";/
-+                "<U06F5><U06F0>";"<U06F5><U06F1>";/
-+                "<U06F5><U06F2>";"<U06F5><U06F3>";/
-+                "<U06F5><U06F4>";"<U06F5><U06F5>";/
-+                "<U06F5><U06F6>";"<U06F5><U06F7>";/
-+                "<U06F5><U06F8>";"<U06F5><U06F9>";/
-+                "<U06F6><U06F0>";"<U06F6><U06F1>";/
-+                "<U06F6><U06F2>";"<U06F6><U06F3>";/
-+                "<U06F6><U06F4>";"<U06F6><U06F5>";/
-+                "<U06F6><U06F6>";"<U06F6><U06F7>";/
-+                "<U06F6><U06F8>";"<U06F6><U06F9>";/
-+                "<U06F7><U06F0>";"<U06F7><U06F1>";/
-+                "<U06F7><U06F2>";"<U06F7><U06F3>";/
-+                "<U06F7><U06F4>";"<U06F7><U06F5>";/
-+                "<U06F7><U06F6>";"<U06F7><U06F7>";/
-+                "<U06F7><U06F8>";"<U06F7><U06F9>";/
-+                "<U06F8><U06F0>";"<U06F8><U06F1>";/
-+                "<U06F8><U06F2>";"<U06F8><U06F3>";/
-+                "<U06F8><U06F4>";"<U06F8><U06F5>";/
-+                "<U06F8><U06F6>";"<U06F8><U06F7>";/
-+                "<U06F8><U06F8>";"<U06F8><U06F9>";/
-+                "<U06F9><U06F0>";"<U06F9><U06F1>";/
-+                "<U06F9><U06F2>";"<U06F9><U06F3>";/
-+                "<U06F9><U06F4>";"<U06F9><U06F5>";/
-+                "<U06F9><U06F6>";"<U06F9><U06F7>";/
-+                "<U06F9><U06F8>";"<U06F9><U06F9>"
-+
-+% Azerbaijani Turkic like Persian doesn't have abbreviations for weekdays and month
-+% names, so "abday" is the same as "day" and "abmon" is the same as "mon".
-+day     "<U06CC><U06A9><U0634><U0646><U0628><U0647>";/
-+        "<U062F><U0648><U0634><U0646><U0628><U0647>";/
-+        "<U0633><U0647><U200C><U0634><U0646><U0628><U0647>";/
-+        "<U0686><U0627><U0631><U0634><U0646><U0628><U0647>";/
-+        "<U062C><U06C6><U0645><U0639><U0647><U0020><U0622><U062E><U0634><U0627><U0645><U06CC>";/
-+        "<U062C><U06C6><U0645><U0639><U0647>";/
-+        "<U0634><U0646><U0628><U0647>"
-+abday   "<U06CC><U06A9><U0634><U0646><U0628><U0647>";/
-+        "<U062F><U0648><U0634><U0646><U0628><U0647>";/
-+        "<U0633><U0647><U200C><U0634><U0646><U0628><U0647>";/
-+        "<U0686><U0627><U0631><U0634><U0646><U0628><U0647>";/
-+        "<U062C><U06C6><U0645><U0639><U0647><U0020><U0622><U062E><U0634><U0627><U0645><U06CC>";/
-+        "<U062C><U06C6><U0645><U0639><U0647>";/
-+        "<U0634><U0646><U0628><U0647>"
-+mon     "<U0698><U0627><U0646><U0648><U06CC><U0647>";/
-+        "<U0641><U0648><U0631><U06CC><U0647>";/
-+        "<U0645><U0627><U0631><U0633>";/
-+        "<U0622><U0648><U0631><U06CC><U0644>";/
-+        "<U0645><U0626><U06CC>";/
-+        "<U0698><U0648><U0626><U0646>";/
-+        "<U062C><U0648><U0644><U0627><U06CC>";/
-+        "<U0622><U0642><U06C7><U0633><U062A>";/
-+        "<U0633><U067E><U062A><U0627><U0645><U0628><U0631>";/
-+        "<U0627><U0648><U0652><U06A9><U062A><U0648><U0652><U0628><U0631>";/
-+        "<U0646><U0648><U0652><U0648><U0627><U0645><U0628><U0631>";/
-+        "<U062F><U0633><U0627><U0645><U0628><U0631>"
-+abmon   "<U0698><U0627><U0646><U0648><U06CC><U0647>";/
-+        "<U0641><U0648><U0631><U06CC><U0647>";/
-+        "<U0645><U0627><U0631><U0633>";/
-+        "<U0622><U0648><U0631><U06CC><U0644>";/
-+        "<U0645><U0626><U06CC>";/
-+        "<U0698><U0648><U0626><U0646>";/
-+        "<U062C><U0648><U0644><U0627><U06CC>";/
-+        "<U0622><U0642><U06C7><U0633><U062A>";/
-+        "<U0633><U067E><U062A><U0627><U0645><U0628><U0631>";/
-+        "<U0627><U0648><U0652><U06A9><U062A><U0648><U0652><U0628><U0631>";/
-+        "<U0646><U0648><U0652><U0648><U0627><U0645><U0628><U0631>";/
-+        "<U062F><U0633><U0627><U0645><U0628><U0631>"
-+%
-+% Copied from "fa_IR":
-+% Appropriate date representation (%x)
-+%       "%Oy/%Om/%Od"
-+d_fmt   "<U0025><U004F><U0079><U002F>/
-+<U0025><U004F><U006D><U002F>/
-+<U0025><U004F><U0064>"
-+%
-+% Cofied from "fa_IR":
-+% Appropriate time representation (%X)
-+%       "%OH:%OM:%OS"
-+t_fmt   "<U0025><U004F><U0048><U003A>/
-+<U0025><U004F><U004D><U003A>/
-+<U0025><U004F><U0053>"
-+%
-+% Copied from "fa_IR":
-+% Appropriate date and time representation (%c)
-+%       "<RLE>%A %Oe %B %Oy<ARABIC COMMA> %OH:%OM:%OS<PDF>"
-+d_t_fmt "<U202B><U0025><U0041><U0020>/
-+<U0025><U004F><U0065><U0020>/
-+<U0025><U0042><U0020>/
-+<U0025><U004F><U0079><U060C><U0020>/
-+<U0025><U004F><U0048><U003A>/
-+<U0025><U004F><U004D><U003A>/
-+<U0025><U004F><U0053><U202C>"
-+am_pm     "";""
-+t_fmt_ampm ""
-+%
-+% Copied from "fa_IR" and changed a little:
-+% Appropriate date representation (date(1))
-+% "<RLE>%A %Oe %B %Oy<ARABIC COMMA> <SEEN><ALEF><AIN><ALEF><TEH> %OH:%OM:%OS (%Z)<PDF>"
-+date_fmt "<U202B><U0025><U0041><U0020>/
-+<U0025><U004F><U0065><U0020>/
-+<U0025><U0042><U0020>/
-+<U0025><U004F><U0079><U060C><U0020>/
-+<U0633><U0627><U0639><U0627><U062A><U0020>/
-+<U0025><U004F><U0048><U003A>/
-+<U0025><U004F><U004D><U003A>/
-+<U0025><U004F><U0053><U0020>/
-+<U0028><U0025><U005A><U0029><U202C>"
-+first_weekday 7
-+first_workday 7
-+cal_direction 3
-+END LC_TIME
-+
-+LC_PAPER
-+copy "fa_IR"
-+END LC_PAPER
-+
-+LC_MEASUREMENT
-+copy "fa_IR"
-+END LC_MEASUREMENT
-+
-+LC_ADDRESS
-+% NOTE: Copied from "fr_IR", it should be checked and reconsidered if necessary:
-+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
-+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
-+<U004E><U0025><U0063><U0025><U004E>"
-+
-+country_name "<U0627><U06CC><U0631><U0627><U0646>"
-+country_ab2 "IR"
-+country_ab3 "IRN"
-+country_num 364
-+country_car "IR"
-+country_isbn "964"
-+
-+% Azerbaijan Turkcesi
-+lang_name "<U0622><U0630><U0631><U0628><U0627><U06CC><U062C><U0627><U0646>/
-+<U0020><U062A><U06C6><U0631><U06A9><U062C><U0647><U200C><U0633><U06CC>"
-+lang_ab "az"
-+lang_term "aze"
-+lang_lib "aze"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "fa_IR"
-+END LC_TELEPHONE
-+
-+LC_NAME
-+name_gen ""
-+% Xanim:
-+name_miss "<U062E><U0627><U0646><U06CC><U0645>"
-+name_ms "<U062E><U0627><U0646><U06CC><U0645>"
-+name_mrs "<U062E><U0627><U0646><U06CC><U0645>"
-+% Agha
-+name_mr "<U0622><U063A><U0627>"
-+name_fmt "<U0025><U0064><U0025><U0074><U0025><U0073><U0025><U0074>/
-+<U0025><U0067><U0025><U0074><U0025><U006D><U0025><U0074><U0025><U0066>"
-+END LC_NAME
 --- 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 @@
@@ -4025,18 +3731,16 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
 +%%%%%%%%%%%%%%%%%%%% locale definition file "sd_PK" ends %%%%%%%%%%%%%%%%%%%%%
 --- glibc-2.19/localedata/SUPPORTED.orig       2014-02-07 10:04:38.000000000 +0100
 +++ glibc-2.19/localedata/SUPPORTED    2014-02-08 08:43:20.218029506 +0100
-@@ -49,20 +49,25 @@
+@@ -50,6 +50,8 @@ ar_TN.UTF-8/UTF-8 \
  ar_TN/ISO-8859-6 \
  ar_YE.UTF-8/UTF-8 \
  ar_YE/ISO-8859-6 \
 +ary_MA@latin/UTF-8 \
- ayc_PE/UTF-8 \
 +ay_PE/UTF-8 \
+ ayc_PE/UTF-8 \
  az_AZ/UTF-8 \
-+az_IR/UTF-8 \
- as_IN/UTF-8 \
- ast_ES.UTF-8/UTF-8 \
- ast_ES/ISO-8859-15 \
+ az_IR/UTF-8 \
+@@ -59,6 +61,8 @@ ast_ES/ISO-8859-15 \
  be_BY.UTF-8/UTF-8 \
  be_BY/CP1251 \
  be_BY@latin/UTF-8 \
@@ -4045,13 +3749,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  bem_ZM/UTF-8 \
  ber_DZ/UTF-8 \
  ber_MA/UTF-8 \
- bg_BG.UTF-8/UTF-8 \
- bg_BG/CP1251 \
- bhb_IN.UTF-8/UTF-8 \
- bho_IN/UTF-8 \
- bn_BD/UTF-8 \
- bn_IN/UTF-8 \
-@@ -83,7 +88,8 @@
+@@ -83,7 +87,8 @@
  ca_IT.UTF-8/UTF-8 \
  ca_IT/ISO-8859-15 \
  ce_RU/UTF-8 \
@@ -4060,7 +3758,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  cmn_TW/UTF-8 \
  crh_UA/UTF-8 \
  cs_CZ.UTF-8/UTF-8 \
-@@ -193,11 +199,15 @@
+@@ -193,11 +198,15 @@
  eu_ES.UTF-8/UTF-8 \
  eu_ES/ISO-8859-1 \
  eu_ES@euro/ISO-8859-15 \
@@ -4076,7 +3774,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  fil_PH/UTF-8 \
  fo_FO.UTF-8/UTF-8 \
  fo_FO/ISO-8859-1 \
-@@ -214,8 +224,14 @@
+@@ -214,8 +223,14 @@
  fr_LU.UTF-8/UTF-8 \
  fr_LU/ISO-8859-1 \
  fr_LU@euro/ISO-8859-15 \
@@ -4091,7 +3789,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  fy_DE/UTF-8 \
  ga_IE.UTF-8/UTF-8 \
  ga_IE/ISO-8859-1 \
-@@ -243,11 +259,13 @@
+@@ -243,11 +258,13 @@
  hsb_DE/ISO-8859-2 \
  hsb_DE.UTF-8/UTF-8 \
  ht_HT/UTF-8 \
@@ -4105,7 +3803,7 @@ 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 +278,12 @@
+@@ -260,10 +277,12 @@
  it_IT/ISO-8859-1 \
  it_IT@euro/ISO-8859-15 \
  iu_CA/UTF-8 \
@@ -4118,7 +3816,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  kk_KZ.UTF-8/UTF-8 \
  kk_KZ/PT154 \
  kl_GL.UTF-8/UTF-8 \
-@@ -281,13 +301,19 @@
+@@ -281,13 +300,19 @@
  ku_TR/ISO-8859-9 \
  kw_GB.UTF-8/UTF-8 \
  kw_GB/ISO-8859-1 \
@@ -4138,7 +3836,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 +327,7 @@
+@@ -301,6 +326,7 @@
  mhr_RU/UTF-8 \
  mi_NZ.UTF-8/UTF-8 \
  mi_NZ/ISO-8859-13 \
@@ -4146,7 +3844,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  mk_MK.UTF-8/UTF-8 \
  mk_MK/ISO-8859-5 \
  ml_IN/UTF-8 \
-@@ -312,11 +339,17 @@
+@@ -312,11 +338,17 @@
  mt_MT.UTF-8/UTF-8 \
  mt_MT/ISO-8859-3 \
  my_MM/UTF-8 \
@@ -4164,7 +3862,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 +364,13 @@
+@@ -331,10 +363,13 @@
  nl_NL@euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
@@ -4178,7 +3876,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 +380,7 @@
+@@ -344,6 +379,7 @@
  pa_PK/UTF-8 \
  pap_AW/UTF-8 \
  pap_CW/UTF-8 \
@@ -4186,7 +3884,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 +391,10 @@
+@@ -354,7 +390,10 @@
  pt_PT/ISO-8859-1 \
  pt_PT@euro/ISO-8859-15 \
  quz_PE/UTF-8 \
@@ -4197,7 +3895,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 +401,25 @@
+@@ -361,19 +400,25 @@
  ru_RU/ISO-8859-5 \
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
@@ -4223,7 +3921,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  sl_SI.UTF-8/UTF-8 \
  sl_SI/ISO-8859-2 \
  so_DJ.UTF-8/UTF-8 \
-@@ -385,9 +431,19 @@
+@@ -385,9 +430,19 @@
  sq_AL.UTF-8/UTF-8 \
  sq_AL/ISO-8859-1 \
  sq_MK/UTF-8 \
@@ -4243,7 +3941,7 @@ diff -Nur glibc/localedata/locales.orig/shn_MM glibc/localedata/locales/shn_MM
  ss_ZA/UTF-8 \
  st_ZA.UTF-8/UTF-8 \
  st_ZA/ISO-8859-1 \
-@@ -396,15 +452,21 @@
+@@ -396,15 +451,21 @@
  sv_FI@euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -4265,13 +3963,15 @@ 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 \
-@@ -413,15 +475,19 @@
+@@ -490,6 +490,7 @@ tig_ER/UTF-8 \
  tk_TM/UTF-8 \
  tl_PH.UTF-8/UTF-8 \
  tl_PH/ISO-8859-1 \
 +tn_ZA.ISO-8859-10/ISO-8859-10 \
  tn_ZA/UTF-8 \
- tr_CY.UTF-8/UTF-8 \
+ to_TO/UTF-8 \
+ tpi_PG/UTF-8 \
+@@ -497,7 +498,10 @@ tr_CY.UTF-8/UTF-8 \
  tr_CY/ISO-8859-9 \
  tr_TR.UTF-8/UTF-8 \
  tr_TR/ISO-8859-9 \
@@ -4282,10 +3982,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 \
- uk_UA.UTF-8/UTF-8 \
- uk_UA/KOI8-U \
- unm_US/UTF-8 \
-@@ -426,8 +492,9 @@
+@@ -426,8 +491,9 @@
  uk_UA/KOI8-U \
  unm_US/UTF-8 \
  ur_IN/UTF-8 \

diff --git a/glibc-thread_start.patch b/glibc-thread_start.patch
deleted file mode 100644 (file)
index 8a262fb..0000000
--- a/glibc-thread_start.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-2006-11-30  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-        * sysdeps/unix/sysv/linux/x86_64/clone.S: Provide CFI for the outermost
-        `clone' function to ensure proper unwinding stop of gdb.
-
---- glibc-2.8/sysdeps/unix/sysv/linux/x86_64/clone.S.orig      2008-04-16 20:57:05.000000000 +0200
-+++ glibc-2.8/sysdeps/unix/sysv/linux/x86_64/clone.S   2008-06-24 23:18:02.000000000 +0200
-@@ -89,9 +89,6 @@
-       ret
- 
- L(thread_start):
--      cfi_startproc;
--      /* Clearing frame pointer is insufficient, use CFI.  */
--      cfi_undefined (rip);
-       /* Clear the frame pointer.  The ABI suggests this be done, to mark
-          the outermost frame obviously.  */
-       xorl    %ebp, %ebp
-@@ -116,7 +113,6 @@
-       /* Call exit with return value from function call. */
-       movq    %rax, %rdi
-       call    HIDDEN_JUMPTARGET (_exit)
--      cfi_endproc;
- 
-       cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))

diff --git a/glibc.spec b/glibc.spec
index 2092e40bf2fa556bacce4ec9c47477367f36b2bf..5ace2e17adef1d9dc86e9285c1de4738577ca3c9 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -8,7 +8,7 @@
 # - math/{test-fenv,test-tgmath,test-float,test-ifloat}, debug/backtrace-tst(SEGV)  fail on alpha
 #
 # Conditional build:
-# min_kernel   (default is 3.4.0 except for x86/x86_64 where 2.6.32 suffices)
+# min_kernel   (default is 3.4.0 except for x86/x86_64 where 3.2.0 suffices)
 %bcond_without memusage        # don't build memusage utility
 %bcond_without selinux         # without SELinux support (in nscd)
 %bcond_with    tests           # perform "make test"
@@ -18,7 +18,7 @@
 %bcond_with    bash_nls        # use bash NLS in shell scripts (ldd, sotruss); restores /bin/bash dep
 #
 %ifarch %{ix86} %{x8664}
-%{!?min_kernel:%global         min_kernel      2.6.32} 
+%{!?min_kernel:%global         min_kernel      3.2.0}
 %else
 %{!?min_kernel:%global         min_kernel      3.4.0}
 %endif
@@ -27,7 +27,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.25
+%define                core_version    2.26
 %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:       5
+Release:       0.1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 1496c3bf41adf9db0ebd0af01f202eed
+# Source0-md5: 102f637c3812f81111f48f2427611be1
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -57,8 +57,8 @@ Source6:      %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
-Patch0:                glibc-git.patch
-# Patch0-md5:  0bf158757ab1c8511e7c9320676a7188
+# Patch0:              glibc-git.patch
+# Patch0-md5:  d41d8cd98f00b204e9800998ecf8427e
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -80,7 +80,6 @@ Patch17:      %{name}-morelocales.patch
 # fixes mostly pending for upstream merge
 Patch18:       %{name}-locale_fixes.patch
 Patch19:       %{name}-ZA_collate.patch
-Patch20:       %{name}-thread_start.patch
 
 Patch23:       %{name}-pt_pax.patch
 
@@ -89,8 +88,6 @@ Patch27:      %{name}-c-utf8-locale.patch
 
 Patch29:       %{name}-arm-alignment-fix.patch
 Patch30:       glibc-rh1124987.patch
-
-Patch38:       1055_all_glibc-resolv-dynamic.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
 BuildRequires: autoconf >= 2.69
@@ -954,7 +951,7 @@ echo "Minimal supported kernel is 2.6.32" >&2
 exit 1
 %endif
 
-%patch0 -p1
+#%patch0 -p1
 
 %patch2 -p1
 %patch3 -p0
@@ -972,9 +969,9 @@ exit 1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
+# FIXME/MERGE UPSTREAM/DROP
+#%patch18 -p1
 %patch19 -p1
-%patch20 -p1
 
 %patch23 -p0
 
@@ -983,8 +980,6 @@ exit 1
 %patch29 -p1
 %patch30 -p1
 
-%patch38 -p1
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -1018,6 +1013,7 @@ AWK="gawk" \
        --enable-hidden-plt \
        --enable-kernel="%{min_kernel}" \
        --enable-nss-crypt%{!?with_nss_crypt:=no} \
+       --enable-obsolete-nsl \
        --enable-obsolete-rpc \
        --enable-profile \
        --enable-stack-protector=strong \