From 165b431299e1fc9de1f9dbafedbc6a01a64d5c36 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 23 Jun 2020 13:14:09 -0400 Subject: [PATCH 1/9] explicit BuildRequires: python3-setuptools Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 9dca115..52f174b 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -259,6 +259,7 @@ BuildRequires: python-devel %else Requires: python3-gobject, python3-pyparsing BuildRequires: python3-devel +BuildRequires: python3-setuptools %endif %if ( 0%{?suse_version} ) Requires: dbus-1-python @@ -859,6 +860,9 @@ exit 0 %endif %changelog +* Tue Jun 23 2020 Kaleb S. KEITHLEY +- explicit BuildRequires: python3-setuptools + * Thu Jun 18 2020 Kaleb S. KEITHLEY - 3.3-3 - rhbz#1848208 From d96da186ebe00868e55a5a58ea5cb41b40b7b863 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 13 Jul 2020 08:31:14 -0400 Subject: [PATCH 2/9] rpc-statd.conf.el8 Signed-off-by: Kaleb S. KEITHLEY --- 0001-systemd-revised-drop-in-conf-file-handling.patch | 7 ++++++- nfs-ganesha.spec | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/0001-systemd-revised-drop-in-conf-file-handling.patch b/0001-systemd-revised-drop-in-conf-file-handling.patch index f259915..3966444 100644 --- a/0001-systemd-revised-drop-in-conf-file-handling.patch +++ b/0001-systemd-revised-drop-in-conf-file-handling.patch @@ -91,7 +91,12 @@ diff --git a/src/scripts/systemd/rpc-statd.conf.el8 b/src/scripts/systemd/rpc-st index 6fec09af1..b67cfdf24 100644 --- a/src/scripts/systemd/rpc-statd.conf.el8 +++ b/src/scripts/systemd/rpc-statd.conf.el8 -@@ -10,5 +10,5 @@ PartOf=nfs-utils.service +@@ -1,3 +1,4 @@ ++[Unit] + Description=NFS status monitor for NFSv2/3 locking. + DefaultDependencies=no + Conflicts=umount.target +@@ -10,5 +11,5 @@ [Service] Environment=RPC_STATD_NO_NOTIFY=1 Type=forking diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 52f174b..2fbef29 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -115,7 +115,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.3 -Release: 3%{?dev:%{dev}}%{?dist} +Release: 4%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki @@ -860,6 +860,9 @@ exit 0 %endif %changelog +* Mon Jul 13 2020 Kaleb S. KEITHLEY - 3.3-4 +- rpc-statd.conf.el8 + * Tue Jun 23 2020 Kaleb S. KEITHLEY - explicit BuildRequires: python3-setuptools From a49b203422695fe6ef81cb41c1f5e04e0cbecd01 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 20 Jul 2020 17:17:06 -0400 Subject: [PATCH 3/9] use /usr/bin/make install DESTDIR=/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-5.fc33.x86_64 INSTALL="/usr/bin/install -p" Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 2fbef29..9027a95 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -115,7 +115,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.3 -Release: 4%{?dev:%{dev}}%{?dist} +Release: 5%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki @@ -602,7 +602,7 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g install -m 644 config_samples/gpfs.ganesha.exports.conf %{buildroot}%{_sysconfdir}/ganesha %endif -make DESTDIR=%{buildroot} install +%make_install %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) install -d %{buildroot}%{_selinux_store_path}/packages @@ -860,6 +860,9 @@ exit 0 %endif %changelog +* Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-5 +- use %make_install + * Mon Jul 13 2020 Kaleb S. KEITHLEY - 3.3-4 - rpc-statd.conf.el8 From 542de333e77792ea65a5731c7ef1f94f2762dc2e Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 20 Jul 2020 17:32:17 -0400 Subject: [PATCH 4/9] use /usr/bin/make install DESTDIR=/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-5.fc33.x86_64 INSTALL="/usr/bin/install -p" Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 9027a95..b409bd1 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -1,5 +1,6 @@ %global _hardened_build 1 +%global __cmake_in_source_build 1 %if ( 0%{?suse_version} ) BuildRequires: distribution-release From a4ec89c0bbda9023d4a9e074d687051d41d8b6a3 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 20 Jul 2020 18:50:27 -0400 Subject: [PATCH 5/9] use cmake_build and DESTDIR="/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-6.fc33.x86_64" /usr/bin/cmake --install "." Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index b409bd1..ae522d8 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -1,6 +1,5 @@ %global _hardened_build 1 -%global __cmake_in_source_build 1 %if ( 0%{?suse_version} ) BuildRequires: distribution-release @@ -116,7 +115,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.3 -Release: 5%{?dev:%{dev}}%{?dist} +Release: 6%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki @@ -529,7 +528,8 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DALLOCATOR=jemalloc %endif -make VERBOSE=1 %{?_smp_mflags} || make %{?_smp_mflags} || make +export VERBOSE=1 +%cmake_build %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) make -C selinux -f /usr/share/selinux/devel/Makefile ganesha.pp @@ -603,7 +603,7 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g install -m 644 config_samples/gpfs.ganesha.exports.conf %{buildroot}%{_sysconfdir}/ganesha %endif -%make_install +%cmake_install %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) install -d %{buildroot}%{_selinux_store_path}/packages @@ -861,6 +861,9 @@ exit 0 %endif %changelog +* Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-6 +- use cmake_build and %cmake_install + * Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-5 - use %make_install From ab19725f23e738293f8da0b4812d9c9b11f4089f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 09:08:01 +0000 Subject: [PATCH 6/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nfs-ganesha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index ae522d8..239cbbc 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -115,7 +115,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.3 -Release: 6%{?dev:%{dev}}%{?dist} +Release: 7%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki @@ -861,6 +861,9 @@ exit 0 %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-6 - use cmake_build and %cmake_install From 3b2b58f384d9d10ae2c2a41e068fe0d9d97545b1 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 5 Nov 2020 13:43:16 -0500 Subject: [PATCH 7/9] BuildRequires: make Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 239cbbc..85b9a4c 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -115,15 +115,17 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.3 -Release: 7%{?dev:%{dev}}%{?dist} +Release: 8%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source0: https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:-%{dev}}.tar.gz Patch0001: 0001-systemd-revised-drop-in-conf-file-handling.patch +Patch0002: 0002-selinux-ganesha.te.patch BuildRequires: cmake +BuildRequires: make BuildRequires: bison BuildRequires: flex BuildRequires: pkgconfig @@ -495,6 +497,7 @@ Development headers and auxiliary files for developing with %{name}. %prep %setup -q -n %{name}-%{version}%{?dev:-%{dev}} %patch0001 -p1 +%patch0002 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -861,7 +864,13 @@ exit 0 %endif %changelog -* Tue Jul 28 2020 Fedora Release Engineering - 3.3-7 +* Thu Nov 5 2020 Kaleb S. KEITHLEY - 3.3-8 +- BuildRequires: make + +* Tue Sep 8 2020 Kaleb S. KEITHLEY - 3.3-7 +- selinux + +* Tue Jul 28 2020 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Mon Jul 20 2020 Kaleb S. KEITHLEY - 3.3-6 From 14466c6a6e53c3f92cad51f87297588b74600430 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 5 Nov 2020 13:44:36 -0500 Subject: [PATCH 8/9] BuildRequires: make Signed-off-by: Kaleb S. KEITHLEY --- 0002-selinux-ganesha.te.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 0002-selinux-ganesha.te.patch diff --git a/0002-selinux-ganesha.te.patch b/0002-selinux-ganesha.te.patch new file mode 100644 index 0000000..c09a71a --- /dev/null +++ b/0002-selinux-ganesha.te.patch @@ -0,0 +1,17 @@ +diff --git a/src/selinux/ganesha.te b/src/selinux/ganesha.te +index 246f9cc8c..6692eedf2 100644 +--- a/src/selinux/ganesha.te ++++ b/src/selinux/ganesha.te +@@ -307,3 +307,12 @@ allow ganesha_t self:capability { fowner setgid setuid }; + # allow ganesha_t glusterd_brick_t:dir { add_name getattr open read write remove_name search }; + # allow ganesha_t glusterd_brick_t:file { create getattr open read write unlink }; + ++######################################## ++# ++# ganesha local policy rhbz#1855350 ++ ++ifdef(`ceph_read_lib_files',` ++ optional_policy(` ++ ceph_read_lib_files(ganesha_t) ++ ') ++') From bf71e9072346819a9aeece2e1058b714ede8663e Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 24 Dec 2020 08:19:55 -0500 Subject: [PATCH 9/9] NFS-Ganesha 3.4 GA Signed-off-by: Kaleb S KEITHLEY --- nfs-ganesha.spec | 21 ++++++++++----------- sources | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 85b9a4c..e447b49 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -114,15 +114,13 @@ Requires: openSUSE-release # %%global dev rc5 Name: nfs-ganesha -Version: 3.3 -Release: 8%{?dev:%{dev}}%{?dist} +Version: 3.4 +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source0: https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:-%{dev}}.tar.gz -Patch0001: 0001-systemd-revised-drop-in-conf-file-handling.patch -Patch0002: 0002-selinux-ganesha.te.patch BuildRequires: cmake BuildRequires: make @@ -157,7 +155,7 @@ BuildRequires: libwbclient-devel %endif BuildRequires: gcc-c++ %if ( %{with_system_ntirpc} ) -BuildRequires: libntirpc-devel = 3.3 +BuildRequires: libntirpc-devel = 3.4 %else Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif @@ -211,7 +209,8 @@ BuildRequires: python3-sphinx %endif %endif Requires(post): psmisc -Requires(pre): shadow-utils +Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) Requires: nfs-ganesha-selinux = %{version}-%{release} @@ -262,12 +261,12 @@ BuildRequires: python-devel Requires: python3-gobject, python3-pyparsing BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif %if ( 0%{?suse_version} ) Requires: dbus-1-python %else Requires: python3-dbus %endif +%endif %if %{with gui_utils} %if ( 0%{?suse_version} ) @@ -362,6 +361,7 @@ be used with NFS-Ganesha to support GPFS backend Summary: The NFS-GANESHA CephFS FSAL Requires: nfs-ganesha = %{version}-%{release} BuildRequires: libcephfs2-devel >= 12.2.0 +BuildRequires: libacl-devel %description ceph This package contains a FSAL shared object to @@ -496,8 +496,6 @@ Development headers and auxiliary files for developing with %{name}. %prep %setup -q -n %{name}-%{version}%{?dev:-%{dev}} -%patch0001 -p1 -%patch0002 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -670,8 +668,6 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha %dir %{_sysconfdir}/ganesha/ %config(noreplace) %{_sysconfdir}/ganesha/ganesha.conf -%dir %{_defaultdocdir}/ganesha/ -%{_defaultdocdir}/ganesha/* %doc src/ChangeLog %dir %{_rundir}/ganesha %dir %{_libexecdir}/ganesha/ @@ -864,6 +860,9 @@ exit 0 %endif %changelog +* Wed Dec 23 2020 Kaleb S. KEITHLEY - 3.4-1 +- NFS-Ganesha 3.4 GA + * Thu Nov 5 2020 Kaleb S. KEITHLEY - 3.3-8 - BuildRequires: make diff --git a/sources b/sources index 47f87c8..5af2183 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-3.3.tar.gz) = 35b5f0da26ba7a29738e7c80bb339d7643a1e06cb70e96c790a750a6d8d2ae76434f0e912e9bd00c9fcddb2916fdadc0c5f224069b1699cb4f90926231d64e71 +SHA512 (nfs-ganesha-3.4.tar.gz) = fe72d41cf9983824c78a622752e1ae608e14737868b9ab3528ffc019ff990c0336e226fe2a43de1757a694a470ddd47b4dc5580591c47d480f8472c72ee76058