[arch-commits] Commit in libmilter/trunk (4 files)
George Rawlinson
grawlinson at archlinux.org
Wed Jun 16 08:00:36 UTC 2021
Date: Wednesday, June 16, 2021 @ 08:00:35
Author: grawlinson
Revision: 964253
upgpkg: libmilter 8.16.1-1
* New upstream release.
* Removed glibc patch, as this was merged upstream.
* Updated systemd socket activation patch.
* Fixed incorrect groups at install time.
Added:
libmilter/trunk/site.config.m4
Modified:
libmilter/trunk/PKGBUILD
libmilter/trunk/fd-passing-libmilter.patch
Deleted:
libmilter/trunk/sendmail-8.15.2-glibc-2.30.patch
----------------------------------+
PKGBUILD | 57 +++++++++++++------------------------
fd-passing-libmilter.patch | 20 +++++-------
sendmail-8.15.2-glibc-2.30.patch | 57 -------------------------------------
site.config.m4 | 15 +++++++++
4 files changed, 44 insertions(+), 105 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-16 07:53:26 UTC (rev 964252)
+++ PKGBUILD 2021-06-16 08:00:35 UTC (rev 964253)
@@ -1,58 +1,43 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
# Contributor: mutantmonkey <mutantmonkey at gmail.com>
pkgname=libmilter
_pkgname=sendmail
-pkgver=8.15.2
-pkgrel=3
+pkgver=8.16.1
+pkgrel=1
pkgdesc='Implementation of the sendmail Mail Filter API'
url='https://www.proofpoint.com/us/sendmail-open-source'
arch=('x86_64')
options=('staticlibs')
-license=('custom:Sendmail open source license')
-validpgpkeys=('30BCA74705FA415455731D7BAAF5B5DE05BDCC53')
+license=('custom:Sendmail')
+validpgpkeys=('ADFDB709FE1EA682E5855971D583210EF51471A7')
+
source=("https://ftp.sendmail.org/${_pkgname}.${pkgver}.tar.gz"{,.sig}
'fd-passing-libmilter.patch'
- 'sendmail-8.15.2-glibc-2.30.patch')
-sha256sums=('24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439'
+ 'site.config.m4')
+sha256sums=('7886d5dc4b436b86175f32b5b9c7305c80787749847e2909bf99123ecc4e64ba'
'SKIP'
- 'b856ebc17e39151652bda93f40f79756ac83eb4a0b67e6d55c049f3ebde42983'
- 'f5378261028782c95014b0c91546e87132c13d4a39d81f61fc6039a0738a0c71')
+ '3692cb43987a3162edead6eda233e9636f86bce98e6bccf5334e1bc209359287'
+ '3c8cb1448f560ba4ca51c4a93e5a8f68920ba69981109551d7e386e0e04a9b52')
prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -p1 -i ../fd-passing-libmilter.patch # FS#49421
- patch -p0 -i ../sendmail-8.15.2-glibc-2.30.patch
-
- # From http://www.j-chkmail.org/wiki/doku.php/doc/installation/start#libmilter
- cat >> devtools/Site/site.config.m4 <<EOF
-dnl Include our flags
-APPENDDEF(\`conf_libmilter_ENVDEF',\`${CPPFLAGS} ${CFLAGS}')
-dnl Enable libmilter with a pool of workers
-APPENDDEF(\`conf_libmilter_ENVDEF',\`-D_FFR_WORKERS_POOL=1 -DMIN_WORKERS=4')
-dnl Use poll instead of select
-APPENDDEF(\`conf_libmilter_ENVDEF',\`-DSM_CONF_POLL=1')
-dnl Enable IPv6
-APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNETINET6=1')
-dnl Add -fPIC
-APPENDDEF(\`conf_libmilter_ENVDEF',\`-fPIC')
-dnl Permissions
-APPENDDEF(\`confINCGRP',\`root')
-APPENDDEF(\`confLIBGRP',\`root')
-EOF
+ cd "${_pkgname}-${pkgver}"
+ patch -p1 -i ../fd-passing-libmilter.patch # FS#49421
+ cp ../site.config.m4 devtools/Site
}
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}/${pkgname}"
- ./Build
+ cd "${_pkgname}-${pkgver}/${pkgname}"
+ ./Build
}
package() {
- cd "${srcdir}/${_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}"
+ install -d "${pkgdir}/usr/lib"
+ ./Build DESTDIR="${pkgdir}" install
+ install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ chown -R root:root "${pkgdir}"
}
Modified: fd-passing-libmilter.patch
===================================================================
--- fd-passing-libmilter.patch 2021-06-16 07:53:26 UTC (rev 964252)
+++ fd-passing-libmilter.patch 2021-06-16 08:00:35 UTC (rev 964253)
@@ -1,10 +1,8 @@
Description: systemd-like socket activation support for libmilter
Author: Mikhail Gusarov <dottedmag at debian.org
-diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html
-index 70a510e..013f04e 100644
--- a/libmilter/docs/smfi_setconn.html
+++ b/libmilter/docs/smfi_setconn.html
-@@ -43,6 +43,7 @@ Set the socket through which this filter should communicate with sendmail.
+@@ -44,6 +44,7 @@ Set the socket through which this filter
<LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe.
<LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket.
<LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket.
@@ -12,11 +10,9 @@
</UL>
</TD></TR>
</TABLE>
-diff --git a/libmilter/listener.c b/libmilter/listener.c
-index 48c552f..2249a1f 100644
--- a/libmilter/listener.c
+++ b/libmilter/listener.c
-@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name)
+@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, n
L_socksize = sizeof addr.sin6;
}
#endif /* NETINET6 */
@@ -28,7 +24,7 @@
else
{
smi_log(SMI_LOG_ERR, "%s: unknown socket type %s",
-@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name)
+@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, n
}
#endif /* NETINET || NETINET6 */
@@ -51,15 +47,15 @@
if (!ValidSocket(sock))
{
smi_log(SMI_LOG_ERR,
-@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name)
+@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, n
#if NETUNIX
addr.sa.sa_family != AF_UNIX &&
- #endif /* NETUNIX */
+ #endif
+ addr.sa.sa_family != AF_UNSPEC &&
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt,
sizeof(sockopt)) == -1)
{
-@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name)
+@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, n
}
#endif /* NETUNIX */
@@ -69,10 +65,10 @@
{
smi_log(SMI_LOG_ERR,
"%s: Unable to bind to port %s: %s",
-@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
+@@ -818,7 +839,7 @@ mi_listener(conn, dbg, smfi, timeout, ba
# ifdef BSD4_4_SOCKADDR
cliaddr.sa.sa_len == 0 ||
- # endif /* BSD4_4_SOCKADDR */
+ # endif
- cliaddr.sa.sa_family != L_family))
+ (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family)))
{
Deleted: sendmail-8.15.2-glibc-2.30.patch
===================================================================
--- sendmail-8.15.2-glibc-2.30.patch 2021-06-16 07:53:26 UTC (rev 964252)
+++ sendmail-8.15.2-glibc-2.30.patch 2021-06-16 08:00:35 UTC (rev 964253)
@@ -1,57 +0,0 @@
-The former deprecated macro RES_USE_INET6 is gone with glibc 2.30
-
----
- libmilter/sm_gethost.c | 6 ++++--
- sendmail/conf.c | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
---- libmilter/sm_gethost.c
-+++ libmilter/sm_gethost.c 2019-09-28 07:27:46.512228011 +0000
-@@ -51,18 +51,20 @@ sm_getipnodebyname(name, family, flags,
- {
- bool resv6 = true;
- struct hostent *h;
--
-+#ifdef RES_USE_INET6
- if (family == AF_INET6)
- {
- /* From RFC2133, section 6.1 */
- resv6 = bitset(RES_USE_INET6, _res.options);
- _res.options |= RES_USE_INET6;
- }
-+#endif
- SM_SET_H_ERRNO(0);
- h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- if (family == AF_INET6 && !resv6)
- _res.options &= ~RES_USE_INET6;
--
-+#endif
- /* the function is supposed to return only the requested family */
- if (h != NULL && h->h_addrtype != family)
- {
---- sendmail/conf.c
-+++ sendmail/conf.c 2019-09-28 07:28:39.103245002 +0000
-@@ -4242,18 +4242,20 @@ sm_getipnodebyname(name, family, flags,
-
- # else /* HAS_GETHOSTBYNAME2 */
- bool resv6 = true;
--
-+#ifdef RES_USE_INET6
- if (family == AF_INET6)
- {
- /* From RFC2133, section 6.1 */
- resv6 = bitset(RES_USE_INET6, _res.options);
- _res.options |= RES_USE_INET6;
- }
-+#endif
- SM_SET_H_ERRNO(0);
- h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- if (!resv6)
- _res.options &= ~RES_USE_INET6;
--
-+#endif
- /* the function is supposed to return only the requested family */
- if (h != NULL && h->h_addrtype != family)
- {
Added: site.config.m4
===================================================================
--- site.config.m4 (rev 0)
+++ site.config.m4 2021-06-16 08:00:35 UTC (rev 964253)
@@ -0,0 +1,15 @@
+dnl Enable libmilter with a pool of workers
+APPENDDEF(`conf_libmilter_ENVDEF',`-D_FFR_WORKERS_POOL=1')
+APPENDDEF(`conf_libmilter_ENVDEF',`-DMIN_WORKERS=4')
+dnl Use poll instead of select
+APPENDDEF(`conf_libmilter_ENVDEF',`-DSM_CONF_POLL=1')
+dnl Enable IPv6
+APPENDDEF(`conf_libmilter_ENVDEF',`-DNETINET6=1')
+dnl Add -fPIC
+APPENDDEF(`conf_libmilter_ENVDEF',`-fPIC')
+dnl Permissions
+APPENDDEF(`confINCGRP',`root')
+APPENDDEF(`confLIBGRP',`root')
+APPENDDEF(`confMBINGRP',`root')
+APPENDDEF(`confSBINGRP',`root')
+APPENDDEF(`confBINGRP',`root')
More information about the arch-commits
mailing list