commit: 4db4f466470ead5803952a38332aea12ebb3d4e6 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> AuthorDate: Fri Feb 10 13:03:20 2017 +0000 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> CommitDate: Fri Feb 10 13:04:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db4f466
sys-cluster/glusterfs: drop old and vulnerable wrt #541540 Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-cluster/glusterfs/Manifest | 1 - sys-cluster/glusterfs/files/glusterd-workdir.patch | 49 --------- .../files/glusterfs-3.1.0-parallel-build.patch | 22 ---- sys-cluster/glusterfs/files/glusterfs-docdir.patch | 51 ---------- sys-cluster/glusterfs/glusterfs-3.1.2.ebuild | 112 --------------------- sys-cluster/glusterfs/metadata.xml | 1 - 6 files changed, 236 deletions(-) diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 97d98978c0..c55ec43970 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -1,4 +1,3 @@ -DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79 DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068 DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8 diff --git a/sys-cluster/glusterfs/files/glusterd-workdir.patch b/sys-cluster/glusterfs/files/glusterd-workdir.patch deleted file mode 100644 index 285136373d..0000000000 --- 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 9320c12ea7..0000000000 --- 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 5e26f637b2..0000000000 --- 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 <[email protected]> -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 - diff --git a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild deleted file mode 100644 index 2c8b8ca74c..0000000000 --- a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -inherit autotools elisp-common eutils multilib versionator - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="http://www.gluster.org/"; -SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="emacs extras +fuse infiniband static-libs vim-syntax" - -RDEPEND="emacs? ( virtual/emacs ) - fuse? ( >=sys-fs/fuse-2.7.0 ) - infiniband? ( sys-fabric/libibverbs )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -SITEFILE="50${PN}-mode-gentoo.el" - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \ - "${FILESDIR}/${PN}-docdir.patch" \ - "${FILESDIR}/glusterd-workdir.patch" - sed -i -e "s/ -ggdb3//g" argp-standalone/configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable fuse fuse-client) \ - $(use_enable infiniband ibverbs) \ - $(use_enable static-libs static) \ - --disable-bdb \ - --docdir=/usr/share/doc/${PF} \ - --localstatedir=/var -} - -src_compile() { - emake || die - if use emacs ; then - elisp-compile extras/glusterfs-mode.el || die - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* || die - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" || die - insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim || die - fi - - if use extras ; then - newbin extras/volgen/glusterfs-volgen glusterfs-volgen || die - newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die - newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS || die - - newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die - newinitd "${FILESDIR}/glusterd.initd" glusterd || die - newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die - - keepdir /var/log/${PN} || die - keepdir /var/lib/glusterd || die -} - -pkg_postinst() { - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - elog - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - elog - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - elog - elog "For more information on how to mount exported GlusterFS filesystems visit:" - elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"; - elog - elog "If you are upgrading from glusterfs 3.0.x please read:" - elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide"; - elog - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml index 9bc43af51b..dbe49ffe84 100644 --- a/sys-cluster/glusterfs/metadata.xml +++ b/sys-cluster/glusterfs/metadata.xml @@ -14,7 +14,6 @@ <flag name="fuse">Add FUSE mount helper</flag> <flag name="glupy">Enable support for translators written in Python</flag> <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag> - <flag name="extras">Install extra helper scripts</flag> <flag name="infiniband">Add support for Infiniband ibverbs transport. Libraries can be found in science overlay</flag> <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
