* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2017-03-29 7:36 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2017-03-29 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 2a8aa5f3e4847d8f79a9e25597745e5ba5128205
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 07:36:34 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 07:36:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8aa5f3
mail-filter/opendmarc: create /var/run/opendmarc at runtime, bug #605512
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-filter/opendmarc/files/opendmarc.initd | 5 ++++-
mail-filter/opendmarc/opendmarc-1.1.3.ebuild | 2 +-
mail-filter/opendmarc/opendmarc-1.3.0.ebuild | 4 +---
mail-filter/opendmarc/opendmarc-1.3.1.ebuild | 4 +---
mail-filter/opendmarc/opendmarc-1.3.2.ebuild | 2 --
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/mail-filter/opendmarc/files/opendmarc.initd b/mail-filter/opendmarc/files/opendmarc.initd
index 0f248fcb86c..6a8300f145d 100644
--- a/mail-filter/opendmarc/files/opendmarc.initd
+++ b/mail-filter/opendmarc/files/opendmarc.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
CONFFILE="/etc/opendmarc/${SVCNAME}.conf"
@@ -14,6 +14,9 @@ check_cfg() {
eerror "Configuration file ${CONFFILE} is missing"
return 1
fi
+ # create /var/run/opendmarc
+ mkdir -p /var/run/opendmarc >& /dev/null
+ chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} /var/run/opendmarc >& /dev/null
PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}")
local PIDDIR="${PIDFILE%/*}"
if [ ! -d "${PIDDIR}" ] ; then
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
index b1320258961..776550c0112 100644
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
index e646fa51722..7a751418a03 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -39,8 +39,6 @@ src_install() {
newconfd "${FILESDIR}"/opendmarc.confd opendmarc
dodir /etc/opendmarc
- dodir /var/run/opendmarc
- fowners milter:milter /var/run/opendmarc
# create config file
sed \
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
index 6c4e05392bb..22347bba539 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -39,8 +39,6 @@ src_install() {
newconfd "${FILESDIR}"/opendmarc.confd opendmarc
dodir /etc/opendmarc
- dodir /var/run/opendmarc
- fowners milter:milter /var/run/opendmarc
# create config file
sed \
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2.ebuild
index 0e47fc1dc99..5b2effd5d43 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2.ebuild
@@ -40,8 +40,6 @@ src_install() {
newconfd "${FILESDIR}"/opendmarc.confd opendmarc
dodir /etc/opendmarc
- dodir /var/run/opendmarc
- fowners milter:milter /var/run/opendmarc
# create config file
sed \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2017-12-22 11:32 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2017-12-22 11:32 UTC (permalink / raw
To: gentoo-commits
commit: b2eab8cee39c59cc922c73f830ccfbc021d8e562
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:29:04 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:29:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2eab8ce
mail-filter/opendmarc: add systemd service file by Garry Filakhtov
Closes: https://bugs.gentoo.org/622606
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-filter/opendmarc/files/opendmarc.service | 20 ++++++++++++++++++++
mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild | 3 ++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/mail-filter/opendmarc/files/opendmarc.service b/mail-filter/opendmarc/files/opendmarc.service
new file mode 100644
index 00000000000..e450637a02f
--- /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.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
index f701f5636ac..1185e252329 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2018-12-10 10:35 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2018-12-10 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 7319c4e904277ecc9ec7fb8f0e1e91dbfdd75546
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 10:34:55 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 10:34:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7319c4e9
mail-filter/opendmarc: cleanup and fix bugs #655728, #662112
Bug: https://bugs.gentoo.org/640012
Closes: https://bugs.gentoo.org/655728
Closes: https://bugs.gentoo.org/662112
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-filter/opendmarc/Manifest | 2 -
mail-filter/opendmarc/files/opendmarc.service | 5 +--
mail-filter/opendmarc/opendmarc-1.3.0.ebuild | 51 ----------------------
...marc-1.3.1.ebuild => opendmarc-1.3.2-r2.ebuild} | 37 +++++++++++-----
4 files changed, 29 insertions(+), 66 deletions(-)
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index aafb9dd996d..7769c4748e3 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,4 +1,2 @@
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
diff --git a/mail-filter/opendmarc/files/opendmarc.service b/mail-filter/opendmarc/files/opendmarc.service
index e450637a02f..90ee5ccb434 100644
--- a/mail-filter/opendmarc/files/opendmarc.service
+++ b/mail-filter/opendmarc/files/opendmarc.service
@@ -1,7 +1,6 @@
[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/
+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]
@@ -17,4 +16,4 @@ Restart=on-failure
RestartSec=3
[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
deleted file mode 100644
index 7a751418a03..00000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd"
-IUSE="spf"
-
-DEPEND="dev-perl/DBI
- || ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
- dev-perl/Switch
- spf? ( mail-filter/libspf2 )"
-
-pkg_setup() {
- enewgroup milter
- enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- $(use_with spf)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/opendmarc.initd opendmarc
- newconfd "${FILESDIR}"/opendmarc.confd opendmarc
-
- dodir /etc/opendmarc
-
- # create config file
- sed \
- -e 's/^# UserID .*$/UserID milter/' \
- -e 's/^# PidFile .*/PidFile \/var\/run\/opendmarc\/opendmarc.pid/' \
- -e '/^# Socket /s/^# //' \
- "${S}"/opendmarc/opendmarc.conf.sample \
- > "${ED}"/etc/opendmarc/opendmarc.conf \
- || die
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
similarity index 54%
rename from mail-filter/opendmarc/opendmarc-1.3.1.ebuild
rename to mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 22347bba539..1a13e2ea9f9 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit user
+inherit user multilib systemd
DESCRIPTION="Open source DMARC implementation "
HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
@@ -12,12 +12,16 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
-IUSE="spf"
+IUSE="spf +reports static-libs"
-DEPEND="dev-perl/DBI
+DEPEND="reports? ( dev-perl/DBI )
|| ( mail-filter/libmilter mail-mta/sendmail )"
RDEPEND="${DEPEND}
- dev-perl/Switch
+ reports? (
+ dev-perl/DBD-mysql
+ dev-perl/HTTP-Message
+ dev-perl/Switch
+ )
spf? ( mail-filter/libspf2 )"
pkg_setup() {
@@ -25,26 +29,39 @@ pkg_setup() {
enewuser milter -1 -1 /var/lib/milter milter
}
+src_prepare() {
+ default
+ if use !reports ; then
+ sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+ fi
+}
+
src_configure() {
econf \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- $(use_with spf)
+ $(use_with spf) \
+ $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+ $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
+ $(use_enable static-libs static)
}
src_install() {
default
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+
newinitd "${FILESDIR}"/opendmarc.initd opendmarc
newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+ systemd_dounit "${FILESDIR}/${PN}.service"
dodir /etc/opendmarc
# create config file
sed \
- -e 's/^# UserID .*$/UserID milter/' \
- -e 's/^# PidFile .*/PidFile \/var\/run\/opendmarc\/opendmarc.pid/' \
- -e '/^# Socket /s/^# //' \
+ -e 's:^# UserID .*$:UserID milter:' \
+ -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+ -e '/^# Socket /s:^# ::' \
"${S}"/opendmarc/opendmarc.conf.sample \
> "${ED}"/etc/opendmarc/opendmarc.conf \
|| die
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2019-09-19 18:46 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2019-09-19 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 4d5480baf0d90e1a33e9b8dde0c9ba7051f989ef
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 18:46:01 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 18:46:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5480ba
mail-filter/opendmarc: revbump with fix for CVE-2019-16378
Bug: https://bugs.gentoo.org/694968
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../files/opendmarc-1.3.2-multiple-From.patch | 35 +++++++++++
mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild | 72 ++++++++++++++++++++++
2 files changed, 107 insertions(+)
diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch b/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
new file mode 100644
index 00000000000..28b2f852f39
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
@@ -0,0 +1,35 @@
+From f6b615e345037408b88b2ffd1acd03239af8a858 Mon Sep 17 00:00:00 2001
+From: Marcin Seremak <panpilkarz@protonmail.com>
+Date: Tue, 30 Jul 2019 08:05:28 +0200
+Subject: [PATCH] Fix multiple addresses in From vulnerability
+
+---
+ libopendmarc/tests/test_finddomain.c | 1 +
+ opendmarc/opendmarc.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libopendmarc/tests/test_finddomain.c b/libopendmarc/tests/test_finddomain.c
+index 50cf405..8447463 100644
+--- a/libopendmarc/tests/test_finddomain.c
++++ b/libopendmarc/tests/test_finddomain.c
+@@ -23,6 +23,7 @@ main(int argc, char **argv)
+ /* 11 */ {"(,) joe@joe.com", "joe.com"},
+ /* 12 */ {"\"( bob@bob.com)\" joe@joe.com", "joe.com"},
+ /* 12 */ {"From: Davide D'Marco <user@blah.com>", "blah.com"},
++ /* 13 */ {"blah.com", "blah.com"},
+ {NULL, NULL},
+ };
+ u_char dbuf[256];
+diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
+index 419c15a..9b7fe3a 100644
+--- a/opendmarc/opendmarc.c
++++ b/opendmarc/opendmarc.c
+@@ -2193,7 +2193,7 @@ mlfi_eom(SMFICTX *ctx)
+ strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
+
+ ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
+- from->hdr_value);
++ dfc->mctx_fromdomain);
+ if (ostatus != DMARC_PARSE_OKAY)
+ {
+ if (conf->conf_dolog)
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
new file mode 100644
index 00000000000..2482aed4e1f
--- /dev/null
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user multilib systemd
+
+DESCRIPTION="Open source DMARC implementation "
+HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
+SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="spf +reports static-libs"
+
+DEPEND="reports? ( dev-perl/DBI )
+ || ( mail-filter/libmilter mail-mta/sendmail )"
+RDEPEND="${DEPEND}
+ reports? (
+ dev-perl/DBD-mysql
+ dev-perl/HTTP-Message
+ dev-perl/Switch
+ )
+ spf? ( mail-filter/libspf2 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-multiple-From.patch
+)
+
+pkg_setup() {
+ enewgroup milter
+ enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+ default
+ if use !reports ; then
+ sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ $(use_with spf) \
+ $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+ $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+
+ newinitd "${FILESDIR}"/opendmarc.initd opendmarc
+ newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ dodir /etc/opendmarc
+
+ # create config file
+ sed \
+ -e 's:^# UserID .*$:UserID milter:' \
+ -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+ -e '/^# Socket /s:^# ::' \
+ "${S}"/opendmarc/opendmarc.conf.sample \
+ > "${ED}"/etc/opendmarc/opendmarc.conf \
+ || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2021-04-30 6:46 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2021-04-30 6:46 UTC (permalink / raw
To: gentoo-commits
commit: da8164259b730c8a0ba69d0cb292df9267c06e9b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 06:46:07 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 06:46:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da816425
mail-filter/opendmarc-1.4.1: version bump
Closes: https://bugs.gentoo.org/781311
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-filter/opendmarc/Manifest | 1 +
.../files/opendmarc-1.4.1-build-fix.patch | 17 ++++++
mail-filter/opendmarc/opendmarc-1.4.1.ebuild | 70 ++++++++++++++++++++++
3 files changed, 88 insertions(+)
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index d24d52d896e..d5a567f1a86 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1 +1,2 @@
DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
+DIST opendmarc-1.4.1.tar.gz 426186 BLAKE2B 894b1cdce322950729de542d9c36d1a3226d6eff519ddce5715b50fd561edb815bef33b01194f216ac5388626dab6157391d837da3f11f7e67e3c52a1350f06c SHA512 df0276ebb9a72bfd5bf339976661f48ac66e273f17f66ee633c0017c588936fa0f4236ed15167c834bd394d8ff17dffcc07a92734093e63f84847dab35e69404
diff --git a/mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch b/mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch
new file mode 100644
index 00000000000..9be5752828c
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch
@@ -0,0 +1,17 @@
+https://github.com/trusteddomainproject/OpenDMARC/issues/163
+
+mdomsch
+
+commit ab1bc01 removed conf_holdquarentinedmessages, but not completely.
+A reference to it still exists which causes the build to fail.
+
+--- a/opendmarc/opendmarc.c
++++ b/opendmarc/opendmarc.c
+@@ -3591,7 +3591,6 @@
+ ret = SMFIS_CONTINUE;
+
+ if (conf->conf_rejectfail &&
+- conf->conf_holdquarantinedmessages &&
+ random() % 100 < pct)
+ {
+ snprintf(replybuf, sizeof replybuf,
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.ebuild
new file mode 100644
index 00000000000..6bbee3d7628
--- /dev/null
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib systemd
+
+DESCRIPTION="Open source DMARC implementation"
+HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
+SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="spf +reports static-libs"
+
+DEPEND="reports? ( dev-perl/DBI )
+ || ( mail-filter/libmilter mail-mta/sendmail )"
+RDEPEND="${DEPEND}
+ acct-user/opendmarc
+ reports? (
+ dev-perl/DBD-mysql
+ dev-perl/HTTP-Message
+ dev-perl/Switch
+ )
+ spf? ( mail-filter/libspf2 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.1-build-fix.patch
+)
+
+S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
+
+src_prepare() {
+ default
+
+ eautoreconf
+ if use !reports ; then
+ sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ econf \
+ $(use_with spf) \
+ $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+ $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+
+ newinitd "${FILESDIR}"/opendmarc.initd opendmarc
+ newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ dodir /etc/opendmarc
+
+ # create config file
+ sed \
+ -e 's:^# UserID .*$:UserID opendmarc:' \
+ -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+ -e '/^# Socket /s:^# ::' \
+ "${S}"/opendmarc/opendmarc.conf.sample \
+ > "${ED}"/etc/opendmarc/opendmarc.conf \
+ || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2021-05-04 9:13 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2021-05-04 9:13 UTC (permalink / raw
To: gentoo-commits
commit: afa1ba45298c5cbbae54d6626c891398a11f633e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 09:12:04 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 4 09:12:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa1ba45
mail-filter/opendmarc-1.4.1.1: version bump
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-filter/opendmarc/Manifest | 2 +-
.../opendmarc/files/opendmarc-1.4.1-build-fix.patch | 17 -----------------
...{opendmarc-1.4.1.ebuild => opendmarc-1.4.1.1.ebuild} | 4 ----
3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index d5a567f1a86..810ee6caf2d 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,2 +1,2 @@
DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
-DIST opendmarc-1.4.1.tar.gz 426186 BLAKE2B 894b1cdce322950729de542d9c36d1a3226d6eff519ddce5715b50fd561edb815bef33b01194f216ac5388626dab6157391d837da3f11f7e67e3c52a1350f06c SHA512 df0276ebb9a72bfd5bf339976661f48ac66e273f17f66ee633c0017c588936fa0f4236ed15167c834bd394d8ff17dffcc07a92734093e63f84847dab35e69404
+DIST opendmarc-1.4.1.1.tar.gz 426618 BLAKE2B a74b2623bc35abb5c34f8d1eff737c71af8f5cadfd6a5d0a85adb6536efd2958118f9da25dd9b736dc24563221968c4ee1ff99b101fa30909764563bda2a8d88 SHA512 ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6
diff --git a/mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch b/mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch
deleted file mode 100644
index 9be5752828c..00000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/trusteddomainproject/OpenDMARC/issues/163
-
-mdomsch
-
-commit ab1bc01 removed conf_holdquarentinedmessages, but not completely.
-A reference to it still exists which causes the build to fail.
-
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -3591,7 +3591,6 @@
- ret = SMFIS_CONTINUE;
-
- if (conf->conf_rejectfail &&
-- conf->conf_holdquarantinedmessages &&
- random() % 100 < pct)
- {
- snprintf(replybuf, sizeof replybuf,
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1.ebuild
similarity index 96%
rename from mail-filter/opendmarc/opendmarc-1.4.1.ebuild
rename to mail-filter/opendmarc/opendmarc-1.4.1.1.ebuild
index 6bbee3d7628..793fac6ee9b 100644
--- a/mail-filter/opendmarc/opendmarc-1.4.1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1.ebuild
@@ -25,10 +25,6 @@ RDEPEND="${DEPEND}
)
spf? ( mail-filter/libspf2 )"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.1-build-fix.patch
-)
-
S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/
@ 2022-04-23 23:46 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2022-04-23 23:46 UTC (permalink / raw
To: gentoo-commits
commit: a62fc3b9e32e7678fea4a1c636aa29605aabbb20
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 23:46:21 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 23:46:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62fc3b9
mail-filter/opendmarc: [QA] fix glibc upgrade issue without hacks
Closes: https://bugs.gentoo.org/839951
Closes: https://github.com/gentoo/gentoo/pull/25173
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/opendmarc-1.4.1.1-underlinking.patch | 17 ++++++
mail-filter/opendmarc/opendmarc-1.4.1.1-r3.ebuild | 71 ----------------------
...4.1.1-r2.ebuild => opendmarc-1.4.1.1-r4.ebuild} | 15 +++--
3 files changed, 24 insertions(+), 79 deletions(-)
diff --git a/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch
new file mode 100644
index 000000000000..825ee461dfd6
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch
@@ -0,0 +1,17 @@
+libopendmarc.so.2.0.3 uses
+* __dn_expand
+* __dn_skipname
+* __res_nquery
+which are defined in libresolv in glibc 2.33 and older.
+
+See: https://bugs.gentoo.org/839951
+
+--- a/libopendmarc/Makefile.am
++++ b/libopendmarc/Makefile.am
+@@ -15,5 +15,6 @@
+ opendmarc_spf_dns.c \
+ opendmarc_internal.h
+ libopendmarc_la_LDFLAGS = -version-info $(LIBOPENDMARC_VERSION_INFO)
++libopendmarc_la_LIBADD = $(LIBRESOLV)
+ libopendmarc_includedir = $(includedir)/opendmarc
+ libopendmarc_include_HEADERS = dmarc.h
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r3.ebuild
deleted file mode 100644
index c9de04f81e6b..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.4.1.1-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Open source DMARC implementation"
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3" # 1.4 has API breakage with 1.3, yet uses same soname
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="spf +reports static-libs"
-
-DEPEND="reports? ( dev-perl/DBI )
- || ( mail-filter/libmilter mail-mta/sendmail )
- elibc_glibc? ( >=sys-libs/glibc-2.34 )" #839951
-RDEPEND="${DEPEND}
- acct-user/opendmarc
- reports? (
- dev-perl/DBD-mysql
- dev-perl/HTTP-Message
- dev-perl/Switch
- )
- spf? ( mail-filter/libspf2 )"
-
-S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
- if use !reports ; then
- sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
- fi
-}
-
-src_configure() {
- econf \
- $(use_with spf) \
- $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
- $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
-
- newinitd "${FILESDIR}"/opendmarc.initd opendmarc
- newconfd "${FILESDIR}"/opendmarc.confd opendmarc
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- dodir /etc/opendmarc
-
- # create config file
- sed \
- -e 's:^# UserID .*$:UserID opendmarc:' \
- -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
- -e '/^# Socket /s:^# ::' \
- "${S}"/opendmarc/opendmarc.conf.sample \
- > "${ED}"/etc/opendmarc/opendmarc.conf \
- || die
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
similarity index 81%
rename from mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild
rename to mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
index 09be27f5139e..e0d08ea8755b 100644
--- a/mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
@@ -8,15 +8,15 @@ inherit autotools systemd
DESCRIPTION="Open source DMARC implementation"
HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}"
LICENSE="BSD"
SLOT="0/3" # 1.4 has API breakage with 1.3, yet uses same soname
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="spf +reports static-libs"
+IUSE="spf +reports"
DEPEND="reports? ( dev-perl/DBI )
- || ( mail-filter/libmilter mail-mta/sendmail )
- elibc_glibc? ( <sys-libs/glibc-2.34 )" #839951
+ || ( mail-filter/libmilter mail-mta/sendmail )"
RDEPEND="${DEPEND}
acct-user/opendmarc
reports? (
@@ -26,10 +26,9 @@ RDEPEND="${DEPEND}
)
spf? ( mail-filter/libspf2 )"
-S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
-
PATCHES=(
"${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
+ "${FILESDIR}"/${PN}-1.4.1.1-underlinking.patch
)
src_prepare() {
@@ -43,16 +42,16 @@ src_prepare() {
src_configure() {
econf \
+ --disable-static \
$(use_with spf) \
$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
- $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_enable static-libs static)
+ $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir))
}
src_install() {
default
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+ find "${ED}" -name '*.la' -delete || die
newinitd "${FILESDIR}"/opendmarc.initd opendmarc
newconfd "${FILESDIR}"/opendmarc.confd opendmarc
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-23 23:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-22 11:32 [gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2022-04-23 23:46 David Seifert
2021-05-04 9:13 Fabian Groffen
2021-04-30 6:46 Fabian Groffen
2019-09-19 18:46 Fabian Groffen
2018-12-10 10:35 Fabian Groffen
2017-03-29 7:36 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox