Attachment #129620 for bug #173635




--- ./libopendkim/dkim.c.orig	2012-10-19 05:22:16.000000000 +0900
+++ ./libopendkim/dkim.c	2012-10-20 15:52:54.000000000 +0900
@@ -938,7 +938,7 @@
 			dkim_dstring_cat(dkim->dkim_sslerrbuf, "; ");
 
 		dkim_dstring_cat(dkim->dkim_sslerrbuf,
-		                 gnutls_strerror(status));
+		                 (u_char *) gnutls_strerror(status));
 	}
 
 #else /* USE_GNUTLS */
@@ -1004,7 +1004,7 @@
 			dkim_dstring_cat(sig->sig_sslerrbuf, "; ");
 
 		dkim_dstring_cat(sig->sig_sslerrbuf,
-		                 gnutls_strerror(status));
+		                 (u_char *) gnutls_strerror(status));
 	}
 
 #else /* USE_GNUTLS */




--- ./Makefile.in.orig	2012-10-31 03:14:49.000000000 +0900
+++ ./Makefile.in	2012-11-12 16:39:23.000000000 +0900
@@ -61,7 +61,6 @@
 @STATS_TRUE@am__append_6 = stats
 @REPUTE_TRUE@am__append_7 = libut reputation
 @REPRRD_TRUE@am__append_8 = reprrd
-@JANSSON_TRUE@am__append_9 = autobuild
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -139,8 +138,7 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = libstrl libopendkim contrib docs libvbr librbl \
-	libdkimrep miltertest stats libut reputation reprrd autobuild \
-	opendkim
+	libdkimrep miltertest stats libut reputation reprrd opendkim
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -419,7 +417,7 @@
 SUBDIRS = $(am__append_1) libopendkim contrib docs $(am__append_2) \
 	$(am__append_3) $(am__append_4) $(am__append_5) \
 	$(am__append_6) $(am__append_7) $(am__append_8) \
-	$(am__append_9) opendkim
+	opendkim
 dist_doc_DATA = FEATURES KNOWNBUGS LICENSE LICENSE.Sendmail \
 	RELEASE_NOTES.Sendmail
 

Lines 4-9 Link Here

(-)mail/opendkim/Makefile.features (-1 / +10 lines)
4	# This file is used to tune build time options.	4	# This file is used to tune build time options.
5	# Please refer FEATURES file distributed with the source for details.	5	# Please refer FEATURES file distributed with the source for details.
6		6
		7	.if ${PORT_OPTIONS:MFFR}
		8
7	.if ${PORT_OPTIONS:MADSP_LISTS}	9	.if ${PORT_OPTIONS:MADSP_LISTS}
8	CONFIGURE_ARGS+= --enable-adsp_lists	10	CONFIGURE_ARGS+= --enable-adsp_lists
9	.endif	11	.endif
Lines 75-80 Link Here
75	CONFIGURE_ARGS+= --enable-rbl	77	CONFIGURE_ARGS+= --enable-rbl
76	MAN3+= rbl.3	78	MAN3+= rbl.3
77	PLIST_SUB+= RBL=""	79	PLIST_SUB+= RBL=""
		80	PORT_OPTIONS+= LUA
78	.else	81	.else
79	PLIST_SUB+= RBL="@comment "	82	PLIST_SUB+= RBL="@comment "
80	.endif	83	.endif
Lines 102-112 Link Here
102	--with-libcurl	105	--with-libcurl
103	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl	106	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
104	. if ${PORT_OPTIONS:MXML}	107	. if ${PORT_OPTIONS:MXML}
105	CONFIGURE_ARGS+= --with-libxml2	108	CONFIGURE_ARGS+= --without-libjansson --with-libxml2
106	LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2	109	LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
		110	PLIST_SUB+= JANSSON="@comment "
107	. else	111	. else
108	CONFIGURE_ARGS+= --with-libjansson	112	CONFIGURE_ARGS+= --with-libjansson
109	LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson	113	LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson
		114	MAN8+= autobuild.8
		115	PLIST_SUB+= JANSSON=
