diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /mail-filter/opendkim | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'mail-filter/opendkim')
-rw-r--r-- | mail-filter/opendkim/Manifest | 3 | ||||
-rw-r--r-- | mail-filter/opendkim/metadata.xml | 3 | ||||
-rw-r--r-- | mail-filter/opendkim/opendkim-2.10.3-r16.ebuild | 231 |
3 files changed, 1 insertions, 236 deletions
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest index f32dbf5a2e90..274e6390bf61 100644 --- a/mail-filter/opendkim/Manifest +++ b/mail-filter/opendkim/Manifest @@ -1,6 +1,5 @@ AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 -EBUILD opendkim-2.10.3-r16.ebuild 7464 BLAKE2B d73201ccdc7b3d98bca25dbf5f757deb4980b34d4f87dbe9ed5a848aa6e15427c87f24d97bd72e9635065d4f960dbf9e4a3df021e3c6343fb3e14108e42e0d0c SHA512 89aaae218cd06d9cafe36bd87ee4b2cbe11f2754b896d8935a3ce61bc14277a4ed29c9dca536aa04b67af51ba97bca357d89a0a97e960d82c0de0887c84a7695 EBUILD opendkim-2.10.3-r17.ebuild 7370 BLAKE2B 5d651b5389f07920d307d9c9895d1bfb320edff2d4ce6cb339b9f2f75e9b2073ffeb528b3bfa409d5eab87d7c04b99c48f61793598c7d0b88cea84c8281f1c3c SHA512 cbc2f5869b49a0981ba874b26ff386adcaddcbc15d227d56ad3baf7b6b6b31c33691bfe5552daa8354cef1db3ded88f9576647347bc047835170bd5c31f9dff9 -MISC metadata.xml 2316 BLAKE2B 5bda2db8ef7a54711366213e84b3edb8a93e5327737a433a445d28a482e92e4c5e29e9dc22d318ba4c294d273f048a63f1e10999e132df9cdcbbc05c12c29d4b SHA512 4720d75af10968bfdcf4a53c2571724ad164ea081dd30b39568467b5eee25f6df25c8caf8b4551ddb2f2e97889b8ddff1fb10a7e24e1eaaf340c8d7bab542837 +MISC metadata.xml 2185 BLAKE2B 0cfb33303e8edf764700664863e2dbf90a288e71cf1a078c33ebaac20b11e398e34ae8ca289732b24401ec1f4b192e2c922a86297632af9a039736c52e0ac143 SHA512 56753bc62e8fa16ad3df9e49c2877bbfa5ca8f2f617455c8b9757e50cdd2afe6b27d2d185edb3620d447e42277d755373eafb448da08262723cfb0b5863c3399 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" -} |