SPECS (AC-branch): glibc.spec - removed PaX hack from bcond (defau...

[mguevara]

Author: mguevara                     Date: Tue Oct 17 20:38:44 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- removed PaX hack from bcond (default is on), added big fat warning to
  prevent removal of the patch.

---- Files affected:
SPECS:
   glibc.spec (1.583.2.82 -> 1.583.2.83) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.82 SPECS/glibc.spec:1.583.2.83
--- SPECS/glibc.spec:1.583.2.82	Tue Oct 17 20:02:24 2006
+++ SPECS/glibc.spec	Tue Oct 17 22:38:38 2006
@@ -18,7 +18,7 @@
 %bcond_without	localedb	# don't build localedb-all (is time consuming)
 %bcond_with	cross		# build using crossgcc (without libgcc_eh)
 %bcond_with	boot64		# bootstrap *64 using cross* (sparc64 currently)
-%bcond_with	pax		# apply PaX hack
+%bcond_with	pax		# build in PaX enabled environment (PaX hack is default BTW)
 #
 # TODO:
 # - look at locale fixes/updates in bugzilla
@@ -132,6 +132,8 @@
 Patch26:	%{name}-iconvconfig-nxstack.patch
 Patch27:	%{name}-sys-kd.patch
 Patch28:	%{name}-cross-gcc_eh.patch
+# WARNING: do not comment or delete pax_dl-execstack.patch, please. If you think 
+#          that this is a good idea send some info to pld-devel-{pl,en}
 Patch29:	%{name}-pax_dl-execstack.patch
 Patch30:	%{name}-pax-build.patch
 Patch31:	%{name}-large_collate_tables.patch
@@ -932,7 +934,13 @@
 %patch26 -p1
 %patch27 -p1
 %{?with_cross:%patch28 -p1}
-%{?with_pax:%patch29 -p1}
+#
+# WARNING - disabling the glibc-pax_dl-execstack.patch will screw up PaX enabled machines.
+#
+%patch29
+#
+# ... and remember we will find you ;-)
+#
 %{?with_pax:%patch30 -p1}
 %patch31 -p1
 %patch32 -p1
@@ -1679,6 +1687,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.83  2006/10/17 20:38:38  mguevara
+- removed PaX hack from bcond (default is on), added big fat warning to
+  prevent removal of the patch.
+
 Revision 1.583.2.82  2006/10/17 18:02:24  qboosh
 - added dl-tls patch (fixes dl-tls assertion, backported from glibc 2.4; needs some testing)
 - release 9
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.82&r2=1.583.2.83&f=u