--- a/MozillaFirefox/MozillaFirefox.changes Thu Jul 01 08:11:24 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Sun Jul 18 14:43:56 2010 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 16 06:48:44 CEST 2010 - wr@rosenauer.org
+
+- security update to 3.6.7 (bnc#622506)
+
-------------------------------------------------------------------
Sun Jun 27 20:24:31 CEST 2010 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Thu Jul 01 08:11:24 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Jul 18 14:43:56 2010 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package MozillaFirefox (Version 3.6.6)
+# spec file for package MozillaFirefox (Version 3.6.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2010 Wolfgang Rosenauer
@@ -22,7 +22,7 @@
Name: MozillaFirefox
%define xulrunner mozilla-xulrunner192
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
-BuildRequires: %{xulrunner}-devel = 1.9.2.6
+BuildRequires: %{xulrunner}-devel = 1.9.2.7
%if %suse_version > 1020
BuildRequires: fdupes
%endif
@@ -34,9 +34,9 @@
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Provides: web_browser
Provides: firefox
-Version: 3.6.6
+Version: 3.6.7
Release: 1
-%define releasedate 2010062600
+%define releasedate 2010071400
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -63,7 +63,6 @@
Patch9: firefox-kde.patch
Patch10: firefox-ui-lockdown.patch
Patch11: firefox-crashreporter.patch
-Patch12: mozilla-crashreporter-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
@@ -167,7 +166,6 @@
%endif
%patch10 -p1
%patch11 -p1
-%patch12 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
--- a/MozillaFirefox/mozilla-crashreporter-x86_64.patch Thu Jul 01 08:11:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-crashreporter-x86_64.patch
\ No newline at end of file
--- a/mozilla-crashreporter-x86_64.patch Thu Jul 01 08:11:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User Ted Mielczarek <ted.mielczarek@gmail.com>
-# Date 1269522979 14400
-# Node ID a00284a2b2f0063b0f053938c1775cf207fe25bb
-# Parent 33d05f60932bac3d66231a54840cbdd173297fff
-bug 554021 - enable compiling Breakpad on Linux/x86-64 by default
-
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -5858,13 +5858,20 @@
- dnl = Breakpad crash reporting (on by default on supported platforms)
- dnl ========================================================
-
--if (test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \
-- || test "$OS_ARCH" = "Darwin" \
-- || test "$OS_ARCH" = "Linux" -a "$CPU_ARCH" = "x86" \
-- || test "$OS_ARCH" = "SunOS") \
-- && test -z "$HAVE_64BIT_OS"; then
-- MOZ_CRASHREPORTER=1
--fi
-+case $target in
-+i?86-*-mingw*)
-+ MOZ_CRASHREPORTER=1
-+ ;;
-+i?86-apple-darwin*|powerpc-apple-darwin*)
-+ MOZ_CRASHREPORTER=1
-+ ;;
-+i?86-*-linux*|x86_64-*-linux*)
-+ MOZ_CRASHREPORTER=1
-+ ;;
-+*solaris*)
-+ MOZ_CRASHREPORTER=1
-+ ;;
-+esac
-
- MOZ_ARG_DISABLE_BOOL(crashreporter,
- [ --disable-crashreporter Disable breakpad crash reporting],
--- a/mozilla-kde.patch Thu Jul 01 08:11:24 2010 +0200
+++ b/mozilla-kde.patch Sun Jul 18 14:43:56 2010 +0200
@@ -541,15 +541,15 @@
+#include "nsKDEUtils.h"
+#endif
+
+ #ifdef XP_MACOSX
+ #include <CoreFoundation/CoreFoundation.h>
+ #endif
+
#define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties"
#define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
#define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete"
#define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval"
- #define PREF_BDM_RETENTION "browser.download.manager.retention"
- #define PREF_BDM_QUITBEHAVIOR "browser.download.manager.quitBehavior"
- #define PREF_BDM_ADDTORECENTDOCS "browser.download.manager.addToRecentDocs"
- #define PREF_BDM_SCANWHENDONE "browser.download.manager.scanWhenDone"
-@@ -2158,16 +2162,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2162,16 +2166,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -575,7 +575,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2193,16 +2206,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2197,16 +2210,17 @@ nsDownload::SetState(DownloadState aStat
// because if it is, they'll click open the download manager and
// the items they downloaded will have been removed.
alerts->ShowAlertNotification(
@@ -586,7 +586,7 @@
}
+ } // end non-KDE block
}
- #if defined(XP_WIN) && !defined(WINCE)
+ #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX)
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
nsCOMPtr<nsIFile> file;
nsAutoString path;
--- a/mozilla-libproxy.patch Thu Jul 01 08:11:24 2010 +0200
+++ b/mozilla-libproxy.patch Sun Jul 18 14:43:56 2010 +0200
@@ -6,7 +6,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@
+@@ -542,16 +542,20 @@ FT2_CFLAGS = @FT2_CFLAGS@
FT2_LIBS = @FT2_LIBS@
MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@
@@ -30,7 +30,7 @@
diff --git a/config/system-headers b/config/system-headers
--- a/config/system-headers
+++ b/config/system-headers
-@@ -1013,8 +1013,11 @@ hunspell.hxx
+@@ -1013,11 +1013,14 @@ hunspell.hxx
#if MOZ_NATIVE_BZ2==1
bzlib.h
#endif
@@ -42,10 +42,13 @@
+#ifdef MOZ_ENABLE_LIBPROXY
+proxy.h
+#endif
+ #if MOZ_NATIVE_LIBEVENT==1
+ event.h
+ #endif
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -5289,16 +5289,39 @@ then
+@@ -5325,16 +5325,39 @@ then
AC_DEFINE(MOZ_ENABLE_DBUS)
fi
fi
@@ -226,8 +229,8 @@
+
+private:
+ ~nsUnixSystemProxySettings() {
-+ if (mProxyFactory)
-+ px_proxy_factory_free(mProxyFactory);
++ if (mProxyFactory)
++ px_proxy_factory_free(mProxyFactory);
+ }
+
+ pxProxyFactory *mProxyFactory;
@@ -288,9 +291,9 @@
+ nsXPIDLCString hostPortString;
+ nsCOMPtr<nsIURI> proxyURI;
+
-+ rv = mIOService->NewURI(nsDependentCString(proxyArray[c]),
-+ nsnull,
-+ nsnull,
++ rv = mIOService->NewURI(nsDependentCString(proxyArray[c]),
++ nsnull,
++ nsnull,
+ getter_AddRefs(proxyURI));
+ NS_ENSURE_SUCCESS(rv, rv);
+
--- a/mozilla-system-nspr.patch Thu Jul 01 08:11:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# HG changeset patch
-# Date 1270816624 -7200
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent b2b5137c9473108008a9ff0fd1f858aa400040e8
-Bug 558299 - ipc does not build with system nspr.
-
-diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h
---- a/ipc/chromium/src/base/basictypes.h
-+++ b/ipc/chromium/src/base/basictypes.h
-@@ -14,29 +14,29 @@
- #error You_must_include_basictypes.h_before_prtypes.h!
- #endif
-
- #ifndef NO_NSPR_10_SUPPORT
- #define NO_NSPR_10_SUPPORT
- #define NO_NSPR_10_SUPPORT_SAVE
- #endif
-
--#include "nspr/prtypes.h"
-+#include "prtypes.h"
-
- #ifdef NO_NSPR_10_SUPPORT_SAVE
- #undef NO_NSPR_10_SUPPORT_SAVE
- #undef NO_NSPR_10_SUPPORT
- #endif
-
- #ifdef _WIN32
- #undef _WIN32
- #define _WIN32_SAVE
- #endif
-
--#include "nspr/obsolete/protypes.h"
-+#include "obsolete/protypes.h"
-
- #define _INT32
- #define _UINT32
-
- #ifdef _WIN32_SAVE
- #undef _WIN32_SAVE
- #define _WIN32
- #endif
--- a/mozilla-xulrunner192/baselibs.conf Thu Jul 01 08:11:24 2010 +0200
+++ b/mozilla-xulrunner192/baselibs.conf Sun Jul 18 14:43:56 2010 +0200
@@ -2,7 +2,7 @@
+/usr/lib(64)?/xulrunner-.*
+/etc/gre.d/.*
recommends "mozilla-xulrunner192-gnome-<targettype>"
- requires "mozilla-js192-<targettype>"
+ requires "mozilla-js192-<targettype> = <version>"
mozilla-js192
--- a/mozilla-xulrunner192/create-tar.sh Thu Jul 01 08:11:24 2010 +0200
+++ b/mozilla-xulrunner192/create-tar.sh Sun Jul 18 14:43:56 2010 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
-RELEASE_TAG="FIREFOX_3_6_6_RELEASE"
-VERSION="1.9.2.6"
+RELEASE_TAG="FIREFOX_3_6_7_RELEASE"
+VERSION="1.9.2.7"
# mozilla
hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla
--- a/mozilla-xulrunner192/mozilla-crashreporter-x86_64.patch Thu Jul 01 08:11:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-crashreporter-x86_64.patch
\ No newline at end of file
--- a/mozilla-xulrunner192/mozilla-system-nspr.patch Thu Jul 01 08:11:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-system-nspr.patch
\ No newline at end of file
--- a/mozilla-xulrunner192/mozilla-xulrunner192.changes Thu Jul 01 08:11:24 2010 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes Sun Jul 18 14:43:56 2010 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 15 21:45:13 CEST 2010 - wr@rosenauer.org
+
+- security update to 1.9.2.7 (bnc#622506)
+
-------------------------------------------------------------------
Sun Jun 27 21:02:29 CEST 2010 - wr@rosenauer.org
--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec Thu Jul 01 08:11:24 2010 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec Sun Jul 18 14:43:56 2010 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-xulrunner192 (Version 1.9.2.6)
+# spec file for package mozilla-xulrunner192 (Version 1.9.2.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2010 Wolfgang Rosenauer
@@ -39,12 +39,12 @@
BuildRequires: wireless-tools
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 1.9.2.6
+Version: 1.9.2.7
Release: 1
-%define releasedate 2010062600
-%define version_internal 1.9.2.6
+%define releasedate 2010071400
+%define version_internal 1.9.2.7
%define apiversion 1.9.2
-%define uaweight 192060
+%define uaweight 192070
Summary: Mozilla Runtime Environment 1.9.2
Url: http://www.mozilla.org
Group: Productivity/Other
@@ -81,9 +81,7 @@
Patch12: gecko-lockdown.patch
Patch13: toolkit-ui-lockdown.patch
# ---
-Patch14: mozilla-system-nspr.patch
Patch15: mozilla-ua-locale-pref.patch
-Patch16: mozilla-crashreporter-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js192 = %{version}
Requires(post): update-alternatives coreutils
@@ -225,10 +223,8 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%patch14 -p1
# bmo#542999
%patch15 -p1
-%patch16 -p1
%build
%if %suse_version >= 1110
--- a/series Thu Jul 01 08:11:24 2010 +0200
+++ b/series Sun Jul 18 14:43:56 2010 +0200
@@ -1,6 +1,4 @@
# xulrunner/gecko patches
-mozilla-system-nspr.patch
-mozilla-crashreporter-x86_64.patch
toolkit-download-folder.patch
mozilla-libproxy.patch
mozilla-pkgconfig.patch