-# TODO
-# - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
-# uninstall (or in service nfs stop)
#
# Conditional build:
-%bcond_with krb5 # build with MIT Kerberos (+libgssglue) instead of Heimdal
+%bcond_with krb5 # build with MIT Kerberos instead of Heimdal
%bcond_without tirpc # use librpcsecgss instead of libtirpc
#
Summary: Kernel NFS server
Summary(ru.UTF-8): Утилиты для NFS и демоны поддержки для NFS-сервера ядра
Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра
Name: nfs-utils
-Version: 1.2.5
-Release: 3.1
+Version: 1.2.9
+Release: 2
License: GPL v2
Group: Networking/Daemons
-#Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
+#Source0: https://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
Source0: http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5: 8395ac770720b83c5c469f88306d7765
+# Source0-md5: 18869d16db3f49c053f8c68eba3fe2e0
#Source1: ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
Source1: nfs.doc.tar.gz
# Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
Source9: nfslock.sysconfig
Source10: nfsfs.sysconfig
Source11: blkmapd.init
+Source12: sunrpc.conf
Source100: proc-fs-nfsd.mount
Source101: var-lib-nfs-rpc_pipefs.mount
Source102: nfsd.service
Patch2: %{name}-subsys.patch
Patch3: %{name}-union-mount.patch
Patch4: %{name}-heimdal.patch
-Patch5: %{name}-heimdal-kcm.patch
+Patch5: fix-minorversion.patch
URL: http://nfs.sourceforge.net/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: cpp
+BuildRequires: device-mapper-devel
BuildRequires: keyutils-devel
BuildRequires: libblkid-devel >= 1.40
-BuildRequires: libmount-devel
BuildRequires: libcap-devel
-BuildRequires: device-mapper-devel
BuildRequires: libevent-devel >= 1.2
+BuildRequires: libmount-devel
BuildRequires: libnfsidmap-devel >= 0.24
BuildRequires: libtool
BuildRequires: libwrap-devel
BuildRequires: pkgconfig
BuildRequires: rpm-pythonprov
+BuildRequires: sqlite3-devel >= 3.3
%if %{with tirpc}
BuildRequires: libtirpc-devel >= 1:0.1.10-4
%else
%endif
%if %{with krb5}
BuildRequires: krb5-devel >= 1.6
-BuildRequires: libgssglue-devel >= 0.3
%else
BuildRequires: heimdal-devel >= 1.0
%endif
Requires(post): fileutils
Requires(post): sed >= 4.0
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-common = %{version}-%{release}
+Requires: libevent >= 2.0.14-2
Requires: rc-scripts >= 0.4.1.5
Requires: rpcbind >= 0.1.7
Requires: setup >= 2.4.6-7
+Requires: systemd-units >= 0.38
Provides: nfsdaemon
Obsoletes: knfsd
Obsoletes: nfs-server
+Obsoletes: nfs-utils-systemd
Obsoletes: nfsdaemon
Conflicts: kernel < 2.2.5
Conflicts: krb5-common < 1.7
супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
традиційні Linux NFS-сервери, які використовує більшість користувачів.
-%package systemd
-Summary: systemd units for NFS server services
-Summary(pl.UTF-8): Jednostki systemd dla serwisów serwera NFS
-Group: Daemons
-Requires: %{name} = %{version}-%{release}
-Requires: systemd
-Requires: systemd-units
-
-%description systemd
-Systemd units for NFS server services.
-
-%description systemd -l pl.UTF-8
-Jednostki systemd dla serwisów serwera NFS.
-
%package clients
Summary: Clients for connecting to a remote NFS server
Summary(pl.UTF-8): Klienci do łączenia się ze zdalnym serwerem NFS
Group: Networking
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-common = %{version}-%{release}
Requires: psmisc
Requires: rc-scripts
+Requires: systemd-units >= 0.38
Provides: nfs-server-clients
Provides: nfsclient
Obsoletes: knfsd-clients
Obsoletes: nfs-server-clients
+Obsoletes: nfs-utils-clients-systemd
Obsoletes: nfsclient
Conflicts: krb5-common < 1.7
zamountowani na tym serwerze. Ten pakiet nie jest konieczny do
zamountowania zasobów NFS.
-%package clients-systemd
-Summary: systemd units for NFS clients
-Summary(pl.UTF-8): Jednostki systemd dla klientów NFS
-Group: Daemons
-Requires: %{name}-clients = %{version}-%{release}
-Requires: systemd
-Requires: systemd-units
-
-%description clients-systemd
-Systemd units for NFS clients.
-
-%description clients-systemd -l pl.UTF-8
-Jednostki systemd dla klientów NFS.
-
%package common
Summary: Common programs for NFS
Summary(pl.UTF-8): Wspólne programy do obsługi NFS
Group: Networking
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Provides: user(rpcstatd)
Provides: group(rpcstatd)
Provides: nfslockd
Provides: nfs-utils-lock
-Requires: libnfsidmap >= 0.21-3
+Requires: libnfsidmap >= 0.25-3
Requires: rc-scripts
Requires: rpcbind >= 0.1.7
+Requires: systemd-units >= 0.38
+Obsoletes: nfs-utils-common-systemd
Obsoletes: nfs-utils-lock
Obsoletes: knfsd-lock
Obsoletes: nfslockd
%description common -l pl.UTF-8
Wspólne programy do obsługi NFS.
-%package common-systemd
-Summary: systemd units for common NFS services
-Summary(pl.UTF-8): Jednostki systemd dla wspólnych serwisów NFS
-Group: Daemons
-Requires: %{name}-common = %{version}-%{release}
-Requires: systemd
-Requires: systemd-units
-
-%description common-systemd
-Systemd units for common NFS services.
-
-%description common-systemd -l pl.UTF-8
-Jednostki systemd dla wspólnych serwisów NFS.
-
%prep
%setup -q -a1
%patch0 -p1
--with-statdpath=/var/lib/nfs/statd \
--with-statedir=/var/lib/nfs \
--with-statduser=rpcstatd \
- --with-start-statd=%{_sbindir}/start-statd \
+ --with-start-statd=/sbin/start-statd \
--with-tcp-wrappers \
+ --without-gssglue \
--with-krb5
%{__make} all
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d,modprobe.d} \
$RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery} \
$RPM_BUILD_ROOT{%{systemdunitdir},%{_datadir}/nfs-utils}
install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
-cat >$RPM_BUILD_ROOT%{_sbindir}/start-statd <<EOF
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/start-statd
+cat >$RPM_BUILD_ROOT/sbin/start-statd <<EOF
#!/bin/sh
# mount.nfs calls this script when mounting a filesystem with locking
# enabled, but when statd does not seem to be running (based on
# /var/run/rpc.statd.pid).
-exec /sbin/service nfslock start
+exec /sbin/rpc.statd --no-notify
EOF
-sed -e "s|#!/bin/bash|#!/bin/sh|" utils/gssd/gss_destroy_creds > $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
+%{__sed} -i -e 's|%{_sbindir}nfsidmap|/sbin/nfsidmap|g' $RPM_BUILD_ROOT%{_mandir}/man8/nfsidmap.8
-mv $RPM_BUILD_ROOT%{_sbindir}/rpcdebug $RPM_BUILD_ROOT/sbin
+for f in rpcdebug blkmapd nfsidmap rpc.gssd rpc.idmapd rpc.statd ; do
+ mv $RPM_BUILD_ROOT%{_sbindir}/$f $RPM_BUILD_ROOT/sbin
+done
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
+install %{SOURCE12} $RPM_BUILD_ROOT/etc/modprobe.d/sunrpc.conf
+
install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
-install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-blkmapd.service
-install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-exportfs.service
-install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-gssd.service
-install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-idmapd.service
-install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-lock.service
-install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-mountd.service
-install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-svcgssd.service
+install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/blkmapd.service
+install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
+install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/gssd.service
+install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/idmapd.service
+install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfslock.service
+install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-mountd.service
+install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/svcgssd.service
install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
-install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfs-lock.preconfig
+install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfslock.preconfig
+
+# Disable old SysV service for systemd installs
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/nfs.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/nfsfs.service
> $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
> $RPM_BUILD_ROOT%{_sysconfdir}/exports
%service nfs restart "NFS daemon"
/sbin/chkconfig --add svcgssd
%service svcgssd restart "RPC svcgssd"
+%systemd_post nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
%preun
if [ "$1" = "0" ]; then
%service svcgssd stop
/sbin/chkconfig --del svcgssd
fi
+%systemd_preun nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
-%post systemd
-%systemd_post nfsd.service
-%systemd_post nfs-exportfs.service
-%systemd_post nfs-mountd.service
-%systemd_post nfs-svcgssd.service
-
-%preun systemd
-%systemd_preun nfsd.service
-%systemd_preun nfs-exportfs.service
-%systemd_preun nfs-mountd.service
-%systemd_preun nfs-svcgssd.service
-
-%postun systemd
+%postun
%systemd_reload
%post clients
%service gssd restart "RPC gssd"
/sbin/chkconfig --add blkmapd
%service blkmapd restart "pNFS blkmapd"
+%systemd_post blkmapd.service gssd.service
%preun clients
if [ "$1" = "0" ]; then
%service blkmapd stop
/sbin/chkconfig --del blkmapd
fi
+%systemd_preun blkmapd.service gssd.service
-%post clients-systemd
-%systemd_post nfs-blkmapd.service
-%systemd_post nfs-gssd.service
-
-%preun clients-systemd
-%systemd_preun nfs-blkmapd.service
-%systemd_preun nfs-gssd.service
-
-%postun clients-systemd
+%postun clients
%systemd_reload
%pre common
%service idmapd restart "RPC idmapd"
/sbin/chkconfig --add nfslock
%service nfslock restart "RPC statd"
+%systemd_post idmapd.service nfslock.service
%preun common
if [ "$1" = "0" ]; then
%service nfslock stop
/sbin/chkconfig --del nfslock
fi
+%systemd_preun idmapd.service nfslock.service
%postun common
if [ "$1" = "0" ]; then
%userremove rpcstatd
%groupremove rpcstatd
fi
-
-%post common-systemd
-%systemd_post nfs-idmapd.service
-%systemd_post nfs-lock.service
-
-%preun common-systemd
-%systemd_preun nfs-idmapd.service
-%systemd_preun nfs-lock.service
-
-%postun common-systemd
%systemd_reload
-%triggerpostun -- %{name} < 1.2.5-4
+%triggerpostun -- %{name} < 1.2.5-7
if [ -f /etc/sysconfig/nfsd ]; then
. /etc/sysconfig/nfsd
- __RPCMOUNTOPTIONS=
- [ -n "$MOUNTD_PORT" ] && __RPCMOUNTOPTIONS="-p $MOUNTD_PORT"
+ __RPCMOUNTDOPTIONS=
+ [ -n "$MOUNTD_PORT" ] && __RPCMOUNTDOPTIONS="-p $MOUNTD_PORT"
for vers in 2 3 4 ; do
__var=$(eval echo \$NFSv$vers)
[ -n "$__var" -a "$__var" != "yes" ] && \
- __RPCMOUNTOPTIONS="$__RPCMOUNTOPTIONS --no-nfs-version $vers"
+ __RPCMOUNTDOPTIONS="$__RPCMOUNTDOPTIONS --no-nfs-version $vers"
done
- [ -z "$__RPCMOUNTOPTIONS" ] && exit 0
- cp -f /etc/sysconfig/nfsd{,.rpmsave}
- echo >>/etc/sysconfig/nfsd
- echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
- echo "RPCMOUNTOPTIONS=$RPCMOUNTOPTIONS $__RPCMOUNTOPTIONS" >>/etc/sysconfig/nfsd
+ if [ -n "$__RPCMOUNTDOPTIONS" ]; then
+ %{__cp} -f /etc/sysconfig/nfsd{,.rpmsave}
+ echo >>/etc/sysconfig/nfsd
+ echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
+ echo "RPCMOUNTDOPTIONS=\"$RPCMOUNTOPTIONS $__RPCMOUNTDOPTIONS\"" >>/etc/sysconfig/nfsd
+ fi
fi
+%systemd_trigger nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
+
+%triggerpostun clients -- %{name}-clients < 1.2.5-7
+%systemd_trigger blkmapd.service gssd.service
%triggerpostun common -- %{name}-lock < 1.2.5-3
if [ -f /etc/sysconfig/nfslock.rpmsave ]; then
mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock
fi
-%triggerpostun common -- %{name}-common < 1.2.5-4
+%triggerpostun common -- %{name}-common < 1.2.5-7
if [ -f /etc/sysconfig/nfslock ]; then
. /etc/sysconfig/nfslock
[ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
[ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
- [ -z "$STATDOPTS" ] && exit 0
- cp -f /etc/sysconfig/nfslock{,.rpmsave}
- echo >>/etc/sysconfig/nfslock
- echo "# Added by rpm trigger" >>/etc/sysconfig/nfslock
- echo "STATDOPTIONS=$STATDOPTS" >>/etc/sysconfig/nfslock
+ if [ -n "$STATDOPTS" ]; then
+ %{__cp} -f /etc/sysconfig/nfslock{,.rpmsave}
+ echo >>/etc/sysconfig/nfslock
+ echo "# Added by rpm trigger" >>/etc/sysconfig/nfslock
+ echo "STATDOPTIONS=\"$STATDOPTS\"" >>/etc/sysconfig/nfslock
+ fi
fi
+%systemd_trigger idmapd.service nfslock.service
%files
%defattr(644,root,root,755)
-%doc ChangeLog README html
+%doc README html
%attr(755,root,root) /sbin/rpcdebug
%attr(755,root,root) /sbin/fsck.nfs
%attr(755,root,root) %{_sbindir}/exportfs
%attr(755,root,root) %{_sbindir}/rpc.nfsd
%attr(755,root,root) %{_sbindir}/rpc.svcgssd
%attr(755,root,root) %{_sbindir}/nfsstat
+%attr(755,root,root) %{_sbindir}/nfsdcltrack
%attr(754,root,root) /etc/rc.d/init.d/nfs
%attr(754,root,root) /etc/rc.d/init.d/svcgssd
%{_mandir}/man8/exportfs.8*
%{_mandir}/man8/mountd.8*
%{_mandir}/man8/nfsd.8*
+%{_mandir}/man8/nfsdcltrack.8*
%{_mandir}/man8/nfsstat.8*
%{_mandir}/man8/rpc.mountd.8*
%{_mandir}/man8/rpc.nfsd.8*
%{_mandir}/man8/rpcdebug.8*
%{_mandir}/man8/svcgssd.8*
-%files systemd
-%defattr(644,root,root,755)
+%{systemdunitdir}/nfs.service
%{systemdunitdir}/nfsd.service
-%{systemdunitdir}/nfs-exportfs.service
-%{systemdunitdir}/nfs-mountd.service
-%{systemdunitdir}/nfs-svcgssd.service
+%{systemdunitdir}/nfsd-exportfs.service
+%{systemdunitdir}/nfsd-mountd.service
+%{systemdunitdir}/svcgssd.service
%{systemdunitdir}/proc-fs-nfsd.mount
%attr(755,root,root) %{_datadir}/nfs-utils/nfsd.postconfig
%attr(755,root,root) %{_datadir}/nfs-utils/nfsd.preconfig
%attr(4755,root,root) /sbin/umount.nfs
%attr(4755,root,root) /sbin/mount.nfs4
%attr(4755,root,root) /sbin/umount.nfs4
-%attr(755,root,root) %{_sbindir}/blkmapd
+%attr(755,root,root) /sbin/blkmapd
+%attr(755,root,root) /sbin/osd_login
+%attr(755,root,root) /sbin/rpc.gssd
%attr(755,root,root) %{_sbindir}/mountstats
%attr(755,root,root) %{_sbindir}/nfsiostat
-%attr(755,root,root) %{_sbindir}/rpc.gssd
%attr(755,root,root) %{_sbindir}/showmount
%{_mandir}/man5/nfsmount.conf.5*
%{_mandir}/man8/blkmapd.8*
%{_mandir}/man8/showmount.8*
%{_mandir}/man8/umount.nfs.8*
-%files clients-systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/nfs-blkmapd.service
-%{systemdunitdir}/nfs-gssd.service
+%{systemdunitdir}/nfsfs.service
+%{systemdunitdir}/blkmapd.service
+%{systemdunitdir}/gssd.service
%files common
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock
%attr(754,root,root) /etc/rc.d/init.d/idmapd
%attr(754,root,root) /etc/rc.d/init.d/nfslock
-%attr(755,root,root) %{_sbindir}/gss_clnt_send_err
-%attr(755,root,root) %{_sbindir}/gss_destroy_creds
-%attr(755,root,root) %{_sbindir}/nfsidmap
-%attr(755,root,root) %{_sbindir}/rpc.idmapd
-%attr(755,root,root) %{_sbindir}/rpc.statd
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/sunrpc.conf
%attr(755,root,root) %{_sbindir}/sm-notify
-%attr(755,root,root) %{_sbindir}/start-statd
+%attr(755,root,root) /sbin/nfsidmap
+%attr(755,root,root) /sbin/rpc.idmapd
+%attr(755,root,root) /sbin/rpc.statd
+%attr(755,root,root) /sbin/start-statd
%dir %{_var}/lib/nfs
%dir %{_var}/lib/nfs/rpc_pipefs
%dir %{_var}/lib/nfs/v4recovery
%{_mandir}/man8/sm-notify.8*
%{_mandir}/man8/statd.8*
-%files common-systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/nfs-idmapd.service
-%{systemdunitdir}/nfs-lock.service
+%{systemdunitdir}/idmapd.service
+%{systemdunitdir}/nfslock.service
%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
%dir %{_datadir}/nfs-utils
-%attr(755,root,root) %{_datadir}/nfs-utils/nfs-lock.preconfig
+%attr(755,root,root) %{_datadir}/nfs-utils/nfslock.preconfig
projects / packages / nfs-utils.git / blobdiff