summaryrefslogtreecommitdiff
path: root/mail-filter
diff options
context:
space:
mode:
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/Manifest.gzbin10880 -> 10868 bytes
-rw-r--r--mail-filter/anubis/Manifest2
-rw-r--r--mail-filter/anubis/anubis-4.2-r1.ebuild69
-rw-r--r--mail-filter/anubis/files/anubis-4.2-gdbm.patch21
-rw-r--r--mail-filter/bmf/Manifest3
-rw-r--r--mail-filter/bmf/bmf-0.9.4-r3.ebuild56
-rw-r--r--mail-filter/bmf/files/bmf-0.9.4_QA.patch4
-rw-r--r--mail-filter/dspam/Manifest1
-rw-r--r--mail-filter/dspam/dspam-3.10.2-r2.ebuild221
-rw-r--r--mail-filter/gld/Manifest2
-rw-r--r--mail-filter/gld/gld-1.7-r4.ebuild (renamed from mail-filter/gld/gld-1.7-r3.ebuild)29
-rw-r--r--mail-filter/opensmtpd-extras/Manifest4
-rw-r--r--mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild4
-rw-r--r--mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild4
-rw-r--r--mail-filter/policyd/Manifest2
-rw-r--r--mail-filter/policyd/policyd-1.82-r3.ebuild (renamed from mail-filter/policyd/policyd-1.82-r2.ebuild)18
-rw-r--r--mail-filter/popfile/Manifest3
-rw-r--r--mail-filter/popfile/popfile-1.1.3-r1.ebuild4
-rw-r--r--mail-filter/popfile/popfile-1.1.3.ebuild54
-rw-r--r--mail-filter/sieve-connect/Manifest3
-rw-r--r--mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild4
-rw-r--r--mail-filter/sieve-connect/sieve-connect-0.87.ebuild33
22 files changed, 416 insertions, 125 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3f6eb5186feb..6c8149c500f8 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
Binary files differ
diff --git a/mail-filter/anubis/Manifest b/mail-filter/anubis/Manifest
index da8a39d9785a..4cf6711c2635 100644
--- a/mail-filter/anubis/Manifest
+++ b/mail-filter/anubis/Manifest
@@ -2,9 +2,11 @@ AUX 4.1.1-gnutls.patch 527 BLAKE2B 88137a7780e596cab930cbca35f5a8b9f7dcd2897c58f
AUX 4.1.1-gnutls3.patch 434 BLAKE2B 3c019fb67ec2ec827a31511956e7f2e165ea414501c73d4f8201456c4df78df1c29793de2cb3e909a228adfaa6791debec7c48d0e6a563726383e2faba3a99df SHA512 58349bac378699b667e0e5b1b24d9538e0c1d590d27a2413ffae884ab2828713e78933eead41cdf9d9ee7cece4a0587feb1820713594bd70e473edf7267af19c
AUX 4.1.1-gpgme.patch 973 BLAKE2B 59c959298a6d1cb52ccd99c1d8b8fe0c9ae8c28393bdeb7784e5be6cedbe1cf1c1d7329d94ffe8a27f366800c7db5d51d11629ec63063daffd5534c4acb507da SHA512 c5812e752498abce76ed54df08198d832b887c1b3713a07f2ab1e09087d8bad73598edb9359bc26255ff5ab2b787319f89408eee1b86abe9b53dd709782cbaf3
AUX 4.1.1-testsuite.patch 570 BLAKE2B 8ee5a2c8d95cac0ecb9d69961850fb140cb7e117bcdca245b91541d25eca7982966eb05decd574365b3825a4180d7e8b7028412c2f09a0c857419dab8cccd106 SHA512 c61a64a990ff4e6eb80118adb44681dd348afdb2d59aeb782a9d05db0cf8eefcb52d93108e243eda164a79d02f96780b9097380f1e73f8021952018a8222fc55
+AUX anubis-4.2-gdbm.patch 540 BLAKE2B 571303e31a9199e508ebc39a5a643edbaaf8990923ff026b7635df8cb950efd4c582cd330155b80a98531fcfef1b9913236825e807c57d5fd1416a3295bf3542 SHA512 7e087be62a5a04b1bf5abe1df9b355391278ca09f97883070da986974ef2ffcee2475ac5b1e7db227781a82b96414f75071b4884c674b9d0bc3a383b371d0bc7
DIST anubis-4.1.1.tar.gz 1104272 BLAKE2B e4aac5ea5b38314bbf82231d3e93183906cd321c653cf6a0c07cc364a962d4a09f2aeb865e3f2fb40a93c8a45321ddb69f23b206d8dde2f830b803c65df94109 SHA512 51e9c3a4cc4f217348522ba196daf26908f5ebed1abbe8c3f4c876847284e1f43f19d5cc68cde3cae5aacc55d42b7a6786f9afb23856c647ddf6d6c4b6c0a7a7
DIST anubis-4.2.tar.gz 1623768 BLAKE2B bb9c6db5f3c79571b71d1256fe45cf65604738e367902cce0ad113c464d4067ef56100cde30ef12c547728a27b6b1fbc387d9bb55c7dd052e9aaef9f766af542 SHA512 cd16b67780b37f02a31374875763a1d54107289fbaf53160de5778f095b56bdb390c72a06fc067d87556b1158b0134c0fc88d30edbe124a71d8c80a89595e75f
EBUILD anubis-4.1.1-r1.ebuild 2109 BLAKE2B 8ad8dbb19a7ec4b68c59ff3f879baec2aad8609a777ae4a1bb8c5db5a6a0c3fa0141ad82dd9eec2e7016ce978c19a80fe0439b43f4ede99db692de0c928760d8 SHA512 519ab2982b392687d5f616579a50d71ef2d83a7b714928b148725b38bffe8053aaeb8468189e32882e3a5c8810b18beed7d6f32c708d2237b2d59476c34b9394
EBUILD anubis-4.1.1.ebuild 2029 BLAKE2B ab1dc1db19713d3dc3ca5649f74e5efbfd2596bd5cbd538c43e8430eb625d738f75b5f670402d8f0a888bd7e6bf15c90c13f7ff1c4a2f5bb40124d74212d82b8 SHA512 1cc5409d4f0af6723ade89512f8d7b5215ea6a6af622b9b2f30f6ed13b33e861ab5d618a9c3ee44456461d294ea036906bb76b648eabfb9c603d530771c10afe
+EBUILD anubis-4.2-r1.ebuild 1515 BLAKE2B b3e1eadc4ca7980f32392215535dda7552ba71581b9b8e4a3547df6117781d27d0d530a7062e6aea31346bc806eaa8b1737b1be2e5bd172c515509eb1f12c0c1 SHA512 db58d2e10e53945a1f2fc58c2889bf9e18dd045e85f6693e4a8654138cb9d910035ef5bd3a12f8e8c3d9ba912a75259050f533e9e9b5e107efea29397f0b65a3
EBUILD anubis-4.2.ebuild 1479 BLAKE2B 6333d27ccb9c59bc7d38382b475124f68ffe018f5ac702633bea5c3be46ce73ed85cec004af55e428af29339a8dab399c41c96f614cb350400245be95747acdd SHA512 e5089735a8c0ed305711cee229356c22af0983183100248bf6c5b620c5ee902cd42274defe39083b2a1ac5ea53dc1c8ff0e8a62d2651a173599db29211e59f26
MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-filter/anubis/anubis-4.2-r1.ebuild b/mail-filter/anubis/anubis-4.2-r1.ebuild
new file mode 100644
index 000000000000..ef65b9481c14
--- /dev/null
+++ b/mail-filter/anubis/anubis-4.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam user
+
+DESCRIPTION="GNU Anubis is an outgoing mail processor"
+HOMEPAGE="https://www.gnu.org/software/anubis/"
+
+SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
+
+RDEPEND="sys-libs/gdbm
+ crypt? ( >=app-crypt/gpgme-1.8.0 )
+ guile? ( >=dev-scheme/guile-1.8 )
+ mysql? ( dev-db/mysql-connector-c )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:*[server] )
+ nls? ( sys-devel/gettext )
+ pcre? ( >=dev-libs/libpcre-3.9 )
+ sasl? ( virtual/gsasl )
+ gnutls? ( net-libs/gnutls )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+ test? ( dev-util/dejagnu )"
+
+REQUIRED_USE="mysql? ( sasl )
+ postgres? ( sasl )"
+
+PATCHES=( "${FILESDIR}/anubis-4.2-gdbm.patch" )
+
+pkg_setup() {
+ enewuser anubis
+}
+
+src_configure() {
+ econf --with-unprivileged-user=anubis \
+ --disable-rpath \
+ $(use_with mysql) \
+ $(use_with postgres) \
+ $(use_with pam) \
+ $(use_with pcre) \
+ $(use_enable nls) \
+ $(use_with guile) \
+ $(use_with sasl gsasl) \
+ $(use_with gnutls) \
+ $(use_with tcpd tcp-wrappers) \
+ $(use_with socks5 socks-proxy) \
+ $(use_with crypt gpgme)
+}
+
+src_test() {
+ emake -C testsuite check
+}
+
+src_install() {
+ default
+ docinto examples
+ dodoc examples/*anubis*
+ docinto guile
+ dodoc guile/*.scm
+
+ use pam && pamd_mimic system-auth anubis auth account session
+}
diff --git a/mail-filter/anubis/files/anubis-4.2-gdbm.patch b/mail-filter/anubis/files/anubis-4.2-gdbm.patch
new file mode 100644
index 000000000000..5c54560ff940
--- /dev/null
+++ b/mail-filter/anubis/files/anubis-4.2-gdbm.patch
@@ -0,0 +1,21 @@
+diff -aurN a/src/gdbm.c b/src/gdbm.c
+--- a/src/gdbm.c 2014-05-22 01:39:58.000000000 -0400
++++ b/src/gdbm.c 2019-02-12 13:29:39.270414662 -0500
+@@ -209,7 +209,7 @@
+ }
+
+ const char *
+-gdbm_db_strerror (void *d, int rc)
++anubis_gdbm_db_strerror (void *d, int rc)
+ {
+ return gdbm_strerror (rc);
+ }
+@@ -222,7 +222,7 @@
+ gdbm_db_close,
+ gdbm_db_get,
+ gdbm_db_put,
+- gdbm_db_delete, gdbm_db_list, gdbm_db_strerror);
++ gdbm_db_delete, gdbm_db_list, anubis_gdbm_db_strerror);
+ }
+
+ #endif /* HAVE_LIBGDBM */
diff --git a/mail-filter/bmf/Manifest b/mail-filter/bmf/Manifest
index c319e3d97510..4124c870cd6a 100644
--- a/mail-filter/bmf/Manifest
+++ b/mail-filter/bmf/Manifest
@@ -1,4 +1,5 @@
-AUX bmf-0.9.4_QA.patch 534 BLAKE2B 44596442a98e37685d99f595f04b8540c6ab7c7383676f4669a3cd27098198fc1f781226dbeac87ebf3f2d86681bd66a406cbfbb3136723c31788fc476271ad8 SHA512 553607088051618cc88d0ccd7e74e644cfc6cc5a7e53f7e622ed1f2259cc49610c27c65613981f13ceb6173093e62c7e20326f4c2fb718bb6f3b2b2de011c2e9
+AUX bmf-0.9.4_QA.patch 538 BLAKE2B fae81e486943274c96cf9efc1fa6782e7adb74d201a9dc81689edeaa27de6cd04ac6fe8de2f360b5b62cade50de289c265f75addd8dcd08a8b2ecb89db404674 SHA512 f5f2c54ddf3db6156dbe8b2fa05a03a8a31cd530a1f711d5cdb2229389ebfc95fa97d49ef7ede45f87178b1c966180ce915612d4d2ad7a6b0b21d77c9524fabd
DIST bmf-0.9.4.tar.gz 36740 BLAKE2B f3bb262006e4e3e9db98f7df9b7160d8e3feeb0c3aa2b0564a65d5a302fb7b8894fd55d947828989dac488c605fcc153a9f18f840f63718cd12f374c0eb4fe2e SHA512 efbc7edd08ac9abd5a56fa8a00d0011363582e50dda309526b2114906f7d9a9795539df62d4db99457903a2277980bde02d24c97c2ec087d2af84df691cdb9f4
EBUILD bmf-0.9.4-r2.ebuild 1186 BLAKE2B c8df42663e416bdca376d8cbc995c5b00046ce41df95b7eda9a5106a4a7c49d474fd17fc551821342be47b9aff4965c7e893b1c025a20ec57d975c1a8011da12 SHA512 cae3de548b2f5103152724350ea208f94585fb1133484a474756059668d481870b67be1c8b2acddc84b6f534e81d97e01636a762ed9213703c5b7b9d0a604f67
+EBUILD bmf-0.9.4-r3.ebuild 1275 BLAKE2B 00cc43451d110d022c7215f762069033cf47fe609c8828b91b2787a820aa5381622b3986ce271c544053c62dfa3d40de807cf80a9ee238062aefb0515ccf53b7 SHA512 a4ad397aa7add6e4f0b5ad9b5cc6fb85c36a95926baaef91a28a57d5145358a75cd1bfab9187c6678ac8d47a9eb36c5b0a178ffe82b75916b412a9d26bcf9437
MISC metadata.xml 317 BLAKE2B a10b8934549528c9d7b05b0f1bd433d57cb4d8d3ec674734a808c3b6aa27660343284fc52855664e92153c362dfff76a4824ac95ad360ebaea2404bdd9b4ec25 SHA512 a278d1d66f598fc794827164dcf307d678f63a4dee8ac4d3b0665182579bef956dae638c955972d781b75d8ea3de62956ca1bd82b9dc18a1f298d90d92a36c3e
diff --git a/mail-filter/bmf/bmf-0.9.4-r3.ebuild b/mail-filter/bmf/bmf-0.9.4-r3.ebuild
new file mode 100644
index 000000000000..84ca042d34fe
--- /dev/null
+++ b/mail-filter/bmf/bmf-0.9.4-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+IUSE="mysql berkdb"
+
+DESCRIPTION="A fast and small Bayesian spam filter"
+HOMEPAGE="http://bmf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bmf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
+ berkdb? ( >=sys-libs/db-3.2.9 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_QA.patch" )
+DOCS=( README AUTHORS ChangeLog )
+
+src_prepare() {
+ # respect CFLAGS
+ sed -i -e '/D_LINUX/s/CFLAGS="$CCDBG/CFLAGS+=" $CCDBG/' \
+ "${S}/configure" || die
+
+ # include mysql headers
+ sed -i -e '/HAVE_MYSQL/s/HAVE_MYSQL/HAVE_MYSQL `mysql_config --include`/' \
+ "${S}/configure" || die
+
+ # We don't need to be root to run install
+ sed -i -e 's/install: checkroot bmf/install: bmf/' Makefile.in || die
+
+ default
+}
+
+src_configure() {
+ # this is not an autotools script
+ ./configure \
+ $(use_with mysql) \
+ $(use_with berkdb libdb) || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+ elog
+ elog "Important: Remember to train bmf before you start using it."
+ elog "See the README file for further instructions on training and using bmf"
+ elog "with procmail."
+ elog
+}
diff --git a/mail-filter/bmf/files/bmf-0.9.4_QA.patch b/mail-filter/bmf/files/bmf-0.9.4_QA.patch
index f911e05d58f9..f9728fbba984 100644
--- a/mail-filter/bmf/files/bmf-0.9.4_QA.patch
+++ b/mail-filter/bmf/files/bmf-0.9.4_QA.patch
@@ -1,5 +1,5 @@
---- dbh.c 2002-10-14 07:09:51.000000000 +0000
-+++ dbh.c 2012-02-24 10:52:07.000000000 +0000
+--- a/dbh.c 2002-10-14 07:09:51.000000000 +0000
++++ b/dbh.c 2012-02-24 10:52:07.000000000 +0000
@@ -60,12 +60,16 @@
case db_text:
pdb = (dbh_t*)dbtext_db_open( dbhost, dbname, dbuser, dbpass );
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 1c9e5a2d2288..9882e32fa2bc 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -4,4 +4,5 @@ AUX dspam.initd 867 BLAKE2B c0dd2e67cb57b646b95b2b5cdf12aeea647166fde24036497e5e
AUX dspam.logrotate 180 BLAKE2B 157570caf3ce9885ded6aaf99f189985a730306e7a15cdb77dfc050134e75722ac0d82b27f69ed9478b252e458a39b3705801d9829d4759cf439a892aaf66275 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389
DIST dspam-3.10.2.tar.gz 1035054 BLAKE2B 9200e6a3449feea3cec80572d7856597e487e553a69b52e7ecee1cd17c0792faf48fbda9e253d1fe52be40b8f0d4dcab4006b898abdcc62289550f17d7d876d3 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856
EBUILD dspam-3.10.2-r1.ebuild 5977 BLAKE2B f988cf01a109b7a96462c4de3e7e432f53a3e69533322e9bef453b651bbdd09ebe9cf18c65b2880ab2fbb6fdc697409205213ee50ffb0794c685ca69cd336a58 SHA512 f6f45d8fdd212442d289c535e260fe79274ebb84356a0dbb7b72b207278dc0ddd89d6fb255fd8d77945600bc9209b291737246a616caf89d9f3c44f9ed791554
+EBUILD dspam-3.10.2-r2.ebuild 5928 BLAKE2B edd2f70ee54ee49457912985f6b2e761294bce167191f0eb1a67ce5b56aecba19cec39cab82eaff74c42bf21f257cf4c97234d349410b9baaafb5eef3685ad17 SHA512 013d1d7409777899d12d001f4d7f2254d612af3e80c818dbc0479a1d7b2f4b2262567114a8bd8dd6a29e87af68bc8838cd342b5b46fe1c0755de1b03fbcf4735
MISC metadata.xml 1157 BLAKE2B c3f336c364a060100e45bf1a8439237900ac09dd087fadbfd36e1b0568f28a735d88fbe5e328497331a2bc037c0feef3375722c5a6ead493b3bb99eb9fdea219 SHA512 84b601656c40e8d1c2444736389c44f54e95c4e8f487728af82c65fdad26d2ecc875087e2d93b27126593514da8ea375f57dee1e8e7730f21ab9c0b988326f0c
diff --git a/mail-filter/dspam/dspam-3.10.2-r2.ebuild b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
new file mode 100644
index 000000000000..427586b4be9e
--- /dev/null
+++ b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
+HOMEPAGE="http://dspam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+DRIVERS_IUSE="+hash mysql postgres sqlite"
+SCALES_IUSE="small-scale +domain-scale large-scale"
+IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
+
+DEPEND="
+ net-mail/mailbase
+ ldap? ( net-nds/openldap )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ postgres? ( dev-db/postgresql )
+ sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="
+ ${DEPEND}
+ clamav? ( app-antivirus/clamav )
+ syslog? ( virtual/logger )
+"
+
+# Demands on sane USE flags:
+# - find out what driver to use: select at least one
+# - if static-libs is set, only one driver may be selected
+# - find out what scale to use: select exactly one
+# - user-homedirs does not work with virtual-users
+REQUIRED_USE="
+ || ( ${DRIVERS_IUSE//+} )
+ static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
+ ^^ ( ${SCALES_IUSE//+} )
+ virtual-users? ( !user-homedirs )
+"
+
+# dspam setup defaults
+DSPAM_HOME=/var/spool/dspam
+DSPAM_CONF=/etc/dspam
+DSPAM_LOG=/var/log/dspam
+DSPAM_MODE=2510
+DSPAM_DRIVERS=
+DSPAM_DRIVERS_EXTRAS=
+
+pkg_setup() {
+ # setup storage, this sets DSPAM_DRIVERS
+ dspam_setup_storage_drivers
+
+ # create dspam user and group
+ dspam_setup_user
+}
+
+src_configure() {
+ econf \
+ --sysconfdir=${DSPAM_CONF} \
+ --with-dspam-home=${DSPAM_HOME} \
+ --with-dspam-home-group=dspam \
+ --with-dspam-mode=${DSPAM_MODE} \
+ --with-dspam-group=dspam \
+ --with-logdir=${DSPAM_LOG} \
+ --enable-external-lookup \
+ --enable-long-usernames \
+ --enable-split-configuration \
+ $(use_enable clamav) \
+ $(use_enable daemon) \
+ $(use_enable debug) \
+ $(use_enable debug bnr-debug) \
+ $(use_enable debug verbose-debug) \
+ $(use_enable domain-scale) \
+ $(use_enable large-scale) \
+ $(use_enable static-libs static) \
+ $(use_enable syslog) \
+ $(use_enable user-homedirs homedir) \
+ $(use_enable virtual-users) \
+ --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
+ $(use mysql || use postgres && echo "--enable-preferences-extension") \
+ $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
+}
+
+dspam_setup_user() {
+ # DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
+ # under suexec in apache, so DSPAM user/group need to be regular users too
+
+ local euid egid
+ for euid in {1000..5000} ; do
+ [ -z "$(egetent passwd ${euid})" ] && break
+ done
+ for egid in {1000..5000} ; do
+ [ -z "$(egetent group ${egid})" ] && break
+ done
+ enewgroup dspam ${egid}
+ enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
+}
+
+dspam_setup_storage_drivers() {
+ # Find out which storage drivers need to be enabled, and set some
+ # variables so that src_configure can pick them up
+
+ if use hash; then
+ DSPAM_DRIVERS+=",hash_drv"
+ fi
+
+ if use mysql; then
+ DSPAM_DRIVERS+=",mysql_drv"
+ DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
+ fi
+
+ if use postgres; then
+ DSPAM_DRIVERS+=",pgsql_drv"
+ fi
+
+ if use sqlite; then
+ DSPAM_DRIVERS+=",sqlite3_drv"
+ fi
+
+ if ! use static-libs; then
+ # set the driver name twice to avoid a static build
+ DSPAM_DRIVERS+=${DSPAM_DRIVERS}
+ fi
+
+ # remove first comma separator
+ DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
+ einfo "Building with drivers: ${DSPAM_DRIVERS}"
+ #echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
+}
+
+src_install() {
+ default
+
+ if use daemon; then
+ newinitd "${FILESDIR}/dspam.initd" dspam
+ newconfd "${FILESDIR}/dspam.confd" dspam
+ fi
+
+ if use mysql; then
+ insinto "/usr/share/${PN}/mysql"
+
+ local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
+ if use virtual-users; then
+ files+=" virtual_user_aliases.sql virtual_users.sql"
+ fi
+
+ for file in $files; do
+ doins src/tools.mysql_drv/${file}
+ done
+ fi
+
+ if use postgres; then
+ insinto "/usr/share/${PN}/pgsql"
+
+ local files="pgsql_objects.sql purge-pe.sql purge.sql"
+ if use virtual-users; then
+ files+=" virtual_users.sql"
+ fi
+
+ for file in $files; do
+ doins src/tools.pgsql_drv/${file}
+ done
+ fi
+
+ if use sqlite; then
+ insinto "/usr/share/${PN}/sqlite"
+ newins src/tools.sqlite_drv/purge-3.sql purge.sql
+ fi
+
+ insinto "${DSPAM_HOME}/txt"
+ doins txt/*.txt
+ local i
+ for i in spam nonspam; do
+ echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
+ doins "${T}/msgtag.${i}"
+ done
+
+ newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}/dspam.cron-r4" dspam
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/dspam.logrotate" dspam
+
+ dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
+
+ # stop logrotate-3.8 from complaining
+ dodir /var/log/dspam
+ fowners dspam:dspam /var/log/dspam
+ fperms 0750 /var/log/dspam
+
+ # Install dspamc setgid
+ fowners root:dspam /usr/bin/dspamc
+ fperms g+s /usr/bin/dspamc
+}
+
+pkg_preinst() {
+ # dspam-3.10.0: config dir change, should be removed at some later point
+ if [ -d "${ROOT}/etc/mail/dspam" ]; then
+ ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
+ if [ -h "${ROOT}${DSPAM_CONF}" ]; then
+ # symlink, this is the setup in older ebuilds
+ ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
+ rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
+ eend $?
+
+ elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
+ # directory and no symlink, do it manually since we cannot decide.
+ ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
+
+ else
+ # nothing interesting in /etc/dspam
+ ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
+ mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
+ eend $?
+ fi
+ fi
+}
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 9feac3510616..8d2efa2a3bf2 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -2,5 +2,5 @@ AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502
AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
EBUILD gld-1.7-r2.ebuild 1875 BLAKE2B 1f2f2dccb676953a92aa4933fdd8a4ee580500c5118327d1c2ea950cbe6a92879a133d7a742d96409253e73df5a0a5409270ad9c9fba1e8a54269d3c982e618f SHA512 16e11bd850678ef303a81fab386870bc54d9a6341f66ac55e8a84b3d0d86cf9f0fccb3aec9cd39c0eff906eac976e554c055e91c197af8f91eadb35414b931ab
-EBUILD gld-1.7-r3.ebuild 1929 BLAKE2B c2a3e3266e8c292a02287aa57899cb59a4e8945c54db46902b55f1c1d6959cdd7ea740b7977f6bcb00a81f910a206c26f5ecc10fa02de71c991fd9b17241d89a SHA512 7bd8f2401b6fb94bcfb98cb0b8bad2ed89e76df04f0fee17e738c574a823021f533811961889cce7778b05cf2b333e34d36fea71b241164e6d045272cce75f9e
+EBUILD gld-1.7-r4.ebuild 2052 BLAKE2B c9478b99900909a4c2fd744d6d352283c95292337675fedc2b9faaede5486a0d8ae0490bc50f1584e67e6103c4ee55ff09d20eb411a4ee17c1cc40937c42357e SHA512 b93674a81aa7463e7aad21f10c616e3797e47433625f97868849323ab2e1f89096fc993006e70ef7201de2c53c24ce44b84efb6a0eea7dd23864ada3f4b0e099
MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-filter/gld/gld-1.7-r3.ebuild b/mail-filter/gld/gld-1.7-r4.ebuild
index 90926c4222af..c367f5ee96a7 100644
--- a/mail-filter/gld/gld-1.7-r3.ebuild
+++ b/mail-filter/gld/gld-1.7-r4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
inherit toolchain-funcs
@@ -17,7 +17,7 @@ IUSE="libressl postgres"
DEPEND="sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
- !postgres? ( virtual/mysql )
+ !postgres? ( dev-db/mysql-connector-c:0= )
postgres? ( dev-db/postgresql:*[server] )"
RDEPEND="${DEPEND}"
@@ -37,17 +37,19 @@ src_prepare() {
sed -i tables.{my,pg}sql \
-e '/ip char/s/16/39/' \
|| die "sed sql tables failed"
+
+ sed -i configure \
+ -e "/SQL_LIBS/{s~/lib~/$(get_libdir)~g}" || die
+
+ default
}
src_configure() {
tc-export CC
+
# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
# use it...
- if use postgres ; then
- myconf="${myconf} --with-pgsql"
- fi
-
- econf ${myconf}
+ econf $(usex postgres '--with-pgsql' '')
}
src_install() {
@@ -69,9 +71,12 @@ pkg_preinst() {
elog "details on how to setup gld."
elog
elog "The sql files have been installed to /usr/share/${PN}/sql."
- if [[ $REPLACING_VERSIONS == "1.7-r1" ]]; then
- elog "You might want to use the ALTER_TABLE command to change the"
- elog "ip field width to 39 chars to accomodate ipv6 addresses."
- elog "Please see your sql server documentation."
- fi
+ local old_ver
+ for old_ver in ${REPLACING_VERSIONS} ; do
+ if ver_test ${old_ver} -eq "1.7-r1" ; then
+ elog "You might want to use the ALTER_TABLE command to change the"
+ elog "ip field width to 39 chars to accomodate ipv6 addresses."
+ elog "Please see your sql server documentation."
+ fi
+ done
}
diff --git a/mail-filter/opensmtpd-extras/Manifest b/mail-filter/opensmtpd-extras/Manifest
index ab474bf8f46b..d7f1d5aa05f6 100644
--- a/mail-filter/opensmtpd-extras/Manifest
+++ b/mail-filter/opensmtpd-extras/Manifest
@@ -1,5 +1,5 @@
DIST opensmtpd-extras-201606062304.tar.gz 631098 BLAKE2B 2e6de8b4a24e6ca9120c907b48ac77bc3cc12e352dfb081c1ed61c291eb146f19b714b5ca04077a91ee063cf32db8330e4ba9c8c344e5c130855940c4bc8e366 SHA512 7af916ed71fb81518bccbc7a82946a2a8252d2b70663238d7eea21841c82926221f03ab7afebd79d49f41e970e62c2dd70234ebaa0d27be5a9c5bbb4ae4ef7d8
DIST opensmtpd-extras-201609141255.tar.gz 561289 BLAKE2B 55aa0f2fe2eeaae9d2f2ebefc20da83041a0a09c1e8b508813df3535c6563edc10bd311f8544b359a984327bf9e7ac8e2ea3618cc53b570678ab65b7dd64db90 SHA512 df9caf235095edd1f8535e41a3aedc51a5674a62d66d0749d5bb0d4433f3ea54e0b31a8b3a4d619b7ca79b64bcb1576b97f220c60cb3f48080d1972b7a46cc0b
-EBUILD opensmtpd-extras-5.9.2.201606062304.ebuild 2169 BLAKE2B 41fd351d14d8e21933dd24673426b0513ed436c945dfc36fee830e45185f68ee5059c2d452d6a29760967b37c63d9893bee3b2732033298844be661b7ec5401f SHA512 2b04688a091526f6a5cdcb8369a2cec278c16b5f77221cafc0571fdb660740c43aeb48b15d8cbb88cba81775d79ec86214496ab7ef976e26f2d199137726fb1e
-EBUILD opensmtpd-extras-5.9.2.201609141255.ebuild 2017 BLAKE2B f36a0be7bfc1bdbb83be4a36f20bb38ff64e6d81f6f2228e58dc66cd6df4e7ece3897290c22a286f07ddbe415888263364b76bf5fbe531c8d1f107ccd55114ed SHA512 b7eb3a80c3ccac7b097431f5eb747a86fa37f1956edd7a1c513311d1a930e4467462b3dcf0007a524b271da573765fcbce3f67f15a6845cbd9c88358c26bcbe0
+EBUILD opensmtpd-extras-5.9.2.201606062304.ebuild 2180 BLAKE2B 8a6e4d8adcb28bc749a5218b2c843ed144ac1fcf38a8c938bbcd99190643183bf4ade856fc548e35a2b05cdfb209b695f34f0ee0e0e8e87599e5857316a19233 SHA512 4e8fe5ef227ce92b446bb0d882457f3766b489c0ff7e68f10918e2d5b13fb7cc8c471e7eb1644c189249ccf709950df1a3903c68dd692eb9a24f5dc1f5b42698
+EBUILD opensmtpd-extras-5.9.2.201609141255.ebuild 2028 BLAKE2B 319e132a27d05db0929643be4ff9f32ea8af7c4048f3d243c948acf13bd47725d4f386d99a459379523f6f8fd093b7175c7ad90afac784f36d966a98b9e39a63 SHA512 561406e0005c66bbab19bcdfa8f6e7fff792c6da9367645423bcb2df3d7d64cbd621f8b951ef72672d7e72b3c2dc1a8c596cf26f0fbd8bcbbefeda7665b0e00a
MISC metadata.xml 2332 BLAKE2B 8bf79bb4a7dd0e8ae8f6e0a9d06e199cf859045a24afdc431a8dc1536739e3163235c0228ba60bf768b4679c4e3f2fbfdcdaa1c30643a42cecd7addf44120053 SHA512 5f103f63090b859599f9224c5c9c8afe570b3ecee690f489d53a8fc76b6174e601235ad6cba13ba0a73be0e1a787e75e56eacd4009cd8faa32e19e90728db316
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild
index f7cb787bdf4a..989e81fd986c 100644
--- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild
+++ b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -69,7 +69,7 @@ DEPEND="mail-mta/opensmtpd
filter-lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:* ) )
filter-dnsbl? ( net-libs/libasr )
table-sqlite? ( dev-db/sqlite:3 )
- table-mysql? ( virtual/mysql )
+ table-mysql? ( dev-db/mysql-connector-c:0= )
table-postgres? ( dev-db/postgresql:* )
table-redis? ( dev-libs/hiredis )
table-python? ( dev-lang/python:2.7 )
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild
index 69c6776bcb7e..6229e20cb006 100644
--- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild
+++ b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -60,7 +60,7 @@ DEPEND="mail-mta/opensmtpd
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
table-sqlite? ( dev-db/sqlite:3 )
- table-mysql? ( virtual/mysql )
+ table-mysql? ( dev-db/mysql-connector-c:0= )
table-postgres? ( dev-db/postgresql:* )
table-redis? ( dev-libs/hiredis )
table-python? ( dev-lang/python:2.7 )
diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 86659ec0553f..49463d7d9060 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -5,5 +5,5 @@ AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e
AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
EBUILD policyd-1.82-r1.ebuild 1974 BLAKE2B 9467c9cb11441d4e528717b1c01abb878b18f02e0321c3195c4ae359ca413ed16d4abb28c54834494661ee92124f7ccb9da8439048c2ee0f75e48b7bbf3b44e9 SHA512 17c253ac9d1f3c0b8e2eccb320e1fc3df627014828fbc4c95f3438b67a27075fb703eb42c806644dd6e9741450b897aaca11e1799255a257269513fd228caf2b
-EBUILD policyd-1.82-r2.ebuild 2012 BLAKE2B 3476d80843b047cb3f91dbb2715594a4a12bb1b250eaf0e2f1dc4776f3bfdd2c807d866f6db425edcc019e5061e2d7854a6fbd2b59db2718f0f5e1a018bfb792 SHA512 bca8d2d5aa6e86f28a1f91397c3cd1b331105f73a14a9c732a89cca94b104069c950245ad23c1d3dcd109ebcd542479c08dc8506992019c17bbacb0a36e5b58e
+EBUILD policyd-1.82-r3.ebuild 2032 BLAKE2B f2e98fb86aa068c899f1900224806cfc71d8858c195f6c15ee8276a9b571b029f0de075fc469e0f513936281e08d6907197616371a5ca78114be60f6ee762f5f SHA512 705f158545acf90e1d2dcffddcb3b5f9f7c6f562c7f98116771f558f2486139a9189d34f94417ea39a5636295d12b8b54ca7b189658980ea38f61ad1684871d7
MISC metadata.xml 331 BLAKE2B 2a54160dd40023392bf403418c358eb93eb1a591010d9184352ed74cb0c8688276a3026b4287dc47d4173f2472df56f35c422d8483796d264d85edcd1367e8b9 SHA512 5241c40be23d5183ef4d5d07901ce582e98a404da73cb5bbac6f51767d028b870315ef3dea6db0341fca1697b9f4d2b2b4a7ad99cd8e1ca9d601b3743ad677e8
diff --git a/mail-filter/policyd/policyd-1.82-r2.ebuild b/mail-filter/policyd/policyd-1.82-r3.ebuild
index 1e145672a007..0d1be22af1b6 100644
--- a/mail-filter/policyd/policyd-1.82-r2.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Policy daemon for postfix and other MTAs"
HOMEPAGE="http://policyd.sf.net/"
@@ -14,15 +14,19 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
IUSE="libressl"
-DEPEND="virtual/mysql
+DEPEND="dev-db/mysql-connector-c:0=
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-post182.patch"
+ "${FILESDIR}/${PN}-makefile.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-post182.patch"
- epatch "${FILESDIR}/${PN}-makefile.patch"
- sed -i -e "s/gcc/$(tc-getCC)/" Makefile
+ default
+ sed -i -e 's/@${CC}/${CC}/' -e 's/@$(CC)/$(CC)/' Makefile
ebegin "Applying config patches"
sed -i -e s:UID=0:UID=65534:g \
@@ -35,7 +39,7 @@ src_prepare() {
}
src_compile() {
- emake build || die "emake build failed"
+ emake CC=$(tc-getCC) build
}
src_install() {
diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index 47546b4482a2..749f78ba0c2b 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,5 +1,4 @@
AUX popfile 715 BLAKE2B 071dd14e37401ab0c5c25d644f55275fbf59bd9dba5bca39202f27338492603a95c023fe1288c507f76f78d4c0137580d8a279c4738247f8b507b3090318a313 SHA512 a802f753de335552a0b54da98baaad07ceda1da83f0c082d4e2204c90378c35ca5f34bfee1f7beaf11ee6795b7287dcf3db07eedf958665134064dfd9168fae2
DIST popfile-1.1.3.zip 523431 BLAKE2B cf084e572bf0d8da7d4ce4435f7df9c527ebb0d6714f9b5ac2c2d8701231f452989de048e24bdd7cec2483466ed20f1ed9aa84255f7606a9ffb2bb06bf05b30c SHA512 0e3ed3d67d2c2b456643335dd030a51e890bb371c5b8cf9eed9fac350a2536b8884eeffff78fcb27b99c39711505df533ee3ded5b40714fb46e54c2d25b3dda9
-EBUILD popfile-1.1.3-r1.ebuild 1121 BLAKE2B 591b689643bab0fb5c4b192732eb4ad2221b14577862fecb63f18331417feda567d0fd16bcff279338cc2cd36852748ead54062788af676c684c0dbcdea36c36 SHA512 72ed23bb8be7e51b20baf540fa4fce83d611966de7c1dd528edef72087a8ca4e729c79caa7e87f4dece3567912a4d4d38e057708bc854b402956c03ddb3bdfd1
-EBUILD popfile-1.1.3.ebuild 1058 BLAKE2B 1713631777762f13a14d5b75cab280044951f2d910fba8803458f3095125994f888ac15bcfa73a62b9d1cae982500a3f5431e536575e590b5ee1295c9711f588 SHA512 f6055e02d18329e3113e4eb56351d7ab78dd2fe09be5345b465e0e561edc84eaa35755c259108ed71428ee2e90023739f5086ae9ad88bb8e28f220f58f939555
+EBUILD popfile-1.1.3-r1.ebuild 1116 BLAKE2B 30091aba8457667ec6e6b768c440eceb74f0c5f5c08df2c4c9a964d391ee53bd3d0807e4d07df4422ef5c624447989d5b8d1a93917fc63e560f568a6fe72d0d7 SHA512 7230d404a69480fcf56a227fe101e38b8f9eaa03b48b66759977608d0bd7674b9f28776475c7de8da623cb0c23cee0acc18d575669d71659b21c09835484f123
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/popfile/popfile-1.1.3-r1.ebuild b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
index bafb8245f838..45ab09e88418 100644
--- a/mail-filter/popfile/popfile-1.1.3-r1.ebuild
+++ b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://getpopfile.org/downloads/${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cjk ipv6 libressl mysql ssl xmlrpc"
RDEPEND="virtual/perl-Digest-MD5
diff --git a/mail-filter/popfile/popfile-1.1.3.ebuild b/mail-filter/popfile/popfile-1.1.3.ebuild
deleted file mode 100644
index 21e54839f75d..000000000000
--- a/mail-filter/popfile/popfile-1.1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Anti-spam bayesian filter"
-HOMEPAGE="http://getpopfile.org"
-SRC_URI="http://getpopfile.org/downloads/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cjk ipv6 mysql ssl xmlrpc"
-
-RDEPEND="virtual/perl-Digest-MD5
- virtual/perl-MIME-Base64
- dev-perl/DBD-SQLite
- dev-perl/HTML-Tagset
- dev-perl/HTML-Template
- dev-perl/TimeDate
- dev-perl/DBI
- virtual/perl-Digest
- cjk? ( dev-perl/Encode-compat
- dev-perl/Text-Kakasi )
- mysql? ( dev-perl/DBD-mysql )
- ipv6? ( dev-perl/IO-Socket-INET6 )
- ssl? ( dev-libs/openssl:0
- dev-perl/IO-Socket-SSL
- dev-perl/Net-SSLeay )
- xmlrpc? ( dev-perl/PlRPC )"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
- local f
- for f in `find ./ -type f`; do
- edos2unix "${f}"
- done
-}
-
-src_install() {
- dodoc *.change*
- rm -rf *.change* license
-
- insinto /usr/share/${PN}
- doins -r *
-
- fperms 755 /usr/share/${PN}/{popfile,insert,pipe,bayes}.pl
-
- dosbin "${FILESDIR}"/${PN}
-}
diff --git a/mail-filter/sieve-connect/Manifest b/mail-filter/sieve-connect/Manifest
index 6d49d7b0d44d..64cee7600a06 100644
--- a/mail-filter/sieve-connect/Manifest
+++ b/mail-filter/sieve-connect/Manifest
@@ -1,4 +1,3 @@
DIST sieve-connect-0.87.tar.bz2 40023 BLAKE2B 510f5c2a42524f7d412b0b13ab549667cd912411b069e7328ab13a1284c2877a78084495e19be6cac643dec4c952a2672b2f3b11bba755fa11aabc3e58008693 SHA512 28ed4f5cd929ee5edb420afcbac238399463beecf551643b9ee5ea41debbb1e5401a619b39b6422ec47885ea3cc207866e09da2e46a65bcc3d4f3ca5bdbf016a
-EBUILD sieve-connect-0.87-r1.ebuild 705 BLAKE2B 5e0152fdd5768993e9aa2f2409aeb21fcd95866de39867a07996bbd60052d695fe893465ed5fbed6557fdeb952dd4cef117ee45b838aef0decb6e77673d730e2 SHA512 fc9912ca31d7eae9f1e52377ea07cf56898de88bd8286a26835811227927b96447aeeabba23fa97353a64a3d73c9bb49a544e8cb690028e55ac70aee1ff383a0
-EBUILD sieve-connect-0.87.ebuild 711 BLAKE2B 72687a35d6f6abe08bcac576e2e2d13e9da86b45a4fe28a5db325369c567c37798c44ffdf8435ce523d1dfab4ba752ca0ff8d447c6a08cdb68a1848e03171720 SHA512 b843773bc8e301b640192c299debe41d7e2f24146ff697156f8a871ae050f1b831b0b4e2cde9302d321838910b25a238a0920eb5876734502fa5d65aedff3278
+EBUILD sieve-connect-0.87-r1.ebuild 700 BLAKE2B 2df5710e30678ae8c92a8a437a88354c540e06df56ee6d676b6318879f91441d06bf254fe127c59f67db870d28e7b499ddc2120ccc8043d8736745c5b10a93bb SHA512 7a09c950c2fb8bca148adcc30abe2109384a4a9d05679d6f0e7f42a30d9e26c75529480b03ad779a0554b082c117ccebf6002896823a954bd7bc2cb598d2bb99
MISC metadata.xml 2017 BLAKE2B 3d6f4fa162a9ef67c1cfac4da9a605d06d8feb6c0b98957f2e14149e9fe10130a3e14dc1733f28470f40816ecf0a4710784695b929e54cfba6f693f5024b1ea4 SHA512 76eecd2659b89c420e34f21244ce33927d2f438e5f3292a30da4e9d4eb968a13af4c51f81e3e4fa2d20345ac2798a9172be7e5bc5ddf07187ae4b032986473d3
diff --git a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild b/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
index 07371b0cb2fd..64296aadb71d 100644
--- a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
+++ b/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/syscomet/sieve-connect/releases/download/v${PV}/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND=">=dev-lang/perl-5"
RDEPEND="${DEPEND}
diff --git a/mail-filter/sieve-connect/sieve-connect-0.87.ebuild b/mail-filter/sieve-connect/sieve-connect-0.87.ebuild
deleted file mode 100644
index 5b2e9a207517..000000000000
--- a/mail-filter/sieve-connect/sieve-connect-0.87.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Sieve Command Line Interface"
-HOMEPAGE="https://people.spodhuis.org/phil.pennock/software/"
-SRC_URI="https://github.com/syscomet/sieve-connect/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5"
-RDEPEND="${DEPEND}
- >=dev-perl/Authen-SASL-2.11
- dev-perl/IO-Socket-INET6
- >=dev-perl/IO-Socket-SSL-0.97
- dev-perl/Net-DNS
- dev-perl/Net-SSLeay
- dev-perl/TermReadKey
- dev-perl/Term-ReadLine-Gnu"
-
-src_compile() {
- emake all sieve-connect.1
-}
-
-src_install() {
- dobin sieve-connect
- doman sieve-connect.1
- dodoc README*
-}