summaryrefslogtreecommitdiff
path: root/mail-filter
diff options
context:
space:
mode:
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/Manifest.gzbin8703 -> 8711 bytes
-rw-r--r--mail-filter/libmilter/Manifest9
-rw-r--r--mail-filter/libmilter/files/libmilter-build-system.patch89
-rw-r--r--mail-filter/libmilter/files/libmilter-glibc-2.30.patch25
-rw-r--r--mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch211
-rw-r--r--mail-filter/libmilter/libmilter-1.0.2.ebuild66
-rw-r--r--mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild2
-rw-r--r--mail-filter/libmilter/libmilter-1.0.2_p1.ebuild79
-rw-r--r--mail-filter/opendmarc/Manifest2
-rw-r--r--mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch35
-rw-r--r--mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch41
-rw-r--r--mail-filter/rspamd/Manifest6
-rw-r--r--mail-filter/rspamd/rspamd-2.7-r103.ebuild (renamed from mail-filter/rspamd/rspamd-2.7-r102.ebuild)4
-rw-r--r--mail-filter/rspamd/rspamd-3.0-r2.ebuild (renamed from mail-filter/rspamd/rspamd-3.0.ebuild)4
-rw-r--r--mail-filter/rspamd/rspamd-9999.ebuild4
15 files changed, 11 insertions, 566 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index d9d05b702ccd..d374a7e40f51 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
Binary files differ
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 3ff03f16b363..bf2ecb4c6da1 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -1,17 +1,10 @@
AUX gentoo.config.m4 168 BLAKE2B bbd9a011f6ca442aebb3f4e0177dfae6c1f8b246a493205be7b9b1b9837fd5bf0eac59cc46eebe639f9938d9d3eea99ff48962938a69198560ce76c8458a5906 SHA512 68b4c02527845ec54c694cbf6f4f7c589aa1317269d25cee6e65ea69243d29215790294180588c3436e72dd6f86163234111d3a762e926da3bfb7acf69f1c4b3
-AUX libmilter-build-system.patch 6855 BLAKE2B 987a71369b672d74835cb37a4ad5ceb58aa8b0fd451ffbcfbcba8ff89dafae58d0c9d412fec8c2a0f0621cce4b8bfce3ee618aa399feb6d7523bd22e3a210fe3 SHA512 d36adc49d5fec792139a921b5292ad0a6d71c11a31093cb1249f4e19b8255bb5a287beb3537b2ec0316d97505233cdd708bac27c0d4e1f54464918d4730be43b
-AUX libmilter-glibc-2.30.patch 686 BLAKE2B 51a3053970fea27ca54fad929148e47ca3091150c3330bbd1b3841a44bed1735e0b9941bd4042e7ccc1eb00b87a65639a4b156db664dfece0b5b146873305ce1 SHA512 5fe9d972e459f95268e56a1a7ddae9ec06c19a7bd070a2a32fc45b4cb99aaae335481f01bab5cd4e2a841e25928962749373cbffcaefb08692fda0b896a56cf1
AUX libmilter-musl-disable-cdefs.patch 352 BLAKE2B 192218bd59e4b5b4b7b7dd8f0a7a3ea19a3df1de3d32ad11c3b7159e55d92d7a2a500c7449dcd2c63b2d84934a18205f45b2962e7a80621697e81bcfbd7e1bdf SHA512 1305d7b0d0742d26fcb742b8751672ec03033abc2b01bb95a31c533dd197903138c3d39468fe104fb4779017d036f5c1656e06454e891e08155b34bbe1718292
AUX libmilter-musl-stack-size.patch 1522 BLAKE2B c2348f569cf69d52418beef8b2fc5fea31d5e100ab849220aca1ebbae44a955c482c375a02ddf43524894574355cebdc292b9566bfa420dead96df2d229a44a8 SHA512 d3e12943fe7e9babdf700a2d8c0229bc16fa2ea16097615600341dee13f137b157ffa4b03f76c92ba9c5552ca3bf01cb598f6a6201720408df3a37247001a219
AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
-AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
AUX sendmail-8.16.1-build-system.patch 9701 BLAKE2B f1bbf82ab321b502ecbd5d2658e549275330ec6f6fdd2a31af36aba580adc1fafa74acaf1213798787c5b6c985e86f366f68e4c260212e4856e5778201400bfc SHA512 9a3dad2df6a84729a5dd7dfc7c696acacdb96d1b0856f763604e1183f9fb7e7e5fc6012d4299c9e0a6a57c65d763d4ca607f3c7862a2055aa3aedf3994ed22fe
-DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
-DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
-EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0
-EBUILD libmilter-1.0.2_p1-r2.ebuild 2215 BLAKE2B e34ec8367a7a3077566dde4671c1fd72ad1883f5ed2d2e3921a7fd91fbc7a8f9f5518152f895c5157c946dd4a5d5491c4306bf880fd1ca478cc788dc0d3d053c SHA512 588fb4abf1450fdb6be2eacb0b2af4e8995525660b7a36d110e870c6e3b57d8a8d8fcb5aefe3e2f940fa2dbcffa8052a089396eedc808baa25e4cb46fde69841
-EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
+EBUILD libmilter-1.0.2_p1-r2.ebuild 2214 BLAKE2B 1d8fe51cf3c6b88889cbf9d9597bf78406794f18c79392a1fb2cb2f4af7ed662d68c35d11fce142b677c272a8234f9c30adda2aea94f31ed9850763ebbf94f89 SHA512 b4ad6934eb6d717c70eb0491508b6e482710e64801e6b1aeff1f0a305f919777d6c100d68fef2093aba09cfbaff7461377f4ee6890cb24db02a74f2ed21d82c0
EBUILD libmilter-1.0.2_p2.ebuild 2589 BLAKE2B 00e621f39053d177496959a7fb2fe77f472f633b10dee23c91ec22baea0e4a0fcf33bc43050579f06d7c71e5f86e11a6758afda3d005adad95bde8c851a61b10 SHA512 f73dfe2f656fe328bdc570fee09d9658c7dcdd1c6cf31835388ea410bb972d8e02eb49f30073d756236b4162fb3ef2a70bae67ee31a5c3c7e228ebc256d819b0
MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/files/libmilter-build-system.patch b/mail-filter/libmilter/files/libmilter-build-system.patch
deleted file mode 100644
index d9991d3d409b..000000000000
--- a/mail-filter/libmilter/files/libmilter-build-system.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.3/devtools/M4/UNIX/defines.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/defines.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/defines.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD= ifdef(`confLD', `confLD', `confCC')
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
-
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
-
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -30,12 +30,12 @@
-
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
-- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
-- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
-
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
-- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/manpage.m4 sendmail-8.14.3/devtools/M4/UNIX/manpage.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/manpage.m4 2006-09-08 00:13:07.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/manpage.m4 2009-09-20 10:16:43.000000000 +0200
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD',
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2009-09-20 09:53:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:18:35.000000000 +0200
-@@ -32,9 +32,9 @@
- MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
- MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
- install-mfapi: ${MFAPI}
-- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
-+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
- divert(0)
-
- bldFINISH
diff --git a/mail-filter/libmilter/files/libmilter-glibc-2.30.patch b/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
deleted file mode 100644
index 5ceac845b90e..000000000000
--- a/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libmilter/sm_gethost.c 2014-03-05 01:59:45.000000000 +0100
-+++ b/libmilter/sm_gethost.c 2019-11-14 18:59:41.885353232 +0100
-@@ -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)
- {
diff --git a/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch b/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
deleted file mode 100644
index 3348e921926c..000000000000
--- a/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
---- sendmail-8.14.3.orig/cf/cf/Makefile 2005-06-14 04:16:34.000000000 +0200
-+++ sendmail-8.14.3/cf/cf/Makefile 2009-09-20 10:55:50.000000000 +0200
-@@ -80,10 +80,10 @@
- install-cf: install-sendmail-cf install-submit-cf
-
- install-sendmail-cf: $(CF).cf
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
-
- install-submit-cf: $(SUBMIT).cf
-- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
-+ $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
-
- depend:
-
-diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4
---- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4 2012-12-27 08:13:15.792214375 +0000
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD= ifdef(`confLD', `confLD', `confCC')
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
-
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
-
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -30,12 +30,12 @@
-
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
-- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
-- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
-
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
-- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 00:56:53.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-
- bldCURRENT_PRODUCT-clean:
- rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
---- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4 2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4 2012-12-27 08:28:52.617502447 +0000
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD',
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN',
--` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
-- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-09-20 10:50:36.000000000 +0200
-@@ -32,9 +32,9 @@
- MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
- MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
- install-mfapi: ${MFAPI}
-- if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
-- ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
-+ if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
-+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
- divert(0)
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
---- sendmail-8.14.3.orig/mail.local/Makefile.m4 2006-06-28 23:08:02.000000000 +0200
-+++ sendmail-8.14.3/mail.local/Makefile.m4 2009-09-20 10:56:24.000000000 +0200
-@@ -30,7 +30,7 @@
- force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
-
- install-mail.local: mail.local
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
- divert
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
---- sendmail-8.14.3.orig/rmail/Makefile.m4 2006-06-28 23:08:04.000000000 +0200
-+++ sendmail-8.14.3/rmail/Makefile.m4 2009-09-20 10:55:29.000000000 +0200
-@@ -31,7 +31,7 @@
- force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
-
- install-rmail: rmail
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
- divert
-
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100
-+++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200
-@@ -14,9 +14,9 @@
-
- dnl hack: /etc/mail is not defined as "location of .cf" in the build system
- define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
--`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
-+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
- define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
--`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- )dnl
-
- # location of sendmail statistics file (usually /etc/mail/ or /var/log)
-@@ -43,21 +43,21 @@
- statistics:
- ${CP} /dev/null statistics
-
--${DESTDIR}/etc/mail/submit.cf:
-+"${DESTDIR}/etc/mail/submit.cf":
- @echo "Please read INSTALL if anything fails while installing the binary."
- @echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
- cd ${SRCDIR}/cf/cf && make install-submit-cf
-
- MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
-
--${DESTDIR}${MSPQ}:
-+"${DESTDIR}${MSPQ}":
- @echo "Please read INSTALL if anything fails while installing the binary."
- @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
- @echo "as explained in sendmail/SECURITY."
-- mkdir -p ${DESTDIR}${MSPQ}
-- chown ${MSPQOWN} ${DESTDIR}${MSPQ}
-- chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
-- chmod 0770 ${DESTDIR}${MSPQ}
-+ mkdir -p "${DESTDIR}${MSPQ}"
-+ chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
-+ chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
-+ chmod 0770 "${DESTDIR}${MSPQ}"
-
- divert(0)
-
-@@ -68,30 +68,30 @@
- divert(bldTARGETS_SECTION)
-
- install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
-- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
-+ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
- for i in ${sendmailTARGET_LINKS}; do \
- rm -f $$i; \
- ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
- done
-
--define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- install-sm-mta: bldCURRENT_PRODUCT
-- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
-+ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
- for i in confMTA_LINKS; do \
- rm -f $$i; \
- ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
- done
-
- install-hf:
-- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
-- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
-+ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
-+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
-
- install-st: statistics
-- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
-- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
-+ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
-+ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
-
--install-submit-st: statistics ${DESTDIR}${MSPQ}
-- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
-+install-submit-st: statistics "${DESTDIR}${MSPQ}"
-+ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
-
- divert(0)
- bldPRODUCT_END
diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild
deleted file mode 100644
index 31d0b281a4e3..000000000000
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-# This library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-SENDMAIL_VER=8.14.5
-
-DESCRIPTION="The Sendmail Filter API (Milter)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="ipv6 poll"
-
-DEPEND="!mail-mta/sendmail
- !mail-mta/sendmail"
-RDEPEND="!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-build-system.patch
- eapply "${FILESDIR}"/${PN}-sharedlib.patch
- default
-
- local CC="$(tc-getCC)"
- local ENVDEF="-DNETUNIX -DNETINET"
- use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
- use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
-
- sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
- -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
- -e "s:@@CC@@:${CC}:" \
- -e "s:@@ENVDEF@@:${ENVDEF}:" \
- "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
- || die "failed to generate site.config.m4"
-}
-
-src_compile() {
- pushd libmilter
- emake -j1 MILTER_SOVER=${PV}
- popd
-}
-
-src_install() {
- local MY_LIBDIR=/usr/$(get_libdir)
- dodir "${MY_LIBDIR}"
- emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
- LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
- MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
- MSPQOWN=root CFOWN=root CFGRP=0 \
- MILTER_SOVER=${PV} \
- install -C obj.*/libmilter
-
- dodoc libmilter/README
- dodoc libmilter/docs/*
-}
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
index 9646d468dabf..59df8fa730f7 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
LICENSE="Sendmail"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="ipv6 poll"
RDEPEND="!<mail-mta/sendmail-8.16.1"
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
deleted file mode 100644
index b9a1147970d6..000000000000
--- a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-# This library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-SENDMAIL_VER=8.15.2
-
-DESCRIPTION="The Sendmail Filter API (Milter)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="ipv6 poll"
-
-DEPEND="!mail-mta/sendmail
- !mail-mta/sendmail"
-RDEPEND="!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
-
-# build system patch copied from sendmail ebuild
-# glibc patch from opensuse
-PATCHES=(
- "${FILESDIR}/sendmail-8.14.6-build-system.patch"
- "${FILESDIR}/${PN}-sharedlib.patch"
- "${FILESDIR}/${PN}-glibc-2.30.patch"
- )
-
-src_prepare() {
- default
-
- local CC="$(tc-getCC)"
- local ENVDEF="-DNETUNIX -DNETINET"
- use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
- use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
-
- if use elibc_musl; then
- use ipv6 && ENVDEF="${ENVDEF} -DNEEDSGETIPNODE"
-
- eapply "${FILESDIR}/${PN}-musl-stack-size.patch"
- eapply "${FILESDIR}/${PN}-musl-disable-cdefs.patch"
- fi
-
- sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
- -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
- -e "s:@@CC@@:${CC}:" \
- -e "s:@@ENVDEF@@:${ENVDEF}:" \
- "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
- || die "failed to generate site.config.m4"
-}
-
-src_compile() {
- pushd libmilter
- emake -j1 MILTER_SOVER=${PV}
- popd
-}
-
-src_install() {
- local MY_LIBDIR=/usr/$(get_libdir)
- dodir "${MY_LIBDIR}"
- emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
- SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
- LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
- MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
- MSPQOWN=root CFOWN=root CFGRP=0 \
- MILTER_SOVER=${PV} \
- install -C obj.*/libmilter
-
- dodoc libmilter/README
- dodoc libmilter/docs/*
-}
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 3e6a7fbc2aef..188bff8b62ae 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,5 +1,3 @@
-AUX opendmarc-1.3.2-multiple-From.patch 1394 BLAKE2B 91b36a131ca9dca5e33f3a9610ab5c3ba17bf7f44f891d278f4c070629987a4177166c176692edd36dee184948811f727a9752e3c6adcbaf1822cfe9aa6d0c8e SHA512 068f58f25133fc6216c437ba9df5a44d5e7139c471f85d63bea81d7c930a56a2900239bc051cf2a3ed7f60fac939a0090bbef4a690c78457911e267293019d66
-AUX opendmarc-1.3.3-CVE-2020-12460.patch 1302 BLAKE2B 8bd4a1f6aaf44e9931fb97553d2e072aa5efa3114e75f5240107a5c126fe432829cc515d29e5c0e082a013b4e2dd90b5eed8b4b07ec8110c63c3fe00248a8955 SHA512 98582c2b0a08d77b27856331f28214b7b5fa3972c572189ed21963030e98858285a5a69851f173d08380bf409d985980e7c61de5d571af11062f0d394fc8b5f5
AUX opendmarc-1.4.1.1-CVE-2021-34555.patch 2517 BLAKE2B 93ebfb101591e5b797b52de4d85a6e199c208544076a7d5bc05fb8b7237c663a204a45172d4cf38d408daf57d5076929b3de227e4e787d97c85aad3e42af9d03 SHA512 24df989c7a501ffea5da43469e049f4a5d9de82f2fe67875f93bad690f558d1734b9d4ea2da1a6aebdedb80b576ada8e12844e7aa061117dd41da3e23c24e176
AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c
AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch b/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
deleted file mode 100644
index 28b2f852f39a..000000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6b615e345037408b88b2ffd1acd03239af8a858 Mon Sep 17 00:00:00 2001
-From: Marcin Seremak <panpilkarz@protonmail.com>
-Date: Tue, 30 Jul 2019 08:05:28 +0200
-Subject: [PATCH] Fix multiple addresses in From vulnerability
-
----
- libopendmarc/tests/test_finddomain.c | 1 +
- opendmarc/opendmarc.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libopendmarc/tests/test_finddomain.c b/libopendmarc/tests/test_finddomain.c
-index 50cf405..8447463 100644
---- a/libopendmarc/tests/test_finddomain.c
-+++ b/libopendmarc/tests/test_finddomain.c
-@@ -23,6 +23,7 @@ main(int argc, char **argv)
- /* 11 */ {"(,) joe@joe.com", "joe.com"},
- /* 12 */ {"\"( bob@bob.com)\" joe@joe.com", "joe.com"},
- /* 12 */ {"From: Davide D'Marco <user@blah.com>", "blah.com"},
-+ /* 13 */ {"blah.com", "blah.com"},
- {NULL, NULL},
- };
- u_char dbuf[256];
-diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
-index 419c15a..9b7fe3a 100644
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -2193,7 +2193,7 @@ mlfi_eom(SMFICTX *ctx)
- strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
-
- ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
-- from->hdr_value);
-+ dfc->mctx_fromdomain);
- if (ostatus != DMARC_PARSE_OKAY)
- {
- if (conf->conf_dolog)
diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch b/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
deleted file mode 100644
index 334c11d5302f..000000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 50d28af25d8735504b6103537228ce7f76ad765f Mon Sep 17 00:00:00 2001
-From: "Murray S. Kucherawy" <msk@blackops.org>
-Date: Wed, 5 Aug 2020 21:56:01 +0000
-Subject: [PATCH] In opendmarc_xml_parse(), ensure NULL-termination of the
- buffer passed to opendmarc_xml().
-
----
- libopendmarc/opendmarc_xml.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libopendmarc/opendmarc_xml.c b/libopendmarc/opendmarc_xml.c
-index 26bb9dc..b3ac55a 100644
---- a/libopendmarc/opendmarc_xml.c
-+++ b/libopendmarc/opendmarc_xml.c
-@@ -158,7 +158,7 @@ opendmarc_xml(char *b, size_t blen, char *e, size_t elen)
- if (*cp != '<')
- continue;
- ++cp;
-- for(sp = cp; *sp != '\0'; ++sp)
-+ for (sp = cp; *sp != '\0'; ++sp)
- {
- if (*sp == '?')
- break;
-@@ -546,7 +546,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
- if (fname == NULL)
- {
- xerror = errno;
-- (void) snprintf(err_buf, err_len, "%s: %s", fname, "File name was NULL");
-+ (void) snprintf(err_buf, err_len, "%s", "File name was NULL");
- errno = EINVAL;
- return NULL;
- }
-@@ -572,7 +572,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
- return NULL;
- }
-
-- bufp = calloc(statb.st_size, 1);
-+ bufp = calloc(statb.st_size + 1, 1);
- if (bufp == NULL)
- {
- xerror = errno;
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 2491065dab11..c4c9b94752e5 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -10,7 +10,7 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269
AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
-EBUILD rspamd-2.7-r102.ebuild 2678 BLAKE2B 22cbf33c83da07e9dd087d8350efe5a900fb9bce2b9d0da7ee9380259bddc09a8263f279f019ce52f463bea8ef6bfbbf08828dfc98f07f376b039680ae5614b2 SHA512 767b03d9fb333edf5d4854e20392e4bd585de4f8adcc125dfaa3bd0c102dd2dc46431eae5e2dd7d5d3bdd945343312fe3464872b75236fa0c031ae13237dd8f3
-EBUILD rspamd-3.0.ebuild 2845 BLAKE2B 1189974898087b675103d9aa84506c391fe4809ddb2b5b0f68ed0bf8f3d971a6068d251aecbd853a1c94811467eec809e27b66b3864ca0628cd4725094e12a78 SHA512 484dbdce9fe79ed25474b0fcfdcc01459564b9d01e1fecaf5345ccfe5100fef0d3bf7d4bf10ceffa396757c5308e5f3a06bc1cdae1f718b2262d0affb7585b8d
-EBUILD rspamd-9999.ebuild 2813 BLAKE2B 33ce7c32935fd0799dc00723d239cf1a05ffef2f37f2bf734047b1bac8b365ce174e04232c8f68688006e7774e02b8ef010fd2d8d179898eb32593d2fb6cd1f9 SHA512 8070cc687811f657b6cd7d0853cfae544b40b179d4eea0e1ad1bed288b449f731fa26bb0cf6093e6e42e324f7a5969eb84178106ed5cdad801ef0ae1d7bd25d2
+EBUILD rspamd-2.7-r103.ebuild 2680 BLAKE2B 75275dd49ac5b6b2f33a53e54934025f0341df190efe6c66034e54377ece549a6fb0c93accac6ca54b543b78b3b600a3ad1a8e75ac1d3677a4688344ecd733d8 SHA512 1be59df83281b02c14cf24a4b13fc841e9dbc0a7e2218807ee3394dfaccc9b73001208dfe22dc88abf2073c6c6b3acf61937627b765a82e71eaad8d8c6054eab
+EBUILD rspamd-3.0-r2.ebuild 2836 BLAKE2B 60e8b70afe764c3260da4058cea28dce5a1ca1676a2333559ea2e8789fd36f0ff803d4e34cb70e9dee2ceb6da4d8cb901b2eddec0485fce0571832b87f13d24a SHA512 522f43a7601f818917c7f5c22eae638214e15469c467113800577022ea7c27cb0f98c9aec18e6551b3e73301441189a84c7634baf4a718d5b531a9909b4cb41d
+EBUILD rspamd-9999.ebuild 2804 BLAKE2B d758f9448ac993be7227a44733798d7dc0b0ff22c16616255acfeee23cca9e9c71a6341f2a0e9322b136f823a98b2871e1f3b9fa8f6e97813eb930c06b4b2bd6 SHA512 4e62781920704264a167340afc3456775cc585d39a9ab77bd62742f90c32641f52d785251a03e697e0eff2d6d633d9101d55cf70cc8a98e672c7bcc42768e853
MISC metadata.xml 683 BLAKE2B 88aae3128d411106650ed6fc0558c5b36419fffc01a6c09a0b23e85bdc6f4a02fa8f086f794dec814a78e40956f0ca3256de5700574ff4547309b868869fbb16 SHA512 a0367a901b8294cab8e725dce17ce5e9c9195aa9a62a1b5925b213875e5706509973d9d7bd2ee3057ee9892a05132f868f81cf2a0193f9fdc5eb9235c09093aa
diff --git a/mail-filter/rspamd/rspamd-2.7-r102.ebuild b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 3bb3d9202b2e..8a361f82f03e 100644
--- a/mail-filter/rspamd/rspamd-2.7-r102.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..2} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
@@ -36,7 +36,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/icu:=
dev-libs/libev
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-3.0.ebuild b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
index 1a472d6db57b..efe18dc57b00 100644
--- a/mail-filter/rspamd/rspamd-3.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r2.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
- ' lua5-{1,2})
+ ')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
@@ -40,7 +40,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libfmt:=
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index ebf109b74cd2..7bcf4740c473 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
- ' lua5-{1,2})
+ ')
acct-group/rspamd
acct-user/rspamd
app-arch/zstd:=
@@ -40,7 +40,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libev
dev-libs/libfmt:=
dev-libs/libsodium:=
- dev-libs/snowball-stemmer
+ dev-libs/snowball-stemmer:=
sys-apps/file
blas? (
virtual/blas
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 03:20:46 +0000