Attachment 122403 Details for Bug 165601 – file.diff

[patch] file.diff

file.diff (text/plain), 3.65 KB, created by Hirohisa Yamaguchi on 2012-03-02 00:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2012-03-02 00:10:12 UTC

Size: 3.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/Makefile,v
>retrieving revision 1.12
>diff -p -u -r1.12 Makefile
>--- Makefile	1 Mar 2012 17:38:23 -0000	1.12
>+++ Makefile	1 Mar 2012 23:45:31 -0000
>@@ -5,25 +5,27 @@
> # $FreeBSD: ports/mail/opendkim/Makefile,v 1.12 2012/03/01 17:38:23 scheidell Exp $
> #
> 
>-PORTNAME=	opendkim
>-PORTVERSION=	2.5.0
>-CATEGORIES=	mail security
>-MASTER_SITES=	SF
>+PORTNAME=		opendkim
>+PORTVERSION=		2.5.0.1
>+CATEGORIES=		mail security
>+MASTER_SITES=		SF
> MASTER_SITE_SUBDIR=	${PORTNAME} \
> 			${PORTNAME}/Previous%20Releases
> 
>-MAINTAINER=	umq@ueo.co.jp
>-COMMENT=	DKIM library and milter implementation
>+MAINTAINER=		umq@ueo.co.jp
>+COMMENT=		DKIM library and milter implementation
> 
>-LICENSE=	BSD SENDMAIL
>-LICENSE_COMB=	multi
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>+LICENSE=		BSD SENDMAIL
>+LICENSE_COMB=		multi
>+LICENSE_FILE=		${WRKSRC}/LICENSE
> 
> LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
> LICENSE_GROUPS_SENDMAIL=	FSF OSI
> LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
> LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1$$//}
>+
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
> USE_LDCONFIG=	yes
>@@ -48,9 +50,9 @@ 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
>+USE_RC_SUBR=		milter-opendkim
>+MAN5+=			opendkim.conf.5
>+MAN8+=			opendkim.8
> PLIST_SUB+=		FILTER=""
> SUB_FILES=		pkg-message
> WITHOUT_MILTER_CFLAGS=	yes
>@@ -63,7 +65,7 @@ PLIST_SUB+=		FILTER="@comment "
> .endif
> 
> .if defined(WITH_GNUTLS)
>-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
>+LIB_DEPENDS+=		gnutls.47:${PORTSDIR}/security/gnutls
> CONFIGURE_ARGS+=	--with-gnutls=${LOCALBASE}
> .else
> CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/mail/opendkim/distinfo,v
>retrieving revision 1.9
>diff -p -u -r1.9 distinfo
>--- distinfo	1 Mar 2012 17:38:23 -0000	1.9
>+++ distinfo	1 Mar 2012 23:45:31 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (opendkim-2.5.0.tar.gz) = 5c17a5c82936495b35bc12b32438ebd7b7a624e3389fcac672f7d2ec5bdc8981
>-SIZE (opendkim-2.5.0.tar.gz) = 1465356
>+SHA256 (opendkim-2.5.0.1.tar.gz) = a1423fbd7b28fddee3cc51ffe550393cca44c32ac049c867ff86e984b787eeb6
>+SIZE (opendkim-2.5.0.1.tar.gz) = 1465386
>Index: files/patch-libopendkim_tests_t-test75.c
>===================================================================
>RCS file: files/patch-libopendkim_tests_t-test75.c
>diff -N files/patch-libopendkim_tests_t-test75.c
>--- files/patch-libopendkim_tests_t-test75.c	1 Mar 2012 17:38:24 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>---- ./libopendkim/tests/t-test75.c.orig	2012-03-01 08:52:30.000000000 +0900
>-+++ ./libopendkim/tests/t-test75.c	2012-03-01 15:50:21.000000000 +0900
>-@@ -52,6 +52,14 @@
>- 	dkim_query_t qtype = DKIM_QUERY_FILE;
>- 	unsigned char hdr[MAXHEADER + 1];
>- 
>-+#ifdef USE_GNUTLS
>-+	(void) gnutls_global_init();
>-+#endif /* USE_GNUTLS */
>-+
>-+	/* instantiate the library */
>-+	lib = dkim_init(NULL, NULL);
>-+	assert(lib != NULL);
>-+
>- 	if (!dkim_libfeature(lib, DKIM_FEATURE_PARSE_TIME))
>- 	{
>- 		printf("*** Date: value extraction SKIPPED\n");
>-@@ -62,14 +70,6 @@
>- 		printf("*** Date: value extraction\n");
>- 	}
>- 
>--#ifdef USE_GNUTLS
>--	(void) gnutls_global_init();
>--#endif /* USE_GNUTLS */
>--
>--	/* instantiate the library */
>--	lib = dkim_init(NULL, NULL);
>--	assert(lib != NULL);
>--
>- #ifdef TEST_KEEP_FILES
>- 	/* set flags */
>- 	flags = (DKIM_LIBFLAGS_TMPFILES|DKIM_LIBFLAGS_KEEPFILES);

Actions: View | Diff

Attachments on bug 165601: 122403