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

Eric Sandall scm at sourcemage.org
Sat Apr 19 03:08:06 EDT 2008


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

 http/firefox/DETAILS |    2 +-
 http/firefox/INSTALL |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

    firefox: Updated to 2.0.0.14. SECURITY_PATCH++

commit 3ed90172623188093f8b7a88aca4b3a8dc833763
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "firefox: Updated to 2.0.0.14. SECURITY_PATCH++"
    
    This reverts commit f0f175388784d348708cd2037abcf16af3bd1ae6.
    
    Forgot SECURITY_PATCH++

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 2a12041..8387874 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -16,7 +16,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=16
+  SECURITY_PATCH=17
 fi
   SOURCE2_IGNORE=signature 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 7116f8f..464c83e 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -5,6 +5,10 @@ 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.



More information about the SM-Commit mailing list