[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     578075444807e9f5ef09e778aa131d1068f83aa5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 09:01:51 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:01:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57807544

mail-filter/opendkim: amd64 stable wrt bug #569802

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
index ec16223..5030677 100644
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     4a27ec9e7ca1f4b76b9505163f007578c6e8cadb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 10:09:32 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:10:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a27ec9e

mail-filter/opendkim: x86 stable wrt bug #569802

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
index 5030677..f0d9a69 100644
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Eray Aslan]

commit:     6fdf3d9efe811816035fd102c70116d0ea1ef1f0
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 12:44:56 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 12:44:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fdf3d9e

mail-filter/opendkim: remove old

Package-Manager: portage-2.2.27

 mail-filter/opendkim/Manifest                 |   4 -
 mail-filter/opendkim/opendkim-2.10.0.ebuild   | 196 -------------------------
 mail-filter/opendkim/opendkim-2.10.2.ebuild   | 196 -------------------------
 mail-filter/opendkim/opendkim-2.9.2-r1.ebuild | 197 --------------------------
 mail-filter/opendkim/opendkim-2.9.3.ebuild    | 197 --------------------------
 5 files changed, 790 deletions(-)

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 7da87da..c419f4b 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,5 +1 @@
-DIST opendkim-2.10.0.tar.gz 1213007 SHA256 4a747c9028e1cba40b5f8ba64ec5fbcf9f7d27a8a41fec4b4a398e2a6001c747 SHA512 c1ef4a8e80ed8a6e64e9a9a4f6d2ec684622fb4248d1d1c9b696f14ec9f4163e7b37f1a936ec8d522b6531b91fc869ca875fd6ff58c96c75ba41c919bed40d53 WHIRLPOOL 8443c330265dd47774ed476e4a88da10e586dc27fe6f7d98bec8f88c9129e04df334bf2d4dcfa0c65ca9b5287d8fa478b9d9bd6da9672add32074d0d6d9da0bf
-DIST opendkim-2.10.2.tar.gz 1209812 SHA256 ff5dc58ca8ad94de9b999bde3c53f49ac040dc09ad4b295ea22984d8d7df4f82 SHA512 b3c3e5fa3c265082d6f68def987a6805edba3798b37390c1e8099e2cecc71a9f6080481036991f654fa02b1a09d6b2107156aa533d14d0bfc0cb2d09bc7e398c WHIRLPOOL a3ca0262d1d2b3d01e28406224afa3ae914fd9f21bb455b34070d5821dbd8211696204fd7143b2e3046a6d3afa098a1d179e7be2433126fa8c763459cb448032
 DIST opendkim-2.10.3.tar.gz 1210224 SHA256 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 WHIRLPOOL 36bbf0f3e81fa291f31123d3614ba113b893d4ba76a5fe017cc9a393888c1ea95525b85e6042bc1db96e9a00e52aa13a251c38438cd03b0fd92b47d17036d680
-DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0 SHA512 f6fe77897927a93c9f57d09e5e9f43b1e73e2b21a586461b5665fb430eee1362b33d9601c8643d50d5a53c8e01b03c7af331f28cd992c9163f959723f21ebf63 WHIRLPOOL b61212d272d07c367c7d9ecb951466b66759b6d449047c10947681ea6889a1f2b2c12986e6c11a59620fb8ace3c0a177235f65f58c54c993909f61dee5cf3c3a
-DIST opendkim-2.9.3.tar.gz 1230406 SHA256 79a84fc17fa6aa9428ed449b1b2b773b0a4cb4ac7fa69b01b178fe0b4691c533 SHA512 9ed79f4cc595ef6dded8c1c1af77404ed629d88d2dad11c72fc0ff961bb9ab62037e010b29b651bc2cdcbdbabf001199b12544330a3af851b61d05518cf92053 WHIRLPOOL 5f24ecb5084babcd572f9cce9645aba92f1a68643bd4928b5040f3cad21f299380af746ad2dcefacc5803438a06c021a85da2be80ecf91308e7519d2df93cf51

diff --git a/mail-filter/opendkim/opendkim-2.10.0.ebuild b/mail-filter/opendkim/opendkim-2.10.0.ebuild
deleted file mode 100644
index 0e845b9..0000000
--- a/mail-filter/opendkim/opendkim-2.10.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

diff --git a/mail-filter/opendkim/opendkim-2.10.2.ebuild b/mail-filter/opendkim/opendkim-2.10.2.ebuild
deleted file mode 100644
index ec16223..0000000
--- a/mail-filter/opendkim/opendkim-2.10.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

diff --git a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
deleted file mode 100644
index 6f7cb7d..0000000
--- a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-adsp_lists \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--disable-rpath \
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

diff --git a/mail-filter/opendkim/opendkim-2.9.3.ebuild b/mail-filter/opendkim/opendkim-2.9.3.ebuild
deleted file mode 100644
index 03b441c..0000000
--- a/mail-filter/opendkim/opendkim-2.9.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-adsp_lists \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--disable-rpath \
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Anthony G. Basile]

commit:     a34ad18c0ed4f6226a6b79cee37e0faba55e1621
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 13:05:41 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 13:05:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34ad18c

mail-filter/opendkim: add libressl support

Package-Manager: portage-2.2.28

 mail-filter/opendkim/opendkim-2.10.3-r1.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
index 73ec108..12f2711 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
@@ -17,11 +17,14 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
+IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
+	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:* )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michał Górny]

commit:     288687c0418e65a757680fa336fb73430476c1ae
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Wed Jul 27 03:06:15 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 14:13:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288687c0

mail-filter/opendkim-2.10.3-r2: fix systemd unit name, #589794

Closes: https://github.com/gentoo/gentoo/pull/1977

 .../opendkim/{opendkim-2.10.3-r1.ebuild => opendkim-2.10.3-r2.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
similarity index 98%
rename from mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
index 12f2711..49a4f9a 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
@@ -120,7 +120,7 @@ src_install() {
 	dosbin stats/opendkim-reportstats
 
 	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim-r1.service"
+	systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service
 
 	dodir /etc/opendkim /var/lib/opendkim
 	fowners milter:milter /var/lib/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Alon Bar-Lev]

commit:     04f5d933ea4df9aab3787f0cbd5ee981222679e2
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 23:51:59 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 23:51:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f5d933

mail-filter/opendkim: fix myconf expansion

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 mail-filter/opendkim/opendkim-2.10.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
index a58a39496e5..9f1d7de3359 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
@@ -105,7 +105,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with gnutls) \
 		$(use_with memcached libmemcached) \
-		${myconf[@]} \
+		"${myconf[@]}" \
 		--enable-filter \
 		--enable-atps \
 		--enable-identity_header \

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     4cd4bfa48702d55894be51344a0badbd65620a88
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 12:08:03 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 12:08:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd4bfa4

mail-filter/opendkim: amd64 stable wrt bug #612360

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
index 9f1d7de3359..a091689917a 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Thomas Deutschmann]

commit:     87ff1dc8f4ff6103385bd8c2315d8738ea0d5f30
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 22:09:13 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 22:09:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ff1dc8

mail-filter/opendkim: add sub slot operator on net-dns/unbound atom

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 mail-filter/opendkim/opendkim-2.10.3-r2.ebuild | 4 ++--
 mail-filter/opendkim/opendkim-2.10.3-r3.ebuild | 4 ++--
 mail-filter/opendkim/opendkim-2.10.3.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
index cae5527aec2..83fbee2e61f 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -31,7 +31,7 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	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-dns/unbound-1.4.1:= net-dns/dnssec-root )
 	!unbound? ( net-libs/ldns )
 	gnutls? ( >=net-libs/gnutls-2.11.7 )"
 

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
index 18f586f3be7..4b39b476cb3 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	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-dns/unbound-1.4.1:= net-dns/dnssec-root )
 	!unbound? ( net-libs/ldns )
 	gnutls? ( >=net-libs/gnutls-3.3 )"
 

diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
index 9e1f0e70218..19bee906d0e 100644
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	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-dns/unbound-1.4.1:= net-dns/dnssec-root )
 	!unbound? ( net-libs/ldns )
 	gnutls? ( >=net-libs/gnutls-2.11.7 )"
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Lars Wendler]

commit:     2c3a8df6ee40ba858dcd3f582e63e2f7af491b09
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 18:29:23 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 19:15:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3a8df6

mail-filter/opendkim: Removed old.

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r2.ebuild | 198 -------------------------
 mail-filter/opendkim/opendkim-2.10.3.ebuild    | 195 ------------------------
 2 files changed, 393 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
deleted file mode 100644
index 83fbee2e61f..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
deleted file mode 100644
index 19bee906d0e..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     e5672be4461a75a0a4d25a4fd1d03a5a123fee79
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 15:01:21 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5672be4

mail-filter/opendkim: simplify and shorten the DESCRIPTION.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
index f8210915054..efc5bf5ad7e 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit autotools db-use eutils systemd user
 
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
+DESCRIPTION="A milter providing DKIM signing and verification"
 HOMEPAGE="http://opendkim.org"
 SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     e4ba262bea44125a2d8a51a9528546be72fcc01c
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 13:33:27 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ba262b

mail-filter/opendkim: remove commented code at top of -r4 ebuild.

There were a few commented variables at the top of the -r4 ebuild that
were used for beta releases. However, this package hasn't seen a
release in three years -- much less a beta release -- so I think
they're just wasting space at this point.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r4.ebuild | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
index 6c1b66b18e1..36c2a995495 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
@@ -1,15 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit autotools db-use eutils systemd user
 
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
 DESCRIPTION="A milter-based application to provide DKIM signing and verification"
 HOMEPAGE="http://opendkim.org"
 SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
