From 9da8982459a9336508c276855b64638b3584c07b Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 9 Oct 2019 10:15:29 -0400 Subject: [PATCH 1/6] f31+ --without-bd Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index a33c761..d5170c8 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -27,7 +27,7 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd %{?_without_bd:%global _without_bd --disable-bd-xlator} -%if ( 0%{?rhel} && 0%{?rhel} > 7 ) +%if ( 0%{?fedora} && 0%{?fedora} > 30 ) || ( 0%{?rhel} && 0%{?rhel} > 7 ) %global _without_bd --without-bd %endif @@ -1394,6 +1394,9 @@ exit 0 %endif %changelog +* Wed Oct 9 2019 Kaleb S. KEITHLEY +- f31+ --without-bd + * Tue Oct 1 2019 Kaleb S. KEITHLEY - 7.0-0.5rc3 - 7.0 RC3 (note, rc2 was tagged but not released) From ee88c88c190bc1337f728c3ffcadd7338235d8e6 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 10 Oct 2019 07:55:12 -0400 Subject: [PATCH 2/6] bd xlator was removed in glusterfs-6 Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index d5170c8..88ecfca 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -22,15 +22,6 @@ %global _with_asan %{nil} %endif -# bd -# if you wish to compile an rpm without the BD map support... -# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd -%{?_without_bd:%global _without_bd --disable-bd-xlator} - -%if ( 0%{?fedora} && 0%{?fedora} > 30 ) || ( 0%{?rhel} && 0%{?rhel} > 7 ) -%global _without_bd --without-bd -%endif - # cmocka # if you wish to compile an rpm with cmocka unit testing... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka @@ -1395,7 +1386,7 @@ exit 0 %changelog * Wed Oct 9 2019 Kaleb S. KEITHLEY -- f31+ --without-bd +- bd xlator was removed in glusterfs-6 * Tue Oct 1 2019 Kaleb S. KEITHLEY - 7.0-0.5rc3 - 7.0 RC3 (note, rc2 was tagged but not released) From 70bfa6fc05228d46c9141c40432606799f6c69bb Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 20 Jul 2020 16:12:25 -0400 Subject: [PATCH 3/6] 7.7 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 295137b..7cae433 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -195,7 +195,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 7.6 +Version: 7.7 Release: 1%{?dev:%{dev}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1381,6 +1381,9 @@ exit 0 %endif %changelog +* Mon Jul 21 2020 Kaleb S. KEITHLEY - 7.7-1 +- 7.7 GA + * Mon May 18 2020 Kaleb S. KEITHLEY - 7.6-1 - 7.6 GA diff --git a/sources b/sources index 862d37d..5f47d69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-7.6.tar.gz) = c26b2046e7afdbb37fdd395fd9f692a0513ebb58c91ea223fbbaf9f8b41641b1fd009f2975e187f0feb8d83fb5cd4a8a0c2fdf4591a8a31e920d6bba75ae7c0f +SHA512 (glusterfs-7.7.tar.gz) = 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125 From 7f2daa43d25791947c58ffaa58a30ff4f7551684 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 22 Jul 2020 08:36:55 -0400 Subject: [PATCH 4/6] 7.7, remove contrib/rpc/xdr_sizeof.c Signed-off-by: Kaleb S. KEITHLEY --- 0001-rpc-rpc-lib-src-Makefile.am.patch | 12 ++++++++++++ glusterfs.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0001-rpc-rpc-lib-src-Makefile.am.patch diff --git a/0001-rpc-rpc-lib-src-Makefile.am.patch b/0001-rpc-rpc-lib-src-Makefile.am.patch new file mode 100644 index 0000000..4b167fc --- /dev/null +++ b/0001-rpc-rpc-lib-src-Makefile.am.patch @@ -0,0 +1,12 @@ +--- glusterfs-8.0/rpc/rpc-lib/src/Makefile.am.orig 2020-07-22 08:09:31.315980869 -0400 ++++ glusterfs-8.0/rpc/rpc-lib/src/Makefile.am 2020-07-22 08:10:12.203980869 -0400 +@@ -2,8 +2,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 \ +- rpc-drc.c $(CONTRIBDIR)/sunrpc/xdr_sizeof.c rpc-clnt-ping.c \ +- autoscale-threads.c mgmt-pmap.c ++ rpc-drc.c rpc-clnt-ping.c autoscale-threads.c mgmt-pmap.c + + EXTRA_DIST = libgfrpc.sym + diff --git a/glusterfs.spec b/glusterfs.spec index 7cae433..576ebf4 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -213,6 +213,7 @@ Source8: glusterfsd.init %else Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif +Patch0001: 0001-rpc-rpc-lib-src-Makefile.am.patch Requires(pre): shadow-utils BuildRequires: systemd @@ -671,6 +672,7 @@ for f in api events extras geo-replication libglusterfs tools xlators; do find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \; done %endif +%patch0001 -p1 %build @@ -1381,7 +1383,10 @@ exit 0 %endif %changelog -* Mon Jul 21 2020 Kaleb S. KEITHLEY - 7.7-1 +* Wed Jul 22 2020 Kaleb S. KEITHLEY - 7.7-2 +- 7.7, remove contrib/rpc/xdr_sizeof.c + +* Tue Jul 21 2020 Kaleb S. KEITHLEY - 7.7-1 - 7.7 GA * Mon May 18 2020 Kaleb S. KEITHLEY - 7.6-1 From abe1597d27906f668f26e39529edcfe7769c95df Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 22 Jul 2020 08:38:09 -0400 Subject: [PATCH 5/6] 7.7, remove contrib/rpc/xdr_sizeof.c Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 576ebf4..2ef97be 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -196,7 +196,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 7.7 -Release: 1%{?dev:%{dev}}%{?dist} +Release: 2%{?dev:%{dev}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ From aa9a05688944b8b421d23d8aad1c7e833acb1528 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 28 Sep 2020 07:42:13 -0400 Subject: [PATCH 6/6] 7.8 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 2ef97be..8be45c9 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -195,8 +195,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 7.7 -Release: 2%{?dev:%{dev}}%{?dist} +Version: 7.8 +Release: 1%{?dev:%{dev}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -259,17 +259,17 @@ BuildRequires: libattr-devel BuildRequires: firewalld %endif -Obsoletes: hekafs +Obsoletes: hekafs <= %{version}-%{release} Obsoletes: %{name}-common < %{version}-%{release} Obsoletes: %{name}-core < %{version}-%{release} %if ( 0%{_for_fedora_koji_builds} ) -Obsoletes: %{name}-regression-tests +Obsoletes: %{name}-regression-tests <= %{version}-%{release} %endif -Obsoletes: %{name}-ufo +Obsoletes: %{name}-ufo <= %{version}-%{release} %if ( 0%{!?_with_gnfs:1} ) -Obsoletes: %{name}-gnfs +Obsoletes: %{name}-gnfs <= %{version}-%{release} %endif -Obsoletes: %{name}-ganesha +Obsoletes: %{name}-ganesha <= %{version}-%{release} Provides: %{name}-common = %{version}-%{release} Provides: %{name}-core = %{version}-%{release} @@ -1383,6 +1383,9 @@ exit 0 %endif %changelog +* Mon Sep 28 2020 Kaleb S. KEITHLEY - 7.8-1 +- 7.8 GA + * Wed Jul 22 2020 Kaleb S. KEITHLEY - 7.7-2 - 7.7, remove contrib/rpc/xdr_sizeof.c diff --git a/sources b/sources index 5f47d69..27ddd28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-7.7.tar.gz) = 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125 +SHA512 (glusterfs-7.8.tar.gz) = 40f7df4bb80a372b370366e8f370f9efdf838122be84d5524b2353027b4eb6005a43b808911214c56411264764164d6480418329db94ed0fe284fdcbd9bccbea