Attachment #91014 for bug #128298

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

Lines 6-13 Link Here

(-)libspf2/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= libspf2	8	PORTNAME= libspf2
9	PORTVERSION= 1.2.5	9	PORTVERSION= 1.2.8
10	PORTREVISION= 3	10	#PORTREVISION= 0
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES= http://www.libspf2.org/%SUBDIR%/	12	MASTER_SITES= http://www.libspf2.org/%SUBDIR%/
13	MASTER_SITE_SUBDIR= spf	13	MASTER_SITE_SUBDIR= spf

Lines 1-3 Link Here

(-)libspf2/distinfo (-3 / +3 lines)
1	MD5 (libspf2-1.2.5.tar.gz) = 06ed6a3b0b54c8590679315ae2d28ad9	1	MD5 (libspf2-1.2.8.tar.gz) = 824d62a83e76108f8e21a39e1ae2ad62
2	SHA256 (libspf2-1.2.5.tar.gz) = 879410f87ab4ffd575b1d8149167de6d5eee751199debc039efcc1558c7d0ecb	2	SHA256 (libspf2-1.2.8.tar.gz) = 3b1cc6c891451b97b094b3e3b40348a952048a4d27ca16c0e50d0fb53938e07f
3	SIZE (libspf2-1.2.5.tar.gz) = 517945	3	SIZE (libspf2-1.2.8.tar.gz) = 575270




--- src/include/spf.h.orig	2008-02-10 11:30:04.000000000 -0200
+++ src/include/spf.h	2008-02-10 11:30:20.000000000 -0200
@@ -52,8 +52,8 @@
 
 /* FYI only -- defaults can't be changed without recompiling the library */
 #define SPF_DEFAULT_MAX_DNS_MECH 10	/* DoS limit on SPF mechanisms	*/
-#define SPF_DEFAULT_MAX_DNS_PTR	  5	/* DoS limit on PTR records	*/
-#define SPF_DEFAULT_MAX_DNS_MX	  5	/* DoS limit on MX records	*/
+#define SPF_DEFAULT_MAX_DNS_PTR	 10	/* DoS limit on PTR records	*/
+#define SPF_DEFAULT_MAX_DNS_MX	 10	/* DoS limit on MX records	*/
 #define SPF_DEFAULT_SANITIZE	  1
 #define SPF_DEFAULT_WHITELIST	  "include:spf.trusted-forwarder.org"
 #define SPF_EXP_MOD_NAME	"exp-text"
--- src/include/spf_internal.h.orig	2008-02-10 11:30:28.000000000 -0200
+++ src/include/spf_internal.h	2008-02-10 11:31:26.000000000 -0200
@@ -57,13 +57,13 @@
 /* It is a bad idea to change this for the same reasons as mentioned
  * above for SPF_MAX_DNS_MECH
  */
-#define SPF_MAX_DNS_PTR   5
+#define SPF_MAX_DNS_PTR   10
 #endif
 #ifndef SPF_MAX_DNS_MX
 /* It is a bad idea to change this for the same reasons as mentioned
  * above for SPF_MAX_DNS_MECH
  */
-#define SPF_MAX_DNS_MX    5
+#define SPF_MAX_DNS_MX    10
 #endif
 
 #if 1
--- src/include/spf_server.h.orig	2008-02-10 11:31:38.000000000 -0200
+++ src/include/spf_server.h	2008-02-10 11:31:55.000000000 -0200
@@ -43,13 +43,13 @@
 /* It is a bad idea to change this for the same reasons as mentioned
  * above for SPF_MAX_DNS_MECH
  */
-#define SPF_MAX_DNS_PTR   5
+#define SPF_MAX_DNS_PTR   10
 #endif
 #ifndef SPF_MAX_DNS_MX
 /* It is a bad idea to change this for the same reasons as mentioned
  * above for SPF_MAX_DNS_MECH
  */
