Date: Tue, 17 Apr 2007 13:04:57 +0900 From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111751: [maintainer] mail/dkim-milter update to 0.6.4 Message-ID: <863b2zodcm.wl%umq@ueo.co.jp> Resent-Message-ID: <200704170410.l3H4A4KM025715@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111751 >Category: ports >Synopsis: [maintainer] mail/dkim-milter update to 0.6.4 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 17 04:10:03 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 #4: Mon Nov 27 15:32:41 JST 2006 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64 >Description: dkim-milter 0.6.4 has been released Release notes: http://sourceforge.net/project/shownotes.php?release_id=501604&group_id=139420 >How-To-Repeat: N/A >Fix: The patch follows. this patch supersedes following pr's. ports/111373: mail/dkim-milter requires openssl 0.9.8 or later to support rsa-sha256 ports/111731: milter-dkim.sh supplies -k option to a verifying-only milter cvs diff: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v retrieving revision 1.19 diff -p -u -r1.19 Makefile --- Makefile 6 Apr 2007 17:41:00 -0000 1.19 +++ Makefile 17 Apr 2007 03:49:29 -0000 @@ -13,7 +13,7 @@ ## base system, building this port may fail. PORTNAME= dkim-milter -PORTVERSION= 0.6.3 +PORTVERSION= 0.6.4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,6 +22,7 @@ MAINTAINER= umq@ueo.co.jp COMMENT= Domainkeys Identified Mail (DKIM) milter USE_RC_SUBR= milter-dkim.sh +USE_OPENSSL= yes .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT) SENDMAIL_MILTER_IN_BASE= yes @@ -75,6 +76,10 @@ pre-fetch: @${FALSE} .endif @${ECHO_MSG} + @${ECHO_MSG} "If you do not have OpenSSL 0.9.8 or later installed," + @${ECHO_MSG} "set WITH_OPENSSL_PORT=yes to support rsa-sha256 algorithm" + @${ECHO_MSG} "which is requied in the latest specification." + @${ECHO_MSG} @${ECHO_MSG} "dkim-milter has the following tunable option(s):" # @${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" @@ -93,6 +98,8 @@ post-patch: ${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" \ ${SITE} > ${WCONF}/site.config.m4 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS) @@ -103,6 +110,8 @@ post-patch: ${LN} -s ${LIBDK_PATH} ${WRKSRC}/ .endif +.include "${.CURDIR}/Makefile.features" + post-install: @${STRIP_CMD} ${PREFIX}/libexec/dkim-filter ${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/distinfo,v retrieving revision 1.10 diff -p -u -r1.10 distinfo --- distinfo 6 Apr 2007 17:41:00 -0000 1.10 +++ distinfo 17 Apr 2007 03:49:29 -0000 @@ -1,3 +1,3 @@ -MD5 (dkim-milter-0.6.3.tar.gz) = 1e8beaadb68824825cc7dda2e11d977c -SHA256 (dkim-milter-0.6.3.tar.gz) = 3810b99599c2db2a5076bed3813ac362f23ca78ed630f0ff2075f8e5fd14e5e7 -SIZE (dkim-milter-0.6.3.tar.gz) = 479669 +MD5 (dkim-milter-0.6.4.tar.gz) = 6324ea1949b36e6a08bdc590c43b2908 +SHA256 (dkim-milter-0.6.4.tar.gz) = d074811c9785ff8069049842d8dddd806fb34ddb2b5b3eb28e8318eb15a1bafd +SIZE (dkim-milter-0.6.4.tar.gz) = 482643 cvs diff: Diffing files Index: files/milter-dkim.sh.in =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/files/milter-dkim.sh.in,v retrieving revision 1.8 diff -p -u -r1.8 milter-dkim.sh.in --- files/milter-dkim.sh.in 6 Apr 2007 17:41:00 -0000 1.8 +++ files/milter-dkim.sh.in 17 Apr 2007 03:49:29 -0000 @@ -35,8 +35,8 @@ milterdkim_uid=${milterdkim_uid:-"mailnu milterdkim_profiles=${milterdkim_profiles:-} milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"} milterdkim_domain=${milterdkim_domain:-"example.com"} -milterdkim_key=${milterdkim_key:-"/var/db/domainkeys/default.key.pem"} -milterdkim_selector=${milterdkim_selector:-"default"} +milterdkim_key=${milterdkim_key:-} +milterdkim_selector=${milterdkim_selector:-} milterdkim_alg=${milterdkim_alg:-} # Options other than above can be set with $milterdkim_flags. # see dkim-milter documentation for detail. Index: files/site.config.m4 =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4,v retrieving revision 1.1 diff -p -u -r1.1 site.config.m4 --- files/site.config.m4 11 Jan 2006 13:50:22 -0000 1.1 +++ files/site.config.m4 17 Apr 2007 03:49:29 -0000 @@ -4,3 +4,5 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/ define(`confUBINDIR',`%%PREFIX%%/libexec') define(`confLIBDIR',`%%PREFIX%%/lib') define(`confDONT_INSTALL_CATMAN',`True') +APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%') +APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%') diff -N -p -u ports.orig/mail/dkim-milter/Makefile.features ports/mail/dkim-milter/Makefile.features --- ports.orig/mail/dkim-milter/Makefile.features Thu Jan 1 09:00:00 1970 +++ ports/mail/dkim-milter/Makefile.features Tue Apr 17 12:03:42 2007 @@ -0,0 +1,86 @@ +# Makefile.features +# Author: Hirohisa Yamaguchi <umq@ueo.co.jp> +# +# This file is used to tune build time options. +# Please refer FEATURES file distributed with the source for details. +# +# $FreeBSD$ +# + +.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 +.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 +.endif + +.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS) + @${REINPLACE_CMD} -e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/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 +.endif + +.if defined(WITH_QUERY_FILE) && !defined(WITHOUT_QUERY_FILE) + @${REINPLACE_CMD} -e '/-D_FFR_QUERY_FILE/s|^dnl ||' \ + ${WRKSRC}/libdkim/Makefile.m4 +.endif + +.if defined(WITH_QUARANTINE) && !defined(WITHOUT_QUARANTINE) + @${REINPLACE_CMD} -e '/-D_FFR_QUARANTINE/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/Makefile.m4 +.endif + +.if defined(WITH_REPORTINFO) && !defined(WITHOUT_REPORTINFO) + @${REINPLACE_CMD} -e '/-D_FFR_REPORTINFO/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/Makefile.m4 +.endif + +.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS) + @${REINPLACE_CMD} -e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/Makefile.m4 +.endif + +.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION) + @${REINPLACE_CMD} -e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/Makefile.m4 +.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 +.endif + +.if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY) + @${REINPLACE_CMD} -e '/-D_FFR_SET_REPLY/s|^dnl ||' \ + ${WRKSRC}/dkim-filter/Makefile.m4 +.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 +.endif >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?863b2zodcm.wl%umq>