diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index f16e594a..42bdef4a 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 12 21:16:19 UTC 2011 - wr@rosenauer.org + +- update to 6.0 (bnc#711954) + * included security fixes +- removed obsolete curl header dependency (mozilla-curl.patch) + ------------------------------------------------------------------- Fri Jul 22 13:34:12 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 4df0cc28..110d5ab4 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,11 +18,11 @@ # norootforbuild -%define major 5 -%define mainver %major.99 +%define major 6 +%define mainver %major.0 Name: MozillaFirefox -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files zip fdupes Mesa-devel yasm %if %suse_version > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel @@ -35,7 +35,7 @@ BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} Release: 1 -%define releasedate 2011072100 +%define releasedate 2011081200 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -74,6 +74,7 @@ Patch12: mozilla-repo.patch Patch13: mozilla-dump_syms-static.patch Patch14: mozilla-sle11.patch Patch15: mozilla-linux3.patch +Patch16: mozilla-curl.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -129,7 +130,6 @@ Requires: perl(Archive::Zip) Development files for Firefox to make packaging of addons easier. %if %localize - %package translations-common Summary: Common translations for MozillaFirefox License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -177,7 +177,6 @@ This package provides upstream look and feel for MozillaFirefox. %if %crashreporter - %package buildsymbols License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Breakpad buildsymbols for %{name} @@ -188,6 +187,7 @@ This subpackage contains the Breakpad created and compatible debugging symbols meant for upload to Mozilla's crash collector database. %endif + %prep %setup -q -n mozilla -b 7 -b 10 cd $RPM_BUILD_DIR/mozilla @@ -206,6 +206,7 @@ cd $RPM_BUILD_DIR/mozilla %patch14 -p1 %endif %patch15 -p1 +%patch16 -p1 # %patch31 -p1 %patch32 -p1 @@ -269,7 +270,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=beta +ac_add_options --enable-update-channel=default EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -533,7 +534,6 @@ exit 0 %config /etc/rpm/macros.%{progname} %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} @@ -547,13 +547,11 @@ exit 0 # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed - %files branding-upstream %defattr(-,root,root) %dir %{progdir} %if %crashreporter - %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/*.zip diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 6106e7ce..01a03b9a 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38fd3130c110a020cc58672840bf106231b70a0777ef2ecc87890e02e2ab259e -size 25676 +oid sha256:204539fc4a582ba0a2bc3cff94789af2df3c60d48f633ae3da7adb114c6e72b5 +size 25687 diff --git a/create-tar.sh b/create-tar.sh index 230384f2..548565b0 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,8 +1,8 @@ #!/bin/bash -BRANCH="releases/mozilla-beta" -RELEASE_TAG="FIREFOX_6_0b3_RELEASE" -VERSION="5.99" +BRANCH="releases/mozilla-release" +RELEASE_TAG="FIREFOX_6_0_RELEASE" +VERSION="6.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -23,7 +23,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/releases/l10n/mozilla-beta/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac diff --git a/firefox-5.99-source.tar.bz2 b/firefox-5.99-source.tar.bz2 deleted file mode 100644 index ae5997ee..00000000 --- a/firefox-5.99-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04a876b1d4512696bdee12fbfac04dcd5c1babb0ae5426095adf84cfac413ca5 -size 67707242 diff --git a/firefox-6.0-source.tar.bz2 b/firefox-6.0-source.tar.bz2 new file mode 100644 index 00000000..c8e6dd53 --- /dev/null +++ b/firefox-6.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e09ccc62e8bb10f419cce797058721eff9847fd89a8af3c7d51c12aff1552563 +size 67685578 diff --git a/l10n-5.99.tar.bz2 b/l10n-5.99.tar.bz2 deleted file mode 100644 index aab2444a..00000000 --- a/l10n-5.99.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:093c037a482d428f4dcd6e2006d11d6fa47d79c9204eb753707ee210c2ded68e -size 43567954 diff --git a/l10n-6.0.tar.bz2 b/l10n-6.0.tar.bz2 new file mode 100644 index 00000000..ceafcda1 --- /dev/null +++ b/l10n-6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a2751fecbc5b204b9ead664ad093e54b87d6de00133217a514eba12be22f739 +size 43685517 diff --git a/mozilla-curl.patch b/mozilla-curl.patch new file mode 100644 index 00000000..023bb8b4 --- /dev/null +++ b/mozilla-curl.patch @@ -0,0 +1,89 @@ +# HG changeset patch +# User Evan Shaw +# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4 +bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted + +diff --git a/config/system-headers b/config/system-headers +--- a/config/system-headers ++++ b/config/system-headers +@@ -199,17 +199,16 @@ crypt.h + cstddef + cstdio + cstdlib + cstring + ctime + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h + dbus/dbus.h + dbus/dbus-glib.h + dbus/dbus-glib-lowlevel.h + ddeml.h + Debug.h +diff --git a/js/src/config/system-headers b/js/src/config/system-headers +--- a/js/src/config/system-headers ++++ b/js/src/config/system-headers +@@ -199,17 +199,16 @@ crypt.h + cstddef + cstdio + cstdlib + cstring + ctime + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h + dbus/dbus.h + dbus/dbus-glib.h + dbus/dbus-glib-lowlevel.h + ddeml.h + Debug.h +diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +@@ -28,17 +28,16 @@ + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include "common/linux/http_upload.h" + + #include + #include + #include + #include +-#include + + namespace { + + // Callback to get the response data from server. + static size_t WriteCallback(void *ptr, size_t size, + size_t nmemb, void *userp) { + if (!userp) + return 0; +diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc ++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +@@ -24,17 +24,16 @@ + // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include + #include +-#include + #include + + #include + #include + + #include "common/linux/libcurl_wrapper.h" + + using std::string; diff --git a/source-stamp.txt b/source-stamp.txt index 7826081a..17cb0303 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=7864cfd02969 -REPO=http://hg.mozilla.org/releases/mozilla-beta +REV=218ed8178b1e +REPO=http://hg.mozilla.org/releases/mozilla-release