diff options
author | Ralph Seichter <github@seichter.de> | 2019-12-17 20:06:49 +0100 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2019-12-18 18:32:36 +0200 |
commit | c9ddba02e825f56aa0caa5c16699f51ec3591109 (patch) | |
tree | 109cc20a2941d432fb72984d89f9990263b76393 /mail-filter | |
parent | net-im/skypeforlinux: Bump version to 8.55.0.123 (diff) | |
download | gentoo-c9ddba02e825f56aa0caa5c16699f51ec3591109.tar.gz gentoo-c9ddba02e825f56aa0caa5c16699f51ec3591109.tar.bz2 gentoo-c9ddba02e825f56aa0caa5c16699f51ec3591109.zip |
mail-filter/opendkim: Removed obsolete build
Ebuild revision 17 has been stabilized. This commit removes both
revision 16 and the now obsolete 'query_cache' USE flag, which
has been replaced with 'querycache'.
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo@seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/14030
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/opendkim/metadata.xml | 3 | ||||
-rw-r--r-- | mail-filter/opendkim/opendkim-2.10.3-r16.ebuild | 231 |
2 files changed, 0 insertions, 234 deletions
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml index 70cf6ebedb92..224c3bd7ac44 100644 --- a/mail-filter/opendkim/metadata.xml +++ b/mail-filter/opendkim/metadata.xml @@ -59,9 +59,6 @@ <flag name="lmdb"> Add support for using <pkg>dev-db/lmdb</pkg> </flag> - <flag name="query_cache"> - Obsolete, use "querycache" instead. Flag will be removed after next stabilization. - </flag> <flag name="querycache"> Add support for query caching (requires 'berkdb' flag) </flag> diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild deleted file mode 100644 index 74145d2b43e5..000000000000 --- a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools db-use eutils systemd tmpfiles user - -DESCRIPTION="A milter providing DKIM signing and verification" -HOMEPAGE="http://opendkim.org/" -SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" - -# The GPL-2 is for the init script, bug 425960. -LICENSE="BSD GPL-2 Sendmail-Open-Source" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats query_cache test unbound" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) - dev-libs/libbsd - sys-apps/grep - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - berkdb? ( >=sys-libs/db-3.2:* ) - opendbx? ( >=dev-db/opendbx-1.4.0 ) - lua? ( dev-lang/lua:* ) - ldap? ( net-nds/openldap ) - lmdb? ( dev-db/lmdb ) - memcached? ( dev-libs/libmemcached ) - sasl? ( dev-libs/cyrus-sasl ) - unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) - !unbound? ( net-libs/ldns )" - -DEPEND="${COMMON_DEPEND} - test? ( dev-lang/lua:* )" - -RDEPEND="${COMMON_DEPEND} - sys-process/psmisc - selinux? ( sec-policy/selinux-dkim )" - -REQUIRED_USE="sasl? ( ldap ) - stats? ( opendbx ) - query_cache? ( berkdb )" - -PATCHES=( - "${FILESDIR}/${P}-openrc.patch" - "${FILESDIR}/${P}-openssl-1.1.1.patch.r2" -) - -pkg_setup() { - # This user can read your private keys, and must therefore not be - # shared with any other package. - enewgroup opendkim - enewuser opendkim -1 -1 -1 opendkim -} - -src_prepare() { - default - sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \ - -i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \ - || die - sed -e 's:dist_doc_DATA:dist_html_DATA:' \ - -i libopendkim/docs/Makefile.am \ - || die - eautoreconf -} - -src_configure() { - local myconf=() - if use berkdb ; then - myconf+=( --with-db-incdir=$(db_includedir) ) - fi - if use unbound; then - myconf+=( --with-unbound ) - else - myconf+=( --with-ldns ) - fi - if use ldap; then - myconf+=( $(use_with sasl) ) - fi - - # We install the our configuration filed under e.g. /etc/opendkim, - # so the next line is necessary to point the daemon and all of its - # documentation to the right location by default. - myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" ) - - econf \ - $(use_with berkdb db) \ - $(use_with opendbx odbx) \ - $(use_with lua) \ - $(use_enable lua rbl) \ - $(use_with ldap openldap) \ - $(use_with lmdb) \ - $(use_enable poll) \ - $(use_enable query_cache) \ - $(use_enable static-libs static) \ - $(use_enable stats) \ - $(use_with memcached libmemcached) \ - "${myconf[@]}" \ - --enable-filter \ - --enable-atps \ - --enable-identity_header \ - --enable-rate_limit \ - --enable-resign \ - --enable-replace_rules \ - --enable-default_sender \ - --enable-sender_macro \ - --enable-vbr \ - --disable-live-testing \ - --with-test-socket="${T}/opendkim.sock" -} - -src_compile() { - emake runstatedir=/run -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - dosbin stats/opendkim-reportstats - - newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}" - systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf" - systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service" - - dodir /etc/opendkim - keepdir /var/lib/opendkim - - # The OpenDKIM data (particularly, your keys) should be read-only to - # the UserID that the daemon runs as. - fowners root:opendkim /var/lib/opendkim - fperms 750 /var/lib/opendkim - - # Tweak the "simple" example configuration a bit before installing - # it unconditionally. - local cf="${T}/opendkim.conf" - # Some MTAs are known to break DKIM signatures with "simple" - # canonicalization [1], so we choose the "relaxed" policy - # over OpenDKIM's current default settings. - # [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/ - sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \ - "${S}/opendkim/opendkim.conf.simple" >"${cf}" || die - cat >>"${cf}" <<EOT || die - -# The UMask is really only used for the PID file (root:root) and the -# local UNIX socket, if you're using one. It should be 0117 for the -# socket. -UMask 0117 -UserID opendkim - -# For use with unbound -#TrustAnchorFile /etc/dnssec/root-anchors.txt -EOT - insinto /etc/opendkim - doins "${cf}" -} - -pkg_postinst() { - tmpfiles_process "${PN}.conf" - if [[ -z ${REPLACING_VERSION} ]]; then - elog "If you want to sign your mail messages and need some help" - elog "please run:" - elog " emerge --config ${CATEGORY}/${PN}" - elog "It will help you create your key and give you hints on how" - elog "to configure your DNS and MTA." - - elog "If you are using a local (UNIX) socket, then you will" - elog "need to make sure that your MTA has read/write access" - elog "to the socket file. This is best accomplished by creating" - elog "a completely-new group with only your MTA user and the" - elog "\"opendkim\" user in it. Step-by-step instructions can be" - elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ." - else - ewarn "The user account for the OpenDKIM daemon has changed" - ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services" - ewarn "from being able to read your private keys. You should" - ewarn "adjust your existing configuration to use the \"opendkim\"" - ewarn "user and group, and change the permissions on" - ewarn "${ROOT}var/lib/opendkim to root:opendkim with mode 0750." - ewarn "The owner and group of the files within that directory" - ewarn "will likely need to be adjusted as well." - fi -} - -pkg_config() { - local selector keysize pubkey - - read -p "Enter the selector name (default ${HOSTNAME}): " selector - [[ -n "${selector}" ]] || selector="${HOSTNAME}" - if [[ -z "${selector}" ]]; then - eerror "Oddly enough, you don't have a HOSTNAME." - return 1 - fi - if [[ -f "${ROOT}var/lib/opendkim/${selector}.private" ]]; then - ewarn "The private key for this selector already exists." - else - keysize=1024 - # Generate the private and public keys. Note that opendkim-genkeys - # sets umask=077 on its own to keep these safe. However, we want - # them to be readable (only!) to the opendkim user, and we manage - # that by changing their groups and making everything group-readable. - opendkim-genkey -b ${keysize} -D "${ROOT}"var/lib/opendkim/ \ - -s "${selector}" -d '(your domain)' && \ - chgrp --no-dereference opendkim \ - "${ROOT}var/lib/opendkim/${selector}".{private,txt} || \ - { eerror "Failed to create private and public keys."; return 1; } - chmod g+r "${ROOT}var/lib/opendkim/${selector}".{private,txt} - fi - - # opendkim selector configuration - echo - einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:" - einfo " Keyfile /var/lib/opendkim/${selector}.private" - einfo " Selector ${selector}" - - # MTA configuration - echo - einfo "If you are using Postfix, add following lines to your main.cf:" - einfo " smtpd_milters = unix:/run/opendkim/opendkim.sock" - einfo " non_smtpd_milters = unix:/run/opendkim/opendkim.sock" - einfo " and read http://www.postfix.org/MILTER_README.html" - - # DNS configuration - einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:" - cat "${ROOT}var/lib/opendkim/${selector}.txt" - einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:" - einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text" -} |