← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to debian/patches/91_nonexec_stack.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/91_nonexec_stack.patch
1
 
Description: unmarked assembly causes the stack to be marked as executable.
2
 
 This upstream patch fixes the assembly behavior.
3
 
Ubuntu: https://launchpad.net/bug/409864
4
 
Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=486537
5
 
 
6
 
Index: nss-3.12.3.1/mozilla/security/nss/lib/freebl/Makefile
7
 
===================================================================
8
 
--- nss-3.12.3.1.orig/mozilla/security/nss/lib/freebl/Makefile  2009-08-24 15:01:51.000000000 -0700
9
 
+++ nss-3.12.3.1/mozilla/security/nss/lib/freebl/Makefile       2009-08-24 15:03:01.000000000 -0700
10
 
@@ -145,7 +145,7 @@
11
 
 ifeq ($(OS_TARGET),Linux)
12
 
 ifeq ($(CPU_ARCH),x86_64)
13
 
     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
14
 
-    ASFLAGS += -march=opteron -m64 -fPIC
15
 
+    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
16
 
     DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
17
 
     DEFINES += -DNSS_USE_COMBA
18
 
     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN