diff options
| author | Vlad Glagolev | 2011-04-21 19:38:47 +0400 |
|---|---|---|
| committer | George Sherwood | 2011-05-14 09:43:13 -0500 |
| commit | a9809ee9dbcc19922c8ca6601c19b20ea27ec5ea (patch) | |
| tree | 3d4a3bd3982f4535b1dbb461ed1e8decdbcaaa2e | |
| parent | 1bf5a97dd4189596d9c2bc359478fb7a918773aa (diff) | |
exim: fixed installation on upgrade
(cherry picked from commit a94e919fcc2bdc743afdf2efa09111d1c66cf53c)
| -rw-r--r-- | mail/exim/HISTORY | 4 | ||||
| -rwxr-xr-x | mail/exim/PRE_BUILD | 3 | ||||
| -rw-r--r-- | mail/exim/config.patch | 15 |
3 files changed, 18 insertions, 4 deletions
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY index d2f40cc746..c41899fb4b 100644 --- a/mail/exim/HISTORY +++ b/mail/exim/HISTORY @@ -1,3 +1,7 @@ +2011-04-21 Vlad Glagolev <stealth@sourcemage.org> + * PRE_BUILD: simplified patching + * config.patch: fixed installation on upgrade procedure with symlinks + 2011-03-23 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * DETAILS: updated spell to 4.75 diff --git a/mail/exim/PRE_BUILD b/mail/exim/PRE_BUILD index 694980c0fb..40f865c14c 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 64ddd837d8..5512a2aefb 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 "" |