From 8f4084004e24bdd056e4161b6c92407ba18affaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 7 Sep 2017 01:11:37 +0200 Subject: [PATCH] glusterfs: 3.10.2 -> 3.12.1 Changes: * The patch `glusterfs-fix-unsubstituted-autoconf-macros` was deleted because the issue was fixed upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1450588 * The `glusterd-ganesha.c` part of `glusterfs-use-PATH-instead-of-hardcodes` was detleted because `glusterd-ganesha.c` was removed upstream without replacement that has the relevant hardcoded paths. Closes https://github.com/NixOS/nixpkgs/pull/29062 --- pkgs/tools/filesystems/glusterfs/default.nix | 5 +- ...10-glusterfind-var-data-under-prefix.patch | 16 +- ...fs-fix-unsubstituted-autoconf-macros.patch | 236 ------------------ ...sterfs-use-PATH-instead-of-hardcodes.patch | 23 -- 4 files changed, 10 insertions(+), 270 deletions(-) delete mode 100644 pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 0bdb7413f22d..dc15866f3cda 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "3.10.2"; + version = "3.12.1"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs"; + sha256 = "14l6p2zyjsrnjvf0lipq32p517zk813nqv06pjq6kcqkmy038wdv"; }; buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline @@ -71,7 +71,6 @@ rec { patches = [ ./glusterfs-use-PATH-instead-of-hardcodes.patch - ./glusterfs-fix-unsubstituted-autoconf-macros.patch ./glusterfs-python-remove-find_library.patch # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch index 8a3da0d6db76..f679fb8f4c1b 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -1,27 +1,27 @@ -From 965eb1e08e10ff82bb91d485dc24672acc7c72cf Mon Sep 17 00:00:00 2001 +From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Fri, 8 Sep 2017 00:51:53 +0200 +Date: Wed, 27 Sep 2017 21:36:41 +0200 Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of localstatedir". Fixes #1489610 -Change-Id: I6d71297fb7a5a9d12cc3726b4a4ad94efcd644f9 +Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0c3a38689..d508fda71 100644 +index f87d8a454..b4d3f5d10 100644 --- a/configure.ac +++ b/configure.ac -@@ -1057,7 +1057,7 @@ if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix +@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then + exec_prefix="$(eval echo $prefix)" fi - GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" + GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" +GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" prefix=$old_prefix + exec_prefix=$old_exec_prefix - ### Dirty hacky stuff to make LOCALSTATEDIR work -- 2.12.0 diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch deleted file mode 100644 index de3c2fa9f62e..000000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch +++ /dev/null @@ -1,236 +0,0 @@ -From b37e0222a6a60505868a6fbb8591608cdc4bba57 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Sat, 13 May 2017 15:33:27 +0200 -Subject: [PATCH] Revert "build/packaging: Debian and Ubuntu don't have - /usr/libexec". Fixes #1450588 - -This reverts commit 18509e436f8a728ef522f3e76e2f2dc30e1bd8ac. - -This fixes autoconf unsubstituted strings to appear in generated source code. ---- - cli/src/Makefile.am | 2 +- - configure.ac | 12 ++++++------ - events/src/Makefile.am | 8 ++++---- - extras/Makefile.am | 2 +- - geo-replication/src/Makefile.am | 8 ++++---- - geo-replication/syncdaemon/Makefile.am | 2 +- - tools/gfind_missing_files/Makefile.am | 4 ++-- - tools/glusterfind/Makefile.am | 4 ++-- - tools/glusterfind/src/Makefile.am | 2 +- - xlators/features/ganesha/src/Makefile.am | 2 +- - xlators/mgmt/glusterd/src/Makefile.am | 2 +- - 11 files changed, 24 insertions(+), 24 deletions(-) - -diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am -index 5ef9389..f5b8d00 100644 ---- a/cli/src/Makefile.am -+++ b/cli/src/Makefile.am -@@ -18,7 +18,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ - -I$(top_builddir)/rpc/xdr/src\ - -DDATADIR=\"$(localstatedir)\" \ - -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ -+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ - $(XML_CPPFLAGS) - -diff --git a/configure.ac b/configure.ac -index c9742e2..0c3a386 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1056,24 +1056,24 @@ old_prefix=$prefix - if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix - fi --GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" --GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" -+GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" -+GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" - prefix=$old_prefix - - ### Dirty hacky stuff to make LOCALSTATEDIR work - if test "x$prefix" = xNONE; then -- test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var -+ test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var - localstatedir=/var -- LOCALSTATEDIR=$localstatedir -+ LOCALSTATEDIR=$(eval echo ${localstatedir}) - else -- LOCALSTATEDIR=$localstatedir -+ LOCALSTATEDIR=$(eval echo ${localstatedir}) - fi - - old_prefix=$prefix - if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix - fi --GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" -+GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" - prefix=$old_prefix - - -diff --git a/events/src/Makefile.am b/events/src/Makefile.am -index 8493abd..87282c6 100644 ---- a/events/src/Makefile.am -+++ b/events/src/Makefile.am -@@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py eventsapiconf.py.in \ - BUILT_SOURCES = eventtypes.py - CLEANFILES = eventtypes.py - --eventsdir = $(GLUSTERFS_LIBEXECDIR)/events -+eventsdir = $(libexecdir)/glusterfs/events - events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \ - utils.py - -@@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py - $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER - - if BUILD_EVENTS --eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR) -+eventspeerscriptdir = $(libexecdir)/glusterfs - eventsconfdir = $(sysconfdir)/glusterfs - eventsconf_DATA = eventsconfig.json - -@@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py - install-exec-hook: - $(mkdir_p) $(DESTDIR)$(sbindir) - rm -f $(DESTDIR)$(sbindir)/glustereventsd -- ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \ -+ ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \ - $(DESTDIR)$(sbindir)/glustereventsd - rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi -- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \ -+ ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \ - $(DESTDIR)$(sbindir)/gluster-eventsapi - - uninstall-hook: -diff --git a/extras/Makefile.am b/extras/Makefile.am -index 9dfc93d..53ac476 100644 ---- a/extras/Makefile.am -+++ b/extras/Makefile.am -@@ -1,4 +1,4 @@ --addonexecdir = $(GLUSTERFS_LIBEXECDIR) -+addonexecdir = $(libexecdir)/glusterfs - addonexec_SCRIPTS = peer_add_secret_pub - - EditorModedir = $(docdir) -diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am -index 9937a0b..87435d5 100644 ---- a/geo-replication/src/Makefile.am -+++ b/geo-replication/src/Makefile.am -@@ -1,4 +1,4 @@ --gsyncddir = $(GLUSTERFS_LIBEXECDIR) -+gsyncddir = $(libexecdir)/glusterfs - - gsyncd_SCRIPTS = gverify.sh peer_gsec_create \ - set_geo_rep_pem_keys.sh peer_mountbroker peer_mountbroker.py \ -@@ -21,7 +21,7 @@ noinst_HEADERS = procdiggy.h - - AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ -- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \ -+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" -DUSE_LIBGLUSTERFS \ - -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" - - AM_CFLAGS = -Wall $(GF_CFLAGS) -@@ -35,11 +35,11 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la: - install-exec-hook: - $(mkdir_p) $(DESTDIR)$(sbindir) - rm -f $(DESTDIR)$(sbindir)/gluster-mountbroker -- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_mountbroker.py \ -+ ln -s $(libexecdir)/glusterfs/peer_mountbroker.py \ - $(DESTDIR)$(sbindir)/gluster-mountbroker - - rm -f $(DESTDIR)$(sbindir)/gluster-georep-sshkey -- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_georep-sshkey.py \ -+ ln -s $(libexecdir)/glusterfs/peer_georep-sshkey.py \ - $(DESTDIR)$(sbindir)/gluster-georep-sshkey - - -diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am -index f80fb26..7cdaf45 100644 ---- a/geo-replication/syncdaemon/Makefile.am -+++ b/geo-replication/syncdaemon/Makefile.am -@@ -1,4 +1,4 @@ --syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon -+syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon - - syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \ - resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \ -diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am -index f77f789..043c34c 100644 ---- a/tools/gfind_missing_files/Makefile.am -+++ b/tools/gfind_missing_files/Makefile.am -@@ -1,4 +1,4 @@ --gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files -+gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files - - gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \ - gfid_to_path.py -@@ -21,6 +21,6 @@ uninstall-local: - - install-data-local: - rm -f $(DESTDIR)$(sbindir)/gfind_missing_files -- ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files -+ ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files - - CLEANFILES = -diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am -index 92fa614..37f23be 100644 ---- a/tools/glusterfind/Makefile.am -+++ b/tools/glusterfind/Makefile.am -@@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind - - CLEANFILES = $(bin_SCRIPTS) - --deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/ -+deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/ - deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py - - uninstall-local: -@@ -16,5 +16,5 @@ install-data-local: - $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys - $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/ - rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post -- ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \ -+ ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \ - $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post -diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am -index e4469c1..541ff94 100644 ---- a/tools/glusterfind/src/Makefile.am -+++ b/tools/glusterfind/src/Makefile.am -@@ -1,4 +1,4 @@ --glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind -+glusterfinddir = $(libexecdir)/glusterfs/glusterfind - - glusterfind_PYTHON = conf.py utils.py __init__.py \ - main.py libgfchangelog.py changelogdata.py -diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am -index 78715d6..54cfcb3 100644 ---- a/xlators/features/ganesha/src/Makefile.am -+++ b/xlators/features/ganesha/src/Makefile.am -@@ -12,7 +12,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\ - -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ - -DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \ -- -DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -+ -DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\" - - AM_CFLAGS = -Wall $(GF_CFLAGS) - -diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am -index 23ebf37..4f2fffd 100644 ---- a/xlators/mgmt/glusterd/src/Makefile.am -+++ b/xlators/mgmt/glusterd/src/Makefile.am -@@ -47,7 +47,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/rpc-lib/src \ - -I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \ - -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ -- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \ -+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \ - -DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \ - -DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS) --- -2.7.4 - diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch index eb4bd5b7d56f..acb15464e48f 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch @@ -41,29 +41,6 @@ index e9f80fe81..6380dd867 100644 progname, strerror (errno)); #endif /* GF_LINUX_HOST_OS */ exit (1); -diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -index da1fee066..dcb9e5725 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c -+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -@@ -122,15 +122,15 @@ manage_service (char *action) - int i = 0; - int ret = 0; - struct service_command sc_list[] = { -- { .binary = "/bin/systemctl", -+ { .binary = "systemctl", - .service = "nfs-ganesha", - .action = sc_systemctl_action - }, -- { .binary = "/sbin/invoke-rc.d", -+ { .binary = "invoke-rc.d", - .service = "nfs-ganesha", - .action = sc_service_action - }, -- { .binary = "/sbin/service", -+ { .binary = "service", - .service = "nfs-ganesha", - .action = sc_service_action - }, diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index 0e6629cf0..fcb4738b7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c