sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to test grimoire by David Kowis
- From: David Kowis <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to test grimoire by David Kowis
- Date: Fri, 19 May 2006 13:01:24 -0500
GIT changes to test grimoire by David Kowis <dkowis AT shlrm.org>:
mail/archivemail/DETAILS | 1 +
mail/archivemail/HISTORY | 4 ++++
mail/archivemail/PRE_BUILD | 3 ++-
mail/dspam/BUILD | 2 +-
mail/dspam/HISTORY | 3 ---
mail/sylpheed-claws/DETAILS | 2 +-
mail/sylpheed-claws/HISTORY | 8 ++++++++
mail/sylpheed-claws/desktop/sylpheed.desktop | 8 --------
mail/thunderbird/DETAILS | 11 +++++++----
mail/thunderbird/HISTORY | 17 ++++++++++++++++-
mail/thunderbird/PRE_BUILD | 2 +-
mail/thunderbird/security_manager_makefile.diff | 12 ++++++------
mail/thunderbird/visibility.patch | 7 ++++---
13 files changed, 51 insertions(+), 29 deletions(-)
New commits:
commit 406f5965e301f886acef0cb928392f0e930e3b70
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>
Pulling latest test from p4 into git
diff --git a/mail/archivemail/DETAILS b/mail/archivemail/DETAILS
index 7d7aa6e..0abf47f 100755
--- a/mail/archivemail/DETAILS
+++ b/mail/archivemail/DETAILS
@@ -1,5 +1,6 @@
SPELL=archivemail
VERSION=0.6.1
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_HASH=sha512:4e75ea2255c324fc2d0d550bf15af6b6babd30a08f9d00e2ad381e2300e72af726cbd44304892084366092d5c9ea478c70f2e4cab0e14a1acbd0c9d71044b69e
diff --git a/mail/archivemail/HISTORY b/mail/archivemail/HISTORY
index 86895be..0f8c360 100644
--- a/mail/archivemail/HISTORY
+++ b/mail/archivemail/HISTORY
@@ -1,3 +1,7 @@
+2006-04-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: fix setup.py so man page goes to /usr/share/man
+ * DETAILS: PATCHLEVEL=1
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/mail/archivemail/PRE_BUILD b/mail/archivemail/PRE_BUILD
index 16e1b86..8e3bde7 100755
--- a/mail/archivemail/PRE_BUILD
+++ b/mail/archivemail/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
+default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+sedit 's:man/man1:share/man/man1:' setup.py &&
patch -p0 < ${SCRIPT_DIRECTORY}/archivemail-python-fix.patch
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index e7e3e08..d7dcc0e 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -1,4 +1,4 @@
-OPTS="$OPTS $DSPAM_DAEMON $DSPAM_PREFS" &&
+OPTS="$OPTS $DSPAM_DAEMON" &&
STORAGE_DRIVERS='hash_drv' &&
if [[ "$DSPAM_SQLITE" == y ]]; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"; fi &&
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index f779fab..5e0443c 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,6 +1,3 @@
-2006-05-19 David Kowis <dkowis AT shlrm.org>
- * BUILD: forgot to add DSPAM_PREFS to the $OPTS. bug #10460
-
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/mail/sylpheed-claws/DETAILS b/mail/sylpheed-claws/DETAILS
index f9474cc..a5bdfca 100755
--- a/mail/sylpheed-claws/DETAILS
+++ b/mail/sylpheed-claws/DETAILS
@@ -1,6 +1,6 @@
SPELL=sylpheed-claws
if [ "$SYLPHEED_CLAWS_GTK2" == "y" ]
-then VERSION=2.1.0
+then VERSION=2.2.0
else VERSION=1.0.5
fi
SOURCE=sylpheed-claws-${VERSION}.tar.bz2
diff --git a/mail/sylpheed-claws/HISTORY b/mail/sylpheed-claws/HISTORY
index 17074ec..6d89ebf 100644
--- a/mail/sylpheed-claws/HISTORY
+++ b/mail/sylpheed-claws/HISTORY
@@ -1,3 +1,11 @@
+2006-05-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.0
+ * desktop/sylpheed.desktop: deleted
+ sylpheed-claws uses its own sylpheed-claws.desktop
+
+2006-04-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1.1
+
2006-04-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.0
diff --git a/mail/sylpheed-claws/desktop/sylpheed.desktop
b/mail/sylpheed-claws/desktop/sylpheed.desktop
deleted file mode 100644
index e6ecc8d..0000000
--- a/mail/sylpheed-claws/desktop/sylpheed.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Sylpheed
-Exec=sylpheed
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index f7a04dd..50063ad 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,20 +1,22 @@
SPELL=thunderbird
- VERSION=1.5
+ VERSION=1.5.0.2
SOURCE=$SPELL-$VERSION-source.tar.bz2
-
SOURCE_HASH=sha512:d9d2026ffb14cb980fd256e230e5546f2deb8070189b84ee3a87690c75b5a0acdfbf51d5a9c27786c268334069e282ce6695d3272f69d54512629a49a09220e2
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
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.93.2
IPC_VERSION=1.1.3
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
SOURCE4=${SOURCE3}.asc
SOURCE4_IGNORE=signature
- SOURCE3_GPG="enigmail.gpg:${SOURCE4}:UPSTREAM_KEY"
+ SOURCE3_GPG="enigmail.gpg:$SOURCE4:UPSTREAM_KEY"
SOURCE5=ipc-$IPC_VERSION.tar.gz
SOURCE6=${SOURCE5}.asc
SOURCE6_IGNORE=signature
- SOURCE5_GPG="enigmail.gpg:${SOURCE6}:UPSTREAM_KEY"
+ SOURCE5_GPG="enigmail.gpg:$SOURCE6:UPSTREAM_KEY"
SOURCE3_URL[0]=http://downloads.mozdev.org/enigmail/src/$SOURCE3
SOURCE3_URL[1]=http://www.mozdev.org.uk/rsync/enigmail/src/$SOURCE3
SOURCE3_URL[2]=ftp://mozdev.secsup.org/pub/software/mozdev/enigmail/src/$SOURCE3
@@ -26,6 +28,7 @@ ENIGMAIL_VERSION=0.93.2
LICENSE[1]=MPL
LICENSE[2]=MPL
fi
+ SECURITY_PATCH=1
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
UPDATED=20050918
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 63b1671..86051ef 100755
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,6 +1,21 @@
+2006-04-26 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Added SECURITY_PATCH=1 (thanks Arwed)
+
+2006-04-25 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 1.5.0.2
+ Security update:
http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunderbird1.5.0.2
includes fixes for:
+ MFSA 2006-28, MFSA 2006-27, MFSA 2006-26, MFSA 2006-25, MFSA 2006-24
+ MFSA 2006-22, MFSA 2006-21, MFSA 2006-20, MFSA 2006-08, MFSA 2006-07
+ MFSA 2006-06, MFSA 2006-05, MFSA 2006-04, MFSA 2006-02, MFSA 2006-01
+ Mozilla at least signed this tarball, re-adding SOURCE GPG check/URL
+ This security update can also fix security Bug #10894
+ * security_manager_makefile.diff,visibility.patch: Updated to 1.5.0.2
+ * PRE_BUILD: visibility.patch now uses -p1
+
2006-03-21 David Kowis <dkowis AT shlrm.org>
* PRE_BUILD: moved the mozilla_remove_nspr function to PRE_BUILD from
BUILD
- Added the application of the *visibility* patch makes it work under
gcc4 none the less
+ Added the application of the *visibility* patch makes it work under
gcc4
+ none the less
2006-03-20 David Kowis <dkowis AT shlrm.org>
* DETAILS: added sha512 SOURCE_HASH since the mozilla folks are
unresponsive
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 8502d62..7169515 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
mozilla_remove_nspr_nss &&
-patch -p0 < $SCRIPT_DIRECTORY/visibility.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/visibility.patch &&
if [ "$BUILD_ENIGMAIL" = "y" ]; then
diff --git a/mail/thunderbird/security_manager_makefile.diff
b/mail/thunderbird/security_manager_makefile.diff
index 49ef7a2..afe1875 100644
--- a/mail/thunderbird/security_manager_makefile.diff
+++ b/mail/thunderbird/security_manager_makefile.diff
@@ -1,6 +1,6 @@
diff -Naur mozilla.orig/security/manager/Makefile.in
mozilla/security/manager/Makefile.in
---- mozilla.orig/security/manager/Makefile.in 2006-01-31 16:58:18.247715416
-0800
-+++ mozilla/security/manager/Makefile.in 2006-01-31 17:38:53.261537048
-0800
+--- mozilla.orig/security/manager/Makefile.in 2006-04-25 13:40:14.858946488
-0700
++++ mozilla/security/manager/Makefile.in 2006-04-25 13:40:24.939414024
-0700
@@ -46,35 +46,6 @@
MODULE = psm
@@ -37,7 +37,7 @@ diff -Naur mozilla.orig/security/manager
# NSS makefiles are not safe for parallel execution.
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -144,19 +115,7 @@
+@@ -147,19 +118,7 @@
include $(topsrcdir)/config/rules.mk
# Attempt to properly handle NSS' refusal to implement a dependency system
@@ -58,7 +58,7 @@ diff -Naur mozilla.orig/security/manager
dependclean export packages chrome::
$(MAKE) -C boot $@
-@@ -168,48 +127,6 @@
+@@ -171,48 +130,6 @@
libs::
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
@@ -107,7 +107,7 @@ diff -Naur mozilla.orig/security/manager
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
$(MAKE) -C locales $@
-@@ -218,20 +135,6 @@
+@@ -221,20 +138,6 @@
endif
install::
@@ -128,7 +128,7 @@ diff -Naur mozilla.orig/security/manager
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
$(MAKE) -C locales $@
-@@ -247,11 +150,6 @@
+@@ -250,11 +153,6 @@
$(MAKE) -C pki $@
endif
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
diff --git a/mail/thunderbird/visibility.patch
b/mail/thunderbird/visibility.patch
index 0ad6e6e..5b0b561 100644
--- a/mail/thunderbird/visibility.patch
+++ b/mail/thunderbird/visibility.patch
@@ -1,6 +1,7 @@
---- configure~ 2006-01-11 06:43:03.000000000 +0100
-+++ configure 2006-02-08 09:29:20.000000000 +0100
-@@ -7626,7 +7626,7 @@
+diff -Naur mozilla.orig/configure mozilla/configure
+--- mozilla.orig/configure 2006-04-25 13:40:12.593290920 -0700
++++ mozilla/configure 2006-04-25 13:41:41.698744832 -0700
+@@ -7650,7 +7650,7 @@
if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
-
[SM-Commit] GIT changes to test grimoire by David Kowis,
David Kowis, 05/19/2006
- <Possible follow-up(s)>
- [SM-Commit] GIT changes to test grimoire by David Kowis, David Kowis, 05/19/2006
Archive powered by MHonArc 2.6.24.