diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /mail-filter/amavisd-new | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'mail-filter/amavisd-new')
15 files changed, 243 insertions, 1025 deletions
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index 062336c6d349..463ad132a0b9 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -1,20 +1,16 @@ AUX amavis-mc.initd 384 BLAKE2B bc481913a052855add95b0149177754e95742bcafe70b3e44699b2765126d401bb6d406ca09f2252f768b2b8354209fdb35fb9d5c64f6749c83c1d5ca1e52767 SHA512 96bb67ce2088c2c4b3187d55040db4ef9f281506a368ceca54df3b90d3e9c6e8c8be96c8010c581c7b2fc75e8439892db800b361da75ed9549a89d94cf7d95df +AUX amavis-mc.initd-r1 492 BLAKE2B b2bafdecd2d57ca52216154def014596f31670300510b0d2d049a4790ee3cc5a29c339ca8b7bb27503d0671b028d9da7d1ddadc662cabae18cac2a659ce2b676 SHA512 66d6364e12a0e71184682bfd35bdd1004c0cd6ee634936da8888b49f21d6c506e0645eabf8ae53ca08dccd9081f9753d63951258ccee8abd9fabf7d28233c533 AUX amavisd-2.11.0-dkim.patch 428 BLAKE2B f9c1bcab637febaf0546f204db0260cb7dc6bc35e27092545f99fb13cb2de27638a3cb04177de6dcb406c216a1168f44141e477f460eced830ba4376581005af SHA512 85628ad2b9c1cde478b579865d414fb941798aafe8968d26af5ef9dddf0f9ec4a3ed1e2077a46ee0632a9ce9be159ad9696badad35a1117cb7437c2ab0c4a973 +AUX amavisd-snmp-subagent-zmq.initd 911 BLAKE2B 7cb247978f70d1b7468919b1df3f2e147b4ca48c6748401c6621d1db7b326981b513b0f02fce582052fdf6a0d5e8b6d55cab52198e262a673802626769050edd SHA512 846ed4622417657f7bc3dc5fa5d9b361dddfe7a13753dab7e8b2328a09dc9c21800c4cd990bc5dc466945ef857861413b8e5a8e726a40f0fa1831c509755e60b +AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e 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 +AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65 AUX amavisd.service 459 BLAKE2B 66648cbc40345ae57c5934dc5377c7c1fb6220c591904dce8685123772ef3ecff2827105dcd0b52336700a0e16f593480446991690f27cf6a8a3714ed593fb7e SHA512 6f196484fc546e16f319abfcd171a68826da35813cc477a572c79594b0bb5e0f8f61370dba30af690be6d064e48f07139b6b0b7f6024dbbfb820547d8bc6998e -DIST amavisd-new-2.10.1.tar.xz 767716 BLAKE2B 603dabc34e2304084f725633bb772fc78316bbccbd5635940cf257bf19d38ffcfc44087832d5d8db270b943c27b5074f32fb76804e2f19a721e7bc9aae09d9c6 SHA512 1939cc60136fe37a078ebd6117a774bcc7ee34b68807472eb08ab15414749300925f74898131299fb051c539cc59d264003439a6307c9d0fa16971d02dab1ff9 +AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a +DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957 -DIST amavisd-new-2.7.2.tar.gz 945448 BLAKE2B b6315f080b246a8715761fbc9516631b6737fa6b7995a52b0e013ed8704546d741d678e09ed5f21d590527bcfb9fa27d051167cd673828b85539d9e495b8dafc SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 -DIST amavisd-new-2.8.1.tar.xz 731816 BLAKE2B 6becb5a9d2029605030f04fc8876570aedd2c8d925a9a202aff22969d0e0001d9ed56e25e00ad7f1181671c16482a90b139f8327abf8478a3c56e5e132e5f662 SHA512 a840b57513b8a7b18e15085016c273ba2fba5cceb76ef52c52aa2ca34e9257be78f8bb8ea350dbdac3b26d2aba8f5aae821c1c45f2d37bc6be04ff2efb9f3ade -DIST amavisd-new-2.9.1.tar.xz 753076 BLAKE2B 835ce09dcaa98b44447d48522b3dfddb8066add0e2fe10767118c5979aeaee37c0db439e17721d9e5c6b40977b5db3ff0213261ea0fc88a2d6566249c1d57888 SHA512 6829a769f50498aaec4fd5c198059f828e9ba90223083e439caa9d2bd19006e0cff8ae7b1e2416009bd2514aae4428598142e86a63260b5292c15b515792a7af -EBUILD amavisd-new-2.10.1-r4.ebuild 4704 BLAKE2B b9a7a614f3ce46e95818f074a003f3cf68afe63e36c4be5d0f82c9483d818eee60e954b7c3fc9d8ff4fe773a3c866dee4743387c5620c1a40aeebfe8b14e4818 SHA512 e790362e3c1e266d70b6dc1de920439565037d349142eeb4637577833d3eb9b2bf09542ffe5367a54ad1cb8cd384d9a485ef9bf251caa2fb408effad46640042 -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 -MISC metadata.xml 738 BLAKE2B 4c1e1fd33c6b27a9a96b849d4c127da188776f3aa053be65feee899c2b82c30a470844511c110e4d36da4c3e386b1e03eaa0c10d4384dc78d67f8c87af26e846 SHA512 7a5af76581b61aece92c89c6bd4516b305dbd90310e7bfc4af40ae8306c5401aa21780bca3aae8007af74678d91b0b978aaefd12958c70345461678685d79ea1 +EBUILD amavisd-new-2.11.1-r1.ebuild 4949 BLAKE2B f0dc3dd57190d24752fe09be30b3c9299e7fdb591347548adea000b2ab2f8a5bc7b6ec66f76eb6046da4bd1857e2f7e6e017899fb466d9ea784dec2481a44308 SHA512 57cb159e9e4da2b6e2393039c85bbd534b275744cb435b0879bee2a3fcf41a86531e154be591281c4e51c066de52a1a75259fcc988de1582e7d1db0156f0db56 +EBUILD amavisd-new-2.11.1-r2.ebuild 5220 BLAKE2B b0488be1475b10b25582a3b020a8a8517c5e9062eb7ddcfd4790e3b36f29e8c0b8893f9183436ba0021d1507a11e73347bc537179bf9d281d5eb1c2938f894ae SHA512 12dbe4d2b83a4c12c98170224ba69f4c3d16d65db6c761beb5400f3c6709da8e0b71c24e1b9dd859dcb0728d92b727276f16e1de0d676db3a4418e6f59d985c0 +MISC metadata.xml 845 BLAKE2B 5ea031bb47ac8f1ca3cb703ed6e6bcd94fa63ea275874c616e3c24c5802f0f2f4b2443b379b62e708eb6ea075a0950116722319cc08023b20d7152cbabce512e SHA512 4409524d4819357253b63c143f0aa4b760ffe0b4ed22d30d28632f86ee2731c7e84a95131016a21ab43a63c32ea35cfbe741010a07f45e8d21fe05f020387228 diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild deleted file mode 100644 index f9e7a0683a5c..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils 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" - -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.8.2" - -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/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 ) - zmq? ( dev-perl/ZMQ-LibZMQ3 )" - -AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if use courier ; then - epatch amavisd-new-courier.patch - fi - - if use qmail ; then - epatch 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 -} - -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* - dohtml 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 - - if has_version "<${CATEGORY}/${PN}-2.7.0" ; then - elog "Amavisd-new ships with a short and condensed config file now." - elog "Transferring your current settings to the new format is" - elog "recommended for ease of future upgrades." - fi -} - -pkg_postinst() { - chown root:amavis "${ROOT}/etc/amavisd.conf" - chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" -} diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild deleted file mode 100644 index 0a0c01a71b05..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils 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" - -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.8.2" - -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/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 ) - zmq? ( dev-perl/ZMQ-LibZMQ2 )" - -AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if use courier ; then - epatch amavisd-new-courier.patch - fi - - if use qmail ; then - epatch 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 -} - -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 - 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* - dohtml 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 - - if has_version "<${CATEGORY}/${PN}-2.7.0" ; then - elog "Amavisd-new ships with a short and condensed config file now." - elog "Transferring your current settings to the new format is" - elog "recommended for ease of future upgrades." - fi -} - -pkg_postinst() { - chown root:amavis "${ROOT}/etc/amavisd.conf" - chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" -} diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild index 0efc27e64544..d436def3bdbe 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # 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" +HOMEPAGE="https://gitlab.com/amavis/amavis" +SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz" PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes LICENSE="GPL-2 BSD-2" @@ -51,7 +50,7 @@ RDEPEND="${DEPEND} >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN - sys-apps/file + dev-perl/File-LibMagic >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex @@ -70,7 +69,14 @@ RDEPEND="${DEPEND} zmq? ( dev-perl/ZMQ-LibZMQ3 )" AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/amavis-${P}" + +pkg_setup() { + # Create the user beforehand so that we can install the config file + # (and some directories) with group "amavis" in src_install(). + enewgroup amavis + enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis +} src_prepare() { # amavisd-new version 2.11.0 breaks DKIM signing of outbound mail, @@ -103,8 +109,9 @@ src_prepare() { if ! use spamassassin ; then sed -i -e \ "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ - "${S}/amavisd.conf" || die "missing conf file - sa" + "${S}/amavisd.conf" || die "missing conf file - sa" fi + eapply_user } @@ -125,21 +132,32 @@ src_install() { newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc fi + if use ldap ; then + dodir /etc/openldap/schema + insinto /etc/openldap/schema + newins LDAP.schema ${PN}.schema || die + fi + + # The config file should be root:amavis so that the amavis user can + # read (only) it after dropping privileges. And of course he should + # own everything in his home directory. insinto /etc - insopts -m0640 + insopts -m0640 -g amavis doins amavisd.conf - newinitd "${FILESDIR}/amavisd.initd-r1" amavisd + # Implementation detail? Keepdir calls dodir under the hood. + diropts -o amavis -g amavis + keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var} - 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 + # BEWARE: + # + # Anything below this line is using the mangled insopts/diropts from + # above! + # - keepdir "${AMAVIS_ROOT}" - keepdir "${AMAVIS_ROOT}/db" - keepdir "${AMAVIS_ROOT}/quarantine" - keepdir "${AMAVIS_ROOT}/tmp" - keepdir "${AMAVIS_ROOT}/var" + newinitd "${FILESDIR}/amavisd.initd-r2" amavisd + + systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \ amavisd.conf-default amavisd-custom.conf @@ -155,18 +173,11 @@ src_install() { 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 + # TODO: the following is done as root, but should probably be done + # as the amavis user. if use razor ; then if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then elog "Setting up initial razor config files..." @@ -177,8 +188,3 @@ pkg_preinst() { 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/amavisd-new-2.11.0-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild index 37446c48476b..1767bdefc4a6 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # 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 +HOMEPAGE="https://gitlab.com/amavis/amavis" +SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz" LICENSE="GPL-2 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq" DEPEND=">=sys-apps/sed-4 @@ -51,11 +49,14 @@ RDEPEND="${DEPEND} >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN - sys-apps/file + dev-perl/File-LibMagic >=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 ) @@ -63,13 +64,24 @@ RDEPEND="${DEPEND} postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) - spamassassin? ( mail-filter/spamassassin ) + spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )" AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/amavis-${P}" + +pkg_setup() { + # Create the user beforehand so that we can install the config file + # (and some directories) with group "amavis" in src_install(). + enewgroup amavis + enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis +} 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 @@ -78,10 +90,14 @@ src_prepare() { eapply -p0 amavisd-new-qmqpqq.patch fi + # We need to fix the daemon_user and daemon_group in amavis-mc even + # though we're going to run it in the foreground, because it calls + # "drop_priv" unconditionally and will crash if its user/group + # doesn't exist. sed -i \ -e '/daemon/s/vscan/amavis/' \ -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ - "${S}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file" + "${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" \ @@ -96,43 +112,60 @@ src_prepare() { if ! use spamassassin ; then sed -i -e \ "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ - "${S}/amavisd.conf" || die "missing conf file - sa" + "${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 + dosbin amavisd{,-agent,-nanny,-release,-signer,-status} dobin p0f-analyzer.pl amavisd-submit if use snmp ; then dosbin amavisd-snmp-subagent - use zmq && dosbin amavisd-snmp-subagent-zmq + newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \ + amavisd-snmp-subagent dodoc AMAVIS-MIB.txt - newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp + + if use zmq ; then + dosbin amavisd-snmp-subagent-zmq + newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \ + amavisd-snmp-subagent-zmq + fi fi if use zmq ; then dosbin amavis-services amavis-mc - newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc + newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc fi + if use ldap ; then + dodir /etc/openldap/schema + insinto /etc/openldap/schema + newins LDAP.schema "${PN}.schema" + fi + + # The config file should be root:amavis so that the amavis user can + # read (only) it after dropping privileges. And of course he should + # own everything in his home directory. insinto /etc - insopts -m0640 + insopts -m0640 -g amavis doins amavisd.conf - newinitd "${FILESDIR}/amavisd.initd-r1" amavisd + # Implementation detail? Keepdir calls dodir under the hood. + diropts -o amavis -g amavis + keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var} + + # BEWARE: + # + # Anything below this line is using the mangled insopts/diropts from + # above! + # - 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 + newinitd "${FILESDIR}/amavisd.initd-r2" amavisd - keepdir "${AMAVIS_ROOT}" - keepdir "${AMAVIS_ROOT}/db" - keepdir "${AMAVIS_ROOT}/quarantine" - keepdir "${AMAVIS_ROOT}/tmp" - keepdir "${AMAVIS_ROOT}/var" + systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \ amavisd.conf-default amavisd-custom.conf @@ -148,18 +181,11 @@ src_install() { 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 + # TODO: the following is done as root, but should probably be done + # as the amavis user. if use razor ; then if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then elog "Setting up initial razor config files..." @@ -170,8 +196,3 @@ pkg_preinst() { 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/amavisd-new-2.7.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild deleted file mode 100644 index b2bce29bb34c..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit eutils 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.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86" -IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin" - -DEPEND=">=sys-apps/sed-4 - >=dev-lang/perl-5.8.2" - -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/ncompress - app-arch/pax - app-arch/unarj - app-arch/xz-utils - || ( app-arch/unrar app-arch/rar ) - app-arch/zoo - >=dev-perl/Archive-Zip-1.14 - >=virtual/perl-IO-Compress-1.35 - >=virtual/perl-Compress-Raw-Zlib-2.017 - dev-perl/Convert-TNEF - >=dev-perl/Convert-UUlib-1.08 - 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-Time-HiRes-1.49 - dev-perl/Unix-Syslog - sys-apps/file - >=sys-libs/db-4.4.20 - dev-perl/BerkeleyDB - dev-perl/Convert-BinHex - >=dev-perl/Mail-DKIM-0.31 - virtual/mta - 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 )" - -AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if use courier ; then - epatch amavisd-new-courier.patch - fi - - if use qmail ; then - epatch amavisd-new-qmqpqq.patch - fi - - sed -i \ - -e '/daemon/s/vscan/amavis/' \ - -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ - "${S}/amavisd.conf" || die "missing conf file" - - if ! use dkim ; then - sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \ - || die "missing conf file" - fi -} - -src_install() { - dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \ - amavisd-signer - dobin p0f-analyzer.pl amavisd-submit - - if use snmp ; then - dosbin amavisd-snmp-subagent - dodoc AMAVIS-MIB.txt - fi - - insinto /etc - insopts -m0640 - doins amavisd.conf - - newinitd "${FILESDIR}/amavisd.initd" amavisd - - 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* - dohtml 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 - - #for i in whitelist blacklist spam_lovers; do - # if [ -f ${AMAVIS_ROOT}/${i} ]; then - # cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}" - # else - # touch "${D}"/${AMAVIS_ROOT}/${i} - # fi - #done - - 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" - fi - fi - - if ! use spamassassin ; then - elog "Disabling anti-spam code in amavisd.conf..." - sed -i -e \ - "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ - "${D}/etc/amavisd.conf" - fi - - if has_version "<${CATEGORY}/${PN}-2.7.0" ; then - elog "Amavisd-new ships with a short and condensed config file now." - elog "Transferring your current settings to the new format is" - elog "recommended for ease of future upgrades." - fi -} - -pkg_postinst() { - chown root:amavis "${ROOT}/etc/amavisd.conf" - chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" -} diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild deleted file mode 100644 index fac90db569b4..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit eutils 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" - -LICENSE="GPL-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.8.2" - -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 - dev-perl/Convert-TNEF - >=dev-perl/Convert-UUlib-1.08 - 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 - sys-apps/file - >=sys-libs/db-4.4.20 - dev-perl/BerkeleyDB - dev-perl/Convert-BinHex - >=dev-perl/Mail-DKIM-0.31 - 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 ) - zmq? ( dev-perl/ZMQ-LibZMQ2 )" - -AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if use courier ; then - epatch amavisd-new-courier.patch - fi - - if use qmail ; then - epatch 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 - - if ! use dkim ; then - sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \ - || die "missing conf file" - fi - - if use zmq ; then - sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" - fi -} - -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 - 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* - dohtml 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 - - #for i in whitelist blacklist spam_lovers; do - # if [ -f ${AMAVIS_ROOT}/${i} ]; then - # cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}" - # else - # touch "${D}"/${AMAVIS_ROOT}/${i} - # fi - #done - - 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" - fi - fi - - if ! use spamassassin ; then - elog "Disabling anti-spam code in amavisd.conf..." - sed -i -e \ - "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ - "${D}/etc/amavisd.conf" - fi - - if has_version "<${CATEGORY}/${PN}-2.7.0" ; then - elog "Amavisd-new ships with a short and condensed config file now." - elog "Transferring your current settings to the new format is" - elog "recommended for ease of future upgrades." - fi -} - -pkg_postinst() { - chown root:amavis "${ROOT}/etc/amavisd.conf" - chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" -} diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild deleted file mode 100644 index 72d7bbcee46f..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils 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" - -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.8.2" - -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 - sys-apps/file - >=sys-libs/db-4.4.20 - dev-perl/BerkeleyDB - dev-perl/Convert-BinHex - >=dev-perl/Mail-DKIM-0.31 - 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 ) - zmq? ( dev-perl/ZMQ-LibZMQ2 )" - -AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if use courier ; then - epatch amavisd-new-courier.patch - fi - - if use qmail ; then - epatch 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 -} - -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* - dohtml 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 - - if has_version "<${CATEGORY}/${PN}-2.7.0" ; then - elog "Amavisd-new ships with a short and condensed config file now." - elog "Transferring your current settings to the new format is" - elog "recommended for ease of future upgrades." - 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/amavis-mc.initd-r1 b/mail-filter/amavisd-new/files/amavis-mc.initd-r1 new file mode 100644 index 000000000000..6343d4255c4c --- /dev/null +++ b/mail-filter/amavisd-new/files/amavis-mc.initd-r1 @@ -0,0 +1,18 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/amavis-mc" +pidfile="/run/${RC_SVCNAME}.pid" + +# Let OpenRC background this, because otherwise it will write its PID +# file after dropping privileges which presents a security issue when +# we go to `kill` the thing as root. +command_args="-f" +command_background="true" +command_user="amavis:amavis" + +depend() { + use logger + before amavisd-new snmpd +} diff --git a/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd b/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd new file mode 100644 index 000000000000..7482a3f1d20b --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd @@ -0,0 +1,26 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/amavisd-snmp-subagent-zmq" +pidfile="/run/${RC_SVCNAME}.pid" + +# The RELEASE_NOTES say "it is safe to run it as root, although +# perhaps not necessary." I'm not in a position to test, but I bet +# it's safe to run this as amavis:amavis. Since the program itself +# doesn't have the ability to drop privileges, we'd have to let OpenRC +# do that; and in that case, the easiest way to deal with the PID file +# is to let OpenRC handle that, too. +# +# Thus as a means of future-proofing, we run $command in the +# foreground, and let OpenRC background it and write a PID file. So +# if somebody wants to try command_user="amavis:amavis" here, it might +# just work. +command_args="-f" +command_background="true" + +depend() { + use logger + before amavisd-new snmpd + need amavis-mc +} diff --git a/mail-filter/amavisd-new/files/amavisd-snmp-subagent.initd b/mail-filter/amavisd-new/files/amavisd-snmp-subagent.initd new file mode 100644 index 000000000000..84784b619e2b --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd-snmp-subagent.initd @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/amavisd-snmp-subagent" +pidfile="/run/${RC_SVCNAME}.pid" + +# The RELEASE_NOTES say "it is safe to run it as root, although +# perhaps not necessary." I'm not in a position to test, but I bet +# it's safe to run this as amavis:amavis. Since the program itself +# doesn't have the ability to drop privileges, we'd have to let OpenRC +# do that; and in that case, the easiest way to deal with the PID file +# is to let OpenRC handle that, too. +# +# Thus as a means of future-proofing, we run $command in the +# foreground, and let OpenRC background it and write a PID file. So +# if somebody wants to try command_user="amavis:amavis" here, it might +# just work. +command_args="-f" +command_background="true" + +depend() { + use logger + before amavisd-new snmpd +} diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd deleted file mode 100644 index 4899296cc140..000000000000 --- a/mail-filter/amavisd-new/files/amavisd.initd +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" -extra_commands="debug debug_sa" - -prog="/usr/sbin/amavisd" -progname="amavisd-new" - -depend() { - need net - use logger antivirus snmpd - before mta -} - -start() { - ebegin "Starting ${progname}" - "${prog}" start - eend $? -} - -stop() { - ebegin "Stopping ${progname}" - "${prog}" stop 1>/dev/null - eend $? -} - -reload() { - ebegin "Reloading ${progname}" - "${prog}" reload 1>/dev/null - eend $? -} - -debug() { - ebegin "Starting ${progname} in debug mode" - "${prog}" debug - eend $? -} - -debug_sa() { - ebegin "Starting ${progname} in debug-sa mode" - "${prog}" debug-sa - eend $? -} diff --git a/mail-filter/amavisd-new/files/amavisd.initd-r2 b/mail-filter/amavisd-new/files/amavisd.initd-r2 new file mode 100644 index 000000000000..2e58bf9b7a93 --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd.initd-r2 @@ -0,0 +1,42 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" +command="/usr/sbin/${RC_SVCNAME}" +pidfile="/run/${RC_SVCNAME}.pid" + +# Why run in the foreground? Typically amavisd will drop privileges +# and then write its own PID file in its home directory. This is fine +# so long as you use e.g. "amavisd stop" to stop the daemon. But, we +# want to use start-stop-daemon to do it. And start-stop-daemon will +# send a signal *as root* to the PID contained in the PID file. So, we +# don't want to rely on a PID file that's controlled by a non-root +# user. +# +# As a workaround, we run amavisd in the foreground, and let +# start-stop-daemon push it into the background with its own PID +# file. We don't pass "-P" via command_args below because we don't +# want amavisd to try (and fail) to create that PID file. This does +# mean that you can't run "amavisd stop" or "amavisd reload" directly; +# sorry! +command_args="foreground" +command_background="true" + +# The amavisd daemon provides its own "stop" and "reload" functions, +# but if you read into the source, they just do what start-stop-daemon +# is going to do anyway. The "stop" command for amavisd will send a +# SIGTERM immediately, and then a SIGKILL after 60 seconds. So, we do +# that too. The "reload" command sends a SIGHUP; see reload() below. +retry="SIGTERM/15 SIGKILL/60" + +depend() { + use net logger antivirus snmpd + before mta +} + +reload() { + ebegin "Reloading ${RC_SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/mail-filter/amavisd-new/files/amavisd.service-r1 b/mail-filter/amavisd-new/files/amavisd.service-r1 new file mode 100644 index 000000000000..038712853551 --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd.service-r1 @@ -0,0 +1,21 @@ +[Unit] +Description=Amavisd Daemon +Before=postfix.service +After=clamd.service +After=network.target + +[Service] +User=amavis +Group=amavis +ExecStart=/usr/sbin/amavisd -c /etc/amavisd.conf foreground +ExecReload=/usr/sbin/amavisd -c /etc/amavisd.conf reload +PrivateTmp=true +CapabilityBoundingSet= +ProtectSystem=full +NoNewPrivileges=true +PrivateDevices=true +ProtectHome=true +MemoryDenyWriteExecute=true + +[Install] +WantedBy=multi-user.target diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml index 2a38ad5c4dac..8ab3437f40f6 100644 --- a/mail-filter/amavisd-new/metadata.xml +++ b/mail-filter/amavisd-new/metadata.xml @@ -9,6 +9,10 @@ <email>antivirus@gentoo.org</email> <name>Gentoo Antivirus Project</name> </maintainer> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + <name>Michael Orlitzky</name> + </maintainer> <use> <flag name="courier">Add courier support</flag> <flag name="dkim">Add DomainKeys Identified Mail support</flag> |