Date: Wednesday, August 18, 2021 @ 01:19:35 Author: grawlinson Revision: 1002852
upgpkg: libmilter 8.17.1-1 New upstream release. Modified: libmilter/trunk/PKGBUILD libmilter/trunk/fd-passing-libmilter.patch ----------------------------+ PKGBUILD | 46 +++++++++++++++++++++++++------------------ fd-passing-libmilter.patch | 18 ++++++++-------- 2 files changed, 36 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-17 23:23:54 UTC (rev 1002851) +++ PKGBUILD 2021-08-18 01:19:35 UTC (rev 1002852) @@ -3,9 +3,9 @@ # Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> # Contributor: mutantmonkey <mutantmon...@gmail.com> +_pkgname=sendmail # libmilter is bundled with the sendmail source pkgname=libmilter -_pkgname=sendmail -pkgver=8.16.1 +pkgver=8.17.1 pkgrel=1 pkgdesc='Implementation of the sendmail Mail Filter API' url='https://www.proofpoint.com/us/sendmail-open-source' @@ -12,32 +12,40 @@ arch=('x86_64') options=('staticlibs') license=('custom:Sendmail') -validpgpkeys=('ADFDB709FE1EA682E5855971D583210EF51471A7') +# Signing keys sourced from upstream. Current version is signed with the 2021 keys. +# https://www.proofpoint.com/us/products/email-protection/open-source-email-solution +validpgpkeys=('F4CE2263210253D6A9F979B04C66EA8D4BEE1BEE') +source=( + "https://ftp.sendmail.org/$_pkgname.$pkgver.tar.gz"{,.sig} + 'fd-passing-libmilter.patch' + 'site.config.m4' +) +b2sums=('4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c' + 'SKIP' + 'ea2f1811666ce1b2c7532794845de9ec1f1e72d6c58a02c4c5800e93359c1c1cd4a0353fee572c258c378b0fea776d03ba19d794da7ed3295d9432b47ceb2481' + '4173a1abd272908faeef7f44b5d033f639101f0494be0bcb7e43e29b087f436f082e05a3065fc89f428b91e94cfa0c4b4abf92be77bd722a646012a1f428300a') -source=("https://ftp.sendmail.org/${_pkgname}.${pkgver}.tar.gz"{,.sig} - 'fd-passing-libmilter.patch' - 'site.config.m4') -sha256sums=('7886d5dc4b436b86175f32b5b9c7305c80787749847e2909bf99123ecc4e64ba' - 'SKIP' - '3692cb43987a3162edead6eda233e9636f86bce98e6bccf5334e1bc209359287' - '3c8cb1448f560ba4ca51c4a93e5a8f68920ba69981109551d7e386e0e04a9b52') - - prepare() { - cd "${_pkgname}-${pkgver}" + cd "$_pkgname-$pkgver" patch -p1 -i ../fd-passing-libmilter.patch # FS#49421 cp ../site.config.m4 devtools/Site } build() { - cd "${_pkgname}-${pkgver}/${pkgname}" + cd "$_pkgname-$pkgver/$pkgname" ./Build } package() { - cd "${_pkgname}-${pkgver}/${pkgname}" - install -d "${pkgdir}/usr/lib" - ./Build DESTDIR="${pkgdir}" install - install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - chown -R root:root "${pkgdir}" + cd "$_pkgname-$pkgver/$pkgname" + + # create install directory + install -vd "$pkgdir/usr/lib" + ./Build DESTDIR="$pkgdir" install + + # license + install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" ../LICENSE + + # correct permissions + chown -R root:root "$pkgdir" } Modified: fd-passing-libmilter.patch =================================================================== --- fd-passing-libmilter.patch 2021-08-17 23:23:54 UTC (rev 1002851) +++ fd-passing-libmilter.patch 2021-08-18 01:19:35 UTC (rev 1002852) @@ -12,7 +12,7 @@ </TABLE> --- a/libmilter/listener.c +++ b/libmilter/listener.c -@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, n +@@ -197,6 +197,11 @@ L_socksize = sizeof addr.sin6; } #endif /* NETINET6 */ @@ -24,10 +24,10 @@ else { smi_log(SMI_LOG_ERR, "%s: unknown socket type %s", -@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, n +@@ -443,7 +448,21 @@ } #endif /* NETINET || NETINET6 */ - + - sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); + if (addr.sa.sa_family == AF_UNSPEC) + { @@ -47,7 +47,7 @@ if (!ValidSocket(sock)) { smi_log(SMI_LOG_ERR, -@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, n +@@ -466,6 +485,7 @@ #if NETUNIX addr.sa.sa_family != AF_UNIX && #endif @@ -55,10 +55,10 @@ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt, sizeof(sockopt)) == -1) { -@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, n +@@ -511,7 +531,8 @@ } #endif /* NETUNIX */ - + - if (bind(sock, &addr.sa, L_socksize) < 0) + if (addr.sa.sa_family != AF_UNSPEC && + bind(sock, &addr.sa, L_socksize) < 0) @@ -65,10 +65,10 @@ { smi_log(SMI_LOG_ERR, "%s: Unable to bind to port %s: %s", -@@ -818,7 +839,7 @@ mi_listener(conn, dbg, smfi, timeout, ba - # ifdef BSD4_4_SOCKADDR +@@ -818,7 +839,7 @@ + #ifdef BSD4_4_SOCKADDR cliaddr.sa.sa_len == 0 || - # endif + #endif - cliaddr.sa.sa_family != L_family)) + (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family))) {