[arch-commits] Commit in postfix/repos/extra-x86_64 (10 files)
Gaëtan Bisson
bisson at archlinux.org
Thu Mar 12 23:30:48 UTC 2020
Date: Thursday, March 12, 2020 @ 23:30:47
Author: bisson
Revision: 377454
archrelease: copy trunk to extra-x86_64
Added:
postfix/repos/extra-x86_64/PKGBUILD
(from rev 377453, postfix/trunk/PKGBUILD)
postfix/repos/extra-x86_64/aliases.patch
(from rev 377453, postfix/trunk/aliases.patch)
postfix/repos/extra-x86_64/glibc2.30.patch
(from rev 377453, postfix/trunk/glibc2.30.patch)
postfix/repos/extra-x86_64/service
(from rev 377453, postfix/trunk/service)
postfix/repos/extra-x86_64/sysusers.d
(from rev 377453, postfix/trunk/sysusers.d)
Deleted:
postfix/repos/extra-x86_64/PKGBUILD
postfix/repos/extra-x86_64/aliases.patch
postfix/repos/extra-x86_64/glibc2.30.patch
postfix/repos/extra-x86_64/service
postfix/repos/extra-x86_64/sysusers.d
-----------------+
PKGBUILD | 230 +++++++++++++++++++++++++++---------------------------
aliases.patch | 36 ++++----
glibc2.30.patch | 102 +++++++++++------------
service | 28 +++---
sysusers.d | 4
5 files changed, 200 insertions(+), 200 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-12 23:30:23 UTC (rev 377453)
+++ PKGBUILD 2020-03-12 23:30:47 UTC (rev 377454)
@@ -1,115 +0,0 @@
-# Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=postfix
-pkgver=3.4.9
-pkgrel=1
-url='http://www.postfix.org/'
-pkgdesc='Fast, easy to administer, secure mail server'
-license=('custom')
-arch=('x86_64')
-depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db' 'libnsl'
- 'mariadb-libs' 'postgresql-libs' 'sqlite' 'tinycdb')
-optdepends=('perl: postfix-collate.pl and qshape')
-source=("http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
- 'glibc2.30.patch'
- 'aliases.patch'
- 'sysusers.d'
- 'service')
-sha256sums=('a4709cfb0626d064b71258b3395573d80e18a48fd11eff0cbf4a9e83455a2da7'
- '8b4730f4629f302471ac1a80653931d32ffcf67241daa10947639a2c701a05f6'
- 'f4c766efc20b4638f9fd72707ca6d4c2628279ebd79f5227276fa4ca6867c336'
- '63f39147887336bdd173fb9425998f0a0c6f00a31241f922a255c157bfd8d02e'
- '52781649c49a50cecd7d20f693f602d7dc78b985ac5f0e72c4abfa0d800e58f0')
-
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-
-conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools')
-provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
-replaces=('postfix-tools')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../glibc2.30.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- CCARGS='
- -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl
- -DHAS_LDAP
- -DUSE_TLS
- -DHAS_MYSQL -I/usr/include/mysql
- -DHAS_PGSQL -I/usr/include/postgresql
- -DHAS_SQLITE
- -DHAS_CDB
- -DDEF_COMMAND_DIR=\"/usr/bin\"
- -DDEF_DAEMON_DIR=\"/usr/lib/postfix/bin\"
- -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\"
- -DDEF_README_DIR=\"/usr/share/doc/postfix\"
- -DDEF_MANPAGE_DIR=\"/usr/share/man\"
- '
- AUXLIBS='
- -lsasl2
- -lldap -llber
- -lssl -lcrypto
- -lmysqlclient -lz -lm
- -lpq
- -lsqlite3 -lpthread
- -lcdb
- '
- make makefiles \
- DEBUG='' \
- pie=yes \
- shared=yes \
- CCARGS="${CCARGS//$'\n'/}" \
- AUXLIBS="${AUXLIBS//$'\n'/}" \
- OPT="${CFLAGS} ${LDFLAGS}" \
-
- make
-}
-
-package() {
- cd "${srcdir}/postfix-${pkgver}"
-
- sed 's:bin/postconf -dhx:bin/postconf -c conf -dhx:g' -i postfix-install
- LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH \
- sh postfix-install -non-interactive install_root="${pkgdir}"
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
- install -Dm644 ../sysusers.d "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-
- for name in posttls-finger {smtp,qmqp}-{sink,source}; do
- install -Dm644 "man/man1/${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
- install -Dm755 "bin/${name}" "${pkgdir}/usr/bin/${name}"
- done
-
- name=qshape
- install -Dm644 "man/man1/${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
- install -Dm755 "auxiliary/${name}/${name}.pl" "${pkgdir}/usr/bin/${name}"
-
- install -Dm755 "auxiliary/collate/collate.pl" "${pkgdir}/usr/bin/postfix-collate.pl"
-
- # now set permissions right to appease the pacman gods
- sed -r \
- -e '/override=1/d' \
- -e '/absolute path name/d' \
- -e 's/\$POSTCONF -/$POSTCONF -c .\/etc\/postfix -/g' \
- -e '/(if \[|chmod|chown|find|mkdir|test)/s/\$path/.\/$path/g' \
- libexec/post-install > ../arch-post-install
- cd "${pkgdir}"
- LD_LIBRARY_PATH=usr/lib/postfix:$LD_LIBRARY_PATH \
- sh "${srcdir}/arch-post-install" \
- command_directory=usr/bin \
- config_directory=etc/postfix \
- meta_directory=etc/postfix \
- setgid_group=75 \
- mail_owner=73 \
- set-permissions
-
- patch --no-backup-if-mismatch -p0 -i "${srcdir}"/aliases.patch
- sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
-}
Copied: postfix/repos/extra-x86_64/PKGBUILD (from rev 377453, postfix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-12 23:30:47 UTC (rev 377454)
@@ -0,0 +1,115 @@
+# Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=postfix
+pkgver=3.4.10
+pkgrel=1
+url='http://www.postfix.org/'
+pkgdesc='Fast, easy to administer, secure mail server'
+license=('custom')
+arch=('x86_64')
+depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db' 'libnsl'
+ 'mariadb-libs' 'postgresql-libs' 'sqlite' 'tinycdb')
+optdepends=('perl: postfix-collate.pl and qshape')
+source=("http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
+ 'glibc2.30.patch'
+ 'aliases.patch'
+ 'sysusers.d'
+ 'service')
+sha256sums=('908a66fc38537a0047e8561e1bc0ef096c53357ffad16d2d728cd4fc8ae56654'
+ '8b4730f4629f302471ac1a80653931d32ffcf67241daa10947639a2c701a05f6'
+ 'f4c766efc20b4638f9fd72707ca6d4c2628279ebd79f5227276fa4ca6867c336'
+ '63f39147887336bdd173fb9425998f0a0c6f00a31241f922a255c157bfd8d02e'
+ '52781649c49a50cecd7d20f693f602d7dc78b985ac5f0e72c4abfa0d800e58f0')
+
+backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
+
+conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools')
+provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
+replaces=('postfix-tools')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../glibc2.30.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ CCARGS='
+ -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl
+ -DHAS_LDAP
+ -DUSE_TLS
+ -DHAS_MYSQL -I/usr/include/mysql
+ -DHAS_PGSQL -I/usr/include/postgresql
+ -DHAS_SQLITE
+ -DHAS_CDB
+ -DDEF_COMMAND_DIR=\"/usr/bin\"
+ -DDEF_DAEMON_DIR=\"/usr/lib/postfix/bin\"
+ -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\"
+ -DDEF_README_DIR=\"/usr/share/doc/postfix\"
+ -DDEF_MANPAGE_DIR=\"/usr/share/man\"
+ '
+ AUXLIBS='
+ -lsasl2
+ -lldap -llber
+ -lssl -lcrypto
+ -lmysqlclient -lz -lm
+ -lpq
+ -lsqlite3 -lpthread
+ -lcdb
+ '
+ make makefiles \
+ DEBUG='' \
+ pie=yes \
+ shared=yes \
+ CCARGS="${CCARGS//$'\n'/}" \
+ AUXLIBS="${AUXLIBS//$'\n'/}" \
+ OPT="${CFLAGS} ${LDFLAGS}" \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/postfix-${pkgver}"
+
+ sed 's:bin/postconf -dhx:bin/postconf -c conf -dhx:g' -i postfix-install
+ LD_LIBRARY_PATH=lib:$LD_LIBRARY_PATH \
+ sh postfix-install -non-interactive install_root="${pkgdir}"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+ install -Dm644 ../sysusers.d "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+
+ for name in posttls-finger {smtp,qmqp}-{sink,source}; do
+ install -Dm644 "man/man1/${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
+ install -Dm755 "bin/${name}" "${pkgdir}/usr/bin/${name}"
+ done
+
+ name=qshape
+ install -Dm644 "man/man1/${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
+ install -Dm755 "auxiliary/${name}/${name}.pl" "${pkgdir}/usr/bin/${name}"
+
+ install -Dm755 "auxiliary/collate/collate.pl" "${pkgdir}/usr/bin/postfix-collate.pl"
+
+ # now set permissions right to appease the pacman gods
+ sed -r \
+ -e '/override=1/d' \
+ -e '/absolute path name/d' \
+ -e 's/\$POSTCONF -/$POSTCONF -c .\/etc\/postfix -/g' \
+ -e '/(if \[|chmod|chown|find|mkdir|test)/s/\$path/.\/$path/g' \
+ libexec/post-install > ../arch-post-install
+ cd "${pkgdir}"
+ LD_LIBRARY_PATH=usr/lib/postfix:$LD_LIBRARY_PATH \
+ sh "${srcdir}/arch-post-install" \
+ command_directory=usr/bin \
+ config_directory=etc/postfix \
+ meta_directory=etc/postfix \
+ setgid_group=75 \
+ mail_owner=73 \
+ set-permissions
+
+ patch --no-backup-if-mismatch -p0 -i "${srcdir}"/aliases.patch
+ sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "etc/postfix/postfix-files"
+}
Deleted: aliases.patch
===================================================================
--- aliases.patch 2020-03-12 23:30:23 UTC (rev 377453)
+++ aliases.patch 2020-03-12 23:30:47 UTC (rev 377454)
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,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
-@@ -392,6 +393,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)
- #
Copied: postfix/repos/extra-x86_64/aliases.patch (from rev 377453, postfix/trunk/aliases.patch)
===================================================================
--- aliases.patch (rev 0)
+++ aliases.patch 2020-03-12 23:30:47 UTC (rev 377454)
@@ -0,0 +1,18 @@
+--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100
++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100
+@@ -382,6 +382,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
+@@ -392,6 +393,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)
+ #
Deleted: glibc2.30.patch
===================================================================
--- glibc2.30.patch 2020-03-12 23:30:23 UTC (rev 377453)
+++ glibc2.30.patch 2020-03-12 23:30:47 UTC (rev 377454)
@@ -1,51 +0,0 @@
-Description: fix build with glibc 2.30
- glibc 2.30 release notes at
- https://savannah.gnu.org/forum/forum.php?forum_id=9515 states:
- """
- Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6
- resolver flag (deprecated in glibc 2.25) have been removed.
- ...
- The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub
- resolver have been removed from <resolv.h>.
- """
- And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are
- being guarded with the same fix.
-Origin: upstream, https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa
-Bug: http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923
-Last-Update: 2019-09-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/postfix/src/dns/dns_str_resflags.c b/postfix/src/dns/dns_str_resflags.c
-index 5f2cce5e..472394c3 100644
---- a/src/dns/dns_str_resflags.c
-+++ b/src/dns/dns_str_resflags.c
-@@ -52,18 +52,28 @@
- static const LONG_NAME_MASK resflag_table[] = {
- "RES_INIT", RES_INIT,
- "RES_DEBUG", RES_DEBUG,
-+#ifdef RES_AAONLY
- "RES_AAONLY", RES_AAONLY,
-+#endif
- "RES_USEVC", RES_USEVC,
-+#ifdef RES_PRIMARY
- "RES_PRIMARY", RES_PRIMARY,
-+#endif
- "RES_IGNTC", RES_IGNTC,
- "RES_RECURSE", RES_RECURSE,
- "RES_DEFNAMES", RES_DEFNAMES,
- "RES_STAYOPEN", RES_STAYOPEN,
- "RES_DNSRCH", RES_DNSRCH,
-+#ifdef RES_INSECURE1
- "RES_INSECURE1", RES_INSECURE1,
-+#endif
-+#ifdef RES_INSECURE2
- "RES_INSECURE2", RES_INSECURE2,
-+#endif
- "RES_NOALIASES", RES_NOALIASES,
-+#ifdef RES_USE_INET6
- "RES_USE_INET6", RES_USE_INET6,
-+#endif
- #ifdef RES_ROTATE
- "RES_ROTATE", RES_ROTATE,
- #endif
Copied: postfix/repos/extra-x86_64/glibc2.30.patch (from rev 377453, postfix/trunk/glibc2.30.patch)
===================================================================
--- glibc2.30.patch (rev 0)
+++ glibc2.30.patch 2020-03-12 23:30:47 UTC (rev 377454)
@@ -0,0 +1,51 @@
+Description: fix build with glibc 2.30
+ glibc 2.30 release notes at
+ https://savannah.gnu.org/forum/forum.php?forum_id=9515 states:
+ """
+ Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6
+ resolver flag (deprecated in glibc 2.25) have been removed.
+ ...
+ The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub
+ resolver have been removed from <resolv.h>.
+ """
+ And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are
+ being guarded with the same fix.
+Origin: upstream, https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa
+Bug: http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923
+Last-Update: 2019-09-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/postfix/src/dns/dns_str_resflags.c b/postfix/src/dns/dns_str_resflags.c
+index 5f2cce5e..472394c3 100644
+--- a/src/dns/dns_str_resflags.c
++++ b/src/dns/dns_str_resflags.c
+@@ -52,18 +52,28 @@
+ static const LONG_NAME_MASK resflag_table[] = {
+ "RES_INIT", RES_INIT,
+ "RES_DEBUG", RES_DEBUG,
++#ifdef RES_AAONLY
+ "RES_AAONLY", RES_AAONLY,
++#endif
+ "RES_USEVC", RES_USEVC,
++#ifdef RES_PRIMARY
+ "RES_PRIMARY", RES_PRIMARY,
++#endif
+ "RES_IGNTC", RES_IGNTC,
+ "RES_RECURSE", RES_RECURSE,
+ "RES_DEFNAMES", RES_DEFNAMES,
+ "RES_STAYOPEN", RES_STAYOPEN,
+ "RES_DNSRCH", RES_DNSRCH,
++#ifdef RES_INSECURE1
+ "RES_INSECURE1", RES_INSECURE1,
++#endif
++#ifdef RES_INSECURE2
+ "RES_INSECURE2", RES_INSECURE2,
++#endif
+ "RES_NOALIASES", RES_NOALIASES,
++#ifdef RES_USE_INET6
+ "RES_USE_INET6", RES_USE_INET6,
++#endif
+ #ifdef RES_ROTATE
+ "RES_ROTATE", RES_ROTATE,
+ #endif
Deleted: service
===================================================================
--- service 2020-03-12 23:30:23 UTC (rev 377453)
+++ service 2020-03-12 23:30:47 UTC (rev 377454)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Postfix Mail Transport Agent
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/spool/postfix/pid/master.pid
-ExecStart=/usr/bin/postfix start
-ExecStop=/usr/bin/postfix stop
-ExecReload=/usr/bin/postfix reload
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: postfix/repos/extra-x86_64/service (from rev 377453, postfix/trunk/service)
===================================================================
--- service (rev 0)
+++ service 2020-03-12 23:30:47 UTC (rev 377454)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Postfix Mail Transport Agent
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/spool/postfix/pid/master.pid
+ExecStart=/usr/bin/postfix start
+ExecStop=/usr/bin/postfix stop
+ExecReload=/usr/bin/postfix reload
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: sysusers.d
===================================================================
--- sysusers.d 2020-03-12 23:30:23 UTC (rev 377453)
+++ sysusers.d 2020-03-12 23:30:47 UTC (rev 377454)
@@ -1,2 +0,0 @@
-g postdrop 75 -
-u postfix 73 - /var/spool/postfix
Copied: postfix/repos/extra-x86_64/sysusers.d (from rev 377453, postfix/trunk/sysusers.d)
===================================================================
--- sysusers.d (rev 0)
+++ sysusers.d 2020-03-12 23:30:47 UTC (rev 377454)
@@ -0,0 +1,2 @@
+g postdrop 75 -
+u postfix 73 - /var/spool/postfix
More information about the arch-commits
mailing list