From 37d66db220892bf99ac08ce835fe22bc78734e7f Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Apr 02 2009 16:36:08 +0000 Subject: - disable execstack when building freebl --- diff --git a/nss-disable-freebl-execstack.patch b/nss-disable-freebl-execstack.patch new file mode 100644 index 0000000..75424ed --- /dev/null +++ b/nss-disable-freebl-execstack.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/nss.spec b/nss.spec index f8de4b5..1ee2b4a 100644 --- a/nss.spec +++ b/nss.spec @@ -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 @@ Patch2: nss-nolocalsql.patch 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 @@ low level services. %patch4 -p0 -b .483855 %patch5 -p0 -b .429175 %patch6 -p0 -b .libpem +%patch7 -p1 %build @@ -450,6 +452,8 @@ done %changelog +* Thu Apr 02 2009 Kai Engert - 3.12.2.99.3-4 +- disable execstack when building freebl * Tue Mar 31 2009 Kai Engert - 3.12.2.99.3-3 - add upstream patch to fix bug 483855 * Tue Mar 31 2009 Kai Engert - 3.12.2.99.3-2