|
@@ -1,41 +1,47 @@
|
|
|
-%define _unpackaged_files_terminate_build 1
|
|
|
-
|
|
|
-Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
|
|
|
-Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
|
|
|
-Name: nfs-utils
|
|
|
-Version: 2.4.1
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+%bcond_with systemd
|
|
|
|
|
|
+%define _unpackaged_files_terminate_build 1
|
|
|
%define enablegss 1
|
|
|
-
|
|
|
# group all 32bit related archs
|
|
|
%define all_32bit_archs i386 i686 athlon
|
|
|
|
|
|
-License: MIT and GPLv2 and GPLv2+ and BSD
|
|
|
+Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
|
|
|
+Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
|
|
|
+Name: nfs-utils
|
|
|
+Version: 2.4.3
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: System Environment/Daemons
|
|
|
-URL: https://sourceforge.net/projects/nfs/
|
|
|
-
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
|
|
|
+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
|
|
|
+
|
|
|
Source10: nfs.init
|
|
|
Source11: nfslock.init
|
|
|
Source12: rpcidmapd.init
|
|
|
Source13: rpcgssd.init
|
|
|
#Source14: rpcsvcgssd.init
|
|
|
Source15: nfsdcld.init
|
|
|
-
|
|
|
-Source21: id_resolver.conf
|
|
|
-Source22: lockd.conf
|
|
|
Source23: nfs.sysconfig
|
|
|
|
|
|
-Patch001: nfs-utils.2.4.2-rc1.patch
|
|
|
+Patch001: nfs-utils.2.4.4-rc2.patch
|
|
|
|
|
|
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
|
|
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
|
|
-Patch103: nfs-utils-1.2.5-idmap-errmsg.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
|
|
|
+Patch105: nfs-utils-2.3.3-nfsconf-usegssproxy.patch
|
|
|
+Patch106: nfs-utils-2.4.2-systemd-svcgssd.patch
|
|
|
|
|
|
Provides: exportfs = %{version}-%{release}
|
|
|
Provides: nfsstat = %{version}-%{release}
|
|
@@ -62,15 +68,26 @@ BuildRequires: libevent-devel libcap-devel
|
|
|
BuildRequires: libnfsidmap-devel libtirpc-devel libblkid-devel
|
|
|
BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
|
|
|
BuildRequires: automake, libtool, glibc-headers, device-mapper-devel
|
|
|
-BuildRequires: krb5-devel, tcp_wrappers, libmount-devel
|
|
|
+BuildRequires: krb5-devel, libmount-devel
|
|
|
BuildRequires: sqlite3-devel
|
|
|
+BuildRequires: libxml2-devel
|
|
|
+BuildRequires: libuuid-devel
|
|
|
BuildRequires: rpcgen
|
|
|
#if %{enablegss}
|
|
|
#BuildRequires: libgssglue-devel
|
|
|
#BuildRequires: librpcsecgss >= 0.17
|
|
|
#endif
|
|
|
Requires(pre): shadow-utils >= 4.0.3-25
|
|
|
+%if %{with systemd}
|
|
|
+BuildRequires: systemd
|
|
|
+Requires(pre): util-linux
|
|
|
+Requires(pre): coreutils
|
|
|
+Requires(preun): coreutils
|
|
|
+%{?systemd_requires}
|
|
|
+%else
|
|
|
Requires(pre): /sbin/chkconfig /sbin/nologin
|
|
|
+Requires(preun): /sbin/chkconfig
|
|
|
+%endif
|
|
|
Requires: libnfsidmap libevent
|
|
|
Requires: libtirpc >= 0.2.3 libblkid libcap libmount
|
|
|
#if %{enablegss}
|
|
@@ -130,24 +147,21 @@ developing programs which use the libnfsidmap library.
|
|
|
|
|
|
|
|
|
%prep
|
|
|
-%autosetup -p1
|
|
|
+%setup -q
|
|
|
+%if %{with systemd}
|
|
|
+%autopatch -p1
|
|
|
+%else
|
|
|
+%patch001 -p1
|
|
|
+%endif
|
|
|
|
|
|
# Remove .orig files
|
|
|
find . -name "*.orig" | xargs rm -f
|
|
|
|
|
|
|
|
|
%build
|
|
|
-
|
|
|
-%ifarch s390 s390x
|
|
|
-PIE="-fPIE"
|
|
|
-%else
|
|
|
-PIE="-fpie"
|
|
|
-%endif
|
|
|
-export PIE
|
|
|
-
|
|
|
sh -x autogen.sh
|
|
|
|
|
|
-CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
|
|
|
+CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS -fpie -D_FILE_OFFSET_BITS=64`"
|
|
|
%configure \
|
|
|
CFLAGS="$CFLAGS" \
|
|
|
CPPFLAGS="$DEFINES" \
|
|
@@ -156,55 +170,77 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
|
|
|
--enable-ipv6 \
|
|
|
--with-statdpath=/var/lib/nfs/statd \
|
|
|
--enable-libmount-mount \
|
|
|
- --with-pluginpath=%{_libdir}/libnfsidmap
|
|
|
+ --with-pluginpath=%{_libdir}/libnfsidmap \
|
|
|
+ --without-tcp-wrappers \
|
|
|
+%if %{with systemd}
|
|
|
+ --with-systemd=%{_unitdir} \
|
|
|
+%endif
|
|
|
+ --enable-junction
|
|
|
|
|
|
make %{?_smp_mflags} all
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
-mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin}
|
|
|
+rm -rf %{buildroot}
|
|
|
+mkdir -p %{buildroot}{/sbin,/usr/sbin}
|
|
|
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_initdir}
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
|
|
|
-make DESTDIR=$RPM_BUILD_ROOT install
|
|
|
-install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir}
|
|
|
-install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT%{_sysconfdir}
|
|
|
-install -m 644 nfs.conf $RPM_BUILD_ROOT%{_sysconfdir}
|
|
|
-install -m 644 support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}
|
|
|
-install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_initdir}/nfs
|
|
|
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_initdir}/nfslock
|
|
|
-install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_initdir}/rpcidmapd
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
|
|
|
+%if %{with systemd}
|
|
|
+mkdir -p %{buildroot}%{_unitdir}
|
|
|
+mkdir -p %{buildroot}/lib/systemd/system-generators
|
|
|
+%else
|
|
|
+mkdir -p %{buildroot}%{_initdir}
|
|
|
+%endif
|
|
|
+
|
|
|
+make DESTDIR=%{buildroot} install
|
|
|
+
|
|
|
+install -s -m 755 tools/rpcdebug/rpcdebug %{buildroot}%{_sbindir}
|
|
|
+install -m 644 utils/mount/nfsmount.conf %{buildroot}%{_sysconfdir}
|
|
|
+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}
|
|
|
+%else
|
|
|
+install -m 755 %{SOURCE10} %{buildroot}%{_initdir}/nfs
|
|
|
+install -m 755 %{SOURCE11} %{buildroot}%{_initdir}/nfslock
|
|
|
+install -m 755 %{SOURCE12} %{buildroot}%{_initdir}/rpcidmapd
|
|
|
+install -m 755 %{SOURCE15} %{buildroot}%{_initdir}/nfsdcld
|
|
|
+install -m 644 %{SOURCE23} %{buildroot}%{_sysconfdir}/sysconfig/nfs
|
|
|
%if %{enablegss}
|
|
|
-install -m 755 %{SOURCE13} $RPM_BUILD_ROOT%{_initdir}/rpcgssd
|
|
|
+install -m 755 %{SOURCE13} %{buildroot}%{_initdir}/rpcgssd
|
|
|
+%endif
|
|
|
%endif
|
|
|
-install -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_initdir}/nfsdcld
|
|
|
|
|
|
-install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
|
|
|
-install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
|
|
|
-install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs
|
|
|
+mkdir -p %{buildroot}/run/sysconfig
|
|
|
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/modprobe.d/lockd.conf
|
|
|
+
|
|
|
+rm -f %{buildroot}%{_libdir}/*.{a,la}
|
|
|
+rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
|
|
|
+mkdir -p %{buildroot}/var/lib/nfs/rpc_pipefs
|
|
|
|
|
|
-touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
|
|
|
-mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin
|
|
|
+touch %{buildroot}/var/lib/nfs/rmtab
|
|
|
+mv %{buildroot}/usr/sbin/rpc.statd %{buildroot}/sbin
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm
|
|
|
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak
|
|
|
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
|
|
|
+mkdir -p %{buildroot}/var/lib/nfs/statd/sm
|
|
|
+mkdir -p %{buildroot}/var/lib/nfs/statd/sm.bak
|
|
|
+mkdir -p %{buildroot}/var/lib/nfs/v4recovery
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/exports.d
|
|
|
|
|
|
# temporarily remove nfs.5 man page until util-linux gets upgraded...
|
|
|
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/nfs.5*
|
|
|
+#rm -f %{buildroot}/%{_mandir}/man5/nfs.5*
|
|
|
|
|
|
-rm -f %{buildroot}%{_libdir}/*.{a,la}
|
|
|
-rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
|
|
|
|
|
|
|
|
|
%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%pre
|
|
@@ -247,6 +283,19 @@ 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
|
|
|
+%else
|
|
|
/sbin/chkconfig --add nfs
|
|
|
/sbin/chkconfig --add nfslock
|
|
|
/sbin/chkconfig --add rpcidmapd
|
|
@@ -262,9 +311,19 @@ if [ -f /var/lock/subsys/rpc.statd ]; then
|
|
|
else
|
|
|
chown -R rpcuser:rpcuser /var/lib/nfs/statd
|
|
|
fi
|
|
|
+%endif
|
|
|
|
|
|
%preun
|
|
|
-if [ "$1" = "0" ]; then
|
|
|
+%if %{with systemd}
|
|
|
+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
|
|
|
+fi
|
|
|
+%else
|
|
|
+if [ "$1" = "0" -o -x /bin/systemctl ]; then
|
|
|
/etc/rc.d/init.d/nfs condstop > /dev/null
|
|
|
%if %{enablegss}
|
|
|
/etc/rc.d/init.d/rpcgssd condstop > /dev/null
|
|
@@ -286,9 +345,16 @@ if [ "$1" = "0" ]; then
|
|
|
rm -rf /var/lib/nfs/statd
|
|
|
rm -rf /var/lib/nfs/v4recovery
|
|
|
fi
|
|
|
+%endif
|
|
|
|
|
|
%postun
|
|
|
-if [ "$1" -ge 1 ]; then
|
|
|
+%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 || :
|
|
|
+%else
|
|
|
+if [ "$1" -ge 1 -a ! -x /bin/systemctl ]; then
|
|
|
if [ -f /etc/rc.d/init.d/rpcidmapd ]; then
|
|
|
/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
|
|
|
fi
|
|
@@ -307,31 +373,46 @@ if [ "$1" -ge 1 ]; then
|
|
|
/etc/rc.d/init.d/nfsdcld condrestart > /dev/null
|
|
|
fi
|
|
|
fi
|
|
|
+%endif
|
|
|
|
|
|
%post -n libnfsidmap -p /sbin/ldconfig
|
|
|
|
|
|
%postun -n libnfsidmap -p /sbin/ldconfig
|
|
|
|
|
|
%triggerpostun -- nfs-server
|
|
|
+%if !%{with systemd}
|
|
|
/sbin/chkconfig --add nfs
|
|
|
+%endif
|
|
|
|
|
|
%triggerpostun -- knfsd
|
|
|
+%if !%{with systemd}
|
|
|
/sbin/chkconfig --add nfs
|
|
|
+%endif
|
|
|
|
|
|
%triggerpostun -- knfsd-clients
|
|
|
+%if !%{with systemd}
|
|
|
/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}
|
|
|
+/usr/lib/systemd/system-generators/*
|
|
|
+%{_unitdir}/*
|
|
|
+%{_sbindir}/nfsconvert
|
|
|
+%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
|
|
|
+%else
|
|
|
%config %{_initdir}/nfs
|
|
|
%config %{_initdir}/nfsdcld
|
|
|
%config %{_initdir}/rpcidmapd
|
|
|
+%config %{_initdir}/nfslock
|
|
|
%if %{enablegss}
|
|
|
%config %{_initdir}/rpcgssd
|
|
|
%endif
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/nfs
|
|
|
+%endif
|
|
|
%config(noreplace) %{_sysconfdir}/nfsmount.conf
|
|
|
%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
|
|
|
%config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf
|
|
@@ -348,7 +429,6 @@ fi
|
|
|
%config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
|
|
|
/sbin/rpc.statd
|
|
|
#/sbin/osd_login
|
|
|
-/sbin/nfsdcld
|
|
|
/sbin/nfsdcltrack
|
|
|
%{_sbindir}/exportfs
|
|
|
%{_sbindir}/nfsstat
|
|
@@ -367,8 +447,10 @@ fi
|
|
|
%{_sbindir}/nfsidmap
|
|
|
%{_sbindir}/blkmapd
|
|
|
%{_sbindir}/nfsconf
|
|
|
+%{_sbindir}/nfsref
|
|
|
+%{_sbindir}/nfsdcld
|
|
|
+%{_sbindir}/clddb-tool
|
|
|
%{_mandir}/*/*
|
|
|
-%config %{_initdir}/nfslock
|
|
|
|
|
|
%attr(4755,root,root) /sbin/mount.nfs
|
|
|
/sbin/mount.nfs4
|
|
@@ -392,6 +474,11 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-1
|
|
|
+- new upstream release.
|
|
|
+- updated patches.
|
|
|
+- added systemd support (disabled as default).
|
|
|
+
|
|
|
* Fri Oct 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.1-1
|
|
|
- new upstream release.
|
|
|
- updated Patch100.
|