Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ae8488cddede88247fb2d77f8fbc478760c67049)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ae8488cddede88247fb2d77f8fbc478760c67049)
  • Date: Wed, 13 Feb 2008 10:55:21 -0600

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

http/firefox/BUILD | 2 +
http/firefox/DETAILS | 2 -
http/firefox/HISTORY | 4 ++
http/firefox/INSTALL | 23 ++++++-----
http/firefox/PRE_BUILD | 16 ++++----
http/mozilla/BUILD | 3 +
http/mozilla/DETAILS | 5 +-
http/mozilla/HISTORY | 6 +++
http/mozilla/PRE_BUILD | 11 +++--
http/nvu/BUILD | 2 +
http/nvu/DETAILS | 2 -
http/nvu/HISTORY | 4 ++
http/nvu/PRE_BUILD | 7 ++-
http/seamonkey/BUILD | 3 +
http/seamonkey/DETAILS | 2 -
http/seamonkey/HISTORY | 4 ++
http/seamonkey/PRE_BUILD | 8 ++--
http/xulrunner/BUILD | 3 +
http/xulrunner/DETAILS | 2 -
http/xulrunner/HISTORY | 5 ++
http/xulrunner/PRE_BUILD | 11 ++++-
libs/nspr/INSTALL | 4 --
mail/thunderbird/BUILD | 2 +
mail/thunderbird/DETAILS | 6 +--
mail/thunderbird/HISTORY | 11 +++++
mail/thunderbird/INSTALL | 8 +++-
mail/thunderbird/PRE_BUILD | 10 +++--
mail/thunderbird/enigmail.patch | 77
++++++++++++++++++++++++++++++++++++++++
28 files changed, 191 insertions(+), 52 deletions(-)

New commits:
commit ae8488cddede88247fb2d77f8fbc478760c67049
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mozilla: Updated Enigmail to 0.93.2

