postfix: updated to version 3.7.0, enabled dynamicmaps and shared library support

6 files changed, 42 insertions, 80 deletions

diff --git a/postfix/.footprint b/postfix/.footprint
index c3d59786b..f408f2f6a 100644
--- a/postfix/.footprint
+++ b/postfix/.footprint
@@ -1,5 +1,7 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/postfix/
+-rw-r--r--	root/root	etc/postfix/LICENSE
+-rw-r--r--	root/root	etc/postfix/TLS_LICENSE
 -rw-r--r--	root/root	etc/postfix/access
 -rw-r--r--	root/root	etc/postfix/access.db (EMPTY)
 -rw-r--r--	root/root	etc/postfix/aliases
@@ -8,6 +10,8 @@ drwxr-xr-x	root/root	etc/postfix/
 -rw-r--r--	root/root	etc/postfix/bounce.cf.default
 -rw-r--r--	root/root	etc/postfix/canonical
 -rw-r--r--	root/root	etc/postfix/canonical.db (EMPTY)
+-rw-r--r--	root/root	etc/postfix/dynamicmaps.cf
+drwxr-xr-x	root/root	etc/postfix/dynamicmaps.cf.d/
 -rw-r--r--	root/root	etc/postfix/generic
 -rw-r--r--	root/root	etc/postfix/header_checks
 -rw-r--r--	root/root	etc/postfix/main.cf
@@ -41,6 +45,11 @@ drwxr-xr-x	root/root	usr/lib/postfix/
 -rwxr-xr-x	root/root	usr/lib/postfix/dnsblog
 -rwxr-xr-x	root/root	usr/lib/postfix/error
 -rwxr-xr-x	root/root	usr/lib/postfix/flush
+-rwxr-xr-x	root/root	usr/lib/postfix/libpostfix-dns.so
+-rwxr-xr-x	root/root	usr/lib/postfix/libpostfix-global.so
+-rwxr-xr-x	root/root	usr/lib/postfix/libpostfix-master.so
+-rwxr-xr-x	root/root	usr/lib/postfix/libpostfix-tls.so
+-rwxr-xr-x	root/root	usr/lib/postfix/libpostfix-util.so
 -rwxr-xr-x	root/root	usr/lib/postfix/lmtp
 -rwxr-xr-x	root/root	usr/lib/postfix/local
 -rwxr-xr-x	root/root	usr/lib/postfix/master
@@ -49,6 +58,7 @@ drwxr-xr-x	root/root	usr/lib/postfix/
 -rwxr-xr-x	root/root	usr/lib/postfix/pickup
 -rwxr-xr-x	root/root	usr/lib/postfix/pipe
 -rwxr-xr-x	root/root	usr/lib/postfix/post-install
+-rwxr-xr-x	root/root	usr/lib/postfix/postfix-pcre.so
 -rwxr-xr-x	root/root	usr/lib/postfix/postfix-script
 -rwxr-xr-x	root/root	usr/lib/postfix/postfix-tls-script
 -rwxr-xr-x	root/root	usr/lib/postfix/postfix-wrapper
diff --git a/postfix/.signature b/postfix/.signature
index 28a664d3d..8e35df1a7 100644
--- a/postfix/.signature
+++ b/postfix/.signature
@@ -1,8 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/WY9TEF6ksK69qGRXcmlzsifnvq+75f+tATn2z1/EkraS+02rgAYFkvLCplw8XuD4MgBlLRChZOt1NsQ0V/BpgA=
-SHA256 (Pkgfile) = 9e2f2255f392bba7c8b76785dc0bed3afaefd6e17e5da551041372d2ac71dac8
-SHA256 (.footprint) = b1662bbb10f743e2602ba9c5cfcd4d7c5ea117e559601b13b7fb28940f76fa63
-SHA256 (postfix-3.6.4.tar.gz) = 8de0619dcf2fa7c215a80cf84b82ab71631d4d4722cba0949725ce3e18031d4e
+RWSE3ohX2g5d/ejJfD1sSpGmiSZ5BTSR+qmgGkIVRL8WcPg2ftvPH6Mrgl8T2/cvhJgvMiJwQeTBUpcZPEsgoqL+Cv2HJOdu1gA=
+SHA256 (Pkgfile) = aeae00d569bf75e1295e6af208c7fbd42107251a605320a6923ca0a5c3634019
+SHA256 (.footprint) = 0c117e4d6ca42a13ef6f2c030aff896a140958e8b6e96fe1ae7c682f70e588aa
+SHA256 (postfix-3.7.0.tar.gz) = 645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c
 SHA256 (aliases) = b6de629cce43ed5dc06086c5742ebe85ccc7b59d085f0fec71d97e0e73a50271
 SHA256 (postfix.rc) = 78059f334abcf0f1662107f5b9542fba26f489d2cb0ca05cdc61a816f4e96dc7
-SHA256 (postfix.patch) = 5329a979c7c91f71aad27eec54ed0747bb51ed687e5180851296e45166d1bca6
diff --git a/postfix/Pkgfile b/postfix/Pkgfile
index 81a655369..b50693683 100644
--- a/postfix/Pkgfile
+++ b/postfix/Pkgfile
@@ -4,59 +4,43 @@
 # Depends on: cyrus-sasl
 
 name=postfix
-version=3.6.4
+version=3.7.0
 release=1
