summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2017-02-10 14:03:20 +0100
committerUltrabug <ultrabug@gentoo.org>2017-02-10 14:04:45 +0100
commit4db4f466470ead5803952a38332aea12ebb3d4e6 (patch)
tree5b6eaeb3e7ef988cfdcbb22fc85310389e8ea4f9 /sys-cluster/glusterfs/files
parentdev-lang/perl: arm64 stable (bug 589680). (diff)
downloadgentoo-4db4f466470ead5803952a38332aea12ebb3d4e6.tar.gz
gentoo-4db4f466470ead5803952a38332aea12ebb3d4e6.tar.bz2
gentoo-4db4f466470ead5803952a38332aea12ebb3d4e6.zip
sys-cluster/glusterfs: drop old and vulnerable wrt #541540
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-cluster/glusterfs/files')
-rw-r--r--sys-cluster/glusterfs/files/glusterd-workdir.patch49
-rw-r--r--sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch22
-rw-r--r--sys-cluster/glusterfs/files/glusterfs-docdir.patch51
3 files changed, 0 insertions, 122 deletions
diff --git a/sys-cluster/glusterfs/files/glusterd-workdir.patch b/sys-cluster/glusterfs/files/glusterd-workdir.patch
deleted file mode 100644
index 285136373d8e..000000000000
--- a/sys-cluster/glusterfs/files/glusterd-workdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
deleted file mode 100644
index 9320c12ea7b1..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- glusterfsd/src/Makefile.am
-+++ glusterfsd/src/Makefile.am
-@@ -20,5 +20,6 @@ uninstall-local:
- install-data-local:
- $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
- $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
- rm -f $(DESTDIR)$(sbindir)/glusterfs
- ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
---- libglusterfs/src/Makefile.am
-+++ libglusterfs/src/Makefile.am
-@@ -15,7 +15,9 @@
- graph.lex.c: graph.l y.tab.h
- $(LEX) -t $(srcdir)/graph.l > $@
-
--y.tab.c y.tab.h: graph.y
-+y.tab.c: y.tab.h
-+
-+y.tab.h: graph.y
- $(YACC) -d $(srcdir)/graph.y
-
- CLEANFILES = graph.lex.c y.tab.c y.tab.h
diff --git a/sys-cluster/glusterfs/files/glusterfs-docdir.patch b/sys-cluster/glusterfs/files/glusterfs-docdir.patch
deleted file mode 100644
index 5e26f637b22a..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-docdir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6a17bb8523c4c7810bf7797371df22cfb259f7a7 Mon Sep 17 00:00:00 2001
-From: MATSUU Takuto <matsuu@gentoo.org>
-Date: Sat, 16 May 2009 07:01:53 +0900
-Subject: [PATCH] Use the standard autoconf $docdir variable.
-
----
- doc/examples/Makefile.am | 1 -
- extras/Makefile.am | 3 +--
- extras/benchmarking/Makefile.am | 4 +---
- 3 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index b4c93f4..5296d83 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -1,7 +1,6 @@
- EXTRA = README unify.vol replicate.vol stripe.vol protocol-client.vol protocol-server.vol posix-locks.vol trash.vol write-behind.vol io-threads.vol io-cache.vol read-ahead.vol filter.vol trace.vol
- EXTRA_DIST = $(EXTRA)
-
--docdir = $(datadir)/doc/$(PACKAGE_NAME)
- Examplesdir = $(docdir)/examples
- Examples_DATA = $(EXTRA)
-
-diff --git a/extras/Makefile.am b/extras/Makefile.am
-index 9be3973..ea0b33d 100644
---- a/extras/Makefile.am
-+++ b/extras/Makefile.am
-@@ -1,6 +1,5 @@
-
--docdir = $(datadir)/doc/glusterfs/
--EditorModedir = $(docdir)/
-+EditorModedir = $(docdir)
- EditorMode_DATA = glusterfs-mode.el glusterfs.vim
-
- SUBDIRS = init.d benchmarking
-diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am
-index 04cc061..bfcc592 100644
---- a/extras/benchmarking/Makefile.am
-+++ b/extras/benchmarking/Makefile.am
-@@ -1,7 +1,5 @@
-
--docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking
--
--benchmarkingdir = $(docdir)
-+benchmarkingdir = $(docdir)/benchmarking
-
- benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh
-
---
-1.6.3
-