From 05b946fcc426ac9159065a832ca66b256ecba06be77327f6949a862e5c63436f Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Mon, 10 Jan 2011 12:22:49 +0000
Subject: [PATCH] Accepting request 57646 from Base:System

Accepted submit request 57646 from user rguenther

OBS-URL: https://build.opensuse.org/request/show/57646
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=32
---
 glibc-2.11.3-bnc658509.diff | 20 ++++++++++++++++++++
 glibc.changes               |  6 ++++++
 glibc.spec                  | 13 ++++++++++---
 ready                       |  0
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 glibc-2.11.3-bnc658509.diff
 create mode 100644 ready

diff --git a/glibc-2.11.3-bnc658509.diff b/glibc-2.11.3-bnc658509.diff
new file mode 100644
index 0000000..bdafe1f
--- /dev/null
+++ b/glibc-2.11.3-bnc658509.diff
@@ -0,0 +1,20 @@
+--- ./string/bits/string3.h.orig	2010-12-09 13:29:45.000000000 +0100
++++ ./string/bits/string3.h	2010-12-09 13:30:15.000000000 +0100
+@@ -53,7 +53,7 @@
+ }
+ 
+ __extern_always_inline void *
+-__NTH (memmove (void *__restrict __dest, __const void *__restrict __src,
++__NTH (memmove (void * __dest, __const void * __src,
+ 		size_t __len))
+ {
+   return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
+@@ -88,7 +88,7 @@
+ 
+ #ifdef __USE_BSD
+ __extern_always_inline void
+-__NTH (bcopy (__const void *__restrict __src, void *__restrict __dest,
++__NTH (bcopy (__const void * __src, void * __dest,
+ 	      size_t __len))
+ {
+   (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
diff --git a/glibc.changes b/glibc.changes
index 1f510b3..82d5407 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  9 12:33:35 UTC 2010 - rguenther@novell.com
+
+- Drop restrict qualifiers from memmove and bcopy fortify wrappers.
+  [bnc#658509]
+
 -------------------------------------------------------------------
 Tue Nov 30 01:53:42 CET 2010 - pbaudis@suse.cz
 
diff --git a/glibc.spec b/glibc.spec
index 3bf491e..3f17936 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -64,7 +64,7 @@ Obsoletes:      glibc-32bit
 Provides:       rtld(GNU_HASH)
 AutoReqProv:    on
 Version:        2.11.3
-Release:        1
+Release:        3
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -141,6 +141,7 @@ Patch502:       ARM_glibc-2.10.1-local-lowlevellock.diff
 Patch503:       ARM_glibc-2.10.1-local-no-hwcap.diff
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=11155
 Patch600:       glibc-sparc64-fxstat.diff
+Patch601:	glibc-2.11.3-bnc658509.diff
 
 %description
 The GNU C Library provides the most important standard libraries used
@@ -362,6 +363,7 @@ rm nscd/s-stamp
 %patch503
 %endif
 %patch600 -p1
+%patch601
 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
 #
@@ -382,12 +384,12 @@ rm nscd/s-stamp
 rm -fv sysdeps/powerpc/powerpc32/power4/hp-timing.c sysdeps/powerpc/powerpc32/power4/hp-timing.h
 find . -name configure | xargs touch
 
+
 #######################################################################
 ###
 ### BUILD
 ###
 #######################################################################
-
 %build
 if [ -x /bin/uname.bin ]; then
 	/bin/uname.bin -a
@@ -552,6 +554,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra
 %endif
     '-DLIBDIR="/%{_lib}"' '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"'
 
+
 #######################################################################
 ###
 ### CHECK
@@ -574,6 +577,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra
 %endif
 make -C cc-base check-abi || echo check-abi failed
 
+
 #######################################################################
 ###
 ### INSTALL
@@ -666,6 +670,7 @@ cp -av bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
 	ln -sf ../%{_lib}/ld-%{version}.so $RPM_BUILD_ROOT/lib/ld64.so.1
 %endif
 
+
 # Miscelanna:
 
 install -m 0700 glibc_post_upgrade $RPM_BUILD_ROOT%{_sbindir}
@@ -686,6 +691,7 @@ cp -p manual/libc/*.html $RPM_BUILD_ROOT/usr/share/doc/glibc
 
 cd manpages; make install_root=$RPM_BUILD_ROOT install; cd ..
 
+
 # nscd tools:
 
 cp nscd/nscd.conf $RPM_BUILD_ROOT/etc
@@ -759,6 +765,7 @@ for o in $RPM_BUILD_ROOT/%{_libdir}/crt[1in].o $RPM_BUILD_ROOT/%{_libdir}/lib*_n
 	objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o
 done
 
+
 #######################################################################
 ###
 ### ...
@@ -796,6 +803,7 @@ done
 %insserv_cleanup
 exit 0
 
+
 #######################################################################
 ###
 ### FILES
@@ -803,7 +811,6 @@ exit 0
 #######################################################################
 
 # glibc
-
 %files
 %defattr(-,root,root)
 %doc LICENSES
diff --git a/ready b/ready
new file mode 100644
index 0000000..473a0f4