-source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$name-$version.tar.gz \
-        aliases postfix.rc postfix.patch)
+source=(http://ftp.porcupine.org/mirrors/postfix-release/official/${name}-${version}.tar.gz
+    aliases postfix.rc)
 
 build() {
     cd $name-$version
 
-    patch -p1 -i $SRC/postfix.patch
-
-    # enable building on recent kernels
-    #sed -i 's:\(Linux\.\[34\):\15:1' makedefs
-    #sed -i 's:\(|| defined(LINUX4)\):\1 || defined(LINUX5):g' src/util/sys_defs.h
-
     make tidy
     make makefiles \
         DEBUG="" \
         OPT="${CFLAGS}" \
-        CCARGS="-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -DUSE_TLS -I/usr/include/openssl" \
-        AUXLIBS="-L/usr/lib -lsasl2 -lssl -lcrypto"
+        pie=yes \
+        shared=yes \
+        dynamicmaps=yes \
+        CCARGS="-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -I/usr/include/sasl" \
+        AUXLIBS="-lsasl2 -lssl -lcrypto"
     make
 
     make non-interactive-package install_root=${PKG} \
-        mail_owner=mail \
-        setgid_group=postdrop \
         config_directory=/etc/postfix \
-        manpage_directory=/usr/share/man \
         daemon_directory=/usr/lib/postfix \
-        data_directory=/var/lib/postfix \
-        command_directory=/usr/sbin \
-        queue_directory=/var/spool/postfix \
-        sendmail_path=/usr/sbin/sendmail \
-        newaliases_path=/usr/bin/newaliases \
-        mailq_path=/usr/bin/mailq
-
-    #
-    # Set proper permissions
-    #
-    chown mail ${PKG}/var/spool/postfix/*
-    chgrp postdrop ${PKG}/var/spool/postfix/{maildrop,public}
-
-    chgrp postdrop ${PKG}/usr/sbin/post{drop,queue}
-    chmod g+s ${PKG}/usr/sbin/post{drop,queue}
-
-    chown mail ${PKG}/var/lib/postfix
+	mail_owner=mail \
+        manpage_directory=/usr/share/man \
+        shlib_directory=/usr/lib/postfix
 
-    rm -f $PKG/etc/postfix/*LICENSE
+    chown mail ${PKG}/var/spool/postfix/* \
+        ${PKG}/var/lib/postfix
+    chgrp postdrop ${PKG}/var/spool/postfix/{maildrop,public} \
+        ${PKG}/usr/sbin/post{drop,queue}
+    chmod g+s ${PKG}/usr/sbin/post{drop,queue}
 
-    install -D -m 00644 ../aliases    $PKG/etc/postfix/aliases
-    install -D -m 00755 ../postfix.rc $PKG/etc/rc.d/postfix
+    install -D -m 0644 ${SRC}/aliases ${PKG}/etc/postfix/aliases
+    install -D -m 0755 ${SRC}/postfix.rc ${PKG}/etc/rc.d/postfix
 
-    touch $PKG/etc/postfix/{aliases,access,canonical,relocated,transport,virtual}.db
-    touch $PKG/etc/postfix/{relay_domains,body_checks,mime_header_checks}
+    touch ${PKG}/etc/postfix/{aliases,access,canonical,relocated,transport,virtual}.db
+    touch ${PKG}/etc/postfix/{relay_domains,body_checks,mime_header_checks}
 }
 
 # vim: set ts=4 et:
diff --git a/postfix/README b/postfix/README
new file mode 100644
index 000000000..2cbe42f90
--- /dev/null
+++ b/postfix/README
@@ -0,0 +1,5 @@
+# postfix README
+
+NOTE: Currently postfix does not build with fakeroot; if you see a message
+which says "ATTENTION: Not supported: building with LD_LIBRARY_PATH" this
+is the cause.
diff --git a/postfix/post-install b/postfix/post-install
index c2cc97c85..0a9554b63 100755
--- a/postfix/post-install
+++ b/postfix/post-install
@@ -1,26 +1,9 @@
 #!/bin/sh
 
-cd /usr/lib/postfix
-
-/bin/sh post-install \
-  daemon_directory=/usr/lib/postfix \
-  manpage_directory=/usr/share/man \
-  command_directory=/usr/sbin \
-  config_directory=/etc/postfix \
-  setgid_group=postdrop \
-  mail_owner=mail \
-  upgrade-package
-
-/bin/sh post-install \
-  daemon_directory=/usr/lib/postfix \
-  command_directory=/usr/sbin \
-  config_directory=/etc/postfix \
-  setgid_group=postdrop \
-  mail_owner=mail \
-  create-missing
-
 /usr/sbin/postalias /etc/postfix/aliases
 
 for hashfile in virtual relocated access transport; do
-  /usr/sbin/postmap hash:/etc/postfix/"$hashfile"
+    /usr/sbin/postmap hash:/etc/postfix/"$hashfile"
 done
+
+# set ts=4 et:
diff --git a/postfix/postfix.patch b/postfix/postfix.patch
deleted file mode 100644
index a1639839e..000000000
--- a/postfix/postfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nru postfix-2.4.5/conf/main.cf postfix-2.4.5-new/conf/main.cf
---- postfix-2.4.5/conf/main.cf	2006-03-25 03:38:54.000000000 +0100
-+++ postfix-2.4.5-new/conf/main.cf	2007-08-11 14:51:26.000000000 +0200
-@@ -376,6 +376,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -386,6 +387,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #