Add unit file (#502054 by Andrius Stikonas)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 222 insertions, 15 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 2aadb51f6f29..cc964a48c5af 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.77 2014/04/15 06:41:38 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.78 2014/05/02 10:46:14 pacho Exp $
+
+*opendkim-2.9.2-r1 (02 May 2014)
+
+  02 May 2014; Pacho Ramos <pacho@gentoo.org> +files/opendkim.service,
+  +opendkim-2.9.2-r1.ebuild:
+  Add unit file (#502054 by Andrius Stikonas)
 
 *opendkim-2.9.2 (15 Apr 2014)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 2ba76afddf18..d824136c74ce 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX opendkim-2.8.0-unbreak_upgrade.patch 1042 SHA256 5c115fa185bc9a64fe847599e2c0fa8d4d2925f4b2dbdef1e88769195c79046d SHA512 b415fe2f05dd16489ac59038ab15b22c77da23fe1bc3b5fc82883186b4e2b44855f546fbc1128109e84b1c19ed868cffed66c72fd4600c66c27ce4f9363b44a2 WHIRLPOOL 6304af7e66862da3c215455273d486aa4f67ae0777209e92e1c81b9537722850699fdd8c167e95412abfb2143eefcb88ff3c58c4cfc380994e27e9c41deee8e8
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
+AUX opendkim.service 439 SHA256 8636aee39d924067d1f1673291d1501cec3e6fdee0de16533a1e3616471b35ed SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 WHIRLPOOL 4b7c42b130a31120efba7aa04f90cacd8c6b760204577e2914901eddc6cb425b1c06253d60f43673d28f9992e4b078010f444a390569544573601b3fdbf66e76
 DIST opendkim-2.8.4.tar.gz 1177118 SHA256 d6ea32f60e750530359841da1e1bd644e6ccb0d228ad5e0633be6dfb8434b30a SHA512 a65e2cbe46878707072aceb5fa60d70d527fda9679aac5c9083b24f1697ba6fe566d9bd7bfca6a23443f639fc27b843e098b5a6b1750347c045f028dd76dc21d WHIRLPOOL b93310e27bfa38326f431ae44ab88d1c6ffddec2d81be1acfce5e3f275ea0e9f8b67eb25715ffb8d5b2c5311766a8ec0236e1e7ee4dc2ee3d0910946654cb550
 DIST opendkim-2.9.0.tar.gz 1134646 SHA256 dc1559d6302bf0f3963b93c399d18728431b5c6fb2f0a1bbebd8651a1998e497 SHA512 102224bf232197974b86c251e7463843032d87610c6c35c1ee494fa4648a0cca5b1eda684b56784b70ad6cbd6f8de6e8163b0513c6487a3fdb79639b05535735 WHIRLPOOL 40c15435e5da994b55b5197f79d7fae15df0c9d5bb6eaf29d6c627ffbaf5f5f21da9a4f08a519a036d8219094cbadab08deaccb816ff6c787f2dcc6c9c8a6723
 DIST opendkim-2.9.1.tar.gz 1227972 SHA256 da746a804e4e88b4046d30a496bc8fefaa097bc25df937145372b06e11fd8323 SHA512 c33e67f3c4fafb1aa1d8a5f2befd044f94bd8f842326f2d52ac3b01cf5c653425a76fafdfe1fb5def966ff25823fb605a6250396a5056dc911dd3b7dd8825619 WHIRLPOOL 83d6ee4325d6a7f166f41c15ff6ee6f35ab281267d2df54e8966e437b6e863bbd42c44080d4b9bfec84680baa7b8ce9e4687a3933e2b28c3e0384432111c0a6f
@@ -10,23 +11,14 @@ DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae4503
 EBUILD opendkim-2.8.4.ebuild 6162 SHA256 b0d0bdb46cd8f3cd4489587538e355b2e16ce438a44f0c18f61daac7359a4233 SHA512 3ce2d608ff6a4e44d9025a3e6bc6504c8cd5714a6098e6a35011c7d0323d41957e4aeea0abcadb99e06906d041dc8b401a0dc2599b0d75fa7194c443a547b493 WHIRLPOOL c3b79d90a15296f588244d82e9d7ebcc249a9066e66fc5463a7ccbd35f5da27780be63fe8cba2f131e3b462115ed5c864782e4508866f6bf390e88daa4cffc84
 EBUILD opendkim-2.9.0.ebuild 6038 SHA256 0b73613b9fe124c1fb3d5c7b0d314e29ac82ee7333181a7a256405baae277bef SHA512 97778ad70932eefe34157fa5e23ed46cb135dd6094e48c6d7649937d7cc31e9f6b715df499fc4614eecc29cef7de42c4d2758a84c2e9c9d5166a49dce5e6c1eb WHIRLPOOL 50cc335da37de2e331d5935bc79b4f05d318a9c8e45e17a05b1d8331e505e7c21e14de72d1b5bbdc32c70fa079c16175a84bb6ef564c644039c68344139d2b25
 EBUILD opendkim-2.9.1.ebuild 6398 SHA256 abe29e30c4f18eea892933e81286cd904a3f4b6f077e6974adb04323d5ee42ca SHA512 8cb6a02ca8f8ea4121834f513886cb84338389fe9019b9105d5782fda89f8e595b4bd00e2b108729709dfa5db55782badd564285bc91fcbf2ecdba21ccdd32e2 WHIRLPOOL bf0c647508859914348c470181ffbc19e6110e90f8bae8692c16449b814c8f9bafc20aa4224c0e3ff5ad3ed9ce35a9574952234d1904faa2d8422bb0df8f2ce9
+EBUILD opendkim-2.9.2-r1.ebuild 6306 SHA256 2080a977bef0957ec619329901679683e0e5414804cc27fa58c4a93efaa5c6e8 SHA512 df74e237fe0df3dea0159d62cd4c5cdc999be25e93a8bbfc7c5d6195efefae4bca367607fa8b62ceff2f2654051bf13fd9ffbc26402add489f8063a39f2f1fbb WHIRLPOOL e27b45f655b5fda9ebc69ce71e7bede83e5b777fe1b307d24e0936d6071bcde6d083038bc5faa5c6a431d330a7fcf933b833512deb2990d1f0286f4db18423e4
 EBUILD opendkim-2.9.2.ebuild 6245 SHA256 60b69e7a90568cc7c406339d2a0d391d3b20f64abdbabf30907241fb0031bf25 SHA512 e1aea5a6b995cb25990b4f5162ac04083d16c1d869e18832d97d6748ab602c84a0a00b7267a18f50a5e60df612e0d7bd8ec1c5c88db2d689e6a83b543cc9759b WHIRLPOOL 796521805e64bb82f56bf0e3d439ef2e5ed62b750d866d9ecb50f37ee66c626046af2f22783fa1480328c640773857bca9d2640d48d46717d91c8983f7089077
-MISC ChangeLog 13500 SHA256 c25e36ea9a12b64471f887ad5d110a48b2e6b4075ac150791a57e2f1253e1b3a SHA512 d728613de80fa967fb48b7a4288f3aacf3d13771a9c14ac653817bab7d2084b6ca0b68eca000f418850c5d136aef98a0a399d30a489ba91cf1f350c1728fa458 WHIRLPOOL 961f5e42cb8c9efeab39b17cd2a2620d4bd299748d7e03693913a29de41d19a6f204c337097f05c23acc71b3c134c8e6a279034278b2c93b33572bc733a262ce
+MISC ChangeLog 13682 SHA256 1898ff5754626f9dbc508f7959cae672fc28d66d2c432be8fc74f2b20fa805ce SHA512 3e057735844fe725d2315f74ff85db7873746aee76ba9ed491730929d558d48d468ff1eebd9fd1993bbb4c7f050d3a1b5c41ed0ca2e6433e543fd6f745c0e1bc WHIRLPOOL 57db5fe64c8dcf58338931977374834f6f0de7b72ee986bc57d4cb27f9e8d5ec7e146dfe6da9064b16c349b5bd4b12f79376641b6786beb0ec42a5a5ce4184ef
 MISC metadata.xml 1403 SHA256 85ffb9c9df1fd60d7f22db45e8d4b1edb2b882dd0fb2004a646651e4f7e675a8 SHA512 b7529c54897e04109deeeb30414ab175de5989baeeb398042995fa193ec0302bbc74a43037550c4a2dc60e490443eeaa4bcb038229b1ea179f70e32e27bdf37a WHIRLPOOL 862f684ef7c3d6f40d5b95eca699e003f0085c62cef406c54a307d4be3d8a847582c2bc3c68eb0208e072b506162a27bde6115fcfad548b1865bee7f033ae371
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTTNSsAAoJEHfx8XVYajsfJCAP/3zdrghAmInZhf7AoLzaPe2Q
-ez1iY5GcGwqS89XWqiX9jCKTlN481iD73wcfK0HYS4bi0m0sbboYGIzUvRS+/n+E
-PyNp5BEMJWJKSsERM9AlFjr6IA8iN6gyD+indSpkWWIc0gILdoBQgsJrUn/8ajMh
-zFAtdI1wh9DNgp+THPaQJelUbC1xxDNnhoHP3VbCUBOiZ7foM61dzgSrhvSfs+vr
-kEab0/RsEoRH5ggjrGyaZYzEUNkfyAC9IZUox7s9KMqlSnAyFHNbFQ+jVPTBCXIA
-0kHs8/eyb4f2JmAbNZ1QRr5N71F4TCXNzOUx5YDTkPLQpGl7SiO67tJfbNy1bN/I
-SQeJOfm12OAHCoq9RXf8kI8JArMX+A4tCy2QTzMHcFi6b0YCtX4S99zcLlEV38gO
-4SqGBXl9540Sahz84aNbJmGpf6ol2R5VtXMWdI3ObO7zRAPunClgqGPRVe19ZDeA
-aW7CEFIwyOMzyfYUwjnIxs0XpPQblJ2Qi34LLuNx+AAn9hbYognv65FtqgGk/1pp
-AdeSI/HVcyPLeMsKmiVd9x6toFzPJ7ZXLmqmp/VFILV1Dah7esOKxz0sdInRXVSa
-IFUJHSVykxdvkzzDW+g10kEtSPzdxBegM3jM7cgK1FQ/gjDsy94QCH0k9r9xLaGV
-V+v7dB6YCLj2zYDiqoEN
-=pue/
+iEYEAREIAAYFAlNjd3cACgkQCaWpQKGI+9QzPwCfY5hQH2k6+ySrmpd2/QO8YWxD
+zOkAn2HICeNYZrjzsxgv05xc/Py4NHTP
+=n3xw
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/files/opendkim.service b/mail-filter/opendkim/files/opendkim.service
new file mode 100644
index 000000000000..be534d670bca
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=DomainKeys Identified Mail (DKIM) Milter
+Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html
+After=network.target nss-lookup.target syslog.target
+
+[Service]
+ExecStart=/usr/sbin/opendkim -f -x /etc/opendkim/opendkim.conf
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..9a05962769dd
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild,v 1.1 2014/05/02 10:46:14 pacho Exp $
+
+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 ~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 )
+	selinux? ( sec-policy/selinux-dkim )
+	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"
+
+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"
+	einfo
+	einfo "Also look at the ADSP http://tools.ietf.org/html/rfc5617"
+}