110	. endif	116	. endif
111	MAN3+= ut.3	117	MAN3+= ut.3
112	MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \	118	MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \
Lines 131-136 Link Here
131		137
132	.if ${PORT_OPTIONS:MSTATSEXT}	138	.if ${PORT_OPTIONS:MSTATSEXT}
133	CONFIGURE_ARGS+= --enable-statsext	139	CONFIGURE_ARGS+= --enable-statsext
		140	PORT_OPTIONS+= LUA STATS
134	.endif	141	.endif
135		142
136	.if ${PORT_OPTIONS:MVBR}	143	.if ${PORT_OPTIONS:MVBR}
Lines 140-142 Link Here
140	.else	147	.else
141	PLIST_SUB+= VBR="@comment "	148	PLIST_SUB+= VBR="@comment "
142	.endif	149	.endif
		150
		151	.endif # ${PORT_OPTIONS:MFFR}

Lines 1-4 Link Here

(-)mail/opendkim/pkg-plist (+1 lines)
1	@comment $FreeBSD$	1	@comment $FreeBSD$
		2	%%REPUTE%%%%JANSSON%%bin/autobuild
2	%%LUA%%bin/miltertest	3	%%LUA%%bin/miltertest
3	%%REPRRD%%bin/opendkim-reprrdimport	4	%%REPRRD%%bin/opendkim-reprrdimport
4	%%ODBX%%%%STATS%%bin/opendkim-spam	5	%%ODBX%%%%STATS%%bin/opendkim-spam




# $FreeBSD$

PORTNAME=		opendkim
PORTVERSION=		2.7.2
CATEGORIES=		mail security
MASTER_SITES=		SF
MASTER_SITE_SUBDIR=	${PORTNAME} \

CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
.endif

.if ${PORT_OPTIONS:MSTATS}
CONFIGURE_ARGS+=	--enable-stats
MAN8+=			opendkim-expire.8 opendkim-gengraphs.8 \
			opendkim-genstats.8 opendkim-stats.8

.endif
.if ${PORT_OPTIONS:MPOPAUTH} \
	|| ${PORT_OPTIONS:MQUERY_CACHE} \
	|| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MLDAP_CACHING} ) \
	|| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MREPUTATION} ) \
	|| ${PORT_OPTIONS:MSTATS}
. if ${PORT_OPTIONS:MBDB_BASE}
CONFIGURE_ARGS+=	--with-db-lib=c

.else
CONFIGURE_ARGS+=	--without-openldap
.endif
.if ${PORT_OPTIONS:MLUA}
CONFIGURE_ARGS+=	--with-lua
. if ${PORT_OPTIONS:MFILTER}
MAN3+=			opendkim-lua.3

Lines 1-2 Link Here

(-)mail/opendkim/distinfo (-2 / +2 lines)
1	SHA256 (opendkim-2.7.1.tar.gz) = 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed	1	SHA256 (opendkim-2.7.2.tar.gz) = cf72a26506ef48a2c6b231947226ab460cdb6e05b18176ee42a94b3b6d521b42
2	SIZE (opendkim-2.7.1.tar.gz) = 1153665	2	SIZE (opendkim-2.7.2.tar.gz) = 1156510

Return to bug 173635

Lines 1-20 Link Here

(-)mail/opendkim/files/patch-libopendkim__dkim.c (-20 lines)
1	--- ./libopendkim/dkim.c.orig 2012-10-19 05:22:16.000000000 +0900
2	+++ ./libopendkim/dkim.c 2012-10-20 15:52:54.000000000 +0900
3	@@ -938,7 +938,7 @@
4	dkim_dstring_cat(dkim->dkim_sslerrbuf, "; ");
5
6	dkim_dstring_cat(dkim->dkim_sslerrbuf,
7	- gnutls_strerror(status));
8	+ (u_char *) gnutls_strerror(status));
9	}
10
11	#else /* USE_GNUTLS */
12	@@ -1004,7 +1004,7 @@
13	dkim_dstring_cat(sig->sig_sslerrbuf, "; ");
14
15	dkim_dstring_cat(sig->sig_sslerrbuf,
16	- gnutls_strerror(status));
17	+ (u_char *) gnutls_strerror(status));
18	}
19
20	#else /* USE_GNUTLS */

Lines 1-29 Link Here

