- Update to 2.8.3
PR: 135225 Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
This commit is contained in:
Martin Wilke
parent
fe584e5b6d
commit
0c12ab8959
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235238
6 changed files with 86 additions and 23 deletions
|
|
@ -13,8 +13,7 @@
|
|||
## base system, building this port may fail.
|
||||
|
||||
PORTNAME= dkim-milter
|
||||
PORTVERSION= 2.8.2
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2.8.3
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= SF
|
||||
|
||||
|
|
@ -25,7 +24,7 @@ USE_RC_SUBR= milter-dkim.sh
|
|||
USE_OPENSSL= yes
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
.if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
|
||||
.if defined(WITH_POSTFIX) || defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX_CURRENT)
|
||||
WITH_SENDMAIL_BASE= yes
|
||||
PKGMESSAGE= ${PKGDIR}/pkg-message.postfix
|
||||
|
||||
|
|
@ -46,16 +45,16 @@ MAN5= dkim-filter.conf.5
|
|||
MAN8= dkim-filter.8 dkim-genkey.8 dkim-testkey.8 dkim-testssp.8
|
||||
PLIST_FILES= etc/mail/dkim-filter.conf.sample include/dkim.h \
|
||||
bin/dkim-genkey %%STATS%%bin/dkim-stats bin/dkim-testkey \
|
||||
bin/dkim-testssp %%LIBDKIM%%lib/libdkim.a \
|
||||
bin/dkim-testssp %%ARLIB%%lib/libar.a %%LIBDKIM%%lib/libdkim.a \
|
||||
%%LIBDKIMSHARED%%lib/libdkim.so %%LIBDKIMSHARED%%lib/libdkim.so.0 \
|
||||
libexec/dkim-filter
|
||||
PLIST_DIRS= etc/mail
|
||||
PORTDOCS= FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
|
||||
autorespond.csh \
|
||||
draft-hoffman-dac-vbr-05.txt draft-ietf-dkim-deployment-03.txt \
|
||||
draft-ietf-dkim-overview-10.txt draft-ietf-dkim-ssp-09.txt \
|
||||
draft-kucherawy-dkim-reporting-04.txt draft-kucherawy-sender-auth-header-20.txt \
|
||||
draft-shafranovich-feedback-report-06.txt rfc4686.txt rfc4871.txt rfc5016.txt
|
||||
draft-ietf-dkim-deployment-04.txt draft-ietf-dkim-overview-12.txt \
|
||||
draft-ietf-dkim-rfc4871-errata-05.txt draft-ietf-dkim-ssp-10.txt \
|
||||
draft-kucherawy-dkim-reporting-04.txt draft-shafranovich-feedback-report-07.txt \
|
||||
rfc4686.txt rfc4871.txt rfc5016.txt rfc5451.txt rfc5518.txt
|
||||
.if !defined(NOPORTDOCS)
|
||||
LIBDOCS= ${DOCSDIR_REL}/libdkim/index.html \
|
||||
${DOCSDIR_REL}/libdkim/overview.html \
|
||||
|
|
@ -143,6 +142,15 @@ PLIST_DIRS+= ${DOCSDIR_REL}/libdkim
|
|||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !defined(WITHOUT_ARLIB) && !(defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND))
|
||||
WITH_ARLIB= yes
|
||||
.endif
|
||||
|
||||
.if ${OSVERSION} < 700000
|
||||
WITH_OPENSSL_PORT= yes
|
||||
.endif
|
||||
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
|
||||
|
||||
WITHOUT_MILTER_CFLAGS= yes
|
||||
WITHOUT_MILTER_LDFLAGS= yes
|
||||
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
|
||||
|
|
@ -163,29 +171,37 @@ SITE_SUB+= -e 's|%%STATIC%%|dnl |g'
|
|||
SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
|
||||
|
||||
.if defined(WITH_LIBDKIM_SHARED)
|
||||
PLIST_SUB+= LIBDKIM=""
|
||||
PLIST_SUB+= LIBDKIMSHARED=""
|
||||
SITE_SUB+= -e '\|bld_LIBDKIM_SHARED|s/^dnl //g'
|
||||
USE_LDCONFIG= yes
|
||||
.if defined(WITH_ARLIB)
|
||||
PLIST_SUB+= ARLIB=""
|
||||
.else
|
||||
PLIST_SUB+= ARLIB="@comment "
|
||||
.endif
|
||||
.else
|
||||
PLIST_SUB+= LIBDKIMSHARED="@comment "
|
||||
.endif
|
||||
.if defined(WITH_LIBDKIM_INSTALL)
|
||||
SITE_SUB+= -e '\|bld_LIBDKIM_INSTALL|s/^dnl //g'
|
||||
.if defined(WITH_LIBDKIM_SHARED)
|
||||
PLIST_SUB+= LIBDKIM="@comment "
|
||||
.else
|
||||
PLIST_SUB+= LIBDKIM=""
|
||||
.endif
|
||||
.if defined(WITH_ARLIB)
|
||||
PLIST_SUB+= ARLIB=""
|
||||
.else
|
||||
PLIST_SUB+= ARLIB="@comment "
|
||||
.endif
|
||||
.endif
|
||||
.if !defined(WITH_LIBDKIM_INSTALL) && !defined(WITH_LIBDKIM_SHARED)
|
||||
PLIST_SUB+= LIBDKIM="@comment "
|
||||
PLIST_SUB+= LIBDKIMSHARED="@comment "
|
||||
PLIST_SUB+= ARLIB="@comment "
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
SITE_SUB+= -e '\|confOPTIMIZE.*-g|s/^dnl //g'
|
||||
.endif
|
||||
.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
|
||||
.if defined(WITH_ARLIB)
|
||||
IGNORE= libar cannot be used simultaneously with unbound
|
||||
IGNORE= libar cannot be used simultaneously with libunbound
|
||||
.endif
|
||||
LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound
|
||||
SITE_SUB+= -e 's|%%UNBOUND%%||g' \
|
||||
|
|
@ -251,10 +267,6 @@ pre-fetch:
|
|||
@${ECHO_MSG} "SENDMAIL_MILTER_IN_BASE now deprecated,"
|
||||
@${ECHO_MSG} "please set WITH_SENDMAIL_BASE=yes instead"
|
||||
.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 required 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"
|
||||
|
|
@ -266,7 +278,6 @@ pre-fetch:
|
|||
@${ECHO_MSG} " WITH_LIBDKIM_INSTALL=yes Install libdkim library"
|
||||
@${ECHO_MSG} " WITH_UNBOUND=yes Link against libunbound"
|
||||
@${ECHO_MSG}
|
||||
@sleep 5
|
||||
|
||||
post-extract:
|
||||
@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
|
||||
|
|
@ -278,6 +289,11 @@ post-patch:
|
|||
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
|
||||
-e "s|\`-O'|\`${CFLAGS}'|g" \
|
||||
${WRKSRC}/devtools/OS/FreeBSD
|
||||
.if !defined(WITHOUT_ARLIB) && (defined(WITH_LIBDKIM_INSTALL) || defined(WITH_LIBDKIM_SHARED)) && !(defined(WITH_UNBOUND) || !defined(WITHOUT_UNBOUND))
|
||||
@${REINPLACE_CMD} -e 's|%%ARLIB%%||' ${WRKSRC}/libar/Makefile.m4
|
||||
.else
|
||||
@${REINPLACE_CMD} -e 's|%%ARLIB%%|dnl |' ${WRKSRC}/libar/Makefile.m4
|
||||
.endif
|
||||
@${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
|
||||
${SITE} > ${WCONF}/site.config.m4
|
||||
|
||||
|
|
|
|||
|
|
@ -56,6 +56,10 @@ SITE_SUB+= -e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||'
|
|||
SITE_SUB+= -e '/-D_FFR_SELECTOR_HEADER/s|^dnl ||'
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
|
||||
SITE_SUB+= -e '/-D_FFR_SENDER_HEADERS/s|^dnl ||'
|
||||
.endif
|
||||
|
||||
.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
|
||||
SITE_SUB+= -e '/-D_FFR_STATS/s|^dnl ||'
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
MD5 (dkim-milter-2.8.2.tar.gz) = 611149d67c6d9916b374e72f48918a17
|
||||
SHA256 (dkim-milter-2.8.2.tar.gz) = 456ccb4ffd34abcd61f2d0bc30c24681db5c08749758435741336dd3d7974f7b
|
||||
SIZE (dkim-milter-2.8.2.tar.gz) = 740258
|
||||
MD5 (dkim-milter-2.8.3.tar.gz) = d2043c269f1720cc095a9b4f163cf3df
|
||||
SHA256 (dkim-milter-2.8.3.tar.gz) = 222afc936b70b823289e8e327c06c2920a5f33df43f07024b5f931856406048f
|
||||
SIZE (dkim-milter-2.8.3.tar.gz) = 748415
|
||||
|
|
|
|||
31
mail/dkim-milter/files/patch-2_8_3_FFR
Normal file
31
mail/dkim-milter/files/patch-2_8_3_FFR
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
------------------------------------
|
||||
Index: ./FEATURES
|
||||
diff -u ./FEATURES:1.57 ./FEATURES:1.58
|
||||
--- ./FEATURES:1.57 Tue Dec 16 23:18:50 2008
|
||||
+++ ./FEATURES Mon Jun 1 23:31:57 2009
|
||||
@@ -75,6 +75,9 @@
|
||||
to use when signing based on the contents of an arbitrary
|
||||
header. (dkim-filter)
|
||||
|
||||
+SENDER_HEADERS Optional control over which headers are used by the filter
|
||||
+ to make the sign vs. verify decision. (dkim-filter)
|
||||
+
|
||||
STATS Optional generation of statistics about pass/fail sorted
|
||||
by domain and canonicalization. Requires Sleepycat DB.
|
||||
(dkim-filter, libdkim)
|
||||
|
||||
------------------------------------
|
||||
Index: ./site.config.m4.dist
|
||||
diff -u ./site.config.m4.dist:1.43 ./site.config.m4.dist:1.44
|
||||
--- ./site.config.m4.dist:1.43 Fri Feb 6 17:06:41 2009
|
||||
+++ ./site.config.m4.dist Mon Jun 1 23:31:57 2009
|
||||
@@ -167,6 +167,7 @@
|
||||
dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ')
|
||||
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
|
||||
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
|
||||
+dnl APPENDDEF(`confENVDEF', `-D_FFR_SENDER_HEADERS ')
|
||||
dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
|
||||
dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
|
||||
dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
|
||||
|
||||
------------------------------------
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
--- ./devtools/M4/UNIX/sharedlib.m4.orig 2006-09-06 07:56:53.000000000 +0900
|
||||
+++ ./devtools/M4/UNIX/sharedlib.m4 2008-01-20 07:37:08.000000000 +0900
|
||||
@@ -52,7 +52,7 @@
|
||||
@@ -55,8 +55,9 @@
|
||||
install-`'bldCURRENT_PRODUCT: ${SHAREDLIB}
|
||||
ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${SHAREDLIBDIR} ]; then confMKDIR -p ${DESTDIR}${SHAREDLIBDIR}; else :; fi ')
|
||||
${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}
|
||||
+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}
|
||||
ifelse(bldOS, `AIX', `${AR} ${AROPTS} ${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}', `rm -f ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}
|
||||
- ${LN} ${LNOPTS} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}')
|
||||
+ ${LN} ${LNOPTS} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}/${SHAREDLIB_LINK}')
|
||||
|
|
|
|||
10
mail/dkim-milter/files/patch-libar-Makefile.m4
Normal file
10
mail/dkim-milter/files/patch-libar-Makefile.m4
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
--- ./libar/Makefile.m4.orig 2009-04-27 05:59:32.000000000 +0900
|
||||
+++ ./libar/Makefile.m4 2009-04-27 05:59:57.000000000 +0900
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
bldPRODUCT_START(`library', `libar')
|
||||
define(`bldSOURCES', `ar.c manual.c ')
|
||||
+%%ARLIB%%define(`bldINSTALLABLE', `true')
|
||||
bldPRODUCT_END
|
||||
|
||||
bldPRODUCT_START(`manpage', `ar')
|
||||
Loading…
Reference in a new issue