[glibc] - Rsync with upstream sources - Drop local 552960-2 patch now that it's upstream. - Drop local
Jeffrey Law
law at fedoraproject.org
Thu Oct 11 15:54:20 UTC 2012
commit 69ddcb4ca7fac4f6917f3cc4142dbd63efd464d3
Author: Jeff Law <law at redhat.com>
Date: Thu Oct 11 09:54:09 2012 -0600
- Rsync with upstream sources
- Drop local 552960-2 patch now that it's upstream.
- Drop local 858274 patch now that the root problem is fixed upstream.
- Repack patchlist.
.gitignore | 2 +
glibc-fedora-elf-rh737223.patch | 40 ++---
glibc-rh552960-2.patch | 434 ---------------------------------------
glibc-rh858274.patch | 383 ----------------------------------
glibc.spec | 36 ++--
sources | 4 +-
6 files changed, 35 insertions(+), 864 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e794a91..090442b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,5 @@ glibc-2.14-394-g8f3b1ff
/glibc-2.16.90-05699367.tar.gz
/glibc-2.16.90-c30e8edf-fedora.tar.gz
/glibc-2.16.90-c30e8edf.tar.gz
+/glibc-2.16.90-54a41734-fedora.tar.gz
+/glibc-2.16.90-54a41734.tar.gz
diff --git a/glibc-fedora-elf-rh737223.patch b/glibc-fedora-elf-rh737223.patch
index c20ba96..5ae6e3a 100644
--- a/glibc-fedora-elf-rh737223.patch
+++ b/glibc-fedora-elf-rh737223.patch
@@ -1,27 +1,15 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab at redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
-* Tue Oct 11 2011 Andreas Schwab <schwab at redhat.com> - 2.14.90-11
-- Horrible workaround for horribly broken software (#737223)
-
----
- elf/rtld.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1404,7 +1404,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- char *copy = malloc (len);
- if (copy == NULL)
- _dl_fatal_printf ("out of memory\n");
-- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+ l->l_libname->name = memcpy (copy, dsoname, len);
-+ if (GLRO(dl_debug_mask))
-+ l->l_name = copy;
- }
+Binary files a/elf/.rtld.c.rej.swp and b/elf/.rtld.c.rej.swp differ
+diff -Nrup a/elf/setup-vdso.h b/elf/setup-vdso.h
+--- a/elf/setup-vdso.h 2012-10-10 21:34:38.000000000 -0600
++++ b/elf/setup-vdso.h 2012-10-11 09:43:14.152958832 -0600
+@@ -93,7 +93,9 @@ setup_vdso (struct link_map *main_map __
+ char *copy = malloc (len);
+ if (copy == NULL)
+ _dl_fatal_printf ("out of memory\n");
+- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
++ l->l_libname->name = memcpy (copy, dsoname, len);
++ if (GLRO(dl_debug_mask))
++ l->l_name = copy;
+ }
- /* Add the vDSO to the object list. */
+ /* Add the vDSO to the object list. */
diff --git a/glibc.spec b/glibc.spec
index cba10c5..0d07fb3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.16.90-c30e8edf
+%define glibcsrcdir glibc-2.16.90-54a41734
%define glibcversion 2.16.90
### glibc.spec.in follows:
%define run_glibc_tests 1
@@ -27,7 +27,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 23%{?dist}
+Release: 24%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -63,9 +63,7 @@ Source1: %{glibcsrcdir}-fedora.tar.gz
# change this.
Patch0001: %{name}-fedora-nscd.patch
-# Reverting an upstream patch. Once upstream fixes the problem
-# Remove this patch and resync.
-Patch0002: %{name}-rh858274.patch
+Patch0002: %{name}-fedora-regcomp-sw11561.patch
# Not likely to be accepted upstream
Patch0003: %{name}-rh787201.patch
@@ -112,6 +110,7 @@ Patch0037: %{name}-fedora-test-debug-gnuc-hack.patch
Patch0038: %{name}-fedora-getconf.patch
Patch0039: %{name}-fedora-getrlimit-PLT.patch
Patch0040: %{name}-fedora-i386-tls-direct-seg-refs.patch
+Patch0041: %{name}-fedora-pt_chown.patch
Patch0042: %{name}-fedora-include-bits-ldbl.patch
Patch0043: %{name}-fedora-ldd.patch
Patch0044: %{name}-fedora-linux-tcsetattr.patch
@@ -124,11 +123,9 @@ Patch0050: %{name}-fedora-locarchive.patch
Patch0051: %{name}-fedora-manual-dircategory.patch
Patch0052: %{name}-fedora-nis-rh188246.patch
Patch0053: %{name}-fedora-nptl-linklibc.patch
+Patch0054: %{name}-fedora-ppc-unwind.patch
Patch0055: %{name}-fedora-nss-files-overflow-fix.patch
-Patch0057: %{name}-fedora-ppc-unwind.patch
-Patch0058: %{name}-fedora-pt_chown.patch
-Patch0059: %{name}-fedora-regcomp-sw11561.patch
-Patch0060: %{name}-fedora-strict-aliasing.patch
+Patch0056: %{name}-fedora-strict-aliasing.patch
#
# Patches from upstream
@@ -184,10 +181,7 @@ Patch2027: %{name}-rh819430.patch
# See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html
Patch2028: %{name}-rh767693-2.patch
-# Upstream BZ 14652
-Patch2062: %{name}-rh552960-2.patch
-
-Patch2063: %{name}-rh864820.patch
+Patch2057: %{name}-rh864820.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
@@ -452,6 +446,7 @@ package or when debugging this package.
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
+%patch0041 -p1
%patch0042 -p1
%patch0043 -p1
%patch0044 -p1
@@ -464,13 +459,10 @@ package or when debugging this package.
%patch0051 -p1
%patch0052 -p1
%patch0053 -p1
+%patch0054 -p1
%patch0055 -p1
-%patch0057 -p1
-%patch0058 -p1
-%patch0059 -p1
-%patch0060 -p1
-%patch2062 -p1
-%patch2063 -p1
+%patch0056 -p1
+%patch2057 -p1
# On powerpc32, hp timing is only available in power4/power6
# libs, not in base, so pre-power4 dynamic linker is incompatible
@@ -1265,6 +1257,12 @@ rm -f *.filelist*
%endif
%changelog
+* Thu Oct 11 2012 Jeff Law <law at redhat.com> - 2.16.90-24
+ - Rsync with upstream sources
+ - Drop local 552960-2 patch now that it's upstream.
+ - Drop local 858274 patch now that the root problem is fixed upstream.
+ - Repack patchlist.
+
* Wed Oct 10 2012 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.16.90-23
- Fix Marathi names for Wednesday, September and October (#rh864820).
diff --git a/sources b/sources
index a67f255..dd33f77 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-64ded9e5fb9e997c6ffd8d8d3e30257d glibc-2.16.90-c30e8edf-fedora.tar.gz
-4805adad605f492302e942964a16cb71 glibc-2.16.90-c30e8edf.tar.gz
+7cbd47d13972f3c11ad3f5ab1c22d4d7 glibc-2.16.90-54a41734-fedora.tar.gz
+cd3e0a870c7a960385978c0b6e77ec54 glibc-2.16.90-54a41734.tar.gz
More information about the scm-commits
mailing list