| 1 |
commit: cdd295d9bdd2a99fb9d9a42b5d58988939479e6f |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 00:40:18 2019 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 03:38:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd295d9 |
| 7 |
|
| 8 |
mail-filter/opendkim: new revision with missing test dependency. |
| 9 |
|
| 10 |
The OpenDKIM test suite won't be run if the user doesn't have Lua |
| 11 |
installed. The (R)DEPEND variables have been refactored to add that |
| 12 |
missing build-time dependency. In addition, a hacky sed line that |
| 13 |
relocated the unix socket in the test suite has been replaced, by |
| 14 |
the --with-test-socket ./configure flag. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/682290 |
| 17 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 18 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 19 |
|
| 20 |
....10.3-r12.ebuild => opendkim-2.10.3-r13.ebuild} | 24 +++++++++++++--------- |
| 21 |
1 file changed, 14 insertions(+), 10 deletions(-) |
| 22 |
|
| 23 |
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild |
| 24 |
similarity index 93% |
| 25 |
rename from mail-filter/opendkim/opendkim-2.10.3-r12.ebuild |
| 26 |
rename to mail-filter/opendkim/opendkim-2.10.3-r13.ebuild |
| 27 |
index ee5908da59c..037a1b0f98c 100644 |
| 28 |
--- a/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild |
| 29 |
+++ b/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild |
| 30 |
@@ -13,9 +13,9 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" |
| 31 |
LICENSE="BSD GPL-2 Sendmail-Open-Source" |
| 32 |
SLOT="0" |
| 33 |
KEYWORDS="~amd64 ~arm ~x86" |
| 34 |
-IUSE="+berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound" |
| 35 |
+IUSE="+berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs test unbound" |
| 36 |
|
| 37 |
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) |
| 38 |
+COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) |
| 39 |
dev-libs/libbsd |
| 40 |
sys-apps/grep |
| 41 |
ssl? ( |
| 42 |
@@ -32,7 +32,10 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) |
| 43 |
unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) |
| 44 |
!unbound? ( net-libs/ldns )" |
| 45 |
|
| 46 |
-RDEPEND="${DEPEND} |
| 47 |
+DEPEND="${COMMON_DEPEND} |
| 48 |
+ test? ( dev-lang/lua:* )" |
| 49 |
+ |
| 50 |
+RDEPEND="${COMMON_DEPEND} |
| 51 |
sys-process/psmisc |
| 52 |
selinux? ( sec-policy/selinux-dkim )" |
| 53 |
|
| 54 |
@@ -52,12 +55,12 @@ pkg_setup() { |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
default |
| 58 |
- sed -i -e 's:/var/db/dkim:/var/lib/opendkim:g' \ |
| 59 |
- opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in || die |
| 60 |
- sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am || die |
| 61 |
- # TODO: what purpose does this serve? |
| 62 |
- sed -i -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \ |
| 63 |
- opendkim/tests/*.lua || die |
| 64 |
+ sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \ |
| 65 |
+ -i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \ |
| 66 |
+ || die |
| 67 |
+ sed -e 's:dist_doc_DATA:dist_html_DATA:' \ |
| 68 |
+ -i libopendkim/docs/Makefile.am \ |
| 69 |
+ || die |
| 70 |
eautoreconf |
| 71 |
} |
| 72 |
|
| 73 |
@@ -106,7 +109,8 @@ src_configure() { |
| 74 |
--enable-default_sender \ |
| 75 |
--enable-sender_macro \ |
| 76 |
--enable-vbr \ |
| 77 |
- --disable-live-testing |
| 78 |
+ --disable-live-testing \ |
| 79 |
+ --with-test-socket="${T}/opendkim.sock" |
| 80 |
} |
| 81 |
|
| 82 |
src_compile() { |
Archives