Tue Jun 7 07:27:11 2011 UTC ()
Fix typos in patch description. I must have been talking with soemone
else while typing it in the dirst place.


(manu)
diff -r1.4 -r1.5 pkgsrc/filesystems/glusterfs/distinfo
diff -r1.1 -r1.2 pkgsrc/filesystems/glusterfs/patches/patch-bq
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/glusterfs/distinfo (expand / switch to unified diff)

--- pkgsrc/filesystems/glusterfs/distinfo 2011/06/06 15:53:13 1.4
+++ pkgsrc/filesystems/glusterfs/distinfo 2011/06/07 07:27:11 1.5
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: distinfo,v 1.4 2011/06/06 15:53:13 manu Exp $ 1$NetBSD: distinfo,v 1.5 2011/06/07 07:27:11 manu Exp $
2 2
3SHA1 (glusterfs-3.2.0.tar.gz) = a8095e04feedce81aa21634639f278b3810398b8 3SHA1 (glusterfs-3.2.0.tar.gz) = a8095e04feedce81aa21634639f278b3810398b8
4RMD160 (glusterfs-3.2.0.tar.gz) = a69f47efd396a413ffb350e1711345ff49557325 4RMD160 (glusterfs-3.2.0.tar.gz) = a69f47efd396a413ffb350e1711345ff49557325
5Size (glusterfs-3.2.0.tar.gz) = 2307276 bytes 5Size (glusterfs-3.2.0.tar.gz) = 2307276 bytes
6SHA1 (patch-aa) = 0975321d76f7f3d1675989b3e7ebbbd10fa37914 6SHA1 (patch-aa) = 0975321d76f7f3d1675989b3e7ebbbd10fa37914
7SHA1 (patch-ab) = 50ebee4f7ba34ef260bccada8f99cbed286f834c 7SHA1 (patch-ab) = 50ebee4f7ba34ef260bccada8f99cbed286f834c
8SHA1 (patch-ac) = c8ed15790eaa9aa72b61096eadb823a88271e94e 8SHA1 (patch-ac) = c8ed15790eaa9aa72b61096eadb823a88271e94e
9SHA1 (patch-ae) = 2ce22194e5841227d38da90aacd9a6780ae5b24c 9SHA1 (patch-ae) = 2ce22194e5841227d38da90aacd9a6780ae5b24c
10SHA1 (patch-af) = b9772f2a91c4d3d94695218e9889d7cd39c1acbf 10SHA1 (patch-af) = b9772f2a91c4d3d94695218e9889d7cd39c1acbf
11SHA1 (patch-an) = f61d747e22665a154b95546cb632489d1e0c55bf 11SHA1 (patch-an) = f61d747e22665a154b95546cb632489d1e0c55bf
12SHA1 (patch-ao) = 1845277f39531160bab22dadec1f4eb3c761a358 12SHA1 (patch-ao) = 1845277f39531160bab22dadec1f4eb3c761a358
13SHA1 (patch-ar) = a5a18baa88fda145795d0b6f85ba86014e2128f7 13SHA1 (patch-ar) = a5a18baa88fda145795d0b6f85ba86014e2128f7
14SHA1 (patch-as) = 54f6ea0ee4208cd29052084efeb928618936c7d1 14SHA1 (patch-as) = 54f6ea0ee4208cd29052084efeb928618936c7d1
15SHA1 (patch-ax) = 2588db4c21df8559ffbcf1b814479228dadd4623 15SHA1 (patch-ax) = 2588db4c21df8559ffbcf1b814479228dadd4623
16SHA1 (patch-ba) = e53d4b833f7b26eaa474a339e5962a251ecacd49 16SHA1 (patch-ba) = e53d4b833f7b26eaa474a339e5962a251ecacd49
17SHA1 (patch-bc) = e9323641ed748cbe0ef6cb8912ab76dc5508cc80 17SHA1 (patch-bc) = e9323641ed748cbe0ef6cb8912ab76dc5508cc80
18SHA1 (patch-be) = 0db2543504300504be1064cdbb6f19de06917e17 18SHA1 (patch-be) = 0db2543504300504be1064cdbb6f19de06917e17
19SHA1 (patch-bf) = 30a39360435dd5f9faaf00e272a2d14fdb1ec86c 19SHA1 (patch-bf) = 30a39360435dd5f9faaf00e272a2d14fdb1ec86c
20SHA1 (patch-bh) = befda4dc6d049cf6759aa9147e124900b3962c73 20SHA1 (patch-bh) = befda4dc6d049cf6759aa9147e124900b3962c73
21SHA1 (patch-bj) = 508dbb651cfe0f284f50490b52cca6aae194da59 21SHA1 (patch-bj) = 508dbb651cfe0f284f50490b52cca6aae194da59
22SHA1 (patch-bk) = 7ecaa91aac8ae936600078c41e963ff600613bd5 22SHA1 (patch-bk) = 7ecaa91aac8ae936600078c41e963ff600613bd5
23SHA1 (patch-bl) = 11565e61240985be475ae54baeb8e58cd736132c 23SHA1 (patch-bl) = 11565e61240985be475ae54baeb8e58cd736132c
24SHA1 (patch-bm) = 71156d3bd9dcc02b09db022ee20852f4b52e7306 24SHA1 (patch-bm) = 71156d3bd9dcc02b09db022ee20852f4b52e7306
25SHA1 (patch-bn) = d806dc6319568279d79fcc7b14fddd76771aa210 25SHA1 (patch-bn) = d806dc6319568279d79fcc7b14fddd76771aa210
26SHA1 (patch-bo) = 3c564fc3854847d26e512ded60082715745a0b1c 26SHA1 (patch-bo) = 3c564fc3854847d26e512ded60082715745a0b1c
27SHA1 (patch-bp) = 28363fc5468ef0bc930fe2551a78bed818ec2585 27SHA1 (patch-bp) = 28363fc5468ef0bc930fe2551a78bed818ec2585
28SHA1 (patch-bq) = 52723f6fbb5c5e262a31ed8f9340f988dec4fbd9 28SHA1 (patch-bq) = 55c71e2c143271fd10afa04b168f94b23acbb982
cvs diff -r1.1 -r1.2 pkgsrc/filesystems/glusterfs/patches/Attic/patch-bq (expand / switch to unified diff)

