Attachment #85679 for bug #121945

View | Details | Raw Unified | Return to bug 121945
Collapse All | Expand All

Lines 13-20 Link Here

(-)ports/mail/dkim-milter/Makefile (-3 / +2 lines)
13	## base system, building this port may fail.	13	## base system, building this port may fail.
14		14
15	PORTNAME= dkim-milter	15	PORTNAME= dkim-milter
16	PORTVERSION= 2.5.0	16	PORTVERSION= 2.5.1
17	PORTREVISION= 1
18	CATEGORIES= mail	17	CATEGORIES= mail
19	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	18	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
20	MASTER_SITE_SUBDIR= ${PORTNAME}	19	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 54-60 PORTDOCS= FEATURES INSTALL KNOWNBUGS LIC Link Here
54	autorespond.csh \	53	autorespond.csh \
55	draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-01.txt \	54	draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-01.txt \
56	draft-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \	55	draft-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \
57	draft-kucherawy-sender-auth-header-12.txt \	56	draft-kucherawy-sender-auth-header-14.txt \
58	rfc4686.txt rfc4871.txt rfc5016.txt	57	rfc4686.txt rfc4871.txt rfc5016.txt
59	.if !defined(NOPORTDOCS)	58	.if !defined(NOPORTDOCS)
60	LIBDOCS= ${DOCSDIR_REL}/libdkim/index.html \	59	LIBDOCS= ${DOCSDIR_REL}/libdkim/index.html \

Lines 1-3 Link Here

(-)ports/mail/dkim-milter/distinfo (-3 / +3 lines)
1	MD5 (dkim-milter-2.5.0.tar.gz) = 4780f1e2efe02a28a36203dd5cee39b6	1	MD5 (dkim-milter-2.5.1.tar.gz) = 591ffca39c0dbdf07bd3491d0da89332
2	SHA256 (dkim-milter-2.5.0.tar.gz) = 9372bdfa34c14d2b957dbac275d6a00cb6ac321fda8803b8e86ca1c73ac14855	2	SHA256 (dkim-milter-2.5.1.tar.gz) = 5d0c193967b593568659bbcfc3305b6852ce9557d2864258942e597907f39303
3	SIZE (dkim-milter-2.5.0.tar.gz) = 639037	3	SIZE (dkim-milter-2.5.1.tar.gz) = 641272

Line 0 Link Here

