← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/nspr/jaunty-security

« back to all changes in this revision

Viewing changes to debian/patches/30_config_64bits.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-05-10 18:40:10 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100510184010-boghfzlm551mtoag
Tags: 4.8-0ubuntu0.9.04.1
* New upstream release: 4.8
  - Support updating NSS to 3.12.6 and fix CVE-2009-3555 aka 
    US-CERT VU#120541
* adjust patches to changed upstream codebase
  - update debian/patches/30_config_64bits.patch
  - update debian/patches/99_configure.patch
* update shlibs symbols to include new API elements
  - update debian/libnspr4-0d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/30_config_64bits.patch
1
1
---
2
 
 mozilla/nsprpub/configure.in |   21 ++++++++++++++++++---
 
2
 configure.in |   21 ++++++++++++++++++---
3
3
 1 file changed, 18 insertions(+), 3 deletions(-)
4
4
 
5
 
Index: nspr-trunk-4.7.0~cvs20070713/mozilla/nsprpub/configure.in
 
5
Index: nspr-4.8/mozilla/nsprpub/configure.in
6
6
===================================================================
7
 
--- nspr-trunk-4.7.0~cvs20070713.orig/mozilla/nsprpub/configure.in      2007-08-14 23:00:47.000000000 +0000
8
 
+++ nspr-trunk-4.7.0~cvs20070713/mozilla/nsprpub/configure.in   2007-08-14 23:02:55.000000000 +0000
9
 
@@ -52,17 +52,17 @@
10
 
 MOD_MINOR_VERSION=7
11
 
 MOD_PATCH_VERSION=0
12
 
 NSPR_MODNAME=nspr20
13
 
 _HAVE_PTHREADS=
14
 
 USE_PTHREADS=
 
7
--- nspr-4.8.orig/mozilla/nsprpub/configure.in  2009-05-02 00:08:00.000000000 +0100
 
8
+++ nspr-4.8/mozilla/nsprpub/configure.in       2010-05-18 12:32:58.467493011 +0100
 
9
@@ -57,7 +57,7 @@
15
10
 USE_USER_PTHREADS=
16
11
 USE_NSPR_THREADS=
17
12
 USE_N32=
20
15
 USE_CPLUS=
21
16
 USE_IPV6=
22
17
 USE_MDUPDATE=
23
 
 _MACOSX_DEPLOYMENT_TARGET=
24
 
 _OPTIMIZE_FLAGS=-O
25
 
 _DEBUG_FLAGS=-g
26
 
 MOZ_DEBUG=1
27
 
 MOZ_OPTIMIZE=
28
 
@@ -218,21 +218,36 @@
29
 
     [ if test "$enableval" = "yes"; then
30
 
        USE_N32=1
31
 
       else if test "$enableval" = "no"; then
32
 
        USE_N32=
33
 
       fi
 
18
@@ -231,11 +231,26 @@
34
19
     fi ])
35
20
 
36
21
 AC_ARG_ENABLE(64bit,
59
44
 AC_ARG_ENABLE(mdupdate,
60
45
     [  --enable-mdupdate       Enable use of certain compilers' mdupdate feature],
61
46
     [ if test "$enableval" = "yes"; then
62
 
            USE_MDUPDATE=1
63
 
       fi ])
64
 
 
65
 
 dnl ========================================================
66
 
 dnl = Mac OS X SDK support