(-)mail/opendkim/files/patch-Makefile.in (-29 lines)
1	--- ./Makefile.in.orig 2012-10-31 03:14:49.000000000 +0900
2	+++ ./Makefile.in 2012-11-12 16:39:23.000000000 +0900
3	@@ -61,7 +61,6 @@
4	@STATS_TRUE@am__append_6 = stats
5	@REPUTE_TRUE@am__append_7 = libut reputation
6	@REPRRD_TRUE@am__append_8 = reprrd
7	-@JANSSON_TRUE@am__append_9 = autobuild
8	subdir = .
9	DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
10	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
11	@@ -139,8 +138,7 @@
12	CTAGS = ctags
13	CSCOPE = cscope
14	DIST_SUBDIRS = libstrl libopendkim contrib docs libvbr librbl \
15	- libdkimrep miltertest stats libut reputation reprrd autobuild \
16	- opendkim
17	+ libdkimrep miltertest stats libut reputation reprrd opendkim
18	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
19	distdir = $(PACKAGE)-$(VERSION)
20	top_distdir = $(distdir)
21	@@ -419,7 +417,7 @@
22	SUBDIRS = $(am__append_1) libopendkim contrib docs $(am__append_2) \
23	$(am__append_3) $(am__append_4) $(am__append_5) \
24	$(am__append_6) $(am__append_7) $(am__append_8) \
25	- $(am__append_9) opendkim
26	+ opendkim
27	dist_doc_DATA = FEATURES KNOWNBUGS LICENSE LICENSE.Sendmail \
28	RELEASE_NOTES.Sendmail
29

Lines 2-8 Link Here

(-)mail/opendkim/Makefile (-5 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= opendkim	4	PORTNAME= opendkim
5	PORTVERSION= 2.7.1	5	PORTVERSION= 2.7.2
6	CATEGORIES= mail security	6	CATEGORIES= mail security
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8	MASTER_SITE_SUBDIR= ${PORTNAME} \	8	MASTER_SITE_SUBDIR= ${PORTNAME} \
Lines 85-91 Link Here
85	CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc	85	CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
86	.endif	86	.endif
87		87
88	.if ${PORT_OPTIONS:MSTATS} \|\| ${PORT_OPTIONS:MSTATSEXT}	88	.if ${PORT_OPTIONS:MSTATS}
89	CONFIGURE_ARGS+= --enable-stats	89	CONFIGURE_ARGS+= --enable-stats
90	MAN8+= opendkim-expire.8 opendkim-gengraphs.8 \	90	MAN8+= opendkim-expire.8 opendkim-gengraphs.8 \
91	opendkim-genstats.8 opendkim-stats.8	91	opendkim-genstats.8 opendkim-stats.8
Lines 99-106 Link Here
99	.endif	99	.endif
100	.if ${PORT_OPTIONS:MPOPAUTH} \	100	.if ${PORT_OPTIONS:MPOPAUTH} \
101	\|\| ${PORT_OPTIONS:MQUERY_CACHE} \	101	\|\| ${PORT_OPTIONS:MQUERY_CACHE} \
102	\|\| ${PORT_OPTIONS:MLDAP_CACHING} \	102	\|\| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MLDAP_CACHING} ) \
103	\|\| ${PORT_OPTIONS:MREPUTATION} \	103	\|\| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MREPUTATION} ) \
104	\|\| ${PORT_OPTIONS:MSTATS}	104	\|\| ${PORT_OPTIONS:MSTATS}
105	. if ${PORT_OPTIONS:MBDB_BASE}	105	. if ${PORT_OPTIONS:MBDB_BASE}
106	CONFIGURE_ARGS+= --with-db-lib=c	106	CONFIGURE_ARGS+= --with-db-lib=c
Lines 142-148 Link Here
142	.else	142	.else
143	CONFIGURE_ARGS+= --without-openldap	143	CONFIGURE_ARGS+= --without-openldap
144	.endif	144	.endif
145	.if ${PORT_OPTIONS:MLUA} \|\| ${PORT_OPTIONS:MRBL} \|\| ${PORT_OPTIONS:MSTATSEXT}	145	.if ${PORT_OPTIONS:MLUA}
146	CONFIGURE_ARGS+= --with-lua	146	CONFIGURE_ARGS+= --with-lua
147	. if ${PORT_OPTIONS:MFILTER}	147	. if ${PORT_OPTIONS:MFILTER}
148	MAN3+= opendkim-lua.3	148	MAN3+= opendkim-lua.3