Date: Wednesday, May 20, 2020 @ 06:00:05 Author: allan Revision: 386983
upgpkg: libmilter 8.15.2-3: fix FTBFS Added: libmilter/trunk/sendmail-8.15.2-glibc-2.30.patch Modified: libmilter/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 13 ++++++-- sendmail-8.15.2-glibc-2.30.patch | 57 +++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-20 05:27:14 UTC (rev 386982) +++ PKGBUILD 2020-05-20 06:00:05 UTC (rev 386983) @@ -5,7 +5,7 @@ pkgname=libmilter _pkgname=sendmail pkgver=8.15.2 -pkgrel=2 +pkgrel=3 pkgdesc='Implementation of the sendmail Mail Filter API' url='https://www.proofpoint.com/us/sendmail-open-source' arch=('x86_64') @@ -13,14 +13,18 @@ license=('custom:Sendmail open source license') validpgpkeys=('30BCA74705FA415455731D7BAAF5B5DE05BDCC53') source=("https://ftp.sendmail.org/${_pkgname}.${pkgver}.tar.gz"{,.sig} - 'fd-passing-libmilter.patch') + 'fd-passing-libmilter.patch' + 'sendmail-8.15.2-glibc-2.30.patch') sha256sums=('24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439' 'SKIP' - 'b856ebc17e39151652bda93f40f79756ac83eb4a0b67e6d55c049f3ebde42983') + 'b856ebc17e39151652bda93f40f79756ac83eb4a0b67e6d55c049f3ebde42983' + 'f5378261028782c95014b0c91546e87132c13d4a39d81f61fc6039a0738a0c71') + 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 @@ -34,6 +38,9 @@ APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNETINET6=1') dnl Add -fPIC APPENDDEF(\`conf_libmilter_ENVDEF',\`-fPIC') +dnl Permissions +APPENDDEF(\`confINCGRP',\`root') +APPENDDEF(\`confLIBGRP',\`root') EOF } Added: sendmail-8.15.2-glibc-2.30.patch =================================================================== --- sendmail-8.15.2-glibc-2.30.patch (rev 0) +++ sendmail-8.15.2-glibc-2.30.patch 2020-05-20 06:00:05 UTC (rev 386983) @@ -0,0 +1,57 @@ +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) + {