Revert "Revert "firefox 2.0.0.8, SECURITY_PATCH=12""

This reverts commit 7c94368e0507ed8183131b6d320eed70d4ecc846.

Also added a fix for the installed files permissions so it runs as non-root.

4 files changed, 21 insertions, 8 deletions

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index d767530031..953096d804 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if  [  "$FIREFOX_CVS"  ==  "y"  ];  then
    SOURCE_URL[0]=cvs://:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
    SOURCE_IGNORE=volatile
 else
-         VERSION=2.0.0.7
+         VERSION=2.0.0.8
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=${SOURCE}.asc
       SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,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=11
+  SECURITY_PATCH=12
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
         WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 6c07798888..e1a8077da5 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2007-10-21 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* INSTALL: fix up permissions after install so it runs as non-root
+
+2007-10-19 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.0.0.8, SECURITY_PATCH=12
+	  http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.8
+	* firefox-config.patch: updated to 2.0.0.8
+
 2007-09-24 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated to used UPSTREAM_KEY again
 	* firefox.gpg: Added new upstream key
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 895d4b33fb..ec36913bc6 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -71,4 +71,9 @@ install  -m  755  -o  root  -g  root  $SCRIPT_DIRECTORY/firefox  \
 sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc  &&
 sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc  &&
 sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
-sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
+sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc &&
+
+# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
+# anyone but root
+chmod -R go+r /usr/lib/firefox  &&
+chmod go+x /usr/lib/firefox/run-mozilla.sh
diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch
index 6a3f0ddcff..4e7b31694e 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.7" != /usr/include ; then
--        includes="-I/usr/local/include/firefox-2.0.0.7"
+-      if test "/usr/local/include/firefox-2.0.0.8" != /usr/include ; then
+-        includes="-I/usr/local/include/firefox-2.0.0.8"
 +      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.7/$n"
+-	component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.8/$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.7"
+-    echo "-I/usr/local/share/idl/firefox-2.0.0.8"
 +    echo "-I/usr/share/idl/firefox"
  fi
  
@@ -41,6 +41,6 @@
  	    ;;
          esac
      done
--    echo -L/usr/local/lib/firefox-2.0.0.7 $libs
+-    echo -L/usr/local/lib/firefox-2.0.0.8 $libs
 +    echo -L/usr/lib $libs
  fi