Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2013-05-17 08:26:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old)
and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2013-04-14 10:35:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2013-05-17 08:26:15.000000000 +0200
@@ -1,0 +2,20 @@
+Fri May 10 05:25:39 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 21.0 (bnc#819204)
+ * removed upstreamed patch firefox-712763.patch
+ * removed disabled mozilla-disable-neon-option.patch
+ * MFSA 2013-41/CVE-2013-0801/CVE-2013-1669
+ Miscellaneous memory safety hazards
+ * MFSA 2013-42/CVE-2013-1670 (bmo#853709)
+ Privileged access for content level constructor
+ * MFSA 2013-43/CVE-2013-1671 (bmo#842255)
+ File input control has access to full path
+ * MFSA 2013-46/CVE-2013-1674 (bmo#860971)
+ Use-after-free with video and onresize event
+ * MFSA 2013-47/CVE-2013-1675 (bmo#866825)
+ Uninitialized functions in DOMSVGZoomEvent
+ * MFSA 2013-48/CVE-2013-1676/CVE-2013-1677/CVE-2013-1678/
+ CVE-2013-1679/CVE-2013-1680/CVE-2013-1681
+ Memory corruption found using Address Sanitizer
+
+-------------------------------------------------------------------
Old:
----
firefox-20.0-source.tar.bz2
firefox-712763.patch
l10n-20.0.tar.bz2
mozilla-disable-neon-option.patch
New:
----
firefox-21.0-source.tar.bz2
l10n-21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:52.000000000 +0200
@@ -17,7 +17,7 @@
#
-%define major 20
+%define major 21
%define mainver %major.0
%define update_channel release
@@ -50,7 +50,7 @@
%else
BuildRequires: wireless-tools
%endif
-BuildRequires: mozilla-nspr-devel >= 4.9.5
+BuildRequires: mozilla-nspr-devel >= 4.9.6
BuildRequires: mozilla-nss-devel >= 3.14.3
BuildRequires: nss-shared-helper-devel
%if %suse_version > 1140
@@ -60,7 +60,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2013032900
+%define releasedate 2013051000
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -99,7 +99,6 @@
Patch8: mozilla-ntlm-full-path.patch
Patch9: mozilla-repo.patch
Patch10: mozilla-sle11.patch
-Patch11: mozilla-disable-neon-option.patch
Patch12: mozilla-arm-disable-edsp.patch
Patch13: mozilla-ppc.patch
Patch14: mozilla-gstreamer-760140.patch
@@ -111,12 +110,10 @@
Patch33: firefox-no-default-ualocale.patch
Patch34: firefox-multilocale-chrome.patch
Patch35: firefox-branded-icons.patch
-Patch36: firefox-712763.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
-Requires: %{name}-branding > 4.0
-Conflicts: %{name}-branding > %{version}
+Requires: %{name}-branding > 20.0
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
Recommends: libcanberra0
@@ -191,7 +188,7 @@
%package branding-upstream
Summary: Upstream branding for Firefox
Group: Productivity/Networking/Web/Browsers
-Provides: %{name}-branding = 5.0
+Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
#BRAND: Provide three files -
@@ -234,7 +231,6 @@
%if %suse_version < 1120
%patch10 -p1
%endif
-#%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -250,7 +246,6 @@
%patch33 -p1
%patch34 -p1
%patch35 -p1
-%patch36 -p1
%build
# no need to add build time to binaries
@@ -267,6 +262,7 @@
source %{SOURCE5}
export MOZ_SOURCE_STAMP=$REV
export SOURCE_REPO=$REPO
+export source_repo=$REPO
export MOZ_SOURCE_REPO=$REPO
export MOZ_BUILD_DATE=%{releasedate}
export MOZILLA_OFFICIAL=1
@@ -352,17 +348,17 @@
export MOZ_SOURCE_REPO=$REPO
make -C browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
#DEBUG (break the build if searchplugins are missing / temporary)
-grep amazondotcom dist/firefox/omni.ja
+grep amazondotcom dist/firefox/browser/omni.ja
# copy tree into RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{progdir}
+mkdir -p $RPM_BUILD_ROOT%{progdir}
cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
-mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions
-mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
-mkdir -p $RPM_BUILD_ROOT%{progdir}/defaults/preferences/
+mkdir -p $RPM_BUILD_ROOT%{progdir}/distribution/extensions
+mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
+mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/
# install kde.js
%if %suse_version >= 1110
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox.js
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js
%endif
# install add-plugins.sh
sed "s:%%PROGDIR:%{progdir}:g" \
@@ -385,17 +381,17 @@
LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \
make -C browser/locales langpack-$locale
cp -rL dist/xpi-stage/locale-$locale \
- $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org
+ $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org
# remove prefs, profile defaults, and hyphenation from langpack
- rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults
- rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
+ rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults
+ rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
# check against the fixed common list and sort into the right filelist
_matched=0
for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
[ "$_match" = "$locale" ] && _matched=1
done
[ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
- echo %{progdir}/extensions/langpack-$locale@firefox.mozilla.org \
+ echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \
>> %{_tmppath}/translations.$_l10ntarget
esac
done
@@ -437,15 +433,15 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_appid}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_appid}
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
-ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
-ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
+ln -sf %{progdir}/browser/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
+ln -sf %{progdir}/browser/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
%if %branding
for size in 16 22 24 32 48 256; do
%else
for size in 16 32 48; do
%endif
mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/
- ln -sf %{progdir}/chrome/icons/default/default$size.png \
+ ln -sf %{progdir}/browser/chrome/icons/default/default$size.png \
$RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png
done
%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK
@@ -552,23 +548,29 @@
%files
%defattr(-,root,root)
%dir %{progdir}
-%dir %{progdir}/chrome/
+%dir %{progdir}/browser/
+%dir %{progdir}/browser/chrome/
+%dir %{progdir}/browser/extensions/
+%{progdir}/browser/components/
+%{progdir}/browser/defaults
+%{progdir}/browser/icons/
+%{progdir}/browser/chrome/icons
+%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{progdir}/browser/searchplugins/
+%{progdir}/browser/blocklist.xml
+%{progdir}/browser/chrome.manifest
+%{progdir}/browser/omni.ja
%dir %{progdir}/distribution/
-%{progdir}/chrome/icons
+%{progdir}/distribution/extensions/
%{progdir}/components/
%{progdir}/defaults/
%{progdir}/dictionaries/
-%dir %{progdir}/extensions/
-%{progdir}/distribution/extensions/
-%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-%{progdir}/icons/
-%{progdir}/searchplugins/
+%{progdir}/webapprt/
%attr(755,root,root) %{progdir}/%{progname}.sh
%{progdir}/firefox
%{progdir}/firefox-bin
%{progdir}/add-plugins.sh
%{progdir}/application.ini
-%{progdir}/blocklist.xml
%{progdir}/dependentlibs.list
%{progdir}/*.so
%{progdir}/mozilla-xremote-client
@@ -576,14 +578,13 @@
%{progdir}/platform.ini
%{progdir}/plugin-container
%{progdir}/webapprt-stub
-%{progdir}/webapprt/
+%{progdir}/chrome.manifest
%if %crashreporter
-%{progdir}/crashreporter-override.ini
%{progdir}/crashreporter
%{progdir}/crashreporter.ini
%{progdir}/Throbber-small.gif
+%{progdir}/browser/crashreporter-override.ini
%endif
-%{progdir}/chrome.manifest
%{_datadir}/applications/%{desktop_file_name}.desktop
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*
@@ -607,12 +608,12 @@
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
%dir %{progdir}
-%dir %{progdir}/extensions/
+%dir %{progdir}/browser/extensions/
%files translations-other -f %{_tmppath}/translations.other
%defattr(-,root,root)
%dir %{progdir}
-%dir %{progdir}/extensions/
+%dir %{progdir}/browser/extensions/
%endif
# this package does not need to provide files but is needed to fulfill
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200
+++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200
@@ -5,7 +5,7 @@
<size unit="G">9</size>
</disk>
<memory>
- <size unit="M">2900</size>
+ <size unit="M">3500</size>
</memory>
</hardware>
</constraints>
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200
+++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200
@@ -2,12 +2,30 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_20_0_RELEASE"
-VERSION="20.0"
+RELEASE_TAG="FIREFOX_21_0_RELEASE"
+VERSION="21.0"
# mozilla
-echo "cloning $BRANCH..."
-hg clone http://hg.mozilla.org/$BRANCH mozilla
+if [ -d mozilla ]; then
+ pushd mozilla
+ _repourl=$(hg paths)
+ case "$_repourl" in
+ *$BRANCH*)
+ echo "updating previous tree"
+ hg pull
+ popd
+ ;;
+ * )
+ echo "removing obsolete tree"
+ popd
+ rm -rf mozilla
+ ;;
+ esac
+fi
+if [ ! -d mozilla ]; then
+ echo "cloning new $BRANCH..."
+ hg clone http://hg.mozilla.org/$BRANCH mozilla
+fi
pushd mozilla
[ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG
# get repo and source stamp
++++++ firefox-20.0-source.tar.bz2 -> firefox-21.0-source.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/firefox-20.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-21.0-source.tar.bz2 differ: char 11, line 1
++++++ firefox-branded-icons.patch ++++++
--- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200
+++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b
+# Parent ad0e2fcaa00769bc56cc2b58d1264209f8c32623
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
-@@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -132,16 +132,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -29,14 +29,14 @@
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
-@@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \
- firefox.icns \
- disk.icns \
+@@ -47,18 +47,21 @@ BRANDING_FILES := \
document.icns \
dsstore \
$(NULL)
+ endif
- LINUX_BRANDING_FILES = \
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ BRANDING_FILES := \
default16.png \
+ default22.png \
+ default24.png \
@@ -45,34 +45,34 @@
+ default256.png \
mozicon128.png \
$(NULL)
+ endif
- OS2_BRANDING_FILES = \
+ ifeq ($(OS_ARCH),OS2)
+ BRANDING_FILES := \
firefox-os2.ico \
document-os2.ico \
- $(NULL)
-
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -552,18 +552,21 @@
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@@ -558,18 +558,21 @@
+ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
#ifdef SHIP_FEEDBACK
- @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
+ @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi
#endif
@BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest
#ifdef MOZ_GTK2
- @BINPATH@/chrome/icons/default/default16.png
-+@BINPATH@/chrome/icons/default/default22.png
-+@BINPATH@/chrome/icons/default/default24.png
- @BINPATH@/chrome/icons/default/default32.png
- @BINPATH@/chrome/icons/default/default48.png
-+@BINPATH@/chrome/icons/default/default256.png
+ @BINPATH@/browser/chrome/icons/default/default16.png
++@BINPATH@/browser/chrome/icons/default/default22.png
++@BINPATH@/browser/chrome/icons/default/default24.png
+ @BINPATH@/browser/chrome/icons/default/default32.png
+ @BINPATH@/browser/chrome/icons/default/default48.png
++@BINPATH@/browser/chrome/icons/default/default256.png
#endif
; shell icons
#ifdef XP_UNIX
#ifndef XP_MACOSX
- @BINPATH@/icons/*.xpm
- @BINPATH@/icons/*.png
- #endif
+ ; shell icons
+ @BINPATH@/browser/icons/*.png
+ #ifdef MOZ_UPDATER
++++++ firefox-kde.patch ++++++
--- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200
+++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1221 @@
+@@ -0,0 +1,1216 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -189,7 +189,7 @@
+ align="start"
+ role="alert">
+ <hbox flex="1">
-+ <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/>
++ <image id="social-activation-icon" class="popup-notification-icon"/>
+ <vbox flex="1">
+ <description id="social-activation-message" class="popup-notification-description"/>
+ <spacer flex="1"/>
@@ -270,7 +270,6 @@
+ class="social-panel"
+ type="arrow"
+ hidden="true"
-+ consumeoutsideclicks="true"
+ noautofocus="true"/>
+