diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-21 18:00:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-21 18:00:10 +0100 |
commit | 265dbe5dbc14c199299496c6db8fce3f76647015 (patch) | |
tree | ab18b5617d138f6684566b619405090989d55a2c /mail-filter | |
parent | 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff) |
gentoo resync : 21.09.2018
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/Manifest.gz | bin | 11016 -> 11022 bytes | |||
-rw-r--r-- | mail-filter/sieve-connect/Manifest | 3 | ||||
-rw-r--r-- | mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild | 32 | ||||
-rw-r--r-- | mail-filter/sieve-connect/sieve-connect-0.87.ebuild | 4 | ||||
-rw-r--r-- | mail-filter/spamassassin/Manifest | 2 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild | 244 |
6 files changed, 282 insertions, 3 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex dfb2340227d0..ff7a7e29b468 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/mail-filter/sieve-connect/Manifest b/mail-filter/sieve-connect/Manifest index b9dc9477d142..6d49d7b0d44d 100644 --- a/mail-filter/sieve-connect/Manifest +++ b/mail-filter/sieve-connect/Manifest @@ -1,3 +1,4 @@ DIST sieve-connect-0.87.tar.bz2 40023 BLAKE2B 510f5c2a42524f7d412b0b13ab549667cd912411b069e7328ab13a1284c2877a78084495e19be6cac643dec4c952a2672b2f3b11bba755fa11aabc3e58008693 SHA512 28ed4f5cd929ee5edb420afcbac238399463beecf551643b9ee5ea41debbb1e5401a619b39b6422ec47885ea3cc207866e09da2e46a65bcc3d4f3ca5bdbf016a -EBUILD sieve-connect-0.87.ebuild 710 BLAKE2B 43d9361c84a94d5bf1ff73e7b47a26fbca72306528760af71984da37a023708a71541d885019921272c76101ce8d6a698e194e75ed8a7e7c4819ab73a6a9aaf5 SHA512 bf9859221f806e7fd4d8f199cf3159e8934f57cd5cae4ebdc8f706e2588115099f9d73185e86ea3067e3266c1fcf8f22ad6c79616d9b288fad84c93097e15d1f +EBUILD sieve-connect-0.87-r1.ebuild 705 BLAKE2B 5e0152fdd5768993e9aa2f2409aeb21fcd95866de39867a07996bbd60052d695fe893465ed5fbed6557fdeb952dd4cef117ee45b838aef0decb6e77673d730e2 SHA512 fc9912ca31d7eae9f1e52377ea07cf56898de88bd8286a26835811227927b96447aeeabba23fa97353a64a3d73c9bb49a544e8cb690028e55ac70aee1ff383a0 +EBUILD sieve-connect-0.87.ebuild 711 BLAKE2B 72687a35d6f6abe08bcac576e2e2d13e9da86b45a4fe28a5db325369c567c37798c44ffdf8435ce523d1dfab4ba752ca0ff8d447c6a08cdb68a1848e03171720 SHA512 b843773bc8e301b640192c299debe41d7e2f24146ff697156f8a871ae050f1b831b0b4e2cde9302d321838910b25a238a0920eb5876734502fa5d65aedff3278 MISC metadata.xml 2017 BLAKE2B 3d6f4fa162a9ef67c1cfac4da9a605d06d8feb6c0b98957f2e14149e9fe10130a3e14dc1733f28470f40816ecf0a4710784695b929e54cfba6f693f5024b1ea4 SHA512 76eecd2659b89c420e34f21244ce33927d2f438e5f3292a30da4e9d4eb968a13af4c51f81e3e4fa2d20345ac2798a9172be7e5bc5ddf07187ae4b032986473d3 diff --git a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild b/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild new file mode 100644 index 000000000000..07371b0cb2fd --- /dev/null +++ b/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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.87.ebuild b/mail-filter/sieve-connect/sieve-connect-0.87.ebuild index fb4e8756c0ad..5b2e9a207517 100644 --- a/mail-filter/sieve-connect/sieve-connect-0.87.ebuild +++ b/mail-filter/sieve-connect/sieve-connect-0.87.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 DESCRIPTION="Sieve Command Line Interface" -HOMEPAGE="http://people.spodhuis.org/phil.pennock/software/" +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" diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 1f849878a011..ea045636795a 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -16,7 +16,9 @@ AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a63 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5 DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 BLAKE2B f85b0ed2bae783bc6dfa39df36589a6cb90e6c657efcff1fa094f952847e4bcb24aa232b6689804bb1170204ae1d33216ed9bde207d7a7a6863410d8f847c391 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af +DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885 EBUILD spamassassin-3.4.1-r19.ebuild 7828 BLAKE2B 2cbf6260632b4fba3e0f25eeb4301be18a321768d6ac77f479d0d0bb7914fb978b59817db61ac35acb19386b2831381f1e6f7784dd8c72f94999c0c9e8cb718c SHA512 822bbd4cefdd73a8174072c2131cd8deead8416192ce7b9373165476cdaa2b3056b589d9143fc84944ad9bd312333852cd510e3ac949afba5310fda9a778b64c EBUILD spamassassin-3.4.1-r20.ebuild 7814 BLAKE2B 144d0498236d9f504e252d7dea23910a7ece9739a8df0a2f840be25ae656702f64847f533b5dcbd54761e3fb5e073b49ca117107269b5bc25a36ab64c0d52468 SHA512 3bc999d93244311e074cbecf3b6e4ad7db065b8ddeb1a13f0cd93e654ed7694d8c527b35dc624479efb56bdb050fa46996a5a8bce15fa3968e26970e87552d32 EBUILD spamassassin-3.4.1-r21.ebuild 7862 BLAKE2B 0d5897de61875e18bc7791ff15b6955be8685caf7ede9bc8294f46b3b7ab1a3f98657f2b1c3769303c4b728e530bf97187430b835c0dfb3b31f2f11951cc37ad SHA512 3d48cb3993e648c59a8073100f03a9f2e7b08c6aa2032374386ea014bc4df1053a6f01110655e8be1d217743f3927c4f183d61735602b09f54ed23eee38b0bbb +EBUILD spamassassin-3.4.2-r1.ebuild 7559 BLAKE2B 14046d07476558eaef6215efd12a7d7223798f3e636d53a90aacbbc04c4bca7ca5f4165b8e7c2659cd4e646e2063e32c58e5fccdc3c171a7cdb4d9a808579773 SHA512 f5af2334f11841ce5441b7a20edb33b70b582f0bf770006a9fbb96d3016a66ab8cfc4ca29d7c18c2b5858380d9bcb3910b7f60cc7d81b7e2c53775fb8b73f1d0 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild new file mode 100644 index 000000000000..2fd2d38d2b86 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit perl-functions systemd toolchain-funcs user + +MY_P="Mail-SpamAssassin-${PV//_/-}" +S="${WORKDIR}/${MY_P}" +DESCRIPTION="An extensible mail filter which can identify and tag spam" +HOMEPAGE="https://spamassassin.apache.org/" +SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" + +# The Makefile.PL script checks for dependencies, but only fails if a +# required (i.e. not optional) dependency is missing. We therefore +# require most of the optional modules only at runtime. +REQDEPEND="dev-lang/perl:= + dev-perl/HTML-Parser + dev-perl/Net-DNS + dev-perl/NetAddr-IP + virtual/perl-Archive-Tar + virtual/perl-Digest-SHA + virtual/perl-IO-Zlib + virtual/perl-Time-HiRes + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + )" + +# SpamAssassin doesn't use libwww-perl except as a fallback for when +# curl/wget are missing, so we depend on one of those instead. Some +# mirrors use https, so we need those utilities to support SSL. +# +# re2c is needed to compile the rules (sa-compile). +# +# We still need the old Digest-SHA1 because razor2 has not been ported +# to Digest-SHA. +OPTDEPEND="app-crypt/gnupg + dev-perl/Digest-SHA1 + dev-perl/Encode-Detect + dev-perl/Geo-IP + dev-perl/HTTP-Date + dev-perl/Mail-DKIM + dev-perl/Mail-SPF + dev-perl/Net-Patricia + dev-perl/Net-CIDR-Lite + dev-util/re2c + || ( net-misc/wget[ssl] net-misc/curl[ssl] ) + virtual/perl-MIME-Base64 + virtual/perl-Pod-Parser + berkdb? ( virtual/perl-DB_File ) + ipv6? ( dev-perl/IO-Socket-INET6 ) + ldap? ( dev-perl/perl-ldap ) + mysql? ( + dev-perl/DBI + dev-perl/DBD-mysql + ) + postgres? ( + dev-perl/DBI + dev-perl/DBD-Pg + ) + sqlite? ( + dev-perl/DBI + dev-perl/DBD-SQLite + ) + ssl? ( dev-perl/IO-Socket-SSL )" + +DEPEND="${REQDEPEND} + test? ( + ${OPTDEPEND} + virtual/perl-Test-Harness + )" +RDEPEND="${REQDEPEND} ${OPTDEPEND}" + +src_prepare() { + default + + # The sa_compile test does some weird stuff like hopping around in + # the directory tree and calling "make" to create a dist tarball + # from ${S}. It fails, and is more trouble than it's worth... + perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test' + + # The spamc tests (which need the networked spamd daemon) fail for + # irrelevant reasons. It's too hard to disable them (unlike the + # spamd tests themselves -- see src_test), so use a crude + # workaround. + perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests' + + # Upstream bug 7622: this thing needs network access but doesn't + # respect the 'run_net_tests' setting. + perl_rm_files t/urilocalbl_geoip.t \ + || die 'failed to remove urilocalbl_geoip tests' +} + +src_configure() { + # This is how and where the perl-module eclass disables the + # MakeMaker interactive prompt. + export PERL_MM_USE_DEFAULT=1 + + # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again + # (just to be sure, nobody knows how it could happen in the first place). + # + # We also set the path to the perl executable explictly. This will be + # used to create the initial shebang line in the scripts (bug 62276). + perl Makefile.PL \ + PREFIX="${EPREFIX}/usr" \ + INSTALLDIRS=vendor \ + SYSCONFDIR="${EPREFIX}/etc" \ + DATADIR="${EPREFIX}/usr/share/spamassassin" \ + PERL_BIN="${EPREFIX}/usr/bin/perl" \ + ENABLE_SSL="$(usex ssl)" \ + DESTDIR="${D}" \ + || die 'failed to create a Makefile using Makefile.PL' + + # Now configure spamc. + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile +} + +src_compile() { + emake + use qmail && emake spamc/qmail-spamc +} + +src_install () { + emake install + einstalldocs + + # Create the stub dir used by sa-update and friends + keepdir /var/lib/spamassassin + + # Move spamd to sbin where it belongs. + dodir /usr/sbin + mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" + + if use qmail; then + dobin spamc/qmail-spamc + fi + + dosym mail/spamassassin /etc/spamassassin + + # Disable plugin by default + sed -i -e 's/^loadplugin/\#loadplugin/g' \ + "${ED}/etc/mail/spamassassin/init.pre" \ + || die "failed to disable plugins by default" + + # Add the init and config scripts. + newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd + newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd + + systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" + systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ + "${PN}.service" + + use postgres && dodoc sql/*_pg.sql + use mysql && dodoc sql/*_mysql.sql + + dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \ + sql/README.awl procmailrc.example sample-nonspam.txt \ + sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \ + spamd-apache2/README.apache + + # Rename some files so that they don't clash with others. + newdoc spamd/README README.spamd + newdoc sql/README README.sql + newdoc ldap/README README.ldap + + if use qmail; then + dodoc spamc/README.qmail + fi + + insinto /etc/mail/spamassassin/ + insopts -m0400 + newins "${FILESDIR}"/secrets.cf secrets.cf.example + + # Create the directory where sa-update stores its GPG key (if you + # choose to import one). If this directory does not exist, the + # import will fail. This is bug 396307. We expect that the import + # will be performed as root, and making the directory accessible + # only to root prevents a warning on the command-line. + diropts -m0700 + dodir /etc/mail/spamassassin/sa-update-keys + + if use cron; then + # Install the cron job if they want it. + exeinto /etc/cron.daily + newexe "${FILESDIR}/update-spamassassin-rules.cron" \ + update-spamassassin-rules + fi + + # Remove perllocal.pod to avoid file collisions (bug #603338). + perl_delete_localpod || die "failed to remove perllocal.pod" + + # The perl-module eclass calls three other functions to clean + # up in src_install. The first fixes references to ${D} in the + # packlist, and is useful to us, too. The other two functions, + # perl_delete_emptybsdir and perl_remove_temppath, don't seem + # to be needed: there are no empty directories, *.bs files, or + # ${D} paths remaining in our installed image. + perl_fix_packlist || die "failed to fix paths in packlist" +} + +src_test() { + # Trick the test suite into skipping the spamd tests. Setting + # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be + # set in SATest.pm. + export SPAMD_HOST=disabled + default +} + +pkg_preinst() { + # The spamd daemon runs as this user. Use a real home directory so + # that it can hold SA configuration. + enewuser spamd -1 -1 /home/spamd +} + +pkg_postinst() { + elog + elog 'No rules are installed by default. You will need to run sa-update' + elog 'at least once, and most likely configure SpamAssassin before it' + elog 'will work.' + + if ! use cron; then + elog + elog 'You should consider a cron job for sa-update. One is provided' + elog 'for daily updates if you enable the "cron" USE flag.' + fi + elog + elog 'Configuration and update help can be found on the wiki:' + elog + elog ' https://wiki.gentoo.org/wiki/SpamAssassin' + elog + + ewarn 'If this version of SpamAssassin causes permissions issues' + ewarn 'with your user configurations or bayes databases, then you' + ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' + ewarn 'configuration file, or remove the --username and --groupname' + ewarn 'flags from the SPAMD_OPTS variable in your systemd service' + ewarn 'configuration file.' +} |