Accepting request 320975 from home:Andreas_Schwab:Factory

- dont-remove-nodelete-flag.patch: Don't remove DF_1_NODELETE flag on
  failed dlopen.

OBS-URL: https://build.opensuse.org/request/show/320975
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=412

dont-remove-nodelete-flag.patch

@@ -0,0 +1,19 @@
+Index: glibc-2.22/elf/dl-close.c
+===================================================================
+--- glibc-2.22.orig/elf/dl-close.c
++++ glibc-2.22/elf/dl-close.c
+@@ -152,14 +152,6 @@ _dl_close_worker (struct link_map *map,
+       l->l_idx = idx;
+       maps[idx] = l;
+       ++idx;
+-
+-      /* Clear DF_1_NODELETE to force object deletion.  We don't need to touch
+-	 l_tls_dtor_count because forced object deletion only happens when an
+-	 error occurs during object load.  Destructor registration for TLS
+-	 non-POD objects should not have happened till then for this
+-	 object.  */
+-      if (force)
+-	l->l_flags_1 &= ~DF_1_NODELETE;
+     }
+   assert (idx == nloaded);
+ 

glibc-testsuite.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  6 15:41:01 UTC 2015 - schwab@suse.de
+
+- dont-remove-nodelete-flag.patch: Don't remove DF_1_NODELETE flag on
+  failed dlopen.
+
 -------------------------------------------------------------------
 Wed Aug  5 09:35:41 UTC 2015 - schwab@suse.de
 

glibc-testsuite.spec

@@ -216,7 +216,8 @@ Patch102:       glibc-2.4.90-no_NO.diff
 Patch103:       glibc-2.4-china.diff
 
 ### Broken patches in glibc that we revert for now:
-# None
+# BZ #18778
+Patch200:       dont-remove-nodelete-flag.patch
 
 ### Network related patches
 # PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change
@@ -439,6 +440,8 @@ rm nscd/s-stamp
 %patch102 -p1
 %patch103 -p1
 
+%patch200 -p1
+
 %patch300 -p1
 %patch301 -p1
 %patch304 -p1

glibc-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  6 15:41:01 UTC 2015 - schwab@suse.de
+
+- dont-remove-nodelete-flag.patch: Don't remove DF_1_NODELETE flag on
+  failed dlopen.
+
 -------------------------------------------------------------------
 Wed Aug  5 09:35:41 UTC 2015 - schwab@suse.de
 

glibc-utils.spec

@@ -215,7 +215,8 @@ Patch102:       glibc-2.4.90-no_NO.diff
 Patch103:       glibc-2.4-china.diff
 
 ### Broken patches in glibc that we revert for now:
-# None
+# BZ #18778
+Patch200:       dont-remove-nodelete-flag.patch
 
 ### Network related patches
 # PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change
@@ -439,6 +440,8 @@ rm nscd/s-stamp
 %patch102 -p1
 %patch103 -p1
 
+%patch200 -p1
+
 %patch300 -p1
 %patch301 -p1
 %patch304 -p1

glibc.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  6 15:41:01 UTC 2015 - schwab@suse.de
+
+- dont-remove-nodelete-flag.patch: Don't remove DF_1_NODELETE flag on
+  failed dlopen.
+
 -------------------------------------------------------------------
 Wed Aug  5 09:35:41 UTC 2015 - schwab@suse.de
 

glibc.spec

@@ -216,7 +216,8 @@ Patch102:       glibc-2.4.90-no_NO.diff
 Patch103:       glibc-2.4-china.diff
 
 ### Broken patches in glibc that we revert for now:
-# None
+# BZ #18778
+Patch200:       dont-remove-nodelete-flag.patch
 
 ### Network related patches
 # PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change
@@ -439,6 +440,8 @@ rm nscd/s-stamp
 %patch102 -p1
 %patch103 -p1
 
+%patch200 -p1
+
 %patch300 -p1
 %patch301 -p1
 %patch304 -p1