postfix-2.12-20140524

diff --git a/postfix/HISTORY b/postfix/HISTORY
index f9b9ef621708e3ce6af9d25b3f6d93c213fd1c7b..fd79660d9f054254966517aaee23b24ec3814c1f 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -19730,3 +19730,12 @@ Apologies for any names omitted.
 
        Bugfix (introduced: 20140320): missing initialization.
        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.

diff --git a/postfix/postfix-install b/postfix/postfix-install
index 6b2a261a0fea597843ef55213b86da409e737ca6..055fa080eea2c10e29d355182ebb04b872556710 100644 (file)
--- a/postfix/postfix-install
+++ b/postfix/postfix-install
@@ -252,11 +252,16 @@ compare_or_replace() {
     }
 }
 
+myreadlink() {
+    ls -l -- "$@" | awk '
+       /->/ { print $NF; next } 
+       { exit(1) }  
+    '
+}
+
 compare_or_symlink() {
-    (cmp $1 $2 >/dev/null 2>&1 && echo Skipping $2...) || {
-       echo Updating $2...
-       rm -f $tempdir/junk || exit 1
-       dest=`echo $1 | sed '
+    case $1 in
+    /*) dest=`echo $1 | sed '
            s;^'$install_root';;
            s;/\./;/;g
            s;//*;/;g
@@ -271,6 +276,13 @@ compare_or_symlink() {
            s;[^/]*/;../;g
            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
        mv -f $tempdir/junk $2 || {
            echo $0: Error: your mv command has trouble renaming symlinks. 1>&2

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 1531aca66e7ae382c2e28da6d15fada6aab9e855..ab05f85471c5c0af1ede8ae50e3d5c9c2d3739ba 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20140516"
+#define MAIL_RELEASE_DATE      "20140524"
 #define MAIL_VERSION_NUMBER    "2.12"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/util/dict_db.c b/postfix/src/util/dict_db.c
index 4a09939a55b582d4d8d90ba9793ac39c92d8dab8..ba0a54c8b2d437445dcde093ebffab20cfe1abf8 100644 (file)
--- a/postfix/src/util/dict_db.c
+++ b/postfix/src/util/dict_db.c
@@ -89,7 +89,7 @@
 #define DONT_CLOBBER                   DB_NOOVERWRITE
 #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))
 #else
 #define DICT_DB_CURSOR(db, curs)       (db)->cursor((db), NULL, (curs), 0)