rpms/nss/devel nss-disable-freebl-execstack.patch, NONE, 1.1 nss.spec, 1.60, 1.61

[Kai Engert]

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606

Modified Files:
	nss.spec 
Added Files:
	nss-disable-freebl-execstack.patch 
Log Message:
* Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-4
- disable execstack when building freebl


nss-disable-freebl-execstack.patch:

--- NEW FILE nss-disable-freebl-execstack.patch ---
--- nss-3.12.2.99.3/mozilla/security/nss/lib/freebl/Makefile-save	2009-04-02 08:46:32.083530732 -0700
+++ nss-3.12.2.99.3/mozilla/security/nss/lib/freebl/Makefile	2009-04-02 08:46:51.740542226 -0700
@@ -133,7 +133,7 @@
 ifeq ($(OS_TARGET),Linux)
 ifeq ($(CPU_ARCH),x86_64)
     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
-    ASFLAGS += -march=opteron -m64 -fPIC
+    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
     DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
     DEFINES += -DNSS_USE_COMBA
     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- nss.spec	31 Mar 2009 23:05:13 -0000	1.60
+++ nss.spec	2 Apr 2009 16:36:08 -0000	1.61
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.99.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -34,6 +34,7 @@
 Patch4:           nss-pem-bug483855.patch
 Patch5:           nss-pem-bug429175.patch
 Patch6:           nss-enable-pem.patch
+Patch7:           nss-disable-freebl-execstack.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -90,6 +91,7 @@
 %patch4 -p0 -b .483855
 %patch5 -p0 -b .429175
 %patch6 -p0 -b .libpem
+%patch7 -p1
 
 
 %build
@@ -450,6 +452,8 @@
 
 
 %changelog
+* Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-4
+- disable execstack when building freebl
 * Tue Mar 31 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-3
 - add upstream patch to fix bug 483855
 * Tue Mar 31 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-2