Fri Apr 16 15:32:59 2010 UTC ()
Add patch to fix closefrom() problem on FreeBSD.


(taca)
diff -r1.129 -r1.130 pkgsrc/mail/postfix/distinfo
diff -r1.57 -r1.58 pkgsrc/mail/postfix-current/distinfo
diff -r1.21 -r1.22 pkgsrc/mail/postfix-current/patches/patch-ag
diff -r1.29 -r1.30 pkgsrc/mail/postfix/patches/patch-ag
cvs diff -r1.129 -r1.130 pkgsrc/mail/postfix/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/postfix/distinfo 2010/02/25 13:01:22 1.129
+++ pkgsrc/mail/postfix/distinfo 2010/04/16 15:32:58 1.130
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.129 2010/02/25 13:01:22 martti Exp $ 1$NetBSD: distinfo,v 1.130 2010/04/16 15:32:58 taca Exp $
2 2
3SHA1 (postfix/postfix-2.7.0.tar.gz) = 1ef2633c2e531d9d60db53ca0e26d4b1d95bc949 3SHA1 (postfix/postfix-2.7.0.tar.gz) = 1ef2633c2e531d9d60db53ca0e26d4b1d95bc949
4RMD160 (postfix/postfix-2.7.0.tar.gz) = 8878c0b5b253a20bd7c64e066ee1ee72ab52073d 4RMD160 (postfix/postfix-2.7.0.tar.gz) = 8878c0b5b253a20bd7c64e066ee1ee72ab52073d
5Size (postfix/postfix-2.7.0.tar.gz) = 3418064 bytes 5Size (postfix/postfix-2.7.0.tar.gz) = 3418064 bytes
6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb 6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
7SHA1 (patch-ag) = af3f5dc5f0de77562927b3e9407289a58b7ebbc7 7SHA1 (patch-ag) = 53f42aec86af576e1ffc420f1b9a19c988c3fe6c
8SHA1 (patch-ai) = ef3feef8a4fe7781a89f7e087fc5780760b461b1 8SHA1 (patch-ai) = ef3feef8a4fe7781a89f7e087fc5780760b461b1
9SHA1 (patch-as) = 621b92e56606794f28ab267c6c5d723734471389 9SHA1 (patch-as) = 621b92e56606794f28ab267c6c5d723734471389
10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03 10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf 11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73 12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73
cvs diff -r1.57 -r1.58 pkgsrc/mail/postfix-current/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/Attic/distinfo 2010/02/25 13:02:02 1.57
+++ pkgsrc/mail/postfix-current/Attic/distinfo 2010/04/16 15:32:58 1.58
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.57 2010/02/25 13:02:02 martti Exp $ 1$NetBSD: distinfo,v 1.58 2010/04/16 15:32:58 taca Exp $
2 2
3SHA1 (postfix/postfix-2.8-20100213.tar.gz) = 2da9e142cce1494c7527be1ec50b278b5f7cc9bf 3SHA1 (postfix/postfix-2.8-20100213.tar.gz) = 2da9e142cce1494c7527be1ec50b278b5f7cc9bf
4RMD160 (postfix/postfix-2.8-20100213.tar.gz) = 2662de13a43e87b572ea549977eab26cf4b8d146 4RMD160 (postfix/postfix-2.8-20100213.tar.gz) = 2662de13a43e87b572ea549977eab26cf4b8d146
5Size (postfix/postfix-2.8-20100213.tar.gz) = 3442437 bytes 5Size (postfix/postfix-2.8-20100213.tar.gz) = 3442437 bytes
6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb 6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
7SHA1 (patch-ag) = 24f57981d99f6515329b313bff627655abe0342e 7SHA1 (patch-ag) = 53f42aec86af576e1ffc420f1b9a19c988c3fe6c
8SHA1 (patch-ai) = f681187d6cf1f1793ecbf946a4aecee278d11f3d 8SHA1 (patch-ai) = f681187d6cf1f1793ecbf946a4aecee278d11f3d
9SHA1 (patch-as) = 8f16d7eda96c1fdbe76fb0a5294148dbf6148171 9SHA1 (patch-as) = 8f16d7eda96c1fdbe76fb0a5294148dbf6148171
10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03 10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf 11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73 12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73
cvs diff -r1.21 -r1.22 pkgsrc/mail/postfix-current/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/patches/Attic/patch-ag 2009/12/13 08:55:57 1.21
+++ pkgsrc/mail/postfix-current/patches/Attic/patch-ag 2010/04/16 15:32:59 1.22
@@ -1,62 +1,73 @@ @@ -1,62 +1,73 @@
1$NetBSD: patch-ag,v 1.21 2009/12/13 08:55:57 martti Exp $ 1$NetBSD: patch-ag,v 1.22 2010/04/16 15:32:59 taca Exp $
2 2
3Only define HAS_DB if it hasn't been defined. 3Only define HAS_DB if it hasn't been defined.
4Add support for NetBSD 5.x and DragonFly BSD. 4Add support for NetBSD 5.x and DragonFly BSD.
 5Handle closefrom() on FreeBSD.
