Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.55 grimoire by George Sherwood (d6625c244b3c3ecb8675dec3b3833bb2f3e29e71)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.55 grimoire by George Sherwood (d6625c244b3c3ecb8675dec3b3833bb2f3e29e71)
  • Date: Sat, 14 May 2011 09:43:47 -0500

GIT changes to stable-0.55 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

mail/exim/DEPENDS | 10 ++++++++--
mail/exim/DETAILS | 4 ++--
mail/exim/HISTORY | 8 ++++++++
mail/exim/PRE_BUILD | 3 +--
mail/exim/config.patch | 15 +++++++++++++--
5 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit d6625c244b3c3ecb8675dec3b3833bb2f3e29e71
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

exim: => 4.76 (security)
(cherry picked from commit df9c423e7d5f7443aefede7ee1e56e3617e95d71)

commit a9809ee9dbcc19922c8ca6601c19b20ea27ec5ea
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

exim: fixed installation on upgrade
(cherry picked from commit a94e919fcc2bdc743afdf2efa09111d1c66cf53c)

diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index d69736c..5498658 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -67,7 +67,13 @@ optional_depends tcp_wrappers \
'--disable-tcp-wrappers-access' \
'for TCP wrapper access control' &&

-optional_depends xorg-libs \
+optional_depends libx11 \
'--enable-x11-monitor' \
'--disable-x11-monitor' \
- 'for X monitor'
+ 'for X monitor' &&
+
+if is_depends_enabled $SPELL libx11; then
+ depends libxt &&
+ depends libxmu &&
+ depends libxaw
+fi
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 796fe3c..19ffa7b 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,6 +1,6 @@
SPELL=exim
- VERSION=4.75
- SECURITY_PATCH=4
+ VERSION=4.76
+ SECURITY_PATCH=5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index d2f40cc..964b12a 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,11 @@
+2011-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.76 (security: CVE-2011-1764)
+ * DEPENDS: killed xorg-libs, see #14699
+
+2011-04-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: simplified patching
+ * config.patch: fixed installation on upgrade procedure with symlinks
+
2011-03-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 4.75

diff --git a/mail/exim/PRE_BUILD b/mail/exim/PRE_BUILD
index 694980c..40f865c 100755
--- a/mail/exim/PRE_BUILD
+++ b/mail/exim/PRE_BUILD
@@ -1,8 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch "$SOURCE_DIRECTORY/scripts/exim_install" \
- "$SPELL_DIRECTORY/config.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/config.patch" &&

sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'" \
src/configure.default
diff --git a/mail/exim/config.patch b/mail/exim/config.patch
index 64ddd83..5512a2a 100644
--- a/mail/exim/config.patch
+++ b/mail/exim/config.patch
@@ -1,5 +1,16 @@
---- scripts/exim_install.orig 2009-10-30 16:14:04.000000000 +0100
-+++ scripts/exim_install 2009-11-17 09:54:49.000000000 +0100
+--- scripts/exim_install.orig 2011-03-22 11:00:51.000000000 +0300
++++ scripts/exim_install 2011-04-21 19:30:29.361679691 +0400
+@@ -316,8 +316,8 @@
+ # If "exim" does not already exist just create a symbolic link.
+
+ else
+- echo \(cd ${BIN_DIRECTORY}\; ${LN} -s ${version} exim\)
+- (${real} cd ${BIN_DIRECTORY}; ${real} ${LN} -s ${version} exim)
++ echo \(cd ${BIN_DIRECTORY}\; ${LN} -sf ${version} exim\)
++ (${real} cd ${BIN_DIRECTORY}; ${real} ${LN} -sf ${version} exim)
+ if [ $? -ne 0 ]; then
+ echo $com ""
+ echo $com "*** Exim installation ${ver}failed ***"
@@ -378,21 +378,10 @@

echo $com ""



  • [SM-Commit] GIT changes to stable-0.55 grimoire by George Sherwood (d6625c244b3c3ecb8675dec3b3833bb2f3e29e71), George Sherwood, 05/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page