Source Mage code commit list

[Pol Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

 http/firefox/DETAILS         |    6 +-
 http/firefox/HISTORY         |    5 +
 http/firefox/PRE_BUILD       |    5 +
 http/firefox/installer.patch |  112 
+++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 4 deletions(-)

New commits:
commit 33052f7d8d82024613392fd40c3a0fe364195d72
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

    http/firefox: version 14.0.1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 38b8161..049209b 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=13.0.1
+         VERSION=14.0.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=13.0.1
+         VERSION=14.0.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else
    
SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
    
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
-  SECURITY_PATCH=50
+  SECURITY_PATCH=51
 fi
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 93d567c..0c87bd4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-07-18 Pol Vinogradov <vin.public AT gmail.com>
+       * DETAILS: 14.0.1, SECURITY_PATCH=51
+       * PRE_BUILD, installer.patch: added fix for
+         https://bugzilla.mozilla.org/show_bug.cgi?id=752895
+
 2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 13.0.1, SECURITY_PATCH=50
 
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 8b10399..c993d21 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -9,7 +9,10 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
 
 # Archlinux patch to drop release point from install path
 # 
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
-patch -p1 < $SPELL_DIRECTORY/install_dir.patch && 
+patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
+
+# fixes https://bugzilla.mozilla.org/show_bug.cgi?id=752895
+patch -p1 < $SPELL_DIRECTORY/installer.patch &&
 
 cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
 
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
new file mode 100644
index 0000000..d3232b5
--- /dev/null
+++ b/http/firefox/installer.patch
@@ -0,0 +1,112 @@
+# HG changeset patch
+# User Andrew Benton <b3nton AT gmail.com>
+# Date 1339485009 -7200
+# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
+# Parent  253d5996845e9fd994dc9ee542d293fbc412ec56
+Bug 752895 - Don't try to install nspr, nss and sqlite when using system 
libraries. 
+r=glandium
+
+diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
+--- a/browser/installer/Makefile.in
++++ b/browser/installer/Makefile.in
+@@ -39,16 +39,24 @@ endif
+ ifdef MOZ_ENABLE_GNOME_COMPONENT
+ DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
+ endif
+ 
+ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+ DEFINES += -DMOZ_GTK2=1
+ endif
+ 
++ifdef MOZ_NATIVE_NSPR
++DEFINES += -DMOZ_NATIVE_NSPR=1
++endif
++
++ifdef MOZ_NATIVE_NSS
++DEFINES += -DMOZ_NATIVE_NSS=1
++endif
++
+ ifdef NSS_DISABLE_DBM
+ DEFINES += -DNSS_DISABLE_DBM=1
+ endif
+ 
+ ifdef _MSC_VER
+ DEFINES += -D_MSC_VER=$(_MSC_VER)
+ endif
+ 
+diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -53,19 +53,21 @@
+ #endif
+ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ #ifdef MOZ_SHARED_MOZGLUE
+ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
+ #endif
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+ #else
+ @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
+ #endif
+ #ifdef XP_MACOSX
+ @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@@ -104,17 +106,19 @@
+ @BINPATH@/@MOZ_APP_NAME@
+ #endif
+ @BINPATH@/application.ini
+ #ifdef MOZ_UPDATER
+ @BINPATH@/update-settings.ini
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
+ @BINPATH@/blocklist.xml
+ #ifdef XP_UNIX
+ @BINPATH@/run-mozilla.sh
+ #ifndef XP_MACOSX
+ @BINPATH@/mozilla-xremote-client
+@@ -578,26 +582,28 @@
+ @BINPATH@/components/dom_svg.xpt
+ @BINPATH@/components/dom_smil.xpt
+ 
+ ; [Personal Security Manager]
+ ;
+ ; NSS libraries are signed in the staging directory,
+ ; meaning their .chk files are created there directly.
+ ;
++#ifndef MOZ_NATIVE_NSS
+ @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
+ #ifndef NSS_DISABLE_DBM
+ @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
+ #endif
+ @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
++#endif
+ @BINPATH@/chrome/pippki@JAREXT@
+ @BINPATH@/chrome/pippki.manifest
+ @BINPATH@/components/pipboot.xpt
+ @BINPATH@/components/pipnss.xpt
+ @BINPATH@/components/pippki.xpt
+ 
+ ; for Solaris SPARC
+ #ifdef SOLARIS
+
+