[Lunar-commits] <moonbase> thunderbird: +0.0.0.03 security update

Zbigniew Luszpinski zbiggy at lunar-linux.org
Fri Feb 29 18:00:34 CET 2008


commit 3a6272cdd640a626e7d69feb4887755b0e497dca
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Feb 29 18:00:34 2008 +0100

    thunderbird: +0.0.0.03 security update
---
 mail/thunderbird/BUILD        |   32 +++++++++++++++++---------------
 mail/thunderbird/DETAILS      |   17 +++++++----------
 mail/thunderbird/POST_INSTALL |    3 ++-
 mail/thunderbird/POST_REMOVE  |    2 ++
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 55658a6..ba0d45b 100644
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,9 +1,8 @@
-( 
-  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
+(
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi &&
-  
+
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
   MOZ_EXTENSIONS="wallet,spellcheck,xmlextras,webservices"
   NECKO_PROT="http,file,jar,viewsource,res,data"
@@ -14,6 +13,9 @@
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-negotiateauth"
   fi &&
 
+  # This hack added to fix a gtk+-2/pango/atk update that broke firefox. This should be removed in the future.
+  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
+
   export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
   export MOZ_THUNDERBIRD=1
   export MOZILLA_OFFICIAL=1
@@ -28,24 +30,26 @@
     --with-system-zlib  \
     --with-system-png   \
     --with-system-jpeg  \
-    --enable-necko-protocols=${NECKO_PROT}      \
     --enable-extensions=${MOZ_EXTENSIONS}       \
+    --enable-single-profile        \
+    --enable-application=mail      \
+    --enable-default-toolkit=gtk2  \
+    --enable-optimize="$CFLAGS"    \
     --enable-xft        \
-    --enable-single-profile     \
-    --enable-application=mail   \
-    --enable-default-toolkit=gtk2       \
     --enable-reorder    \
     --enable-cpp-rtti   \
-    --enable-optimize="$CFLAGS"   \
+    --enable-cpp-exceptions \
     --enable-crypto     \
     --enable-strip      \
     --enable-strip-libs \
     --enable-xterm-updates      \
-    --disable-svg       \
+    --enable-official-branding  \
     --enable-image-decoders=default,-xbm        \
+    --enable-necko-protocols=${NECKO_PROT}      \
     --disable-debug     \
     --disable-tests     \
     --disable-oji       \
+    --disable-svg       \
     --disable-plugins   \
     --disable-necko-disk-cache  \
     --disable-installer \
@@ -56,10 +60,8 @@
     --disable-profilesharing    \
     --disable-mathml    \
     $OPTS               &&
-              
-    make        &&
-    prepare_install &&
-    make install &&
+
+  default_make        &&
 
     # Enigmail support disabled since it doesn't work anylonger
     # Blame the thunderbird developers
@@ -78,11 +80,11 @@
     install -m644 $SOURCE_DIRECTORY/mail/extensions/newsblog/rss.rdf $MOZILLA_HOME/defaults/isp/US &&
 
     # Put some important headers in place
-    install -d /usr/include/$MODULE-$VERSION/nss &&
+    mkdir -p /usr/include/$MODULE-$VERSION/nss &&
     cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/$MODULE-$VERSION/nss &&
 
     # Now the .desktop file and the icon
-    install -d /usr/share/applications /usr/share/pixmaps &&
+    mkdir -p /usr/share/applications /usr/share/pixmaps &&
     install -m644 $SOURCE_CACHE/$SOURCE2 /usr/share/applications &&
     rm -f /usr/share/pixmaps/thunderbird.xpm &&
     install -m644 $MOZILLA_HOME/icons/mozicon50.xpm /usr/share/pixmaps
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 650f865..58f08d2 100644
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,25 +1,22 @@
           MODULE=thunderbird
-         VERSION=2.0.0.9
+         VERSION=2.0.0.12
           SOURCE=thunderbird-$VERSION-source.tar.bz2
          SOURCE2=thunderbird.desktop
-         SOURCE3=sm-xrender.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
-   SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
-   SOURCE_URL[1]=http://archive.progeny.com/mozilla.org/$MODULE/releases/$VERSION/source/
-      SOURCE_VFY=sha1:fede9db98f25adb978b84129a6d15a4dbe6bbb3e
+   SOURCE_URL[0]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
+   SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
+   SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/source/
+   SOURCE_URL[3]=http://archive.progeny.com/mozilla.org/$MODULE/releases/$VERSION/source/
+      SOURCE_VFY=sha1:36ea64353d32a9f138ef658250cfdcf8f9e862f2
      SOURCE2_URL=$PATCH_URL
      SOURCE2_VFY=sha1:a76c4e25bf4e491014c5bafbb07de096248a9931
-     SOURCE3_URL=$PATCH_URL
-     SOURCE3_VFY=sha1:cab357aa5854456ffd24713126e64a18b391a4cb
         WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
-         UPDATED=20071117
+         UPDATED=20080229
            SHORT="A full-featured mail client"
            PSAFE=no
-
 cat << EOF
 Thunderbird includes:
-
 * The ability to customize your toolbars the way you want them.
   Choose View / Toolbars / Customize inside any window.
 * UI extensions can be added to Mozilla Thunderbird to customize your
diff --git a/mail/thunderbird/POST_INSTALL b/mail/thunderbird/POST_INSTALL
index 2331f76..0b72f93 100644
--- a/mail/thunderbird/POST_INSTALL
+++ b/mail/thunderbird/POST_INSTALL
@@ -6,6 +6,8 @@ if [ ! -z $OLD_VER ]; then
   rm -rf /usr/lib/thunderbird-$OLD_VER
 fi
 
+unset_module_config OLD_VER
+
 # No more linking workarounds
 export LD_LIBRARY_PATH="$TBIRD_HOME/lib/$TBIRD_LIBDIR:$TBIRD_HOME/lib/$TBIRD_LIBDIR/plugins:$TBIRD_HOME/lib/$TBIRD_LIBDIR/components"
 export MOZILLA_FIVE_HOME="$TBIRD_HOME/lib/$TBIRD_LIBDIR"
@@ -16,4 +18,3 @@ echo "locale,install,select,en-US" >> $TBIRD_HOME/lib/$TBIRD_LIBDIR/chrome/insta
 
 cd $TBIRD_HOME/lib/$TBIRD_LIBDIR
 ./regxpcom
-#./regchrome
diff --git a/mail/thunderbird/POST_REMOVE b/mail/thunderbird/POST_REMOVE
index 4d72eaa..c9d5ec6 100644
--- a/mail/thunderbird/POST_REMOVE
+++ b/mail/thunderbird/POST_REMOVE
@@ -1 +1,3 @@
+rm -f  /usr/share/pixmaps/mozicon50.xpm
+rm -rf /usr/include/thunderbird-$VERSION
 rm -rf /usr/lib/thunderbird-$VERSION


More information about the Lunar-commits mailing list