Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:11.2 checked in at Fri Apr 29 17:12:19 CEST 2011.
-------- --- old-versions/11.2/UPDATES/all/MozillaFirefox/MozillaFirefox.changes 2011-03-23 07:21:52.000000000 +0100 +++ 11.2/MozillaFirefox/MozillaFirefox.changes 2011-04-29 07:08:09.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 21 10:18:09 UTC 2011 - w...@rosenauer.org + +- security update to 3.6.17 (bnc#689281) + * MFSA 2011-12/ CVE-2011-0069 CVE-2011-0070 CVE-2011-0072 + CVE-2011-0074 CVE-2011-0075 CVE-2011-0077 CVE-2011-0078 + CVE-2011-0080 CVE-2011-0081 + Miscellaneous memory safety hazards + * MFSA 2011-13/CVE-2011-0065/CVE-2011-0066/CVE-2011-0073 + Multiple dangling pointer vulnerabilities + * MFSA 2011-14/CVE-2011-0067 (bmo#527935) + Information stealing via form history + * MFSA 2011-18/CVE-2011-1202 (bmo#640339) + XSLT generate-id() function heap address leak + +------------------------------------------------------------------- +Fri Mar 25 13:33:17 UTC 2011 - lnus...@suse.de + +- add macros file similar to Mandriva in order to simplify + packaging extensions + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 Old: ---- firefox-3.6.16-source.tar.bz2 l10n-3.6.16.tar.bz2 New: ---- firefox-3.6.17-source.tar.bz2 l10n-3.6.17.tar.bz2 mozilla-get-app-id ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.ZHH9Vy/_old 2011-04-29 17:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ZHH9Vy/_new 2011-04-29 17:11:44.000000000 +0200 @@ -18,11 +18,13 @@ # norootforbuild +%define major 3 +%define mainver %major.6 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.16 +BuildRequires: %{xulrunner}-devel = 1.9.2.17 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -31,12 +33,14 @@ %else BuildRequires: wireless-tools %endif -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 3.6.16 +License: MPLv1.1 or GPLv2+ or LGPLv2+ +Version: %mainver.17 Release: 0.<RELEASE2> Provides: web_browser +Provides: firefox = %{mainver} +Provides: firefox = %{version}-%{release} Provides: firefox = %{version} -%define releasedate 2011031900 +%define releasedate 2011042000 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -52,6 +56,7 @@ Source9: firefox-lockdown.js Source16: firefox.1 Source17: firefox-suse-default-prefs.js +Source18: mozilla-get-app-id Patch1: firefox-libxul-sdk.patch Patch2: firefox-credits.patch Patch3: toolkit-download-folder.patch @@ -73,6 +78,7 @@ Requires: %{xulrunner}-32bit = %(rpm -q --queryformat '%{VERSION}' %{xulrunner}) %endif Requires: %{name}-branding >= 3.5 +%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" @@ -99,12 +105,23 @@ compliance and performance. Its functionality can be enhanced via a plethora of extensions. +%package devel +License: MPLv1.1 or GPLv2+ or LGPLv2+ +Summary: Devel package for Firefox +Group: Development/Tools/Other +Provides: firefox-devel = %{version}-%{release} +Requires: %{name} = %{version} +Requires: perl(XML::Simple) +Requires: perl(Archive::Zip) + +%description devel +Development files for Firefox to make packaging of addons easier. %if %localize %package translations-common Summary: Common translations for MozillaFirefox -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Provides: locale(%{name}: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) Group: System/Localization Requires: %{name} = %{version} @@ -117,7 +134,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) Group: System/Localization Requires: %{name} = %{version} @@ -131,7 +148,7 @@ %endif %package branding-upstream -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Upstream branding for MozillaFirefox Group: Productivity/Networking/Web/Browsers Provides: %{name}-branding = 3.5 @@ -276,6 +293,8 @@ ########## # ADDONS # +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 @@ -294,6 +313,29 @@ rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE +# devel +mkdir -p %{buildroot}%{_bindir} +install -m 755 %SOURCE18 %{buildroot}%{_bindir} +# inspired by mandriva +mkdir -p %{buildroot}/etc/rpm +cat <<'FIN' >%{buildroot}/etc/rpm/macros.%{progname} +# Macros from %{name} package +%%firefox_major %{major} +%%firefox_version %{version} +%%firefox_mainver %{mainver} +%%firefox_mozillapath %%{_libdir}/%{progname} +%%firefox_xulrunner %{xulrunner} +%%firefox_xulrunner_version %(rpm -q --queryformat '%{VERSION}' %{xulrunner}) +%%firefox_pluginsdir %%{_libdir}/browser-plugins +%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} +%%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) + +%%firefox_ext_install() \ + extdir="%%{buildroot}%%{firefox_extdir}/`mozilla-get-app-id '%%1'`" \ + mkdir -p "$extdir" \ + %%{__unzip} -q -d "$extdir" "%%1" \ + %%{nil} +FIN # fdupes %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{progdir} @@ -356,6 +398,12 @@ %{progdir}/components/ %exclude %{progdir}/defaults/profile/bookmarks.html %{progdir}/defaults/ +%dir %{_datadir}/mozilla +%dir %{_datadir}/mozilla/extensions +%dir %{_datadir}/mozilla/extensions/%{firefox_appid} +%dir %{_libdir}/mozilla +%dir %{_libdir}/mozilla/extensions +%dir %{_libdir}/mozilla/extensions/%{firefox_appid} %{progdir}/extensions/ %{progdir}/icons/ %{progdir}/searchplugins/ @@ -396,4 +444,9 @@ %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html +%files devel +%defattr(-,root,root) +%{_bindir}/mozilla-get-app-id +/etc/rpm/macros.%{progname} + %changelog ++++++ firefox-3.6.16-source.tar.bz2 -> firefox-3.6.17-source.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/MozillaFirefox/firefox-3.6.16-source.tar.bz2 11.2/MozillaFirefox/firefox-3.6.17-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-3.6.16.tar.bz2 -> l10n-3.6.17.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/MozillaFirefox/l10n-3.6.16.tar.bz2 11.2/MozillaFirefox/l10n-3.6.17.tar.bz2 differ: char 11, line 1 ++++++ mozilla-get-app-id ++++++ #!/usr/bin/perl -w use XML::Simple; my $file = shift || die "Usage: $0 [install.rdf|somefile.xpi]\n"; my $xml; if ($file =~ /\.xpi$/) { use Archive::Zip qw/:ERROR_CODES :CONSTANTS/; my $zip = Archive::Zip->new(); if ( $zip->read($file) != AZ_OK ) { die "zip file read error\n"; } my $data = $zip->contents("install.rdf"); die "missing install.rdf in $file\n" unless $data; $xml = XMLin($data) || die "$!\n"; } elsif ($file =~ /install.rdf/) { $xml = XMLin($file) || die "$!\n"; } else { die "unsupported file format\n"; } my $desc; for my $tag (qw/RDF:Description Description/) { if (exists $xml->{$tag}) { if (ref $xml->{$tag} eq 'ARRAY') { $desc = $xml->{$tag}; } else { $desc = [ $xml->{$tag} ]; } } } my $uuid; my $id; for my $x (@$desc) { if ($x->{"em:id"} =~ /{[[:xdigit:]]+-/) { print STDERR "Warning: multiple uuids!\n" if defined $uuid; $uuid = $x->{"em:id"}; } elsif ($x->{"em:id"} =~ /@/) { print STDERR "Warning: multiple ids!\n" if defined $id; $id = $x->{"em:id"}; } } if (defined $id) { print "$id\n"; } elsif (defined $uuid) { print "$uuid\n"; } else { exit 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org