[packages/glusterfs] - updated to 3.7.9 (new sonames; glusterfs 3.5.x left on glusterfs-3.5 branch) - updated link patch

qboosh qboosh at pld-linux.org
Sat Apr 2 09:28:42 CEST 2016 

commit be6cd9ba295c0bb3a2fc38063d1b178a0bb51987
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 2 09:28:46 2016 +0200

    - updated to 3.7.9 (new sonames; glusterfs 3.5.x left on glusterfs-3.5 branch)
    - updated link patch
    - removed obsolete no-sysctl-on-linux patch
    - added python patch (use prefix-specific python dirs)

 glusterfs-link.patch     | 56 ++++---------------------------
 glusterfs-python.patch   | 11 +++++++
 glusterfs.spec           | 86 +++++++++++++++++++++++++++++++++++++++++++-----
 no-sysctl-on-linux.patch | 11 -------
 4 files changed, 96 insertions(+), 68 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index debd88d..5eda279 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - package ganesha specific files? (no ganesha in PLD yet)
 # - Find pidfiles killproc --pidfile ${PIDFILE} -TERM instead of kill -TERM ${PID}
 # - Check transport-ibverbs package and ibverbs bcond
 # - Add passing options from /etc/sysconfig/glusterfsd to glusterfsd
@@ -11,35 +12,42 @@
 Summary:	Clustered File Storage that can scale to peta bytes
 Summary(pl.UTF-8):	Klastrowy system przechowywania plików skalujący się do petabajtów
 Name:		glusterfs
-Version:	3.5.9
+Version:	3.7.9
 Release:	1
 License:	LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
 Group:		Applications/System
-Source0:	http://download.gluster.org/pub/gluster/glusterfs/3.5/LATEST/glusterfs-%{version}.tar.gz
-# Source0-md5:	28c3f410b701fe914333ebcc9f3b34ea
+Source0:	http://download.gluster.org/pub/gluster/glusterfs/3.7/LATEST/glusterfs-%{version}.tar.gz
+# Source0-md5:	622e8d3557992554528f33d577c95d8b
 Source1:	glusterfsd.init
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-noquiet.patch
-Patch2:		no-sysctl-on-linux.patch
+Patch2:		%{name}-python.patch
 URL:		http://www.gluster.org/
+BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bison
+# cmocka >= 1.0.1 for unittest
 BuildRequires:	device-mapper-devel >= 2.02.79
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libaio-devel
 BuildRequires:	libfuse-devel >= 2.6
 %{?with_ibverbs:BuildRequires:	libibverbs-devel >= 1.0.4}
+%{?with_ibverbs:BuildRequires:	librdmacm-devel >= 1.0.4}
 BuildRequires:	libtool
+BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-devel >= 1:2.6.19
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.4
+BuildRequires:	python-devel >= 1:2.4
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	sqlite3-devel >= 3
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
+BuildRequires:	userspace-rcu-devel >= 0.8
 BuildRequires:	zlib-devel >= 1.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -224,8 +232,6 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-#%{__python} gen-headers.py
-#%{__mv} gf-error-codes.h libglusterfs/src
 %configure \
 	--disable-silent-rules \
 	--enable-fusermount \
@@ -237,7 +243,7 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_var}/lib/glusterd}
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -261,6 +267,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}/{emacs/site-lisp,vim/syntax}
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/glusterfs/benchmarking
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/python/syncdaemon/README.md
+# example, installed as /var/lib/glusterd/groups/virt
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/glusterfs/group-virt.example
 
 %py_postclean
 
@@ -272,13 +280,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files common
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README THANKS
+%doc ChangeLog NEWS README.md THANKS
 %dir %{_sysconfdir}/%{name}
+%attr(755,root,root) %{_bindir}/glusterfind
 %attr(755,root,root) %{_sbindir}/glfsheal
 # NOTE: glusterfs is link to glusterfsd and is needed by client mount
 %attr(755,root,root) %{_sbindir}/glusterfs
 %attr(755,root,root) %{_sbindir}/glusterfsd
 