5 6
6--- src/util/sys_defs.h.orig 2009-11-15 01:32:37.000000000 +0200 7--- src/util/sys_defs.h.orig 2009-11-14 23:32:37.000000000 +0000
7+++ src/util/sys_defs.h 2009-12-13 10:46:54.000000000 +0200 8+++ src/util/sys_defs.h
8@@ -29,8 +29,8 @@ 9@@ -29,8 +29,8 @@
9 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ 10 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ 11 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
11 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ 12 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
12- || defined(NETBSD4) \ 13- || defined(NETBSD4) \
13- || defined(EKKOBSD1) 14- || defined(EKKOBSD1)
14+ || defined(NETBSD4) || defined(NETBSD5) \ 15+ || defined(NETBSD4) || defined(NETBSD5) \
15+ || defined(EKKOBSD1) || defined(DRAGONFLY) 16+ || defined(EKKOBSD1) || defined(DRAGONFLY)
16 #define SUPPORTED 17 #define SUPPORTED
17 #include <sys/types.h> 18 #include <sys/types.h>
18 #include <sys/param.h> 19 #include <sys/param.h>
19@@ -43,7 +43,9 @@ 20@@ -43,7 +43,9 @@
20 #define DEF_MAILBOX_LOCK "flock, dotlock" 21 #define DEF_MAILBOX_LOCK "flock, dotlock"
21 #define HAS_SUN_LEN 22 #define HAS_SUN_LEN
22 #define HAS_FSYNC 23 #define HAS_FSYNC
23+#ifndef HAS_DB 24+#ifndef HAS_DB
24 #define HAS_DB 25 #define HAS_DB
25+#endif 26+#endif
26 #define HAS_SA_LEN 27 #define HAS_SA_LEN
27 #define DEF_DB_TYPE "hash" 28 #define DEF_DB_TYPE "hash"
28 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) 29 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
29@@ -163,9 +165,19 @@ 30@@ -111,7 +113,8 @@
 31 #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */
 32 #endif
 33
 34-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */
 35+#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \
 36+ || __FreeBSD_version >= 800100
 37 #define HAS_CLOSEFROM
 38 #endif
 39
 40@@ -163,9 +166,19 @@
30 #define HAS_FUTIMES 41 #define HAS_FUTIMES
31 #endif 42 #endif
32  43
33+#if defined(__DragonFly__) 44+#if defined(__DragonFly__)
34+#define HAS_DEV_URANDOM 45+#define HAS_DEV_URANDOM
35+#define HAS_ISSETUGID 46+#define HAS_ISSETUGID
36+#define HAS_FUTIMES 47+#define HAS_FUTIMES
37+#define SOCKADDR_SIZE socklen_t 48+#define SOCKADDR_SIZE socklen_t
38+#define SOCKOPT_SIZE socklen_t 49+#define SOCKOPT_SIZE socklen_t
39+#define HAS_DUPLEX_PIPE 50+#define HAS_DUPLEX_PIPE
40+#endif 51+#endif
41+ 52+
42 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \ 53 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \
43 || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \ 54 || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \
44 || (defined(OpenBSD) && OpenBSD >= 200003) \ 55 || (defined(OpenBSD) && OpenBSD >= 200003) \
45+ || defined(__DragonFly__) \ 56+ || defined(__DragonFly__) \
46 || defined(USAGI_LIBINET6) 57 || defined(USAGI_LIBINET6)
47 #ifndef NO_IPV6 58 #ifndef NO_IPV6
48 # define HAS_IPV6 59 # define HAS_IPV6
49@@ -174,14 +186,16 @@ 60@@ -174,14 +187,16 @@
50  61
51 #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \ 62 #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
52 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \ 63 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
53- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ 64- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */
54+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \ 65+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \
55+ || defined(__DragonFly__) 66+ || defined(__DragonFly__)
56 # define USE_SYSV_POLL 67 # define USE_SYSV_POLL
57 #endif 68 #endif
58  69
59 #ifndef NO_KQUEUE 70 #ifndef NO_KQUEUE
60 # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \ 71 # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \
61 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \ 72 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \
62- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ 73- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */
cvs diff -r1.29 -r1.30 pkgsrc/mail/postfix/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/postfix/patches/patch-ag 2010/02/25 13:01:23 1.29
+++ pkgsrc/mail/postfix/patches/patch-ag 2010/04/16 15:32:58 1.30
@@ -1,62 +1,73 @@ @@ -1,62 +1,73 @@
1$NetBSD: patch-ag,v 1.29 2010/02/25 13:01:23 martti Exp $ 1$NetBSD: patch-ag,v 1.30 2010/04/16 15:32:58 taca Exp $
2 2
3Only define HAS_DB if it hasn't been defined. 3Only define HAS_DB if it hasn't been defined.
4Add support for NetBSD 5.x and DragonFly BSD. 4Add support for NetBSD 5.x and DragonFly BSD.
 5Handle closefrom() on FreeBSD.
