From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 15 Feb 2023 16:31:08 +0000 (+0100)
Subject: - /var/lib/glusterd is used by client too, move to common subpackage
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f03c98b774c72b877f73ac9a26804996b22558ed;p=packages%2Fglusterfs.git

- /var/lib/glusterd is used by client too, move to common subpackage
- chnage SSL certificate/key/dh paths to /etc/glusterfs
---

diff --git a/glusterfs.spec b/glusterfs.spec
index 62bff56..5b464cb 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -14,12 +14,13 @@ 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:	10.3
-Release:	2
+Release:	3
 License:	LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
 Group:		Applications/System
 Source0:	https://download.gluster.org/pub/gluster/glusterfs/10/%{version}/glusterfs-%{version}.tar.gz
 # Source0-md5:	9c795c8479f244e81bca5b2499a480cc
 Source1:	glusterfsd.init
+Patch0:		ssl_paths.patch
 URL:		https://www.gluster.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.50
@@ -265,6 +266,7 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -413,6 +415,8 @@ fi
 
 %{_mandir}/man8/glusterfs.8*
 %{_mandir}/man8/glusterfsd.8*
+
+%dir %{_var}/lib/glusterd
 %dir %{_var}/log/glusterfs
 
 %files libs
@@ -482,7 +486,6 @@ fi
 
 %{_mandir}/man8/gluster-setgfid2path.8*
 %{_mandir}/man8/glusterd.8*
-%dir %{_var}/lib/glusterd
 %dir %{_var}/lib/glusterd/groups
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/db-workload
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/distributed-virt
diff --git a/ssl_paths.patch b/ssl_paths.patch
new file mode 100644
index 0000000..e66870b
--- /dev/null
+++ b/ssl_paths.patch
@@ -0,0 +1,28 @@
+diff -ur glusterfs-10.3.orig/rpc/rpc-transport/socket/src/socket.c glusterfs-10.3/rpc/rpc-transport/socket/src/socket.c
+--- glusterfs-10.3.orig/rpc/rpc-transport/socket/src/socket.c	2022-09-20 12:24:29.656820924 +0200
++++ glusterfs-10.3/rpc/rpc-transport/socket/src/socket.c	2023-02-15 16:02:26.665973455 +0100
+@@ -46,20 +46,12 @@
+ #define SSL_CRL_PATH_OPT "transport.socket.ssl-crl-path"
+ #define OWN_THREAD_OPT "transport.socket.own-thread"
+ 
+-#if !defined(DEFAULT_CERT_PATH)
+-#define DEFAULT_CERT_PATH SSL_CERT_PATH "/glusterfs.pem"
+-#endif
+-#if !defined(DEFAULT_KEY_PATH)
+-#define DEFAULT_KEY_PATH SSL_CERT_PATH "/glusterfs.key"
+-#endif
+-#if !defined(DEFAULT_CA_PATH)
+-#define DEFAULT_CA_PATH SSL_CERT_PATH "/glusterfs.ca"
+-#endif
+-#if !defined(DEFAULT_VERIFY_DEPTH)
++#define DEFAULT_CERT_PATH "/etc/glusterfs/glusterfs.pem"
++#define DEFAULT_KEY_PATH "/etc/glusterfs/glusterfs.key"
++#define DEFAULT_CA_PATH "/etc/glusterfs/glusterfs.ca"
+ #define DEFAULT_VERIFY_DEPTH 1
+-#endif
+ #define DEFAULT_CIPHER_LIST "EECDH:EDH:HIGH:!3DES:!RC4:!DES:!MD5:!aNULL:!eNULL"
+-#define DEFAULT_DH_PARAM SSL_CERT_PATH "/dhparam.pem"
++#define DEFAULT_DH_PARAM "/etc/glusterfs/dhparam.pem"
+ #define DEFAULT_EC_CURVE "prime256v1"
+ 
+ #define POLL_MASK_INPUT (POLLIN | POLLPRI)