[SM-Commit] GIT changes to master grimoire by Eric Sandall (f0f175388784d348708cd2037abcf16af3bd1ae6)

Eric Sandall scm at sourcemage.org
Sat Apr 19 02:39:23 EDT 2008


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 http/firefox/DETAILS              |    2 -
 http/firefox/HISTORY              |    7 +++++
 http/firefox/INSTALL              |    4 ---
 http/firefox/firefox-config.patch |   46 --------------------------------------
 4 files changed, 8 insertions(+), 51 deletions(-)

New commits:
commit f0f175388784d348708cd2037abcf16af3bd1ae6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    firefox: Updated to 2.0.0.14. SECURITY_PATCH++

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 885f5d1..2a12041 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.13
+         VERSION=2.0.0.14
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8819fc5..189af5e 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2008-04-18 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 2.0.0.14
+	  SECURITY_PATCH++
+	  See http://www.mozilla.org/security/announce/2008/mfsa2008-20.html
+	* PRE_BUILD: firefox-config.patch now applied upstream
+	* firefox-config.patch: Removed (now applied upstream)
+
 2008-04-01 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated FIREFOX_CVS=y to 3.0b5, small clean up of "{"
 	  and spaces
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 464c83e..7116f8f 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -5,10 +5,6 @@ FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&
 if  spell_ok  Firebird;  then
   dispel Firebird
 fi  &&
-#fix firefox-config file to match installed configuration
-if [ "$FIREFOX_CVS" == "n" ]; then
-  patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
-fi &&
 
 # Not recommended by http://www.mozilla.org/build to use
 # make install.  Manually install the files.
diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch
deleted file mode 100644
index a1dc473..0000000
--- a/http/firefox/firefox-config.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- build/unix/firefox-config.orig	2007-02-25 11:06:08.000000000 +0400
-+++ build/unix/firefox-config	2007-02-25 13:26:14.000000000 +0400
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
--prefix=/usr/local
--exec_prefix=/usr/local
-+prefix=/usr
-+exec_prefix=/usr
- exec_prefix_set=no
- 
- usage()
-@@ -60,8 +60,8 @@
-       exit 0
-       ;;
-     --cflags)
--      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
-       echo_cflags=yes
-       ;;
-@@ -105,13 +105,13 @@
- 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.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.13"
-+    echo "-I/usr/share/idl/firefox"
- fi
- 
- _nspr_libs="-L/usr/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
-@@ -138,5 +138,5 @@
- 	    ;;
-         esac
-     done
--    echo -L/usr/local/lib/firefox-2.0.0.13 $libs
-+    echo -L/usr/lib $libs
- fi



More information about the SM-Commit mailing list