summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2008-03-29 16:04:02 +0400
committerEric Sandall2008-04-13 00:43:31 -0700
commit8aa0406257e75f001bb9645067a963a4f8d8072c (patch)
treee37591d5c6a63c2791454ae35bc73d0ff712f0cb
parentda9854a96a48380b19ec31444c71469be970859d (diff)
firefox: Updated to version 2.0.0.13. SECURITY_PATCH++
-rwxr-xr-xhttp/firefox/DETAILS4
-rw-r--r--http/firefox/HISTORY6
-rwxr-xr-xhttp/firefox/PRE_BUILD2
-rw-r--r--http/firefox/firefox-config.patch10
4 files changed, 14 insertions, 8 deletions
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index a02b585fec..92c538e985 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -7,7 +7,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL}.asc
else
- VERSION=2.0.0.12
+ VERSION=2.0.0.13
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=15
+ SECURITY_PATCH=16
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index efe2fb76b2..126a44eee8 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2008-03-29 George Sherwood <george@beernabeer.com>
+ * DETAILS: Updated to 2.0.0.13. SECURITY_PATCH++
+ * PRE_BUILD: Removed gcc43.patch
+ * gcc43.patch: Removed. Incorporated in upstream update.
+ * firefox-config.patch: Updated to 2.0.0.13
+
2008-02-13 George Sherwood <george@beernabeer.com>
* DETAILS: Updated devel to version 3.0 beta 3
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 4d060c90f9..5bf88d7f90 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -6,7 +6,7 @@ cd mozilla &&
if [ "$FIREFOX_CVS" == "n" ]; then
patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
-fi &&
+fi &&
if [ "$FIREFOX_CVS" == "y" ]; then
cp $SCRIPT_DIRECTORY/mozconfig3 .mozconfig
diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch
index d86d1c54c3..a1dc4731f4 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
exit 0
;;
--cflags)
-- if test "/usr/local/include/firefox-2.0.0.12" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.12"
+- if test "/usr/local/include/firefox-2.0.0.13" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.13"
+ if test "/usr/include/firefox" != /usr/include ; then
+ includes="-I/usr/include/firefox"
fi
@@ -25,14 +25,14 @@
if test "$echo_cflags" = "yes"; then
nspr_cflags="-I/usr/include/nspr"
for n in $echo_components; do
-- component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.12/$n"
+- component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.13/$n"
+ component_includes="$component_includes -I/usr/include/firefox/$n"
done
echo $component_includes $includes $nspr_cflags
fi
if test "$echo_idlflags" = "yes"; then
-- echo "-I/usr/local/share/idl/firefox-2.0.0.12"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.13"
+ echo "-I/usr/share/idl/firefox"
fi
@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.12 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.13 $libs
+ echo -L/usr/lib $libs
fi