Add missing patch

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 56 insertions, 14 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 3a2d0785e75b..7b4473a521cc 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.13 2010/11/21 18:56:20 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.14 2010/11/22 16:15:33 xarthisius Exp $
+
+  22 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/glusterd-workdir.patch:
+  Add missing patch
 
 *glusterfs-3.1.0-r1 (21 Nov 2010)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index dd9cd7e77763..78e45fc82bc1 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d
+AUX glusterd-workdir.patch 1528 RMD160 c18b1407bcf02e6504afca8aaf1dba894856dc11 SHA1 6d7a428df9e6dfc8da75831ca64dbc84253b3a36 SHA256 b614c90279fd0546d353f017616dff798e73a20c45fa846d57a35bf4569389df
 AUX glusterd.initd 833 RMD160 e26b0924ede76d50625c46c051cfd50d663277d7 SHA1 d8c456643d15f7605ec97b9ca1c21d9adc60e41b SHA256 cd6d277236a9bc22cb3872269d1454c2c5a140cea6a9badb3b6ba2d88ae52232
 AUX glusterfs-2.0.8-docdir.patch 1644 RMD160 6961d29068c6b556f195615b789188f28e80b181 SHA1 4ff29870fae0039f390945ccaee3bcd25c87ae70 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07
 AUX glusterfs-3.1.0-parallel-build.patch 659 RMD160 a5127f529387a0f9a543c666d139beac6f8b306c SHA1 bf1d566d9b306b44f0a26db7d2c9ddaa10f8a872 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c
@@ -10,14 +8,5 @@ AUX glusterfs.initd 3134 RMD160 6606d3c3ee825e1af9624d66f5a46e30270e73a3 SHA1 68
 AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa880c49a7bd1a0e185539acede53840b138746 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099
 DIST glusterfs-3.1.0.tar.gz 2043401 RMD160 96f8944cfe41f7d5a7971010ea47283c26998821 SHA1 b783b7be68f890684fbdc45b96bc30b092de692c SHA256 47c7d8f53f46c0a9c77bad7c1e098b63be2a9c128b379e409c81a1f37ec17da7
 EBUILD glusterfs-3.1.0-r1.ebuild 3540 RMD160 4910b9a731ae5db7a5d345ebe6c052e4a5ba9ebe SHA1 4dcc90fa810bce8de03718ab02d612faee8b4115 SHA256 7796d8cbf9968615fe3c14ab10b5f20fd311fd44962244106548a22feedd1232
-MISC ChangeLog 2761 RMD160 add3963d240fabf8b3666d2fea4790a9d8ff7e46 SHA1 5cba4bfafd27749a407918df8718f4ef4b608e6c SHA256 294152f855ab737149b5cf8909812161f953be8907c6e588a9703c6436397a27
+MISC ChangeLog 2869 RMD160 245696b4c0f2b3230588c25021a5d867cf726653 SHA1 9b5d365d413055c12e4187cb29f35d05d01be5c4 SHA256 4577da952c495078bea9fc67045d5b38c3a8f40b9ae4fe21d78707dfb26c68cb
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkzpa10ACgkQIiMqcbOVdxQtVgP+KxkxjgcEFVbpN7JlidRJvLLz
-y0ss3O5qrNPiDAtVXoi+rqnjUxjG6wQxK3Rm4MHHOqyYfpo7JM9sQL1Aoa7P5ocA
-2Il5NC/sFpAfF4ZQ6vvZOhQ7yyyBS8UZIG8tIXguE8fy24IdSOBz+6SzaOfe7/g9
-0pW6I9iaOAqDW5k6rzg=
-=UpX3
------END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterd-workdir.patch b/sys-cluster/glusterfs/files/glusterd-workdir.patch
new file mode 100644
index 000000000000..285136373d8e
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-workdir.patch
@@ -0,0 +1,49 @@
+Change the default workdir of the glusterd daemon to /var/lib/glusterd instead of /etc/glusterd.
+This directory is dynamically populated by glusterd via the gluster CLI so it does better
+belong into /var/lib/.
+
+Patch by Ultrabug.
+
+--- a/xlators/mgmt/glusterd/src/glusterd.h   2010-10-13 06:20:37.000000000 +0200
++++ b/xlators/mgmt/glusterd/src/glusterd.h   2010-10-26 10:47:52.747265444 +0200
+@@ -204,7 +204,7 @@
+         GLUSTERD_VOL_COMP_RJT,
+ };
+
+-#define GLUSTERD_DEFAULT_WORKDIR "/etc/glusterd"
++#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd"
+ #define GLUSTERD_DEFAULT_PORT    GF_DEFAULT_BASE_PORT
+ #define GLUSTERD_INFO_FILE      "glusterd.info"
+ #define GLUSTERD_VOLUME_DIR_PREFIX "vols"
+--- a/doc/glusterd.vol  2010-10-13 06:20:36.000000000 +0200
++++ b/doc/glusterd.vol  2010-10-26 10:48:16.487931870 +0200
+@@ -1,6 +1,6 @@
+ volume management
+     type mgmt/glusterd
+-    option working-directory /etc/glusterd
++    option working-directory /var/lib/glusterd
+     option transport-type socket,rdma
+     option transport.socket.keepalive-time 10
+     option transport.socket.keepalive-interval 2
+--- a/doc/gluster.8  2010-10-13 06:20:36.000000000 +0200
++++ b/doc/gluster.8  2010-10-26 10:48:36.738500314 +0200
+@@ -118,7 +118,7 @@
+ .TP
+ .PP
+ .SH FILES
+-/etc/glusterd/*
++/var/lib/glusterd/*
+
+ .SH SEE ALSO
+ .nf
+--- a/doc/glusterd.8 2010-10-13 06:20:36.000000000 +0200
++++ b/doc/glusterd.8 2010-10-26 10:48:44.898729373 +0200
+@@ -70,7 +70,7 @@
+
+ .PP
+ .SH FILES
+-/etc/glusterd/*
++/var/lib/glusterd/*
+
+ .SH SEE ALSO
+ .nf