summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2012-06-06 04:38:00 +0200
committerVlad Glagolev2012-06-14 12:34:15 +0400
commite3a7b23861044a8705be5fae007a386b26827dab (patch)
treeff82fa08e6220780976246be2a776785cd7ffbee
parent2de4500bde6ad8e1ea8536d33c76abc11e1fcf70 (diff)
firefox 13.0, SECURITY_PATCH=49
(cherry picked from commit 84c0b2655c5d024b1b508255e7d2c65a8a7c2f31)
-rwxr-xr-xhttp/firefox/DETAILS6
-rw-r--r--http/firefox/HISTORY5
-rwxr-xr-xhttp/firefox/PRE_BUILD2
-rw-r--r--http/firefox/mozconfig (renamed from http/firefox/mozconfig5)1
4 files changed, 10 insertions, 4 deletions
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index b75ffc94a0..22d6e7de0c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=12.0
+ VERSION=13.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=12.0
+ VERSION=13.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else
SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=48
+ SECURITY_PATCH=49
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f9caefcb5d..a673d2c043 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-06-06 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 13.0, SECURITY_PATCH=49
+ * PRE_BUILD, mozconfig5: mozconfig5 -> mozconfig
+ * mozconfig: --disable-crashreporter added
+
2012-04-25 Pol Vinogradov <vin.public@gmail.com>
* DETAILS: 12.0, SECURITY_PATCH=48
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f62a6d3ccc..8b103993e3 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,7 +11,7 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
# http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
-cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
if [[ "$FIREFOX_SAFE" == "y" ]]; then
sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig
index 9e9d2f0b8e..609fcbb617 100644
--- a/http/firefox/mozconfig5
+++ b/http/firefox/mozconfig
@@ -23,6 +23,7 @@ ac_add_options --with-system-nss
ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
ac_add_options --disable-tests
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --mandir=$INSTALL_ROOT/usr