commit 48a67b4d59b7ee1fc6703e53d1a5fdd860cc0f1f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mozilla: Create unique SOURCE_DIRECTORY (fixes Bug #7977)

commit fff20edbc77d725328a3a02bcac61931d54ba8e9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xulrunner: Create unique SOURCE_DIRECTORY (fixes Bug #7977)

commit c61a460915f64f0fccf6d3b9207e248e58285135
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Enable Enigmail without running as root first (Bug #10720)

commit 30c3b80f7148c48d9ca3553f5b0f019b668d6111
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

firefox: Create unique SOURCE_DIRECTORY (fixes Bug #7977)

commit 60a5a408abfd2eb29946d2b727e67cfdcd2ddc8a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Updated Enigmail to 0.95.6

commit 6162b4bdfc2889c3a2e8e918147dd88f5181c81a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nvu: Create unique SOURCE_DIRECTORY (fixes Bug #7977)

commit 8d269fbcbbf5a91bb0fa080bc8b6f4598857e4d8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

seamonkey: Create unique SOURCE_DIRECTORY (fixes Bug #7977)

commit c9b2aa706bb986d88fc7f86d0c5b59223c6347cb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Create unique SOURCE_DIRECTORY (fixes Bug #7977)

commit b5a8e78bd9569c6ca46f9c18391f875160cf498b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nspr: Remove commented out code from INSTALL

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index f53fc45..9509edf 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -1,3 +1,5 @@
+cd $SOURCE_DIRECTORY/mozilla &&
+
FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&
export MOZ_PHOENIX=1 &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index a1bf128..a02b585 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -19,7 +19,7 @@ else
SOURCE2_URL[0]=${SOURCE_URL}.asc
SECURITY_PATCH=15
fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.mozilla.org/projects/firefox/
ENTERED=20030813
LICENSE[0]=MOZILLA
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index a989d7e..efe2fb7 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,6 +1,10 @@
2008-02-13 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel to version 3.0 beta 3

+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD, INSTALL: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2008-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.12, SECURITY_PATCH=15

http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.12
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 724c990..464c83e 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -1,3 +1,5 @@
+cd $SOURCE_DIRECTORY/mozilla &&
+
FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&

if spell_ok Firebird; then
@@ -5,14 +7,13 @@ if spell_ok Firebird; then
fi &&
#fix firefox-config file to match installed configuration
if [ "$FIREFOX_CVS" == "n" ]; then
-patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
+ patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
fi &&

# Not recommended by http://www.mozilla.org/build to use
# make install. Manually install the files.

mkdir -p $INSTALL_ROOT/usr/lib/firefox &&
-cd $SOURCE_DIRECTORY &&
cp -RLv dist/bin/* $INSTALL_ROOT/usr/lib/firefox/ &&
mkdir -p $INSTALL_ROOT/usr/include/firefox/ &&
cp -LfRv dist/include/* $INSTALL_ROOT/usr/include/firefox/ &&
@@ -20,10 +21,10 @@ mkdir -p $INSTALL_ROOT/usr/share/idl/firefox/ &&
cp -LfRv dist/idl/* $INSTALL_ROOT/usr/share/idl/firefox/ &&

if [ "$FIREFOX_CVS" == "n" ]; then
-#fix install directories in *.pc files.
-sed -i s#usr/local#usr# build/unix/firefox-* &&
-sed -i s#-${VERSION}## build/unix/firefox-* &&
-cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig
+ #fix install directories in *.pc files.
+ sed -i s#usr/local#usr# build/unix/firefox-* &&
+ sed -i s#-${VERSION}## build/unix/firefox-* &&
+ cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig
fi &&

#
@@ -71,11 +72,11 @@ install -m 755 -o root -g root
$SCRIPT_DIRECTORY/firefox \
$INSTALL_ROOT/usr/bin &&

if [ "$FIREFOX_CVS" == "n" ]; then
-# make the pkgconfig files reference the nspr from the standalone nspr spell
-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
+ # make the pkgconfig files reference the nspr from the standalone nspr
spell
+ 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
fi &&


diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index cfb4fa9..4d060c9 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,17 +1,19 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&

if [ "$FIREFOX_CVS" == "n" ]; then
-patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
+ patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
+ patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
fi &&

if [ "$FIREFOX_CVS" == "y" ]; then
- cp $SCRIPT_DIRECTORY/mozconfig3 $SOURCE_DIRECTORY/.mozconfig
+ cp $SCRIPT_DIRECTORY/mozconfig3 .mozconfig
else
- cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig
+ cp $SCRIPT_DIRECTORY/mozconfig .mozconfig
fi &&

if [ "$FIREFOX_OFFICIAL" == "y" ]; then
- sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
+ sedit '24iac_add_options --enable-official-branding' .mozconfig
fi
diff --git a/http/mozilla/BUILD b/http/mozilla/BUILD
index 40a2ac1..d7eac55 100755
--- a/http/mozilla/BUILD
+++ b/http/mozilla/BUILD
@@ -1,4 +1,5 @@
-MOZILLA_HOME=$INSTALL_ROOT/usr/lib/mozilla &&
+cd $SOURCE_DIRECTORY/mozilla &&
+MOZILLA_HOME=$INSTALL_ROOT/usr/lib/mozilla &&

if [[ "$MOZILLA_ENIGMAIL" == 'y' ]]; then
MOZILLA_EXT="$MOZILLA_EXT,ipc,enigmail"
diff --git a/http/mozilla/DETAILS b/http/mozilla/DETAILS
index f17c04e..595d7f2 100755
--- a/http/mozilla/DETAILS
+++ b/http/mozilla/DETAILS
@@ -1,7 +1,8 @@
SPELL=mozilla
VERSION=1.7.13
-ENIGMAIL_VERSION=0.92.1
+ENIGMAIL_VERSION=0.93.2
IPC_VERSION=1.1.3
+ PATCHLEVEL=1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
@@ -15,7 +16,7 @@ ENIGMAIL_VERSION=0.92.1
SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE3_GPG="enigmail.gpg:${SOURCE4}:UPSTREAM_KEY"
SOURCE5_GPG="enigmail.gpg:${SOURCE6}:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=mozilla/releases/$SPELL$VERSION/source/$SOURCE
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=ftp://archive.progeny.com/$SOURCE_URI
diff --git a/http/mozilla/HISTORY b/http/mozilla/HISTORY
index e6aec3c..34a8c97 100644
--- a/http/mozilla/HISTORY
+++ b/http/mozilla/HISTORY
@@ -1,3 +1,9 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated Enigmail to 0.93.2
+ PATCHLEVEL=1
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-09-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* freetype.patch: another fix for a freetype2 api change, some const
were added to functions in freetype
diff --git a/http/mozilla/PRE_BUILD b/http/mozilla/PRE_BUILD
index 40826a6..bbfc663 100755
--- a/http/mozilla/PRE_BUILD
+++ b/http/mozilla/PRE_BUILD
@@ -1,5 +1,7 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&

# fixes the "nsBuildID.h: No such file or directory" problem
patch -p1 < $SCRIPT_DIRECTORY/xpfe-bootstrap.diff &&
@@ -7,7 +9,6 @@ patch -p0 < $SCRIPT_DIRECTORY/libreg-standalone.diff &&

patch -p1 < $SCRIPT_DIRECTORY/freetype.patch &&

-
if use_gcc ^4; then
patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch
fi &&
@@ -19,8 +20,8 @@ sedit 's/\\$/ \\/' extensions/p3p/Makefile.in &&
# Enigmail extensions
#
if [[ "$MOZILLA_ENIGMAIL" == 'y' ]]; then
- cd $SOURCE_DIRECTORY/extensions &&
- unpack_file 3 &&
+ cd extensions &&
+ unpack_file 3 &&
unpack_file 5
fi &&

diff --git a/http/nvu/BUILD b/http/nvu/BUILD
index fb698f7..cc09cb3 100755
--- a/http/nvu/BUILD
+++ b/http/nvu/BUILD
@@ -1,3 +1,5 @@
+cd $SOURCE_DIRECTORY/mozilla &&
+
local NVU_HOME=${INSTALL_ROOT}/usr/lib/nvu &&

OPTS="--disable-mailnews \
diff --git a/http/nvu/DETAILS b/http/nvu/DETAILS
index 10c0159..77b60e0 100755
--- a/http/nvu/DETAILS
+++ b/http/nvu/DETAILS
@@ -1,7 +1,7 @@
SPELL=nvu
VERSION=1.0
SOURCE=$SPELL-$VERSION-sources.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://cvs.nvu.com/download/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
WEB_SITE=http://www.nvu.com/
diff --git a/http/nvu/HISTORY b/http/nvu/HISTORY
index a5686ec..3d1f38d 100644
--- a/http/nvu/HISTORY
+++ b/http/nvu/HISTORY
@@ -1,3 +1,7 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-04-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created
Note that SVG is broken (both cairo and libart_lgpl), so disable it
diff --git a/http/nvu/PRE_BUILD b/http/nvu/PRE_BUILD
index 684afed..5d8856d 100755
--- a/http/nvu/PRE_BUILD
+++ b/http/nvu/PRE_BUILD
@@ -1,5 +1,8 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&
+
cp composer/config/mozconfig.linux .mozconfig &&

#
diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index 5e79115..f41f4ae 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -1,4 +1,5 @@
-MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&
+cd $SOURCE_DIRECTORY/mozilla &&
+MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&

#
# Only strip if the user wants us to
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index c5df487..e3852d9 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.1.8
SOURCE=$SPELL-$VERSION.source.tar.bz2

SOURCE_HASH=sha512:8cea1796743608c61b432ebfa391b53e96df59213e2c232105fe5ef2df98fd87d8743444f23c712f4c4fa66e068acca410760f0f3b74997e0561baeb14112952:UPSTREAM_HASH
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.mozilla.org/
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 358325b..d8f15ea 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2008-02-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.1.8. SECUIRTY_PATCH++

http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonkey
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index adc6b49..8b7ca4d 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -1,4 +1,7 @@
-default_pre_build &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&

# remove /root/.mozconfig, it causes too much trouble
if [ -f /root/.mozconfig ]; then
@@ -6,7 +9,6 @@ if [ -f /root/.mozconfig ]; then
fi &&

# remove broken .mozconfig shipped with 1.0b
-rm -f $SOURCE_DIRECTORY/.mozconfig &&
+rm -f .mozconfig &&

-cd $SOURCE_DIRECTORY &&
patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index 3fd5c23..f609480 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -1,4 +1,5 @@
-MOZILLA_HOME=$INSTALL_ROOT/usr/lib/xulrunner &&
+cd $SOURCE_DIRECTORY/mozilla &&
+MOZILLA_HOME=$INSTALL_ROOT/usr/lib/xulrunner &&

#
# Only strip if the user wants us to
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 90a7a26..907c63b 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -4,7 +4,7 @@
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
SOURCE_GPG=mozilla.gpg:$SOURCE2:WORKS_FOR_ME
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URI=$SPELL/releases/$VERSION/source/$SOURCE2
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 277aa78..05e6679 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-10-27 Lalo Martins <lalo AT sourcemage.org>
* BUILD: fix build on non-ia32
(no PATCHLEVEL, as it only makes it buildable for users when it
wasn't
@@ -29,3 +33,4 @@

2006-08-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, PRE_BULID, BUILD, INSTALL, CONFIGURE, DEPENDS, PROVIDES,
HISTORY: created spell
+
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index dec1237..b8096c5 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -1,11 +1,16 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&
+
mozilla_remove_nspr_nss &&
patch -p0 < $SCRIPT_DIRECTORY/xulrunner-visibility.diff &&
patch -p0 < $SCRIPT_DIRECTORY/nsiSidebar.patch &&
patch -p0 < $SCRIPT_DIRECTORY/nsiPermission.patch &&
+
if [ -f /root/.mozconfig ]; then
rm -f /root/.mozconfig
fi &&
+
# remove broken .mozconfig shipped with 1.0b
-rm -f $SOURCE_DIRECTORY/.mozconfig
+rm -f .mozconfig
diff --git a/libs/nspr/INSTALL b/libs/nspr/INSTALL
index f7c3eda..41c41c3 100755
--- a/libs/nspr/INSTALL
+++ b/libs/nspr/INSTALL
@@ -13,7 +13,3 @@ install --mode=755 lib/*.so $INSTALL_ROOT/usr/lib/ &&
install --mode=644 lib/*.a $INSTALL_ROOT/usr/lib/ &&
cd include/nspr &&
find -name '*.h' -exec install -D --mode=644 {}
$INSTALL_ROOT/usr/include/nspr/{} ';'
-#install -d --mode=755
$INSTALL_ROOT/usr/include/nspr &&
-#install --mode=644 include/nspr/*.h
$INSTALL_ROOT/usr/include/nspr/ &&
-#install -d --mode=755
$INSTALL_ROOT/usr/include/nspr/obsolete &&
-#install --mode=644 include/nspr/obsolete/*.h
$INSTALL_ROOT/usr/include/nspr/obsolete/
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index f07e9de..e89dab3 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,3 +1,5 @@
+cd $SOURCE_DIRECTORY/mozilla &&
+
THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
export MOZ_THUNDERBIRD="1" &&

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 670089d..4751d21 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -3,17 +3,17 @@
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
if [ "$BUILD_ENIGMAIL" = "y" ]; then
-ENIGMAIL_VERSION=0.95.5
+ENIGMAIL_VERSION=0.95.6
PATCHLEVEL=0
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
SOURCE4=${SOURCE3}.sig
SOURCE4_IGNORE=signature
SOURCE3_GPG="enigmail.gpg:$SOURCE4:UPSTREAM_KEY"
- SOURCE3_URL[0]=http://www.mozilla-enigmail.org/downloads/src/$SOURCE3
+ SOURCE3_URL[0]=http://www.mozilla-enigmail.org/download/source/$SOURCE3
SOURCE4_URL[0]=${SOURCE3_URL}.sig
LICENSE[1]=MPL
LICENSE[2]=MPL
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index fa43cce..39f1d18 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,14 @@
+2008-02-12 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Apply enigmail.patch if Enigmail is enabled
+ * enigmail.patch: Patch for Engimail to be registered (Bug #10720)
+ Probably a better way, but this is the quick fix
+
+2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated Enigmail to 0.95.6
+ Enigmail SOURCE_URL changed to /download/source from /downloads/src
+ * DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
+ Fixes Bug #7977
+
2007-11-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.9, SECURITY_PATCH=10
* mozilla.gpg: updated "Mozilla Software Releases" key
diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index 9e976ee..ab35c19 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -5,7 +5,12 @@ ln -s $THUNDERBIRD_HOME $THUNDERBIRD_HOME-$VERSION &&
make install &&

if [ "$BUILD_ENIGMAIL" == "y" ]; then
- make -C mailnews/extensions/enigmail install
+ make -C mailnews/extensions/enigmail install &&
+ #
+ # Register Enigmail if it is installed
+ #
+ patch $INSTALL_ROOT/usr/lib/thunderbird/chrome/app-chrome.manifest \
+ $SCRIPT_DIRECTORY/enigmail.patch
fi &&

cd ${INSTALL_ROOT}/usr/lib/thunderbird &&
@@ -14,6 +19,7 @@ export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
./regxpcom &&
touch `find . -name *.rdf` &&

+
#
# Create symlink from NSS Root CA store, if it exists. NSS requires this
# to be in the same directory as the current application binary. See:
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 770e954..9e3013f 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,9 +1,11 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd mozilla &&

-cp mail/config/mozconfig .mozconfig &&
+cp mail/config/mozconfig .mozconfig &&

if [ "$BUILD_ENIGMAIL" = "y" ]; then
- cd $SOURCE_DIRECTORY/mailnews/extensions &&
+ cd mailnews/extensions &&
unpack_file 3
fi
diff --git a/mail/thunderbird/enigmail.patch b/mail/thunderbird/enigmail.patch
new file mode 100644
index 0000000..08aaffd
--- /dev/null
+++ b/mail/thunderbird/enigmail.patch
@@ -0,0 +1,77 @@
+diff -Naur thunderbird.orig/chrome/app-chrome.manifest
thunderbird/chrome/app-chrome.manifest
+--- thunderbird.orig/chrome/app-chrome.manifest 1969-12-31
16:00:00.000000000 -0800
++++ thunderbird/chrome/app-chrome.manifest 2008-02-12 09:12:43.594567541
-0800
+@@ -0,0 +1,73 @@
++
++locale wallet en-US jar:en-US.jar!/locale/en-US/wallet/
++
++content enigmime jar:enigmime.jar!/content/enigmime/
++
++skin enigmail classic/1.0
jar:enigmail-skin-tbird.jar!/skin/classic/enigmail/
++
++overlay
chrome://messenger/content/messengercompose/messengercompose.xul
chrome://enigmail/content/enigmailCheckLanguage.xul
++overlay
chrome://messenger/content/messengercompose/messengercompose.xul
chrome://enigmail/content/enigmailMsgComposeOverlay.xul
++overlay chrome://messenger/content/mailWindowOverlay.xul
chrome://enigmail/content/enigmailCheckLanguage.xul
++overlay chrome://messenger/content/mailWindowOverlay.xul
chrome://enigmail/content/enigmailMessengerOverlay.xul
++overlay chrome://messenger/content/msgHdrViewOverlay.xul
chrome://enigmail/content/enigmailMsgHdrViewOverlay.xul
++overlay chrome://messenger/content/msgPrintEngine.xul
chrome://enigmail/content/enigmailMsgPrintOverlay.xul
++overlay chrome://messenger/content/am-identity-edit.xul
chrome://enigmail/content/enigmailAmIdEditOverlay.xul
++overlay chrome://messenger/content/am-identity-edit.xul
chrome://enigmail/content/enigmailEditIdentity.xul
++overlay chrome://messenger/content/addressbook/addressbook.xul
chrome://enigmail/content/enigmailAbCardViewOverlay.xul
++overlay chrome://messenger/content/addressbook/abContactsPanel.xul
chrome://enigmail/content/enigmailAbContactsPanel.xul
++overlay chrome://global/content/customizeToolbar.xul
chrome://enigmail/content/enigmailCustToolOverlay.xul
++overlay chrome://communicator/content/pref/preftree.xul
chrome://enigmail/content/enigmailPrefsOverlay.xul
++overlay chrome://enigmail/content/am-enigprefs.xul
chrome://enigmail/content/enigmailEditIdentity.xul
++overlay chrome://enigmail/content/am-enigprefs-edit.xul
chrome://enigmail/content/enigmailEditIdentity.xul
++overlay chrome://browser/content/browser.xul
chrome://enigmail/content/enigmailNavigatorOverlay.xul
++content enigmail jar:enigmail.jar!/content/enigmail/
++
++locale enigmail en-US
jar:enigmail.jar!/locale/en-US/enigmail/
++
++locale enigmail en-US
jar:enigmail-en-US.jar!/locale/en-US/enigmail/
++
++skin enigmail modern/1.0
jar:enigmail-skin.jar!/skin/modern/enigmail/
++
++skin enigmail classic/1.0
jar:enigmail-skin.jar!/skin/classic/enigmail/
++
++locale enigmail ca-AD
jar:enigmail-locale.jar!/locale/ca-AD/enigmail/
++
++locale enigmail de-AT
jar:enigmail-locale.jar!/locale/de-AT/enigmail/
++
++locale enigmail de-DE
jar:enigmail-locale.jar!/locale/de-DE/enigmail/
++
++locale enigmail el
jar:enigmail-locale.jar!/locale/el/enigmail/
++
++locale enigmail es-ES
jar:enigmail-locale.jar!/locale/es-ES/enigmail/
++
++locale enigmail fi-FI
jar:enigmail-locale.jar!/locale/fi-FI/enigmail/
++
++locale enigmail fr-FR
jar:enigmail-locale.jar!/locale/fr-FR/enigmail/
++
++locale enigmail hu-HU
jar:enigmail-locale.jar!/locale/hu-HU/enigmail/
++
++locale enigmail it-IT
jar:enigmail-locale.jar!/locale/it-IT/enigmail/
++
++locale enigmail ja-JP
jar:enigmail-locale.jar!/locale/ja-JP/enigmail/
++
++locale enigmail ko-KR
jar:enigmail-locale.jar!/locale/ko-KR/enigmail/
++
++locale enigmail nb-NO
jar:enigmail-locale.jar!/locale/nb-NO/enigmail/
++
++locale enigmail pl-PL
jar:enigmail-locale.jar!/locale/pl-PL/enigmail/
++
++locale enigmail pt-BR
jar:enigmail-locale.jar!/locale/pt-BR/enigmail/
++
++locale enigmail pt-PT
jar:enigmail-locale.jar!/locale/pt-PT/enigmail/
++
++locale enigmail ru-RU
jar:enigmail-locale.jar!/locale/ru-RU/enigmail/
++
++locale enigmail sl-SI
jar:enigmail-locale.jar!/locale/sl-SI/enigmail/
++
++locale enigmail sv-SE
jar:enigmail-locale.jar!/locale/sv-SE/enigmail/
++
++locale enigmail tr-TR
jar:enigmail-locale.jar!/locale/tr-TR/enigmail/
++
++locale enigmail zh-CN
jar:enigmail-locale.jar!/locale/zh-CN/enigmail/
++
++locale enigmail zh-TW
jar:enigmail-locale.jar!/locale/zh-TW/enigmail/



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ae8488cddede88247fb2d77f8fbc478760c67049), Eric Sandall, 02/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page