Date: Tue, 8 Nov 2011 17:40:09 GMT From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/162177: mail/opendkim - make dependency to Sendmail optional Message-ID: <201111081740.pA8He9pT008063@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/162177; it has been noted by GNATS.
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: bug-followup@FreeBSD.ORG
Cc: Michele Mazzucchi <m.mazzucchi@frontdam.com>
Subject: Re: ports/162177: mail/opendkim - make dependency to Sendmail optional
Date: Wed, 09 Nov 2011 02:24:27 +0900
--pgp-sign-Multipart_Wed_Nov__9_02:24:27_2011-1
Content-Type: multipart/mixed;
boundary="Multipart_Wed_Nov__9_02:24:27_2011-1"
--Multipart_Wed_Nov__9_02:24:27_2011-1
Content-Type: text/plain; charset=US-ASCII
Hi,
At Sun, 30 Oct 2011 22:11:57 GMT,
Michele Mazzucchi wrote:
| This patch allows people who run MTAs other than the bat to use the
| port without dragging on sendmail as well. The milter component is
| enabled/disabled with a suitable switch in OPTIONS.
| For compatibility, the "FILTER" option is currently on by default,
| thus reproducing the behavior of the former port in interactive mode.
Thanks for the patch.
I made a slight change to your (latter) patch, and attached.
Regards,
--
Hirohisa Yamaguchi
umq@ueo.co.jp
--Multipart_Wed_Nov__9_02:24:27_2011-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="mail_opendkim-2.4.2.patch"
Content-Transfer-Encoding: 7bit
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/opendkim/Makefile,v
retrieving revision 1.8
diff -p -u -r1.8 Makefile
--- Makefile 2 Jul 2011 11:55:27 -0000 1.8
+++ Makefile 8 Nov 2011 16:49:36 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= opendkim
-PORTVERSION= 2.4.1
+PORTVERSION= 2.4.2
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -25,18 +25,16 @@ LICENSE_PERMS_SENDMAIL= dist-mirror dist
GNU_CONFIGURE= yes
USE_OPENSSL= yes
-USE_RC_SUBR= milter-opendkim
USE_LDCONFIG= yes
-MAN5= opendkim.conf.5
MAN8= opendkim-genkey.8 opendkim-genzone.8 \
- opendkim-testadsp.8 opendkim-testkey.8 \
- opendkim.8
+ opendkim-testadsp.8 opendkim-testkey.8
SUB_FILES= pkg-message
OPTIONS= \
ARLIB "Asynchronous thread-safe DNS library" On \
+ FILTER "OpenDKIM filter, requires libmilter/Sendmail" On \
GNUTLS "Use GnuTLS instead of OpenSSL" Off \
LUA "Describe filter policy with lua" Off \
MEMCACHED "Use memcached as a data set" Off \
@@ -50,10 +48,19 @@ MAKE_ARGS+= pkgconfigdir="${PREFIX}/libd
.include <bsd.port.pre.mk>
+.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
+USE_RC_SUBR= milter-opendkim
+MAN5+= opendkim.conf.5
+MAN8+= opendkim.8
+PLIST_SUB+= FILTER=""
WITHOUT_MILTER_CFLAGS= yes
WITHOUT_MILTER_LDFLAGS= yes
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
CONFIGURE_ARGS+= --with-milter=${MILTERBASE}
+.else
+CONFIGURE_ARGS+= --disable-filter
+PLIST_SUB+= FILTER="@comment "
+.endif
.if defined(WITH_GNUTLS)
LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
@@ -95,9 +102,6 @@ LIB_DEPENDS+= unbound:${PORTSDIR}/dns/u
PLIST_SUB+= ARLIB="@comment "
.else
.if defined(WITH_ARLIB)
-. if ${CC} == "clang"
-BROKEN= ARLIB option does not compile with clang
-. endif
PLIST_SUB+= ARLIB=""
CONFIGURE_ARGS+= --enable-arlib
MAN3= ar.3
@@ -126,7 +130,9 @@ USE_OPENLDAP= yes
.endif
.if defined(WITH_LUA) || defined(WITH_RBL) || defined(WITH_STATSEXT)
CONFIGURE_ARGS+= --with-lua
+. if !defined(WITHOUT_FILTER)
MAN3+= opendkim-lua.3
+. endif
MAN8+= miltertest.8
PLIST_SUB+= LUA=""
USE_LUA= 5.1
Index: Makefile.features
===================================================================
RCS file: /home/ncvs/ports/mail/opendkim/Makefile.features,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile.features
--- Makefile.features 2 Jul 2011 11:55:27 -0000 1.5
+++ Makefile.features 8 Nov 2011 16:49:36 -0000
@@ -16,6 +16,7 @@ CONFIGURE_ARGS+= --enable-allsymbols
.endif
.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS)
+WITH_XTAGS= yes
CONFIGURE_ARGS+= --enable-atps
.endif
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/opendkim/distinfo,v
retrieving revision 1.6
diff -p -u -r1.6 distinfo
--- distinfo 2 Jul 2011 11:55:27 -0000 1.6
+++ distinfo 8 Nov 2011 16:49:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.4.1.tar.gz) = 1567a6d41dba92977d3eaae726580c5ecdc74766866331e87fc201792333b1f2
-SIZE (opendkim-2.4.1.tar.gz) = 1322057
+SHA256 (opendkim-2.4.2.tar.gz) = 930a9ef845822ba310666dfc918d306d1ffa44cc0a8d9f56d7c0b0426d668f3f
+SIZE (opendkim-2.4.2.tar.gz) = 1374662
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/opendkim/pkg-plist,v
retrieving revision 1.6
diff -p -u -r1.6 pkg-plist
--- pkg-plist 2 Jul 2011 11:55:27 -0000 1.6
+++ pkg-plist 8 Nov 2011 16:49:36 -0000
@@ -18,7 +18,7 @@ lib/libopendkim.so
lib/libopendkim.so.5
%%ARLIB%%libdata/pkgconfig/ar.pc
libdata/pkgconfig/opendkim.pc
-sbin/opendkim
+%%FILTER%%sbin/opendkim
@dirrm include/opendkim
%%ARLIB%%@dirrm include/ar
@dirrmtry etc/mail
--Multipart_Wed_Nov__9_02:24:27_2011-1--
--pgp-sign-Multipart_Wed_Nov__9_02:24:27_2011-1
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
Content-Description: OpenPGP Digital Signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)
iQEcBAABAgAGBQJOuWXLAAoJEML/cja+Xi6+owkH+gP5fjd23hpOGparHTTGO9cg
/428mR5ZsORHQvITiM6Y1eXeg6/PL+7GxOU0DSq3LZF1gV3Wkv0ak3aclnrl+gar
qDlnmuH9KrpAuWQzXHb5ac8NtQsIZc8P6SuYaQU4mxykASgqr9vHf39ewdejzNcZ
OmXMzcx6rAfbS5p4o9fV5CfdYGgfA/NXYoFfgS2f5dP8ELLzSjWgsHnyVjcXo4xJ
G7nItcO3c+hfUw1CIXNqMMwZhAEGsVyp/hFQ8rSXHna/5zKcWEXpchnFptqDeCf6
dON2IFo52gXul+lTEQ9pXe/zgyzNCYD77SF/RvaZSVAwyudtR/PiIKBr/8sCVPc=
=fnsm
-----END PGP SIGNATURE-----
--pgp-sign-Multipart_Wed_Nov__9_02:24:27_2011-1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111081740.pA8He9pT008063>