diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /mail-filter/amavisd-new | |
parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) |
gentoo resync : 07.10.2018
Diffstat (limited to 'mail-filter/amavisd-new')
-rw-r--r-- | mail-filter/amavisd-new/Manifest | 2 | ||||
-rw-r--r-- | mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild | 184 | ||||
-rw-r--r-- | mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch | 12 |
3 files changed, 198 insertions, 0 deletions
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index b645540219c2..062336c6d349 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -1,4 +1,5 @@ AUX amavis-mc.initd 384 BLAKE2B bc481913a052855add95b0149177754e95742bcafe70b3e44699b2765126d401bb6d406ca09f2252f768b2b8354209fdb35fb9d5c64f6749c83c1d5ca1e52767 SHA512 96bb67ce2088c2c4b3187d55040db4ef9f281506a368ceca54df3b90d3e9c6e8c8be96c8010c581c7b2fc75e8439892db800b361da75ed9549a89d94cf7d95df +AUX amavisd-2.11.0-dkim.patch 428 BLAKE2B f9c1bcab637febaf0546f204db0260cb7dc6bc35e27092545f99fb13cb2de27638a3cb04177de6dcb406c216a1168f44141e477f460eced830ba4376581005af SHA512 85628ad2b9c1cde478b579865d414fb941798aafe8968d26af5ef9dddf0f9ec4a3ed1e2077a46ee0632a9ce9be159ad9696badad35a1117cb7437c2ab0c4a973 AUX amavisd-snmp.initd 692 BLAKE2B b47671b5e8962a151cda0369bf13eba302e37e2f014fddff63f1a1d706868cd14d82c9141a79f8d123fb50cd95251f45407a6bb884398899e456dcf972bc37d0 SHA512 0e8513f7bfb03ae6d28190edd0f4f59b87f81b412b68dcfa3c91d77fd138d4e92ff6b36864bb590d214c08d9f73ec5de694e5fbc1b7e1d27ae0e532f052e3910 AUX amavisd.initd 716 BLAKE2B 1376292c5560add4b85c7fa3e34454d9999e9602997525d85b088c3660093f68027dd9fa95c205d75ea7c2ecfcc2fec200a59b5af3fee2ce87a09419822bee22 SHA512 e7f1f9f233b26402101d501ae09d6774d8483637f2c2180eee706015790ea2ea494a14b1ff17e3b600ca4571bfaa895d8df65682993e1fc9ce5c31d37f9548c3 AUX amavisd.initd-r1 710 BLAKE2B 46d484e167e45f5a5772373a4d636727ceda2feecf2e6260c737d513f1d7fb563b069c5e79a28459a6c75fd382cf106a260bd4d94c7b0c76bfca7dbf74ac30ef SHA512 0c45276d4b487c9550b36a56e1e296a401fb46985dafe1227bf70ec840fc4a255e959026ef31dffbd0719ebbcec064619e096602ab32da2b95776030772878de @@ -12,6 +13,7 @@ EBUILD amavisd-new-2.10.1-r4.ebuild 4704 BLAKE2B b9a7a614f3ce46e95818f074a003f3c EBUILD amavisd-new-2.10.1.ebuild 4647 BLAKE2B 6a94883de88d63224f6bc126a8db5fbac1f12d1eee0375aa38f99921f097ecd38c4a76585f5b8899e07ba677d55843837f663e93d2991449ceed404723705929 SHA512 34c03fa676550f125dc0445b1e953356566e7a6a8d7d171b0145e21dd030e82a4478fec217fa478ef7df589598529eec114858b9252807edec09d0473d2e8568 EBUILD amavisd-new-2.11.0-r2.ebuild 4516 BLAKE2B b4ffc91098bc1391b9c2cb0c044e7395d4e2e6872b1fd20322394143bded6374dc61998f0eb976005b74971fdd803456f263a713b2d354770cffea97e7dade0a SHA512 cd507065732fa2a2e2f87830005ef466abec65e58778c1219d560d05ef3b0ee701161ecbf1e045d1f57e47fcab921c5a92d8a1c9420c63adb5536f07b7169b48 EBUILD amavisd-new-2.11.0-r3.ebuild 4605 BLAKE2B 5e08b390567ea546fa4bb7ab8371dabcef91cb0c39d2ff87cfab4580f2f878c3a066f4d607fb57f214c9b4e837c079ecce80157662df805768f2f1e3db33e469 SHA512 0e349d6bf27c0492688b3715270dcc4e49d2ce2b2050a08d7f8b8854981752efa32361c661982e3eec083efb571a0fa831cba6d040f9799d1facee4b59fa893a +EBUILD amavisd-new-2.11.0-r4.ebuild 4765 BLAKE2B 686ce5268c24939367746162f50944cd2134e0fb6db5e3377caf9af6928f71c44d6e6b2f8f31984e1b56d1082ae432fc051538b1a8cce068e23a8acdd713e4d4 SHA512 e60e42e868f28dd9768578ab3203cd7153574e7ca32f900126b387c87453f0a5d05d2eee6132ff5e22a0d04ccd83def090871e2ce59a36fda0a2fe3b00999fec EBUILD amavisd-new-2.7.2.ebuild 4162 BLAKE2B df8e094ae544f60187d9d0b437c8429ec08de5a89b205bb37fe3e9c164a482023b6ba3599b6081cde4707311e533c4736a683454c38df59013e6b545fd490833 SHA512 39dd3b56f6fce585329eb159228dd2afe354ffd3ec3ac24dfec79b6b569f5345ef98cc9be7587d557f140ac96a0e412941c264545b2d47dec676a409141ff8b4 EBUILD amavisd-new-2.8.1-r1.ebuild 4804 BLAKE2B a049093a184f387c3c4e7be7ecbba2838279d6461d54956c419e659cdaafbf5712a6bc03c35ca0ac314ae8442d3c52ba9a14b642a46e2b8b0de035702fca0807 SHA512 290fdbe57f59ba560c99e2abad84e0c4456be394986128f42161b67d22586c34f7fc59cd79099f525864565f06fbe7357626cadee5bf1f18cd97f4621852675f EBUILD amavisd-new-2.9.1-r2.ebuild 4683 BLAKE2B a76172816b36ccde43c3c4f82d95a558407aac07627dd90676150d4190ce408d310f4d8ca8e314787ff6a2e6fedacc37bfa6ea06f1e1224c6aab00faec007995 SHA512 cd5bbcfa7ba32fb3471d958b49d0c1f4a4a12235c08d12340752bdbaa6d88773c75d1b19b960a1aa33cad72d107eb5de72ca80465f878a53e8cf858c8bae2ac1 diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild new file mode 100644 index 000000000000..0efc27e64544 --- /dev/null +++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit systemd user + +MY_P="${P/_/-}" +DESCRIPTION="High-performance interface between the MTA and content checkers" +HOMEPAGE="https://www.ijs.si/software/amavisd/" +SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz" +PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes + +LICENSE="GPL-2 BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq" + +DEPEND=">=sys-apps/sed-4 + >=dev-lang/perl-5.10.0" + +RDEPEND="${DEPEND} + >=sys-apps/coreutils-5.0-r3 + app-arch/cpio + app-arch/gzip + app-arch/bzip2 + app-arch/arc + app-arch/cabextract + app-arch/freeze + app-arch/lha + app-arch/lrzip + app-arch/lzop + app-arch/ncompress + app-arch/p7zip + app-arch/pax + app-arch/unarj + app-arch/unrar + app-arch/xz-utils + app-arch/zoo + net-mail/ripole + >=dev-perl/Archive-Zip-1.14 + >=virtual/perl-IO-Compress-1.35 + >=virtual/perl-Compress-Raw-Zlib-2.017 + net-mail/tnef + virtual/perl-MIME-Base64 + >=dev-perl/MIME-tools-5.415 + >=dev-perl/MailTools-1.58 + >=dev-perl/Net-Server-0.91 + virtual/perl-Digest-MD5 + dev-perl/IO-stringy + virtual/perl-IO-Socket-IP + >=virtual/perl-Time-HiRes-1.49 + dev-perl/Unix-Syslog + dev-perl/Net-LibIDN + sys-apps/file + >=sys-libs/db-4.4.20 + dev-perl/BerkeleyDB + dev-perl/Convert-BinHex + >=dev-perl/Mail-DKIM-0.31 + virtual/perl-File-Temp + dev-perl/Net-SSLeay + dev-perl/IO-Socket-SSL + virtual/mta + clamav? ( app-antivirus/clamav ) + ldap? ( >=dev-perl/perl-ldap-0.33 ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + razor? ( mail-filter/razor ) + snmp? ( net-analyzer/net-snmp[perl] ) + spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) + zmq? ( dev-perl/ZMQ-LibZMQ3 )" + +AMAVIS_ROOT="/var/amavis" +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # amavisd-new version 2.11.0 breaks DKIM signing of outbound mail, + # see https://bugs.gentoo.org/603582 + eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch" + + if use courier ; then + eapply -p0 amavisd-new-courier.patch + fi + + if use qmail ; then + eapply -p0 amavisd-new-qmqpqq.patch + fi + + sed -i \ + -e '/daemon/s/vscan/amavis/' \ + -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ + "${S}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file" + + if ! use dkim ; then + sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \ + || die "missing conf file - dkim" + fi + + if use zmq ; then + sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \ + || die "missing conf file - zmq" + fi + + if ! use spamassassin ; then + sed -i -e \ + "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ + "${S}/amavisd.conf" || die "missing conf file - sa" + fi + eapply_user +} + +src_install() { + dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \ + amavisd-signer amavisd-status + dobin p0f-analyzer.pl amavisd-submit + + if use snmp ; then + dosbin amavisd-snmp-subagent + use zmq && dosbin amavisd-snmp-subagent-zmq + dodoc AMAVIS-MIB.txt + newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp + fi + + if use zmq ; then + dosbin amavis-services amavis-mc + newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc + fi + + insinto /etc + insopts -m0640 + doins amavisd.conf + + newinitd "${FILESDIR}/amavisd.initd-r1" amavisd + + systemd_dounit "${FILESDIR}/amavisd.service" + use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service + use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service + + keepdir "${AMAVIS_ROOT}" + keepdir "${AMAVIS_ROOT}/db" + keepdir "${AMAVIS_ROOT}/quarantine" + keepdir "${AMAVIS_ROOT}/tmp" + keepdir "${AMAVIS_ROOT}/var" + + dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \ + amavisd.conf-default amavisd-custom.conf + + docinto README_FILES + dodoc README_FILES/README* + dodoc -r README_FILES/*.{html,css} + docinto README_FILES/images + dodoc README_FILES/images/*.png + docinto README_FILES/images/callouts + dodoc README_FILES/images/callouts/*.png + + docinto test-messages + dodoc test-messages/README + dodoc test-messages/sample.tar.gz.compl + + if use ldap ; then + dodir /etc/openldap/schema + insinto /etc/openldap/schema + insopts -o root -g root -m 644 + newins LDAP.schema ${PN}.schema || die + fi +} + +pkg_preinst() { + enewgroup amavis + enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis + if use razor ; then + if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then + elog "Setting up initial razor config files..." + + razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor" + sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ + "${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die + fi + fi +} + +pkg_postinst() { + chown root:amavis "${ROOT}/etc/amavisd.conf" + chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" +} diff --git a/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch new file mode 100644 index 000000000000..d9aa07d732ba --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch @@ -0,0 +1,12 @@ +Origin: https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html + +--- a/amavisd ++++ b/amavisd +@@ -34338,6 +34338,7 @@ + $sig_ind++; + } + Amavis::load_policy_bank($_,$msginfo) for @bank_names; ++ $msginfo->originating(c('originating')); + $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid; + # if (ll(5) && $sig_ind > 0) { + # # show which header fields are covered by which signature |