+#%attr(755,root,root) %{_libdir}/ganesha/create-export-ganesha.sh
+#%attr(755,root,root) %{_libdir}/ganesha/dbus-send.sh
+#%attr(755,root,root) %{_libdir}/ganesha/ganesha-ha.sh
+
 %dir %{_libdir}/glusterfs
 
 %dir %{_libdir}/glusterfs/%{version}
@@ -290,6 +303,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/glusterfs/%{version}/rpc-transport/socket.so
 
 %dir %{_libdir}/glusterfs/%{version}/xlator
+%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/meta.so
 %dir %{_libdir}/glusterfs/%{version}/xlator/cluster
 %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/cluster/*.so
 %dir %{_libdir}/glusterfs/%{version}/xlator/debug
@@ -326,11 +340,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/glusterfs/peer_add_secret_pub
 %attr(755,root,root) %{_libdir}/glusterfs/peer_gsec_create
 
+%dir %{_libdir}/glusterfs/gfind_missing_files
+%attr(755,root,root) %{_libdir}/glusterfs/gfind_missing_files/*
+
+%{_libdir}/glusterfs/glusterfind
+
 %dir %{_libdir}/glusterfs/python
 %dir %{_libdir}/glusterfs/python/syncdaemon
 # gsyncd.py is a script, the rest probably don't require *.py
 %{_libdir}/glusterfs/python/syncdaemon/*.py*
 
+%attr(755,root,root) %{_libdir}/glusterfs/peer_mountbroker
+%attr(755,root,root) %{_libdir}/glusterfs/set_geo_rep_pem_keys.sh
+
 %dir %{_datadir}/glusterfs
 %dir %{_datadir}/glusterfs/scripts
 %attr(755,root,root) %{_datadir}/glusterfs/scripts/generate-gfid-file.sh
@@ -339,7 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/glusterfs/scripts/gsync-upgrade.sh
 %attr(755,root,root) %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
 %attr(755,root,root) %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
+%attr(755,root,root) %{_datadir}/glusterfs/scripts/schedule_georep.py
 %attr(755,root,root) %{_datadir}/glusterfs/scripts/slave-upgrade.sh
+%attr(755,root,root) %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
 
 %{_mandir}/man8/glusterfs.8*
 %{_mandir}/man8/glusterfsd.8*
@@ -351,6 +375,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgfapi.so.0
 %attr(755,root,root) %{_libdir}/libgfchangelog.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgfchangelog.so.0
+%attr(755,root,root) %{_libdir}/libgfdb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgfdb.so.0
 %attr(755,root,root) %{_libdir}/libgfrpc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgfrpc.so.0
 %attr(755,root,root) %{_libdir}/libgfxdr.so.*.*.*
@@ -362,24 +388,31 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgfapi.so
 %attr(755,root,root) %{_libdir}/libgfchangelog.so
+%attr(755,root,root) %{_libdir}/libgfdb.so
 %attr(755,root,root) %{_libdir}/libgfrpc.so
 %attr(755,root,root) %{_libdir}/libgfxdr.so
 %attr(755,root,root) %{_libdir}/libglusterfs.so
 %{_libdir}/libgfapi.la
 %{_libdir}/libgfchangelog.la
+%{_libdir}/libgfdb.la
 %{_libdir}/libgfrpc.la
 %{_libdir}/libgfxdr.la
 %{_libdir}/libglusterfs.la
 %dir %{_includedir}/glusterfs
 %{_includedir}/glusterfs/api
 %{_includedir}/glusterfs/gfchangelog
+%{_includedir}/glusterfs/gfdb
 %{_pkgconfigdir}/glusterfs-api.pc
 %{_pkgconfigdir}/libgfchangelog.pc
+%{_pkgconfigdir}/libgfdb.pc
 
 %files -n python-gluster
 %defattr(644,root,root,755)
 %dir %{py_sitescriptdir}/gluster
 %{py_sitescriptdir}/gluster/*.py[co]
+%{py_sitescriptdir}/gluster/glupy
+# created only when using py_build/py_install in xlators/features/glupy/src
+#%{py_sitescriptdir}/glusterfs_glupy-%{version}-py*.egg-info
 
 %if %{with ibverbs}
 %files transport-ibverbs
@@ -391,10 +424,44 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/glusterfsd.vol
 %attr(754,root,root) /etc/rc.d/init.d/glusterfsd
+%attr(755,root,root) %{_sbindir}/gcron.py
+%attr(755,root,root) %{_sbindir}/gfind_missing_files
 %attr(755,root,root) %{_sbindir}/glusterd
+%attr(755,root,root) %{_sbindir}/snap_scheduler.py
 %{systemdtmpfilesdir}/gluster.conf
 %{_mandir}/man8/glusterd.8*
 %dir %{_var}/lib/glusterd
+%dir %{_var}/lib/glusterd/groups
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/virt
+%dir %{_var}/lib/glusterd/hooks
+%dir %{_var}/lib/glusterd/hooks/1
+%dir %{_var}/lib/glusterd/hooks/1/add-brick
+%dir %{_var}/lib/glusterd/hooks/1/add-brick/post
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh
+%dir %{_var}/lib/glusterd/hooks/1/add-brick/pre
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
+%dir %{_var}/lib/glusterd/hooks/1/delete
+%dir %{_var}/lib/glusterd/hooks/1/delete/post
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
+%dir %{_var}/lib/glusterd/hooks/1/gsync-create
+%dir %{_var}/lib/glusterd/hooks/1/gsync-create/post
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh
+%dir %{_var}/lib/glusterd/hooks/1/reset
+%dir %{_var}/lib/glusterd/hooks/1/reset/post
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/reset/post/S31ganesha-reset.sh
+%dir %{_var}/lib/glusterd/hooks/1/set
+%dir %{_var}/lib/glusterd/hooks/1/set/post
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/set/post/S30samba-set.sh
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh
+%dir %{_var}/lib/glusterd/hooks/1/start
+%dir %{_var}/lib/glusterd/hooks/1/start/post
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/start/post/S29CTDBsetup.sh
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/start/post/S30samba-start.sh
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/start/post/S31ganesha-start.sh
+%dir %{_var}/lib/glusterd/hooks/1/stop
+%dir %{_var}/lib/glusterd/hooks/1/stop/pre
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/stop/pre/S30samba-stop.sh
 %dir %{_var}/run/gluster
 
 %files client
@@ -410,6 +477,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/lib/ocf/resource.d/glusterfs
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/glusterfs/glusterd
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/glusterfs/volume
+#%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_grace
+#%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_mon
+#%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_nfsd
 
 %files -n emacs-glusterfs-mode
 %defattr(644,root,root,755)
diff --git a/glusterfs-link.patch b/glusterfs-link.patch
index 263b6ec..82cf917 100644
--- a/glusterfs-link.patch
+++ b/glusterfs-link.patch
@@ -1,54 +1,12 @@
---- glusterfs-3.3.1/rpc/Makefile.am.orig	2012-12-17 22:48:54.435191720 +0100
-+++ glusterfs-3.3.1/rpc/Makefile.am	2012-12-17 22:56:20.508515756 +0100
-@@ -1 +1 @@
--SUBDIRS = rpc-lib rpc-transport xdr
-+SUBDIRS = xdr rpc-lib rpc-transport
---- glusterfs-3.3.1/rpc/rpc-lib/src/Makefile.am.orig	2012-12-17 22:16:10.205232660 +0100
-+++ glusterfs-3.3.1/rpc/rpc-lib/src/Makefile.am	2012-12-17 22:48:22.138525726 +0100
-@@ -3,7 +3,7 @@
- libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
- 	rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c
+--- glusterfs-3.7.5/rpc/rpc-lib/src/Makefile.am.orig	2015-10-07 15:18:14.993228975 +0200
++++ glusterfs-3.7.5/rpc/rpc-lib/src/Makefile.am	2015-10-09 18:28:49.261547744 +0200
+@@ -4,7 +4,8 @@
+ 	rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
+ 	rpc-drc.c $(CONTRIBDIR)/sunrpc/xdr_sizeof.c  rpc-clnt-ping.c
  
 -libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 +libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(top_builddir)/rpc/xdr/src/libgfxdr.la
++
+ libgfrpc_la_LDFLAGS = -version-info $(LIBGFRPC_LT_VERSION) $(GF_LDFLAGS)
  
  noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
- 	rpc-clnt.h rpcsvc-common.h protocol-common.h
---- glusterfs-3.3.1/rpc/xdr/src/Makefile.am.orig	2012-12-17 22:56:45.071848577 +0100
-+++ glusterfs-3.3.1/rpc/xdr/src/Makefile.am	2012-12-17 23:12:22.731829033 +0100
-@@ -6,8 +6,7 @@
- 			-D_GNU_SOURCE -D$(GF_HOST_OS) \
- 			-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src
- 
--libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
--		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
-+libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
- libgfxdr_la_SOURCES =  xdr-generic.c rpc-common-xdr.c \
- 			glusterfs3-xdr.c \
---- glusterfs-3.5.1/xlators/features/compress/src/Makefile.am.orig	2014-06-29 11:36:20.398339217 +0200
-+++ glusterfs-3.5.1/xlators/features/compress/src/Makefile.am	2014-06-29 11:47:06.574992416 +0200
-@@ -4,10 +4,10 @@
- 
- noinst_HEADERS = cdc.h cdc-mem-types.h
- 
--cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS)
-+cdc_la_LDFLAGS = -module -avoid-version
- 
- cdc_la_SOURCES = cdc.c cdc-helper.c
--cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
- 
- AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \
- -shared -nostartfiles  $(LIBZ_CFLAGS)
---- glusterfs-3.5.0/configure.ac.orig	2014-05-18 15:51:39.493655451 +0200
-+++ glusterfs-3.5.0/configure.ac	2014-05-18 16:29:11.676941834 +0200
-@@ -505,7 +505,7 @@
- # CDC xlator - check if libz is present if so enable HAVE_LIB_Z
- echo -n "checking if libz is present... "
- 
--PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],
-+PKG_CHECK_MODULES([LIBZ], [zlib >= 1.2.0],
-                   [echo "yes (features requiring zlib enabled)"  AC_DEFINE(HAVE_LIB_Z, 1, [define if zlib is present])],
-                   [echo "no"] )
- 
diff --git a/glusterfs-python.patch b/glusterfs-python.patch
new file mode 100644
index 0000000..04328e5
--- /dev/null
+++ b/glusterfs-python.patch
@@ -0,0 +1,11 @@
+--- glusterfs-3.7.9/configure.ac.orig	2016-03-31 21:42:00.820154766 +0200
++++ glusterfs-3.7.9/configure.ac	2016-04-01 17:09:46.650547715 +0200
+@@ -1203,7 +1203,7 @@
+ esac
+ 
+ if test "x$BUILD_GLUPY" = "xyes"; then
+-   BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
++   BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix="'$prefix'"))'`
+    BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
+    BUILD_PYTHON_LIB=python$PYTHON_VERSION
+    GLUPY_SUBDIR=glupy
diff --git a/no-sysctl-on-linux.patch b/no-sysctl-on-linux.patch
deleted file mode 100644
index f5f9ec5..0000000
--- a/no-sysctl-on-linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glusterfs-3.5.3/xlators/mount/fuse/src/fuse-helpers.c~	2014-11-12 13:51:20.000000000 +0000
-+++ glusterfs-3.5.3/xlators/mount/fuse/src/fuse-helpers.c	2014-12-30 19:46:36.645378934 +0000
-@@ -14,7 +14,7 @@
- #include "fuse-bridge.h"
- #if defined(GF_SOLARIS_HOST_OS)
- #include <sys/procfs.h>
--#else
-+#elif !defined(GF_LINUX_HOST_OS)
- #include <sys/sysctl.h>
- #endif
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glusterfs.git/commitdiff/be6cd9ba295c0bb3a2fc38063d1b178a0bb51987

More information about the pld-cvs-commit mailing list