gentoo resync : 23.12.2017

5 files changed, 30 insertions, 3 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 88c0a8f29cd2..e5261dfe8a79 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 5bf2d5ccbe57..6352badaa858 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,11 +1,12 @@
 AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c
 AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
+AUX opendmarc.service 799 BLAKE2B 08e6b800f46a6d21a50f7edb5b19117e0464e89af38d4e190c1962c132c27524e9ac591957c14133980e05212bdef5940cc4f0748437ae459a15530c8696440f SHA512 a918f9f6bcfc78c59244e7b6603ce49a70a88093ec9af9c3d73cdaa50b1d4941a857bb96c917a53ef4ff3929bf3556ca60d541d65a4a8e5318946386623b7f66
 DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
 DIST opendmarc-1.3.0.tar.gz 640017 BLAKE2B 6ffe63ac8a610ae4ef9904379e42e11f2dbc09e14a7febe36e875247f72d958b9ff931cd1a034f28d0a9eff15663cf0acb75d8d0c91186243fbab94470bf10db SHA512 c685cae0e02a72b797f24a28b9965f8745f165a3ce3a8f3f2e0167ebf6121e92389990870271204ca02b06703f4ad98c6d343345478040f7fc4013b1ce331b03
 DIST opendmarc-1.3.1.tar.gz 640151 BLAKE2B 8e0e29ac9b95730f226a16c6130ff78aca7ecaf8c896864d9868f7d285676b84c2896bd0663fafbd79a9a7e182655a644aa51e37dd23a08662406099a7f1c5d5 SHA512 0be11540bc26bd3b3e6cc9817bc379a5d290b63ef16c5d3559bf96b241ad6628bea7a9daeb468afac855bc16be16676f722b3c1d468ea82c8d8364e8a8137226
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
-EBUILD opendmarc-1.1.3.ebuild 597 BLAKE2B b8d45fc6d6c01879c1cd92b182316ef93026f81944d46cce2f808b307f839c51d3622360f53d1980cded8b3395eeab0b30bcee33723c3db485511b4da8383bf9 SHA512 45dbba6d2ce68b5467d5fcb42b3a4818fb80f59a7596259c8f715baa5fbf73957e199087f9d5e6e52a2750ad495d3dc97271e4534745572f256522ff16127c1b
+EBUILD opendmarc-1.1.3.ebuild 768 BLAKE2B f9fcb819281ac3eadbfc22875fdfa0d663cd5c73c9e4221ade6af260ae0f3bfdbb5b396de53b297a7346120cbc36b06a698d6ae1cb3df0b916a1842944751d2e SHA512 d2f7ae5dd159315b6f96bea798796cd6ee9ff7a3fd07329c80e7764fc1e9d9cc35fab481dccb369dea0f1682590ecc17ec45448be514602626bd565dab527257
 EBUILD opendmarc-1.3.0.ebuild 1151 BLAKE2B ee9031d2b817db728a5deaf846bbcb0a31832bffb436f6275add51feb007b60fbff1c124140c57c65698af8afe7f6ba73608948ad1fe3acbe90a5008cf329b8c SHA512 5f78d95f7cee6896f592a907baf175f52b2d42f497f286392a7cc0db91d7a84de6628b99f914fec805045abb86e2b1f3ba86d61fc2eb7a1d5134de276cd8ed20
 EBUILD opendmarc-1.3.1.ebuild 1156 BLAKE2B f67a507aba98313c53b224e9cf4883d5fef73b4aea7b55daf7cd2583a3135919acfc46f8ccb09b31b767f3692d5d819558d3588fceba266b23fadb17b0b211b9 SHA512 16f9c896956264d1a4baea5d2b89d0a9faa67541e016e2e75304f087df60f72430b6f3fb079a250b183bfa2f5f868c3b97f350d8a11d24c817a68355d9c42e1d
-EBUILD opendmarc-1.3.2-r1.ebuild 1471 BLAKE2B 8aa5f4dd69728188f4f22d7be942868b96891bdabc55c1e9a2f5ad7d6fe50e479b2446ce9092f32c4471c7eda284c545e031a83020f4a20902bbe6b74299b2a0 SHA512 84b335416af77d6d7303ab1d9dee4c086a181c6bb87319020a849df6750ac39b6ba6d3e4af4e728fd8b2c49bb4f06ef4073df351859f8bd1cd14262177e6627e
+EBUILD opendmarc-1.3.2-r1.ebuild 1523 BLAKE2B a0dcb2966b4fffc17cc8e954932bb52848975b6793006f3963addf7888eef3664b5a2c147038aa6b39b4505929662cae38b9380b2d6405ac03eb39986fd1aac4 SHA512 6d8b072ca96ea10bca46ee1b3c164219608f520e26160bd5f48018bed93b8d8e672b28ffe52cb2567a6d76c72016bb884f0b3076cdae9084b8b23c7032ab57f0
 MISC metadata.xml 617 BLAKE2B 52663fcfe5269dff772d329e505644227b5a40226d354c2d633190a5206e80b6c8f9afbd1b8a2834f8995ee599117266beba893fb73bbabc226da31ac91e6e84 SHA512 d87d8c166d001457d673d4c19ed5a34aa6e2fd99dd91aee1d31649d1b9e671034dcec42b5e160817d45ed6f8f0a44bce579ce72861113588a4229f25b56386fb
diff --git a/mail-filter/opendmarc/files/opendmarc.service b/mail-filter/opendmarc/files/opendmarc.service
new file mode 100644
index 000000000000..e450637a02f6
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Domain-based Message Authentication, Reporting and Conformance (DMARC) Milter
+Documentation=man:opendmarc(8) man:opendmarc.conf(5) man:opendmarc-expire(8) man:opendmarc-importstats(8) man:opendmarc-reports(8)
+man:opendmarc-check(8) man:opendmarc-import(8) man:opendmarc-params(8) http://www.trusteddomain.org/opendmarc/
+After=network.target nss-lookup.target syslog.target
+
+[Service]
+User=milter
+Group=milter
+PIDFile=/var/run/opendmarc/opendmarc.pid
+ExecStartPre=/usr/sbin/opendmarc -c /etc/opendmarc/opendmarc.conf -n 
+ExecStart=/usr/sbin/opendmarc -c /etc/opendmarc/opendmarc.conf -f -P /var/run/opendmarc/opendmarc.pid
+ExecReload=/bin/kill -USR1 $MAINPID
+RuntimeDirectory=opendmarc
+RuntimeDirectoryMode=0750
+Restart=on-failure
+RestartSec=3
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
index 776550c01125..d57dcbb45999 100644
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
@@ -17,6 +17,11 @@ DEPEND="dev-perl/DBI
 RDEPEND="${DEPEND}
 	dev-perl/Switch"
 
+src_prepare() {
+	# fix building with newer glibc, already fixed in later releases, #640012
+	sed -i -e 's/T_RRSIG/disabled_T_RRSIG/' libopendmarc/opendmarc_dns.c || die
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
index f701f5636acd..1185e2523296 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit user
+inherit user systemd
 
 DESCRIPTION="Open source DMARC implementation "
 HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
@@ -50,6 +50,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
 	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	dodir /etc/opendmarc