Changeset 6960

Timestamp:

11/03/10 03:14:28 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 3.5.15-1

Location:

pkg/frankie/main/iceweasel/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (2 diffs)
• control.in (modified) (1 diff)
• patches/build-config/Allow-to-build-the-js-shell-against-the-libmozjs-sha.patch (modified) (1 diff)
• patches/build-config/Build-js-shell-and-xpcshell-against-libreadline.patch (modified) (1 diff)
• patches/configure.patch (modified) (3 diffs)
• patches/debian-hacks/Add-soname-to-appropriate-libraries.patch (modified) (2 diffs)
• patches/debian-hacks/Avoid-some-symbols-from-being-exported-in-C-mangled-.patch (modified) (1 diff)
• patches/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch (modified) (1 diff)
• patches/debian-hacks/Disable-APNG-support-when-system-libpng-doesn-t-supp.patch (modified) (1 diff)
• patches/debian-hacks/Expose-js_StrictlyEqual-to-consumers.patch (modified) (1 diff)
• patches/debian-hacks/Gross-workaround-to-avoid-installing-test-idl-and-in.patch (modified) (2 diffs)
• patches/debian-hacks/Ignore-system-libjpeg-libpng-and-zlib-version-checki.patch (modified) (1 diff)
• patches/debian-hacks/Put-the-crmf-library-before-the-NSS-libraries.patch (modified) (1 diff)
• patches/debian-hacks/Simplify-how-js-src-configure-is-called-from-main-co.patch (modified) (1 diff)
• patches/debian-hacks/Use-char16_t-when-available-and-when-it-is-don-t-tes.patch (modified) (1 diff)
• patches/fixes/Allow-intl.locale.matchOS-to-be-modified-in-user-pro.patch (modified) (1 diff)
• patches/fixes/Override-intl.locale.matchOS-if-general.useragent.lo.patch (modified) (1 diff)
• patches/fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch (modified) (2 diffs)
• patches/fixes/Work-around-FTBFS-on-mips-by-disabling-TLS-support.patch (modified) (1 diff)
• patches/porting/Increase-stability-and-performance-on-mips.patch (modified) (2 diffs)
• patches/porting/Support-building-on-GNU-Hurd.patch (modified) (3 diffs)
• patches/prefs/Set-DPI-to-system-settings.patch (modified) (1 diff)
• patches/prefs/Set-javascript.options.showInConsole.patch (modified) (1 diff)
• patches/system-libs/Add-readline-support-to-xpcshell.patch (modified) (1 diff)

pkg/frankie/main/iceweasel/trunk/debian/changelog

