summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2010-09-12 14:03:04 -0500
committerGeorge Sherwood2010-09-12 14:03:04 -0500
commit525349b9ad27016843f88219bdb212eec29cdfb6 (patch)
treec104fdbe49dd1bb4f6147d538c311652ff0a76c9
parent8b83090d628105027b6f0cdac86d610d54a7e633 (diff)
firefox 3.6.9, SECURITY_PATCH=35
(cherry picked from commit 385755e3b4b31ec13670758b8507bbcdb126ae39) Conflicts: http/firefox/HISTORY
-rwxr-xr-xhttp/firefox/DETAILS4
-rw-r--r--http/firefox/HISTORY3
2 files changed, 5 insertions, 2 deletions
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index a9c7d47d54..870ca2ca18 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
# SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.8
+ VERSION=3.6.9
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,7 +17,7 @@ else
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=34
+ SECURITY_PATCH=35
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ae5d2292d0..9310d1661d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2010-09-08 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.6.9, SECURITY_PATCH=35
+
2010-08-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* BUILD: forced optimizations to -O2 to prevent segfault