@@ -60,10 +55,10 @@ src_prepare() {
 	default
 
 	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
+		   -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
+		   -e 's:/etc/mail:/etc/opendkim:g' \
+		   -e 's:mailnull:milter:g' \
+		   -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
 		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
 		   stats/opendkim-reportstats{,.in} || die
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     c6b380f6fb110aa721836a2f836aa2cab090cb01
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 14:10:13 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b380f6

mail-filter/opendkim: new revision to fix a dodir->keepdir usage.

The data directory /var/lib/opendkim is installed empty by default,
and therefore needs to be created with keepdir (and not dodir). This
changes the installed image, and thus is cause for a new revision.

Closes: https://bugs.gentoo.org/666334
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 .../opendkim/{opendkim-2.10.3-r4.ebuild => opendkim-2.10.3-r5.ebuild}  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r5.ebuild
similarity index 99%
rename from mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r5.ebuild
index 74b3c8a1021..82a6167336a 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r5.ebuild
@@ -126,7 +126,8 @@ src_install() {
 	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
 	systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service
 
-	dodir /etc/opendkim /var/lib/opendkim
+	dodir /etc/opendkim
+	keepdir /var/lib/opendkim
 	fowners milter:milter /var/lib/opendkim
 
 	# default configuration

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     d39cb5c7e77cbb2ddb6c763db993598df4e12249
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 13:30:31 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d39cb5c7

mail-filter/opendkim: add myself as a maintainer; whitespace cleanup.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/metadata.xml | 73 ++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 2014530dff9..ba4a1a9842d 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,31 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>A program implementing the Milter API that signs and verifies
-using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescription>
-	<use>
-		<!--flag name='diffheaders'>On verification failure, compare the
-	original and the received headers to look for possible munging</flag-->
-		<flag name="unbound">Use the unbound dnssec library to perform DKIM DNS
-	queries.</flag>
-		<flag name="opendbx">Use opendbx backend to facilitate dataset driven
-	OpenDKIM configuration options like stats, bodylengthdb, etc. against a wide
-	variety of database types</flag>
-		<flag name="sasl">Used to authenticate to a LDAP server in various ways if
-	required.</flag>
-		<flag name="ldap">Enable openldap as a dataset facilitator or keys,
-	determining domains to sign for, and any other dataset that opendkim
-	supports.</flag>
-		<flag name="lua">Enables control over signature verification, filtering and
-	policy to be controlled by user defined lua scripts.</flag>
-		<flag name="poll">Use poll() instead of select() for the provided
-	asynchronous resolver library.</flag>
-		<flag name="memcached">Add support for using <pkg>dev-libs/libmemcached</pkg>
-	</flag>
-		<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">opendkim</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+
+  <longdescription>
+    A program implementing the Milter API that signs and verifies
+    using the DKIM standard. This is a fork of Sendmail's DKIM-milter
+  </longdescription>
+  <use>
+    <flag name="unbound">
+      Use the unbound dnssec library to perform DKIM DNS
+      queries.
+    </flag>
+    <flag name="opendbx">
+      Use opendbx backend to facilitate dataset driven OpenDKIM
+      configuration options like stats, bodylengthdb, etc. against a
+      wide variety of database types
+    </flag>
+    <flag name="sasl">
+      Used to authenticate to a LDAP server in various ways if
+      required.
+    </flag>
+    <flag name="ldap">
+      Enable openldap as a dataset facilitator or keys, determining
+      domains to sign for, and any other dataset that opendkim
+      supports.
+    </flag>
+    <flag name="lua">
+      Enables control over signature verification, filtering and
+      policy to be controlled by user defined lua scripts.
+    </flag>
+    <flag name="poll">
+      Use poll() instead of select() for the provided asynchronous
+      resolver library.
+    </flag>
+    <flag name="memcached">
+      Add support for using <pkg>dev-libs/libmemcached</pkg>
+    </flag>
+    <flag name="lmdb">
+      Add support for using <pkg>dev-db/lmdb</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">opendkim</remote-id>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     a3d81912b95dbe7b9af7ffbeff06a828556ff34e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 14:04:39 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d81912

mail-filter/opendkim: add GPL-2 to LICENSE for OpenRC service script.

Our init script is a critical out-of-tree piece of code that gets
installed, and it's licensed GPL-2. So, we should include that in the
LICENSE variable for the package.

Closes: https://bugs.gentoo.org/425960
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
index 36c2a995495..74b3c8a1021 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r4.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="A milter-based application to provide DKIM signing and verification
 HOMEPAGE="http://opendkim.org"
 SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
-LICENSE="Sendmail-Open-Source BSD"
+# 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 gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     b37dfc1e0ce727481e17391f4d61f87e4faea495
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 15:02:31 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37dfc1e

mail-filter/opendkim: remove two commented econf lines.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r6.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
index efc5bf5ad7e..79d0a2ec820 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
@@ -111,8 +111,6 @@ src_configure() {
 		--enable-sender_macro \
 		--enable-vbr \
 		--disable-live-testing
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     a336c8fa9cccd520e99b136d54162a2ca3524274
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 14:18:04 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a336c8fa

mail-filter/opendkim: remove dangerous elog suggesting "umask 000".

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r5.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r5.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r5.ebuild
index 82a6167336a..fe0d7c091a7 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r5.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r5.ebuild
@@ -152,10 +152,6 @@ pkg_postinst() {
 		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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     47648f4182e4ebb6d2ce5755c6f88ffae89b3870
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 17:11:11 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47648f41

mail-filter/opendkim: remove some no-op sed lines.

Looking through the upstream example config files, I don't see any of
the expressions that the "sed" script in src_prepare is supposed to
replace. Huh. This commit removes those "sed" commands.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r8.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
index f2e43b0041f..02b499bde25 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
@@ -56,9 +56,6 @@ src_prepare() {
 	# We delete the "Socket" setting because it's overridden by our
 	# conf.d file.
 	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
-		-e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-		-e 's:/etc/mail:/etc/opendkim:g' \
-		-e 's:mailnull:opendkim:g' \
 		-e '/^[[:space:]]*Socket/d' \
 		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
 		stats/opendkim-reportstats{,.in} || die

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     1e35c9f5cb7862d43cecc76cf4159bae5b71ff9c
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 16:01:33 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e35c9f5

mail-filter/opendkim: add an elog about sharing a local socket.

Sharing a local OpenDKIM socket with an MTA is far too tricky. This
commit adds an elog with some vague hints, but we really need a decent
wiki page with some step-by-step instructions. This is progress
towards bug 575666, but I won't consider that resolved until we have
a wiki page.

Bug: https://bugs.gentoo.org/575666
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r7.ebuild | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
index 0b954394930..28700f34963 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
@@ -153,6 +153,18 @@ pkg_postinst() {
 		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."
+
+		# TODO: This is tricky, we really need a good wiki page showing
+		# how to share a local socket with an 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. You would then set \"UMask 0112\""
+		elog "in your opendkim.conf, and switch the primary group of your"
+		elog "\"opendkim\" user to the group that you just created. The"
+		elog "last step is necessary for the socket to be created as the"
+		elog "new group (and not as group \"opendkim\")".
 	else
 		ewarn "The user account for the OpenDKIM daemon has changed"
 		ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     ca3fe1b2bf85e471adbf16313eb9f4f167333fff
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 15:55:31 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3fe1b2

mail-filter/opendkim: add a trailing slash to the HOMEPAGE.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
index ec539e9dbc5..0b954394930 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools db-use eutils systemd user
 
 DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
+HOMEPAGE="http://opendkim.org/"
 SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 # The GPL-2 is for the init script, bug 425960.

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     38b55aff18a5a0c98da6d6ca59d6e4b415b70333
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 15:07:16 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b55aff

mail-filter/opendkim: combine two neighboring sed expressions.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r6.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
index 79d0a2ec820..b375078ae11 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r6.ebuild
@@ -64,8 +64,9 @@ src_prepare() {
 	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
 		|| die
 
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
+	sed -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' \
+		-e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' \
+		-i opendkim/tests/*.lua || die
 
 	eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     8fb71c916f648e79897e202076fc5447df07c991
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 16:53:38 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb71c91

mail-filter/opendkim: use /var/lib/opendkim in pkg_config.

The keys that are generated by opendkim-genkey are data, in a sense,
and not configuration files. As a result, I think it's more appropriate
to store them in /var/lib/opendkim than in /etc/opendkim where they were
previously stored. This commit moves the keys, and also tightens the
permissions on them a bit so that the "opendkim" user can only read them.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r8.ebuild | 28 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
index c45d7104150..f2e43b0041f 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 
 	# We delete the "Socket" setting because it's overridden by our
 	# conf.d file.
-	sed -e 's:/var/db/dkim:/etc/opendkim:g' \
+	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
 		-e 's:/var/db/opendkim:/var/lib/opendkim:g' \
 		-e 's:/etc/mail:/etc/opendkim:g' \
 		-e 's:mailnull:opendkim:g' \
@@ -183,28 +183,32 @@ pkg_config() {
 	local selector keysize pubkey
 
 	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
+	[[ -n "${selector}" ]] || selector="${HOSTNAME}"
 	if [[ -z "${selector}" ]]; then
 		eerror "Oddly enough, you don't have a HOSTNAME."
 		return 1
 	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
+	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
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown opendkim:opendkim \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
+		# 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 /etc/opendkim/${selector}.private"
+	einfo "  Keyfile /var/lib/opendkim/${selector}.private"
 	einfo "  Selector ${selector}"
 
 	# MTA configuration
@@ -216,7 +220,7 @@ pkg_config() {
 
 	# DNS configuration
 	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
+	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"
 }

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     65005df6050d33d3eb5001d958aaae17bb72a962
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 16:28:12 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65005df6

mail-filter/opendkim: new revision with a consistent config file.

The previous revisions installed a variable config file, and only did
so conditionally, based on the state of the live filesystem. The new
revision always installs the same config file. This should be simpler
and more predictable. In addition, the temporary directory "${T}" is
now used as "scratch space" while mangling that config file.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 ...im-2.10.3-r7.ebuild => opendkim-2.10.3-r8.ebuild} | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
similarity index 93%
rename from mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
index 9a16abcce51..c45d7104150 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
@@ -135,15 +135,17 @@ src_install() {
 	fowners root:opendkim /var/lib/opendkim
 	fperms 750 /var/lib/opendkim
 
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID opendkim >> "${D}"/etc/opendkim/opendkim.conf
-	fi
+	# Strip the comments out of the "simple" example configuration...
+	grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+		 > "${T}/opendkim.conf" || die
+
+	# and tweak it a bit before installing it unconditionally.
+	echo "# For use with unbound" >> "${T}/opendkim.conf" || die
+	echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \
+		 >> "${T}/opendkim.conf" || die
+	echo UserID opendkim >> "${T}/opendkim.conf" || die
+	insinto /etc/opendkim
+	doins "${T}/opendkim.conf"
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     979c3fa625bf403e17268c70b7f7dace5c7efb31
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 16:19:56 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979c3fa6

mail-filter/opendkim: add a TODO question about a sed line.

There's a sed line in src_prepare that messes with some *.lua test
files. I've changed the action of that script to use "${T}" rather
than "/tmp" for security reasons... but I'm unable to figure out when
those test files are actuallty used. So, I've left a TODO comment to
figure it out in the future (or maybe just delete that sed line
entirely).

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
index 28700f34963..9a16abcce51 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild
@@ -66,8 +66,8 @@ src_prepare() {
 	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
 		|| die
 
-	sed -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' \
-		-e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' \
+	# TODO: what purpose does this serve, do the tests even get run?
+	sed -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \
 		-i opendkim/tests/*.lua || die
 
 	eautoreconf

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     18427f923c8ee239c73918eb4dfb147230f0e50f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 17:00:18 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 17:18:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18427f92

mail-filter/opendkim: add Ralph Seichter and klondike as maintainers.

These two people expressed interest (on the -dev mailing list) in
maintaining this package.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/metadata.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index ba4a1a9842d..88da0199862 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+
+  <maintainer type="person">
+    <email>gentoo@seichter.de</email>
+    <name>Ralph Seichter</name>
+  </maintainer>
+
+  <maintainer type="person">
+    <email>klondike@gentoo.org</email>
+    <name>Francisco Blas Izquierdo Riera</name>
+  </maintainer>
+
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
 
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
   <longdescription>
     A program implementing the Milter API that signs and verifies
     using the DKIM standard. This is a fork of Sendmail's DKIM-milter

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     c6c1a0fa67977ef6d3849415467990831229f4b0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 10:45:14 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 10:45:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c1a0fa

mail-filter/opendkim: amd64 stable wrt bug #629914

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 mail-filter/opendkim/opendkim-2.10.3-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
index 02b499bde25..153e6a57764 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     db3f841d797fc4d27befc756e1acf30dbb00035d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 21:11:47 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 21:12:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3f841d

mail-filter/opendkim: add "UMask 0117" to the config by default.

Ralph and I have been discussing the best way to handle a local UNIX
socket. One thing that we both agree on is that, regardless of the
other details, the daemon should be running with a UMask of 0117 to
create the socket group-writable but otherwise private. And since the
opendkim(8) man page says that the UMask is used only for the socket,
there's no reason we shouldn't add it to the default configuration. In
other words, it doesn't hurt anything if you're *not* using a local
socket. This is one fewer thing that we need to document.

Bug: https://bugs.gentoo.org/575666
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r9.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild
index 841184ed46b..9a9ff14612a 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild
@@ -140,7 +140,13 @@ src_install() {
 	echo "# For use with unbound" >> "${T}/opendkim.conf" || die
 	echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \
 		 >> "${T}/opendkim.conf" || die
-	echo UserID opendkim >> "${T}/opendkim.conf" || die
+	echo "UserID opendkim" >> "${T}/opendkim.conf" || 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, so we might as well set that unconditionally here.
+	echo "UMask 0117" >> "${T}/opendkim.conf" || die
+
 	insinto /etc/opendkim
 	doins "${T}/opendkim.conf"
 }

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Thomas Deutschmann]

commit:     28ce44ec735795ad5fd432ae3defdcd6101a28dc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 01:23:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 01:23:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ce44ec

mail-filter/opendkim: x86 stable (bug #629914)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
index 153e6a57764..9d1d90805c8 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     d424c81f020cada007c5ca23be5acc73f4cf6600
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 11:31:17 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 11:31:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d424c81f

mail-filter/opendkim: remove old vulnerable revision.

Bug: https://bugs.gentoo.org/629914
Bug: https://bugs.gentoo.org/629888
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r3.ebuild | 204 -------------------------
 1 file changed, 204 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
deleted file mode 100644
index 4b39b476cb3..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	gnutls? ( >=net-libs/gnutls-3.3 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnutls-3.4.patch"
-)
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use berkdb ; then
-		myconf+=(
-			$(db_includedir)
-			--with-db-incdir=${myconf#-I}
-			--enable-popauth
-			--enable-query_cache
-			--enable-stats
-		)
-	fi
-	if use unbound; then
-		myconf+=( --with-unbound )
-	else
-		myconf+=( --with-ldns )
-	fi
-	if use ldap; then
-		myconf+=( $(use_with sasl) )
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     8f7972686b2df35e61187a82e47566d402178c6c
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Tue Apr 16 20:17:14 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 22:53:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f797268

mail-filter/opendkim: Removed 'gnutls' support, added enewgroup

Removed support for the 'gnutls' use flag. Added missing enewgroup
statement. These modifications address the two bugs listed below.

Closes: https://bugs.gentoo.org/682906
Closes: https://bugs.gentoo.org/683338
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r10.ebuild | 227 ++++++++++++++++++++++++
 1 file changed, 227 insertions(+)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild
new file mode 100644
index 00000000000..8cba8ef6170
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools db-use eutils systemd 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 unbound"
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	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 )"
+
+RDEPEND="${DEPEND}
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )
+"
+
+REQUIRED_USE="sasl? ( ldap )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openssl-1.1.1.patch"
+)
+
+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
+
+	# We delete the "Socket" setting because it's overridden by our
+	# conf.d file.
+	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
+		-e '/^[[:space:]]*Socket/d' \
+		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		stats/opendkim-reportstats{,.in} || die
+
+	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+		|| die
+
+	# TODO: what purpose does this serve, do the tests even get run?
+	sed -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \
+		-i opendkim/tests/*.lua || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	if use berkdb ; then
+		myconf+=(
+			$(db_includedir)
+			--with-db-incdir=${myconf#-I}
+			--enable-popauth
+			--enable-query_cache
+			--enable-stats
+		)
+	fi
+	if use unbound; then
+		myconf+=( --with-unbound )
+	else
+		myconf+=( --with-ldns )
+	fi
+	if use ldap; then
+		myconf+=( $(use_with sasl) )
+	fi
+	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 static-libs static) \
+		$(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
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${FILESDIR}/opendkim.init.r6" opendkim
+	newconfd "${FILESDIR}/opendkim.confd" opendkim
+	systemd_newunit "${FILESDIR}/opendkim.service.r4" opendkim.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf" "${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
+
+	# Strip the comments out of the "simple" example configuration...
+	grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+		 > "${T}/opendkim.conf" || die
+
+	# and tweak it a bit before installing it unconditionally.
+	echo "# For use with unbound" >> "${T}/opendkim.conf" || die
+	echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \
+		 >> "${T}/opendkim.conf" || die
+	echo "UserID opendkim" >> "${T}/opendkim.conf" || 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, so we might as well set that unconditionally here.
+	echo "UMask 0117" >> "${T}/opendkim.conf" || die
+
+	insinto /etc/opendkim
+	doins "${T}/opendkim.conf"
+}
+
+pkg_postinst() {
+	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."
+
+		# TODO: This is tricky, we really need a good wiki page showing
+		# how to share a local socket with an 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. You would then set \"UMask 0112\""
+		elog "in your opendkim.conf, and switch the primary group of your"
+		elog "\"opendkim\" user to the group that you just created. The"
+		elog "last step is necessary for the socket to be created as the"
+		elog "new group (and not as group \"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"
+}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     b25aafe5f47dd4ae9c78a397fe7752c3e8c2978c
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 00:41:22 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed May  1 03:38:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25aafe5

mail-filter/opendkim: remove old "unused" -r9 and -r10 ebuilds.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 mail-filter/opendkim/opendkim-2.10.3-r10.ebuild | 227 -----------------------
 mail-filter/opendkim/opendkim-2.10.3-r9.ebuild  | 229 ------------------------
 2 files changed, 456 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild
deleted file mode 100644
index 8cba8ef6170..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild
+++ /dev/null
@@ -1,227 +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 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 unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-1.1.1.patch"
-)
-
-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
-
-	# We delete the "Socket" setting because it's overridden by our
-	# conf.d file.
-	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
-		-e '/^[[:space:]]*Socket/d' \
-		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	# TODO: what purpose does this serve, do the tests even get run?
-	sed -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \
-		-i opendkim/tests/*.lua || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use berkdb ; then
-		myconf+=(
-			$(db_includedir)
-			--with-db-incdir=${myconf#-I}
-			--enable-popauth
-			--enable-query_cache
-			--enable-stats
-		)
-	fi
-	if use unbound; then
-		myconf+=( --with-unbound )
-	else
-		myconf+=( --with-ldns )
-	fi
-	if use ldap; then
-		myconf+=( $(use_with sasl) )
-	fi
-	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 static-libs static) \
-		$(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
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r6" opendkim
-	newconfd "${FILESDIR}/opendkim.confd" opendkim
-	systemd_newunit "${FILESDIR}/opendkim.service.r4" opendkim.service
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf" "${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
-
-	# Strip the comments out of the "simple" example configuration...
-	grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-		 > "${T}/opendkim.conf" || die
-
-	# and tweak it a bit before installing it unconditionally.
-	echo "# For use with unbound" >> "${T}/opendkim.conf" || die
-	echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \
-		 >> "${T}/opendkim.conf" || die
-	echo "UserID opendkim" >> "${T}/opendkim.conf" || 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, so we might as well set that unconditionally here.
-	echo "UMask 0117" >> "${T}/opendkim.conf" || die
-
-	insinto /etc/opendkim
-	doins "${T}/opendkim.conf"
-}
-
-pkg_postinst() {
-	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."
-
-		# TODO: This is tricky, we really need a good wiki page showing
-		# how to share a local socket with an 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. You would then set \"UMask 0112\""
-		elog "in your opendkim.conf, and switch the primary group of your"
-		elog "\"opendkim\" user to the group that you just created. The"
-		elog "last step is necessary for the socket to be created as the"
-		elog "new group (and not as group \"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"
-}

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild
deleted file mode 100644
index 9a9ff14612a..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r9.ebuild
+++ /dev/null
@@ -1,229 +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 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 gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	gnutls? ( >=net-libs/gnutls-3.3 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnutls-3.4.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch"
-)
-
-pkg_setup() {
-	# This user can read your private keys, and must therefore not be
-	# shared with any other package.
-	enewuser opendkim
-}
-
-src_prepare() {
-	default
-
-	# We delete the "Socket" setting because it's overridden by our
-	# conf.d file.
-	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
-		-e '/^[[:space:]]*Socket/d' \
-		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	# TODO: what purpose does this serve, do the tests even get run?
-	sed -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \
-		-i opendkim/tests/*.lua || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use berkdb ; then
-		myconf+=(
-			$(db_includedir)
-			--with-db-incdir=${myconf#-I}
-			--enable-popauth
-			--enable-query_cache
-			--enable-stats
-		)
-	fi
-	if use unbound; then
-		myconf+=( --with-unbound )
-	else
-		myconf+=( --with-ldns )
-	fi
-	if use ldap; then
-		myconf+=( $(use_with sasl) )
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(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
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r6" opendkim
-	newconfd "${FILESDIR}/opendkim.confd" opendkim
-	systemd_newunit "${FILESDIR}/opendkim.service.r4" opendkim.service
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf" "${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
-
-	# Strip the comments out of the "simple" example configuration...
-	grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-		 > "${T}/opendkim.conf" || die
-
-	# and tweak it a bit before installing it unconditionally.
-	echo "# For use with unbound" >> "${T}/opendkim.conf" || die
-	echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \
-		 >> "${T}/opendkim.conf" || die
-	echo "UserID opendkim" >> "${T}/opendkim.conf" || 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, so we might as well set that unconditionally here.
-	echo "UMask 0117" >> "${T}/opendkim.conf" || die
-
-	insinto /etc/opendkim
-	doins "${T}/opendkim.conf"
-}
-
-pkg_postinst() {
-	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."
-
-		# TODO: This is tricky, we really need a good wiki page showing
-		# how to share a local socket with an 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. You would then set \"UMask 0112\""
-		elog "in your opendkim.conf, and switch the primary group of your"
-		elog "\"opendkim\" user to the group that you just created. The"
-		elog "last step is necessary for the socket to be created as the"
-		elog "new group (and not as group \"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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     cdd295d9bdd2a99fb9d9a42b5d58988939479e6f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 00:40:18 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed May  1 03:38:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd295d9

mail-filter/opendkim: new revision with missing test dependency.

The OpenDKIM test suite won't be run if the user doesn't have Lua
installed. The (R)DEPEND variables have been refactored to add that
missing build-time dependency. In addition, a hacky sed line that
relocated the unix socket in the test suite has been replaced, by
the --with-test-socket ./configure flag.

Bug: https://bugs.gentoo.org/682290
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 ....10.3-r12.ebuild => opendkim-2.10.3-r13.ebuild} | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild
similarity index 93%
rename from mail-filter/opendkim/opendkim-2.10.3-r12.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r13.ebuild
index ee5908da59c..037a1b0f98c 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild
@@ -13,9 +13,9 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 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 unbound"
+IUSE="+berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs test unbound"
 
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	dev-libs/libbsd
 	sys-apps/grep
 	ssl? (
@@ -32,7 +32,10 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
 	!unbound? ( net-libs/ldns )"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-lang/lua:* )"
+
+RDEPEND="${COMMON_DEPEND}
 	sys-process/psmisc
 	selinux? ( sec-policy/selinux-dkim )"
 
@@ -52,12 +55,12 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e 's:/var/db/dkim:/var/lib/opendkim:g' \
-		opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in || die
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am || die
-	# TODO: what purpose does this serve?
-	sed -i -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \
-		opendkim/tests/*.lua || die
+	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
 }
 
@@ -106,7 +109,8 @@ src_configure() {
 		--enable-default_sender \
 		--enable-sender_macro \
 		--enable-vbr \
-		--disable-live-testing
+		--disable-live-testing \
+		--with-test-socket="${T}/opendkim.sock"
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     129704fc9faf6d415a66b48171c1840e30ebf399
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 13:28:33 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 13:33:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129704fc

mail-filter/opendkim: fix building against BerkeleyDB.

Our ebuild was doing something strange with USE=berkdb set, and as a
result, the ./configure script for OpenDKIM was not being passed the
correct location for the BerkeleyDB headers. This seems like a simple
fix; to set

  --with-db-incdir="$(db_includedir)"

in the ebuild. I've made that change in a new revision, and tested
that the OpenDKIM build system can pick up the right version of
BerkeleyDB:

  checking for BerkeleyDB db.h... /usr/include/db6.0

Seems to work.

Closes: https://bugs.gentoo.org/684958
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 .../{opendkim-2.10.3-r13.ebuild => opendkim-2.10.3-r14.ebuild}         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r14.ebuild
similarity index 99%
rename from mail-filter/opendkim/opendkim-2.10.3-r13.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r14.ebuild
index 037a1b0f98c..ff45f1dac4d 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r14.ebuild
@@ -68,8 +68,7 @@ src_configure() {
 	local myconf=()
 	if use berkdb ; then
 		myconf+=(
-			$(db_includedir)
-			--with-db-incdir=${myconf#-I}
+			--with-db-incdir=$(db_includedir)
 			--enable-popauth
 			--enable-query_cache
 			--enable-stats

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     52b8aa248f2d4dd8e6c55bd1b710535e5806b66f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 13:32:58 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 13:38:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b8aa24

mail-filter/opendkim: drop --enable-popauth flag.

The "--enable-popauth" flag was enabled automatically when USE=berkdb
was set, which already doesn't make any sense. This was noticed while
investigating bug 684958. However, "popauth" refers to POP-before-SMTP,
which is an outdated and altogether ridiculous way of authenticating.
No one competent has used it since the 1990s. Instead of converting it
to an independent local USE flag, this new -r15 just drops it.

Bug: https://bugs.gentoo.org/687972
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 .../opendkim/{opendkim-2.10.3-r14.ebuild => opendkim-2.10.3-r15.ebuild}  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r14.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r15.ebuild
similarity index 99%
rename from mail-filter/opendkim/opendkim-2.10.3-r14.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r15.ebuild
index ff45f1dac4d..2a84537cc6a 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r14.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r15.ebuild
@@ -69,7 +69,6 @@ src_configure() {
 	if use berkdb ; then
 		myconf+=(
 			--with-db-incdir=$(db_includedir)
-			--enable-popauth
 			--enable-query_cache
 			--enable-stats
 		)

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     37776b38953dc2012dad7413487a33c794a605fa
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sat Jun 29 16:19:23 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 01:52:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37776b38

mail-filter/opendkim: Added query_cache and stats USE flags

Added new USE flags "query_cache" to enable query caching and "stats"
to enable statistics. In previous ebuild versions, these features were
always enabled.

Closes: https://bugs.gentoo.org/687972
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/metadata.xml               |   6 +
 mail-filter/opendkim/opendkim-2.10.3-r16.ebuild | 230 ++++++++++++++++++++++++
 2 files changed, 236 insertions(+)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 88da0199862..e70d2e70d70 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -59,6 +59,12 @@
     <flag name="lmdb">
       Add support for using <pkg>dev-db/lmdb</pkg>
     </flag>
+    <flag name="query_cache">
+      Add support for query caching (requires 'berkdb' flag)
+    </flag>
+    <flag name="stats">
+      Add support for statistics (requires 'opendbx' flag)
+    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">opendkim</remote-id>

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
new file mode 100644
index 00000000000..dd5ca50e9a3
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
@@ -0,0 +1,230 @@
+# 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"
+
+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"
+}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Thomas Deutschmann]

commit:     67c0013e644fbf31c925c8670b7fea72dfdd2850
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 14:29:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 14:32:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c0013e

mail-filter/opendkim: x86 stable (bug #688966)

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
index dd5ca50e9a3..8f413fcb486 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats query_cache test unbound"
 
 COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Mikle Kolyada]

commit:     64ff3fa723cd9ec79d83ac200ecdaa0d92755080
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 08:58:39 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 08:58:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ff3fa7

mail-filter/opendkim: amd64 stable wrt bug #688966

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 mail-filter/opendkim/opendkim-2.10.3-r16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
index 8f413fcb486..1b353d988f6 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm x86"
 IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats query_cache test unbound"
 
 COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     00fb1a50d7b32e2835d7fc195def639d41ae1172
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Mon Oct  7 23:49:05 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 21:29:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fb1a50

mail-filter/opendkim: Migrate user+group to GLEP81

Use acct-group/opendkim and acct-user/opendkim as requested by QA,
replace mirror://sourceforge in SRC_URI with proper URL, move test
dependencies from DEPEND to BDEPEND, replace USE flag "query_cache"
with "querycache".

Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Bug: https://bugs.gentoo.org/694638
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/metadata.xml               |   3 +
 mail-filter/opendkim/opendkim-2.10.3-r17.ebuild | 227 ++++++++++++++++++++++++
 2 files changed, 230 insertions(+)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index e70d2e70d70..70cf6ebedb9 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -60,6 +60,9 @@
       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>
     <flag name="stats">

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
new file mode 100644
index 00000000000..d9b8c07b0c5
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use eutils systemd tmpfiles
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="https://downloads.sourceforge.net/project/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 querycache test unbound"
+
+BDEPEND="acct-user/opendkim
+	test? ( dev-lang/lua:* )"
+
+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}"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/opendkim
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	querycache? ( berkdb )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+)
+
+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 querycache 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"
+}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     a6b6e7c1b892107b9e1f3573bed217e5dc2df17b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 13:42:34 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 13:42:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b6e7c1

mail-filter/opendkim: amd64 stable wrt bug #702754

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
index d9b8c07b0c5..20825611e39 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     5182af43955989919364aa316b2da73d2a924a23
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 14:45:22 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 14:45:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5182af43

mail-filter/opendkim: x86 stable wrt bug #702754

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
index 20825611e39..49ff115b99b 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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"
+KEYWORDS="amd64 ~arm x86"
 IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Joonas Niilola]

commit:     c9ddba02e825f56aa0caa5c16699f51ec3591109
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Tue Dec 17 19:06:49 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 16:32:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ddba02

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 <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/14030
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-filter/opendkim/metadata.xml               |   3 -
 mail-filter/opendkim/opendkim-2.10.3-r16.ebuild | 231 ------------------------
 2 files changed, 234 deletions(-)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 70cf6ebedb9..224c3bd7ac4 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 74145d2b43e..00000000000
--- 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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     212bdfb217f9b98942fde7dd5ad8def54df41e25
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 11:08:45 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 11:08:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212bdfb2

mail-filter/opendkim: Keyword 2.10.3-r18 arm64, #745789

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
index 039036e2305..33852707c25 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     4b33152c76d8149fe3120cacdb7435b894395a3b
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 15:01:33 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 15:01:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b33152c

mail-filter/opendkim: new masked revision with slotted lua.

This is relatively untested, of course, but at least I've picked out
the compatible versions of Lua and have put the eclass variables in
approximately the right places.

Bug: https://bugs.gentoo.org/752738
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r25.ebuild | 235 ++++++++++++++++++++++++
 1 file changed, 235 insertions(+)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
new file mode 100644
index 00000000000..8ca7f3a8623
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 lua5-2} )
+
+inherit autotools db-use eutils systemd tmpfiles lua-single
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+
+BDEPEND="acct-user/opendkim
+	test? ( ${LUA_DEPS} )"
+
+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? ( ${LUA_DEPS} )
+	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}"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/opendkim
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	querycache? ( berkdb )
+	lua? ( ${LUA_REQUIRED_USE} )
+	test? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
+	"${FILESDIR}/${P}-fix-libmilter-search.patch"
+)
+
+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 querycache query_cache) \
+		$(use_enable static-libs static) \
+		$(use_enable stats) \
+		$(use_with memcached libmemcached) \
+		"${myconf[@]}" \
+		--enable-filter \
+		--with-milter \
+		--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"
+}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     f601822614a771c5ec2fbf885d8bd70dceab7ae1
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 13:22:51 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 13:23:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6018226

mail-filter/opendkim: typo fix.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
index 8ca7f3a8623..d6a9c321c57 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 lua5-2} )
+LUA_COMPAT=( lua5-1 lua5-2 )
 
 inherit autotools db-use eutils systemd tmpfiles lua-single
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Marek Szuba]

commit:     963327d7be7c7d0047fed6b3dd119c382e94b2f7
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 12:33:53 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 14:52:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963327d7

mail-filter/opendkim-2.10.3-r25: temporarily limit LUA_COMPAT to lua5.1

Lua detection as it stands now will always prefer lua5.1, if installed,
over whatever version is pointed at by the eclass-provided pkgconfig
wrapper. Until the relevant patch has been merged into the tree, thus
making sure that if the user requests building against lua5-2 OpenDKIM
really *is* built against that version, stick with 5.1 only.

Closes: https://bugs.gentoo.org/752738
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r25.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
index d6a9c321c57..eb05adb29aa 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 lua5-2 )
+# Supports lua5-2 as well but in order for that to work the lua-pkgconfig
+# patch has to be updated not to prefer "lua5.1" over "lua" while looking
+# for Lua pkgconfig modules.
+LUA_COMPAT=( lua5-1 )
 
 inherit autotools db-use eutils systemd tmpfiles lua-single
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     5dccbd2596fc427187b27cbe1a323e5f40372476
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Tue Dec 22 16:09:52 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 18:07:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dccbd25

mail-filter/opendkim: Step down as maintainer

Removed myself and the Proxy Maintainers team.

Closes: https://github.com/gentoo/gentoo/pull/18764
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/metadata.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 224c3bd7ac4..47cb0241dd4 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
-  <maintainer type="person">
-    <email>gentoo@seichter.de</email>
-    <name>Ralph Seichter</name>
-  </maintainer>
-
   <maintainer type="person">
     <email>klondike@gentoo.org</email>
     <name>Francisco Blas Izquierdo Riera</name>
   </maintainer>
-
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-
   <longdescription>
     A program implementing the Milter API that signs and verifies
     using the DKIM standard. This is a fork of Sendmail's DKIM-milter

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     6f8585de7ea586a36cbc06530346f855540d25e0
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 19:08:38 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 19:08:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8585de

mail-filter/opendkim: new revision to disable parallel tests.

The test suite for OpenDKIM currently relies on two "setup" and
"cleanup" tests being run at the beginning/end of the test suite,
respectively. But when the test suite is run in parallel, that's not
always guaranteed. This new revision runs the test suite sequentially
to avoid the problem, which has been reported upstream.  The credit
for this goes to klondike, who was able to determine the root cause of
the heisenbug.

In the process, a minor security vulnerability (insecure /tmp path)
was also reported upstream and fixed in the ebuild.

Closes: https://bugs.gentoo.org/745969
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 ...ndkim-2.10.3-r25.ebuild => opendkim-2.10.3-r26.ebuild} | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
similarity index 93%
rename from mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
index b105074a89a..5aad117eed3 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
@@ -68,6 +68,15 @@ src_prepare() {
 	sed -e 's:dist_doc_DATA:dist_html_DATA:' \
 		-i libopendkim/docs/Makefile.am \
 		|| die
+
+	# The existing hard-coded path under /tmp is vulnerable to exploits
+	# since (for example) a user can create a symlink there to a file
+	# that portage will clobber. Reported upstream at,
+	#
+	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
+	#
+	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die
+
 	eautoreconf
 }
 
@@ -121,6 +130,12 @@ src_compile() {
 	emake runstatedir=/run
 }
 
+src_test() {
+	# Needed for now due to the expected sequencing of the setup/cleanup
+	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
+	emake -j1 check
+}
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -type f -delete || die

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Conrad Kostecki]

commit:     4349eb5cd8d59a6f77ef53309d761797e30e6970
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 22:56:40 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 23:30:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4349eb5c

mail-filter/opendkim: drop old version

Drop all versions, which depend on dev-lang/lua:0, since we have a
stable version for slotted lua.

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r17.ebuild | 227 -----------------------
 mail-filter/opendkim/opendkim-2.10.3-r19.ebuild | 231 ------------------------
 2 files changed, 458 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
deleted file mode 100644
index 7b427e9303a..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use eutils systemd tmpfiles
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/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 querycache test unbound"
-
-BDEPEND="acct-user/opendkim
-	test? ( dev-lang/lua:0= )"
-
-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:0= )
-	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}"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/opendkim
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
-	stats? ( opendbx )
-	querycache? ( berkdb )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-)
-
-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 querycache 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}"
-	newtmpfiles "${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"
-}

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild
deleted file mode 100644
index 689a798992a..00000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use eutils systemd tmpfiles
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
-IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
-	test? ( dev-lang/lua:0= )"
-
-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:0= )
-	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}"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/opendkim
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
-	stats? ( opendbx )
-	querycache? ( berkdb )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-	"${FILESDIR}/${P}-lua-pkgconfig.patch"
-	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
-	"${FILESDIR}/${P}-fix-libmilter-search.patch"
-)
-
-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 querycache query_cache) \
-		$(use_enable static-libs static) \
-		$(use_enable stats) \
-		$(use_with memcached libmemcached) \
-		"${myconf[@]}" \
-		--enable-filter \
-		--with-milter \
-		--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}"
-	newtmpfiles "${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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Mikle Kolyada]

commit:     d5b7dd2afaa4de4fe6e8d585b22abba58478f7af
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 08:58:40 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 08:59:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b7dd2a

mail-filter/opendkim: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r26.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
index e2394f1e21f..d678d4120cc 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
 LICENSE="BSD GPL-2 Sendmail-Open-Source"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim
 	test? ( ${LUA_DEPS} )"
@@ -24,8 +24,7 @@ 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= )
+		dev-libs/openssl:0=
 	)
 	berkdb? ( >=sys-libs/db-3.2:* )
 	opendbx? ( >=dev-db/opendbx-1.4.0 )

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     77890fca37b6a6d889cd984eb029799652442574
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 12:31:18 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 12:32:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77890fca

mail-filter/opendkim: update sendmail/libmilter dependency.

As reported in bug 833778, it would be nice if we could bind to the
libmilter subslot with an := dependency. In the existing ebuild, that
wasn't possible because we accepted either libmilter || sendmail, and
using := within an any-of clause is disallowed.

Fortunately, the "|| sendmail" portion of that is a relic, for
versions of sendmail that don't themselves use libmilter. All versions
of mail-mta/sendmail in the tree today do, so we can drop the sendmail
portion of that any-of dependency entirely, and then afterwards add
the := to libmilter.

Closes: https://bugs.gentoo.org/833778
Reported-by: Daniel M. Weeks <dan <AT> danweeks.net>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r27.ebuild | 254 ++++++++++++++++++++++++
 1 file changed, 254 insertions(+)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r27.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r27.ebuild
new file mode 100644
index 000000000000..129a8167f831
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r27.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 lua5-2 )
+
+inherit autotools db-use systemd tmpfiles lua-single
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+
+BDEPEND="acct-user/opendkim
+	test? ( ${LUA_DEPS} )"
+
+COMMON_DEPEND="mail-filter/libmilter:=
+	dev-libs/libbsd
+	sys-apps/grep
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	berkdb? ( >=sys-libs/db-3.2:* )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( ${LUA_DEPS} )
+	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}"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/opendkim
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	querycache? ( berkdb )
+	lua? ( ${LUA_REQUIRED_USE} )
+	test? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
+	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
+	"${FILESDIR}/${P}-fix-libmilter-search.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+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
+
+	# The existing hard-coded path under /tmp is vulnerable to exploits
+	# since (for example) a user can create a symlink there to a file
+	# that portage will clobber. Reported upstream at,
+	#
+	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
+	#
+	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || 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 querycache query_cache) \
+		$(use_enable static-libs static) \
+		$(use_enable stats) \
+		$(use_with memcached libmemcached) \
+		"${myconf[@]}" \
+		--enable-filter \
+		--with-milter \
+		--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_test() {
+	# Needed for now due to the expected sequencing of the setup/cleanup
+	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
+	newtmpfiles "${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"
+}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     90d2a61d4322df2188ed4d5b56d1a152779435ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 00:09:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 00:13:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d2a61d

mail-filter/opendkim: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{opendkim-2.10.3-r26.ebuild => opendkim-2.10.3-r28.ebuild}    | 8 ++++----
 .../{opendkim-2.10.3-r27.ebuild => opendkim-2.10.3-r29.ebuild}    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r28.ebuild
similarity index 98%
rename from mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r28.ebuild
index d678d4120cc4..fb9509a1384b 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,12 +29,12 @@ COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	berkdb? ( >=sys-libs/db-3.2:* )
 	opendbx? ( >=dev-db/opendbx-1.4.0 )
 	lua? ( ${LUA_DEPS} )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
+	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 )"
+	!unbound? ( net-libs/ldns:= )"
 
 DEPEND="${COMMON_DEPEND}"
 

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r27.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
similarity index 98%
rename from mail-filter/opendkim/opendkim-2.10.3-r27.ebuild
rename to mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
index 129a8167f831..448ce5cbc56b 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r27.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
@@ -29,12 +29,12 @@ COMMON_DEPEND="mail-filter/libmilter:=
 	berkdb? ( >=sys-libs/db-3.2:* )
 	opendbx? ( >=dev-db/opendbx-1.4.0 )
 	lua? ( ${LUA_DEPS} )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
+	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 )"
+	!unbound? ( net-libs/ldns:= )"
 
 DEPEND="${COMMON_DEPEND}"
 

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Jakov Smolić]

commit:     aaa10e46b80f7f1302c7995b8c926009c752b689
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 09:55:30 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 09:55:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa10e46

mail-filter/opendkim: Stabilize 2.10.3-r29 amd64, #835821

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
index 448ce5cbc56b..2110d3df206f 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Agostino Sarubbo]

commit:     1ad5e58a2bc1e81119f66ab709cf98b39e7d1bbf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 10:35:44 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 10:35:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad5e58a

mail-filter/opendkim: x86 stable wrt bug #835821

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
index 2110d3df206f..7faab9dbd50c 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     e5924df4f3d0e1c632e79dda9370eff29755dd6d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 03:38:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 04:17:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5924df4

mail-filter/opendkim: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/opendkim/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index b822ecaf0536..0b748202e257 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -55,5 +55,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">opendkim</remote-id>
+    <remote-id type="github">trusteddomainproject/OpenDKIM</remote-id>
   </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     5665d15b7f627703f607618e98b4d313cae53c92
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 00:59:02 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 01:02:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5665d15b

mail-filter/opendkim: drop 2.10.3-r28

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r28.ebuild | 254 ------------------------
 1 file changed, 254 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r28.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r28.ebuild
deleted file mode 100644
index fb9509a1384b..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r28.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 lua5-2 )
-
-inherit autotools db-use systemd tmpfiles lua-single
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 x86"
-IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
-	test? ( ${LUA_DEPS} )"
-
-COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	sys-apps/grep
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( ${LUA_DEPS} )
-	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}"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/opendkim
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
-	stats? ( opendbx )
-	querycache? ( berkdb )
-	lua? ( ${LUA_REQUIRED_USE} )
-	test? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-	"${FILESDIR}/${P}-lua-pkgconfig.patch"
-	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
-	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
-	"${FILESDIR}/${P}-fix-libmilter-search.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-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
-
-	# The existing hard-coded path under /tmp is vulnerable to exploits
-	# since (for example) a user can create a symlink there to a file
-	# that portage will clobber. Reported upstream at,
-	#
-	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
-	#
-	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || 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 querycache query_cache) \
-		$(use_enable static-libs static) \
-		$(use_enable stats) \
-		$(use_with memcached libmemcached) \
-		"${myconf[@]}" \
-		--enable-filter \
-		--with-milter \
-		--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_test() {
-	# Needed for now due to the expected sequencing of the setup/cleanup
-	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
-	newtmpfiles "${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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     770d624809c1f462eb5c6c8feb2f818a75e4900b
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 00:56:19 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 01:02:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770d6248

mail-filter/opendkim: new revision to drop the net-libs/ldns dependency.

This just... doesn't do anything. And the logic was backwards this whole
time, so I'm extra sure that it doesn't do anything.

Thanks to Gil Kloepfer for noticing it!

Closes: https://bugs.gentoo.org/895944
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r30.ebuild | 249 ++++++++++++++++++++++++
 1 file changed, 249 insertions(+)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
new file mode 100644
index 000000000000..9334c2a8071f
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 lua5-2 )
+
+inherit autotools db-use systemd tmpfiles lua-single
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+
+BDEPEND="acct-user/opendkim
+	test? ( ${LUA_DEPS} )"
+
+COMMON_DEPEND="mail-filter/libmilter:=
+	dev-libs/libbsd
+	sys-apps/grep
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	berkdb? ( >=sys-libs/db-3.2:* )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( ${LUA_DEPS} )
+	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 )"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/opendkim
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	querycache? ( berkdb )
+	lua? ( ${LUA_REQUIRED_USE} )
+	test? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
+	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
+	"${FILESDIR}/${P}-fix-libmilter-search.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+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
+
+	# The existing hard-coded path under /tmp is vulnerable to exploits
+	# since (for example) a user can create a symlink there to a file
+	# that portage will clobber. Reported upstream at,
+	#
+	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
+	#
+	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	if use berkdb ; then
+		myconf+=( --with-db-incdir=$(db_includedir) )
+	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 querycache query_cache) \
+		$(use_enable static-libs static) \
+		$(use_enable stats) \
+		$(use_with memcached libmemcached) \
+		$(use_with unbound) \
+		"${myconf[@]}" \
+		--enable-filter \
+		--with-milter \
+		--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_test() {
+	# Needed for now due to the expected sequencing of the setup/cleanup
+	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
+	newtmpfiles "${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"
+}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     80293eb37de2d7bc48e619f7998d27597191720f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 04:18:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 04:18:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80293eb3

mail-filter/opendkim: Stabilize 2.10.3-r30 x86, #908129

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
index 44e60bed1f71..996ffbef1220 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     976a794a31ef04e483badb98f640e79cd967ec39
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 04:18:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 04:18:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976a794a

mail-filter/opendkim: Stabilize 2.10.3-r30 amd64, #908129

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
index bb6117a78bb2..44e60bed1f71 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     5ce28466a845296b6c9b2d8b0047ce3c39f08260
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 11:37:47 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 11:37:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce28466

mail-filter/opendkim: drop 2.10.3-r29

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r29.ebuild | 254 ------------------------
 1 file changed, 254 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
deleted file mode 100644
index 7faab9dbd50c..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 lua5-2 )
-
-inherit autotools db-use systemd tmpfiles lua-single
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 x86"
-IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
-	test? ( ${LUA_DEPS} )"
-
-COMMON_DEPEND="mail-filter/libmilter:=
-	dev-libs/libbsd
-	sys-apps/grep
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( ${LUA_DEPS} )
-	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}"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/opendkim
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
-	stats? ( opendbx )
-	querycache? ( berkdb )
-	lua? ( ${LUA_REQUIRED_USE} )
-	test? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-	"${FILESDIR}/${P}-lua-pkgconfig.patch"
-	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
-	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
-	"${FILESDIR}/${P}-fix-libmilter-search.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-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
-
-	# The existing hard-coded path under /tmp is vulnerable to exploits
-	# since (for example) a user can create a symlink there to a file
-	# that portage will clobber. Reported upstream at,
-	#
-	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
-	#
-	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || 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 querycache query_cache) \
-		$(use_enable static-libs static) \
-		$(use_enable stats) \
-		$(use_with memcached libmemcached) \
-		"${myconf[@]}" \
-		--enable-filter \
-		--with-milter \
-		--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_test() {
-	# Needed for now due to the expected sequencing of the setup/cleanup
-	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
-	newtmpfiles "${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"
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     6204fac4d367bee88d24abb65046c50dffc8dbe9
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 14:07:17 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 14:10:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6204fac4

mail-filter/opendkim: fix RFC link in postinst

The old URL was both broken and outdated (the RFC has been updated twice
since). Let's user the newer one from rfc-editor.org.

Closes: https://bugs.gentoo.org/941256
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
index b61911d89247..bd70b4d144b7 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
@@ -250,5 +250,5 @@ pkg_config() {
 	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"
+	einfo "  https://www.rfc-editor.org/rfc/rfc6376.html#section-3.6.1"
 }

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     cbba781cb78d7e89883a9abf956ecfc5e17f7365
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 17:49:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 17:49:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbba781c

mail-filter/opendkim: Stabilize 2.10.3-r32 amd64, #941534

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
index a9d07a7b57cb..8eb402141574 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Sam James]

commit:     170ad764d9f157c8310d7b08fa91011019755833
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 17:49:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 17:49:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170ad764

mail-filter/opendkim: Stabilize 2.10.3-r32 x86, #941534

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
index bd70b4d144b7..a9d07a7b57cb 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/

[Michael Orlitzky]

commit:     2b2766cedc411b16f5cf12967e86e498feb7b6c3
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 02:42:40 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 02:42:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2766ce

mail-filter/opendkim: drop 2.10.3-r30

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/opendkim-2.10.3-r30.ebuild | 252 ------------------------
 1 file changed, 252 deletions(-)

diff --git a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
deleted file mode 100644
index b689770a7ba0..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 lua5-2 )
-
-inherit autotools db-use systemd tmpfiles lua-single
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/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 ~arm64 x86"
-IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
-	test? ( ${LUA_DEPS} )"
-
-COMMON_DEPEND="mail-filter/libmilter:=
-	dev-libs/libbsd
-	sys-apps/grep
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( ${LUA_DEPS} )
-	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 )"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/opendkim
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
-	stats? ( opendbx )
-	querycache? ( berkdb )
-	lua? ( ${LUA_REQUIRED_USE} )
-	test? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-	"${FILESDIR}/${P}-lua-pkgconfig.patch"
-	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
-	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
-	"${FILESDIR}/${P}-fix-libmilter-search.patch"
-	"${FILESDIR}/${P}-snprintf-include.patch"
-	"${FILESDIR}/${P}-c-std.patch"
-	"${FILESDIR}/${P}-fix-ldap-sasl-pc.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-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
-
-	# The existing hard-coded path under /tmp is vulnerable to exploits
-	# since (for example) a user can create a symlink there to a file
-	# that portage will clobber. Reported upstream at,
-	#
-	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
-	#
-	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use berkdb ; then
-		myconf+=( --with-db-incdir=$(db_includedir) )
-	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 querycache query_cache) \
-		$(use_enable static-libs static) \
-		$(use_enable stats) \
-		$(use_with memcached libmemcached) \
-		$(use_with unbound) \
-		"${myconf[@]}" \
-		--enable-filter \
-		--with-milter \
-		--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_test() {
-	# Needed for now due to the expected sequencing of the setup/cleanup
-	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
-	newtmpfiles "${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"
-}