[glibc] - Resync with upstream sources (#834447). - Fix use-after-free in dcigettext.c (#816647).

Jeffrey Law law at fedoraproject.org
Thu Jun 21 23:28:24 UTC 2012


commit 5176c4e7b561acd45f98d820e4d044b2eea3546e
Author: Jeff Law <law at redhat.com>
Date:   Thu Jun 21 17:28:16 2012 -0600

      - Resync with upstream sources (#834447).
      - Fix use-after-free in dcigettext.c (#816647).

 .gitignore            |    3 ++
 glibc-rh729661.patch  |   56 -------------------------------------------------
 glibc-rh816647.patch  |   25 ---------------------
 glibc-sw13618-2.patch |   28 ------------------------
 glibc.spec            |   16 ++-----------
 sources               |    6 ++--
 6 files changed, 9 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 288a94e..c6294e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ glibc-2.14-394-g8f3b1ff
 /glibc-2.15.90-6043738b.tar.gz
 /glibc-2.15.90-f8308a72-fedora.tar.gz
 /glibc-2.15.90-f8308a72.tar.gz
+/glibc-2.15.90-116a106a-fedora.tar.gz
+/glibc-2.15.90-116a106a.tar.gz
+/glibc-ports-2.15.90-a20c2b3c.tar.gz
diff --git a/glibc.spec b/glibc.spec
index af26340..647a8d6 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.15.90-f8308a72
+%define glibcsrcdir glibc-2.15.90-116a106a
 %define glibcversion 2.15.90
-%define glibcportsdir glibc-ports-2.15.90-36d173fb
+%define glibcportsdir glibc-ports-2.15.90-a20c2b3c
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
 %define auxarches athlon alphaev6
@@ -121,11 +121,6 @@ Patch2003: %{name}-rh757881.patch
 # Upstream BZ 13013
 Patch2004: %{name}-rh730856.patch
 
-Patch2006: %{name}-rh729661.patch
-
-# Upstream BZ 13618
-Patch2010: %{name}-sw13618-2.patch
-
 Patch2013: %{name}-rh741105.patch
 Patch2014: %{name}-rh770869.patch
 Patch2015: %{name}-rh691912.patch
@@ -174,9 +169,6 @@ Patch2034: %{name}-rh767693-2.patch
 # Upstream BZ 14247
 Patch2036: %{name}-rh827510.patch
 
-# Upstream BZ 14277
-Patch2037: %{name}-rh816647.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
 Obsoletes: nss_db
@@ -404,11 +396,9 @@ rm -rf %{glibcportsdir}
 %patch2003 -p1
 %patch2004 -p1
 %patch0005 -p1
-%patch2006 -p1
 %patch0007 -p1
 %patch0008 -p1
 %patch0009 -p1
-%patch2010 -p1
 %patch0011 -p1
 %patch0012 -p1
 %patch2013 -p1
@@ -435,7 +425,6 @@ rm -rf %{glibcportsdir}
 %patch2034 -p1
 %patch0035 -p1
 %patch2036 -p1
-%patch2037 -p1
 
 # On powerpc32, hp timing is only available in power4/power6
 # libs, not in base, so pre-power4 dynamic linker is incompatible
@@ -1319,6 +1308,7 @@ rm -f *.filelist*
 
 %changelog
 * Thu Jun 21 2012 Jeff Law <law at redhat.com> - 2.15.90-15
+  - Resync with upstream sources (#834447).
   - Fix use-after-free in dcigettext.c (#816647).
 
 * Fri Jun 15 2012 Jeff Law <law at redhat.com> - 2.15.90-14
diff --git a/sources b/sources
index 6304cd4..7e42a78 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1a684f60874718dbfb3dd5556fd9bc77  glibc-2.15.90-f8308a72-fedora.tar.gz
-9d03c29eacc9a7b842825bc220b4ec36  glibc-2.15.90-f8308a72.tar.gz
-8502eb8b2c3abccaabaa45ce45808d48  glibc-ports-2.15.90-36d173fb.tar.gz
+281f4fd07d6f28c3463ceb3178bff664  glibc-2.15.90-116a106a-fedora.tar.gz
+4057fc6c44b80ac29a709d839ddb9b89  glibc-2.15.90-116a106a.tar.gz
+f29d9ebfdc591ebfbfbb14e24855b9c0  glibc-ports-2.15.90-a20c2b3c.tar.gz


More information about the scm-commits mailing list