|
|
@@ -5,10 +5,12 @@
|
|
|
# group all 32bit related archs
|
|
|
%define all_32bit_archs i386 i686 athlon
|
|
|
|
|
|
+%{!?_udevrulesdir:%global _udevrulesdir /usr/lib/udev/rules.d}
|
|
|
+
|
|
|
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
|
|
|
Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
|
|
|
Name: nfs-utils
|
|
|
-Version: 2.5.1
|
|
|
+Version: 2.8.3
|
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
@@ -18,12 +20,10 @@ License: MIT and GPLv2 and GPLv2+ and BSD
|
|
|
URL: https://sourceforge.net/projects/nfs/
|
|
|
Source0: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
|
|
|
|
|
|
-#Source3: 24-nfs-server.conf
|
|
|
Source1: id_resolver.conf
|
|
|
Source2: lockd.conf
|
|
|
-Source4: nfsconvert.py
|
|
|
-Source5: nfsconvert.sh
|
|
|
-Source6: nfs-convert.service
|
|
|
+Source3: 24-nfs-server.conf
|
|
|
+Source4: 10-nfsv4.conf
|
|
|
|
|
|
Source10: nfs.init
|
|
|
Source11: nfslock.init
|
|
|
@@ -33,11 +33,9 @@ Source13: rpcgssd.init
|
|
|
Source15: nfsdcld.init
|
|
|
Source23: nfs.sysconfig
|
|
|
|
|
|
-Patch001: nfs-utils-2.5.2-rc3.patch
|
|
|
-Patch002: nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch
|
|
|
+Patch001: nfs-utils.2.8.4-rc2.patch
|
|
|
|
|
|
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
|
|
-Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
|
|
Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
|
|
|
Patch103: nfs-utils-2.3.1-systemd-gssproxy-restart.patch
|
|
|
Patch104: nfs-utils-2.3.3-man-tcpwrappers.patch
|
|
|
@@ -62,7 +60,7 @@ Provides: umount.nfs4 = %{version}-%{release}
|
|
|
Provides: sm-notify = %{version}-%{release}
|
|
|
Provides: start-statd = %{version}-%{release}
|
|
|
|
|
|
-Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
|
|
|
Requires: kmod, keyutils, quota
|
|
|
BuildRequires: libevent-devel libcap-devel
|
|
|
@@ -73,6 +71,8 @@ BuildRequires: krb5-devel, libmount-devel
|
|
|
BuildRequires: sqlite3-devel
|
|
|
BuildRequires: libxml2-devel
|
|
|
BuildRequires: libuuid-devel
|
|
|
+BuildRequires: libnl3-devel
|
|
|
+BuildRequires: readline-devel
|
|
|
BuildRequires: rpcgen
|
|
|
#if %{enablegss}
|
|
|
#BuildRequires: libgssglue-devel
|
|
|
@@ -147,13 +147,15 @@ This package includes header files and libraries necessary for
|
|
|
developing programs which use the libnfsidmap library.
|
|
|
|
|
|
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q
|
|
|
%if %{with systemd}
|
|
|
%autopatch -p1
|
|
|
%else
|
|
|
%patch001 -p1
|
|
|
-%patch002 -p1
|
|
|
%endif
|
|
|
|
|
|
# Remove .orig files
|
|
|
@@ -185,13 +187,14 @@ make %{?_smp_mflags} all
|
|
|
%install
|
|
|
rm -rf %{buildroot}
|
|
|
mkdir -p %{buildroot}{/sbin,/usr/sbin}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
|
|
|
+mkdir -p %{buildroot}%{_mandir}/{man5,man8}
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/gssproxy
|
|
|
%if %{with systemd}
|
|
|
mkdir -p %{buildroot}%{_unitdir}
|
|
|
-mkdir -p %{buildroot}/lib/systemd/system-generators
|
|
|
+mkdir -p %{buildroot}/usr/lib/systemd/system-generators
|
|
|
%else
|
|
|
mkdir -p %{buildroot}%{_initdir}
|
|
|
%endif
|
|
|
@@ -204,15 +207,7 @@ install -m 644 nfs.conf %{buildroot}%{_sysconfdir}
|
|
|
install -m 644 support/nfsidmap/idmapd.conf %{buildroot}%{_sysconfdir}
|
|
|
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/request-key.d
|
|
|
|
|
|
-%if %{with systemd}
|
|
|
-install -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/nfsconvert
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/
|
|
|
-install -m 755 %{SOURCE5} %{buildroot}/%{_libexecdir}/nfs-utils/nfsconvert.sh
|
|
|
-install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}
|
|
|
-mkdir -p %{buildroot}/lib/systemd/system-generators/
|
|
|
-mv -f %{buildroot}/usr/lib/systemd/system-generators/* %{buildroot}/lib/systemd/system-generators/
|
|
|
-
|
|
|
-%else
|
|
|
+%if %{without systemd}
|
|
|
install -m 755 %{SOURCE10} %{buildroot}%{_initdir}/nfs
|
|
|
install -m 755 %{SOURCE11} %{buildroot}%{_initdir}/nfslock
|
|
|
install -m 755 %{SOURCE12} %{buildroot}%{_initdir}/rpcidmapd
|
|
|
@@ -225,6 +220,7 @@ install -m 755 %{SOURCE13} %{buildroot}%{_initdir}/rpcgssd
|
|
|
|
|
|
mkdir -p %{buildroot}/run/sysconfig
|
|
|
install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/modprobe.d/lockd.conf
|
|
|
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/gssproxy/
|
|
|
|
|
|
rm -f %{buildroot}%{_libdir}/*.{a,la}
|
|
|
rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
|
|
|
@@ -239,15 +235,13 @@ mkdir -p %{buildroot}/var/lib/nfs/statd/sm.bak
|
|
|
mkdir -p %{buildroot}/var/lib/nfs/v4recovery
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/exports.d
|
|
|
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/nfsmount.conf.d
|
|
|
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nfsmount.conf.d
|
|
|
+
|
|
|
# temporarily remove nfs.5 man page until util-linux gets upgraded...
|
|
|
#rm -f %{buildroot}/%{_mandir}/man5/nfs.5*
|
|
|
|
|
|
|
|
|
-
|
|
|
-%clean
|
|
|
-rm -rf %{buildroot}
|
|
|
-
|
|
|
-
|
|
|
%pre
|
|
|
# move files so the running service will have this applied as well
|
|
|
for x in gssd svcgssd idmapd ; do
|
|
|
@@ -289,17 +283,7 @@ fi
|
|
|
|
|
|
%post
|
|
|
%if %{with systemd}
|
|
|
-if [ $1 -eq 1 ] ; then
|
|
|
- # Initial installation
|
|
|
- /bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
|
|
|
- /bin/systemctl start nfs-client.target >/dev/null 2>&1 || :
|
|
|
-fi
|
|
|
-
|
|
|
-# Enable nfs-convert so if an old configuration
|
|
|
-# exists a conversion will occur
|
|
|
-/bin/systemctl enable nfs-convert >/dev/null 2>&1 || :
|
|
|
-
|
|
|
-%systemd_post nfs-server
|
|
|
+%systemd_post nfs-client.target nfs-server.service
|
|
|
%else
|
|
|
/sbin/chkconfig --add nfs
|
|
|
/sbin/chkconfig --add nfslock
|
|
|
@@ -320,12 +304,9 @@ fi
|
|
|
|
|
|
%preun
|
|
|
%if %{with systemd}
|
|
|
+%systemd_preun nfs-client.target nfs-server.service
|
|
|
if [ $1 -eq 0 ]; then
|
|
|
- %systemd_preun nfs-client.target
|
|
|
- %systemd_preun nfs-server.service
|
|
|
-
|
|
|
- rm -rf /var/lib/nfs/statd
|
|
|
- rm -rf /var/lib/nfs/v4recovery
|
|
|
+ ( : >%{_localstatedir}/lib/rpm-state/nfs-server.cleanup ) || :
|
|
|
fi
|
|
|
%else
|
|
|
if [ "$1" = "0" -o -x /bin/systemctl ]; then
|
|
|
@@ -354,12 +335,14 @@ fi
|
|
|
|
|
|
%postun
|
|
|
%if %{with systemd}
|
|
|
-%systemd_postun_with_restart nfs-client.target
|
|
|
-%systemd_postun_with_restart nfs-server
|
|
|
-
|
|
|
-/bin/systemctl --system daemon-reload >/dev/null 2>&1 || :
|
|
|
+%systemd_postun_with_restart nfs-client.target nfs-server.service
|
|
|
+if [ -f %{_localstatedir}/lib/rpm-state/nfs-server.cleanup ]; then
|
|
|
+ rm %{_localstatedir}/lib/rpm-state/nfs-server.cleanup || :
|
|
|
+ rm -rf /var/lib/nfs/statd || :
|
|
|
+ rm -rf /var/lib/nfs/v4recovery || :
|
|
|
+fi
|
|
|
%else
|
|
|
-if [ "$1" -ge 1 -a ! -x /bin/systemctl ]; then
|
|
|
+if [ "$1" -ge 1 -a ! -x /usr/bin/systemctl ]; then
|
|
|
if [ -f /etc/rc.d/init.d/rpcidmapd ]; then
|
|
|
/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
|
|
|
fi
|
|
|
@@ -380,9 +363,8 @@ if [ "$1" -ge 1 -a ! -x /bin/systemctl ]; then
|
|
|
fi
|
|
|
%endif
|
|
|
|
|
|
-%post -n libnfsidmap -p /sbin/ldconfig
|
|
|
-
|
|
|
-%postun -n libnfsidmap -p /sbin/ldconfig
|
|
|
+%triggerun -- nfs-utils < 2.5.1-2
|
|
|
+/bin/systemctl disable nfs-convert > /dev/null 2>&1 || :
|
|
|
|
|
|
%triggerpostun -- nfs-server
|
|
|
%if !%{with systemd}
|
|
|
@@ -399,15 +381,14 @@ fi
|
|
|
/sbin/chkconfig --add nfslock
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%files
|
|
|
-%defattr(-,root,root)
|
|
|
%doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
|
|
|
%doc linux-nfs/THANKS linux-nfs/TODO
|
|
|
%if %{with systemd}
|
|
|
-/lib/systemd/system-generators/*
|
|
|
+/usr/lib/systemd/system-generators/*
|
|
|
%{_unitdir}/*
|
|
|
-%{_sbindir}/nfsconvert
|
|
|
-%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
|
|
|
+%attr(0600,root,root) %config(noreplace) %{_udevrulesdir}/60-nfs.rules
|
|
|
%else
|
|
|
%config %{_initdir}/nfs
|
|
|
%config %{_initdir}/nfsdcld
|
|
|
@@ -422,6 +403,8 @@ fi
|
|
|
%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
|
|
|
%config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf
|
|
|
%config(noreplace) %{_sysconfdir}/nfs.conf
|
|
|
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/nfsmount.conf.d/10-nfsv4.conf
|
|
|
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/gssproxy/24-nfs-server.conf
|
|
|
%dir %{_sysconfdir}/exports.d
|
|
|
%dir /var/lib/nfs/v4recovery
|
|
|
%dir /var/lib/nfs/rpc_pipefs
|
|
|
@@ -433,8 +416,6 @@ fi
|
|
|
%config(noreplace) /var/lib/nfs/rmtab
|
|
|
%config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
|
|
|
/sbin/rpc.statd
|
|
|
-#/sbin/osd_login
|
|
|
-/sbin/nfsdcltrack
|
|
|
%{_sbindir}/exportfs
|
|
|
%{_sbindir}/nfsstat
|
|
|
%{_sbindir}/rpcdebug
|
|
|
@@ -456,6 +437,11 @@ fi
|
|
|
%{_sbindir}/nfsdcld
|
|
|
%{_sbindir}/nfsdclddb
|
|
|
%{_sbindir}/nfsdclnts
|
|
|
+%{_sbindir}/rpcctl
|
|
|
+%{_sbindir}/nfsdctl
|
|
|
+%{_sbindir}/fsidd
|
|
|
+%{_libexecdir}/nfsrahead
|
|
|
+%{_udevrulesdir}/99-nfs.rules
|
|
|
%{_mandir}/*/*
|
|
|
|
|
|
%attr(4755,root,root) /sbin/mount.nfs
|
|
|
@@ -480,6 +466,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jun 8 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.3-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Thu Aug 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.1-1
|
|
|
- new upstream release.
|
|
|
|
