From cc278f54ebdb3758844682281a98f07b316576b0 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 21 Mar 2017 08:45:31 -0400 Subject: [PATCH 01/31] nfs-ganesha 2.4.4 GA --- nfs-ganesha.spec | 11 +++++++++-- sources | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 801fe75..15a0484 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -73,8 +73,8 @@ Requires: sles-release >= 12 %global use_system_ntirpc %{on_off_switch system_ntirpc} Name: nfs-ganesha -Version: 2.4.3 -Release: 2%{?dev:%{dev}}%{?dist} +Version: 2.4.4 +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -102,7 +102,11 @@ BuildRequires: gcc-c++ %if %{with system_ntirpc} BuildRequires: libntirpc-devel >= 1.4.1 %endif +%if ( 0%{?fedora} ) +# this should effectively be a no-op, as all Fedora installs should have it +# with selinux. Requires: policycoreutils-python +%endif Requires: nfs-utils %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) || ( 0%{?suse_version} ) Requires: rpcbind @@ -544,6 +548,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Tue Mar 21 2017 Kaleb S. KEITHLEY 2.4.4-1 +- nfs-ganesha 2.4.4 GA + * Thu Feb 9 2017 Kaleb S. KEITHLEY 2.4.3-2 - nfs-ganesha 2.4.3 GA, reenable FSAL_CEPH and FSAL_RGW diff --git a/sources b/sources index b071202..fb36b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.4.3.tar.gz) = e2b438f046d2032933749a37aa763040d6b708b02cd50e3ad063fdd395cbf0dae8747759857bb7488be729069c910f0102e0893bcfc0302fe6d82cd5b5e5edcd +SHA512 (nfs-ganesha-2.4.4.tar.gz) = 88ecceb1af0bea27e97621970ea727e77a1fe45ee94f33261898c6750e73d73579fb8ef0bdb6af0df545d0013ffdbf06321afd5ef8847e6e3dc91a6b32a3f4ed From 066e64aa67ca2f9d0c15c7872366b7ab421c217b Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 5 Apr 2017 09:50:22 -0400 Subject: [PATCH 02/31] nfs-ganesha 2.4.5 GA --- nfs-ganesha.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 15a0484..c7fb1c5 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -46,7 +46,7 @@ Requires: sles-release >= 12 %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} -%bcond_without rgw +%bcond_with rgw %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -73,7 +73,7 @@ Requires: sles-release >= 12 %global use_system_ntirpc %{on_off_switch system_ntirpc} Name: nfs-ganesha -Version: 2.4.4 +Version: 2.4.5 Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System @@ -548,6 +548,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Wed Apr 5 2017 Kaleb S. KEITHLEY 2.4.5-1 +- nfs-ganesha 2.4.5 GA + * Tue Mar 21 2017 Kaleb S. KEITHLEY 2.4.4-1 - nfs-ganesha 2.4.4 GA diff --git a/sources b/sources index fb36b8a..39b2df0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.4.4.tar.gz) = 88ecceb1af0bea27e97621970ea727e77a1fe45ee94f33261898c6750e73d73579fb8ef0bdb6af0df545d0013ffdbf06321afd5ef8847e6e3dc91a6b32a3f4ed +SHA512 (nfs-ganesha-2.4.5.tar.gz) = 1c0b68d2b818d53b3dd5881a10c13b125640edbecdd07ade2e09bba042b3088bb1c0a30b6e498e7872fbe7d16641730f9cbcbb336b4129f333a55569a7762984 From bfd42fc37561f2a62fae9a246502ff4baa38fac9 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 19 Apr 2017 13:43:37 -0400 Subject: [PATCH 03/31] nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7) --- nfs-ganesha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index c7fb1c5..5f642eb 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -46,7 +46,7 @@ Requires: sles-release >= 12 %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} -%bcond_with rgw +%bcond_without rgw %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -74,7 +74,7 @@ Requires: sles-release >= 12 Name: nfs-ganesha Version: 2.4.5 -Release: 1%{?dev:%{dev}}%{?dist} +Release: 2%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -548,6 +548,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Wed Apr 19 2017 Kaleb S. KEITHLEY 2.4.5-2 +- nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7) + * Wed Apr 5 2017 Kaleb S. KEITHLEY 2.4.5-1 - nfs-ganesha 2.4.5 GA From 59466f6b5c1c48f28a0aed6a6ae298a3556ecf13 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sat, 22 Apr 2017 08:38:40 -0400 Subject: [PATCH 04/31] nfs-ganesha 2.5rc2 --- nfs-ganesha.spec | 65 +++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 5f642eb..0fdec3a 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -37,6 +37,9 @@ Requires: sles-release >= 12 %bcond_without nullfs %global use_fsal_null %{on_off_switch nullfs} +%bcond_with mem +%global use_fsal_mem %{on_off_switch mem} + %bcond_with gpfs %global use_fsal_gpfs %{on_off_switch gpfs} @@ -46,7 +49,7 @@ Requires: sles-release >= 12 %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} -%bcond_without rgw +%bcond_with rgw %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -72,15 +75,18 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} +%global dev rc2 +%global dash_dev_version 2.5-rc2 + Name: nfs-ganesha -Version: 2.4.5 -Release: 2%{?dev:%{dev}}%{?dist} +Version: 2.5.0 +Release: 0.1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki -Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz BuildRequires: cmake BuildRequires: bison @@ -100,7 +106,7 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: gcc-c++ %if %{with system_ntirpc} -BuildRequires: libntirpc-devel >= 1.4.1 +BuildRequires: libntirpc-devel >= 1.5.0 %endif %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it @@ -136,6 +142,7 @@ Requires(postun): systemd %else BuildRequires: initscripts %endif +Requires(post): psmisc # Use CMake variables @@ -177,9 +184,9 @@ be used with NFS-Ganesha to support PROXY based filesystems Summary: The NFS-GANESHA's util scripts Group: Applications/System %if ( 0%{?suse_version} ) -Requires: dbus-1-python, python-gobject2 +Requires: dbus-1-python, python-gobject2 python-pyparsing %else -Requires: dbus-python, pygobject2 +Requires: dbus-python, pygobject2, pyparsing %endif %if %{with gui_utils} %if ( 0%{?suse_version} ) @@ -224,6 +231,18 @@ This package contains a Stackable FSAL shared object to be used with NFS-Ganesha. This is mostly a template for future (more sophisticated) stackable FSALs %endif +# MEM +%if %{with mem} +%package mem +Summary: The NFS-GANESHA's Memory backed testing FSAL +Group: Applications/System +Requires: nfs-ganesha = %{version}-%{release} + +%description mem +This package contains a FSAL shared object to be used with NFS-Ganesha. This +is used for speed and latency testing. +%endif + # GPFS %if %{with gpfs} %package gpfs @@ -242,7 +261,7 @@ be used with NFS-Ganesha to support GPFS backend Summary: The NFS-GANESHA's CephFS FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: libcephfs1-devel >= 10.2.0 +BuildRequires: libcephfs1-devel >= 10.2.7 %description ceph This package contains a FSAL shared object to @@ -255,7 +274,7 @@ be used with NFS-Ganesha to support CephFS Summary: The NFS-GANESHA's Ceph RGW FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: librgw2-devel >= 10.2.0 +BuildRequires: librgw2-devel >= 10.2.7 %description rgw This package contains a FSAL shared object to @@ -293,7 +312,7 @@ be used with NFS-Ganesha to support PANFS Summary: The NFS-GANESHA's GLUSTER FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: glusterfs-api-devel >= 3.8.5 +BuildRequires: glusterfs-api-devel >= 3.10.0 BuildRequires: libattr-devel, libacl-devel %description gluster @@ -302,13 +321,14 @@ be used with NFS-Ganesha to support Gluster %endif %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{dash_dev_version} rm -rf contrib/libzfswrapper %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_CONFIG=rpmbuild \ -DUSE_FSAL_NULL=%{use_fsal_null} \ + -DUSE_FSAL_MEM=%{use_fsal_mem} \ -DUSE_FSAL_ZFS=NO \ -DUSE_FSAL_XFS=%{use_fsal_xfs} \ -DUSE_FSAL_CEPH=%{use_fsal_ceph} \ @@ -373,6 +393,11 @@ install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif +%if %{with rgw} +install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 644 config_samples/rgw_bucket.conf %{buildroot}%{_sysconfdir}/ganesha +%endif + %if %{with gluster} install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/logrotate.d/ganesha-gfapi %endif @@ -403,7 +428,7 @@ make DESTDIR=%{buildroot} install %systemd_post nfs-ganesha-config.service %endif %endif -killall -SIGHUP dbus-daemon 2>&1 > /dev/null +killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %preun %if ( 0%{?suse_version} ) @@ -427,8 +452,8 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %license src/LICENSE.txt %{_bindir}/ganesha.nfsd %if ! %{with system_ntirpc} -%{_libdir}/libntirpc.so.1.4.0 -%{_libdir}/libntirpc.so.1.4 +%{_libdir}/libntirpc.so.1.5.0 +%{_libdir}/libntirpc.so.1.5 %{_libdir}/libntirpc.so %{_libdir}/pkgconfig/libntirpc.pc %{_includedir}/ntirpc/ @@ -471,6 +496,12 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %{_libdir}/ganesha/libfsalnull* %endif +%if %{with mem} +%files mem +%defattr(-,root,root,-) +%{_libdir}/ganesha/libfsalmem* +%endif + %if %{with gpfs} %files gpfs %{_libdir}/ganesha/libfsalgpfs* @@ -502,6 +533,7 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %defattr(-,root,root,-) %{_libdir}/ganesha/libfsalrgw* %config(noreplace) %{_sysconfdir}/ganesha/rgw.conf +%config(noreplace) %{_sysconfdir}/ganesha/rgw_bucket.conf %endif %if %{with gluster} @@ -545,9 +577,14 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %{_bindir}/ganesha_stats %{_bindir}/sm_notify.ganesha %{_bindir}/ganesha_mgr +%{_bindir}/ganesha_conf +%{_mandir}/*/* %endif %changelog +* Mon Apr 24 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc2 +- nfs-ganesha 2.5rc2 + * Wed Apr 19 2017 Kaleb S. KEITHLEY 2.4.5-2 - nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7) diff --git a/sources b/sources index 39b2df0..1fc8296 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.4.5.tar.gz) = 1c0b68d2b818d53b3dd5881a10c13b125640edbecdd07ade2e09bba042b3088bb1c0a30b6e498e7872fbe7d16641730f9cbcbb336b4129f333a55569a7762984 +SHA512 (nfs-ganesha-2.5-rc2.tar.gz) = 41647c1f2096a5beb944665831370829f86f6f5fb55a7e17f8060a4c251bdd03704b458cfea97ba747398eccc9b39c600a67121e96fd409a5e2c3e7fc5e87d5d From 2c451eb2c568d291c69b0a2804549a7af604cb5a Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 1 May 2017 10:45:21 -0400 Subject: [PATCH 05/31] nfs-ganesha 2.5rc3 --- nfs-ganesha.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 0fdec3a..54754a7 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc2 -%global dash_dev_version 2.5-rc2 +%global dev rc3 +%global dash_dev_version 2.5-rc3 Name: nfs-ganesha Version: 2.5.0 -Release: 0.1%{?dev:%{dev}}%{?dist} +Release: 0.2%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -582,6 +582,9 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %endif %changelog +* Mon May 1 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc3 +- nfs-ganesha 2.5rc3 + * Mon Apr 24 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc2 - nfs-ganesha 2.5rc2 diff --git a/sources b/sources index 1fc8296..f69018e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5-rc2.tar.gz) = 41647c1f2096a5beb944665831370829f86f6f5fb55a7e17f8060a4c251bdd03704b458cfea97ba747398eccc9b39c600a67121e96fd409a5e2c3e7fc5e87d5d +SHA512 (nfs-ganesha-2.5-rc3.tar.gz) = 9da03c168e3afdd02abda38a56892e5394c63f1ffbfbb2f97c6131dcf8c2dfea0343916e4134cdbf6629620c977110e2e6330a56e40fb887a826b3d29645b1c1 From 6368c27d68510b97d14269ea5d5ee1a23303128c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 8 May 2017 06:44:21 -0400 Subject: [PATCH 06/31] nfs-ganesha 2.5rc4 --- nfs-ganesha.spec | 24 +++++++++++++++++++++--- sources | 1 + 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 54754a7..78cac9b 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc3 -%global dash_dev_version 2.5-rc3 +%global dev rc4 +%global dash_dev_version 2.5-rc4 Name: nfs-ganesha Version: 2.5.0 -Release: 0.2%{?dev:%{dev}}%{?dist} +Release: 0.3%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -143,6 +143,7 @@ Requires(postun): systemd BuildRequires: initscripts %endif Requires(post): psmisc +Requires(pre): shadow-utils # Use CMake variables @@ -379,6 +380,11 @@ install -m 644 scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-g install -m 644 scripts/systemd/nfs-ganesha-lock.service %{buildroot}%{_unitdir}/nfs-ganesha-lock.service install -m 644 scripts/systemd/nfs-ganesha-config.service %{buildroot}%{_unitdir}/nfs-ganesha-config.service install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha +%if 0%{?_tmpfilesdir:1} +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 644 scripts/systemd/tmpfiles.d/ganesha.conf %{buildroot}%{_tmpfilesdir} +%endif +mkdir -p %{buildroot}%{_localstatedir}/log/ganesha %else mkdir -p %{buildroot}%{_sysconfdir}/init.d install -m 755 scripts/init.d/nfs-ganesha.el6 %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha @@ -430,6 +436,11 @@ make DESTDIR=%{buildroot} install %endif killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : +%pre +getent group ganesha > /dev/null || groupadd -r ganesha +getent passwd ganesha > /dev/null || useradd -r -g ganesha -d /var/run/ganesha -s /sbin/nologin -c "NFS-Ganesha Daemon" ganesha +exit 0 + %preun %if ( 0%{?suse_version} ) %service_del_preun nfs-ganesha-lock.service @@ -469,11 +480,15 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %dir %{_localstatedir}/run/ganesha %dir %{_libexecdir}/ganesha/ %{_libexecdir}/ganesha/nfs-ganesha-config.sh +%dir %attr(0755,ganesha,ganesha) %{_localstatedir}/log/ganesha %if %{with_systemd} %{_unitdir}/nfs-ganesha.service %{_unitdir}/nfs-ganesha-lock.service %{_unitdir}/nfs-ganesha-config.service +%if 0%{?_tmpfilesdir:1} +%{_tmpfilesdir}/ganesha.conf +%endif %else %{_sysconfdir}/init.d/nfs-ganesha %endif @@ -582,6 +597,9 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %endif %changelog +* Mon May 8 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc4 +- nfs-ganesha 2.5rc4 + * Mon May 1 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc3 - nfs-ganesha 2.5rc3 diff --git a/sources b/sources index f69018e..17c670e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (nfs-ganesha-2.5-rc3.tar.gz) = 9da03c168e3afdd02abda38a56892e5394c63f1ffbfbb2f97c6131dcf8c2dfea0343916e4134cdbf6629620c977110e2e6330a56e40fb887a826b3d29645b1c1 +SHA512 (nfs-ganesha-2.5-rc4.tar.gz) = c8132bc701e3bce550f1c65068bcf0e69beabcbc80783fc469f771f71b3e8d22494a386c956765b41f7cf3e926fe894cbef4ae59cfedaef29c2daec3f23a7fb1 From 8a9dc58eb504fe3fa38a1fc667219c5a22749bce Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 8 May 2017 07:21:22 -0400 Subject: [PATCH 07/31] nfs-ganesha 2.5rc4 --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 17c670e..3ee16b0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (nfs-ganesha-2.5-rc3.tar.gz) = 9da03c168e3afdd02abda38a56892e5394c63f1ffbfbb2f97c6131dcf8c2dfea0343916e4134cdbf6629620c977110e2e6330a56e40fb887a826b3d29645b1c1 SHA512 (nfs-ganesha-2.5-rc4.tar.gz) = c8132bc701e3bce550f1c65068bcf0e69beabcbc80783fc469f771f71b3e8d22494a386c956765b41f7cf3e926fe894cbef4ae59cfedaef29c2daec3f23a7fb1 From 23164b906248b4ac1598199c184fc8b837fd17f7 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 11 May 2017 07:18:28 -0400 Subject: [PATCH 08/31] rebuild with libntirpc-1.5.1 --- nfs-ganesha.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 78cac9b..f097331 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -80,7 +80,7 @@ Requires: sles-release >= 12 Name: nfs-ganesha Version: 2.5.0 -Release: 0.3%{?dev:%{dev}}%{?dist} +Release: 0.4%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -106,7 +106,7 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: gcc-c++ %if %{with system_ntirpc} -BuildRequires: libntirpc-devel >= 1.5.0 +BuildRequires: libntirpc-devel >= 1.5.1 %endif %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it @@ -597,10 +597,13 @@ exit 0 %endif %changelog -* Mon May 8 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc4 +* Wed May 10 2017 Kaleb S. KEITHLEY 2.5.0-0.4rc4 +- rebuild with libntirpc-1.5.1 + +* Mon May 8 2017 Kaleb S. KEITHLEY 2.5.0-0.3rc4 - nfs-ganesha 2.5rc4 -* Mon May 1 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc3 +* Mon May 1 2017 Kaleb S. KEITHLEY 2.5.0-0.2rc3 - nfs-ganesha 2.5rc3 * Mon Apr 24 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc2 From 2374aacdbeff8d34658d44e3935822f1d250cd15 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 11 May 2017 07:23:09 -0400 Subject: [PATCH 09/31] nfs-ganesha 2.5rc5 --- nfs-ganesha.spec | 9 ++++++--- sources | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index f097331..69d804d 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc4 -%global dash_dev_version 2.5-rc4 +%global dev rc5 +%global dash_dev_version 2.5-rc5 Name: nfs-ganesha Version: 2.5.0 -Release: 0.4%{?dev:%{dev}}%{?dist} +Release: 0.5%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -597,6 +597,9 @@ exit 0 %endif %changelog +* Thu May 11 2017 Kaleb S. KEITHLEY 2.5.0-0.5rc5 +- nfs-ganesha 2.5rc5 + * Wed May 10 2017 Kaleb S. KEITHLEY 2.5.0-0.4rc4 - rebuild with libntirpc-1.5.1 diff --git a/sources b/sources index 3ee16b0..cecb88c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (nfs-ganesha-2.5-rc4.tar.gz) = c8132bc701e3bce550f1c65068bcf0e69beabcbc80783fc469f771f71b3e8d22494a386c956765b41f7cf3e926fe894cbef4ae59cfedaef29c2daec3f23a7fb1 +SHA512 (nfs-ganesha-2.5-rc5.tar.gz) = 3ac13c115d8bf646676bc13587f30c2d05e82f791c3b7d287e1717cd3a1b7320ca74a7d2f8e6f925fce7ad9ff9209c682a972bea08aed8f8f64dda81bc11d1b4 From 0ccf11e5e8bbdaca6a319d8c38ac712db7282ba2 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sun, 14 May 2017 17:54:49 -0400 Subject: [PATCH 10/31] nfs-ganesha 2.5rc6 --- nfs-ganesha.spec | 9 ++++++--- sources | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 69d804d..83e8d22 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc5 -%global dash_dev_version 2.5-rc5 +%global dev rc6 +%global dash_dev_version 2.5-rc6 Name: nfs-ganesha Version: 2.5.0 -Release: 0.5%{?dev:%{dev}}%{?dist} +Release: 0.6%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -597,6 +597,9 @@ exit 0 %endif %changelog +* Sun May 14 2017 Kaleb S. KEITHLEY 2.5.0-0.6rc6 +- nfs-ganesha 2.5rc6 + * Thu May 11 2017 Kaleb S. KEITHLEY 2.5.0-0.5rc5 - nfs-ganesha 2.5rc5 diff --git a/sources b/sources index cecb88c..178a2c3 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (nfs-ganesha-2.5-rc4.tar.gz) = c8132bc701e3bce550f1c65068bcf0e69beabcbc80783fc469f771f71b3e8d22494a386c956765b41f7cf3e926fe894cbef4ae59cfedaef29c2daec3f23a7fb1 SHA512 (nfs-ganesha-2.5-rc5.tar.gz) = 3ac13c115d8bf646676bc13587f30c2d05e82f791c3b7d287e1717cd3a1b7320ca74a7d2f8e6f925fce7ad9ff9209c682a972bea08aed8f8f64dda81bc11d1b4 +SHA512 (nfs-ganesha-2.5-rc6.tar.gz) = 10d0617c3d293c18119a18b2d4b7df18d54bfa4073265189b0d4eaf344392f6d96f435ff77e5d7d226cbb8d9f2395320047118e63956232fbbd2e8f248966299 From b8570f7f58b9f4fee2ef363442693f0f25c689c2 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sun, 14 May 2017 17:55:15 -0400 Subject: [PATCH 11/31] nfs-ganesha 2.5rc6 --- sources | 2 -- 1 file changed, 2 deletions(-) diff --git a/sources b/sources index 178a2c3..21cfe64 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (nfs-ganesha-2.5-rc4.tar.gz) = c8132bc701e3bce550f1c65068bcf0e69beabcbc80783fc469f771f71b3e8d22494a386c956765b41f7cf3e926fe894cbef4ae59cfedaef29c2daec3f23a7fb1 -SHA512 (nfs-ganesha-2.5-rc5.tar.gz) = 3ac13c115d8bf646676bc13587f30c2d05e82f791c3b7d287e1717cd3a1b7320ca74a7d2f8e6f925fce7ad9ff9209c682a972bea08aed8f8f64dda81bc11d1b4 SHA512 (nfs-ganesha-2.5-rc6.tar.gz) = 10d0617c3d293c18119a18b2d4b7df18d54bfa4073265189b0d4eaf344392f6d96f435ff77e5d7d226cbb8d9f2395320047118e63956232fbbd2e8f248966299 From 46a5515e9839a97d9de94400a40039b22a9167da Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 22 May 2017 08:30:59 -0400 Subject: [PATCH 12/31] nfs-ganesha 2.5rc7 --- nfs-ganesha.spec | 11 +++++++---- sources | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 83e8d22..95a49c6 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -46,7 +46,7 @@ Requires: sles-release >= 12 %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} -%bcond_without ceph +%bcond_with ceph %global use_fsal_ceph %{on_off_switch ceph} %bcond_with rgw @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc6 -%global dash_dev_version 2.5-rc6 +%global dev rc7 +%global dash_dev_version 2.5-rc7 Name: nfs-ganesha Version: 2.5.0 -Release: 0.6%{?dev:%{dev}}%{?dist} +Release: 0.7%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -597,6 +597,9 @@ exit 0 %endif %changelog +* Mon May 22 2017 Kaleb S. KEITHLEY 2.5.0-0.7rc7 +- nfs-ganesha 2.5rc7 + * Sun May 14 2017 Kaleb S. KEITHLEY 2.5.0-0.6rc6 - nfs-ganesha 2.5rc6 diff --git a/sources b/sources index 21cfe64..9335480 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (nfs-ganesha-2.5-rc6.tar.gz) = 10d0617c3d293c18119a18b2d4b7df18d54bfa4073265189b0d4eaf344392f6d96f435ff77e5d7d226cbb8d9f2395320047118e63956232fbbd2e8f248966299 +SHA512 (nfs-ganesha-2.5-rc7.tar.gz) = b6cfafa52469e3304c298aaff438029318163c2ee6f06fc2b76dd250ae4cced7554bf9bffba03d924106ca14e350cf61e0657a8fb377f647d3ef474181eeb6d0 From 92b66aed9250ae75ffeee7f610b0d36274e211ca Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 30 May 2017 18:25:04 -0400 Subject: [PATCH 13/31] nfs-ganesha 2.5 rc8, with libntirpc-1.5.2 --- nfs-ganesha.spec | 23 +++++++++++++---------- sources | 3 +-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 95a49c6..f1b6bf7 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc7 -%global dash_dev_version 2.5-rc7 +%global dev rc8 +%global dash_dev_version 2.5-rc8 Name: nfs-ganesha Version: 2.5.0 -Release: 0.7%{?dev:%{dev}}%{?dist} +Release: 0.8%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -106,7 +106,7 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: gcc-c++ %if %{with system_ntirpc} -BuildRequires: libntirpc-devel >= 1.5.1 +BuildRequires: libntirpc-devel >= 1.5.2 %endif %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it @@ -597,26 +597,29 @@ exit 0 %endif %changelog +* Tue May 30 2017 Kaleb S. KEITHLEY 2.5.0-0.8rc8 +- nfs-ganesha 2.5 rc8, with libntirpc-1.5.2 + * Mon May 22 2017 Kaleb S. KEITHLEY 2.5.0-0.7rc7 -- nfs-ganesha 2.5rc7 +- nfs-ganesha 2.5 rc7 * Sun May 14 2017 Kaleb S. KEITHLEY 2.5.0-0.6rc6 -- nfs-ganesha 2.5rc6 +- nfs-ganesha 2.5 rc6 * Thu May 11 2017 Kaleb S. KEITHLEY 2.5.0-0.5rc5 -- nfs-ganesha 2.5rc5 +- nfs-ganesha 2.5 rc5 * Wed May 10 2017 Kaleb S. KEITHLEY 2.5.0-0.4rc4 - rebuild with libntirpc-1.5.1 * Mon May 8 2017 Kaleb S. KEITHLEY 2.5.0-0.3rc4 -- nfs-ganesha 2.5rc4 +- nfs-ganesha 2.5 rc4 * Mon May 1 2017 Kaleb S. KEITHLEY 2.5.0-0.2rc3 -- nfs-ganesha 2.5rc3 +- nfs-ganesha 2.5 rc3 * Mon Apr 24 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc2 -- nfs-ganesha 2.5rc2 +- nfs-ganesha 2.5 rc2 * Wed Apr 19 2017 Kaleb S. KEITHLEY 2.4.5-2 - nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7) diff --git a/sources b/sources index 9335480..07f7a60 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (nfs-ganesha-2.5-rc6.tar.gz) = 10d0617c3d293c18119a18b2d4b7df18d54bfa4073265189b0d4eaf344392f6d96f435ff77e5d7d226cbb8d9f2395320047118e63956232fbbd2e8f248966299 -SHA512 (nfs-ganesha-2.5-rc7.tar.gz) = b6cfafa52469e3304c298aaff438029318163c2ee6f06fc2b76dd250ae4cced7554bf9bffba03d924106ca14e350cf61e0657a8fb377f647d3ef474181eeb6d0 +SHA512 (nfs-ganesha-2.5-rc8.tar.gz) = 4a2cfdf4303dd4687dea3b30505e2f978ccacf191e3383cdca3b3f3c234d284a342bfffc222b97d08365807bed96b7aa9f9dd20831a1bbeafcb35eadb35b0b43 From 417adbba625ad0099edb924e8af5d1453c2e087a Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 6 Jun 2017 02:01:48 -0400 Subject: [PATCH 14/31] nfs-ganesha 2.5 rc8, with libntirpc-1.5.2 --- nfs-ganesha.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index f1b6bf7..351a396 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc8 -%global dash_dev_version 2.5-rc8 +%global dev rc9 +%global dash_dev_version 2.5-rc9 Name: nfs-ganesha Version: 2.5.0 -Release: 0.8%{?dev:%{dev}}%{?dist} +Release: 0.9%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ diff --git a/sources b/sources index 07f7a60..660d52c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5-rc8.tar.gz) = 4a2cfdf4303dd4687dea3b30505e2f978ccacf191e3383cdca3b3f3c234d284a342bfffc222b97d08365807bed96b7aa9f9dd20831a1bbeafcb35eadb35b0b43 +SHA512 (nfs-ganesha-2.5-rc9.tar.gz) = 7aaed2eb6307860aa8e89ae08607bc3855040dcb468ab7105bb86ea0ad12beb52f22b8c7d8c31c4f7a88d3a789650bf74cab9b76c3ab79c9dbd51ca6ab82a3f1 From 9fa6588925cc7509e0b9cae20d087a23d4b3abf1 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 7 Jun 2017 01:54:32 -0400 Subject: [PATCH 15/31] nfs-ganesha 2.5 final --- nfs-ganesha.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 351a396..c4dd1ef 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc9 -%global dash_dev_version 2.5-rc9 +%global dev final +%global dash_dev_version 2.5-final Name: nfs-ganesha Version: 2.5.0 -Release: 0.9%{?dev:%{dev}}%{?dist} +Release: 0.10%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -597,6 +597,12 @@ exit 0 %endif %changelog +* Wed Jun 7 2017 Kaleb S. KEITHLEY 2.5.0-0.10final +- nfs-ganesha 2.5 final + +* Tue Jun 6 2017 Kaleb S. KEITHLEY 2.5.0-0.9rc9 +- nfs-ganesha 2.5 rc9 + * Tue May 30 2017 Kaleb S. KEITHLEY 2.5.0-0.8rc8 - nfs-ganesha 2.5 rc8, with libntirpc-1.5.2 diff --git a/sources b/sources index 660d52c..1678c59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5-rc9.tar.gz) = 7aaed2eb6307860aa8e89ae08607bc3855040dcb468ab7105bb86ea0ad12beb52f22b8c7d8c31c4f7a88d3a789650bf74cab9b76c3ab79c9dbd51ca6ab82a3f1 +SHA512 (nfs-ganesha-2.5-final.tar.gz) = e035e520169deea1d6c4f4cd04cd74226991944aad66414c3def73cfdc185666ff15fbd9c0966ca8d76c3be1c1c63add767e1419e8c1f9ecd9a9cdb1b10caf1e From e97bb47964e8f43ef1f951ab48a453c112e9d01f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 12 Jun 2017 12:24:06 -0400 Subject: [PATCH 16/31] nfs-ganesha 2.5.0 GA --- nfs-ganesha.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index c4dd1ef..3fadaf3 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,18 +75,18 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev final -%global dash_dev_version 2.5-final +# %%global dev final +# %%global dash_dev_version 2.5-final Name: nfs-ganesha Version: 2.5.0 -Release: 0.10%{?dev:%{dev}}%{?dist} +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki -Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: bison @@ -322,12 +322,13 @@ be used with NFS-Ganesha to support Gluster %endif %prep -%setup -q -n %{name}-%{dash_dev_version} +%setup -q -n %{name}-%{version} rm -rf contrib/libzfswrapper %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_CONFIG=rpmbuild \ + -DDSANITIZE_ADDRESS=OFF \ -DUSE_FSAL_NULL=%{use_fsal_null} \ -DUSE_FSAL_MEM=%{use_fsal_mem} \ -DUSE_FSAL_ZFS=NO \ @@ -597,6 +598,9 @@ exit 0 %endif %changelog +* Mon Jun 12 2017 Kaleb S. KEITHLEY 2.5.0-1 +- nfs-ganesha 2.5.0 GA + * Wed Jun 7 2017 Kaleb S. KEITHLEY 2.5.0-0.10final - nfs-ganesha 2.5 final diff --git a/sources b/sources index 1678c59..bb28cc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5-final.tar.gz) = e035e520169deea1d6c4f4cd04cd74226991944aad66414c3def73cfdc185666ff15fbd9c0966ca8d76c3be1c1c63add767e1419e8c1f9ecd9a9cdb1b10caf1e +SHA512 (nfs-ganesha-2.5.0.tar.gz) = 6f00125d71c250fd163e3a7663b30367cbe11d2cb868f36c28ced6ece8e24094d8b62e3649ed669e9b03dfc8d72cdc12ac1ab51bad9b77353a82f30a9f6dd1a9 From 8b3fa92254f7f1b82e58557bb52e95da5f4ee9da Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sun, 25 Jun 2017 18:44:52 -0400 Subject: [PATCH 17/31] nfs-ganesha 2.5.0 rebuild with userspace-rcu-0.10.0 (liburcu-bp.so.6) --- nfs-ganesha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 3fadaf3..f691002 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -80,7 +80,7 @@ Requires: sles-release >= 12 Name: nfs-ganesha Version: 2.5.0 -Release: 1%{?dev:%{dev}}%{?dist} +Release: 2%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -598,6 +598,9 @@ exit 0 %endif %changelog +* Sun Jun 25 2017 Kaleb S. KEITHLEY 2.5.0-2 +- nfs-ganesha 2.5.0 rebuild with userspace-rcu-0.10.0 (liburcu-bp.so.6) + * Mon Jun 12 2017 Kaleb S. KEITHLEY 2.5.0-1 - nfs-ganesha 2.5.0 GA From c046aad3c56da53f4a215186aea481fe9a79c632 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 27 Jun 2017 09:31:32 -0400 Subject: [PATCH 18/31] nfs-ganesha 2.5.0 rebuild with ceph --- nfs-ganesha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index f691002..e55a558 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -46,7 +46,7 @@ Requires: sles-release >= 12 %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} -%bcond_with ceph +%bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} %bcond_with rgw @@ -80,7 +80,7 @@ Requires: sles-release >= 12 Name: nfs-ganesha Version: 2.5.0 -Release: 2%{?dev:%{dev}}%{?dist} +Release: 3%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -598,6 +598,9 @@ exit 0 %endif %changelog +* Tue Jun 27 2017 Kaleb S. KEITHLEY 2.5.0-3 +- nfs-ganesha 2.5.0 rebuild with ceph + * Sun Jun 25 2017 Kaleb S. KEITHLEY 2.5.0-2 - nfs-ganesha 2.5.0 rebuild with userspace-rcu-0.10.0 (liburcu-bp.so.6) From 5e04aa1acda0997f9a49d97f6dd92b2a190c82f2 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 19 Jul 2017 13:23:46 -0400 Subject: [PATCH 19/31] nfs-ganesha 2.5.0 rebuild with libntirpc-1.5.3 --- nfs-ganesha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index e55a558..020ecfb 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -80,7 +80,7 @@ Requires: sles-release >= 12 Name: nfs-ganesha Version: 2.5.0 -Release: 3%{?dev:%{dev}}%{?dist} +Release: 4%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -106,7 +106,7 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: gcc-c++ %if %{with system_ntirpc} -BuildRequires: libntirpc-devel >= 1.5.2 +BuildRequires: libntirpc-devel >= 1.5.3 %endif %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it @@ -598,6 +598,9 @@ exit 0 %endif %changelog +* Wed Jul 19 2017 Kaleb S. KEITHLEY 2.5.0-4 +- nfs-ganesha 2.5.0 rebuild with libntirpc-1.5.3 + * Tue Jun 27 2017 Kaleb S. KEITHLEY 2.5.0-3 - nfs-ganesha 2.5.0 rebuild with ceph From 2bc3ae1b1fb420454656a23d2d4e3d69110f496c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 21 Jul 2017 22:35:04 -0400 Subject: [PATCH 20/31] nfs-ganesha 2.5.1 GA --- nfs-ganesha.spec | 78 ++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 020ecfb..0c1e3ed 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -14,8 +14,14 @@ %endif %if ( 0%{?suse_version} ) +BuildRequires: distribution-release +%if ( ! 0%{?is_opensuse} ) BuildRequires: sles-release >= 12 Requires: sles-release >= 12 +%else +BuildRequires: openSUSE-release +Requires: openSUSE-release +%endif %global with_systemd 1 %global with_nfsidmap 1 @@ -75,12 +81,16 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -# %%global dev final -# %%global dash_dev_version 2.5-final +%bcond_without man_page +%global use_man_page %{on_off_switch man_page} + + +# %%global dev final +# %%global dash_dev_version 2.5-final Name: nfs-ganesha -Version: 2.5.0 -Release: 4%{?dev:%{dev}}%{?dist} +Version: 2.5.1 +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -111,7 +121,7 @@ BuildRequires: libntirpc-devel >= 1.5.3 %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it # with selinux. -Requires: policycoreutils-python +Requires: policycoreutils-python %endif Requires: nfs-utils %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) || ( 0%{?suse_version} ) @@ -142,6 +152,9 @@ Requires(postun): systemd %else BuildRequires: initscripts %endif +%if %{with man_page} +BuildRequires: python-sphinx +%endif Requires(post): psmisc Requires(pre): shadow-utils @@ -198,8 +211,13 @@ BuildRequires: PyQt4-devel Requires: PyQt4 %endif %endif -BuildRequires: python2-devel +%if ( 0%{?suse_version} ) +BuildRequires: python-devel +Requires: nfs-ganesha = %{version}-%{release}, python +%else +BuildRequires: python2-devel Requires: nfs-ganesha = %{version}-%{release}, python2 +%endif %description utils This package contains utility scripts for managing the NFS-GANESHA server @@ -210,7 +228,7 @@ This package contains utility scripts for managing the NFS-GANESHA server Summary: The NFS-GANESHA's library for use with LTTng Group: Applications/System BuildRequires: lttng-ust-devel >= 2.3 -Requires: nfs-ganesha = %{version}-%{release}, lttng-tools >= 2.3, lttng-ust >= 2.3 +Requires: nfs-ganesha = %{version}-%{release}, lttng-tools >= 2.3, lttng-ust >= 2.3 %description lttng This package contains the libganesha_trace.so library. When preloaded @@ -240,7 +258,7 @@ Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} %description mem -This package contains a FSAL shared object to be used with NFS-Ganesha. This +This package contains a FSAL shared object to be used with NFS-Ganesha. This is used for speed and latency testing. %endif @@ -348,6 +366,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_DBUS=ON \ -DUSE_9P=ON \ -DDISTNAME_HAS_GIT_DATA=OFF \ + -DUSE_MAN_PAGE=%{use_man_page} \ %if %{with jemalloc} -DALLOCATOR=jemalloc %endif @@ -377,7 +396,7 @@ install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha %if %{with_systemd} mkdir -p %{buildroot}%{_unitdir} -install -m 644 scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-ganesha.service +install -m 644 scripts/systemd/nfs-ganesha.service.el7 %{buildroot}%{_unitdir}/nfs-ganesha.service install -m 644 scripts/systemd/nfs-ganesha-lock.service %{buildroot}%{_unitdir}/nfs-ganesha-lock.service install -m 644 scripts/systemd/nfs-ganesha-config.service %{buildroot}%{_unitdir}/nfs-ganesha-config.service install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha @@ -454,6 +473,7 @@ exit 0 %postun %if ( 0%{?suse_version} ) %service_del_postun nfs-ganesha-lock.service +%debug_package %else %if %{with_systemd} %systemd_postun_with_restart nfs-ganesha-lock.service @@ -494,17 +514,33 @@ exit 0 %{_sysconfdir}/init.d/nfs-ganesha %endif +%if %{with man_page} +%{_mandir}/*/ganesha-config.8.gz +%{_mandir}/*/ganesha-core-config.8.gz +%{_mandir}/*/ganesha-export-config.8.gz +%{_mandir}/*/ganesha-cache-config.8.gz +%{_mandir}/*/ganesha-log-config.8.gz +%endif + + %files mount-9P %{_sbindir}/mount.9P - +%if %{with man_page} +%{_mandir}/*/ganesha-9p-config.8.gz +%endif %files vfs %{_libdir}/ganesha/libfsalvfs* %config(noreplace) %{_sysconfdir}/ganesha/vfs.conf - +%if %{with man_page} +%{_mandir}/*/ganesha-vfs-config.8.gz +%endif %files proxy %{_libdir}/ganesha/libfsalproxy* +%if %{with man_page} +%{_mandir}/*/ganesha-proxy-config.8.gz +%endif # Optional packages %if %{with nullfs} @@ -530,18 +566,27 @@ exit 0 %if ! %{with_systemd} %{_sysconfdir}/init.d/nfs-ganesha-gpfs %endif +%if %{with man_page} +%{_mandir}/*/ganesha-gpfs-config.8.gz +%endif %endif %if %{with xfs} %files xfs %{_libdir}/ganesha/libfsalxfs* %config(noreplace) %{_sysconfdir}/ganesha/xfs.conf +%if %{with man_page} +%{_mandir}/*/ganesha-xfs-config.8.gz +%endif %endif %if %{with ceph} %files ceph %{_libdir}/ganesha/libfsalceph* %config(noreplace) %{_sysconfdir}/ganesha/ceph.conf +%if %{with man_page} +%{_mandir}/*/ganesha-ceph-config.8.gz +%endif %endif %if %{with rgw} @@ -550,12 +595,18 @@ exit 0 %{_libdir}/ganesha/libfsalrgw* %config(noreplace) %{_sysconfdir}/ganesha/rgw.conf %config(noreplace) %{_sysconfdir}/ganesha/rgw_bucket.conf +%if %{with man_page} +%{_mandir}/*/ganesha-rgw-config.8.gz +%endif %endif %if %{with gluster} %files gluster %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha-gfapi %{_libdir}/ganesha/libfsalgluster* +%if %{with man_page} +%{_mandir}/*/ganesha-gluster-config.8.gz +%endif %endif %if %{with panfs} @@ -594,10 +645,13 @@ exit 0 %{_bindir}/sm_notify.ganesha %{_bindir}/ganesha_mgr %{_bindir}/ganesha_conf -%{_mandir}/*/* +%{_mandir}/*/ganesha_conf.8.gz %endif %changelog +* Fri Jul 21 2017 Kaleb S. KEITHLEY 2.5.1-1 +- nfs-ganesha 2.5.1 GA + * Wed Jul 19 2017 Kaleb S. KEITHLEY 2.5.0-4 - nfs-ganesha 2.5.0 rebuild with libntirpc-1.5.3 diff --git a/sources b/sources index bb28cc4..ee960ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5.0.tar.gz) = 6f00125d71c250fd163e3a7663b30367cbe11d2cb868f36c28ced6ece8e24094d8b62e3649ed669e9b03dfc8d72cdc12ac1ab51bad9b77353a82f30a9f6dd1a9 +SHA512 (nfs-ganesha-2.5.1.tar.gz) = f6c49da23e8fe9aa0db07119c98669872e75e83bac39dbbfeb057b36e4a681526869c1dd31b30a6c30b4dda75ab5bfde2cd218f2636e19062ef9175304ca55e4 From 7f85a340c7b39de6881b9f9bbca51c9ac625a9ba Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 24 Jul 2017 15:15:14 -0400 Subject: [PATCH 21/31] nfs-ganesha 2.5.1 w/ ceph-12.1.1 --- nfs-ganesha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 0c1e3ed..d1c45d7 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -90,7 +90,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.1 -Release: 1%{?dev:%{dev}}%{?dist} +Release: 2%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -280,7 +280,7 @@ be used with NFS-Ganesha to support GPFS backend Summary: The NFS-GANESHA's CephFS FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: libcephfs1-devel >= 10.2.7 +BuildRequires: libcephfs-devel >= 12.l.1 %description ceph This package contains a FSAL shared object to @@ -649,6 +649,9 @@ exit 0 %endif %changelog +* Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-2 +- nfs-ganesha 2.5.1 w/ ceph-12.1.1 + * Fri Jul 21 2017 Kaleb S. KEITHLEY 2.5.1-1 - nfs-ganesha 2.5.1 GA From a58d1bc4cd6fee33934d93b069e7efb356ba0df3 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 24 Jul 2017 15:57:32 -0400 Subject: [PATCH 22/31] nfs-ganesha 2.5.1 w/ ceph-12.1.1 --- nfs-ganesha.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index d1c45d7..e20a830 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -52,7 +52,11 @@ Requires: openSUSE-release %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} +%ifnarch i686 armv7hl ppc64 %bcond_without ceph +%else +%bcond_with ceph +%endif %global use_fsal_ceph %{on_off_switch ceph} %bcond_with rgw @@ -90,7 +94,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.1 -Release: 2%{?dev:%{dev}}%{?dist} +Release: 3%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -275,6 +279,7 @@ be used with NFS-Ganesha to support GPFS backend %endif # CEPH +%ifnarch i686 armv7hl ppc64 %if %{with ceph} %package ceph Summary: The NFS-GANESHA's CephFS FSAL @@ -299,6 +304,7 @@ BuildRequires: librgw2-devel >= 10.2.7 This package contains a FSAL shared object to be used with NFS-Ganesha to support Ceph RGW %endif +%endif # XFS %if %{with xfs} @@ -415,6 +421,7 @@ install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysc install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha %endif +%ifnarch i686 armv7hl ppc64 %if %{with ceph} install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif @@ -423,6 +430,7 @@ install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/rgw_bucket.conf %{buildroot}%{_sysconfdir}/ganesha %endif +%endif %if %{with gluster} install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/logrotate.d/ganesha-gfapi @@ -580,6 +588,7 @@ exit 0 %endif %endif +%ifnarch i686 armv7hl ppc64 %if %{with ceph} %files ceph %{_libdir}/ganesha/libfsalceph* @@ -599,6 +608,7 @@ exit 0 %{_mandir}/*/ganesha-rgw-config.8.gz %endif %endif +%endif %if %{with gluster} %files gluster @@ -649,7 +659,7 @@ exit 0 %endif %changelog -* Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-2 +* Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-3 - nfs-ganesha 2.5.1 w/ ceph-12.1.1 * Fri Jul 21 2017 Kaleb S. KEITHLEY 2.5.1-1 From e5f872ff521fcfd507359eac9139c8735ca778bc Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 25 Jul 2017 08:06:11 -0400 Subject: [PATCH 23/31] nfs-ganesha 2.5.1 w/ FSAL_RGW --- nfs-ganesha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index e20a830..cffd3f1 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -59,7 +59,7 @@ Requires: openSUSE-release %endif %global use_fsal_ceph %{on_off_switch ceph} -%bcond_with rgw +%bcond_without rgw %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -94,7 +94,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.1 -Release: 3%{?dev:%{dev}}%{?dist} +Release: 4%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -659,6 +659,9 @@ exit 0 %endif %changelog +* Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-4 +- nfs-ganesha 2.5.1 w/ FSAL_RGW + * Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-3 - nfs-ganesha 2.5.1 w/ ceph-12.1.1 From a170b7fc78e33cd60c825ba3fa43a15bfac73b0b Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 25 Jul 2017 08:14:57 -0400 Subject: [PATCH 24/31] nfs-ganesha 2.5.1 w/ FSAL_RGW --- nfs-ganesha.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index cffd3f1..6a78d1c 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -59,7 +59,11 @@ Requires: openSUSE-release %endif %global use_fsal_ceph %{on_off_switch ceph} +%ifnarch i686 armv7hl ppc64 %bcond_without rgw +%else +%bcond_with rgw +%endif %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -94,7 +98,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.1 -Release: 4%{?dev:%{dev}}%{?dist} +Release: 5%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -659,7 +663,7 @@ exit 0 %endif %changelog -* Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-4 +* Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-5 - nfs-ganesha 2.5.1 w/ FSAL_RGW * Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-3 From 6b492c58178bcc46a7bee5a646fdb3b18462a684 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:55:09 +0000 Subject: [PATCH 25/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- nfs-ganesha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 6a78d1c..0264b78 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -98,7 +98,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.1 -Release: 5%{?dev:%{dev}}%{?dist} +Release: 6%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -663,6 +663,9 @@ exit 0 %endif %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 24 2017 Kaleb S. KEITHLEY 2.5.1-5 - nfs-ganesha 2.5.1 w/ FSAL_RGW From b85803fad4c58368ab656fa66e24c531aa31f1a4 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 31 Jul 2017 08:22:52 -0400 Subject: [PATCH 26/31] nfs-ganesha 2.5.1 w/ FSAL_CEPH and FSAL_RGW on i686, armv7hl --- nfs-ganesha.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 0264b78..42d70cb 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -52,14 +52,14 @@ Requires: openSUSE-release %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} -%ifnarch i686 armv7hl ppc64 +%ifnarch ppc64 %bcond_without ceph %else %bcond_with ceph %endif %global use_fsal_ceph %{on_off_switch ceph} -%ifnarch i686 armv7hl ppc64 +%ifnarch ppc64 %bcond_without rgw %else %bcond_with rgw @@ -98,7 +98,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.1 -Release: 6%{?dev:%{dev}}%{?dist} +Release: 7%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -283,7 +283,7 @@ be used with NFS-Ganesha to support GPFS backend %endif # CEPH -%ifnarch i686 armv7hl ppc64 +%ifnarch ppc64 %if %{with ceph} %package ceph Summary: The NFS-GANESHA's CephFS FSAL @@ -425,7 +425,7 @@ install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysc install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha %endif -%ifnarch i686 armv7hl ppc64 +%ifnarch ppc64 %if %{with ceph} install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif @@ -592,7 +592,7 @@ exit 0 %endif %endif -%ifnarch i686 armv7hl ppc64 +%ifnarch ppc64 %if %{with ceph} %files ceph %{_libdir}/ganesha/libfsalceph* @@ -663,6 +663,9 @@ exit 0 %endif %changelog +* Mon Jul 31 2017 Kaleb S. KEITHLEY 2.5.1-7 +- nfs-ganesha 2.5.1 w/ FSAL_CEPH and FSAL_RGW on i686, armv7hl + * Wed Jul 26 2017 Fedora Release Engineering - 2.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0cbafc6f02e0c8786ac7f0e9ddbf3c06afce8894 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 3 Aug 2017 09:30:28 -0400 Subject: [PATCH 27/31] nfs-ganesha 2.5.1.1 GA enable ppc64, enable FSAL_GPFS --- nfs-ganesha.spec | 29 ++++++++--------------------- sources | 2 +- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 42d70cb..59a2f1b 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -46,24 +46,16 @@ Requires: openSUSE-release %bcond_with mem %global use_fsal_mem %{on_off_switch mem} -%bcond_with gpfs +%bcond_without gpfs %global use_fsal_gpfs %{on_off_switch gpfs} %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} -%ifnarch ppc64 %bcond_without ceph -%else -%bcond_with ceph -%endif %global use_fsal_ceph %{on_off_switch ceph} -%ifnarch ppc64 %bcond_without rgw -%else -%bcond_with rgw -%endif %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -97,8 +89,8 @@ Requires: openSUSE-release # %%global dash_dev_version 2.5-final Name: nfs-ganesha -Version: 2.5.1 -Release: 7%{?dev:%{dev}}%{?dist} +Version: 2.5.1.1 +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -283,7 +275,6 @@ be used with NFS-Ganesha to support GPFS backend %endif # CEPH -%ifnarch ppc64 %if %{with ceph} %package ceph Summary: The NFS-GANESHA's CephFS FSAL @@ -302,13 +293,12 @@ be used with NFS-Ganesha to support CephFS Summary: The NFS-GANESHA's Ceph RGW FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: librgw2-devel >= 10.2.7 +BuildRequires: librgw-devel >= 12.1.1 %description rgw This package contains a FSAL shared object to be used with NFS-Ganesha to support Ceph RGW %endif -%endif # XFS %if %{with xfs} @@ -400,9 +390,6 @@ install -m 755 scripts/nfs-ganesha-config.sh %{buildroot}%{_libexecdir}/ganesha install -m 755 tools/mount.9P %{buildroot}%{_sbindir}/mount.9P install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha -%if %{with rgw} -install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha -%endif %if %{with_systemd} mkdir -p %{buildroot}%{_unitdir} @@ -425,7 +412,6 @@ install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysc install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha %endif -%ifnarch ppc64 %if %{with ceph} install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif @@ -434,7 +420,6 @@ install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/rgw_bucket.conf %{buildroot}%{_sysconfdir}/ganesha %endif -%endif %if %{with gluster} install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/logrotate.d/ganesha-gfapi @@ -592,7 +577,6 @@ exit 0 %endif %endif -%ifnarch ppc64 %if %{with ceph} %files ceph %{_libdir}/ganesha/libfsalceph* @@ -612,7 +596,6 @@ exit 0 %{_mandir}/*/ganesha-rgw-config.8.gz %endif %endif -%endif %if %{with gluster} %files gluster @@ -663,6 +646,10 @@ exit 0 %endif %changelog +* Wed Aug 2 2017 Kaleb S. KEITHLEY 2.5.1.1-1 +- nfs-ganesha 2.5.1.1 GA +- enable ppc64, enable FSAL_GPFS + * Mon Jul 31 2017 Kaleb S. KEITHLEY 2.5.1-7 - nfs-ganesha 2.5.1 w/ FSAL_CEPH and FSAL_RGW on i686, armv7hl diff --git a/sources b/sources index ee960ae..454c50d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5.1.tar.gz) = f6c49da23e8fe9aa0db07119c98669872e75e83bac39dbbfeb057b36e4a681526869c1dd31b30a6c30b4dda75ab5bfde2cd218f2636e19062ef9175304ca55e4 +SHA512 (nfs-ganesha-2.5.1.1.tar.gz) = 433cbb718af0fdbeaab093a26ce4867bb7e6eb3d53525a30cba448625e66c9da9a93b558886d9d037f1b7a7eca483c226f77863f7f528591866eb38a1f1b8ad7 From 32ba49ab2a31f825dfc8162d7253a89c59161d68 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 18 Aug 2017 13:57:40 -0400 Subject: [PATCH 28/31] /var/run -> /run --- nfs-ganesha.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 59a2f1b..1ab3497 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -84,13 +84,18 @@ Requires: openSUSE-release %bcond_without man_page %global use_man_page %{on_off_switch man_page} +%if ( 0%{?rhel} && 0%{?rhel} < 7 ) +%global _rundir %{_localstatedir}/run +%else +%global _rundir /run +%endif # %%global dev final # %%global dash_dev_version 2.5-final Name: nfs-ganesha Version: 2.5.1.1 -Release: 1%{?dev:%{dev}}%{?dist} +Release: 2%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -381,7 +386,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libdir}/ganesha -mkdir -p %{buildroot}%{_localstatedir}/run/ganesha +mkdir -p %{buildroot}%{_rundir}/ganesha mkdir -p %{buildroot}%{_libexecdir}/ganesha cd src install -m 644 config_samples/logrotate_ganesha %{buildroot}%{_sysconfdir}/logrotate.d/ganesha @@ -455,7 +460,7 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %pre getent group ganesha > /dev/null || groupadd -r ganesha -getent passwd ganesha > /dev/null || useradd -r -g ganesha -d /var/run/ganesha -s /sbin/nologin -c "NFS-Ganesha Daemon" ganesha +getent passwd ganesha > /dev/null || useradd -r -g ganesha -d %{_rundir}/ganesha -s /sbin/nologin -c "NFS-Ganesha Daemon" ganesha exit 0 %preun @@ -495,7 +500,7 @@ exit 0 %dir %{_defaultdocdir}/ganesha/ %{_defaultdocdir}/ganesha/* %doc src/ChangeLog -%dir %{_localstatedir}/run/ganesha +%dir %{_rundir}/ganesha %dir %{_libexecdir}/ganesha/ %{_libexecdir}/ganesha/nfs-ganesha-config.sh %dir %attr(0755,ganesha,ganesha) %{_localstatedir}/log/ganesha @@ -646,6 +651,9 @@ exit 0 %endif %changelog +* Fri Aug 18 2017 Kaleb S. KEITHLEY 2.5.1.1-2 +- /var/run -> /run + * Wed Aug 2 2017 Kaleb S. KEITHLEY 2.5.1.1-1 - nfs-ganesha 2.5.1.1 GA - enable ppc64, enable FSAL_GPFS From 3029cca49a9416cd102544efaafd9dd96a359082 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 24 Aug 2017 09:21:29 -0400 Subject: [PATCH 29/31] nfs-ganesha 2.5.2 GA --- nfs-ganesha.spec | 72 ++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 1ab3497..76e15bb 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -86,16 +86,15 @@ Requires: openSUSE-release %if ( 0%{?rhel} && 0%{?rhel} < 7 ) %global _rundir %{_localstatedir}/run -%else -%global _rundir /run %endif +%global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print(s2) } # %%global dev final # %%global dash_dev_version 2.5-final Name: nfs-ganesha -Version: 2.5.1.1 -Release: 2%{?dev:%{dev}}%{?dist} +Version: 2.5.2 +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -122,6 +121,8 @@ BuildRequires: libuuid-devel BuildRequires: gcc-c++ %if %{with system_ntirpc} BuildRequires: libntirpc-devel >= 1.5.3 +%else +Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it @@ -344,6 +345,44 @@ This package contains a FSAL shared object to be used with NFS-Ganesha to support Gluster %endif +# NTIRPC (if built-in) +%if ! %{with system_ntirpc} +%package -n libntirpc +Summary: New Transport Independent RPC Library +Group: System Environment/Libraries +License: BSD +Version: @NTIRPC_VERSION_EMBED@ +Url: https://github.com/nfs-ganesha/ntirpc + +# libtirpc has /etc/netconfig, most machines probably have it anyway +# for NFS client +Requires: libtirpc + +%description -n libntirpc +This package contains a new implementation of the original libtirpc, +transport-independent RPC (TI-RPC) library for NFS-Ganesha. It has +the following features not found in libtirpc: + 1. Bi-directional operation + 2. Full-duplex operation on the TCP (vc) transport + 3. Thread-safe operating modes + 3.1 new locking primitives and lock callouts (interface change) + 3.2 stateless send/recv on the TCP transport (interface change) + 4. Flexible server integration support + 5. Event channels (remove static arrays of xprt handles, new EPOLL/KEVENT + integration) + +%package -n libntirpc-devel +Summary: Development headers for libntirpc +Requires: libntirpc = @NTIRPC_VERSION_EMBED@ +Group: System Environment/Libraries +License: BSD +Version: @NTIRPC_VERSION_EMBED@ +Url: https://github.com/nfs-ganesha/ntirpc + +%description -n libntirpc-devel +Development headers and auxiliary files for developing with %{name}. +%endif + %prep %setup -q -n %{name}-%{version} rm -rf contrib/libzfswrapper @@ -485,13 +524,6 @@ exit 0 %files %license src/LICENSE.txt %{_bindir}/ganesha.nfsd -%if ! %{with system_ntirpc} -%{_libdir}/libntirpc.so.1.5.0 -%{_libdir}/libntirpc.so.1.5 -%{_libdir}/libntirpc.so -%{_libdir}/pkgconfig/libntirpc.pc -%{_includedir}/ntirpc/ -%endif %config %{_sysconfdir}/dbus-1/system.d/org.ganesha.nfsd.conf %config(noreplace) %{_sysconfdir}/sysconfig/ganesha %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha @@ -611,6 +643,21 @@ exit 0 %endif %endif +%if ! %{with system_ntirpc} +%files -n libntirpc +%defattr(-,root,root,-) +%{_libdir}/libntirpc.so.@NTIRPC_VERSION_EMBED@ +%{_libdir}/libntirpc.so.1.5 +%{_libdir}/libntirpc.so +%{!?_licensedir:%global license %%doc} +%license libntirpc/COPYING +%doc libntirpc/NEWS libntirpc/README +%files -n libntirpc-devel +%{_libdir}/pkgconfig/libntirpc.pc +%dir %{_includedir}/ntirpc +%{_includedir}/ntirpc/* +%endif + %if %{with panfs} %files panfs %{_libdir}/ganesha/libfsalpanfs* @@ -651,6 +698,9 @@ exit 0 %endif %changelog +* Thu Aug 24 2017 Kaleb S. KEITHLEY 2.5.2-1 +- nfs-ganesha 2.5.2 GA + * Fri Aug 18 2017 Kaleb S. KEITHLEY 2.5.1.1-2 - /var/run -> /run diff --git a/sources b/sources index 454c50d..482b8f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5.1.1.tar.gz) = 433cbb718af0fdbeaab093a26ce4867bb7e6eb3d53525a30cba448625e66c9da9a93b558886d9d037f1b7a7eca483c226f77863f7f528591866eb38a1f1b8ad7 +SHA512 (nfs-ganesha-2.5.2.tar.gz) = 06e87cee4944ceb22da59e0d09bdafcebce34677b86af04f0cc259b165fa71afbadf1bc7f879353ad7a44af8d8080dc97f9463d128938dae5bf8a91635c729dd From 9f41a4ca0fa6e78972a44840f6aae4f949ea4535 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 24 Aug 2017 10:34:53 -0400 Subject: [PATCH 30/31] no rdma on arm(v7hl), thus no rgw in ceph, hence no FSAL_RGW --- nfs-ganesha.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 76e15bb..6a27426 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -55,7 +55,11 @@ Requires: openSUSE-release %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} +%ifnarch %{arm} %bcond_without rgw +%else +%bcond_with rgw +%endif %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -94,7 +98,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.2 -Release: 1%{?dev:%{dev}}%{?dist} +Release: 2%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -698,6 +702,9 @@ exit 0 %endif %changelog +* Thu Aug 24 2017 Kaleb S. KEITHLEY 2.5.2-2 +- no rdma on arm(v7hl), thus no rgw in ceph, hence no FSAL_RGW + * Thu Aug 24 2017 Kaleb S. KEITHLEY 2.5.2-1 - nfs-ganesha 2.5.2 GA From cbd714c6ef0013aa6c0795d00c76360f860bad4f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 25 Aug 2017 13:13:31 -0400 Subject: [PATCH 31/31] no rdma on arm(v7hl), FSAL_RGW, FSAL_CEPH; with ceph-12-1.4-5 --- nfs-ganesha.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 6a27426..aa0081b 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -52,7 +52,11 @@ Requires: openSUSE-release %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} +%ifnarch %{arm} +%bcond_with ceph +%else %bcond_without ceph +%endif %global use_fsal_ceph %{on_off_switch ceph} %ifnarch %{arm} @@ -98,7 +102,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 2.5.2 -Release: 2%{?dev:%{dev}}%{?dist} +Release: 3%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -702,6 +706,9 @@ exit 0 %endif %changelog +* Fri Aug 25 2017 Kaleb S. KEITHLEY 2.5.2-3 +- no rdma on arm(v7hl), FSAL_RGW, FSAL_CEPH; with ceph-12-1.4-5 + * Thu Aug 24 2017 Kaleb S. KEITHLEY 2.5.2-2 - no rdma on arm(v7hl), thus no rgw in ceph, hence no FSAL_RGW