@@ -1 @@
-iceweasel (3.5.13-1) unstable; urgency=low
+iceweasel (3.5.15-1) unstable; urgency=low
 
   [ Mike Hommey ]
   * New upstream release.
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 10 Oct 2010 11:32:09 -0700
+  * Fix for mfsa2010-73, also known as CVE-2010-3765.
+
+ -- Alan Baghumian <alan@technotux.org>  Tue, 02 Nov 2010 19:13:49 -0700
+
+iceweasel (3.5.14-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixes for mfsa2010-{64-69}, also known as
+    CVE-2010-3176, CVE-2010-3174, CVE-2010-3179, CVE-2010-3180,
+    CVE-2010-3183, CVE-2010-3177, CVE-2010-3178.
+  * debian/control*: Bump build dependencies on libnspr4-dev and libnss3-dev
+    to fit what configure will be looking for.
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 19 Oct 2010 23:42:00 +0200
+
+iceweasel (3.5.13-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org>  Thu, 16 Sep 2010 08:52:12 +0200
 
 iceweasel (3.5.12-2) unstable; urgency=low

pkg/frankie/main/iceweasel/trunk/debian/control

@@ -23 +23 @@
                python,
                dpkg-dev (>= 1.13.19),
-               libnspr4-dev (>= 4.8),
-               libnss3-dev (>= 3.12.6),
+               libnspr4-dev (>= 4.8.6),
+               libnss3-dev (>= 3.12.8),
                libhunspell-dev (>= 1.2),
                libdbus-glib-1-dev,
@@ -55 +55 @@
          procps,
          debianutils (>= 1.16),
-         xulrunner-1.9.1 (>= 1.9.1.13)
+         xulrunner-1.9.1 (>= 1.9.1.14)
 Suggests: ttf-lyx | latex-xft-fonts,
           xfonts-mathml,

pkg/frankie/main/iceweasel/trunk/debian/control.in

@@ -23 +23 @@
                python,
                dpkg-dev (>= 1.13.19),
-               libnspr4-dev (>= 4.8),
-               libnss3-dev (>= 3.12.6),
+               libnspr4-dev (>= 4.8.6),
+               libnss3-dev (>= 3.12.8),
                libhunspell-dev (>= 1.2),
                libdbus-glib-1-dev,

pkg/frankie/main/iceweasel/trunk/debian/patches/build-config/Allow-to-build-the-js-shell-against-the-libmozjs-sha.patch

@@ -54 +54 @@
          JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_ASSERT_EQ_FAILED,
 diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
-index 091a823..f7db001 100644
+index d3ac8bb..8b627de 100644
 --- a/js/src/jstracer.cpp
 +++ b/js/src/jstracer.cpp

pkg/frankie/main/iceweasel/trunk/debian/patches/build-config/Build-js-shell-and-xpcshell-against-libreadline.patch

@@ -25 +25 @@
  MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
 diff --git a/configure.in b/configure.in
-index 32eaa11..4e87e61 100644
+index d681f75..78461a3 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/configure.patch

@@ -1 +1 @@
 diff --git a/configure b/configure
-index 794bcf4..b35de6c 100755
+index 2274203..01d5120 100755
 --- a/configure
 +++ b/configure
@@ -4277 +4277 @@
 @@ -12291,7 +12333,7 @@ fi
  
-        min_nspr_version=4.8.0
+        min_nspr_version=4.8.6
         echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
 -echo "configure:12295: checking for NSPR - version >= $min_nspr_version" >&5
@@ -4332 +4332 @@
 @@ -12465,7 +12512,7 @@ fi
  
-        min_nss_version=3.12.6
+        min_nss_version=3.12.8
         echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
 -echo "configure:12469: checking for NSS - version >= $min_nss_version" >&5

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Add-soname-to-appropriate-libraries.patch

@@ -14 +14 @@
 
 diff --git a/config/rules.mk b/config/rules.mk
-index 82e7c23..9de1358 100644
+index 9c55eed..5bae201 100644
 --- a/config/rules.mk
 +++ b/config/rules.mk
@@ -97 +97 @@
         $(SYSINSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(libdir)
 diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
-index 82e7c23..9de1358 100644
+index 9c55eed..5bae201 100644
 --- a/js/src/config/rules.mk
 +++ b/js/src/config/rules.mk

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Avoid-some-symbols-from-being-exported-in-C-mangled-.patch

@@ -39 +39 @@
  
 diff --git a/js/src/xpconnect/src/xpcquickstubs.cpp b/js/src/xpconnect/src/xpcquickstubs.cpp
-index 5a26be5..2758a46 100644
+index cb111c4..a0e13df 100644
 --- a/js/src/xpconnect/src/xpcquickstubs.cpp
 +++ b/js/src/xpconnect/src/xpcquickstubs.cpp
-@@ -305,10 +305,6 @@ SharedLookupSetter(JSContext *cx, uintN argc, jsval *vp)
-     return LookupGetterOrSetter(cx, PR_FALSE, vp);
+@@ -312,10 +312,6 @@ SharedLookupSetter(JSContext *cx, uintN argc, jsval *vp)
+     return LookupGetterOrSetter(cx, PR_FALSE, argc, vp);
  }
  

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch

@@ -10 +10 @@
 
 diff --git a/configure.in b/configure.in
-index 8399825..98647d1 100644
+index 2edb875..e17bcb5 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Disable-APNG-support-when-system-libpng-doesn-t-supp.patch

@@ -25 +25 @@
  MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
 diff --git a/configure.in b/configure.in
-index 6826c25..35faa6b 100644
+index 55c3ef8..7828df1 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Expose-js_StrictlyEqual-to-consumers.patch

@@ -10 +10 @@
 
 diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
-index 6600822..17dec41 100644
+index f0cc5a7..b3a7c68 100644
 --- a/js/src/jsapi.cpp
 +++ b/js/src/jsapi.cpp

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Gross-workaround-to-avoid-installing-test-idl-and-in.patch

@@ -10 +10 @@
 
 diff --git a/config/rules.mk b/config/rules.mk
-index 9de1358..507d568 100644
+index 5bae201..443383b 100644
 --- a/config/rules.mk
 +++ b/config/rules.mk
@@ -29 +29 @@
  ifeq ($(OS_ARCH),OS2)
 diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
-index 9de1358..507d568 100644
+index 5bae201..443383b 100644
 --- a/js/src/config/rules.mk
 +++ b/js/src/config/rules.mk

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Ignore-system-libjpeg-libpng-and-zlib-version-checki.patch

@@ -11 +11 @@
 
 diff --git a/configure.in b/configure.in
-index 13aeab3..6826c25 100644
+index 4eb28a3..55c3ef8 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Put-the-crmf-library-before-the-NSS-libraries.patch

@@ -8 +8 @@
 
 diff --git a/configure.in b/configure.in
-index 98647d1..13aeab3 100644
+index e17bcb5..4eb28a3 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Simplify-how-js-src-configure-is-called-from-main-co.patch

@@ -9 +9 @@
 
 diff --git a/configure.in b/configure.in
-index 35faa6b..a3eda3b 100644
+index 7828df1..d490c71 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/debian-hacks/Use-char16_t-when-available-and-when-it-is-don-t-tes.patch

@@ -14 +14 @@
 
 diff --git a/configure.in b/configure.in
-index a3eda3b..1e9d984 100644
+index d490c71..121bf23 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/fixes/Allow-intl.locale.matchOS-to-be-modified-in-user-pro.patch

@@ -16 +16 @@
 
 diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp
-index d70e594..2a1a3da 100644
+index 4e7efd7..2f55af4 100644
 --- a/chrome/src/nsChromeRegistry.cpp
 +++ b/chrome/src/nsChromeRegistry.cpp

pkg/frankie/main/iceweasel/trunk/debian/patches/fixes/Override-intl.locale.matchOS-if-general.useragent.lo.patch

@@ -14 +14 @@
 
 diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp
-index 2a1a3da..8bcf69f 100644
+index 2f55af4..cd8a3e6 100644
 --- a/chrome/src/nsChromeRegistry.cpp
 +++ b/chrome/src/nsChromeRegistry.cpp

pkg/frankie/main/iceweasel/trunk/debian/patches/fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch

@@ -1 @@
-From 3630e5168a6f5be3035210eb07e4fa9f6c52813b Mon Sep 17 00:00:00 2001
 From: Mike Hommey <mh@glandium.org>
 Date: Sat, 11 Sep 2010 09:31:09 +0200
@@ -39 +38 @@
        os.symlink(src, out)
  
--- 
-1.7.2.rc1.13.gd67bc
-

pkg/frankie/main/iceweasel/trunk/debian/patches/fixes/Work-around-FTBFS-on-mips-by-disabling-TLS-support.patch

@@ -9 +9 @@
 
 diff --git a/configure.in b/configure.in
-index 4e87e61..bdeeb35 100644
+index 78461a3..bcd7b88 100644
 --- a/configure.in
 +++ b/configure.in

pkg/frankie/main/iceweasel/trunk/debian/patches/porting/Increase-stability-and-performance-on-mips.patch

@@ -10 +10 @@
 
 diff --git a/config/rules.mk b/config/rules.mk
-index e66e66e..82e7c23 100644
+index f0b80ea..9c55eed 100644
 --- a/config/rules.mk
 +++ b/config/rules.mk
@@ -30 +30 @@
  # which uses internal symbols first
 diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
-index e66e66e..82e7c23 100644
+index f0b80ea..9c55eed 100644
 --- a/js/src/config/rules.mk
 +++ b/js/src/config/rules.mk

pkg/frankie/main/iceweasel/trunk/debian/patches/porting/Support-building-on-GNU-Hurd.patch

@@ -15 +15 @@
 
 diff --git a/config/rules.mk b/config/rules.mk
-index cd2059c..e66e66e 100644
+index d9864a0..f0b80ea 100644
 --- a/config/rules.mk
 +++ b/config/rules.mk
@@ -34 +34 @@
  ifeq ($(OS_ARCH),WINNT)
 diff --git a/configure.in b/configure.in
-index bdeeb35..8399825 100644
+index bcd7b88..2edb875 100644
 --- a/configure.in
 +++ b/configure.in
@@ -73 +73 @@
  
 diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
-index cd2059c..e66e66e 100644
+index d9864a0..f0b80ea 100644
 --- a/js/src/config/rules.mk
 +++ b/js/src/config/rules.mk

pkg/frankie/main/iceweasel/trunk/debian/patches/prefs/Set-DPI-to-system-settings.patch

@@ -8 +8 @@
 
 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
-index bf61e8b..9922e7d 100644
+index 7d83807..63795b0 100644
 --- a/modules/libpref/src/init/all.js
 +++ b/modules/libpref/src/init/all.js
-@@ -1112,7 +1112,7 @@ pref("layout.css.visited_links_enabled", true);
+@@ -1123,7 +1123,7 @@ pref("layout.css.visited_links_enabled", true);
  // A value of 0 means use the system DPI. A positive value is used as the DPI.
  // This sets the physical size of a device pixel and thus controls the

pkg/frankie/main/iceweasel/trunk/debian/patches/prefs/Set-javascript.options.showInConsole.patch

@@ -8 +8 @@
 
 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
-index 2d6915d..bf61e8b 100644
+index c040031..7d83807 100644
 --- a/modules/libpref/src/init/all.js
 +++ b/modules/libpref/src/init/all.js

pkg/frankie/main/iceweasel/trunk/debian/patches/system-libs/Add-readline-support-to-xpcshell.patch

@@ -9 +9 @@
 
 diff --git a/js/src/xpconnect/shell/Makefile.in b/js/src/xpconnect/shell/Makefile.in
-index 10d74118..3c92752 100644
+index 10d7411..3c92752 100644
 --- a/js/src/xpconnect/shell/Makefile.in
 +++ b/js/src/xpconnect/shell/Makefile.in