--- pkgsrc/filesystems/glusterfs/patches/Attic/patch-bq 2011/06/06 15:53:14 1.1
+++ pkgsrc/filesystems/glusterfs/patches/Attic/patch-bq 2011/06/07 07:27:11 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-bq,v 1.1 2011/06/06 15:53:14 manu Exp $ 1$NetBSD: patch-bq,v 1.2 2011/06/07 07:27:11 manu Exp $
2 2
3Make sur glusterfsd uses the same address family as gluserd.  3Make sur glusterfsd uses the same address family as glusterd.
4 4
5glusterfsd uses getaddrinfo and picks the first entry for its 5glusterfsd uses getaddrinfo and picks the first entry for its
6listening address. The first entru is of inet7 family on  6listening address. The first entry is of inet6 family on
7NetBSD. Even if glusterd was started with option  7NetBSD. Even if glusterd was started with option
8transport.address-family inet, we ended with glusterfsd  8transport.address-family inet, we ended with glusterfsd
9started with inet6, and the client could not connect to it 9using inet6. Since the client assumes glusterd and glusterfsd
10if the letwork lack IPv6 10use the same address family, it could not reach glusterfsd.
11 11
12--- xlators/mgmt/glusterd/src/glusterd-utils.c.orig 2011-06-06 10:28:42.000000000 +0200 12--- xlators/mgmt/glusterd/src/glusterd-utils.c.orig 2011-06-06 10:28:42.000000000 +0200
13+++ xlators/mgmt/glusterd/src/glusterd-utils.c 2011-06-06 16:17:30.000000000 +0200 13+++ xlators/mgmt/glusterd/src/glusterd-utils.c 2011-06-06 16:17:30.000000000 +0200
14@@ -88,8 +88,52 @@ 14@@ -88,8 +88,52 @@
15 //TODO: set timestamp 15 //TODO: set timestamp
16 return 0; 16 return 0;
17 } 17 }
18  18
19+static const char * 19+static const char *
20+glusterd_listener_family_name(void) 20+glusterd_listener_family_name(void)
21+{ 21+{
22+ xlator_t *this = NULL; 22+ xlator_t *this = NULL;
23+ glusterd_conf_t *conf = NULL; 23+ glusterd_conf_t *conf = NULL;