View | Details | Raw Unified | Return to bug 176462 | Differences between
and this patch

Collapse All | Expand All

(-)mail/opendkim/Makefile.options (-1 / +2 lines)
Lines 11-17 Link Here
11
OPTIONS_GROUP+=		FFR
11
OPTIONS_GROUP+=		FFR
12
OPTIONS_GROUP_FFR=	ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \
12
OPTIONS_GROUP_FFR=	ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \
13
			DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \
13
			DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \
14
			DKIM_REPUTATION ERLANG IDENTITY_HEADER \
14
			DKIM_REPUTATION ERLANG IDENTITY_HEADER LCOV \
15
			LDAP_CACHING POSTGRES_RECONNECT_HACK \
15
			LDAP_CACHING POSTGRES_RECONNECT_HACK \
16
			RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \
16
			RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \
17
			REPUTATION RESIGN SENDER_MACRO SOCKETDB \
17
			REPUTATION RESIGN SENDER_MACRO SOCKETDB \
Lines 27-32 Link Here
27
DKIM_REPUTATION_DESC=		DKIM reputation check (experimental)
27
DKIM_REPUTATION_DESC=		DKIM reputation check (experimental)
28
ERLANG_DESC=			Support for Erlang datasets
28
ERLANG_DESC=			Support for Erlang datasets
29
IDENTITY_HEADER_DESC=		Special header to set identity
29
IDENTITY_HEADER_DESC=		Special header to set identity
30
LCOV_DESC=			Profiling with LCOV
30
LDAP_CACHING_DESC=		LDAP query piggybacking and caching
31
LDAP_CACHING_DESC=		LDAP query piggybacking and caching
31
POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
32
POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
32
RATE_LIMIT_DESC=		DKIM based rate limiting support
33
RATE_LIMIT_DESC=		DKIM based rate limiting support
(-)mail/opendkim/Makefile.features (-1 / +10 lines)
Lines 60-65 Link Here
60
CONFIGURE_ARGS+=	--enable-identity_header
60
CONFIGURE_ARGS+=	--enable-identity_header
61
.endif
61
.endif
62
62
63
.if ${PORT_OPTIONS:MLCOV}
64
BROKEN=			Does not install
65
BUILD_DEPENDS+=		lcov:${PORTSDIR}/devel/lcov \
66
			${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
67
CONFIGURE_ARGS+=	--with-lcov
68
.else
69
CONFIGURE_ARGS+=	--without-lcov
70
.endif
71
63
.if ${PORT_OPTIONS:MLDAP_CACHING}
72
.if ${PORT_OPTIONS:MLDAP_CACHING}
64
WITH_OPENLDAP=		yes
73
WITH_OPENLDAP=		yes
65
CONFIGURE_ARGS+=	--enable-ldap_caching
74
CONFIGURE_ARGS+=	--enable-ldap_caching
Lines 94-100 Link Here
94
CONFIGURE_ARGS+=	--enable-reprrd
103
CONFIGURE_ARGS+=	--enable-reprrd
95
MAN8+=			opendkim-reprrdimport.8
104
MAN8+=			opendkim-reprrdimport.8
96
PLIST_SUB+=		REPRRD=""
105
PLIST_SUB+=		REPRRD=""
97
BUILD_DEPENDS=		rrdtool>=0:${PORTSDIR}/databases/rrdtool
106
BUILD_DEPENDS+=		rrdtool>=0:${PORTSDIR}/databases/rrdtool
98
.else
107
.else
99
CONFIGURE_ARGS+=	--disable-reprrd
108
CONFIGURE_ARGS+=	--disable-reprrd
100
PLIST_SUB+=		REPRRD="@comment "
109
PLIST_SUB+=		REPRRD="@comment "
(-)mail/opendkim/pkg-plist (-1 / +1 lines)
Lines 18-24 Link Here
18
lib/libopendkim.a
18
lib/libopendkim.a
19
lib/libopendkim.la
19
lib/libopendkim.la
20
lib/libopendkim.so
20
lib/libopendkim.so
21
lib/libopendkim.so.8
21
lib/libopendkim.so.9
22
%%RBL%%lib/librbl.a
22
%%RBL%%lib/librbl.a
23
%%RBL%%lib/librbl.la
23
%%RBL%%lib/librbl.la
24
%%RBL%%lib/librbl.so
24
%%RBL%%lib/librbl.so
(-)mail/opendkim/Makefile (-3 / +13 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=		opendkim
4
PORTNAME=		opendkim
5
PORTVERSION=		2.7.4
5
PORTVERSION=		2.8.0
6
PORTREVISION=		1
7
CATEGORIES=		mail security
6
CATEGORIES=		mail security
8
MASTER_SITES=		SF
7
MASTER_SITES=		SF
9
MASTER_SITE_SUBDIR=	${PORTNAME} \
8
MASTER_SITE_SUBDIR=	${PORTNAME} \
Lines 109-115 Link Here
109
CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
108
CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
110
			--with-db-libdir=${BDB_LIB_DIR} \
109
			--with-db-libdir=${BDB_LIB_DIR} \
111
			--with-db-lib=${BDB_LIB_NAME}
110
			--with-db-lib=${BDB_LIB_NAME}
112
USE_BDB=		41+
111
USE_BDB=		40+
113
. endif
112
. endif
114
.endif
113
.endif
115
.if ${PORT_OPTIONS:MUNBOUND}
114
.if ${PORT_OPTIONS:MUNBOUND}
Lines 155-160 Link Here
155
PLIST_SUB+=		LUA="@comment "
154
PLIST_SUB+=		LUA="@comment "
156
.endif
155
.endif
157
156
157
pre-configure:
158
	${REINPLACE_CMD} -e '/PKG_CONFIG/s/lua5/lua-5/' \
159
	${WRKSRC}/configure
160
161
post-patch:
162
.if ${PORT_OPTIONS:MLCOV}
163
	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/
164
	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/opendkim/tests/
165
	${FIND} ${WRKSRC} -type f -name \*-helper.sh -exec ${CHMOD} 755 {} +
166
.endif
167
158
post-install:
168
post-install:
159
.if ! ${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER}
169
.if ! ${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER}
160
	@${STRIP_CMD} ${PREFIX}/sbin/opendkim
170
	@${STRIP_CMD} ${PREFIX}/sbin/opendkim
(-)mail/opendkim/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (opendkim-2.7.4.tar.gz) = fa66f7ca52dd3fa94cd869e8fe9e8f849ab83d6a32a8d4ed3cf18b06b4584e76
1
SHA256 (opendkim-2.8.0.tar.gz) = a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c
2
SIZE (opendkim-2.7.4.tar.gz) = 1158496
2
SIZE (opendkim-2.8.0.tar.gz) = 1175377
(-)mail/opendkim/files/patch-libopendkim__tests__Makefile.in (+41 lines)
Line 0 Link Here
1
--- ./libopendkim/tests/Makefile.in.orig	2013-02-26 06:06:04.000000000 +0900
2
+++ ./libopendkim/tests/Makefile.in	2013-02-26 19:58:50.000000000 +0900
3
@@ -1049,8 +1049,10 @@
4
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5
     END { for (dir in files) print dir, files[dir] }'
6
 am__base_list = \
7
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
9
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\
10
+/ /g' | \
11
+  sed '$$!N;$$!N;$$!N;$$!N;s/\
12
+/ /g'
13
 am__uninstall_files_from_dir = { \
14
   test -z "$$files" \
15
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
16
@@ -2782,16 +2784,19 @@
17
 @LCOV_TRUE@description.txt: $(check_PROGRAMS) $(check_SCRIPTS)
18
 @LCOV_TRUE@	rm -f $@
19
 @LCOV_TRUE@	for i in $(check_PROGRAMS); do \
20
-@LCOV_TRUE@		testname=$${i/t-}; \
21
-@LCOV_TRUE@		testname=$${testname//-/_}; \
22
+@LCOV_TRUE@		testname=$${i#t-}; \
23
+@LCOV_TRUE@		testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
24
 @LCOV_TRUE@		fgrep '***' $$i.c | tail -n 1 | \
25
-@LCOV_TRUE@		(echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\n.*/\t\1\n/g' ) >> $@; \
26
+@LCOV_TRUE@		(echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\
27
+@LCOV_TRUE@.*/	\1\
28
+@LCOV_TRUE@/g' ) >> $@; \
29
 @LCOV_TRUE@	done
30
 @LCOV_TRUE@	for i in $(check_SCRIPTS); do \
31
-@LCOV_TRUE@		testname=$${i/t-}; \
32
-@LCOV_TRUE@		testname=$${testname//-/_}; \
33
+@LCOV_TRUE@		testname=$${i#t-}; \
34
+@LCOV_TRUE@		testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
35
 @LCOV_TRUE@		grep '^#' $$i | tail -n 1 | \
36
-@LCOV_TRUE@		(echo $${testname} ; sed -e 's/^# \(.*\)/\t\1\n/g' ) >> $@; \
37
+@LCOV_TRUE@		(echo $${testname} ; sed -e 's/^# \(.*\)/	\1\
38
+@LCOV_TRUE@/g' ) >> $@; \
39
 @LCOV_TRUE@	done
40
 
41
 @LCOV_TRUE@description.html: description.txt
(-)mail/opendkim/files/patch-libopendkim__dkim-cache.c (+18 lines)
Line 0 Link Here
1
diff --git a/libopendkim/dkim-cache.c b/libopendkim/dkim-cache.c
2
index 1bb10e8..3a0d6c5 100644
3
--- ./libopendkim/dkim-cache.c
4
+++ ./libopendkim/dkim-cache.c
5
@@ -508,7 +508,13 @@ dkim_cache_stats(DB *db, u_int *queries, u_int *hits, u_int *expired,
6
 #if DB_VERSION_CHECK(2,0,0)
7
 		DB_HASH_STAT *sp;
8
 
9
+# if DB_VERSION_CHECK(4,3,0)
10
 		if (db->stat(db, NULL, (void *) &sp, 0) != 0)
11
+# elif DB_VERSION_CHECK(4,0,0)
12
+		if (db->stat(db, (void *) &sp, 0) != 0)
13
+# else /* DB_VERSION_CHECK(4,0,0) */
14
+		if (db->stat(db, (void *) &sp, NULL, 0) != 0)
15
+# endif /* DB_VERSION_CHECK(4,0,0) */
16
 		{
17
 			*keys = (u_int) -1;
18
 		}
(-)mail/opendkim/files/patch-opendkim__tests__Makefile.in (+36 lines)
Line 0 Link Here
1
--- ./opendkim/tests/Makefile.in.orig	2013-02-26 06:06:06.000000000 +0900
2
+++ ./opendkim/tests/Makefile.in	2013-02-26 19:58:50.000000000 +0900
3
@@ -98,8 +98,10 @@
4
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5
     END { for (dir in files) print dir, files[dir] }'
6
 am__base_list = \
7
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
9
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\
10
+/ /g' | \
11
+  sed '$$!N;$$!N;$$!N;$$!N;s/\
12
+/ /g'
13
 am__uninstall_files_from_dir = { \
14
   test -z "$$files" \
15
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
16
@@ -778,14 +780,16 @@
17
 @LCOV_TRUE@description.txt: $(check_SCRIPTS)
18
 @LCOV_TRUE@	rm -f $@
19
 @LCOV_TRUE@	for test in $? ; do \
20
-@LCOV_TRUE@		testname=$${test/t-}; \
21
-@LCOV_TRUE@		testname=$${testname//-/_}; \
22
+@LCOV_TRUE@		testname=$${test#t-}; \
23
+@LCOV_TRUE@		testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
24
 @LCOV_TRUE@		grep ^# $$test | tail -n 1 | \
25
-@LCOV_TRUE@			sed -e "s/^#\(.*\)/$${testname}\n\t\1\n/g" >> $@; \
26
+@LCOV_TRUE@			sed -e "s/^#\(.*\)/$${testname}\
27
+@LCOV_TRUE@	\1\
28
+@LCOV_TRUE@/g" >> $@; \
29
 @LCOV_TRUE@	done
30
 
31
 @LCOV_TRUE@description.html: description.txt
32
-@LCOV_TRUE@	gendesc --output $@ $<
33
+@LCOV_TRUE@	gendesc --output $@ $?
34
 
35
 @LCOV_TRUE@maintainer-clean-local:
36
 @LCOV_TRUE@	-rm -rf lcov/[^C]*
(-)mail/opendkim/files/patch-libopendkim__tests__t-test49.c (+26 lines)
Line 0 Link Here
1
diff --git a/libopendkim/tests/t-test49.c b/libopendkim/tests/t-test49.c
2
index e54cb37..318ad8a 100644
3
--- ./libopendkim/tests/t-test49.c
4
+++ ./libopendkim/tests/t-test49.c
5
@@ -53,7 +53,7 @@ main(int argc, char **argv)
6
 
7
 	int status;
8
 	int err;
9
-	u_int s1, s2, s3;
10
+	u_int s1, s2, s3, s4;
11
 	size_t buflen;
12
 	DB *cache;
13
 	char buf[BUFRSZ + 1];
14
@@ -99,10 +99,11 @@ main(int argc, char **argv)
15
 	assert(status == 1);
16
 
17
 	printf("--- retrieve cache stats\n");
18
-	dkim_cache_stats(&s1, &s2, &s3);
19
+	dkim_cache_stats(cache, &s1, &s2, &s3, &s4, FALSE);
20
 	assert(s1 == 3);
21
 	assert(s2 == 1);
22
 	assert(s3 == 1);
23
+	assert(s4 == 0);
24
 
25
 	dkim_cache_close(cache);
26
 #endif /* ! QUERY_CACHE */
(-)mail/opendkim/files/lcov-helper.sh (+9 lines)
Line 0 Link Here
1
#! /bin/sh
2
$1
3
x=$?
4
# keep consistant with Makefile.am
5
testname=${1#./t-}
6
testname=$(echo ${testname} | sed -e 's/-/_/g')
7
lcov --capture --directory .. --output-file $1.info --test-name ${testname} --quiet
8
lcov --remove $1.info '/usr/include/*' --output-file $1.info --quiet &
9
exit $x

Return to bug 176462