ports/112436: [maintainer] mail/dkim-milter update to 0.7.0
Hirohisa Yamaguchi
umq at ueo.co.jp
Sat May 5 07:40:03 UTC 2007
>Number: 112436
>Category: ports
>Synopsis: [maintainer] mail/dkim-milter update to 0.7.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat May 05 07:40:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Hirohisa Yamaguchi
>Release: FreeBSD 7.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #5: Sun Apr 8 16:30:19 JST 2007 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64
>Description:
The new version of dkim-milter 0.7.0 has been relased.
Release notes: http://sourceforge.net/project/shownotes.php?release_id=505789
>How-To-Repeat:
N/A
>Fix:
The patch follows:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 27 Apr 2007 07:38:41 -0000 1.22
+++ Makefile 5 May 2007 07:29:49 -0000
@@ -13,7 +13,7 @@
## base system, building this port may fail.
PORTNAME= dkim-milter
-PORTVERSION= 0.6.6
+PORTVERSION= 0.7.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -68,6 +68,8 @@ LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht
${DOCSDIR_REL}/libdkim/dkim_getcanonlen.html \
${DOCSDIR_REL}/libdkim/dkim_getidentity.html \
${DOCSDIR_REL}/libdkim/dkim_getkeysize.html \
+ ${DOCSDIR_REL}/libdkim/dkim_getselector.html \
+ ${DOCSDIR_REL}/libdkim/dkim_getsigdomain.html \
${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
${DOCSDIR_REL}/libdkim/dkim_getsignalg.html \
${DOCSDIR_REL}/libdkim/dkim_getsigntime.html \
@@ -79,6 +81,9 @@ LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht
${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
${DOCSDIR_REL}/libdkim/dkim_query_t.html \
${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \
+ ${DOCSDIR_REL}/libdkim/dkim_set_dns_callback.html \
+ ${DOCSDIR_REL}/libdkim/dkim_set_key_lookup.html \
+ ${DOCSDIR_REL}/libdkim/dkim_set_policy_lookup.html \
${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
${DOCSDIR_REL}/libdkim/dkim_sign.html \
${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \
@@ -94,16 +99,31 @@ SITE+= ${FILESDIR}/site.config.m4
.if !defined(SENDMAIL_MILTER_IN_BASE)
SITE+= ${FILESDIR}/site.config.m4.milter
.endif
+SITE+= ${WRKSRC}/site.config.m4.dist
+SITE_SUB+= -e "s|%%PREFIX%%|${PREFIX}|g" \
+ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+ -e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
+ -e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g"
.include <bsd.port.pre.mk>
SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
+.if defined(WITH_DEBUG)
+SITE_SUB+= -e '\|confOPTIMIZE.*-g|s/^dnl //g'
+.endif
+.if !defined(WITHOUT_ARLIB)
+SITE_SUB+= -e '\|bld_USE_ARLIB|s/^dnl //g'
+.endif
+.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
+SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g'
+.endif
+
.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
LIBDK_PORT= mail/dk-milter
BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
-DKMILTER_DISTNAME!= cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V DISTNAME
-LIBDK_PATH= ${PORTSDIR}/${LIBDK_PORT}/work/${DKMILTER_DISTNAME}/libdk
+LIBDK_PATH!= cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
+SITE_SUB+= -e '\|bld_VERIFY_DOMAINKEYS|s/^dnl //'
.endif
.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
@@ -112,6 +132,19 @@ PLIST_SUB+= STATS=""
PLIST_SUB+= STATS="@comment "
.endif
+.if defined(WITH_POPAUTH) \
+ || defined(WITH_QUERY_CACHE) \
+ || defined(WITH_STATS)
+USE_BDB= 41+
+INVALID_BDB_VER= 2 3 40
+SITE_SUB+= -e 's|%%BDB%%||g' \
+ -e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
+ -e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
+ -e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g"
+.else
+SITE_SUB+= -e 's|%%BDB%%|dnl |g'
+.endif
+
pre-fetch:
.if defined(SENDMAIL_WITHOUT_MILTER)
@${ECHO_MSG}
@@ -125,6 +158,7 @@ pre-fetch:
@${ECHO_MSG} "which is requied in the latest specification."
@${ECHO_MSG}
@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
+ @${ECHO_MSG} " WITH_POPAUTH=yes Query POP-before-SMTP authentication database"
@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes Verify DomainKeys using dk-milter's libdk"
@${ECHO_MSG} " SENDMAIL_MILTER_IN_BASE=yes Build to run with base sendmail"
@${ECHO_MSG} " WITH_POSTFIX=yes Build to run with postfix port"
@@ -134,28 +168,20 @@ pre-fetch:
post-extract:
@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
+.include "${.CURDIR}/Makefile.features"
post-patch:
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-e "s|\`-O'|\`${CFLAGS}'|g" \
${WRKSRC}/devtools/OS/FreeBSD
- @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
- -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
- -e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
- -e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g" \
+ @${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
${SITE} > ${WCONF}/site.config.m4
.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
- @${REINPLACE_CMD} -e "/bldPUSH_SMLIB(\`dk')/s|^dnl ||" \
- -e "/-I\.\.\/libdk\//s|^dnl ||" \
- -e '/-DVERIFY_DOMAINKEYS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
- ${LN} -s ${LIBDK_PATH} ${WRKSRC}/
+ ${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
.endif
-.include "${.CURDIR}/Makefile.features"
-
post-install:
@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \
Index: Makefile.features
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile.features,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.features
--- Makefile.features 27 Apr 2007 07:38:41 -0000 1.3
+++ Makefile.features 5 May 2007 07:29:49 -0000
@@ -8,101 +8,57 @@
#
.if defined(WITH_ALLMAN_SSP_02) && !defined(WITHOUT_ALLMAN_SSP_02)
- @${REINPLACE_CMD} -e '/-D_FFR_ALLMAN_SSP_02/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4 \
- ${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_ALLMAN_SSP_02/s|^dnl ||'
.endif
.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
- @${REINPLACE_CMD} -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
.endif
.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
- @${REINPLACE_CMD} -e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
.endif
.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
- @${REINPLACE_CMD} -e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||'
.endif
.if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)
- @${REINPLACE_CMD} -e '/-D_FFR_HASH_BUFFERING/s|^dnl ||' \
- ${WRKSRC}/libdkim/Makefile.m4
-.endif
-
-.if defined(WITH_LOG_SSL_ERRORS) && !defined(WITHOUT_LOG_SSL_ERRORS)
- @${REINPLACE_CMD} -e '/-D_FFR_LOG_SSL_ERRORS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_MULTIPLE_KEYS) && !defined(WITHOUT_MULTIPLE_KEYS)
- @${REINPLACE_CMD} -e '/-D_FFR_MULTIPLE_KEYS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_OMIT_HEADERS) && !defined(WITHOUT_OMIT_HEADERS)
- @${REINPLACE_CMD} -e '/-D_FFR_OMIT_HEADERS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_HASH_BUFFERING/s|^dnl ||'
.endif
.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
- @${REINPLACE_CMD} -e '/-D_FFR_QUERY_CACHE/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4 \
- ${WRKSRC}/libdkim/Makefile.m4
-.endif
-
-.if defined(WITH_QUERY_FILE) && !defined(WITHOUT_QUERY_FILE)
- @${REINPLACE_CMD} -e '/-D_FFR_QUERY_FILE/s|^dnl ||' \
- ${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_QUERY_CACHE/s|^dnl ||'
.endif
.if defined(WITH_QUARANTINE) && !defined(WITHOUT_QUARANTINE)
- @${REINPLACE_CMD} -e '/-D_FFR_QUARANTINE/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_QUARANTINE/s|^dnl ||'
.endif
.if defined(WITH_REPORTINFO) && !defined(WITHOUT_REPORTINFO)
- @${REINPLACE_CMD} -e '/-D_FFR_REPORTINFO/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_REPORTINFO/s|^dnl ||'
.endif
.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
- @${REINPLACE_CMD} -e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||'
.endif
.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
- @${REINPLACE_CMD} -e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||'
.endif
.if defined(WITH_SELECT_SIGN_HEADERS) && !defined(WITHOUT_SELECT_SIGN_HEADERS)
- @${REINPLACE_CMD} -e '/-D_FFR_SELECT_SIGN_HEADERS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
-.endif
-
-.if defined(WITH_SET_DNS_CALLBACK) && !defined(WITHOUT_SET_DNS_CALLBACK)
- @${REINPLACE_CMD} -e '/-D_FFR_SET_DNS_CALLBACK/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4 \
- ${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_SELECT_SIGN_HEADERS/s|^dnl ||'
.endif
.if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY)
- @${REINPLACE_CMD} -e '/-D_FFR_SET_REPLY/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_SET_REPLY/s|^dnl ||'
.endif
.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
- @${REINPLACE_CMD} -e '/-D_FFR_STATS/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4 \
- ${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_STATS/s|^dnl ||'
.endif
.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
- @${REINPLACE_CMD} -e '/-D_FFR_VBR/s|^dnl ||' \
- ${WRKSRC}/dkim-filter/Makefile.m4 \
- ${WRKSRC}/libdkim/Makefile.m4
+SITE_SUB+= -e '/-D_FFR_VBR/s|^dnl ||'
.endif
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 27 Apr 2007 07:38:41 -0000 1.13
+++ distinfo 5 May 2007 07:29:49 -0000
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-0.6.6.tar.gz) = 7967e57b2df7a3019a4156a24971d5a8
-SHA256 (dkim-milter-0.6.6.tar.gz) = 25705f3fade8ba5db86272c1e937f006a645958467b47b7650b8d89451086bcb
-SIZE (dkim-milter-0.6.6.tar.gz) = 492420
+MD5 (dkim-milter-0.7.0.tar.gz) = a75e36335e8fb2a3147af1aa8898c0ef
+SHA256 (dkim-milter-0.7.0.tar.gz) = fcf52d57df54b5605f827d806f43ffd1235ee6fc82e763201580b017376610d3
+SIZE (dkim-milter-0.7.0.tar.gz) = 510486
cvs diff: Diffing files
cvs diff: cannot find files/patch-dkim-filter-Makefile.m4
cvs diff: cannot find files/patch-libdkim-Makefile.m4
Index: files/site.config.m4
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4,v
retrieving revision 1.2
diff -u -p -r1.2 site.config.m4
--- files/site.config.m4 18 Apr 2007 06:27:20 -0000 1.2
+++ files/site.config.m4 5 May 2007 07:29:49 -0000
@@ -4,7 +4,8 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/
define(`confUBINDIR',`%%PREFIX%%/libexec')
define(`confLIBDIR',`%%PREFIX%%/lib')
define(`confDONT_INSTALL_CATMAN',`True')
+%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%%')
+%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%%')
+%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%%')
+APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% -R%%OPENSSLLIB%%')
APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
-APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')
-APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
-APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')
Index: files/site.config.m4.milter
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4.milter,v
retrieving revision 1.1
diff -u -p -r1.1 site.config.m4.milter
--- files/site.config.m4.milter 11 Jan 2006 13:50:22 -0000 1.1
+++ files/site.config.m4.milter 5 May 2007 07:29:49 -0000
@@ -1,2 +1,2 @@
-APPENDDEF(`confENVDEF',`-I%%LOCALBASE%%/include')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`bld_dkim_filter_INCDIRS',`-I%%LOCALBASE%%/include')
+APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L%%LOCALBASE%%/lib')
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list