Attachment 107592 Details for Bug 148397 – opendkim.diff

[patch] opendkim.diff

opendkim.diff (text/plain; charset=us-ascii), 11.09 KB, created by Sahil Tandon on 2010-07-08 02:51:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sahil Tandon

Created: 2010-07-08 02:51:43 UTC

Size: 11.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/mail/opendkim/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- Makefile	22 Dec 2009 11:36:22 -0000	1.3
>+++ Makefile	8 Jul 2010 01:39:41 -0000
>@@ -1,13 +1,12 @@
> # New ports collection makefile for:	opendkim
>-# Date created:		2009-08-26
>-# Whom:			Hirohisa Yamaguchi <umq@ueo.co.jp>
>+# Date created:				2009-08-26
>+# Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
> #
> # $FreeBSD: ports/mail/opendkim/Makefile,v 1.3 2009/12/22 11:36:22 miwi Exp $
> #
> 
> PORTNAME=	opendkim
>-PORTVERSION=	1.1.2
>-PORTREVISION=	1
>+PORTVERSION=	2.1.2
> CATEGORIES=	mail security
> MASTER_SITES=	SF/opendkim
> 
>@@ -19,16 +18,16 @@
> USE_RC_SUBR=	milter-opendkim
> USE_LDCONFIG=	yes
> 
>-MAN_COMPRESSED=	no
> MAN3=		ar.3
> MAN5=		opendkim.conf.5
>-MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
>-		opendkim-testkey.8 opendkim.8
>-PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
>-		README RELEASE_NOTES RELEASE_NOTES.Sendmail
>-PORTDOCS=	docs/*
>+MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
>+		opendkim-testadsp.8 opendkim-testkey.8 \
>+		opendkim.8
>+
> SUB_FILES=	pkg-message
> 
>+MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
>+
> .include <bsd.port.pre.mk>
> 
> WITHOUT_MILTER_CFLAGS=	yes
>@@ -48,14 +47,19 @@
> CONFIGURE_ARGS+=	--enable-debug
> .endif
> 
>+.if !defined(NOPORTDOCS)
>+PORTDOCS=	*
>+.else
>+CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
>+.endif
>+
> .if (defined(WITH_POPAUTH) \
> 	|| defined(WITH_QUERY_CACHE) \
> 	|| defined(WITH_BODYLENGTH_DB) \
> 	|| defined(WITH_STATS)) \
> 	&& !defined(WITH_BDB_BASE)
>-#BROKEN=		LIBDB_INCDIR nor LIBDB_LIBDIRS cannot be set individually
> CONFIGURE_ARGS+=	--with-db
>-USE_BDB=	41+
>+USE_BDB=		41+
> .endif
> .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
> BROKEN=		configure fails since arlib cannot be disabled
>@@ -64,7 +68,7 @@
> .endif
> CONFIGURE_ARGS+=	--with-unbound \
> 			--disable-arlib
>-LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
>+LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
> PLIST_SUB+=		ARLIB="@comment "
> .else
> .if !defined(WITHOUT_ARLIB)
>@@ -82,24 +86,12 @@
> CONFIGURE_ARGS+=	--enable-querycache
> .endif
> 
>-post-extract:
>-.for f in ${PORTDOCS0}
>-	@${CP} ${WRKSRC}/${f} ${WRKSRC}/docs/
>-.endfor
>-
> post-install:
> .if !defined(WITH_DEBUG)
> 	@${STRIP_CMD} ${PREFIX}/sbin/opendkim
> .endif
> 	@${MKDIR} ${PREFIX}/etc/mail
> 	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
>-.if !defined(NOPORTDOCS)
>-.for f in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>-.endfor
>-.else
>-	@${RM} -rf ${DOCSDIR}
>-.endif
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.post.mk>
>Index: Makefile.features
>===================================================================
>RCS file: /home/pcvs/ports/mail/opendkim/Makefile.features,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile.features
>--- Makefile.features	21 Sep 2009 12:25:21 -0000	1.1
>+++ Makefile.features	8 Jul 2010 01:39:41 -0000
>@@ -57,10 +57,6 @@
> CONFIGURE_ARGS+=	--enable-selectorheader
> .endif
> 
>-.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
>-CONFIGURE_ARGS+=	--enable-senderheaders
>-.endif
>-
> .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
> CONFIGURE_ARGS+=	--enable-stats
> MAN8+=			opendkim-stats.8
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/mail/opendkim/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	21 Nov 2009 14:42:46 -0000	1.2
>+++ distinfo	8 Jul 2010 01:39:41 -0000
>@@ -1,3 +1,3 @@
>-MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
>-SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
>-SIZE (opendkim-1.1.2.tar.gz) = 856455
>+MD5 (opendkim-2.1.2.tar.gz) = 7860684aaa3e17c9272081891a856092
>+SHA256 (opendkim-2.1.2.tar.gz) = 5f9e8c6447cfba022378e2cf54cfc82516319a745f01e457a6903c61a2295f93
>+SIZE (opendkim-2.1.2.tar.gz) = 1010010
>Index: pkg-descr
>===================================================================
>RCS file: /home/pcvs/ports/mail/opendkim/pkg-descr,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-descr
>--- pkg-descr	21 Sep 2009 12:25:21 -0000	1.1
>+++ pkg-descr	8 Jul 2010 01:39:41 -0000
>@@ -1,10 +1,12 @@
>-OpenDKIM is an open source implementation of the DKIM sender authentication
>-system proposed by the E-mail Signing Technology Group (ESTG), now a proposed
>-standard of the IETF (RFC4871).
>+OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified 
>+Mail) sender authentication system proposed by the E-mail Signing Technology 
>+Group (ESTG), now standardized by the IETF (RFC4871). It also includes 
>+implementations of the Author Domain Signing Practises (ADSP, RFC5617) and 
>+Vouch By Reference (VBR, RFC5518) proposed standards.
> 
> The OpenDKIM package consists of a library that implements the DKIM service
> and a milter-based filter application that can plug in to any milter-aware
> MTA to provide that service to sufficiently recent sendmail MTAs and other
> MTAs that support the milter protocol. 
> 
>-WWW:	http://opendkim.org/
>+WWW: http://opendkim.org/
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/mail/opendkim/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	21 Nov 2009 14:42:46 -0000	1.2
>+++ pkg-plist	8 Jul 2010 01:39:41 -0000
>@@ -10,119 +10,15 @@
> lib/libopendkim.a
> lib/libopendkim.la
> lib/libopendkim.so
>-lib/libopendkim.so.0
>+lib/libopendkim.so.2
>+libdata/pkgconfig/ar.pc
>+libdata/pkgconfig/opendkim.pc
> sbin/opendkim
> sbin/opendkim-genkey.sh
>+sbin/opendkim-genzone
> %%STATS%%sbin/opendkim-stats
> sbin/opendkim-testadsp
> sbin/opendkim-testkey
>-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>-%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
>-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
>-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.Sendmail
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
>-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.Sendmail
>-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-dkim-deployment-09.txt
>-%%PORTDOCS%%%%DOCSDIR%%/draft-kucherawy-dkim-reporting-06.txt
>-%%PORTDOCS%%%%DOCSDIR%%/draft-shafranovich-feedback-report-08.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc4686.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc4871.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc5016.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc5451.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc5518.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc5585.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc5617.txt
>-%%PORTDOCS%%%%DOCSDIR%%/rfc5672.txt
>-%%DATADIR%%/dkim.html
>-%%DATADIR%%/dkim_alg_t.html
>-%%DATADIR%%/dkim_body.html
>-%%DATADIR%%/dkim_canon_t.html
>-%%DATADIR%%/dkim_cbstat.html
>-%%DATADIR%%/dkim_chunk.html
>-%%DATADIR%%/dkim_close.html
>-%%DATADIR%%/dkim_diffheaders.html
>-%%DATADIR%%/dkim_dnssec.html
>-%%DATADIR%%/dkim_eoh.html
>-%%DATADIR%%/dkim_eom.html
>-%%DATADIR%%/dkim_flush_cache.html
>-%%DATADIR%%/dkim_free.html
>-%%DATADIR%%/dkim_get_user_context.html
>-%%DATADIR%%/dkim_getcachestats.html
>-%%DATADIR%%/dkim_getdomain.html
>-%%DATADIR%%/dkim_geterror.html
>-%%DATADIR%%/dkim_getmode.html
>-%%DATADIR%%/dkim_get_msgdate.html
>-%%DATADIR%%/dkim_getpartial.html
>-%%DATADIR%%/dkim_getpolicystr.html
>-%%DATADIR%%/dkim_getpresult.html
>-%%DATADIR%%/dkim_getpresultstr.html
>-%%DATADIR%%/dkim_get_reputation.html
>-%%DATADIR%%/dkim_getresultstr.html
>-%%DATADIR%%/dkim_getsighdr.html
>-%%DATADIR%%/dkim_getsiglist.html
>-%%DATADIR%%/dkim_getsignature.html
>-%%DATADIR%%/dkim_header.html
>-%%DATADIR%%/dkim_init.html
>-%%DATADIR%%/dkim_key_syntax.html
>-%%DATADIR%%/dkim_lib.html
>-%%DATADIR%%/dkim_minbody.html
>-%%DATADIR%%/dkim_ohdrs.html
>-%%DATADIR%%/dkim_options.html
>-%%DATADIR%%/dkim_param_t.html
>-%%DATADIR%%/dkim_policy.html
>-%%DATADIR%%/dkim_policy_getdnssec.html
>-%%DATADIR%%/dkim_policy_getreportinfo.html
>-%%DATADIR%%/dkim_policy_syntax.html
>-%%DATADIR%%/dkim_policy_t.html
>-%%DATADIR%%/dkim_presult.html
>-%%DATADIR%%/dkim_pstate.html
>-%%DATADIR%%/dkim_query_t.html
>-%%DATADIR%%/dkim_set_dns_callback.html
>-%%DATADIR%%/dkim_set_final.html
>-%%DATADIR%%/dkim_set_key_lookup.html
>-%%DATADIR%%/dkim_set_margin.html
>-%%DATADIR%%/dkim_set_policy_lookup.html
>-%%DATADIR%%/dkim_setpartial.html
>-%%DATADIR%%/dkim_set_prescreen.html
>-%%DATADIR%%/dkim_set_signature_handle.html
>-%%DATADIR%%/dkim_set_signature_handle_free.html
>-%%DATADIR%%/dkim_set_signature_tagvalues.html
>-%%DATADIR%%/dkim_set_signer.html
>-%%DATADIR%%/dkim_set_trust_anchor.html
>-%%DATADIR%%/dkim_set_user_context.html
>-%%DATADIR%%/dkim_sig_getbh.html
>-%%DATADIR%%/dkim_sig_getcanonlen.html
>-%%DATADIR%%/dkim_sig_getcanons.html
>-%%DATADIR%%/dkim_sig_getcontext.html
>-%%DATADIR%%/dkim_sig_getdnssec.html
>-%%DATADIR%%/dkim_sig_getdomain.html
>-%%DATADIR%%/dkim_sig_geterror.html
>-%%DATADIR%%/dkim_sig_geterrorstr.html
>-%%DATADIR%%/dkim_sig_getflags.html
>-%%DATADIR%%/dkim_sig_getidentity.html
>-%%DATADIR%%/dkim_sig_getkeysize.html
>-%%DATADIR%%/dkim_sig_getreportinfo.html
>-%%DATADIR%%/dkim_sig_getselector.html
>-%%DATADIR%%/dkim_sig_getsignalg.html
>-%%DATADIR%%/dkim_sig_getsigntime.html
>-%%DATADIR%%/dkim_sig_hdrsigned.html
>-%%DATADIR%%/dkim_sig_ignore.html
>-%%DATADIR%%/dkim_sig_process.html
>-%%DATADIR%%/dkim_sig_syntax.html
>-%%DATADIR%%/dkim_sigerror.html
>-%%DATADIR%%/dkim_siginfo.html
>-%%DATADIR%%/dkim_sigkey_t.html
>-%%DATADIR%%/dkim_sign.html
>-%%DATADIR%%/dkim_libfeature.html
>-%%DATADIR%%/dkim_ssl_version.html
>-%%DATADIR%%/dkim_stat.html
>-%%DATADIR%%/dkim_verify.html
>-%%DATADIR%%/index.html
>-%%DATADIR%%/overview.html
>-%%DATADIR%%/rfc2822_mailbox_split.html
>-@dirrm %%DATADIR%%
> @dirrm include/opendkim
> @dirrm include/ar
> @dirrmtry etc/mail
>Index: files/patch-FEATURES
>===================================================================
>RCS file: files/patch-FEATURES
>diff -N files/patch-FEATURES
>--- files/patch-FEATURES	21 Sep 2009 12:25:21 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,12 +0,0 @@
>---- ./FEATURES.orig	2009-08-04 06:31:48.000000000 +0900
>-+++ ./FEATURES	2009-08-27 20:35:42.000000000 +0900
>-@@ -74,6 +74,9 @@
>- 		to use when signing based on the contents of an arbitrary
>- 		header.  (opendkim)
>- 
>-+senderheaders	Optional control over which headers are used by the filter
>-+		to make the sign vs. verify decision.  (opendkim)
>-+
>- stats		Optional generation of statistics about pass/fail sorted
>- 		by domain and canonicalization.  Requires Sleepycat DB.
>- 		(opendkim, libopendkim)
>Index: files/patch-opendkim__Makefile.in
>===================================================================
>RCS file: files/patch-opendkim__Makefile.in
>diff -N files/patch-opendkim__Makefile.in
>--- files/patch-opendkim__Makefile.in	21 Sep 2009 12:25:21 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- ./opendkim/Makefile.in.orig	2009-08-15 01:44:49.000000000 +0900
>-+++ ./opendkim/Makefile.in	2009-08-27 20:36:49.000000000 +0900
>-@@ -327,7 +327,7 @@
>- AM_LDFLAGS = -pthread
>- sbin_SCRIPTS = opendkim-genkey.sh
>- exampledir = $(datarootdir)/doc/@PACKAGE@
>--example_DATA = opendkim.conf.sample
>-+example_DATA = 
>- @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h config.c config.h stats.c stats.h test.c test.h util.c util.h
>- @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(am__append_2) $(am__append_6) \
>- @BUILD_FILTER_TRUE@	$(am__append_7) $(am__append_8) \

Actions: View | Diff

Attachments on bug 148397: 107592