Attachment 119594 Details for Bug 162177 – patch.txt

patch.txt

patch.txt (text/plain), 3.14 KB, created by Michele Mazzucchi on 2011-10-30 23:55:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michele Mazzucchi

Created: 2011-10-30 23:55:59 UTC

Size: 3.14 KB

patch

obsolete

>diff -ruN opendkim-orig/Makefile opendkim/Makefile
>--- opendkim-orig/Makefile	2011-07-02 13:55:27.000000000 +0200
>+++ opendkim/Makefile	2011-10-30 23:57:45.118832722 +0100
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	opendkim
> PORTVERSION=	2.4.1
>+PORTREVISION=	1
> CATEGORIES=	mail security
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -25,18 +26,13 @@
> 
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
>-USE_RC_SUBR=	milter-opendkim
> USE_LDCONFIG=	yes
> 
>-MAN5=		opendkim.conf.5
>-MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
>-		opendkim-testadsp.8 opendkim-testkey.8 \
>-		opendkim.8
>-
> SUB_FILES=	pkg-message
> 
>-OPTIONS= \
>+OPTIONS=	\
> 	ARLIB		"Asynchronous thread-safe DNS library"	On  \
>+	FILTER		"opendkim filter, requires libmilter/Sendmail"	On \
> 	GNUTLS		"Use GnuTLS instead of OpenSSL"		Off \
> 	LUA		"Describe filter policy with lua"	Off \
> 	MEMCACHED	"Use memcached as a data set"		Off \
>@@ -50,10 +46,23 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
>+USE_RC_SUBR=	milter-opendkim
>+# man pages
>+MAN5+=		opendkim.conf.5
>+MAN8+=		opendkim-genkey.8 opendkim-genzone.8 \
>+		opendkim-testadsp.8 opendkim-testkey.8 \
>+		opendkim.8
>+# installed opendkim* binaries
>+PLIST_SUB+=		FILTER=""
>+# milter options
> WITHOUT_MILTER_CFLAGS=	yes
> WITHOUT_MILTER_LDFLAGS=	yes
> .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
> CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
>+.else
>+PLIST_SUB+=		FILTER="@comment "
>+.endif
> 
> .if defined(WITH_GNUTLS)
> LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
>diff -ruN opendkim-orig/Makefile.features opendkim/Makefile.features
>--- opendkim-orig/Makefile.features	2011-07-02 13:55:27.000000000 +0200
>+++ opendkim/Makefile.features	2011-10-30 21:52:29.000000000 +0100
>@@ -11,6 +11,10 @@
> CONFIGURE_ARGS+=	--enable-adsp_lists
> .endif
> 
>+.if !defined(WITH_FILTER) && defined(WITHOUT_FILTER)
>+CONFIGURE_ARGS+=    --disable-filter
>+.endif
>+
> .if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
> CONFIGURE_ARGS+=	--enable-allsymbols
> .endif
>Files opendkim-orig/opendkim-2.4.1.tbz and opendkim/opendkim-2.4.1.tbz differ
>Files opendkim-orig/opendkim-2.4.1_1.tbz and opendkim/opendkim-2.4.1_1.tbz differ
>diff -ruN opendkim-orig/pkg-plist opendkim/pkg-plist
>--- opendkim-orig/pkg-plist	2011-07-02 13:55:27.000000000 +0200
>+++ opendkim/pkg-plist	2011-10-30 23:44:23.878792592 +0100
>@@ -1,11 +1,11 @@
> @comment $FreeBSD: ports/mail/opendkim/pkg-plist,v 1.6 2011/07/02 11:55:27 swills Exp $
> %%LUA%%bin/miltertest
>-bin/opendkim-genkey
>-bin/opendkim-genzone
>-%%STATS%%bin/opendkim-stats
>-bin/opendkim-testadsp
>-bin/opendkim-testkey
>-etc/mail/opendkim.conf.sample
>+%%FILTER%%bin/opendkim-genkey
>+%%FILTER%%bin/opendkim-genzone
>+%%FILTER%%%%STATS%%bin/opendkim-stats
>+%%FILTER%%bin/opendkim-testadsp
>+%%FILTER%%bin/opendkim-testkey
>+%%FILTER%%etc/mail/opendkim.conf.sample
> %%ARLIB%%include/ar/ar.h
> include/opendkim/dkim.h
> %%ARLIB%%lib/libar.a
>@@ -18,7 +18,7 @@
> lib/libopendkim.so.5
> %%ARLIB%%libdata/pkgconfig/ar.pc
> libdata/pkgconfig/opendkim.pc
>-sbin/opendkim
>+%%FILTER%%sbin/opendkim
> @dirrm include/opendkim
> %%ARLIB%%@dirrm include/ar
> @dirrmtry etc/mail

Actions: View

Attachments on bug 162177: 119593 | 119594