mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-22 09:57:34 +00:00
Code Issues Releases Wiki Activity

postfix-2.12-20140524

Browse Source
This commit is contained in:
Wietse Venema 2014-05-24 00:00:00 -05:00 committed by Viktor Dukhovni
parent 1582fdf34e
commit 61886400e3
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
postfix/HISTORY
View File

@ -19730,3 +19730,12 @@ Apologies for any names omitted.
Bugfix (introduced: 20140320): missing initialization. Bugfix (introduced: 20140320): missing initialization.
Viktor Dukhovni. File pipe/pipe.c. Viktor Dukhovni. File pipe/pipe.c.
20140516
Cleanup: Berkeley DB6 support. File: util/dict_db.c.
20140524
Cleanup: symlink handling in post-install, back-ported
from the non-production release. File: post-install.

20
postfix/postfix-install
View File

@ -252,11 +252,16 @@ compare_or_replace() {
} }
} }
myreadlink() {
ls -l -- "$@" | awk '
/->/ { print $NF; next }
{ exit(1) }
'
}
compare_or_symlink() { compare_or_symlink() {
(cmp $1 $2 >/dev/null 2>&1 && echo Skipping $2...) || { case $1 in
echo Updating $2... /*) dest=`echo $1 | sed '
rm -f $tempdir/junk || exit 1
dest=`echo $1 | sed '
s;^'$install_root';; s;^'$install_root';;
s;/\./;/;g s;/\./;/;g
s;//*;/;g s;//*;/;g
@ -271,6 +276,13 @@ compare_or_symlink() {
s;[^/]*/;../;g s;[^/]*/;../;g
s;$;'$dest'; s;$;'$dest';
'` '`
;;
*) link=$1
;;
esac
(test $link = "`myreadlink $2`" >/dev/null 2>&1 && echo Skipping $2...) || {
echo Updating $2...
rm -f $tempdir/junk || exit 1
ln -s $link $tempdir/junk || exit 1 ln -s $link $tempdir/junk || exit 1
mv -f $tempdir/junk $2 || { mv -f $tempdir/junk $2 || {
echo $0: Error: your mv command has trouble renaming symlinks. 1>&2 echo $0: Error: your mv command has trouble renaming symlinks. 1>&2

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20140516" #define MAIL_RELEASE_DATE "20140524"
#define MAIL_VERSION_NUMBER "2.12" #define MAIL_VERSION_NUMBER "2.12"
#ifdef SNAPSHOT #ifdef SNAPSHOT

2
postfix/src/util/dict_db.c
View File

@ -89,7 +89,7 @@
#define DONT_CLOBBER DB_NOOVERWRITE #define DONT_CLOBBER DB_NOOVERWRITE
#endif #endif
#if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR <= 6) #if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6)
#define DICT_DB_CURSOR(db, curs) (db)->cursor((db), NULL, (curs)) #define DICT_DB_CURSOR(db, curs) (db)->cursor((db), NULL, (curs))
#else #else
#define DICT_DB_CURSOR(db, curs) (db)->cursor((db), NULL, (curs), 0) #define DICT_DB_CURSOR(db, curs) (db)->cursor((db), NULL, (curs), 0)