- fix compatibility with kernels not supporting NFS vers 4.1 and 4.2

[packages/nfs-utils.git] / nfs-utils.spec

diff --git a/nfs-utils.spec b/nfs-utils.spec
index cdb2af6d0604b9c130d05c0739caa409c4a73957..a8838685b95ebd6d18127809699b934aa57c2706 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,6 +1,6 @@
 #
 # 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
@@ -9,13 +9,13 @@ Summary(pt_BR.UTF-8): Os utilitários para o cliente e servidor NFS do Linux
 Summary(ru.UTF-8):     Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils
-Version:       1.2.5
-Release:       5
+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
@@ -29,6 +29,7 @@ Source8:      nfs.sysconfig
 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
@@ -47,22 +48,23 @@ Patch1:             %{name}-statdpath.patch
 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
@@ -70,7 +72,6 @@ BuildRequires:        librpcsecgss-devel >= 0.16
 %endif
 %if %{with krb5}
 BuildRequires: krb5-devel >= 1.6
-BuildRequires: libgssglue-devel >= 0.3
 %else
 BuildRequires: heimdal-devel >= 1.0
 %endif
@@ -80,6 +81,7 @@ BuildConflicts:       gss_mech_spkm3-devel
 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
@@ -89,6 +91,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
@@ -125,6 +128,7 @@ 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
@@ -133,6 +137,7 @@ 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
 
@@ -155,6 +160,7 @@ 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
@@ -163,6 +169,7 @@ 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
@@ -209,13 +216,14 @@ Wspólne programy do obsługi NFS.
        --with-statduser=rpcstatd \
        --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}
 
@@ -224,6 +232,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
 
 install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
 
+%{__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
@@ -232,7 +241,6 @@ cat >$RPM_BUILD_ROOT/sbin/start-statd <<EOF
 exec /sbin/rpc.statd --no-notify
 EOF
 
-%{__sed} -i -e "s|#!/bin/bash|#!/bin/sh|" $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
 %{__sed} -i -e 's|%{_sbindir}nfsidmap|/sbin/nfsidmap|g' $RPM_BUILD_ROOT%{_mandir}/man8/nfsidmap.8
 
 for f in rpcdebug blkmapd nfsidmap rpc.gssd rpc.idmapd rpc.statd ; do
@@ -250,6 +258,8 @@ install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/nfsd
 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
@@ -358,7 +368,7 @@ if [ "$1" = "0" ]; then
 fi
 %systemd_reload
 
-%triggerpostun -- %{name} < 1.2.5-5
+%triggerpostun -- %{name} < 1.2.5-7
 if [ -f /etc/sysconfig/nfsd ]; then
        . /etc/sysconfig/nfsd
        __RPCMOUNTDOPTIONS=
@@ -368,15 +378,16 @@ if [ -f /etc/sysconfig/nfsd ]; then
                [ -n "$__var" -a "$__var" != "yes" ] && \
                        __RPCMOUNTDOPTIONS="$__RPCMOUNTDOPTIONS --no-nfs-version $vers"
        done
-       [ -z "$__RPCMOUNTDOPTIONS" ] && exit 0
-       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
+       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-5
+%triggerpostun clients -- %{name}-clients < 1.2.5-7
 %systemd_trigger blkmapd.service gssd.service
 
 %triggerpostun common -- %{name}-lock < 1.2.5-3
@@ -385,22 +396,23 @@ if [ -f /etc/sysconfig/nfslock.rpmsave ]; then
        mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock
 fi
 
-%triggerpostun common -- %{name}-common < 1.2.5-5
+%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
@@ -408,6 +420,7 @@ fi
 %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
@@ -425,6 +438,7 @@ fi
 %{_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*
@@ -453,6 +467,7 @@ fi
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
 %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
@@ -476,8 +491,7 @@ fi
 %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
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/sunrpc.conf
 %attr(755,root,root) %{_sbindir}/sm-notify
 %attr(755,root,root) /sbin/nfsidmap
 %attr(755,root,root) /sbin/rpc.idmapd