5 6
6--- src/util/sys_defs.h.orig 2009-11-15 01:32:37.000000000 +0200 7--- src/util/sys_defs.h.orig 2009-11-14 23:32:37.000000000 +0000
7+++ src/util/sys_defs.h 2010-02-25 14:47:46.000000000 +0200 8+++ src/util/sys_defs.h
8@@ -29,8 +29,8 @@ 9@@ -29,8 +29,8 @@
9 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ 10 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ 11 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
11 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ 12 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
12- || defined(NETBSD4) \ 13- || defined(NETBSD4) \
13- || defined(EKKOBSD1) 14- || defined(EKKOBSD1)
14+ || defined(NETBSD4) || defined(NETBSD5) \ 15+ || defined(NETBSD4) || defined(NETBSD5) \
15+ || defined(EKKOBSD1) || defined(DRAGONFLY) 16+ || defined(EKKOBSD1) || defined(DRAGONFLY)
16 #define SUPPORTED 17 #define SUPPORTED
17 #include <sys/types.h> 18 #include <sys/types.h>
18 #include <sys/param.h> 19 #include <sys/param.h>
19@@ -43,7 +43,9 @@ 20@@ -43,7 +43,9 @@
20 #define DEF_MAILBOX_LOCK "flock, dotlock" 21 #define DEF_MAILBOX_LOCK "flock, dotlock"
21 #define HAS_SUN_LEN 22 #define HAS_SUN_LEN
22 #define HAS_FSYNC 23 #define HAS_FSYNC
23+#ifndef HAS_DB 24+#ifndef HAS_DB
24 #define HAS_DB 25 #define HAS_DB
25+#endif 26+#endif
26 #define HAS_SA_LEN 27 #define HAS_SA_LEN
27 #define DEF_DB_TYPE "hash" 28 #define DEF_DB_TYPE "hash"
28 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) 29 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
29@@ -163,9 +165,19 @@ 30@@ -111,7 +113,8 @@
 31 #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */
 32 #endif
 33
 34-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */
 35+#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \
 36+ || __FreeBSD_version >= 800100
 37 #define HAS_CLOSEFROM
 38 #endif
 39
 40@@ -163,9 +166,19 @@
30 #define HAS_FUTIMES 41 #define HAS_FUTIMES
31 #endif 42 #endif
32  43
33+#if defined(__DragonFly__) 44+#if defined(__DragonFly__)
34+#define HAS_DEV_URANDOM 45+#define HAS_DEV_URANDOM
35+#define HAS_ISSETUGID 46+#define HAS_ISSETUGID
36+#define HAS_FUTIMES 47+#define HAS_FUTIMES
37+#define SOCKADDR_SIZE socklen_t 48+#define SOCKADDR_SIZE socklen_t
38+#define SOCKOPT_SIZE socklen_t 49+#define SOCKOPT_SIZE socklen_t
39+#define HAS_DUPLEX_PIPE 50+#define HAS_DUPLEX_PIPE
40+#endif 51+#endif
41+ 52+
42 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \ 53 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \
43 || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \ 54 || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \
44 || (defined(OpenBSD) && OpenBSD >= 200003) \ 55 || (defined(OpenBSD) && OpenBSD >= 200003) \
45+ || defined(__DragonFly__) \ 56+ || defined(__DragonFly__) \
46 || defined(USAGI_LIBINET6) 57 || defined(USAGI_LIBINET6)
47 #ifndef NO_IPV6 58 #ifndef NO_IPV6
48 # define HAS_IPV6 59 # define HAS_IPV6
49@@ -174,14 +186,16 @@ 60@@ -174,14 +187,16 @@
50  61
51 #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \ 62 #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
52 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \ 63 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
53- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ 64- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */
54+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \ 65+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \
55+ || defined(__DragonFly__) 66+ || defined(__DragonFly__)
56 # define USE_SYSV_POLL 67 # define USE_SYSV_POLL
57 #endif 68 #endif
58  69
59 #ifndef NO_KQUEUE 70 #ifndef NO_KQUEUE
60 # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \ 71 # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \
61 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \ 72 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \
62- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ 73- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */