From 4e1a9eb783b804e02dd42b4409a621a814a26b4c Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 3 Dec 2012 13:37:41 -0700 Subject: [PATCH] * Mon Dec 3 2012 Jeff Law - 2.16.90-36 - Resync with master - Drop local patch for 657588 that is no longer needed. - Drop local patch for 740682 that is no longer needed. - Drop local patch for 770439 that is no longer needed. - Drop local patch for 789209 that is no longer needed. - Drop lotch patch for nss-files-overflow that seems useless. - Drop localedata-locales-fixes as they were rejected upstream. - Drop test-debug-gnuc-hack.patch that seems useless now. - Repack patchlist. --- .gitignore | 2 + glibc-fedora-localedata-locales-fixes.patch | 57 --------------------- glibc-fedora-test-debug-gnuc-hack.patch | 22 -------- glibc-rh740682.patch | 12 ----- glibc-rh770439.patch | 22 -------- glibc-rh789209.patch | 12 ----- glibc.spec | 30 +++++------ sources | 4 +- 8 files changed, 17 insertions(+), 144 deletions(-) delete mode 100644 glibc-fedora-localedata-locales-fixes.patch delete mode 100644 glibc-fedora-test-debug-gnuc-hack.patch delete mode 100644 glibc-rh740682.patch delete mode 100644 glibc-rh770439.patch delete mode 100644 glibc-rh789209.patch diff --git a/.gitignore b/.gitignore index 55f172c..16cb3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,5 @@ glibc-2.14-394-g8f3b1ff /glibc-2.16.90-1a538b9f.tar.gz /glibc-2.16.90-70e5aee4-fedora.tar.gz /glibc-2.16.90-70e5aee4.tar.gz +/glibc-2.16.90-0136fe2a-fedora.tar.gz +/glibc-2.16.90-0136fe2a.tar.gz diff --git a/glibc-fedora-localedata-locales-fixes.patch b/glibc-fedora-localedata-locales-fixes.patch deleted file mode 100644 index a1a254e..0000000 --- a/glibc-fedora-localedata-locales-fixes.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nrup a/localedata/locales/cy_GB b/localedata/locales/cy_GB ---- a/localedata/locales/cy_GB 2012-06-05 07:42:49.000000000 -0600 -+++ b/localedata/locales/cy_GB 2012-06-07 12:15:21.805318719 -0600 -@@ -248,9 +248,9 @@ mon "" - d_fmt "" - t_fmt "" --am_pm "";"" -+am_pm "";"" - t_fmt_ampm "" --date_fmt "/ -+date_fmt "/ - / - " - first_workday 2 -diff -Nrup a/localedata/locales/en_GB b/localedata/locales/en_GB ---- a/localedata/locales/en_GB 2012-06-05 07:42:49.000000000 -0600 -+++ b/localedata/locales/en_GB 2012-06-07 12:15:21.806318715 -0600 -@@ -116,7 +116,7 @@ mon "" - d_fmt "" - t_fmt "" --am_pm "";"" -+am_pm "";"" - t_fmt_ampm "" - date_fmt "/ - / -diff -Nrup a/localedata/locales/zh_TW b/localedata/locales/zh_TW ---- a/localedata/locales/zh_TW 2012-06-05 07:42:49.000000000 -0600 -+++ b/localedata/locales/zh_TW 2012-06-07 12:15:21.807318711 -0600 -@@ -1,7 +1,7 @@ - comment_char % - escape_char / - % --% Chinese language locale for Taiwan R.O.C. -+% Chinese language locale for Taiwan - % charmap: BIG5-CP950 - % - % Original Author: -@@ -17,7 +17,7 @@ escape_char / - % Reference: http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf - - LC_IDENTIFICATION --title "Chinese locale for Taiwan R.O.C." -+title "Chinese locale for Taiwan" - source "" - address "" - contact "" -@@ -25,7 +25,7 @@ email "bug-glibc-locales@gnu.org" - tel "" - fax "" - language "Chinese" --territory "Taiwan R.O.C." -+territory "Taiwan" - revision "0.2" - date "2000-08-02" - % diff --git a/glibc-fedora-test-debug-gnuc-hack.patch b/glibc-fedora-test-debug-gnuc-hack.patch deleted file mode 100644 index 977bd76..0000000 --- a/glibc-fedora-test-debug-gnuc-hack.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e818d7d5034bd33373aebf570402abdb8e434f6e Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek -Date: Sat, 19 Mar 2005 20:18:00 +0000 -Subject: [PATCH] Updated to fedora-glibc-20050319T1907 - ---- - debug/tst-chk1.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 229 insertions(+), 5 deletions(-) - -diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c ---- a/debug/tst-chk1.c -+++ b/debug/tst-chk1.c -@@ -16,6 +16,9 @@ - License along with the GNU C Library; if not, see - . */ - -+/* Hack: make sure GCC doesn't know __chk_fail () will not return. */ -+#define __noreturn__ -+ - #include - #include - #include diff --git a/glibc-rh740682.patch b/glibc-rh740682.patch deleted file mode 100644 index 999d266..0000000 --- a/glibc-rh740682.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup c/time/sys/time.h d/time/sys/time.h ---- c/time/sys/time.h 2012-05-20 19:47:38.000000000 -0600 -+++ d/time/sys/time.h 2012-05-21 00:14:17.033127079 -0600 -@@ -77,7 +77,7 @@ extern int gettimeofday (struct timeval - This call is restricted to the super-user. */ - extern int settimeofday (const struct timeval *__tv, - const struct timezone *__tz) -- __THROW __nonnull ((1)); -+ __THROW; - - /* Adjust the current time of day by the amount in DELTA. - If OLDDELTA is not NULL, it is filled in with the amount diff --git a/glibc-rh770439.patch b/glibc-rh770439.patch deleted file mode 100644 index a6ec302..0000000 --- a/glibc-rh770439.patch +++ /dev/null @@ -1,22 +0,0 @@ -2012-02-08 Rakesh Pandit - - * locales/ks_IN@devanagari: Fix week day names. - ---- a/localedata/locales/ks_IN@devanagari -+++ a/localedata/locales/ks_IN@devanagari -@@ -64,11 +64,11 @@ abday "";/ - "" - % - % Full weekday names (%A) --day "";/ -+day "";/ - "";/ -- "";/ -- "";/ -- "";/ -+ "";/ -+ "";/ -+ "";/ - "";/ - "" - % diff --git a/glibc-rh789209.patch b/glibc-rh789209.patch deleted file mode 100644 index 9645298..0000000 --- a/glibc-rh789209.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup a/localedata/locales/uk_UA b/localedata/locales/uk_UA ---- a/localedata/locales/uk_UA 2012-01-01 05:16:32.000000000 -0700 -+++ b/localedata/locales/uk_UA 2012-02-09 22:32:36.864134146 -0700 -@@ -700,7 +700,7 @@ LC_MONETARY - % 200 hrv. - 200 hryven (money) - - % the local currency symbol --currency_symbol "" % hr (hryvnya) -+currency_symbol "" % hr (hryvnya) - - % This must be a 4-character string containing the international currency - % symbol as defined by the ISO 4217 standard (three characters) followed diff --git a/glibc.spec b/glibc.spec index 1e0517d..99e333d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.16.90-70e5aee4 +%define glibcsrcdir glibc-2.16.90-0136fe2a %define glibcversion 2.16.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -81,7 +81,7 @@ Patch0006: %{name}-arm-hardfloat-3.patch Patch0007: %{name}-rh697421.patch # Needs to be sent upstream -Patch0008: %{name}-rh740682.patch +Patch0008: %{name}-fedora-getrlimit-PLT.patch Patch0009: %{name}-fedora-include-bits-ldbl.patch # stap, needs to be sent upstream @@ -89,7 +89,9 @@ Patch0010: %{name}-stap-libm.patch Patch0012: %{name}-fedora-linux-tcsetattr.patch Patch0014: %{name}-fedora-nptl-linklibc.patch -Patch0018: %{name}-fedora-localedata-locales-fixes.patch +Patch0015: %{name}-fedora-localedef.patch +Patch0016: %{name}-fedora-i386-tls-direct-seg-refs.patch +Patch0018: %{name}-fedora-pt_chown.patch Patch0019: %{name}-fedora-nis-rh188246.patch Patch0020: %{name}-fedora-manual-dircategory.patch Patch0024: %{name}-fedora-locarchive.patch @@ -110,11 +112,6 @@ Patch0033: %{name}-fedora-elf-ORIGIN.patch Patch0034: %{name}-fedora-elf-init-hidden_undef.patch Patch0035: %{name}-fedora-elf-rh737223.patch Patch0036: %{name}-fedora-gai-canonical.patch -Patch0037: %{name}-fedora-test-debug-gnuc-hack.patch -Patch0038: %{name}-fedora-localedef.patch -Patch0039: %{name}-fedora-getrlimit-PLT.patch -Patch0040: %{name}-fedora-i386-tls-direct-seg-refs.patch -Patch0041: %{name}-fedora-pt_chown.patch # # Patches from upstream @@ -130,8 +127,6 @@ Patch0041: %{name}-fedora-pt_chown.patch Patch2011: %{name}-rh757881.patch Patch2013: %{name}-rh741105.patch -Patch2015: %{name}-rh770439.patch -Patch2016: %{name}-rh789209.patch Patch2017: %{name}-rh691912.patch # Upstream BZ 9954 @@ -386,8 +381,8 @@ package or when debugging this package. %patch0012 -p1 %patch2013 -p1 %patch0014 -p1 -%patch2015 -p1 -%patch2016 -p1 +%patch0015 -p1 +%patch0016 -p1 %patch2017 -p1 %patch0018 -p1 %patch0019 -p1 @@ -408,11 +403,6 @@ package or when debugging this package. %patch0034 -p1 %patch0035 -p1 %patch0036 -p1 -%patch0037 -p1 -%patch0038 -p1 -%patch0039 -p1 -%patch0040 -p1 -%patch0041 -p1 # On powerpc32, hp timing is only available in power4/power6 # libs, not in base, so pre-power4 dynamic linker is incompatible @@ -1210,8 +1200,14 @@ rm -f *.filelist* * Mon Dec 3 2012 Jeff Law - 2.16.90-36 - Resync with master - Drop local patch for 657588 that is no longer needed. + - Drop local patch for 740682 that is no longer needed. + - Drop local patch for 770439 that is no longer needed. + - Drop local patch for 789209 that is no longer needed. - Drop lotch patch for nss-files-overflow that seems useless. + - Drop localedata-locales-fixes as they were rejected + upstream. + - Drop test-debug-gnuc-hack.patch that seems useless now. - Repack patchlist. * Fri Nov 30 2012 Jeff Law - 2.16.90-35 diff --git a/sources b/sources index 023f103..7f4caaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9c01e48bb4243efe6eccd816e7778397 glibc-2.16.90-70e5aee4-fedora.tar.gz -b916c52cb084837eabb4107e7fb830ca glibc-2.16.90-70e5aee4.tar.gz +7e76edce71548ff1c2b35789756af7b8 glibc-2.16.90-0136fe2a-fedora.tar.gz +6b9d4ffa9757f92c6af8cb1c5db293e5 glibc-2.16.90-0136fe2a.tar.gz