- added iconvconfig-nxstack patch (updated from pax_iconvconfig patch;

  not only PaX-specific - let iconvconfig have non-exec GNU_STACK)

Changed files:
    glibc.spec -> 1.580

diff --git a/glibc.spec b/glibc.spec
index 0ea0c4b6efcd4dd461e695e8f3e22dd1d80545a3..9dce5c8265a5ce9669897a10b89cc62b358b9d99 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -124,10 +124,10 @@ Patch23:  %{name}-locale_fixes.patch
 Patch24:       %{name}-ZA_collate.patch
 Patch25:       %{name}-tls_fix.patch
 Patch26:       %{name}-nscd.patch
-Patch27:       %{name}-gcc4.patch
-Patch28:       %{name}-cross-gcc_eh.patch
-# PaX hacks (dropped)
-#Patch29:      %{name}-pax_iconvconfig.patch
+Patch27:       %{name}-iconvconfig-nxstack.patch
+Patch28:       %{name}-gcc4.patch
+Patch29:       %{name}-cross-gcc_eh.patch
+# PaX hack (dropped)
 #Patch30:      %{name}-pax_dl-execstack.patch
 URL:           http://www.gnu.org/software/libc/
 BuildRequires: automake
@@ -818,7 +818,8 @@ Statyczne 64-bitowe biblioteki GNU libc.
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%{?with_cross:%patch28 -p1}
+%patch28 -p1
+%{?with_cross:%patch29 -p1}
 
 chmod +x scripts/cpp