(-)ports/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4 (+11 lines)
	1	--- ./dkim-filter/Makefile.m4.orig 2008-03-06 02:58:40.000000000 +0900
	2	+++ ./dkim-filter/Makefile.m4 2008-03-22 02:05:26.000000000 +0900
	3	@@ -12,7 +12,7 @@
	4	ifelse(index(confENVDEF, `-DQUERY_CACHE'), -1, `', `
	5	define(`confUSE_DB', `TRUE')
	6	')
	7	-ifelse(index(confENVDEF, `-DPOPAUTH'), -1, `', `
	8	+ifelse(index(conf_dkim_filter_ENVDEF, `-DPOPAUTH'), -1, `', `
	9	define(`confUSE_DB', `TRUE')
	10	')
	11	ifelse(index(confENVDEF, `-D_FFR_BODYLENGTH_DB'), -1, `', `




--- ./dkim-filter/dkim-db.c.orig	2008-03-05 02:41:25.000000000 +0900
+++ ./dkim-filter/dkim-db.c	2008-03-12 23:57:52.000000000 +0900
@@ -46,15 +46,22 @@
 	int flags = 0;
 #endif /* DB_VERSION_CHECK(2,0,0) */
 	int status = 0;
+	DBTYPE dbtype;
 
 	assert(db != NULL);
 	assert(file != NULL);
 
 #if DB_VERSION_CHECK(2,0,0)
 	if (ro)
+	{
 		flags |= DB_RDONLY;
+		dbtype = DB_UNKNOWN;
+	}
 	else
+	{
 		flags |= DB_CREATE;
+		dbtype = DB_BTREE;
+	}
 #endif /* DB_VERSION_CHECK(2,0,0) */
 
 #if DB_VERSION_CHECK(3,0,0)
@@ -62,21 +69,21 @@
 	if (status == 0)
 	{
 # if DB_VERSION_CHECK(4,1,25)
-		status = (*db)->open(*db, NULL, file, NULL, DB_UNKNOWN,
+		status = (*db)->open((*db), NULL, file, NULL, dbtype,
 		                     flags, 0);
 # else /* DB_VERSION_CHECK(4,1,25) */
-		status = (*db)->open(*db, file, NULL, DB_UNKNOWN,
-		                     flags, 0);
+		status = (*db)->open((*db), file, NULL, dbtype, flags, 0);
 # endif /* DB_VERSION_CHECK(4,1,25) */
 	}
 #elif DB_VERSION_CHECK(2,0,0)
-	status = db_open(file, DB_HASH, flags, DB_MODE, NULL, NULL, db);
+	status = db_open(file, dbtype, flags, DB_MODE, NULL, NULL, db);
 #else /* DB_VERSION_MAJOR < 2 */
 	*db = dbopen(file, (ro ? O_RDONLY :(O_CREAT|O_RDWR)), DB_MODE,
-	             DB_HASH, NULL);
+	             dbtype, NULL);
 	if (*db == NULL)
 		status = errno;
 #endif /* DB_VERSION_CHECK */
+
 	return status;
 }
 




--- ./dkim-filter/dkim-filter.c.orig	2008-03-06 04:29:36.000000000 +0900
+++ ./dkim-filter/dkim-filter.c	2008-03-12 23:57:52.000000000 +0900
@@ -2481,6 +2481,16 @@
 		if (status != DKIM_STAT_OK)
 			return FALSE;
 	}
+	else
+	{
+		status = dkim_options(conf->conf_libdkim, DKIM_OP_SETOPT,
+		                      DKIM_OPTS_SKIPHDRS,
+		                      (void *) should_not_signhdrs,
+		                      sizeof (u_char **));
+
+		if (status != DKIM_STAT_OK)
+			return FALSE;
+	}
 
 	if (conf->conf_signhdrs != NULL)
 	{
@@ -2494,8 +2504,8 @@
 	else
 	{
 		status = dkim_options(conf->conf_libdkim, DKIM_OP_SETOPT,
-		                      DKIM_OPTS_SKIPHDRS,
-		                      (void *) should_not_signhdrs,
+		                      DKIM_OPTS_SIGNHDRS,
+		                      (void *) should_signhdrs,
 		                      sizeof (u_char **));
 
 		if (status != DKIM_STAT_OK)
@@ -7447,6 +7457,9 @@
 	}
 #endif /* _FFR_BODYLENGTH_DB */
 
+	pthread_mutex_init(&popen_lock, NULL);
+	pthread_mutex_init(&conf_lock, NULL);
+
 	/* perform test mode */
 	if (testfile != NULL)
 	{
@@ -7456,9 +7469,6 @@
 		return status;
 	}
 
-	pthread_mutex_init(&popen_lock, NULL);
-	pthread_mutex_init(&conf_lock, NULL);
-
 	memset(argstr, '\0', sizeof argstr);
 	end = &argstr[sizeof argstr - 1];
 	n = sizeof argstr;

Return to bug 121945

Lines 1-52 Link Here

(-)ports/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c (-52 lines)
1	--- ./dkim-filter/dkim-db.c.orig 2008-03-05 02:41:25.000000000 +0900
2	+++ ./dkim-filter/dkim-db.c 2008-03-12 23:57:52.000000000 +0900
3	@@ -46,15 +46,22 @@
4	int flags = 0;
5	#endif /* DB_VERSION_CHECK(2,0,0) */
6	int status = 0;
7	+ DBTYPE dbtype;
8
9	assert(db != NULL);
10	assert(file != NULL);
11
12	#if DB_VERSION_CHECK(2,0,0)
13	if (ro)
14	+ {
15	flags \|= DB_RDONLY;
16	+ dbtype = DB_UNKNOWN;
17	+ }
18	else
19	+ {
20	flags \|= DB_CREATE;
21	+ dbtype = DB_BTREE;
22	+ }
23	#endif /* DB_VERSION_CHECK(2,0,0) */
24
25	#if DB_VERSION_CHECK(3,0,0)
26	@@ -62,21 +69,21 @@
27	if (status == 0)
28	{
29	# if DB_VERSION_CHECK(4,1,25)
30	- status = (db)->open(db, NULL, file, NULL, DB_UNKNOWN,
31	+ status = (db)->open((db), NULL, file, NULL, dbtype,
32	flags, 0);
33	# else /* DB_VERSION_CHECK(4,1,25) */
34	- status = (db)->open(db, file, NULL, DB_UNKNOWN,
35	- flags, 0);
36	+ status = (db)->open((db), file, NULL, dbtype, flags, 0);
37	# endif /* DB_VERSION_CHECK(4,1,25) */
38	}
39	#elif DB_VERSION_CHECK(2,0,0)
40	- status = db_open(file, DB_HASH, flags, DB_MODE, NULL, NULL, db);
41	+ status = db_open(file, dbtype, flags, DB_MODE, NULL, NULL, db);
42	#else /* DB_VERSION_MAJOR < 2 */
43	*db = dbopen(file, (ro ? O_RDONLY :(O_CREAT\|O_RDWR)), DB_MODE,
44	- DB_HASH, NULL);
45	+ dbtype, NULL);
46	if (*db == NULL)
47	status = errno;
48	#endif /* DB_VERSION_CHECK */
49	+
50	return status;
51	}
52

Lines 1-50 Link Here

(-)ports/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c (-50 lines)
1	--- ./dkim-filter/dkim-filter.c.orig 2008-03-06 04:29:36.000000000 +0900
2	+++ ./dkim-filter/dkim-filter.c 2008-03-12 23:57:52.000000000 +0900
3	@@ -2481,6 +2481,16 @@
4	if (status != DKIM_STAT_OK)
5	return FALSE;
6	}
7	+ else
8	+ {
9	+ status = dkim_options(conf->conf_libdkim, DKIM_OP_SETOPT,
10	+ DKIM_OPTS_SKIPHDRS,
11	+ (void *) should_not_signhdrs,
12	+ sizeof (u_char **));
13	+
14	+ if (status != DKIM_STAT_OK)
15	+ return FALSE;
16	+ }
17
18	if (conf->conf_signhdrs != NULL)
19	{
20	@@ -2494,8 +2504,8 @@
21	else
22	{
23	status = dkim_options(conf->conf_libdkim, DKIM_OP_SETOPT,
24	- DKIM_OPTS_SKIPHDRS,
25	- (void *) should_not_signhdrs,
26	+ DKIM_OPTS_SIGNHDRS,
27	+ (void *) should_signhdrs,
28	sizeof (u_char **));
29
30	if (status != DKIM_STAT_OK)
31	@@ -7447,6 +7457,9 @@
32	}
33	#endif /* _FFR_BODYLENGTH_DB */
34
35	+ pthread_mutex_init(&popen_lock, NULL);
36	+ pthread_mutex_init(&conf_lock, NULL);
37	+
38	/* perform test mode */
39	if (testfile != NULL)
40	{
41	@@ -7456,9 +7469,6 @@
42	return status;
43	}
44
45	- pthread_mutex_init(&popen_lock, NULL);
46	- pthread_mutex_init(&conf_lock, NULL);
47	-
48	memset(argstr, '\0', sizeof argstr);
49	end = &argstr[sizeof argstr - 1];
50	n = sizeof argstr;