diff options
Diffstat (limited to 'mail-filter')
60 files changed, 615 insertions, 1339 deletions
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest index 6560842e319e..7eb162306044 100644 --- a/mail-filter/dcc/Manifest +++ b/mail-filter/dcc/Manifest @@ -1,2 +1 @@ -DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599 diff --git a/mail-filter/dcc/dcc-1.3.154.ebuild b/mail-filter/dcc/dcc-1.3.154.ebuild deleted file mode 100644 index ea113dcaf293..000000000000 --- a/mail-filter/dcc/dcc-1.3.154.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit base eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Distributed Checksum Clearinghouse" -HOMEPAGE="https://www.rhyolite.com/anti-spam/dcc/" -SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z" - -LICENSE="DCC GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" # -IUSE="cgi ipv6 rrdtool milter" - -RDEPEND="dev-lang/perl - rrdtool? ( net-analyzer/rrdtool ) - || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )" -DEPEND="sys-apps/sed - sys-devel/gcc - ${RDEPEND}" - -dcc_cgibin=/var/www/localhost/cgi-bin/dcc -dcc_homedir=/var/dcc -dcc_libexec=/usr/sbin -dcc_man=/usr/share/man -dcc_rundir=/var/run/dcc - -PATCHES=( "${FILESDIR}"/dcc-1.3.140-freebsd.patch ) - -src_configure() { - tc-export CC AR RANLIB - local myconf - myconf="${myconf} --homedir=${dcc_homedir}" - myconf="${myconf} --bindir=/usr/bin" - myconf="${myconf} --libexecdir=${dcc_libexec}" - myconf="${myconf} --mandir=/usr/share/man" - myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile" - myconf="${myconf} --with-installroot=${D}" - # sigh. should be DCC-MD5 but see line 486 in the shipped configure script - myconf="${myconf} --with-DDC-MD5" - myconf="${myconf} --with-uid=root" - myconf="${myconf} --enable-server" - myconf="${myconf} --enable-dccifd" - myconf="${myconf} --with-rundir=${dcc_rundir}" - myconf="${myconf} --with-db-memory=64" - myconf="${myconf} --with-max-db-mem=128" - myconf="${myconf} --with-max-log-size=0" - myconf="${myconf} --with-make-cmd=${MAKE:-make}" - myconf="${myconf} $(use_enable ipv6 IPv6)" - myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})" - myconf="${myconf} $(use_enable milter dccm)" - use milter && myconf="${myconf} --with-sendmail=" - - einfo "Using config: ${myconf}" - - # This is NOT a normal configure script. - ./configure ${myconf} || die "configure failed!" -} - -moveconf() { - local into=/etc/dcc/ - for i in $@; do - mv "${D}${dcc_homedir}/${i}" "${D}${into}" - dosym "${into}${i}" "${dcc_homedir}/${i}" - done -} - -src_install() { - # stolen from the RPM .spec and modified for gentoo - MANOWN=root MANGRP=$(id -g -n root) export MANOWN MANGRP - BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP - DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR - DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR - DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP - - dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc - if use cgi ; then - dodir "${dcc_cgibin}" - fi - keepdir /var/log/dcc - - # This package now takes "${D}" at compile-time! - # make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die - emake install - - # branding and setting reasonable defaults - sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ - -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ - -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ - -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ - -e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \ - -e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \ - -e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \ - -e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \ - -i "${D}${dcc_homedir}/dcc_conf" - - if use milter ; then - # enable milter - sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \ - "${D}${dcc_homedir}"/dcc_conf - fi - - # provide cronjob - mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed" - - # clean up - mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed" - - statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}" - if ! use rrdtool; then - # remove rrdtool interface scripts - eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts" - fi - - # clean up - rm -f "${D}"/usr/sbin/{rcDCC,updatedcc} - - # place configuration files into /etc instead of /var/dcc - moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist - - newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc - newconfd "${FILESDIR}"/dcc.confd dcc - - rmdir "${D}"/var/dcc/log/ - - dodoc CHANGES RESTRICTIONS - dohtml *.html - doman *.{0,8} -} diff --git a/mail-filter/dcc/dcc-1.3.158-r1.ebuild b/mail-filter/dcc/dcc-1.3.158-r1.ebuild new file mode 100644 index 000000000000..4f94c517ed2f --- /dev/null +++ b/mail-filter/dcc/dcc-1.3.158-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Distributed Checksum Clearinghouse" +HOMEPAGE="https://www.rhyolite.com/dcc/" +SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z" + +LICENSE="DCC GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="cgi ipv6 rrdtool milter" + +RDEPEND=" + dev-lang/perl + || ( + net-ftp/ftp + net-misc/curl + net-misc/wget + www-client/fetch + ) + milter? ( + || ( + mail-filter/libmilter + mail-mta/sendmail + ) + ) + rrdtool? ( net-analyzer/rrdtool )" +DEPEND="${RDEPEND}" + +dcc_cgibin=var/www/localhost/cgi-bin/dcc +dcc_homedir=var/dcc +dcc_libexec=usr/sbin +dcc_man=usr/share/man +dcc_rundir=var/run/dcc + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.140-freebsd.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_configure() { + tc-export CC AR RANLIB + local myconf=( + --bindir="${EPREFIX}"/usr/bin + --homedir="${EPREFIX}"/${dcc_homedir} + --libexecdir="${EPREFIX}"/${dcc_libexec} + --mandir="${EPREFIX}"/usr/share/man + --enable-dccifd + --enable-server + --with-DDC-MD5 + --with-installroot="${D}" + --with-rundir="${EPREFIX}"/${dcc_rundir} + --with-uid=root + --with-updatedcc_pfile="${EPREFIX}"/${dcc_homedir}/updatecc.pfile + --with-db-memory=64 + --with-max-db-mem=128 + --with-max-log-size=0 + --with-make-cmd=${MAKE:-make} + $(use_enable ipv6 IPv6) + $(use_enable milter dccm) + $(use_with cgi cgibin ${dcc_cgibin}) + $(use_with milter sendmail) + ) + + einfo "Using config: ${myconf[@]}" + + # This is NOT a normal configure script. + ./configure "${myconf[@]}" || die "configure failed!" +} + +moveconf() { + local i + for i in $@; do + mv "${ED}/${dcc_homedir}/${i}" "${ED}"/etc/dcc || die + dosym ../../etc/dcc/"${i}" "${dcc_homedir}/${i}" + done +} + +src_install() { + # stolen from the RPM .spec and modified for gentoo + export MANOWN=root + export MANGRP=$(id -g -n root) + export BINOWN="${MANOWN}" + export BINGRP="${MANGRP}" + export DCC_PROTO_HOMEDIR="${ED}/${dcc_homedir}" + export DCC_CGIBINDIR="${ED}/${dcc_cgibin}" + export DCC_SUID="${BINOWN}" + export DCC_OWN="${BINOWN}" + export DCC_GRP="${BINGRP}" + + dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc + if use cgi ; then + dodir "${dcc_cgibin}" + fi + keepdir /var/log/dcc + + emake install + + # branding and setting reasonable defaults + sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ + -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ + -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ + -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ + -e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \ + -e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \ + -e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \ + -e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \ + -i "${ED}/${dcc_homedir}/dcc_conf" || die + + if use milter ; then + # enable milter + sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \ + "${ED}/${dcc_homedir}"/dcc_conf || die + fi + + # provide cronjob + mv "${ED}"/usr/sbin/cron-dccd "${ED}"/etc/cron.daily/dccd || die "mv failed" + + # clean up + mv "${ED}"/usr/sbin/logger "${ED}"/usr/sbin/logger-dcc || die "mv failed" + + if ! use rrdtool; then + # remove rrdtool interface scripts + rm "${ED}"/usr/sbin/dcc-stats-{collect,graph,init} || die "Failed to clean up rrdtool scripts" + fi + + # clean up + rm "${ED}"/usr/sbin/{rcDCC,updatedcc} || die + + # place configuration files into /etc instead of /var/dcc + moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist + + newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc + newconfd "${FILESDIR}"/dcc.confd dcc + + rmdir "${ED}"/var/dcc/log/ || die + + dodoc CHANGES RESTRICTIONS + doman *.{0,8} +} diff --git a/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch b/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch index e72224f41c2f..8d4a8d59c334 100644 --- a/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch +++ b/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index 5efe49d..de8d6f2 100755 --- a/configure +++ b/configure @@ -3677,7 +3677,7 @@ case "$TARGET_SYS" in diff --git a/mail-filter/dcc/files/dcc-1.3.158-fno-common.patch b/mail-filter/dcc/files/dcc-1.3.158-fno-common.patch new file mode 100644 index 000000000000..0ff4cb599a17 --- /dev/null +++ b/mail-filter/dcc/files/dcc-1.3.158-fno-common.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/706988 +--- a/srvrlib/db.c ++++ b/srvrlib/db.c +@@ -65,7 +65,7 @@ struct timeval db_time; + + int db_debug; + +-u_char grey_on; ++extern u_char grey_on; + + DB_BUF_MODE db_buf_mode_hash, db_buf_mode_db; + +--- a/thrlib/cmn_defs.h ++++ b/thrlib/cmn_defs.h +@@ -237,7 +237,7 @@ extern u_int dcc_ctxt_sn; /* change X-DCC header server name */ + + extern RCPT_ST *rcpt_st_free; + +-const char *userdirs; ++extern const char *userdirs; + + extern u_char dcc_query_only; + extern u_char can_discard_1; /* 1=can trim targets after DATA */ diff --git a/mail-filter/dovecot_deleted_to_trash/metadata.xml b/mail-filter/dovecot_deleted_to_trash/metadata.xml index aa644658c0b5..4e1a456622a9 100644 --- a/mail-filter/dovecot_deleted_to_trash/metadata.xml +++ b/mail-filter/dovecot_deleted_to_trash/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">lexbrugman/dovecot_deleted_to_trash</remote-id> </upstream> diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest index f8949b123a05..b6f33917e91e 100644 --- a/mail-filter/imapfilter/Manifest +++ b/mail-filter/imapfilter/Manifest @@ -1 +1,2 @@ DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19 +DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442 diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch new file mode 100644 index 000000000000..fb665f852710 --- /dev/null +++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch @@ -0,0 +1,26 @@ +From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin <steils@gentoo.org> +Date: Wed, 30 Dec 2020 06:48:40 +0300 +Subject: [PATCH] Fix build with LibreSSL + +Signed-off-by: Stefan Strogin <steils@gentoo.org> +--- + src/socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/socket.c b/src/socket.c +index aa2ef4f..fa75de4 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -143,7 +143,7 @@ open_secure_connection(session *ssn) + goto fail; + + if (get_option_boolean("hostnames")) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_set_hostflags(ssn->sslconn, + X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); + if (!SSL_set1_host(ssn->sslconn, ssn->server)) { +-- +2.30.0 + diff --git a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild index 8709726d2a4a..e6bef2c86e7c 100644 --- a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild +++ b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single toolchain-funcs diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild new file mode 100644 index 000000000000..7694dd92ce4e --- /dev/null +++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua-single toolchain-funcs + +DESCRIPTION="An IMAP mail filtering utility" +HOMEPAGE="https://github.com/lefcha/imapfilter" +SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="libressl" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + dev-libs/libpcre + ${LUA_DEPS}" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS NEWS README samples/*" + +PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) + +src_prepare() { + default + sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \ + -e "/^MANDIR/s:man:share/man:" \ + -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \ + -e "/^CFLAGS/s/-O//" \ + src/Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" \ + INCDIRS=$(lua_get_CFLAGS) \ + LIBLUA=$(lua_get_LIBS) +} + +src_install() { + default + doman doc/imapfilter.1 doc/imapfilter_config.5 +} diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild index aa92b8e735bb..8eb03a28b5d3 100644 --- a/mail-filter/libmilter/libmilter-1.0.2.ebuild +++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild @@ -17,7 +17,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="ipv6 poll" DEPEND="!mail-mta/sendmail diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild index 8e1ef5506072..4738d9ee9e12 100644 --- a/mail-filter/libspf2/libspf2-1.2.10.ebuild +++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.libspf2.org/spf/libspf2-${PV}.tar.gz" LICENSE="|| ( LGPL-2.1 BSD-2 )" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="static static-libs" DEPEND="" diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild index 4d0c263508ed..ad3fc51b0e44 100644 --- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild +++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="static-libs" RDEPEND="!dev-perl/Mail-SRS" diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild index f35f6903ab9f..7c420ee1bcb4 100644 --- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild +++ b/mail-filter/mailfilter/mailfilter-0.8.4.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=6 diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest index 0bbcc99dc50c..b2e1eed7cafb 100644 --- a/mail-filter/mapson/Manifest +++ b/mail-filter/mapson/Manifest @@ -1,2 +1 @@ DIST mapson-3.3.1.tar.gz 553101 BLAKE2B 5100029e4b650b63cf868de48d9c709ac9fa8dcf773adb9ab70061756604116d69a20421d96ca769e19047efbe806cfc63432269cc83133f7f7f54f71b627d45 SHA512 07ecfdd2f9857a8b3818d065e4c342fda5089b77074ea153f9a380fe655716a214ff06f79eebe768b2470724e11a6ee819c1e457a47670c07537d6fd226dc1db -DIST mapson-3.3.tar.gz 421820 BLAKE2B e12c358113452a426cd5b55b945b77a303b595362064f6c84fe8bd8799502dd72872ca46cf54ce04022c3d27be52a849e337ae149521ce6ca35e990be73c1e98 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0 diff --git a/mail-filter/mapson/files/mapson-3.3-gcc6.patch b/mail-filter/mapson/files/mapson-3.3-gcc6.patch deleted file mode 100644 index d43c2cb95ea9..000000000000 --- a/mail-filter/mapson/files/mapson-3.3-gcc6.patch +++ /dev/null @@ -1,287 +0,0 @@ ---- a/accept-confirmation.cpp -+++ b/accept-confirmation.cpp -@@ -52,7 +52,7 @@ - for (rc = read(fd, tmp, sizeof(tmp)); rc > 0; rc = read(fd, tmp, sizeof(tmp))) - mail.append(tmp, rc); - if (rc < 0) -- throw system_error(string("Failed to read mail file '") + filename + "'"); -+ throw mapson_system_error(string("Failed to read mail file '") + filename + "'"); - deliver(mail); - unlink(filename.c_str()); - } ---- a/address-db.cpp -+++ b/address-db.cpp -@@ -26,7 +26,7 @@ - - fd = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); - if (fd < 0) -- throw system_error(string("Can't open address db '") + -+ throw mapson_system_error(string("Can't open address db '") + - filename + "' for reading"); - fd_sentry sentry(fd); - -@@ -36,7 +36,7 @@ - lock.l_start = 0; - lock.l_len = 0; - if (fcntl(fd, F_SETLKW, &lock) != 0) -- throw system_error(string("Can't lock file '") + filename + "'"); -+ throw mapson_system_error(string("Can't lock file '") + filename + "'"); - - // Read the file into memory. - -@@ -47,7 +47,7 @@ - rc = read(fd, buffer, sizeof(buffer))) - data.append(buffer, rc); - if (rc < 0) -- throw system_error(string("Failed to read address db '") + -+ throw mapson_system_error(string("Failed to read address db '") + - filename + "' into memory"); - - // Success. Don't close the file descriptor. -@@ -107,7 +107,7 @@ - { - ssize_t rc = write(fd, data.data()+len, data.size()-len); - if (rc < 0) -- throw system_error(string("Failed writing to the address db '") + filename + "'"); -+ throw mapson_system_error(string("Failed writing to the address db '") + filename + "'"); - else - len += rc; - } ---- a/config.cpp -+++ b/config.cpp -@@ -70,9 +70,9 @@ - string tmp = string(name) + "=" + value; - char* env = strdup(tmp.c_str()); - if (env == 0) -- throw system_error("strdup() failed"); -+ throw mapson_system_error("strdup() failed"); - if (putenv(env) != 0) -- throw system_error("putenv() failed"); -+ throw mapson_system_error("putenv() failed"); - } - } - -@@ -84,7 +84,7 @@ - - pwd_sentry sentry(getpwuid(getuid())); - if (sentry.pwd == 0) -- throw system_error("Can't get my user name"); -+ throw mapson_system_error("Can't get my user name"); - log_file.assign(sentry.pwd->pw_dir).append("/.mapson/log"); - spool_dir.assign(sentry.pwd->pw_dir).append("/.mapson/spool"); - address_db.assign(sentry.pwd->pw_dir).append("/.mapson/address-db"); ---- a/deliver.cpp -+++ b/deliver.cpp -@@ -31,11 +31,11 @@ - - FILE* fh = popen(config->mailbox.c_str()+1, "w"); - if (fh == NULL) -- throw system_error(string("Can't start delivery pipe '") + config->mailbox + "'"); -+ throw mapson_system_error(string("Can't start delivery pipe '") + config->mailbox + "'"); - int len = fwrite(mail.data(), mail.size(), 1, fh); - pclose(fh); - if (len != 1) -- throw system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'"); -+ throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'"); - } - else - { -@@ -43,7 +43,7 @@ - - int fd = open(config->mailbox.c_str(), O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR); - if (fd < 0) -- throw system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing"); -+ throw mapson_system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing"); - fd_sentry sentry(fd); - - struct flock lock; -@@ -52,13 +52,13 @@ - lock.l_start = 0; - lock.l_len = 0; - if (fcntl(fd, F_SETLKW, &lock) != 0) -- throw system_error(string("Can't lock file '") + config->mailbox + "'"); -+ throw mapson_system_error(string("Can't lock file '") + config->mailbox + "'"); - - for (size_t len = 0; len < mail.size(); ) - { - ssize_t rc = write(fd, mail.data()+len, mail.size()-len); - if (rc < 0) -- throw system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'"); -+ throw mapson_system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'"); - else - len += rc; - } ---- a/lines2regex.cpp -+++ b/lines2regex.cpp -@@ -29,7 +29,7 @@ - if (errno == ENOENT) - return ""; - else -- throw system_error(string("Can't open regex db '") + -+ throw mapson_system_error(string("Can't open regex db '") + - filename + "' for reading"); - } - fd_sentry sentry(fd); -@@ -40,7 +40,7 @@ - lock.l_start = 0; - lock.l_len = 0; - if (fcntl(fd, F_SETLKW, &lock) != 0) -- throw system_error(string("Can't lock file '") + filename + "'"); -+ throw mapson_system_error(string("Can't lock file '") + filename + "'"); - - // Read the file into memory. - -@@ -52,7 +52,7 @@ - rc = read(fd, buffer, sizeof(buffer))) - data.append(buffer, rc); - if (rc < 0) -- throw system_error(string("Failed to read regex db '") + -+ throw mapson_system_error(string("Failed to read regex db '") + - filename + "' into memory"); - - // Walk through the lines and compile the regexes. ---- a/log.cpp -+++ b/log.cpp -@@ -30,10 +30,10 @@ - char buf[64]; - time_t tstamp = time(0); - if (tstamp == static_cast<time_t>(-1)) -- throw system_error("time(2) failed"); -+ throw mapson_system_error("time(2) failed"); - struct tm* tmtime = localtime(&tstamp); - if (tmtime == 0) -- throw system_error("localtime(3) failed"); -+ throw mapson_system_error("localtime(3) failed"); - strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tmtime); - return buf; - } -@@ -42,7 +42,7 @@ - { - fileh.file = fopen(file, "a"); - if (fileh.file == 0) -- throw system_error(string("Could not open log file ") + file); -+ throw mapson_system_error(string("Could not open log file ") + file); - - struct flock lock; - lock.l_type = F_WRLCK; -@@ -50,7 +50,7 @@ - lock.l_start = 0; - lock.l_len = 0; - if (fcntl(fileno(fileh.file), F_SETLKW, &lock) != 0) -- throw system_error(string("Can't lock file '") + file + "'"); -+ throw mapson_system_error(string("Can't lock file '") + file + "'"); - } - - void _debug(const char* fmt, ...) ---- a/mapson.cpp -+++ b/mapson.cpp -@@ -62,7 +62,7 @@ - - fd = open(argv[i], O_RDONLY, 0); - if (fd < 0) -- throw system_error("Can't open file for reading"); -+ throw mapson_system_error("Can't open file for reading"); - fd_sentry sentry(fd); - string mail; - for (rc = read(fd, buffer, sizeof(buffer)); -@@ -72,7 +72,7 @@ - mail.append(buffer, rc); - } - if (rc < 0) -- throw system_error("Failed to read from file"); -+ throw mapson_system_error("Failed to read from file"); - - // Extract the mail addresses. - -@@ -196,7 +196,7 @@ - mail.append(buffer, rc); - } - if (rc < 0) -- throw system_error("Failed to read mail from standard input"); -+ throw mapson_system_error("Failed to read mail from standard input"); - - // Check whether the mail contains a valid cookie. If it does, - // mail will be replaced with the original e-mail, that was ---- a/parse-config-file.cpp -+++ b/parse-config-file.cpp -@@ -55,7 +55,7 @@ - - std::ifstream file(filename); - if (!file) -- throw system_error(std::string("parse_config_file() failed to open '") + filename + "'"); -+ throw mapson_system_error(std::string("parse_config_file() failed to open '") + filename + "'"); - - // Now we read line by line and process each one seperately. - ---- a/request-confirmation.cpp -+++ b/request-confirmation.cpp -@@ -157,7 +157,7 @@ - string filename = config->request_for_confirmation_file; - int fd = multi_open(filename, O_RDONLY, S_IRUSR | S_IWUSR); - if (fd < 0) -- throw system_error(string("Can't open request-mail template file '") + filename + "' for reading"); -+ throw mapson_system_error(string("Can't open request-mail template file '") + filename + "' for reading"); - fd_sentry sentry(fd); - - // Read the file into memory. -@@ -167,7 +167,7 @@ - for (rc = read(fd, buffer, sizeof(buffer)); rc > 0; rc = read(fd, buffer, sizeof(buffer))) - mail_template.append(buffer, rc); - if (rc < 0) -- throw system_error(string("Failed to read request-mail template file '") + filename + "' into memory"); -+ throw mapson_system_error(string("Failed to read request-mail template file '") + filename + "' into memory"); - - // Expand variables in the template. - -@@ -180,11 +180,11 @@ - debug(("Executing mail transport agent '%s'.", config->mta.c_str())); - FILE* fh = popen(config->mta.c_str(), "w"); - if (fh == NULL) -- throw system_error(string("Can't start MTA '") + config->mta + "'"); -+ throw mapson_system_error(string("Can't start MTA '") + config->mta + "'"); - if (fwrite(mail_template.data(), mail_template.size(), 1, fh) != 1) - { - pclose(fh); -- throw system_error(string("Failed to pipe to MTA process '") + config->mta + "'"); -+ throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mta + "'"); - } - pclose(fh); - } ---- a/spool.cpp -+++ b/spool.cpp -@@ -44,13 +44,13 @@ - info("Spooling e-mail '%s' as '%s'.", config->message_id.c_str(), filename.c_str()); - int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); - if (fd < 0) -- throw system_error(string("Can't open spool file '") + filename + "' for writing"); -+ throw mapson_system_error(string("Can't open spool file '") + filename + "' for writing"); - fd_sentry sentry(fd); - for (size_t len = 0; len < mail.size(); ) - { - ssize_t rc = write(fd, mail.data()+len, mail.size()-len); - if (rc < 0) -- throw system_error(string("Failed writing to the spool file '") + filename + "'"); -+ throw mapson_system_error(string("Failed writing to the spool file '") + filename + "'"); - else - len += rc; - } ---- a/system-error.hpp -+++ b/system-error.hpp -@@ -23,14 +23,14 @@ - #include <string> - #include <cstring> - --class system_error : public std::runtime_error -+class mapson_system_error : public std::runtime_error - { - public: -- system_error() : runtime_error(str()) -+ mapson_system_error() : runtime_error(str()) - { - } - -- explicit system_error(std::string const & msg) -+ explicit mapson_system_error(std::string const & msg) - : runtime_error(msg + ": " + str()) - { - } diff --git a/mail-filter/mapson/mapson-3.3-r1.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild deleted file mode 100644 index 02859c614ffa..000000000000 --- a/mail-filter/mapson/mapson-3.3-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A challenge/response-based white-list spam filter" -HOMEPAGE="https://sourceforge.net/projects/mapson/" -SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug" - -RDEPEND=" - acct-user/mail - virtual/mta -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.3-gcc6.patch - "${FILESDIR}"/${PN}-3.3-respect-AR.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with debug) -} - -src_install() { - emake DESTDIR="${ED}" install - - dodoc AUTHORS INSTALL NEWS README - doman doc/mapson.1 - - docinto html - dodoc doc/mapson.html - - insinto /etc/mapson - newins sample-config mapson.config - - insinto /usr/share/mapson - newins sample-challenge-template challenge-template - - rm -f "${ED}"/etc/sample-config || die - rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die -} diff --git a/mail-filter/mapson/mapson-3.3.1.ebuild b/mail-filter/mapson/mapson-3.3.1.ebuild index 43edb4c0e930..bbcc2038b5fd 100644 --- a/mail-filter/mapson/mapson-3.3.1.ebuild +++ b/mail-filter/mapson/mapson-3.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug" RDEPEND=" diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch new file mode 100644 index 000000000000..9e963eced4dd --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch @@ -0,0 +1,51 @@ +From 6dcab8d2e001bb4b91314693affa65e9c1a9adbd Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Tue, 22 Dec 2020 19:36:28 -0500 +Subject: [PATCH 1/2] configure.ac: drop lua5.1 pkg-config check. + +The official upstream name for the lua pkg-config file is "lua.pc", so +preferring the name "lua5.1.pc" to the official one can lead to +problems when both are installed. Specifically, if lua-5.2 is +installed and its pkg-config file is called "lua.pc", then ./configure +will still detect (and use!) lua-5.1 if it happens to be installed +with just the right name. + +This was honestly left in only for superstitious reasons, and now it's +actually causing problems on Gentoo systems that have more than one +version of Lua installed. So, time to go. + +Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/111 +--- + configure.ac | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 828fe53f..d3d688ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1517,20 +1517,10 @@ lua_found="no" + + if test \( x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x"" + then +- PKG_CHECK_MODULES([LIBLUA], [lua5.1], [ ++ PKG_CHECK_MODULES([LIBLUA], [lua], [ + LIBLUA_INCDIRS="$LIBLUA_CFLAGS" + lua_found="yes" +- ], +- [ +- AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...]) +- PKG_CHECK_MODULES([LIBLUA], [lua], [ +- LIBLUA_INCDIRS="$LIBLUA_CFLAGS" +- lua_found="yes" +- ], +- [AC_MSG_WARN([pkg-config for lua not found, trying manual search...])] +- ) +- ] +- ) ++ ]) + fi + + if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no" +-- +2.26.2 + diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml index 0c5d0b5ab0c2..017603d731d7 100644 --- a/mail-filter/opendkim/metadata.xml +++ b/mail-filter/opendkim/metadata.xml @@ -1,27 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - - <maintainer type="person"> - <email>gentoo@seichter.de</email> - <name>Ralph Seichter</name> - </maintainer> - <maintainer type="person"> <email>klondike@gentoo.org</email> <name>Francisco Blas Izquierdo Riera</name> </maintainer> - <maintainer type="person"> <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> - - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription> A program implementing the Milter API that signs and verifies using the DKIM standard. This is a fork of Sendmail's DKIM-milter diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild index ff3c69920d0a..ef0518f4da0d 100644 --- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild +++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm x86" IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound" BDEPEND="acct-user/opendkim - test? ( dev-lang/lua:* )" + test? ( dev-lang/lua:0= )" COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd @@ -27,7 +27,7 @@ COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) diff --git a/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild index d49e1f6a3625..242061fd5a6c 100644 --- a/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild +++ b/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound" BDEPEND="acct-user/opendkim - test? ( dev-lang/lua:* )" + test? ( dev-lang/lua:0= )" COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd @@ -27,7 +27,7 @@ COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild index b38499601ac8..66f7eba8b167 100644 --- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild +++ b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-1 lua5-2} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit autotools db-use eutils systemd tmpfiles lua-single @@ -55,6 +55,7 @@ PATCHES=( "${FILESDIR}/${P}-openrc.patch" "${FILESDIR}/${P}-openssl-1.1.1.patch.r2" "${FILESDIR}/${P}-lua-pkgconfig.patch" + "${FILESDIR}/${P}-lua-pkgconfig-pt2.patch" "${FILESDIR}/${P}-define-P-macro-in-libvbr.patch" "${FILESDIR}/${P}-fix-libmilter-search.patch" ) @@ -67,6 +68,15 @@ src_prepare() { sed -e 's:dist_doc_DATA:dist_html_DATA:' \ -i libopendkim/docs/Makefile.am \ || die + + # The existing hard-coded path under /tmp is vulnerable to exploits + # since (for example) a user can create a symlink there to a file + # that portage will clobber. Reported upstream at, + # + # https://github.com/trusteddomainproject/OpenDKIM/issues/113 + # + sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die + eautoreconf } @@ -120,6 +130,12 @@ src_compile() { emake runstatedir=/run } +src_test() { + # Needed for now due to the expected sequencing of the setup/cleanup + # tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110 + emake -j1 check +} + src_install() { default find "${D}" -name '*.la' -type f -delete || die diff --git a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild index f1406d1303d8..14f0041012cd 100644 --- a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild +++ b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${P LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="spf +reports static-libs" DEPEND="reports? ( dev-perl/DBI ) diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest index b445413d7923..ae58ff0be96f 100644 --- a/mail-filter/postgrey/Manifest +++ b/mail-filter/postgrey/Manifest @@ -1,2 +1,2 @@ -DIST postgrey-1.36.tar.gz 38797 BLAKE2B b8e4dedb28ababc92cdd1d128652a468caeb55eb611ca019148a2e538d3cc0d397cd14889942904b05c9471bb13ed9fa6250e399d47df22241895c109a68315d SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395 DIST postgrey-1.37.tar.gz 41815 BLAKE2B dd8a1f62f56a614c25863afde089f1882a1567e3a53a24b1d12b6f23994388caf99059f05775853065143f4f953a6fd964625d5c865993e0e679dd545b848c11 SHA512 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca +DIST postgrey-1.37_p20190625.tar.gz 124667 BLAKE2B ca2caba51a72198e42d6d4d9c5c7590b62c1bd1589d05bfb4096fb4d95ff62ff96976beac8c1b35136a4a6830af936244485ff7dcdcd46d8558a4bef0bbb123a SHA512 f3caf3c7663bd8784701c7e1ad45d1c577edf6fac14591a6983fda25e7f8a875f2501780a8f97ce72e6a324878404e9ac2a003a07ae07ad4debae61fe734b8d4 diff --git a/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch b/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch deleted file mode 100644 index 615c6e5b77d1..000000000000 --- a/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9673b54064691a5b9c295ffea340d8a1f9ee1cb8 Mon Sep 17 00:00:00 2001 -From: Yasuhiro KIMURA <yasu@utahime.org> -Date: Sat, 17 Aug 2013 22:05:27 +0900 -Subject: [PATCH] Make postgrey work with Perl 5.18 - ---- - postgrey | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/postgrey b/postgrey -index 7cb0352..37f69bd 100755 ---- a/postgrey -+++ b/postgrey -@@ -557,6 +557,16 @@ sub main() - if($opt{dbdir}) { - $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1; - } -+ # untaint what is given on --pidfile. It is not security sensitive since -+ # it is provided by the admin -+ if($opt{pidfile}) { -+ $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1; -+ } -+ # untaint what is given on --inet. It is not security sensitive since -+ # it is provided by the admin -+ if($opt{inet}) { -+ $opt{inet} =~ /^(.*)$/; $opt{inet} = $1; -+ } - - # determine proper "logsock" for Sys::Syslog - my $syslog_logsock; --- -2.0.3 - diff --git a/mail-filter/postgrey/files/targrey-0.31-postgrey-1.34.patch b/mail-filter/postgrey/files/targrey-0.31-postgrey-1.34.patch deleted file mode 100644 index a17b6457d39a..000000000000 --- a/mail-filter/postgrey/files/targrey-0.31-postgrey-1.34.patch +++ /dev/null @@ -1,202 +0,0 @@ ---- postgrey.orig 2011-05-04 22:54:15.000000000 +0200 -+++ postgrey 2011-10-17 10:10:21.000000000 +0200 -@@ -309,6 +309,22 @@ - $self->mylog(1, "cleaning clients database finished. before: $nr_keys_before, after: $nr_keys_after"); - } - -+ if($self->{postgrey}{targrey}) { -+ # cleanup tarpit blacklist database -+ my $tarpit_db = $self->{postgrey}{db_tarpit}; -+ ($nr_keys_before, $nr_keys_after) = (0, 0); -+ while (my ($key, $tarpit_last_seen) = each %$tarpit_db) { -+ $nr_keys_before++; -+ if($now - $tarpit_last_seen > $retry_window) { -+ delete $tarpit_db->{$key}; -+ } -+ else { -+ $nr_keys_after++; -+ } -+ } -+ $self->mylog(1, "cleaning tarpit blacklist database finished. before: $nr_keys_before, after: $nr_keys_after"); -+ } -+ - $self->{postgrey}{last_maint_keys}=$now; - } - } -@@ -383,7 +399,7 @@ - # whitelist if count is enough - if(defined $cawl_count and $cawl_count >= $self->{postgrey}{awl_clients}) - { -- if(($now >= $cawl_last+3600) or ($cawl_last > $now)) { -+ if(($now >= $cawl_last + $self->{postgrey}{awl_delay}) or ($cawl_last > $now)) { - $cawl_count++; # for statistics - $cawl_db->{$cawl_key}=$cawl_count.','.$now; - } -@@ -392,6 +408,28 @@ - } - } - -+ # check tarpit passed if targrey mode -+ if ($self->{postgrey}{targrey} && $attr->{protocol_state} eq 'DATA') { # passed tarpit -+ # remove tarpit blacklist -+ my $tarpit_db = $self->{postgrey}{db_tarpit}; -+ my $tarpit_key = $attr->{client_address}; -+ delete $tarpit_db->{$tarpit_key}; -+ -+ # auto whitelist clients by tarpit -+ if ($self->{postgrey}{awl_clients}) { -+ # enough time has passed (record only one attempt per hour) -+ if (! defined $cawl_last or $now >= $cawl_last + $self->{postgrey}{awl_delay}) { -+ # ok, increase count -+ $cawl_count++; -+ $cawl_db->{$cawl_key}=$cawl_count.','.$now; -+ $self->mylog(1, "tarpit whitelisted: $attr->{client_name}"."[".$attr->{client_address}."]") -+ if $cawl_count==$self->{postgrey}{awl_clients}; -+ } -+ } -+ -+ return 'DUNNO'; -+ } -+ - # lookup - my $sender = $self->do_sender_substitutions($attr->{sender}); - my ($client_net, $client_host) = -@@ -402,10 +440,11 @@ - } - my $val = $db->{$key}; - my $first; -+ my $retry_count=0; - my $last_was_successful=0; - if(defined $val) { - my $last; -- ($first, $last) = split(/,/,$val); -+ ($first, $last, $retry_count) = split(/,/,$val); - # find out if the last time was unsuccessful, so that we can add a header - # to say how much had to be waited - if($last - $first >= $self->{postgrey}{delay}) { -@@ -426,16 +465,19 @@ - $first = $now; - } - -+ my $diff = $self->{postgrey}{delay} - ($now - $first); -+ -+ # enough waited? -> increase retry_count -+ $retry_count++ if($diff <= 0); -+ - # update (put as last element stripped host-part if it was stripped) - if(defined $client_host) { -- $db->{$key}="$first,$now,$client_host"; -+ $db->{$key}="$first,$now,$retry_count,$client_host"; - } - else { -- $db->{$key}="$first,$now"; -+ $db->{$key}="$first,$now,$retry_count"; - } - -- my $diff = $self->{postgrey}{delay} - ($now - $first); -- - # auto whitelist clients - # algorithm: - # - on successful entry in the greylist db of a triplet: -@@ -443,23 +485,41 @@ - # - client whitelisted already? -> update last-seen timestamp - if($self->{postgrey}{awl_clients}) { - # greylisting succeeded -- if($diff <= 0 and !$last_was_successful) { -+ if($retry_count >= $self->{postgrey}{retry_count} and !$last_was_successful) { - # enough time has passed (record only one attempt per hour) -- if(! defined $cawl_last or $now >= $cawl_last + 3600) { -+ if(! defined $cawl_last or $now >= $cawl_last + $self->{postgrey}{awl_delay}) { - # ok, increase count - $cawl_count++; - $cawl_db->{$cawl_key}=$cawl_count.','.$now; - my $client = $attr->{client_name} ? - $attr->{client_name}.'['.$attr->{client_address}.']' : - $attr->{client_address}; -- $self->mylog(1, "whitelisted: $client") -+ $self->mylog(1, "whitelisted: $attr->{client_name}"."[".$attr->{client_address}."]") - if $cawl_count==$self->{postgrey}{awl_clients}; - } - } - } - -- # not enough waited? -> greylist -- if ($diff > 0 ) { -+ # not enough retry? -> greylist -+ if ($retry_count < $self->{postgrey}{retry_count}) { -+ if($self->{postgrey}{tarpit} && ! $self->{postgrey}{targrey}) { -+ # do tarpit and greylist if tarpit option only -+ # don't add message after greylist_action -+ return "SLEEP $self->{postgrey}{tarpit}, $self->{postgrey}{greylist_action}"; -+ } -+ if($self->{postgrey}{targrey}) { -+ # do tarpit if targrey option -+ # add tarpit blacklist -+ my $tarpit_db = $self->{postgrey}{db_tarpit}; -+ my $tarpit_key = $attr->{client_address}; -+ my $tarpit_last = $tarpit_db->{$tarpit_key}; -+ $tarpit_last = 0 unless (defined $tarpit_last); -+ $tarpit_db->{$tarpit_key} = "$now" if ($now >= $tarpit_last+300); # update if 5min ago -+ -+ # return sleep if not tarpit blacklisted -+ return "SLEEP $self->{postgrey}{tarpit}" if ($tarpit_last == 0); -+ # greylist if tarpit blacklisted -+ } - my $msg = $self->{postgrey}{greylist_text}; - # Workaround for an Exchange bug related to Greylisting: - # use DSN 4.2.0 instead of the default 4.7.1. This works -@@ -517,6 +577,7 @@ - 'syslogfacility|syslog-facility|facility=s', - 'retry-window=s', 'greylist-action=s', 'greylist-text=s', 'privacy', - 'hostname=s', 'exim', 'listen-queue-size=i', 'x-greylist-header=s', -+ 'tarpit:s', 'targrey', 'retry-count=i', 'auto-whitelist-delay=i', - ) or exit(1); - # note: lookup-by-subnet can be given for compatibility, but it is default - # so do not do nothing with it... -@@ -606,7 +667,9 @@ - awl_clients => defined $opt{'auto-whitelist-clients'} ? - ($opt{'auto-whitelist-clients'} ne '' ? - $opt{'auto-whitelist-clients'} : 5) : 5, -+ awl_delay => $opt{'auto-whitelist-delay'} || 3600, - retry_window => $retry_window, -+ retry_count => $opt{'retry-count'} || 1, - greylist_action => $opt{'greylist-action'} || 'DEFER_IF_PERMIT', - greylist_text => $opt{'greylist-text'} || 'Greylisted, see http://postgrey.schweikert.ch/help/%r.html', - whitelist_clients_files => $opt{'whitelist-clients'} || -@@ -618,6 +681,10 @@ - hostname => defined $opt{hostname} ? $opt{hostname} : hostname, - exim => defined $opt{'exim'}, - x_greylist_header => $opt{'x-greylist-header'} || 'X-Greylist: delayed %t seconds by postgrey-%v at %h; %d', -+ tarpit => defined $opt{'tarpit'} ? -+ ($opt{'tarpit'} ne '' ? -+ $opt{'tarpit'} : 65) : undef, -+ targrey => defined $opt{'targrey'}, - }, - }, 'postgrey'; - -@@ -633,6 +700,11 @@ - require Digest::SHA; - } - -+ # --targrey needs tarpit sec -+ if(defined $opt{'targrey'} && ! defined $opt{'tarpit'}) { -+ $server->{postgrey}{tarpit} = 125; -+ } -+ - $0 = join(' ', @{$server->{server}{commandline}}); - $server->run; - -@@ -711,6 +783,13 @@ - -Env => $self->{postgrey}{db_env} - ) or die "ERROR: can't create database $self->{server}{dbdir}/postgrey_clients.db: $!\n"; - } -+ if($self->{postgrey}{targrey}) { # use targrey -+ tie(%{$self->{postgrey}{db_tarpit}}, 'BerkeleyDB::Btree', -+ -Filename => 'tarpit_clients.db', -+ -Flags => DB_CREATE, -+ -Env => $self->{postgrey}{db_env} -+ ) or die "ERROR: can't create database $self->{server}{dbdir}/tarpit_clients.db: $!\n"; -+ } - } - - sub mux_input() diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml index 0ad1be606de3..b411ed0f2447 100644 --- a/mail-filter/postgrey/metadata.xml +++ b/mail-filter/postgrey/metadata.xml @@ -2,18 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>lists@xunil.at</email> - <name>Stefan Weichinger</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> <longdescription> Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE. </longdescription> - <use> - <flag name="targrey">Enables the targrey patch</flag> - </use> + <upstream> + <remote-id type="github">schweikert/postgrey</remote-id> + </upstream> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/mail-filter/postgrey/postgrey-1.37.ebuild b/mail-filter/postgrey/postgrey-1.37.ebuild index 59932bed5424..f9070ca4ffb9 100644 --- a/mail-filter/postgrey/postgrey-1.37.ebuild +++ b/mail-filter/postgrey/postgrey-1.37.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ~ppc ppc64 x86" IUSE="" DEPEND="" diff --git a/mail-filter/postgrey/postgrey-1.36-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild index a6485ac49c2f..59c2f6c19049 100644 --- a/mail-filter/postgrey/postgrey-1.36-r1.ebuild +++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild @@ -1,43 +1,43 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils systemd user +inherit systemd +COMMIT="eb420c5dee57dd54e6f63bad5d74e85f5cc9535d" DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" HOMEPAGE="https://postgrey.schweikert.ch/" -SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz -http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" +SRC_URI="https://github.com/schweikert/postgrey/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 hppa ~ppc ppc64 x86" -IUSE="targrey" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -DEPEND="" -RDEPEND=">=dev-lang/perl-5.6.0 - dev-perl/Net-Server - dev-perl/IO-Multiplex - dev-perl/BerkeleyDB - dev-perl/Net-DNS - dev-perl/NetAddr-IP - dev-perl/Net-RBLClient - dev-perl/Parse-Syslog - virtual/perl-Digest-SHA - >=sys-libs/db-4.1" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} +DEPEND=" + acct-group/postgrey + acct-user/postgrey +" +RDEPEND=" + ${DEPEND} + >=dev-lang/perl-5.6.0 + dev-perl/Net-Server + dev-perl/IO-Multiplex + dev-perl/BerkeleyDB + dev-perl/Net-DNS + dev-perl/NetAddr-IP + dev-perl/Net-RBLClient + dev-perl/Parse-Syslog + virtual/perl-Digest-SHA + >=sys-libs/db-4.1 +" src_prepare() { - if use targrey ; then - epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch - fi + default # bug 479400 sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed" + sed -i -e '/git/d' Makefile || die } src_install() { diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest index fd02a04e05a9..48f18bff6ea7 100644 --- a/mail-filter/postsrsd/Manifest +++ b/mail-filter/postsrsd/Manifest @@ -1 +1 @@ -DIST postsrsd-1.6.tar.gz 32111 BLAKE2B 5b4e562aa9c9b5faf0e45c035a71d76dc2b6e9b3d4399108f06e6d0ad3e4f7abfcb8c18c818f3b4787bab155bf7895caaf127a97b861b26525ad5a27f2ee4dc7 SHA512 b2df4cdec41361e15cd8c9207fb16564d607559bcb36dd73c9347b90e4f3c2414b88434ef1ffe6a18783f38c5960383516e40e4ffa28802a03539e52ca723aa1 +DIST postsrsd-1.10.tar.gz 34844 BLAKE2B 4722e8f3ec1d5d7de0648d8afc03c38f485c92b092bd42bc02c82c4072b5eb053cbb907bd1198de1219acf465c850b4f08ee8bca629f85734ca2ff643d77c1e4 SHA512 79f824cbc56de2e79da2eb67b1888c1c171a10a7bae5f19384c22024ff7e65dd36a447e632ddaf77bea6bdfa4972c7a918a30cd3b06f7b7ae49ab7552c43be0e diff --git a/mail-filter/postsrsd/postsrsd-1.6.ebuild b/mail-filter/postsrsd/postsrsd-1.10.ebuild index 5b7fe63b27e0..9e1777c300cc 100644 --- a/mail-filter/postsrsd/postsrsd-1.6.ebuild +++ b/mail-filter/postsrsd/postsrsd-1.10.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="Postfix Sender Rewriting Scheme daemon" SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND=">=dev-util/cmake-2.4" +BDEPEND=">=dev-util/cmake-2.4" RDEPEND="" CHROOT_DIR="${EPREFIX}/var/lib/postsrsd" @@ -24,11 +24,11 @@ src_configure() { -DCHROOT_DIR=${CHROOT_DIR} -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install newinitd "${FILESDIR}/postsrsd.init-r1" postsrsd newconfd "${BUILD_DIR}/postsrsd.default" postsrsd keepdir ${CHROOT_DIR} diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild b/mail-filter/procmail/procmail-3.22-r14.ebuild index 1a6e95025cea..17a88009d03f 100644 --- a/mail-filter/procmail/procmail-3.22-r14.ebuild +++ b/mail-filter/procmail/procmail-3.22-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz" LICENSE="|| ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="mbox selinux" DEPEND="virtual/mta" diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest index 418fdd57e1cd..23730c858e15 100644 --- a/mail-filter/pyzor/Manifest +++ b/mail-filter/pyzor/Manifest @@ -1,2 +1 @@ -DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f diff --git a/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch b/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch deleted file mode 100644 index 03031a976690..000000000000 --- a/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 66225b32d2774cf37fa7f702f7eb26cd94094482 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sun, 4 Mar 2018 17:27:01 -0500 -Subject: [PATCH 1/1] scripts/pyzor: replace the client with the git (+ issue - 64 fix) version. - ---- - scripts/pyzor | 33 +++++++++++++++++++++++++++------ - 1 file changed, 27 insertions(+), 6 deletions(-) - -diff --git a/scripts/pyzor b/scripts/pyzor -index 19b1d21..86c6f7d 100755 ---- a/scripts/pyzor -+++ b/scripts/pyzor -@@ -17,9 +17,9 @@ import tempfile - import threading - - try: -- import ConfigParser --except ImportError: - import configparser as ConfigParser -+except ImportError: -+ import ConfigParser - - import pyzor.digest - import pyzor.client -@@ -110,7 +110,7 @@ def load_configuration(): - config = ConfigParser.ConfigParser() - # Set the defaults. - config.add_section("client") -- for key, value in defaults.iteritems(): -+ for key, value in defaults.items(): - config.set("client", key, value) - # Override with the configuration. - config.read(os.path.join(options.homedir, "config")) -@@ -171,14 +171,35 @@ def _get_input_digests(dummy): - - - def _get_input_msg(digester): -- msg = email.message_from_file(sys.stdin) -+ msg = email.message_from_bytes(get_binary_stdin().read()) - digested = digester(msg).value - yield digested - - -+def _is_binary_reader(stream, default=False): -+ try: -+ return isinstance(stream.read(0), bytes) -+ except Exception: -+ return default -+ -+ -+def get_binary_stdin(): -+ # sys.stdin might or might not be binary in some extra cases. By -+ # default it's obviously non binary which is the core of the -+ # problem but the docs recommend changing it to binary for such -+ # cases so we need to deal with it. -+ is_binary = _is_binary_reader(sys.stdin, False) -+ if is_binary: -+ return sys.stdin -+ buf = getattr(sys.stdin, 'buffer', None) -+ if buf is not None and _is_binary_reader(buf, True): -+ return buf -+ raise RuntimeError('Did not manage to get binary stdin') -+ -+ - def _get_input_mbox(digester): - tfile = tempfile.NamedTemporaryFile() -- tfile.write(sys.stdin.read().encode("utf8")) -+ tfile.write(get_binary_stdin().read()) - tfile.seek(0) - mbox = mailbox.mbox(tfile.name) - for msg in mbox: -@@ -372,7 +393,7 @@ def genkey(client, servers, config, hash_func=hashlib.sha1): - return False - # pylint: disable-msg=W0612 - salt = "".join([chr(random.randint(0, 255)) -- for unused in xrange(hash_func(b"").digest_size)]) -+ for unused in range(hash_func(b"").digest_size)]) - if sys.version_info >= (3, 0): - salt = salt.encode("utf8") - salt_digest = hash_func(salt) --- -2.13.6 - diff --git a/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch b/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch deleted file mode 100644 index 93d0f07a2579..000000000000 --- a/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e4f06e21f697b863fa45a50e535ff0c6e3621a60 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Sun, 25 Mar 2018 10:14:21 -0400 -Subject: [PATCH 1/1] scripts/pyzor: undo ConfigParser python-3.x - compatibility. - -The build system for pyzor-1.0.0 still runs the 2to3 utility on the -scripts to be installed. As an unintended side-effect, the python-3.x -"try... import... except" compatibility block for the ConfigParser <-> -configparser module gets modified (the module name gets mistakenly -lowercased). - -This commit puts back the python-2.x "import ConfigParser" line -unconditionally, and we'll have to rely on 2to3 to fix it when run -under python-3.x. In newer versions of pyzor, the automatic 2to3 will -not happen. - -Bug: https://bugs.gentoo.org/643692 ---- - scripts/pyzor | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/scripts/pyzor b/scripts/pyzor -index 86c6f7d..2750d92 100755 ---- a/scripts/pyzor -+++ b/scripts/pyzor -@@ -16,10 +16,7 @@ import optparse - import tempfile - import threading - --try: -- import configparser as ConfigParser --except ImportError: -- import ConfigParser -+import ConfigParser - - import pyzor.digest - import pyzor.client --- -2.16.1 - diff --git a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild deleted file mode 100644 index 80afd4218a8e..000000000000 --- a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -MY_PV="1-0-0" -DESCRIPTION="A distributed, collaborative spam detection and filtering network" -HOMEPAGE="https://github.com/SpamExperts/pyzor" -SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -IUSE="doc gdbm gevent pyzord redis test" -# The test suite is py2-only -RESTRICT="test" - -# The mysql-python library is always required for the MySQL engine. We -# depend on it conditionally here because otherwise repoman will balk at -# the potential conflict between PYTHON_TARGETS and USE=mysql. But as a -# result, if you try to use the MySQL engine with python-3.x, it just -# won't work because you'll be missing the library. -RDEPEND=" - pyzord? ( - gdbm? ( $(python_gen_impl_dep 'gdbm') ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - gevent? ( dev-python/gevent[${PYTHON_USEDEP}] ) - )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( ${RDEPEND} )" - -# TODO: maybe upstream would support skipping tests for which the -# dependencies are missing? -REQUIRED_USE="pyzord? ( || ( gdbm redis ) ) - test? ( gdbm redis )" -S="${WORKDIR}/${PN}-release-${MY_PV}" - -PATCHES=( - "${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch" - "${FILESDIR}/unfix-configparser-compat-for-2to3.patch" -) - -python_test() { - PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_install_all() { - use doc && HTML_DOCS=( docs/.build/html/. ) - distutils-r1_python_install_all -} - -src_install() { - distutils-r1_src_install - - if use pyzord; then - dodir /usr/sbin - mv "${D}"usr/bin/pyzord* "${ED}usr/sbin" \ - || die "failed to relocate pyzord" - else - rm "${D}"usr/bin/pyzord* || die "failed to remove pyzord" - fi -} diff --git a/mail-filter/razor/razor-2.85-r3.ebuild b/mail-filter/razor/razor-2.85-r3.ebuild index 5b56997df36f..0662dcdf48ab 100644 --- a/mail-filter/razor/razor-2.85-r3.ebuild +++ b/mail-filter/razor/razor-2.85-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2" LICENSE="Artistic" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" dev-perl/URI diff --git a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild index f9305dbb4bf4..f8aa98a7b716 100644 --- a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild +++ b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/logic/rblcheck" SRC_URI="https://github.com/logic/rblcheck/releases/download/${P}/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86" IUSE="" src_prepare() { diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 7b2fbeee7132..df4f86e665d9 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,2 +1,2 @@ -DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a +DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 diff --git a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch deleted file mode 100644 index 81d7f3de2958..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx -index a09886701..8df176d1c 100644 ---- a/contrib/replxx/src/io.cxx -+++ b/contrib/replxx/src/io.cxx -@@ -3,6 +3,7 @@ - #include <cstdlib> - #include <cstring> - #include <array> -+#include <stdexcept> - - #ifdef _WIN32 - diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch deleted file mode 100644 index 4a20c8f19d3f..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bbc141170..7fbb1b485 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -598,10 +598,6 @@ ADD_SUBDIRECTORY(contrib/libev) - ADD_SUBDIRECTORY(contrib/kann) - ADD_SUBDIRECTORY(contrib/fastutf8) - --IF (NOT WITH_LUAJIT) -- ADD_SUBDIRECTORY(contrib/lua-bit) --ENDIF() -- - IF (ENABLE_LUA_REPL MATCHES "ON") - ADD_SUBDIRECTORY(contrib/replxx) - SET(WITH_LUA_REPL 1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9a34d2ac4..59bab5c15 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") - ADD_DEPENDENCIES(rspamd-server rspamd-clang) - ENDIF() - --IF (NOT WITH_LUAJIT) -- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit) --ENDIF() -- - IF (ENABLE_SNOWBALL MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd-server stemmer) - ENDIF() -diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c -index ce5fff6c5..bea6dc389 100644 ---- a/src/lua/lua_common.c -+++ b/src/lua/lua_common.c -@@ -903,10 +903,6 @@ rspamd_lua_wipe_realloc (void *ud, - return NULL; - } - --#ifndef WITH_LUAJIT --extern int luaopen_bit(lua_State *L); --#endif -- - lua_State * - rspamd_lua_init (bool wipe_mem) - { -@@ -961,7 +957,6 @@ rspamd_lua_init (bool wipe_mem) - luaopen_kann (L); - luaopen_spf (L); - #ifndef WITH_LUAJIT -- rspamd_lua_add_preload (L, "bit", luaopen_bit); - lua_settop (L, 0); - #endif - diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch deleted file mode 100644 index e86d70173c64..000000000000 --- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e3665c18..ad989f7f2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -171,6 +171,8 @@ ELSE() - ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) - ENDIF() - -+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h -+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) - ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite - ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) - ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h -@@ -583,7 +585,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) - ADD_SUBDIRECTORY(contrib/fpconv) - ADD_SUBDIRECTORY(contrib/lc-btrie) - ADD_SUBDIRECTORY(contrib/libottery) --ADD_SUBDIRECTORY(contrib/zstd) - IF(ENABLE_SNOWBALL MATCHES "ON") - ADD_SUBDIRECTORY(contrib/snowball) - SET(WITH_SNOWBALL 1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 54b2e4083..e0e2edd58 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) - TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) --TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) - - IF (ENABLE_CLANG_PLUGIN MATCHES "ON") -diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c -index 98b51506b..b4ed1cb5e 100644 ---- a/src/client/rspamdclient.c -+++ b/src/client/rspamdclient.c -@@ -19,8 +19,8 @@ - #include "libserver/http/http_private.h" - #include "libserver/protocol_internal.h" - #include "unix-std.h" --#include "contrib/zstd/zstd.h" --#include "contrib/zstd/zdict.h" -+#include <zstd.h> -+#include <zdict.h> - - #ifdef HAVE_FETCH_H - #include <fetch.h> -diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c -index d3ad9e210..c7e09c2f9 100644 ---- a/src/libserver/cfg_utils.c -+++ b/src/libserver/cfg_utils.c -@@ -36,9 +36,8 @@ - #include "contrib/libottery/ottery.h" - #include "contrib/fastutf8/fastutf8.h" - --#define ZSTD_STATIC_LINKING_ONLY --#include "contrib/zstd/zstd.h" --#include "contrib/zstd/zdict.h" -+#include <zstd.h> -+#include <zdict.h> - - #ifdef HAVE_OPENSSL - #include <openssl/rand.h> -diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c -index a832adc4f..bdc1f8ba0 100644 ---- a/src/libserver/maps/map.c -+++ b/src/libserver/maps/map.c -@@ -23,7 +23,7 @@ - #include "libserver/http/http_connection.h" - #include "libserver/http/http_private.h" - #include "rspamd.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "contrib/libev/ev.h" - #include "contrib/uthash/utlist.h" - -diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c -index 35d50b909..53c23ed51 100644 ---- a/src/libserver/protocol.c -+++ b/src/libserver/protocol.c -@@ -21,7 +21,7 @@ - #include "worker_private.h" - #include "libserver/cfg_file_private.h" - #include "libmime/scan_result_private.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "lua/lua_common.h" - #include "unix-std.h" - #include "protocol_internal.h" -diff --git a/src/libserver/task.c b/src/libserver/task.c -index 3e8dd381f..150b5d54c 100644 ---- a/src/libserver/task.c -+++ b/src/libserver/task.c -@@ -25,7 +25,7 @@ - #include "stat_api.h" - #include "unix-std.h" - #include "utlist.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "libserver/mempool_vars_internal.h" - #include "libserver/cfg_file_private.h" - #include "libmime/lang_detection.h" -diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c -index 91cc18800..d29f8aeaa 100644 ---- a/src/lua/lua_util.c -+++ b/src/lua/lua_util.c -@@ -17,7 +17,7 @@ - #include "html.h" - #include "tokenizers/tokenizers.h" - #include "unix-std.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - #include "contrib/uthash/utlist.h" - #include "libmime/email_addr.h" - #include "libmime/content_type.h" -diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c -index e9ce9ef5e..a9f3159db 100644 ---- a/src/rspamd_proxy.c -+++ b/src/rspamd_proxy.c -@@ -36,7 +36,7 @@ - #include "libserver/milter.h" - #include "libserver/milter_internal.h" - #include "libmime/lang_detection.h" --#include "contrib/zstd/zstd.h" -+#include <zstd.h> - - #include <math.h> - --- -2.24.1 - diff --git a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch new file mode 100644 index 000000000000..c8254f1ce95e --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 72382acb6..2335ae4bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,42 +141,8 @@ IF(ENABLE_LUAJIT MATCHES "ON") + ELSE(ENABLE_LUAJIT MATCHES "ON") + + ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.3" +- LIB_SUFFIXES "lua5.3" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.3" +- "include/lua5.3" +- "include/lua53" +- "include/lua" + ROOT ${LUA_ROOT} +- MODULES lua53 +- OPTIONAL) +- +- IF (NOT WITH_LIBLUA) +- ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.2" +- LIB_SUFFIXES "lua5.2" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.2" +- "include/lua5.2" +- "include/lua52" +- "include/lua" +- ROOT ${LUA_ROOT} +- MODULES lua52 +- OPTIONAL) +- +- IF (NOT WITH_LIBLUA) +- ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.1" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.1" +- "include/lua5.1" +- "include/lua51" +- "include/lua" +- ROOT ${LUA_ROOT} +- MODULES lua51) +- ENDIF() +- ENDIF() ++ MODULES lua) + ENDIF(ENABLE_LUAJIT MATCHES "ON") + + IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) +-- diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch index c42bb8f5d6f2..f0fc9f8352bd 100644 --- a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch +++ b/mail-filter/rspamd/files/rspamd-2.7-unbundle-zstd.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b4bd8469..75582513e 100644 +index 77ad86785..56246807e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -199,6 +199,8 @@ ELSE() +@@ -202,6 +202,8 @@ ELSE() ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) ENDIF() @@ -11,7 +11,7 @@ index 3b4bd8469..75582513e 100644 ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h -@@ -616,7 +618,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) +@@ -619,7 +621,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) ADD_SUBDIRECTORY(contrib/fpconv) ADD_SUBDIRECTORY(contrib/lc-btrie) ADD_SUBDIRECTORY(contrib/libottery) @@ -20,12 +20,12 @@ index 3b4bd8469..75582513e 100644 ADD_SUBDIRECTORY(contrib/snowball) SET(WITH_SNOWBALL 1) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 59bab5c15..098329991 100644 +index 54b2e4083..e0e2edd58 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) +@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) -TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) @@ -45,7 +45,7 @@ index bcb25672e..48ca58e94 100644 #ifdef HAVE_FETCH_H #include <fetch.h> diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c -index e2f886aa6..5b214c09c 100644 +index 987123cbb..51c2e1468 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -36,8 +36,7 @@ @@ -85,7 +85,7 @@ index 31b0308cb..62ba3d833 100644 #include "unix-std.h" #include "protocol_internal.h" diff --git a/src/libserver/task.c b/src/libserver/task.c -index e7a83a603..c613fffcc 100644 +index 096933803..f78754ab4 100644 --- a/src/libserver/task.c +++ b/src/libserver/task.c @@ -25,7 +25,7 @@ diff --git a/mail-filter/rspamd/rspamd-2.6-r100.ebuild b/mail-filter/rspamd/rspamd-2.6-r100.ebuild index e8100951ee1d..45f00615591e 100644 --- a/mail-filter/rspamd/rspamd-2.6-r100.ebuild +++ b/mail-filter/rspamd/rspamd-2.6-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua-single pax-utils systemd tmpfiles diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild index a31a0897fc9a..d45893559286 100644 --- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild +++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Rapid spam filtering system" diff --git a/mail-filter/rspamd/rspamd-2.7-r100.ebuild b/mail-filter/rspamd/rspamd-2.7-r100.ebuild new file mode 100644 index 000000000000..93ad5abb5192 --- /dev/null +++ b/mail-filter/rspamd/rspamd-2.7-r100.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake lua-single pax-utils systemd tmpfiles + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" + inherit git-r3 +else + SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Rapid spam filtering system" +HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" +SLOT="0" +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" + +REQUIRED_USE="${LUA_REQUIRED_USE} + jit? ( lua_single_target_luajit )" + +RDEPEND="${LUA_DEPS} + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ' lua5-{1,2}) + acct-group/rspamd + acct-user/rspamd + app-arch/zstd + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libev + dev-libs/libsodium + dev-libs/snowball-stemmer + net-libs/libnsl + sys-apps/file + blas? ( + virtual/blas + virtual/lapack + ) + cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) + jemalloc? ( dev-libs/jemalloc ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + pcre2? ( dev-libs/libpcre2[jit=] ) + !pcre2? ( dev-libs/libpcre[jit=] )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" + "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" +) + +src_prepare() { + cmake_src_prepare + + rm -vrf contrib/{lua-bit,snowball,zstd} || die + + sed -i -e 's/User=_rspamd/User=rspamd/g' \ + rspamd.service \ + || die +} + +src_configure() { + local mycmakeargs=( + -DCONFDIR=/etc/rspamd + -DRUNDIR=/var/run/rspamd + -DDBDIR=/var/lib/rspamd + -DLOGDIR=/var/log/rspamd + -DENABLE_BLAS=$(usex blas ON OFF) + -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) + -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) + -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) + -DENABLE_PCRE2=$(usex pcre2 ON OFF) + ) + cmake_src_configure +} + +src_test() { + cmake_src_test +} + +src_install() { + cmake_src_install + + newconfd "${FILESDIR}"/rspamd.conf rspamd + newinitd "${FILESDIR}/rspamd-r7.init" rspamd + systemd_newunit rspamd.service rspamd.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf + + # Remove mprotect for JIT support + if use lua_single_target_luajit; then + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rspamd-r1.logrotate rspamd + + diropts -o rspamd -g rspamd + keepdir /var/{lib,log}/rspamd +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +} diff --git a/mail-filter/rspamd/rspamd-2.5-r1.ebuild b/mail-filter/rspamd/rspamd-2.7.ebuild index c1020d552c74..86ced7662db8 100644 --- a/mail-filter/rspamd/rspamd-2.5-r1.ebuild +++ b/mail-filter/rspamd/rspamd-2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,10 @@ RDEPEND=" dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file - blas? ( sci-libs/openblas ) + blas? ( + virtual/blas + virtual/lapack + ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( @@ -52,9 +55,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/rspamd-2.5-replxx-gcc10.patch" - "${FILESDIR}/rspamd-2.5-unbundle-lua.patch" - "${FILESDIR}/rspamd-2.5-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" ) diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index 8f97da55c2b1..93ad5abb5192 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua-single pax-utils systemd tmpfiles @@ -56,9 +56,9 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" + "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" - "${FILESDIR}/rspamd-9999-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" ) diff --git a/mail-filter/sieve-connect/Manifest b/mail-filter/sieve-connect/Manifest index 0d56ae9493f8..a925abaee3a1 100644 --- a/mail-filter/sieve-connect/Manifest +++ b/mail-filter/sieve-connect/Manifest @@ -1,2 +1 @@ -DIST sieve-connect-0.87.tar.bz2 40023 BLAKE2B 510f5c2a42524f7d412b0b13ab549667cd912411b069e7328ab13a1284c2877a78084495e19be6cac643dec4c952a2672b2f3b11bba755fa11aabc3e58008693 SHA512 28ed4f5cd929ee5edb420afcbac238399463beecf551643b9ee5ea41debbb1e5401a619b39b6422ec47885ea3cc207866e09da2e46a65bcc3d4f3ca5bdbf016a DIST sieve-connect-0.90.tar.bz2 46481 BLAKE2B d6bc466caffa3344537b1777b00a66f34697139d474763862c5296367f1e69174078a5e864225c1e967fbc5677c97d3ef71a4b75b677952d7b4993a5b8a08108 SHA512 3b4d4a6a7eb7d48f8b2dbc4c302c3de1a2a193282c7b2d25581e1131d6c7598cc2a47edabf8b108e94e0fd1a9cc50e48a103c133dba233f180f12d36c0da0718 diff --git a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild b/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild deleted file mode 100644 index 64296aadb71d..000000000000 --- a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -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* -} diff --git a/mail-filter/sieve-connect/sieve-connect-0.90.ebuild b/mail-filter/sieve-connect/sieve-connect-0.90.ebuild index cee4de699910..69c84c1baa99 100644 --- a/mail-filter/sieve-connect/sieve-connect-0.90.ebuild +++ b/mail-filter/sieve-connect/sieve-connect-0.90.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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/sigh/Manifest b/mail-filter/sigh/Manifest index d3aee440160f..67b4d7f948c6 100644 --- a/mail-filter/sigh/Manifest +++ b/mail-filter/sigh/Manifest @@ -1,2 +1 @@ -DIST sigh-1607.1.2.tar.gz 57662 BLAKE2B 288430b3016483340f7bb6c69060f6c2f38efee525b45d505e965c12e84c66d241d0a90c8a3f55e0b9bf801d8686ee1d2fa5eb03afad4795df620e594468afd9 SHA512 410883b55072b6476fc454440cf5f0e048587853a5095fddd7870b0efb5eca82e257f34ddef821f1a1968e1859207e7972e645922675fddaa2bf05b314bf5f60 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b diff --git a/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch b/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch new file mode 100644 index 000000000000..a76b102be147 --- /dev/null +++ b/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch @@ -0,0 +1,19 @@ +--- a/src/common.h ++++ b/src/common.h +@@ -28,14 +28,14 @@ namespace util { + * @param x A string literal + * @return A pointer to char + */ +- auto ccp = [](const std::string &str) { ++ inline auto ccp = [](const std::string &str) { + return const_cast<char *> (str.c_str()); + }; + + /*! + * @brief Data structure for each client connection + */ +- auto mlfipriv = [](SMFICTX *ctx) { ++ inline auto mlfipriv = [](SMFICTX *ctx) { + return static_cast<mlt::Client *> (smfi_getpriv(ctx)); + }; + } // namespace util diff --git a/mail-filter/sigh/sigh-1607.1.2.ebuild b/mail-filter/sigh/sigh-1607.1.2.ebuild deleted file mode 100644 index 04b2490222d7..000000000000 --- a/mail-filter/sigh/sigh-1607.1.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils user - -DESCRIPTION="S/MIME signing milter" -HOMEPAGE="https://signing-milter.org/" -SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="mail-filter/libmilter - dev-libs/boost - dev-libs/openssl:0" -DEPEND="${RDEPEND}" - -DOCS=( README README.build AUTHORS LICENSE ) -CMAKE_IN_SOURCE_BUILD=1 - -pkg_setup() { - enewgroup sigh - enewuser sigh -1 -1 /var/lib/sigh sigh -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - dodoc "${DOCS[@]}" - - newinitd "${FILESDIR}"/${PN}.initd ${PN} -} diff --git a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild b/mail-filter/sigh/sigh-1607.1.6-r1.ebuild new file mode 100644 index 000000000000..43bef3b3b138 --- /dev/null +++ b/mail-filter/sigh/sigh-1607.1.6-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_IN_SOURCE_BUILD=1 +inherit cmake + +DESCRIPTION="S/MIME signing milter" +HOMEPAGE="https://signing-milter.org/" +SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/sigh + acct-user/sigh + dev-libs/boost + dev-libs/openssl:0= + mail-filter/libmilter" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +src_install() { + cmake_src_install + newinitd "${FILESDIR}"/${PN}.initd ${PN} +} diff --git a/mail-filter/sigh/sigh-1607.1.6.ebuild b/mail-filter/sigh/sigh-1607.1.6.ebuild deleted file mode 100644 index b0d0ac055922..000000000000 --- a/mail-filter/sigh/sigh-1607.1.6.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils user - -DESCRIPTION="S/MIME signing milter" -HOMEPAGE="https://signing-milter.org/" -SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="mail-filter/libmilter - dev-libs/boost - dev-libs/openssl:0" -DEPEND="${RDEPEND}" - -DOCS=( README README.build AUTHORS LICENSE ) -CMAKE_IN_SOURCE_BUILD=1 - -pkg_setup() { - enewgroup sigh - enewuser sigh -1 -1 /var/lib/sigh sigh -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - dodoc "${DOCS[@]}" - - newinitd "${FILESDIR}"/${PN}.initd ${PN} -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild index a5ab782e6ed5..5b15b0b3ad6b 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild index e7e986455f6f..14997d22b436 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" |