Date: Thursday, November 12, 2020 @ 09:31:02 Author: dvzrv Revision: 400447
archrelease: copy trunk to testing-x86_64 Added: postfix/repos/testing-x86_64/PKGBUILD (from rev 400446, postfix/trunk/PKGBUILD) postfix/repos/testing-x86_64/postfix-3.5.8-main_defaults.patch (from rev 400446, postfix/trunk/postfix-3.5.8-main_defaults.patch) postfix/repos/testing-x86_64/postfix.service (from rev 400446, postfix/trunk/postfix.service) postfix/repos/testing-x86_64/postfix.sysusers (from rev 400446, postfix/trunk/postfix.sysusers) postfix/repos/testing-x86_64/postfix.tmpfiles (from rev 400446, postfix/trunk/postfix.tmpfiles) Deleted: postfix/repos/testing-x86_64/PKGBUILD postfix/repos/testing-x86_64/postfix-3.5.8-main_defaults.patch postfix/repos/testing-x86_64/postfix.service postfix/repos/testing-x86_64/postfix.sysusers postfix/repos/testing-x86_64/postfix.tmpfiles -----------------------------------+ PKGBUILD | 220 ++++++++++++++++++------------------ postfix-3.5.8-main_defaults.patch | 38 +++--- postfix.service | 36 ++--- postfix.sysusers | 4 postfix.tmpfiles | 30 ++-- 5 files changed, 165 insertions(+), 163 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-12 09:30:53 UTC (rev 400446) +++ PKGBUILD 2020-11-12 09:31:02 UTC (rev 400447) @@ -1,109 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Contributor: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> -# Contributor: Paul Mattal <p...@archlinux.org> - -pkgname=postfix -pkgver=3.5.8 -pkgrel=1 -url="http://www.postfix.org/" -pkgdesc='Fast, easy to administer, secure mail server' -license=('EPL') -arch=('x86_64') -depends=('db' 'glibc' 'libldap' 'libnsl' 'libsasl' 'openssl' 'pcre' -'postgresql-libs' 'sqlite' 'tinycdb' 'zlib') -makedepends=('icu' 'mariadb-libs') -optdepends=('perl: for postfix-collate.pl and qshape') -conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools') -provides=('smtp-server' 'smtp-forwarder' 'postfix-tools') -replaces=('postfix-tools') -backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-3.5.8-main_defaults.patch" - "${pkgname}.service" - "${pkgname}.sysusers" - "${pkgname}.tmpfiles" -) -sha512sums=('0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b' - '7b2785aa8120ca3ff91b405baf675e9e11f8d58b18a9b842672e7ae30932febddac10556a70823d8746fcb160bceb4dbabdee45cf46b02fc0127057656fb85c4' - '27f54747ad480d65b560c9dbc97e12c6353e4bceca0ffe3e358e31de56db0ad79928164c9f8790c73a9f791daa378253d2ee29b5a766661778553ec889b2cf97' - 'a7f15970f613ae7b98ce1b84ca0a6034ce3cc7b2b9ce7160dad9731f740fb762f4a54f44acceb5f06f8744fa9e952b088086af8a69da388a600b742a3cda37f2' - '490ce5123005de7a82c18b68d2423ea15b9878af9419d3a29c4a174e7f5ddc21da7afde725d25ad2fc445815ee9d284b61781a62dd67b863b82f746d61db885d') -b2sums=('13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc' - 'b5f19e0619f1fb017cd889c14e341c21146b3afe7b9eefcdb7fb1eb83a357434b899d1e92f3ab0023c78ef8f2de6ae54c4599ee0f0bd04d257f4ca0a4dc9a16c' - '02dd441cf6e4a7c2bc0de876f020b0784d811f77a5c6102dd075d67b07158dbc53c8b4d62bc8035283d4f349008574b1c3fac03f4519d56ffd809cb5bcfb7bea' - 'db58b7deb24cea16fb84f56680f0000683f72e11a95039969878e3819607aad5e65af9d9f50007e7710609065c0e3ebb9b30c1d929162b74eca5e74434d82cf1' - 'e870b3fc67b60a492728e418a7c2753952c279418108e55d2ff01197e9150e6144dc6a210d1f5b8a3d4d661ab3d289c6026c36034deb90d67406e739a70a3b54') - -prepare() { - cd "${pkgname}-${pkgver}" - # add distribution defaults to main.cf (alias_maps and alias_database) - patch -Np1 -i ../"${pkgname}-3.5.8-main_defaults.patch" -} - -build() { - local _ccargs=( - '-fPIC' '-fcommon' - '-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\"' - ) - - cd "${pkgname}-${pkgver}" - # NOTE: descriptions of variables in makedefs - make makefiles \ - DEBUG='' \ - pie=yes \ - shared=yes \ - dynamicmaps=yes \ - CCARGS="${_ccargs[*]}" \ - AUXLIBS="$(pkgconf --libs openssl libsasl2) -lnsl" \ - AUXLIBS_LDAP='-lldap -llber' \ - AUXLIBS_LMDB="$(pkgconf --libs lmdb)" \ - AUXLIBS_PCRE="$(pkgconf --libs pcre)" \ - AUXLIBS_MYSQL="$(pkgconf --libs mariadb)" \ - AUXLIBS_PGSQL="$(pkgconf --libs libpq)" \ - AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)" \ - AUXLIBS_CDB='-lcdb' \ - SHLIB_RPATH="-Wl,-rpath,/usr/lib/postfix ${LDFLAGS}" \ - OPT="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" - - make -} - -package() { - local _name - depends+=('libicuuc.so' 'libmariadb.so') - - cd "${pkgname}-${pkgver}" - LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" \ - sh postfix-install -non-interactive install_root="${pkgdir}" - - # additional man pages and scripts - for _name in posttls-finger {smtp,qmqp}-{sink,source}; do - install -vDm 644 "man/man1/${_name}.1" -t "${pkgdir}/usr/share/man/man1/" - install -vDm 755 "bin/${_name}" -t "${pkgdir}/usr/bin/" - done - install -Dm 644 "man/man1/qshape.1" -t "${pkgdir}/usr/share/man/man1/" - install -Dm 755 "auxiliary/qshape/qshape.pl" "${pkgdir}/usr/bin/qshape" - install -Dm 755 "auxiliary/collate/collate.pl" "${pkgdir}/usr/bin/postfix-collate.pl" - # license - install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/" - # systemd service - install -vDm 644 "../${pkgname}.service" -t "${pkgdir}/usr/lib/systemd/system/" - # sysusers.d - install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" - # tmpfiles.d - # NOTE: follow setup in conf/postfix-files - install -vDm 644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" -} Copied: postfix/repos/testing-x86_64/PKGBUILD (from rev 400446, postfix/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-12 09:31:02 UTC (rev 400447) @@ -0,0 +1,111 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Jeff Brodnax <tullyarc...@bellsouth.net> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=postfix +pkgver=3.5.8 +pkgrel=2 +url="http://www.postfix.org/" +pkgdesc='Fast, easy to administer, secure mail server' +license=('EPL') +arch=('x86_64') +depends=('db' 'glibc' 'libldap' 'libnsl' 'libsasl' 'openssl' 'pcre' +'postgresql-libs' 'sqlite' 'tinycdb' 'zlib') +makedepends=('icu' 'mariadb-libs') +optdepends=('perl: for postfix-collate.pl and qshape') +conflicts=('smtp-server' 'smtp-forwarder' 'postfix-tools') +provides=('smtp-server' 'smtp-forwarder' 'postfix-tools') +replaces=('postfix-tools') +backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) +source=("http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" + "${pkgname}-3.5.8-main_defaults.patch" + "${pkgname}.service" + "${pkgname}.sysusers" + "${pkgname}.tmpfiles" +) +sha512sums=('0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b' + '7b2785aa8120ca3ff91b405baf675e9e11f8d58b18a9b842672e7ae30932febddac10556a70823d8746fcb160bceb4dbabdee45cf46b02fc0127057656fb85c4' + '27f54747ad480d65b560c9dbc97e12c6353e4bceca0ffe3e358e31de56db0ad79928164c9f8790c73a9f791daa378253d2ee29b5a766661778553ec889b2cf97' + 'a7f15970f613ae7b98ce1b84ca0a6034ce3cc7b2b9ce7160dad9731f740fb762f4a54f44acceb5f06f8744fa9e952b088086af8a69da388a600b742a3cda37f2' + '490ce5123005de7a82c18b68d2423ea15b9878af9419d3a29c4a174e7f5ddc21da7afde725d25ad2fc445815ee9d284b61781a62dd67b863b82f746d61db885d') +b2sums=('13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc' + 'b5f19e0619f1fb017cd889c14e341c21146b3afe7b9eefcdb7fb1eb83a357434b899d1e92f3ab0023c78ef8f2de6ae54c4599ee0f0bd04d257f4ca0a4dc9a16c' + '02dd441cf6e4a7c2bc0de876f020b0784d811f77a5c6102dd075d67b07158dbc53c8b4d62bc8035283d4f349008574b1c3fac03f4519d56ffd809cb5bcfb7bea' + 'db58b7deb24cea16fb84f56680f0000683f72e11a95039969878e3819607aad5e65af9d9f50007e7710609065c0e3ebb9b30c1d929162b74eca5e74434d82cf1' + 'e870b3fc67b60a492728e418a7c2753952c279418108e55d2ff01197e9150e6144dc6a210d1f5b8a3d4d661ab3d289c6026c36034deb90d67406e739a70a3b54') + +prepare() { + cd "${pkgname}-${pkgver}" + # add distribution defaults to main.cf (alias_maps and alias_database) + patch -Np1 -i ../"${pkgname}-3.5.8-main_defaults.patch" +} + +build() { + local _ccargs=( + '-fPIC' '-fcommon' + '-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\"' + ) + + cd "${pkgname}-${pkgver}" + # NOTE: descriptions of variables in makedefs + make makefiles \ + DEBUG='' \ + pie=yes \ + shared=yes \ + dynamicmaps=yes \ + CCARGS="${_ccargs[*]}" \ + AUXLIBS="$(pkgconf --libs openssl libsasl2) -lnsl" \ + AUXLIBS_LDAP='-lldap -llber' \ + AUXLIBS_LMDB="$(pkgconf --libs lmdb)" \ + AUXLIBS_PCRE="$(pkgconf --libs pcre)" \ + AUXLIBS_MYSQL="$(pkgconf --libs mariadb)" \ + AUXLIBS_PGSQL="$(pkgconf --libs libpq)" \ + AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)" \ + AUXLIBS_CDB='-lcdb' \ + SHLIB_RPATH="-Wl,-rpath,/usr/lib/postfix ${LDFLAGS}" \ + OPT="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" + + make +} + +package() { + local _name + depends+=('libicuuc.so' 'libmariadb.so') + + cd "${pkgname}-${pkgver}" + LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" \ + sh postfix-install -non-interactive install_root="${pkgdir}" + + # additional man pages and scripts + for _name in posttls-finger {smtp,qmqp}-{sink,source}; do + install -vDm 644 "man/man1/${_name}.1" -t "${pkgdir}/usr/share/man/man1/" + install -vDm 755 "bin/${_name}" -t "${pkgdir}/usr/bin/" + done + install -Dm 644 "man/man1/qshape.1" -t "${pkgdir}/usr/share/man/man1/" + install -Dm 755 "auxiliary/qshape/qshape.pl" "${pkgdir}/usr/bin/qshape" + install -Dm 755 "auxiliary/collate/collate.pl" "${pkgdir}/usr/bin/postfix-collate.pl" + # license + install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/" + # systemd service + install -vDm 644 "../${pkgname}.service" -t "${pkgdir}/usr/lib/systemd/system/" + # sysusers.d + install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + # tmpfiles.d + # NOTE: follow setup in conf/postfix-files + install -vDm 644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + # remove non-reproducible file, that only lists what the build circumstances were + rm -v "${pkgdir}/etc/${pkgname}/makedefs.out" +} Deleted: postfix-3.5.8-main_defaults.patch =================================================================== --- postfix-3.5.8-main_defaults.patch 2020-11-12 09:30:53 UTC (rev 400446) +++ postfix-3.5.8-main_defaults.patch 2020-11-12 09:31:02 UTC (rev 400447) @@ -1,19 +0,0 @@ -diff -ruN a/conf/main.cf b/conf/main.cf ---- a/conf/main.cf 2019-06-16 02:33:53.000000000 +0200 -+++ b/conf/main.cf 2020-11-09 18:22:06.436205639 +0100 -@@ -401,6 +401,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 -@@ -411,6 +412,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/testing-x86_64/postfix-3.5.8-main_defaults.patch (from rev 400446, postfix/trunk/postfix-3.5.8-main_defaults.patch) =================================================================== --- postfix-3.5.8-main_defaults.patch (rev 0) +++ postfix-3.5.8-main_defaults.patch 2020-11-12 09:31:02 UTC (rev 400447) @@ -0,0 +1,19 @@ +diff -ruN a/conf/main.cf b/conf/main.cf +--- a/conf/main.cf 2019-06-16 02:33:53.000000000 +0200 ++++ b/conf/main.cf 2020-11-09 18:22:06.436205639 +0100 +@@ -401,6 +401,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 +@@ -411,6 +412,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: postfix.service =================================================================== --- postfix.service 2020-11-12 09:30:53 UTC (rev 400446) +++ postfix.service 2020-11-12 09:31:02 UTC (rev 400447) @@ -1,18 +0,0 @@ -[Unit] -Description=Postfix Mail Transport Agent -After=network.target - -[Service] -CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE -ExecReload=/usr/bin/postfix reload -ExecStart=/usr/bin/postfix start -ExecStop=/usr/bin/postfix stop -PIDFile=/var/spool/postfix/pid/master.pid -PrivateDevices=true -PrivateTmp=true -ProtectSystem=true -Restart=always -Type=forking - -[Install] -WantedBy=multi-user.target Copied: postfix/repos/testing-x86_64/postfix.service (from rev 400446, postfix/trunk/postfix.service) =================================================================== --- postfix.service (rev 0) +++ postfix.service 2020-11-12 09:31:02 UTC (rev 400447) @@ -0,0 +1,18 @@ +[Unit] +Description=Postfix Mail Transport Agent +After=network.target + +[Service] +CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE +ExecReload=/usr/bin/postfix reload +ExecStart=/usr/bin/postfix start +ExecStop=/usr/bin/postfix stop +PIDFile=/var/spool/postfix/pid/master.pid +PrivateDevices=true +PrivateTmp=true +ProtectSystem=true +Restart=always +Type=forking + +[Install] +WantedBy=multi-user.target Deleted: postfix.sysusers =================================================================== --- postfix.sysusers 2020-11-12 09:30:53 UTC (rev 400446) +++ postfix.sysusers 2020-11-12 09:31:02 UTC (rev 400447) @@ -1,2 +0,0 @@ -g postdrop 75 - -u postfix 73 - /var/spool/postfix Copied: postfix/repos/testing-x86_64/postfix.sysusers (from rev 400446, postfix/trunk/postfix.sysusers) =================================================================== --- postfix.sysusers (rev 0) +++ postfix.sysusers 2020-11-12 09:31:02 UTC (rev 400447) @@ -0,0 +1,2 @@ +g postdrop 75 - +u postfix 73 - /var/spool/postfix Deleted: postfix.tmpfiles =================================================================== --- postfix.tmpfiles 2020-11-12 09:30:53 UTC (rev 400446) +++ postfix.tmpfiles 2020-11-12 09:31:02 UTC (rev 400447) @@ -1,15 +0,0 @@ -z /usr/bin/postdrop 2755 root postdrop -z /usr/bin/postqueue 2755 root postdrop -z /var/lib/postfix 700 postfix root -z /var/spool/postfix/active 700 postfix root -z /var/spool/postfix/bounce 700 postfix root -z /var/spool/postfix/corrupt 700 postfix root -z /var/spool/postfix/defer 700 postfix root -z /var/spool/postfix/deferred 700 postfix root -z /var/spool/postfix/flush 700 postfix root -z /var/spool/postfix/incoming 700 postfix root -z /var/spool/postfix/maildrop 730 postfix postdrop -z /var/spool/postfix/private 700 postfix root -z /var/spool/postfix/public 710 postfix postdrop -z /var/spool/postfix/saved 700 postfix root -z /var/spool/postfix/trace 700 postfix root Copied: postfix/repos/testing-x86_64/postfix.tmpfiles (from rev 400446, postfix/trunk/postfix.tmpfiles) =================================================================== --- postfix.tmpfiles (rev 0) +++ postfix.tmpfiles 2020-11-12 09:31:02 UTC (rev 400447) @@ -0,0 +1,15 @@ +z /usr/bin/postdrop 2755 root postdrop +z /usr/bin/postqueue 2755 root postdrop +z /var/lib/postfix 700 postfix root +z /var/spool/postfix/active 700 postfix root +z /var/spool/postfix/bounce 700 postfix root +z /var/spool/postfix/corrupt 700 postfix root +z /var/spool/postfix/defer 700 postfix root +z /var/spool/postfix/deferred 700 postfix root +z /var/spool/postfix/flush 700 postfix root +z /var/spool/postfix/incoming 700 postfix root +z /var/spool/postfix/maildrop 730 postfix postdrop +z /var/spool/postfix/private 700 postfix root +z /var/spool/postfix/public 710 postfix postdrop +z /var/spool/postfix/saved 700 postfix root +z /var/spool/postfix/trace 700 postfix root