-#define SPF_MAX_DNS_MX    5
+#define SPF_MAX_DNS_MX    10
 #endif
 
 struct SPF_server_struct {




--- configure.orig	Wed Feb 23 23:14:51 2005
+++ configure	Thu Jul 28 20:12:32 2005
@@ -23661,12 +23661,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-	#ifdef HAVE_SYS_SOCKET_H
-	# include <sys/socket.h>		/* inet_ functions / structs */
-	#endif
-	#ifdef HAVE_NETINET_IN_H
-	# include <netinet/in.h>		/* inet_ functions / structs */
-	#endif
 	#ifdef HAVE_ARPA_NAMESER_H
 	#  include <arpa/nameser.h> /* DNS HEADER struct */
 	#endif




--- src/libspf2/spf_interpret.c.orig	Wed Dec 13 00:46:58 2006
+++ src/libspf2/spf_interpret.c	Wed Dec 13 00:47:23 2006
@@ -49,8 +49,8 @@
 	SPF_record_t	*spf_record;
 	SPF_errcode_t	 err;
 	char			*buf;
-	int				 buflen;
-	int				 len;
+	size_t				 buflen;
+	size_t				 len;
 
 	SPF_ASSERT_NOTNULL(spf_response);
 	spf_request = spf_response->spf_request;

Lines 1-10 Link Here

(-)libspf2/files/patch-src_include_spf__server.h (-10 lines)
1	--- src/include/spf_server.h.orig Thu Jul 28 18:35:53 2005
2	+++ src/include/spf_server.h Thu Jul 28 18:35:59 2005
3	@@ -20,7 +20,6 @@
4
5	#include "spf_record.h"
6	#include "spf_dns.h"
7	-#include "spf_dns_internal.h"
8
9	#ifndef SPF_MAX_DNS_MECH
10	/* It is a bad idea to change this for two reasons.




Index: src/libspf2/spf_dns_resolv.c
diff -u -p src/libspf2/spf_dns_resolv.c.orig src/libspf2/spf_dns_resolv.c
--- src/libspf2/spf_dns_resolv.c.orig	Thu Oct 16 07:02:03 2008
+++ src/libspf2/spf_dns_resolv.c	Fri Oct 24 12:19:29 2008
@@ -92,7 +92,11 @@ static pthread_key_t	res_state_key;
 # define SPF_h_errno h_errno
 #endif
 
+#if HAVE_DECL_RES_NINIT
 static pthread_once_t	res_state_control = PTHREAD_ONCE_INIT;
 static pthread_key_t	res_state_key;
 
 static void
 SPF_dns_resolv_thread_term(void *arg)
 {

 	free(arg);
 }
 
@@ -615,7 +619,7 @@ SPF_dns_resolv_new(SPF_dns_server_t *lay
 #if HAVE_DECL_RES_NINIT
 	pthread_key_create(&res_state_key, SPF_dns_resolv_thread_term);
 }
+#endif
 
 
 #if 0
@@ -130,8 +136,10 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *
     int		rdlen;
     const u_char	*rdata, *rdata_end;
 
+#if HAVE_DECL_RES_NINIT
 	void				*res_spec;
 	struct __res_state	*res_state;
+#endif
 
 	SPF_ASSERT_NOTNULL(spf_dns_server);
 
@@ -140,10 +148,15 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *
 	SPF_ASSERT_NOTNULL(spfhook);
 #endif
 
+#if HAVE_DECL_RES_NINIT
 	res_spec = pthread_getspecific(res_state_key);
 	if (res_spec == NULL) {
 		res_state = (struct __res_state *)
 						malloc(sizeof(struct __res_state));
+		if (res_state == NULL) {
+			SPF_error("Failed to call malloc()");
+		}
+		memset(res_state, 0, sizeof(*res_state));
 		if (res_ninit(res_state) != 0) {
 			SPF_error("Failed to call res_ninit()");
 		}
@@ -152,6 +165,11 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *
 	else {
 		res_state = (struct __res_state *)res_spec;
 	}
+#else
+	if ((_res.options & RES_INIT) == 0 && res_init() != 0) {
+		SPF_error("Failed to call res_init()");
+	}
+#endif
 
     /*
      * try resolving the name
@@ -486,7 +504,9 @@ SPF_dns_resolv_new(SPF_dns_server_t *lay
 	SPF_dns_resolv_config_t	*spfhook;
 #endif
 
+#if HAVE_DECL_RES_NINIT
 	pthread_once(&res_state_control, SPF_dns_resolv_init_key);
+#endif
 
     spf_dns_server = malloc(sizeof(SPF_dns_server_t));
     if ( spf_dns_server == NULL )
@@ -517,19 +537,19 @@ SPF_dns_resolv_new(SPF_dns_server_t *lay
     spfhook = SPF_voidp2spfhook( spf_dns_server->hook );
 #endif
 
-#if HAVE_DECL_RES_NINIT
 #if 0
+#if HAVE_DECL_RES_NINIT
     if ( res_ninit( &spfhook->res_state ) != 0 ) {
 		free(spfhook);
 		free(spf_dns_server);
 		return NULL;
     }
-#endif
 #else
-	if ( res_init() != 0 ) {
+	if ((_res.options & RES_INIT) == 0 && res_init() != 0) {
 		perror("res_init");
 		return NULL;
 	}
+#endif
 #endif
 
     return spf_dns_server;




--- src/spf_example/spf_example.c.orig	Mon Mar 28 14:17:20 2005
+++ src/spf_example/spf_example.c	Mon Mar 28 14:22:46 2005
@@ -90,17 +90,17 @@
 	"\n"
 	"Valid data options are:\n"
 	"	-i <IP address>			The IP address that is sending email\n"
-	"	-s <email address>		 The email address used as the\n"
-	"							   envelope-from.  If no username (local\n"
-	"							   part) is given, 'postmaster' will be\n"
-	"							   assumed.\n"
-	"	-r <email address>		 [optional] The email address used as\n"
-	"							   the envelope-to email address, for\n"
-	"							   secondary-MX checking.\n"
-	"	-h <domain name>		   The domain name given on the SMTP HELO\n"
-	"							   command.  This is only needed if the\n"
-	"							   -sender option is not given.\n"
-	"	-d [debug level]		   debug level.\n"
+	"	-s <email address>		The email address used as the\n"
+	"					envelope-from.  If no username (local\n"
+	"					part) is given, 'postmaster' will be\n"
+	"					assumed.\n"
+	"	-r <email address>		[optional] The email address used as\n"
+	"					the envelope-to email address, for\n"
+	"					secondary-MX checking.\n"
+	"	-h <domain name>		The domain name given on the SMTP HELO\n"
+	"					command.  This is only needed if the\n"
+	"					-sender option is not given.\n"
+	"	-d [debug level]		debug level.\n"
 	);
 }
 
@@ -206,7 +206,7 @@
 	 * destroyed when you are finished.
 	 */

Lines 1-11 Link Here

(-)libspf2/files/patch-src_spfquery_spfquery.c (-11 lines)
1	--- src/spfquery/spfquery.c.orig Thu Jul 28 19:04:46 2005
2	+++ src/spfquery/spfquery.c Thu Jul 28 19:04:54 2005
3	@@ -261,7 +261,7 @@
4	response_print_errors(const char *context,
5	SPF_response_t *spf_response, SPF_errcode_t err)
6	{
7	- SPF_error_t *spf_error;;
8	+ SPF_error_t *spf_error;
9	int i;
10
11	printf("StartError\n");

Lines 24-27 include/spf2/spf_server.h Link Here

(-)libspf2/pkg-plist (-1 / +1 lines)
24	lib/libspf2.a	24	lib/libspf2.a
25	lib/libspf2.la	25	lib/libspf2.la
26	lib/libspf2.so	26	lib/libspf2.so
27	lib/libspf2.so.2	27	lib/libspf2.so.3

Return to bug 128298

Lines 1-49 Link Here

(-)libspf2/files/patch-RFC4408-DOS (-49 lines)
1	--- src/include/spf.h.orig 2008-02-10 11:30:04.000000000 -0200
2	+++ src/include/spf.h 2008-02-10 11:30:20.000000000 -0200
3	@@ -52,8 +52,8 @@
4
5	/* FYI only -- defaults can't be changed without recompiling the library */
6	#define SPF_DEFAULT_MAX_DNS_MECH 10 /* DoS limit on SPF mechanisms */
7	-#define SPF_DEFAULT_MAX_DNS_PTR 5 /* DoS limit on PTR records */
8	-#define SPF_DEFAULT_MAX_DNS_MX 5 /* DoS limit on MX records */
9	+#define SPF_DEFAULT_MAX_DNS_PTR 10 /* DoS limit on PTR records */
10	+#define SPF_DEFAULT_MAX_DNS_MX 10 /* DoS limit on MX records */
11	#define SPF_DEFAULT_SANITIZE 1
12	#define SPF_DEFAULT_WHITELIST "include:spf.trusted-forwarder.org"
13	#define SPF_EXP_MOD_NAME "exp-text"
14	--- src/include/spf_internal.h.orig 2008-02-10 11:30:28.000000000 -0200
15	+++ src/include/spf_internal.h 2008-02-10 11:31:26.000000000 -0200
16	@@ -57,13 +57,13 @@
17	/* It is a bad idea to change this for the same reasons as mentioned
18	* above for SPF_MAX_DNS_MECH
19	*/
20	-#define SPF_MAX_DNS_PTR 5
21	+#define SPF_MAX_DNS_PTR 10
22	#endif
23	#ifndef SPF_MAX_DNS_MX
24	/* It is a bad idea to change this for the same reasons as mentioned
25	* above for SPF_MAX_DNS_MECH
26	*/
27	-#define SPF_MAX_DNS_MX 5
28	+#define SPF_MAX_DNS_MX 10
29	#endif
30
31	#if 1
32	--- src/include/spf_server.h.orig 2008-02-10 11:31:38.000000000 -0200
33	+++ src/include/spf_server.h 2008-02-10 11:31:55.000000000 -0200
34	@@ -43,13 +43,13 @@
35	/* It is a bad idea to change this for the same reasons as mentioned
36	* above for SPF_MAX_DNS_MECH
37	*/
38	-#define SPF_MAX_DNS_PTR 5
39	+#define SPF_MAX_DNS_PTR 10
40	#endif
41	#ifndef SPF_MAX_DNS_MX
42	/* It is a bad idea to change this for the same reasons as mentioned
43	* above for SPF_MAX_DNS_MECH
44	*/
45	-#define SPF_MAX_DNS_MX 5
46	+#define SPF_MAX_DNS_MX 10
47	#endif
48
49	struct SPF_server_struct {

Lines 1-15 Link Here

(-)libspf2/files/patch-configure (-15 lines)
1	--- configure.orig Wed Feb 23 23:14:51 2005
2	+++ configure Thu Jul 28 20:12:32 2005
3	@@ -23661,12 +23661,6 @@
4	cat >>conftest.$ac_ext <<_ACEOF
5	/* end confdefs.h. */
6
7	- #ifdef HAVE_SYS_SOCKET_H
8	- # include <sys/socket.h> /* inet_ functions / structs */
9	- #endif
10	- #ifdef HAVE_NETINET_IN_H
11	- # include <netinet/in.h> /* inet_ functions / structs */
12	- #endif
13	#ifdef HAVE_ARPA_NAMESER_H
14	# include <arpa/nameser.h> /* DNS HEADER struct */
15	#endif

Lines 1-13 Link Here

(-)libspf2/files/patch-src__libspf2__spf_interpret.c (-13 lines)
1	--- src/libspf2/spf_interpret.c.orig Wed Dec 13 00:46:58 2006
2	+++ src/libspf2/spf_interpret.c Wed Dec 13 00:47:23 2006
3	@@ -49,8 +49,8 @@
4	SPF_record_t *spf_record;
5	SPF_errcode_t err;
6	char *buf;
7	- int buflen;
8	- int len;
9	+ size_t buflen;
10	+ size_t len;
11
12	SPF_ASSERT_NOTNULL(spf_response);
13	spf_request = spf_response->spf_request;

Lines 1-15 Link Here

(-)libspf2/files/patch-src_libspf2_spf__dns__resolv.c (-86 / +9 lines)
1	Index: src/libspf2/spf_dns_resolv.c	1	Index: src/libspf2/spf_dns_resolv.c
2	diff -u -p src/libspf2/spf_dns_resolv.c.orig src/libspf2/spf_dns_resolv.c	2	diff -u -p src/libspf2/spf_dns_resolv.c.orig src/libspf2/spf_dns_resolv.c
3	--- src/libspf2/spf_dns_resolv.c.orig Sat Feb 19 11:38:12 2005	3	--- src/libspf2/spf_dns_resolv.c.orig Thu Oct 16 07:02:03 2008
4	+++ src/libspf2/spf_dns_resolv.c Mon Jul 31 14:02:57 2006	4	+++ src/libspf2/spf_dns_resolv.c Fri Oct 24 12:19:29 2008
5	@@ -71,13 +71,18 @@ typedef struct	5	@@ -92,7 +92,11 @@ static pthread_key_t res_state_key;
6	# define SPF_h_errno h_errno
7	#endif
8
9	+#if HAVE_DECL_RES_NINIT
10	static pthread_once_t res_state_control = PTHREAD_ONCE_INIT;
11	static pthread_key_t res_state_key;
12
13	static void	6	static void
14	SPF_dns_resolv_thread_term(void *arg)	7	SPF_dns_resolv_thread_term(void *arg)
15	{	8	{
Lines 21-102 diff -u -p src/libspf2/spf_dns_resolv.c. Link Here
21	free(arg);	14	free(arg);
22	}	15	}
23		16
24	@@ -86,6 +91,7 @@ SPF_dns_resolv_init_key()	17	@@ -615,7 +619,7 @@ SPF_dns_resolv_new(SPF_dns_server_t *lay
25	{	18	#if HAVE_DECL_RES_NINIT
26	pthread_key_create(&res_state_key, SPF_dns_resolv_thread_term);
27	}
28	+#endif
29
30
31	#if 0
32	@@ -130,8 +136,10 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *
33	int rdlen;
34	const u_char rdata, rdata_end;
35
36	+#if HAVE_DECL_RES_NINIT
37	void *res_spec;
38	struct __res_state *res_state;
39	+#endif
40
41	SPF_ASSERT_NOTNULL(spf_dns_server);
42
43	@@ -140,10 +148,15 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *
44	SPF_ASSERT_NOTNULL(spfhook);
45	#endif
46
47	+#if HAVE_DECL_RES_NINIT
48	res_spec = pthread_getspecific(res_state_key);
49	if (res_spec == NULL) {
50	res_state = (struct __res_state *)
51	malloc(sizeof(struct __res_state));
52	+ if (res_state == NULL) {
53	+ SPF_error("Failed to call malloc()");
54	+ }
55	+ memset(res_state, 0, sizeof(*res_state));
56	if (res_ninit(res_state) != 0) {
57	SPF_error("Failed to call res_ninit()");
58	}
59	@@ -152,6 +165,11 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *
60	else {
61	res_state = (struct __res_state *)res_spec;
62	}
63	+#else
64	+ if ((_res.options & RES_INIT) == 0 && res_init() != 0) {
65	+ SPF_error("Failed to call res_init()");
66	+ }
67	+#endif
68
69	/*
70	* try resolving the name
71	@@ -486,7 +504,9 @@ SPF_dns_resolv_new(SPF_dns_server_t *lay
72	SPF_dns_resolv_config_t *spfhook;
73	#endif
74
75	+#if HAVE_DECL_RES_NINIT
76	pthread_once(&res_state_control, SPF_dns_resolv_init_key);	19	pthread_once(&res_state_control, SPF_dns_resolv_init_key);
77	+#endif
78
79	spf_dns_server = malloc(sizeof(SPF_dns_server_t));
80	if ( spf_dns_server == NULL )
81	@@ -517,19 +537,19 @@ SPF_dns_resolv_new(SPF_dns_server_t *lay
82	spfhook = SPF_voidp2spfhook( spf_dns_server->hook );
83	#endif
84
85	-#if HAVE_DECL_RES_NINIT
86	#if 0
87	+#if HAVE_DECL_RES_NINIT
88	if ( res_ninit( &spfhook->res_state ) != 0 ) {
89	free(spfhook);
90	free(spf_dns_server);
91	return NULL;
92	}
93	-#endif
94	#else	20	#else
95	if ( res_init() != 0 ) {	21	- if ( res_init() != 0 ) {
96	free( spf_dns_server );	22	+ if ((_res.options & RES_INIT) == 0 && res_init() != 0) {
		23	perror("res_init");
97	return NULL;	24	return NULL;
98	}	25	}
99	+#endif
100	#endif
101
102	return spf_dns_server;

Lines 1-34 Link Here

(-)libspf2/files/patch-src_spf__example_spf__example.c (-29 lines)
1	--- src/spf_example/spf_example.c.orig Mon Mar 28 14:17:20 2005	1	--- src/spf_example/spf_example.c.orig Mon Mar 28 14:17:20 2005
2	+++ src/spf_example/spf_example.c Mon Mar 28 14:22:46 2005	2	+++ src/spf_example/spf_example.c Mon Mar 28 14:22:46 2005
3	@@ -90,17 +90,17 @@
4	"\n"
5	"Valid data options are:\n"
6	" -i <IP address> The IP address that is sending email\n"
7	- " -s <email address> The email address used as the\n"
8	- " envelope-from. If no username (local\n"
9	- " part) is given, 'postmaster' will be\n"
10	- " assumed.\n"
11	- " -r <email address> [optional] The email address used as\n"
12	- " the envelope-to email address, for\n"
13	- " secondary-MX checking.\n"
14	- " -h <domain name> The domain name given on the SMTP HELO\n"
15	- " command. This is only needed if the\n"
16	- " -sender option is not given.\n"
17	- " -d [debug level] debug level.\n"
18	+ " -s <email address> The email address used as the\n"
19	+ " envelope-from. If no username (local\n"
20	+ " part) is given, 'postmaster' will be\n"
21	+ " assumed.\n"
22	+ " -r <email address> [optional] The email address used as\n"
23	+ " the envelope-to email address, for\n"
24	+ " secondary-MX checking.\n"
25	+ " -h <domain name> The domain name given on the SMTP HELO\n"
26	+ " command. This is only needed if the\n"
27	+ " -sender option is not given.\n"
28	+ " -d [debug level] debug level.\n"
29	);
30	}
31
32	@@ -206,7 +206,7 @@	3	@@ -206,7 +206,7 @@
33	* destroyed when you are finished.	4	* destroyed when you are finished.
34	*/	5	*/