From 2406a7b668f03dab0749d25121d2da3f454c4598 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 9 Aug 2010 15:04:17 +0200 Subject: [PATCH 01/31] build fix --- mozilla-gdk-pixbuf.patch | 15 +++++++++++++++ xulrunner.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mozilla-gdk-pixbuf.patch diff --git a/mozilla-gdk-pixbuf.patch b/mozilla-gdk-pixbuf.patch new file mode 100644 index 0000000..0596b1b --- /dev/null +++ b/mozilla-gdk-pixbuf.patch @@ -0,0 +1,15 @@ +diff -up mozilla-1.9.2/configure.in.gdk-pixbuf mozilla-1.9.2/configure.in +--- mozilla-1.9.2/configure.in.gdk-pixbuf 2010-07-13 21:10:45.000000000 +0200 ++++ mozilla-1.9.2/configure.in 2010-08-03 15:38:43.113733420 +0200 +@@ -5354,7 +5354,10 @@ then + then + if test "$MOZ_ENABLE_LIBNOTIFY" + then +- PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION) ++ dnl Code which requires gdk-pixbuf is only in ++ dnl toolkit/system/gnome/nsAlertsIconListener.cpp and is compiled ++ dnl only when libnotify is enabled ++ PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION gdk-pixbuf-2.0 gtk+-2.0) + fi + fi + fi diff --git a/xulrunner.spec b/xulrunner.spec index 8abc8f4..b361a4f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,7 +23,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.7 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -44,6 +44,7 @@ Patch7: xulrunner-1.9.2.1-build.patch Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch Patch10: mozilla-build-s390.patch +Patch11: mozilla-gdk-pixbuf.patch # Fedora specific patches Patch20: mozilla-192-pkgconfig.patch @@ -144,6 +145,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %ifarch s390 %patch10 -p1 -b .s390 %endif +%patch11 -p1 -b .gdk-pixbuf %patch20 -p1 -b .pk %patch21 -p2 -b .jpeg-turbo @@ -452,6 +454,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Aug 9 2010 Martin Stransky 1.9.2.7-2 +- added build-fix by Adam Tkac + * Tue Jul 20 2010 Jan Horak - 1.9.2.7-1 - Update to 1.9.2.7 From 4b70a27341fec7655c8b235b46f24bf036e35760 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 7 Sep 2010 10:08:36 +0200 Subject: [PATCH 02/31] Update to 3.6.9 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 04e5933..872aa6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xulrunner-1.9.2.7.source.tar.bz2 +/xulrunner-1.9.2.9.source.tar.bz2 diff --git a/sources b/sources index 9322d49..3bd8c03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e240541898766e44a407e543c70d4949 xulrunner-1.9.2.7.source.tar.bz2 +100ecafd6c6c5062bc03bb2fb651fc17 xulrunner-1.9.2.9.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index b361a4f..96c3a7f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ # Minimal required versions %define nspr_version 4.8 -%define nss_version 3.12.6 +%define nss_version 3.12.7 %define cairo_version 1.6.0 %define freetype_version 2.1.9 %define sqlite_version 3.6.16 @@ -22,8 +22,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.7 -Release: 2%{?pretag}%{?dist} +Version: 1.9.2.9 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -454,6 +454,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Sep 6 2010 Jan Horak - 1.9.2.9-1 +- Update to 1.9.2.9 + * Mon Aug 9 2010 Martin Stransky 1.9.2.7-2 - added build-fix by Adam Tkac From e8ca4707d97364fab07b7cd03ffec307dccc1f1d Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 7 Sep 2010 22:32:30 +0200 Subject: [PATCH 03/31] Removed system sqlite due to missing SQLITE_SECURE_DELETE --- xulrunner-mozconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 8c42114..6a007d9 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -11,7 +11,7 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite +#ac_add_options --enable-system-sqlite Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-strip From 593ef552efc96d2e04487aa0a28984b932fcbb76 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 21 Sep 2010 11:41:51 +0200 Subject: [PATCH 04/31] Update to 1.9.2.10 --- sources | 2 +- xulrunner.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3bd8c03..65ac594 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -100ecafd6c6c5062bc03bb2fb651fc17 xulrunner-1.9.2.9.source.tar.bz2 +59ee60ddfd8b33e99a24788d3b12adb3 xulrunner-1.9.2.10.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 96c3a7f..a82f0ce 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -22,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.9 +Version: 1.9.2.10 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -454,6 +454,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Sep 21 2010 Martin Stransky 1.9.2.10-1 +- Update to 1.9.2.10 + * Mon Sep 6 2010 Jan Horak - 1.9.2.9-1 - Update to 1.9.2.9 From 9dfc80f57e6be675db5cc5534ac9b5644de8655c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 5 Oct 2010 15:43:12 -0700 Subject: [PATCH 05/31] - Rebuilt for gcc bug 634757 --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index a82f0ce..8db3d3f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,7 +23,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.10 -Release: 1%{?pretag}%{?dist} +Release: 1%{?pretag}%{?dist}.1 URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -454,6 +454,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Oct 05 2010 jkeating - 1.9.2.10-1.1 +- Rebuilt for gcc bug 634757 + * Tue Sep 21 2010 Martin Stransky 1.9.2.10-1 - Update to 1.9.2.10 From c62665c5236a04b48b385ebb54e1479b19d8549e Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 19 Oct 2010 17:05:45 +0200 Subject: [PATCH 06/31] Update to 1.9.2.11 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 872aa6c..5739352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.9.source.tar.bz2 +/xulrunner-1.9.2.11.source.tar.bz2 diff --git a/sources b/sources index 65ac594..ab78533 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59ee60ddfd8b33e99a24788d3b12adb3 xulrunner-1.9.2.10.source.tar.bz2 +f698dd0f8f145d84933a50f69662c8db xulrunner-1.9.2.11.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 8db3d3f..3c1bde2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ # Minimal required versions %define nspr_version 4.8 -%define nss_version 3.12.7 +%define nss_version 3.12.8 %define cairo_version 1.6.0 %define freetype_version 2.1.9 %define sqlite_version 3.6.16 @@ -22,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.10 +Version: 1.9.2.11 Release: 1%{?pretag}%{?dist}.1 URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -454,6 +454,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Oct 19 2010 Jan Horak - 1.9.2.11-1 +- Update to 1.9.2.11 + * Tue Oct 05 2010 jkeating - 1.9.2.10-1.1 - Rebuilt for gcc bug 634757 From c97fb225d1eae62035780e4ed9397a8409903954 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 19 Oct 2010 17:26:11 +0200 Subject: [PATCH 07/31] Removed no longer valid patch --- mozilla-ps-pdf-simplify-operators.patch | 42 ------------------------- xulrunner.spec | 5 +-- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 mozilla-ps-pdf-simplify-operators.patch diff --git a/mozilla-ps-pdf-simplify-operators.patch b/mozilla-ps-pdf-simplify-operators.patch deleted file mode 100644 index cab1341..0000000 --- a/mozilla-ps-pdf-simplify-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=435313 - -Index: mozilla/gfx/thebes/public/gfxPDFSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPDFSurface.h ---- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; -Index: mozilla/gfx/thebes/public/gfxPSSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPSSurface.h ---- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; diff --git a/xulrunner.spec b/xulrunner.spec index 3c1bde2..652e6a6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,7 +23,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.11 -Release: 1%{?pretag}%{?dist}.1 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -51,7 +51,6 @@ Patch20: mozilla-192-pkgconfig.patch Patch21: mozilla-libjpeg-turbo.patch # Upstream patches -Patch100: mozilla-ps-pdf-simplify-operators.patch # --------------------------------------------------- @@ -150,8 +149,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk %patch21 -p2 -b .jpeg-turbo -%patch100 -p1 -b .ps-pdf-simplify-operators - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig From 7d2b522561dd370e5cc8c1eb00286cea6923c079 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 27 Oct 2010 17:46:23 +0200 Subject: [PATCH 08/31] Update to 1.9.2.12 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5739352..c88e19d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.9.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 +/xulrunner-1.9.2.12.source.tar.bz2 diff --git a/sources b/sources index ab78533..b58f370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f698dd0f8f145d84933a50f69662c8db xulrunner-1.9.2.11.source.tar.bz2 +80f4d83f23a7c45fc3f1904964ea2a5a xulrunner-1.9.2.12.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 652e6a6..94a320e 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -22,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.11 +Version: 1.9.2.12 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -451,6 +451,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Oct 27 2010 Jan Horak - 1.9.2.12-1 +- Update to 1.9.2.12 + * Tue Oct 19 2010 Jan Horak - 1.9.2.11-1 - Update to 1.9.2.11 From 7f282e962723f34ee4c2647f19acec2b3f2ffed7 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 9 Dec 2010 13:22:43 +0100 Subject: [PATCH 09/31] Update to 1.9.2.13 --- .gitignore | 1 + mozilla-crashreporter-static.patch | 11 +++++++++++ sources | 2 +- xulrunner.spec | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 mozilla-crashreporter-static.patch diff --git a/.gitignore b/.gitignore index c88e19d..4d87b48 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.9.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 +/xulrunner-1.9.2.13.source.tar.bz2 diff --git a/mozilla-crashreporter-static.patch b/mozilla-crashreporter-static.patch new file mode 100644 index 0000000..610b66e --- /dev/null +++ b/mozilla-crashreporter-static.patch @@ -0,0 +1,11 @@ +diff -up mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in +--- mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-09-14 20:53:09.000000000 +0200 ++++ mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-10-13 14:21:14.000000000 +0200 +@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1 + + #XXX: bug 554854 causes us to be unable to run binaries on the build slaves + # due to them having an older libstdc++ +-HOST_LDFLAGS += -static ++#HOST_LDFLAGS += -static + + include $(topsrcdir)/config/rules.mk diff --git a/sources b/sources index b58f370..50ee003 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80f4d83f23a7c45fc3f1904964ea2a5a xulrunner-1.9.2.12.source.tar.bz2 +d7c90aed8209beefa74badf02e8eeae1 xulrunner-1.9.2.13.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 94a320e..1c0f3af 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -49,6 +49,7 @@ Patch11: mozilla-gdk-pixbuf.patch # Fedora specific patches Patch20: mozilla-192-pkgconfig.patch Patch21: mozilla-libjpeg-turbo.patch +Patch22: mozilla-crashreporter-static.patch # Upstream patches @@ -121,6 +122,8 @@ Requires: sqlite-devel Requires: startup-notification-devel Requires: alsa-lib-devel Requires: libnotify-devel +Requires: curl-devel +BuildRequires: libcurl-devel %description devel Gecko development files. @@ -148,6 +151,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk %patch21 -p2 -b .jpeg-turbo +%patch22 -p1 -b .static %{__rm} -f .mozconfig From de358a17c544ec42b5d2f859ce53dee38b674de5 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 9 Dec 2010 13:30:14 +0100 Subject: [PATCH 10/31] Removed no longer required patches (mozilla-plugins.patch) --- mozilla-plugin.patch | 10 ---------- xulrunner.spec | 7 ++++--- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 mozilla-plugin.patch diff --git a/mozilla-plugin.patch b/mozilla-plugin.patch deleted file mode 100644 index 75eac7e..0000000 --- a/mozilla-plugin.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old 2009-11-25 05:13:11.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2009-12-03 10:14:41.000000000 +0100 -@@ -5,5 +5,5 @@ includedir=%includedir% - Name: Mozilla Plug-In API - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% --Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -+Cflags: -I${includedir} -DXP_UNIX %ojidef% - diff --git a/xulrunner.spec b/xulrunner.spec index 1c0f3af..61d1065 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -22,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.12 +Version: 1.9.2.13 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -41,7 +41,6 @@ Patch1: mozilla-build.patch Patch3: mozilla-jemalloc.patch Patch4: mozilla-about-firefox-version.patch Patch7: xulrunner-1.9.2.1-build.patch -Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch Patch10: mozilla-build-s390.patch Patch11: mozilla-gdk-pixbuf.patch @@ -142,7 +141,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch3 -p1 -b .jemalloc %patch4 -p1 -b .about-firefox-version %patch7 -p2 -b .del -%patch8 -p1 -b .plugin %patch9 -p2 -b .sbrk %ifarch s390 %patch10 -p1 -b .s390 @@ -455,6 +453,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Dec 9 2010 Jan Horak - 1.9.2.13-1 +- Update to 1.9.2.13 + * Wed Oct 27 2010 Jan Horak - 1.9.2.12-1 - Update to 1.9.2.12 From 3c531902e10c5289acf2baf244279cd686620ca4 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 20 Dec 2010 12:14:52 +0100 Subject: [PATCH 11/31] removed unused library path (rhbz#658471) --- xulrunner.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 61d1065..bb3aaf2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,7 +23,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.13 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -336,18 +336,6 @@ MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.` %{__mv} $RPM_BUILD_ROOT/etc/gre.d/$MOZILLA_GECKO_VERSION".system.conf" \ $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} - -# Library path -%ifarch x86_64 ia64 ppc64 s390x -%define ld_conf_file xulrunner-64.conf -%else -%define ld_conf_file xulrunner-32.conf -%endif - -%{__mkdir_p} $RPM_BUILD_ROOT/etc/ld.so.conf.d -%{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{ld_conf_file} << EOF -${MOZ_APP_DIR} -EOF # Copy over the LICENSE %{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR} @@ -419,7 +407,6 @@ fi %{mozappdir}/xulrunner-stub %{mozappdir}/platform.ini %{mozappdir}/dependentlibs.list -%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf %if %{?separated_plugins} %{mozappdir}/plugin-container %endif @@ -453,6 +440,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Dec 20 2010 Martin Stransky 1.9.2.13-2 +- removed unused library path (rhbz#658471) + * Thu Dec 9 2010 Jan Horak - 1.9.2.13-1 - Update to 1.9.2.13 From b31ae121b596b3bbdf3dcac069604ca728a527d3 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 3 Jan 2011 11:56:39 +0100 Subject: [PATCH 12/31] reverted fix for rhbz#658471, breaks gnome shell, disabled system cairo, breaks animated gifs (rhbz#628331) --- xulrunner-mozconfig | 6 ++++-- xulrunner.spec | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 6a007d9..dcbc124 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -11,8 +11,10 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --enable-system-hunspell -#ac_add_options --enable-system-sqlite Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE -ac_add_options --enable-system-cairo +# Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE +#ac_add_options --enable-system-sqlite +# disabled because of rhbz#628331 +ac_add_options --disable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-strip ac_add_options --disable-tests diff --git a/xulrunner.spec b/xulrunner.spec index bb3aaf2..80a9b82 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,7 +23,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.13 -Release: 2%{?pretag}%{?dist} +Release: 3%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -336,6 +336,18 @@ MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.` %{__mv} $RPM_BUILD_ROOT/etc/gre.d/$MOZILLA_GECKO_VERSION".system.conf" \ $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} + +# Library path +%ifarch x86_64 ia64 ppc64 s390x +%define ld_conf_file xulrunner-64.conf +%else +%define ld_conf_file xulrunner-32.conf +%endif + +%{__mkdir_p} $RPM_BUILD_ROOT/etc/ld.so.conf.d +%{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{ld_conf_file} << EOF +${MOZ_APP_DIR} +EOF # Copy over the LICENSE %{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR} @@ -407,6 +419,7 @@ fi %{mozappdir}/xulrunner-stub %{mozappdir}/platform.ini %{mozappdir}/dependentlibs.list +%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf %if %{?separated_plugins} %{mozappdir}/plugin-container %endif @@ -440,6 +453,10 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jan 3 2011 Martin Stransky 1.9.2.13-3 +- reverted fix for rhbz#658471, breaks gnome shell +- disabled system cairo, breaks animated gifs (rhbz#628331) + * Mon Dec 20 2010 Martin Stransky 1.9.2.13-2 - removed unused library path (rhbz#658471) From a6fa45542bd098e45ef5256dcef3069003983874 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 3 Jan 2011 13:18:41 +0100 Subject: [PATCH 13/31] Enabled mozilla crash reporter --- xulrunner.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 80a9b82..96529f1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -12,7 +12,12 @@ %define freetype_version 2.1.9 %define sqlite_version 3.6.16 %define tarballdir mozilla-1.9.2 -%define enable_mozilla_crashreporter 0 +# enable crash reporter only for iX86 +%ifarch %{ix86} +%define enable_mozilla_crashreporter 1 +%else +%define enable_mozilla_crashreporter 0 +%endif # The actual sqlite version (see #480989): %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) @@ -23,7 +28,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.13 -Release: 3%{?pretag}%{?dist} +Release: 4%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -363,9 +368,10 @@ touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat # Add debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} -cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir} -#cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} +# Debug symbols are stored in /usr/lib even in x86_64 arch +DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"` +mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} +cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} %endif #--------------------------------------------------------------------- @@ -453,6 +459,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jan 3 2011 Jan Horak - 1.9.2.13-4 +- Enabled mozilla crash reporter + * Mon Jan 3 2011 Martin Stransky 1.9.2.13-3 - reverted fix for rhbz#658471, breaks gnome shell - disabled system cairo, breaks animated gifs (rhbz#628331) From edd0ea12afb5e14297f9ea6af8a636f3805183be Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 3 Jan 2011 14:25:46 +0100 Subject: [PATCH 14/31] renamed libsqlite3.so to libmozsqlite3.so (rhbz#658471) --- xulrunner-mozconfig | 2 +- xulrunner.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index dcbc124..0330b67 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -12,7 +12,7 @@ ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --enable-system-hunspell # Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE -#ac_add_options --enable-system-sqlite +ac_add_options --disable-system-sqlite # disabled because of rhbz#628331 ac_add_options --disable-system-cairo ac_add_options --with-pthreads diff --git a/xulrunner.spec b/xulrunner.spec index 96529f1..8bf3420 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -28,7 +28,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.13 -Release: 4%{?pretag}%{?dist} +Release: 5%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -56,6 +56,7 @@ Patch21: mozilla-libjpeg-turbo.patch Patch22: mozilla-crashreporter-static.patch # Upstream patches +Patch30: mozilla-513747.patch # --------------------------------------------------- @@ -156,6 +157,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch21 -p2 -b .jpeg-turbo %patch22 -p1 -b .static +%patch30 -p2 -b .513747 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -459,6 +461,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jan 3 2011 Martin Stransky 1.9.2.13-5 +- renamed libsqlite3.so to libmozsqlite3.so (rhbz#658471) + * Mon Jan 3 2011 Jan Horak - 1.9.2.13-4 - Enabled mozilla crash reporter From 9faafe8142fbe3652e356836f110f6df3696889f Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 3 Jan 2011 14:29:12 +0100 Subject: [PATCH 15/31] added missing patch --- mozilla-513747.patch | 97 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 mozilla-513747.patch diff --git a/mozilla-513747.patch b/mozilla-513747.patch new file mode 100644 index 0000000..f74e2ab --- /dev/null +++ b/mozilla-513747.patch @@ -0,0 +1,97 @@ +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in.513747 2010-12-03 16:47:53.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in 2011-01-03 13:29:14.000000000 +0100 +@@ -99,7 +99,7 @@ + #elifdef XP_OS2 + @BINPATH@/plugins/npnulos2.dll + #endif +-@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@ ++@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ + @BINPATH@/README.txt + @BINPATH@/LICENSE + @BINPATH@/blocklist.xml +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in.513747 2010-12-03 16:47:53.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in 2011-01-03 13:20:16.000000000 +0100 +@@ -811,5 +811,6 @@ install.rdf + components/nsUpdateService.js + components/nsUpdateServiceStub.js + #endif ++@DLL_PREFIX@sqlite3@DLL_SUFFIX@ + old-homepage-default.properties + mozilla-runtime@BIN_SUFFIX@ +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in.513747 2010-12-03 16:47:53.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in 2011-01-03 13:20:16.000000000 +0100 +@@ -448,7 +448,7 @@ user_pref("camino.use_system_proxy_setti + if self.UNIXISH or self.IS_MAC: + envVar = "LD_LIBRARY_PATH" + if self.IS_MAC: +- envVar = "DYLD_LIBRARY_PATH" ++ envVar = "DYLD_LIBRARY_PATH_DISABLED" + else: # unixish + env['MOZILLA_FIVE_HOME'] = xrePath + if envVar in env: +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/configure.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/configure.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/configure.in.513747 2011-01-03 13:20:16.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/configure.in 2011-01-03 13:28:11.000000000 +0100 +@@ -6332,8 +6332,8 @@ MOZ_NATIVE_SQLITE= ) + + if test -z "$MOZ_NATIVE_SQLITE" + then +- SQLITE_CFLAGS= +- SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)' ++ SQLITE_CFLAGS= ++ SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)' + else + PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION) + dnl =================================== +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in.513747 2010-12-03 16:47:59.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in 2011-01-03 13:20:16.000000000 +0100 +@@ -46,7 +46,7 @@ VPATH = @srcdir@ + include $(DEPTH)/config/autoconf.mk + + MODULE = sqlite3 +-LIBRARY_NAME = sqlite3 ++LIBRARY_NAME = mozsqlite3 + FORCE_SHARED_LIB = 1 + VISIBILITY_FLAGS = + LIB_IS_C_ONLY = 1 +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def.513747 xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def +--- xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def.513747 2010-12-03 16:47:59.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def 2011-01-03 13:20:16.000000000 +0100 +@@ -33,7 +33,7 @@ + ; + ; ***** END LICENSE BLOCK ***** + +-LIBRARY sqlite3.dll ++LIBRARY mozsqlite3.dll + + EXPORTS + sqlite3_aggregate_context +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in.513747 2011-01-03 13:20:16.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in 2011-01-03 13:30:23.000000000 +0100 +@@ -179,6 +179,9 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= + DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) + DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 + DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 ++ifndef MOZ_NATIVE_SQLITE ++DEFAULT_GMAKE_FLAGS += SQLITE=$(call EXPAND_LIBNAME,mozsqlite3) ++endif + ifdef NSS_DISABLE_DBM + DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 + endif +diff -up xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in +--- xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in.513747 2010-12-03 16:49:21.000000000 +0100 ++++ xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in 2011-01-03 13:20:16.000000000 +0100 +@@ -85,7 +85,7 @@ DEPENDENT_LIBS_LIST += \ + ifdef MOZ_ENABLE_LIBXUL + + DEPENDENT_LIBS_LIST += \ +- $(LIB_PREFIX)sqlite3$(DLL_SUFFIX) \ ++ $(LIB_PREFIX)mozsqlite3$(DLL_SUFFIX) \ + $(LIB_PREFIX)nssutil3$(DLL_SUFFIX) \ + $(LIB_PREFIX)softokn3$(DLL_SUFFIX) \ + $(LIB_PREFIX)nss3$(DLL_SUFFIX) \ From 7185271dc47c7bae65da5710cf8129e184349fbf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 10 Jan 2011 18:37:57 -0600 Subject: [PATCH 16/31] disable naojit on sparc64 --- xulrunner.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 8bf3420..7355d6b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -28,7 +28,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.13 -Release: 5%{?pretag}%{?dist} +Release: 6%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -169,6 +169,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ echo "ac_add_options --disable-ipc" >> .mozconfig %endif +# Upstream bug filed without resolution +# for now make sure jit is not enabled on sparc64 +%ifarch sparc64 +echo "ac_add_options --disable-jit" >> .mozconfig +%endif + #--------------------------------------------------------------------- %build @@ -461,6 +467,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jan 10 2011 Dennis Gilmore 1.9.2.13-6 +- disable nanojit on sparc64 its not supported and doesnt get automatically switched off + * Mon Jan 3 2011 Martin Stransky 1.9.2.13-5 - renamed libsqlite3.so to libmozsqlite3.so (rhbz#658471) From 21d9f3cb95e7493494bead4d923be17a28d9750a Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 1 Mar 2011 09:56:49 +0100 Subject: [PATCH 17/31] Update to 1.9.2.14 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4d87b48..b1f36d1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 +/xulrunner-1.9.2.14.source.tar.bz2 diff --git a/sources b/sources index 50ee003..cd95fea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7c90aed8209beefa74badf02e8eeae1 xulrunner-1.9.2.13.source.tar.bz2 +ab0d00cd33e6b2388429dda1c01abd01 xulrunner-1.9.2.14.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 7355d6b..1429d81 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,8 +27,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.13 -Release: 6%{?pretag}%{?dist} +Version: 1.9.2.14 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -467,6 +467,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 1 2011 Jan Horak - 1.9.2.14-1 +- Update to 1.9.2.14 + * Mon Jan 10 2011 Dennis Gilmore 1.9.2.13-6 - disable nanojit on sparc64 its not supported and doesnt get automatically switched off From 700bdc1b85d122ed443f9a9153f77dec7c403e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 7 Mar 2011 13:48:42 +0100 Subject: [PATCH 18/31] mozilla-build-s390.patch updated --- mozilla-build-s390.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla-build-s390.patch b/mozilla-build-s390.patch index 92f5cbb..2bfe1d5 100644 --- a/mozilla-build-s390.patch +++ b/mozilla-build-s390.patch @@ -1,8 +1,8 @@ -diff -up mozilla-1.9.2/js/src/jstl.h.old mozilla-1.9.2/js/src/jstl.h ---- mozilla-1.9.2/js/src/jstl.h.old 2010-03-10 10:01:51.000000000 +0100 -+++ mozilla-1.9.2/js/src/jstl.h 2010-03-10 12:24:55.000000000 +0100 +diff -up mozilla-1.9.2/js/src/jstl.h.s390 mozilla-1.9.2/js/src/jstl.h +--- mozilla-1.9.2/js/src/jstl.h.s390 2011-02-18 19:33:24.000000000 +0100 ++++ mozilla-1.9.2/js/src/jstl.h 2011-03-07 08:41:29.000000000 +0100 @@ -195,7 +195,6 @@ class ReentrancyGuard - static JS_ALWAYS_INLINE size_t + JS_ALWAYS_INLINE size_t RoundUpPow2(size_t x) { - typedef tl::StaticAssert::result>::result _; From 7860a3324959e0839e55ac07db338c3e41aae80f Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 7 Mar 2011 14:41:34 +0100 Subject: [PATCH 19/31] Update to 3.6.15 Crashreporter enabled for x86_64 --- crashreporter-remove-static.patch | 11 +++++++++++ xulrunner.spec | 14 +++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 crashreporter-remove-static.patch diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch new file mode 100644 index 0000000..b94d165 --- /dev/null +++ b/crashreporter-remove-static.patch @@ -0,0 +1,11 @@ +diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in +--- mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200 +@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1 + + #XXX: bug 554854 causes us to be unable to run binaries on the build slaves + # due to them having an older libstdc++ +-HOST_LDFLAGS += -static ++#HOST_LDFLAGS += -static + + include $(topsrcdir)/config/rules.mk diff --git a/xulrunner.spec b/xulrunner.spec index 1429d81..a20b933 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -13,7 +13,7 @@ %define sqlite_version 3.6.16 %define tarballdir mozilla-1.9.2 # enable crash reporter only for iX86 -%ifarch %{ix86} +%ifarch %{ix86} x86_64 %define enable_mozilla_crashreporter 1 %else %define enable_mozilla_crashreporter 0 @@ -27,7 +27,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.14 +Version: 1.9.2.15 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -54,6 +54,7 @@ Patch11: mozilla-gdk-pixbuf.patch Patch20: mozilla-192-pkgconfig.patch Patch21: mozilla-libjpeg-turbo.patch Patch22: mozilla-crashreporter-static.patch +Patch24: crashreporter-remove-static.patch # Upstream patches Patch30: mozilla-513747.patch @@ -194,7 +195,11 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} # Mozilla builds with -Wall with exception of a few warnings which show up # everywhere in the code; so, don't override that. -MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//') +# +# -fpermissive is needed to build with gcc 4.6+ which has become stricter +# +MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \ + %{__sed} -e 's/-Wall//' ) export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS @@ -467,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Mar 7 2011 Jan Horak - 1.9.2.15-1 +- Update to 1.9.2.15 + * Tue Mar 1 2011 Jan Horak - 1.9.2.14-1 - Update to 1.9.2.14 From dcb3c8ac3378d4931998fd9401a1bfb02ad08764 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 7 Mar 2011 18:23:00 +0100 Subject: [PATCH 20/31] update to 1.9.2.15 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b1f36d1..8889ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 /xulrunner-1.9.2.14.source.tar.bz2 +/xulrunner-1.9.2.15.source.tar.bz2 diff --git a/sources b/sources index cd95fea..54c799f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab0d00cd33e6b2388429dda1c01abd01 xulrunner-1.9.2.14.source.tar.bz2 +fcf8042948d91f1f3d9c33599b79cf35 xulrunner-1.9.2.15.source.tar.bz2 From 9d2c658a1a23fa4c1d0b79fa8e385eb2ea540f06 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 8 Mar 2011 09:02:07 +0100 Subject: [PATCH 21/31] Replacing -gstabs with -gdwarf2 --- xulrunner-mozconfig-debuginfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xulrunner-mozconfig-debuginfo b/xulrunner-mozconfig-debuginfo index a0ef07a..4dd2427 100644 --- a/xulrunner-mozconfig-debuginfo +++ b/xulrunner-mozconfig-debuginfo @@ -1,5 +1,5 @@ # For mozilla's debuginfo: -export CFLAGS="-gstabs+" -export CXXFLAGS="-gstabs+" +export CFLAGS="$CFLAGS -gdwarf-2" +export CXXFLAGS="$CXXFLAGS -gdwarf-2" export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-crashreporter From d3121973ce10b93627667747759df24331982264 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 22 Mar 2011 15:22:01 -0700 Subject: [PATCH 22/31] 1.9.2.16 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8889ad4..23f1055 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 /xulrunner-1.9.2.14.source.tar.bz2 /xulrunner-1.9.2.15.source.tar.bz2 +/xulrunner-1.9.2.16.source.tar.bz2 diff --git a/sources b/sources index 54c799f..0add42a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcf8042948d91f1f3d9c33599b79cf35 xulrunner-1.9.2.15.source.tar.bz2 +232a3c0160cd1cbe3dcaaaf7e4ae51c2 xulrunner-1.9.2.16.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index a20b933..52decf8 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,7 +27,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.15 +Version: 1.9.2.16 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -472,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 22 2011 Christopher Aillon - 3.6.16-1 +- Update to 1.9.2.16 + * Mon Mar 7 2011 Jan Horak - 1.9.2.15-1 - Update to 1.9.2.15 From 198eec86828cdeb8f2834fc23fc99d88d2cd9e51 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 28 Apr 2011 12:59:59 +0200 Subject: [PATCH 23/31] Update to 1.9.2.17 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 23f1055..fb90f42 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.14.source.tar.bz2 /xulrunner-1.9.2.15.source.tar.bz2 /xulrunner-1.9.2.16.source.tar.bz2 +/xulrunner-1.9.2.17.source.tar.bz2 diff --git a/sources b/sources index 0add42a..bdf1b14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -232a3c0160cd1cbe3dcaaaf7e4ae51c2 xulrunner-1.9.2.16.source.tar.bz2 +49509c51010bd91a198aee63780aeaf9 xulrunner-1.9.2.17.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 52decf8..7923313 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,7 +27,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.16 +Version: 1.9.2.17 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -472,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Apr 28 2011 Jan Horak - 1.9.2.17-1 +- Update to 1.9.2.17 + * Tue Mar 22 2011 Christopher Aillon - 3.6.16-1 - Update to 1.9.2.16 From 23997c967ecae70f224216b4d5dccf7fc874b016 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 28 Apr 2011 22:00:15 +0200 Subject: [PATCH 24/31] Added comodo/nss patch --- mozilla-comodo-646460.patch | 24 ++++++++++++++++++++++++ xulrunner.spec | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 mozilla-comodo-646460.patch diff --git a/mozilla-comodo-646460.patch b/mozilla-comodo-646460.patch new file mode 100644 index 0000000..a9f806d --- /dev/null +++ b/mozilla-comodo-646460.patch @@ -0,0 +1,24 @@ +diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp +--- a/security/manager/ssl/src/nsNSSIOLayer.cpp ++++ b/security/manager/ssl/src/nsNSSIOLayer.cpp +@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info + { + infoObject->SetCanceled(PR_TRUE); + return SECFailure; + } + + static SECStatus + nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket) + { ++ // cert was revoked, don't do anything else ++ if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE) ++ return SECFailure; ++ + nsNSSShutDownPreventionLock locker; + nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg; + if (!infoObject) + return SECFailure; + + if (nsSSLThread::exitRequested()) + return cancel_and_failure(infoObject); + diff --git a/xulrunner.spec b/xulrunner.spec index 7923313..39658f0 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -58,6 +58,7 @@ Patch24: crashreporter-remove-static.patch # Upstream patches Patch30: mozilla-513747.patch +Patch31: mozilla-comodo-646460.patch # --------------------------------------------------- @@ -159,6 +160,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch22 -p1 -b .static %patch30 -p2 -b .513747 +%patch31 -p1 -b .646460 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig From e5b1a4deab9930291db89299146330e42d9c6583 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 28 Apr 2011 22:01:41 +0200 Subject: [PATCH 25/31] release bump --- xulrunner.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 39658f0..6888470 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -28,7 +28,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.17 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -474,7 +474,7 @@ fi #--------------------------------------------------------------------- %changelog -* Thu Apr 28 2011 Jan Horak - 1.9.2.17-1 +* Thu Apr 28 2011 Jan Horak - 1.9.2.17-2 - Update to 1.9.2.17 * Tue Mar 22 2011 Christopher Aillon - 3.6.16-1 From a1268bcad5a9df217759086ebd119161812e7b41 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 21 Jun 2011 11:52:56 +0200 Subject: [PATCH 26/31] Update to 3.6.18 --- .gitignore | 1 + mozilla-comodo-646460.patch | 24 ------------------------ sources | 2 +- xulrunner.spec | 9 +++++---- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 mozilla-comodo-646460.patch diff --git a/.gitignore b/.gitignore index fb90f42..8f1f9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.15.source.tar.bz2 /xulrunner-1.9.2.16.source.tar.bz2 /xulrunner-1.9.2.17.source.tar.bz2 +/xulrunner-1.9.2.18.source.tar.bz2 diff --git a/mozilla-comodo-646460.patch b/mozilla-comodo-646460.patch deleted file mode 100644 index a9f806d..0000000 --- a/mozilla-comodo-646460.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp ---- a/security/manager/ssl/src/nsNSSIOLayer.cpp -+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp -@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info - { - infoObject->SetCanceled(PR_TRUE); - return SECFailure; - } - - static SECStatus - nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket) - { -+ // cert was revoked, don't do anything else -+ if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE) -+ return SECFailure; -+ - nsNSSShutDownPreventionLock locker; - nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg; - if (!infoObject) - return SECFailure; - - if (nsSSLThread::exitRequested()) - return cancel_and_failure(infoObject); - diff --git a/sources b/sources index bdf1b14..48ec94e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49509c51010bd91a198aee63780aeaf9 xulrunner-1.9.2.17.source.tar.bz2 +2f1b6f82c6f3fa59254b32468e29e008 xulrunner-1.9.2.18.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 6888470..8469cfe 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,8 +27,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.17 -Release: 2%{?pretag}%{?dist} +Version: 1.9.2.18 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -58,7 +58,6 @@ Patch24: crashreporter-remove-static.patch # Upstream patches Patch30: mozilla-513747.patch -Patch31: mozilla-comodo-646460.patch # --------------------------------------------------- @@ -160,7 +159,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch22 -p1 -b .static %patch30 -p2 -b .513747 -%patch31 -p1 -b .646460 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -474,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 21 2011 Jan Horak - 1.9.2.18-1 +- Update to 1.9.2.18 + * Thu Apr 28 2011 Jan Horak - 1.9.2.17-2 - Update to 1.9.2.17 From a7aaa4e2163619e82aadc128c3dc85dd913ebfc6 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 16 Aug 2011 22:36:56 +0200 Subject: [PATCH 27/31] Update to 1.9.2.20 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f1f9f1..39dc540 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.16.source.tar.bz2 /xulrunner-1.9.2.17.source.tar.bz2 /xulrunner-1.9.2.18.source.tar.bz2 +/xulrunner-1.9.2.20.source.tar.bz2 diff --git a/sources b/sources index 48ec94e..0b70a4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f1b6f82c6f3fa59254b32468e29e008 xulrunner-1.9.2.18.source.tar.bz2 +5a7efdef31f331cff68dbd28e7675ff1 xulrunner-1.9.2.20.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 8469cfe..25618d7 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,7 +27,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.18 +Version: 1.9.2.20 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -472,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Aug 16 2011 Jan Horak - 1.9.2.20-1 +- Update to 1.9.2.20 + * Tue Jun 21 2011 Jan Horak - 1.9.2.18-1 - Update to 1.9.2.18 From e9fc6c0cdda62473cc2a107549f9bbff08250528 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 31 Aug 2011 11:49:07 +0200 Subject: [PATCH 28/31] Distrust a specific Certificate Authority --- xulrunner-diginotar.patch | 278 ++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 7 +- 2 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 xulrunner-diginotar.patch diff --git a/xulrunner-diginotar.patch b/xulrunner-diginotar.patch new file mode 100644 index 0000000..af69fd2 --- /dev/null +++ b/xulrunner-diginotar.patch @@ -0,0 +1,278 @@ +# HG changeset patch +# User Brian Smith +# Date 1314714784 14400 +# Node ID b01c24423221e4e88447d24c17412fbba9913993 +# Parent cbe67e60d8c0f10dbc34768cac7e0b0821674dc2 +Bug 682927 - Dis-trust DigiNotar root certificate, part 3; r=kaie,dveditz a=me + +diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp +--- a/security/manager/ssl/src/nsNSSCallbacks.cpp ++++ b/security/manager/ssl/src/nsNSSCallbacks.cpp +@@ -997,16 +997,63 @@ static struct nsSerialBinaryBlacklistEnt + { 16, "\x3e\x75\xce\xd4\x6b\x69\x30\x21\x21\x88\x30\xae\x86\xa8\x2a\x71" }, + { 17, "\x00\xe9\x02\x8b\x95\x78\xe4\x15\xdc\x1a\x71\x0a\x2b\x88\x15\x44\x47" }, + { 17, "\x00\xd7\x55\x8f\xda\xf5\xf1\x10\x5b\xb2\x13\x28\x2b\x70\x77\x29\xa3" }, + { 16, "\x04\x7e\xcb\xe9\xfc\xa5\x5f\x7b\xd0\x9e\xae\x36\xe1\x0c\xae\x1e" }, + { 17, "\x00\xf5\xc8\x6a\xf3\x61\x62\xf1\x3a\x64\xf5\x4f\x6d\xc9\x58\x7c\x06" }, + { 0, 0 } // end marker + }; + ++// Bug 682927: Do not trust any DigiNotar-issued certificates. ++// We do this check after normal certificate validation because we do not ++// want to override a "revoked" OCSP response. ++PRErrorCode ++PSM_SSL_BlacklistDigiNotar(CERTCertificate * serverCert, ++ CERTCertList * serverCertChain) ++{ ++ PRBool isDigiNotarIssuedCert = PR_FALSE; ++ ++ for (CERTCertListNode *node = CERT_LIST_HEAD(serverCertChain); ++ !CERT_LIST_END(node, serverCertChain); ++ node = CERT_LIST_NEXT(node)) { ++ if (!node->cert->issuerName) ++ continue; ++ ++ if (strstr(node->cert->issuerName, "CN=DigiNotar")) { ++ isDigiNotarIssuedCert = PR_TRUE; ++ // Do not let the user override the error if the cert was ++ // chained from the "DigiNotar Root CA" cert and the cert was issued ++ // within the time window in which we think the mis-issuance(s) occurred. ++ if (strstr(node->cert->issuerName, "CN=DigiNotar Root CA")) { ++ PRTime cutoff = 0, notBefore = 0, notAfter = 0; ++ PRStatus status = PR_ParseTimeString("01-JUL-2011 00:00", PR_TRUE, &cutoff); ++ NS_ASSERTION(status == PR_SUCCESS, "PR_ParseTimeString failed"); ++ if (status != PR_SUCCESS || ++ CERT_GetCertTimes(serverCert, ¬Before, ¬After) != SECSuccess || ++ notBefore >= cutoff) { ++ return SEC_ERROR_REVOKED_CERTIFICATE; ++ } ++ } ++ } ++ ++ // By request of the Dutch government ++ if (!strcmp(node->cert->issuerName, ++ "CN=Staat der Nederlanden Root CA,O=Staat der Nederlanden,C=NL") && ++ CERT_LIST_END(CERT_LIST_NEXT(node), serverCertChain)) { ++ return 0; ++ } ++ } ++ ++ if (isDigiNotarIssuedCert) ++ return SEC_ERROR_UNTRUSTED_ISSUER; // user can override this ++ else ++ return 0; // No DigiNotor cert => carry on as normal ++} ++ ++ + SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd, + PRBool checksig, PRBool isServer) { + nsNSSShutDownPreventionLock locker; + + CERTCertificate *serverCert = SSL_PeerCertificate(fd); + CERTCertificateCleaner serverCertCleaner(serverCert); + + if (serverCert && +@@ -1059,24 +1106,38 @@ SECStatus PR_CALLBACK AuthCertificateCal + nsNSSSocketInfo* infoObject = (nsNSSSocketInfo*) fd->higher->secret; + nsRefPtr status = infoObject->SSLStatus(); + nsRefPtr nsc; + + if (!status || !status->mServerCert) { + nsc = new nsNSSCertificate(serverCert); + } + ++ CERTCertList *certList = nsnull; ++ if (rv == SECSuccess) { ++ certList = CERT_GetCertChainFromCert(serverCert, PR_Now(), certUsageSSLCA); ++ if (!certList) { ++ rv = SECFailure; ++ } else { ++ PRErrorCode blacklistErrorCode = PSM_SSL_BlacklistDigiNotar(serverCert, ++ certList); ++ if (blacklistErrorCode != 0) { ++ infoObject->SetCertIssuerBlacklisted(); ++ PORT_SetError(blacklistErrorCode); ++ rv = SECFailure; ++ } ++ } ++ } ++ + if (SECSuccess == rv) { + if (nsc) { + PRBool dummyIsEV; + nsc->GetIsExtendedValidation(&dummyIsEV); // the nsc object will cache the status + } + +- CERTCertList *certList = CERT_GetCertChainFromCert(serverCert, PR_Now(), certUsageSSLCA); +- + nsCOMPtr nssComponent; + + for (CERTCertListNode *node = CERT_LIST_HEAD(certList); + !CERT_LIST_END(node, certList); + node = CERT_LIST_NEXT(node)) { + + if (node->cert->slot) { + // This cert was found on a token, no need to remember it in the temp db. +@@ -1102,16 +1163,19 @@ SECStatus PR_CALLBACK AuthCertificateCal + if (slot) { + PK11_ImportCert(slot, node->cert, CK_INVALID_HANDLE, + const_cast(nickname.get()), PR_FALSE); + PK11_FreeSlot(slot); + } + } + } + ++ } ++ ++ if (certList) { + CERT_DestroyCertList(certList); + } + + // The connection may get terminated, for example, if the server requires + // a client cert. Let's provide a minimal SSLStatus + // to the caller that contains at least the cert and its status. + if (!status) { + status = new nsSSLStatus(); +diff --git a/security/manager/ssl/src/nsNSSCallbacks.h b/security/manager/ssl/src/nsNSSCallbacks.h +--- a/security/manager/ssl/src/nsNSSCallbacks.h ++++ b/security/manager/ssl/src/nsNSSCallbacks.h +@@ -48,16 +48,19 @@ + + char* PR_CALLBACK + PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg); + + void PR_CALLBACK HandshakeCallback(PRFileDesc *fd, void *client_data); + SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd, + PRBool checksig, PRBool isServer); + ++PRErrorCode PSM_SSL_BlacklistDigiNotar(CERTCertificate * serverCert, ++ CERTCertList * serverCertChain); ++ + SECStatus RegisterMyOCSPAIAInfoCallback(); + SECStatus UnregisterMyOCSPAIAInfoCallback(); + + class nsHTTPListener : public nsIStreamLoaderObserver + { + private: + // For XPCOM implementations that are not a base class for some other + // class, it is good practice to make the destructor non-virtual and +diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp +--- a/security/manager/ssl/src/nsNSSIOLayer.cpp ++++ b/security/manager/ssl/src/nsNSSIOLayer.cpp +@@ -217,17 +217,18 @@ nsNSSSocketInfo::nsNSSSocketInfo() + mForSTARTTLS(PR_FALSE), + mHandshakePending(PR_TRUE), + mCanceled(PR_FALSE), + mHasCleartextPhase(PR_FALSE), + mHandshakeInProgress(PR_FALSE), + mAllowTLSIntoleranceTimeout(PR_TRUE), + mRememberClientAuthCertificate(PR_FALSE), + mHandshakeStartTime(0), +- mPort(0) ++ mPort(0), ++ mIsCertIssuerBlacklisted(PR_FALSE) + { + mThreadData = new nsSSLSocketThreadData; + } + + nsNSSSocketInfo::~nsNSSSocketInfo() + { + delete mThreadData; + +@@ -3300,16 +3301,20 @@ nsNSSBadCertHandler(void *arg, PRFileDes + + verify_log->arena = log_arena; + + srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), peerCert, + PR_TRUE, certificateUsageSSLServer, + PR_Now(), (void*)infoObject, + verify_log, NULL); + ++ if (infoObject->IsCertIssuerBlacklisted()) { ++ collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED; ++ } ++ + // We ignore the result code of the cert verification. + // Either it is a failure, which is expected, and we'll process the + // verify log below. + // Or it is a success, then a domain mismatch is the only + // possible failure. + + CERTVerifyLogNode *i_node; + for (i_node = verify_log->head; i_node; i_node = i_node->next) +diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h +--- a/security/manager/ssl/src/nsNSSIOLayer.h ++++ b/security/manager/ssl/src/nsNSSIOLayer.h +@@ -196,16 +196,22 @@ public: + + /* Set SSL Status values */ + nsresult SetSSLStatus(nsSSLStatus *aSSLStatus); + nsSSLStatus* SSLStatus() { return mSSLStatus; } + PRBool hasCertErrors(); + + PRStatus CloseSocketAndDestroy(); + ++ PRBool IsCertIssuerBlacklisted() const { ++ return mIsCertIssuerBlacklisted; ++ } ++ void SetCertIssuerBlacklisted() { ++ mIsCertIssuerBlacklisted = PR_TRUE; ++ } + protected: + nsCOMPtr mCallbacks; + PRFileDesc* mFd; + nsCOMPtr mCert; + nsCOMPtr mPreviousCert; // DocShellDependent + enum { + blocking_state_unknown, is_nonblocking_socket, is_blocking_socket + } mBlockingState; +@@ -223,16 +229,17 @@ protected: + PRPackedBool mCanceled; + PRPackedBool mHasCleartextPhase; + PRPackedBool mHandshakeInProgress; + PRPackedBool mAllowTLSIntoleranceTimeout; + PRPackedBool mRememberClientAuthCertificate; + PRIntervalTime mHandshakeStartTime; + PRInt32 mPort; + nsXPIDLCString mHostName; ++ PRErrorCode mIsCertIssuerBlacklisted; + + /* SSL Status */ + nsRefPtr mSSLStatus; + + nsresult ActivateSSL(); + + nsSSLSocketThreadData *mThreadData; + +diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp +--- a/security/manager/ssl/src/nsIdentityChecking.cpp ++++ b/security/manager/ssl/src/nsIdentityChecking.cpp +@@ -118,28 +118,16 @@ static struct nsMyTrustedEVInfo myTruste + SEC_OID_UNKNOWN, + "5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6", + "MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVz" + "dCBHbG9iYWwgUm9vdA==", + "BAAAAAABD4WqLUg=", + nsnull + }, + { +- // E=info@diginotar.nl,CN=DigiNotar Root CA,O=DigiNotar,C=NL +- "2.16.528.1.1001.1.1.1.12.6.1.1.1", +- "DigiNotar EV OID", +- SEC_OID_UNKNOWN, +- "C0:60:ED:44:CB:D8:81:BD:0E:F8:6C:0B:A2:87:DD:CF:81:67:47:8C", +- "MF8xCzAJBgNVBAYTAk5MMRIwEAYDVQQKEwlEaWdpTm90YXIxGjAYBgNVBAMTEURp" +- "Z2lOb3RhciBSb290IENBMSAwHgYJKoZIhvcNAQkBFhFpbmZvQGRpZ2lub3Rhci5u" +- "bA==", +- "DHbanJEMTiye/hXQWJM8TA==", +- nsnull +- }, +- { + // CN=SwissSign Gold CA - G2,O=SwissSign AG,C=CH + "2.16.756.1.89.1.2.1.1", + "SwissSign EV OID", + SEC_OID_UNKNOWN, + "D8:C5:38:8A:B7:30:1B:1B:6E:D4:7A:E6:45:25:3A:6F:9F:1A:27:61", + "MEUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMT" + "FlN3aXNzU2lnbiBHb2xkIENBIC0gRzI=", + "ALtAHEP1Xk+w", diff --git a/xulrunner.spec b/xulrunner.spec index 25618d7..ad172f3 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -28,7 +28,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.20 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -58,6 +58,7 @@ Patch24: crashreporter-remove-static.patch # Upstream patches Patch30: mozilla-513747.patch +Patch31: xulrunner-diginotar.patch # --------------------------------------------------- @@ -159,6 +160,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch22 -p1 -b .static %patch30 -p2 -b .513747 +%patch31 -p1 -b .diginotar %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -472,6 +474,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Aug 31 2011 Jan Horak - 1.9.2.20-2 +- Distrust a specific Certificate Authority + * Tue Aug 16 2011 Jan Horak - 1.9.2.20-1 - Update to 1.9.2.20 From 42108faccd1b5965b2346eba70359ea7133c83b0 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 6 Sep 2011 14:20:37 +0200 Subject: [PATCH 29/31] Update to 1.9.2.22 --- .gitignore | 1 + sources | 2 +- xulrunner-diginotar.patch | 278 -------------------------------------- xulrunner.spec | 9 +- 4 files changed, 7 insertions(+), 283 deletions(-) delete mode 100644 xulrunner-diginotar.patch diff --git a/.gitignore b/.gitignore index 39dc540..7439fc9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.17.source.tar.bz2 /xulrunner-1.9.2.18.source.tar.bz2 /xulrunner-1.9.2.20.source.tar.bz2 +/xulrunner-1.9.2.22.source.tar.bz2 diff --git a/sources b/sources index 0b70a4e..cfc305d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a7efdef31f331cff68dbd28e7675ff1 xulrunner-1.9.2.20.source.tar.bz2 +b2ed2c401808bfc28038b201afb203f3 xulrunner-1.9.2.22.source.tar.bz2 diff --git a/xulrunner-diginotar.patch b/xulrunner-diginotar.patch deleted file mode 100644 index af69fd2..0000000 --- a/xulrunner-diginotar.patch +++ /dev/null @@ -1,278 +0,0 @@ -# HG changeset patch -# User Brian Smith -# Date 1314714784 14400 -# Node ID b01c24423221e4e88447d24c17412fbba9913993 -# Parent cbe67e60d8c0f10dbc34768cac7e0b0821674dc2 -Bug 682927 - Dis-trust DigiNotar root certificate, part 3; r=kaie,dveditz a=me - -diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp ---- a/security/manager/ssl/src/nsNSSCallbacks.cpp -+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp -@@ -997,16 +997,63 @@ static struct nsSerialBinaryBlacklistEnt - { 16, "\x3e\x75\xce\xd4\x6b\x69\x30\x21\x21\x88\x30\xae\x86\xa8\x2a\x71" }, - { 17, "\x00\xe9\x02\x8b\x95\x78\xe4\x15\xdc\x1a\x71\x0a\x2b\x88\x15\x44\x47" }, - { 17, "\x00\xd7\x55\x8f\xda\xf5\xf1\x10\x5b\xb2\x13\x28\x2b\x70\x77\x29\xa3" }, - { 16, "\x04\x7e\xcb\xe9\xfc\xa5\x5f\x7b\xd0\x9e\xae\x36\xe1\x0c\xae\x1e" }, - { 17, "\x00\xf5\xc8\x6a\xf3\x61\x62\xf1\x3a\x64\xf5\x4f\x6d\xc9\x58\x7c\x06" }, - { 0, 0 } // end marker - }; - -+// Bug 682927: Do not trust any DigiNotar-issued certificates. -+// We do this check after normal certificate validation because we do not -+// want to override a "revoked" OCSP response. -+PRErrorCode -+PSM_SSL_BlacklistDigiNotar(CERTCertificate * serverCert, -+ CERTCertList * serverCertChain) -+{ -+ PRBool isDigiNotarIssuedCert = PR_FALSE; -+ -+ for (CERTCertListNode *node = CERT_LIST_HEAD(serverCertChain); -+ !CERT_LIST_END(node, serverCertChain); -+ node = CERT_LIST_NEXT(node)) { -+ if (!node->cert->issuerName) -+ continue; -+ -+ if (strstr(node->cert->issuerName, "CN=DigiNotar")) { -+ isDigiNotarIssuedCert = PR_TRUE; -+ // Do not let the user override the error if the cert was -+ // chained from the "DigiNotar Root CA" cert and the cert was issued -+ // within the time window in which we think the mis-issuance(s) occurred. -+ if (strstr(node->cert->issuerName, "CN=DigiNotar Root CA")) { -+ PRTime cutoff = 0, notBefore = 0, notAfter = 0; -+ PRStatus status = PR_ParseTimeString("01-JUL-2011 00:00", PR_TRUE, &cutoff); -+ NS_ASSERTION(status == PR_SUCCESS, "PR_ParseTimeString failed"); -+ if (status != PR_SUCCESS || -+ CERT_GetCertTimes(serverCert, ¬Before, ¬After) != SECSuccess || -+ notBefore >= cutoff) { -+ return SEC_ERROR_REVOKED_CERTIFICATE; -+ } -+ } -+ } -+ -+ // By request of the Dutch government -+ if (!strcmp(node->cert->issuerName, -+ "CN=Staat der Nederlanden Root CA,O=Staat der Nederlanden,C=NL") && -+ CERT_LIST_END(CERT_LIST_NEXT(node), serverCertChain)) { -+ return 0; -+ } -+ } -+ -+ if (isDigiNotarIssuedCert) -+ return SEC_ERROR_UNTRUSTED_ISSUER; // user can override this -+ else -+ return 0; // No DigiNotor cert => carry on as normal -+} -+ -+ - SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd, - PRBool checksig, PRBool isServer) { - nsNSSShutDownPreventionLock locker; - - CERTCertificate *serverCert = SSL_PeerCertificate(fd); - CERTCertificateCleaner serverCertCleaner(serverCert); - - if (serverCert && -@@ -1059,24 +1106,38 @@ SECStatus PR_CALLBACK AuthCertificateCal - nsNSSSocketInfo* infoObject = (nsNSSSocketInfo*) fd->higher->secret; - nsRefPtr status = infoObject->SSLStatus(); - nsRefPtr nsc; - - if (!status || !status->mServerCert) { - nsc = new nsNSSCertificate(serverCert); - } - -+ CERTCertList *certList = nsnull; -+ if (rv == SECSuccess) { -+ certList = CERT_GetCertChainFromCert(serverCert, PR_Now(), certUsageSSLCA); -+ if (!certList) { -+ rv = SECFailure; -+ } else { -+ PRErrorCode blacklistErrorCode = PSM_SSL_BlacklistDigiNotar(serverCert, -+ certList); -+ if (blacklistErrorCode != 0) { -+ infoObject->SetCertIssuerBlacklisted(); -+ PORT_SetError(blacklistErrorCode); -+ rv = SECFailure; -+ } -+ } -+ } -+ - if (SECSuccess == rv) { - if (nsc) { - PRBool dummyIsEV; - nsc->GetIsExtendedValidation(&dummyIsEV); // the nsc object will cache the status - } - -- CERTCertList *certList = CERT_GetCertChainFromCert(serverCert, PR_Now(), certUsageSSLCA); -- - nsCOMPtr nssComponent; - - for (CERTCertListNode *node = CERT_LIST_HEAD(certList); - !CERT_LIST_END(node, certList); - node = CERT_LIST_NEXT(node)) { - - if (node->cert->slot) { - // This cert was found on a token, no need to remember it in the temp db. -@@ -1102,16 +1163,19 @@ SECStatus PR_CALLBACK AuthCertificateCal - if (slot) { - PK11_ImportCert(slot, node->cert, CK_INVALID_HANDLE, - const_cast(nickname.get()), PR_FALSE); - PK11_FreeSlot(slot); - } - } - } - -+ } -+ -+ if (certList) { - CERT_DestroyCertList(certList); - } - - // The connection may get terminated, for example, if the server requires - // a client cert. Let's provide a minimal SSLStatus - // to the caller that contains at least the cert and its status. - if (!status) { - status = new nsSSLStatus(); -diff --git a/security/manager/ssl/src/nsNSSCallbacks.h b/security/manager/ssl/src/nsNSSCallbacks.h ---- a/security/manager/ssl/src/nsNSSCallbacks.h -+++ b/security/manager/ssl/src/nsNSSCallbacks.h -@@ -48,16 +48,19 @@ - - char* PR_CALLBACK - PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg); - - void PR_CALLBACK HandshakeCallback(PRFileDesc *fd, void *client_data); - SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd, - PRBool checksig, PRBool isServer); - -+PRErrorCode PSM_SSL_BlacklistDigiNotar(CERTCertificate * serverCert, -+ CERTCertList * serverCertChain); -+ - SECStatus RegisterMyOCSPAIAInfoCallback(); - SECStatus UnregisterMyOCSPAIAInfoCallback(); - - class nsHTTPListener : public nsIStreamLoaderObserver - { - private: - // For XPCOM implementations that are not a base class for some other - // class, it is good practice to make the destructor non-virtual and -diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp ---- a/security/manager/ssl/src/nsNSSIOLayer.cpp -+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp -@@ -217,17 +217,18 @@ nsNSSSocketInfo::nsNSSSocketInfo() - mForSTARTTLS(PR_FALSE), - mHandshakePending(PR_TRUE), - mCanceled(PR_FALSE), - mHasCleartextPhase(PR_FALSE), - mHandshakeInProgress(PR_FALSE), - mAllowTLSIntoleranceTimeout(PR_TRUE), - mRememberClientAuthCertificate(PR_FALSE), - mHandshakeStartTime(0), -- mPort(0) -+ mPort(0), -+ mIsCertIssuerBlacklisted(PR_FALSE) - { - mThreadData = new nsSSLSocketThreadData; - } - - nsNSSSocketInfo::~nsNSSSocketInfo() - { - delete mThreadData; - -@@ -3300,16 +3301,20 @@ nsNSSBadCertHandler(void *arg, PRFileDes - - verify_log->arena = log_arena; - - srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), peerCert, - PR_TRUE, certificateUsageSSLServer, - PR_Now(), (void*)infoObject, - verify_log, NULL); - -+ if (infoObject->IsCertIssuerBlacklisted()) { -+ collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED; -+ } -+ - // We ignore the result code of the cert verification. - // Either it is a failure, which is expected, and we'll process the - // verify log below. - // Or it is a success, then a domain mismatch is the only - // possible failure. - - CERTVerifyLogNode *i_node; - for (i_node = verify_log->head; i_node; i_node = i_node->next) -diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h ---- a/security/manager/ssl/src/nsNSSIOLayer.h -+++ b/security/manager/ssl/src/nsNSSIOLayer.h -@@ -196,16 +196,22 @@ public: - - /* Set SSL Status values */ - nsresult SetSSLStatus(nsSSLStatus *aSSLStatus); - nsSSLStatus* SSLStatus() { return mSSLStatus; } - PRBool hasCertErrors(); - - PRStatus CloseSocketAndDestroy(); - -+ PRBool IsCertIssuerBlacklisted() const { -+ return mIsCertIssuerBlacklisted; -+ } -+ void SetCertIssuerBlacklisted() { -+ mIsCertIssuerBlacklisted = PR_TRUE; -+ } - protected: - nsCOMPtr mCallbacks; - PRFileDesc* mFd; - nsCOMPtr mCert; - nsCOMPtr mPreviousCert; // DocShellDependent - enum { - blocking_state_unknown, is_nonblocking_socket, is_blocking_socket - } mBlockingState; -@@ -223,16 +229,17 @@ protected: - PRPackedBool mCanceled; - PRPackedBool mHasCleartextPhase; - PRPackedBool mHandshakeInProgress; - PRPackedBool mAllowTLSIntoleranceTimeout; - PRPackedBool mRememberClientAuthCertificate; - PRIntervalTime mHandshakeStartTime; - PRInt32 mPort; - nsXPIDLCString mHostName; -+ PRErrorCode mIsCertIssuerBlacklisted; - - /* SSL Status */ - nsRefPtr mSSLStatus; - - nsresult ActivateSSL(); - - nsSSLSocketThreadData *mThreadData; - -diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp ---- a/security/manager/ssl/src/nsIdentityChecking.cpp -+++ b/security/manager/ssl/src/nsIdentityChecking.cpp -@@ -118,28 +118,16 @@ static struct nsMyTrustedEVInfo myTruste - SEC_OID_UNKNOWN, - "5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6", - "MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVz" - "dCBHbG9iYWwgUm9vdA==", - "BAAAAAABD4WqLUg=", - nsnull - }, - { -- // E=info@diginotar.nl,CN=DigiNotar Root CA,O=DigiNotar,C=NL -- "2.16.528.1.1001.1.1.1.12.6.1.1.1", -- "DigiNotar EV OID", -- SEC_OID_UNKNOWN, -- "C0:60:ED:44:CB:D8:81:BD:0E:F8:6C:0B:A2:87:DD:CF:81:67:47:8C", -- "MF8xCzAJBgNVBAYTAk5MMRIwEAYDVQQKEwlEaWdpTm90YXIxGjAYBgNVBAMTEURp" -- "Z2lOb3RhciBSb290IENBMSAwHgYJKoZIhvcNAQkBFhFpbmZvQGRpZ2lub3Rhci5u" -- "bA==", -- "DHbanJEMTiye/hXQWJM8TA==", -- nsnull -- }, -- { - // CN=SwissSign Gold CA - G2,O=SwissSign AG,C=CH - "2.16.756.1.89.1.2.1.1", - "SwissSign EV OID", - SEC_OID_UNKNOWN, - "D8:C5:38:8A:B7:30:1B:1B:6E:D4:7A:E6:45:25:3A:6F:9F:1A:27:61", - "MEUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMT" - "FlN3aXNzU2lnbiBHb2xkIENBIC0gRzI=", - "ALtAHEP1Xk+w", diff --git a/xulrunner.spec b/xulrunner.spec index ad172f3..4afc0f1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,8 +27,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.20 -Release: 2%{?pretag}%{?dist} +Version: 1.9.2.22 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -58,7 +58,6 @@ Patch24: crashreporter-remove-static.patch # Upstream patches Patch30: mozilla-513747.patch -Patch31: xulrunner-diginotar.patch # --------------------------------------------------- @@ -160,7 +159,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch22 -p1 -b .static %patch30 -p2 -b .513747 -%patch31 -p1 -b .diginotar %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -474,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Sep 6 2011 Jan Horak - 1.9.2.22-1 +- Update to 1.9.2.22 + * Wed Aug 31 2011 Jan Horak - 1.9.2.20-2 - Distrust a specific Certificate Authority From 4440bfdcb49f4b5c6d5513ae54473d53247d89f3 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 27 Sep 2011 18:20:14 +0200 Subject: [PATCH 30/31] Update to 3.6.23 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7439fc9..ccbafea 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.18.source.tar.bz2 /xulrunner-1.9.2.20.source.tar.bz2 /xulrunner-1.9.2.22.source.tar.bz2 +/xulrunner-1.9.2.23.source.tar.bz2 diff --git a/sources b/sources index cfc305d..7b35019 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2ed2c401808bfc28038b201afb203f3 xulrunner-1.9.2.22.source.tar.bz2 +589f00cd48eb1e25ec326354a78b3c66 xulrunner-1.9.2.23.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 4afc0f1..8b37105 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,7 +27,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.22 +Version: 1.9.2.23 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -472,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Sep 27 2011 Jan Horak - 1.9.2.23-1 +- Update to 1.9.2.23 + * Tue Sep 6 2011 Jan Horak - 1.9.2.22-1 - Update to 1.9.2.22 From f24da24efb6788baa70f48f9c727a774fe7272a7 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 8 Nov 2011 11:20:01 +0100 Subject: [PATCH 31/31] Update to 1.9.2.24 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ccbafea..7e4026e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.20.source.tar.bz2 /xulrunner-1.9.2.22.source.tar.bz2 /xulrunner-1.9.2.23.source.tar.bz2 +/xulrunner-1.9.2.24.source.tar.bz2 diff --git a/sources b/sources index 7b35019..0f0e0fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -589f00cd48eb1e25ec326354a78b3c66 xulrunner-1.9.2.23.source.tar.bz2 +28e37363782c47b4718d82ce5a699c14 xulrunner-1.9.2.24.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 8b37105..d75ad9a 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,7 +27,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.23 +Version: 1.9.2.24 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -472,6 +472,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Nov 8 2011 Jan Horak - 1.9.2.24-1 +- Update to 1.9.2.24 + * Tue Sep 27 2011 Jan Horak - 1.9.2.23-1 - Update to 1.9.2.23