- updated to 2.5.3

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 436bf53064fe0f0d01bc77c1cd2350cf1db90d7c..57215af4306d3e892b525aa1bdb4a16eff45c483 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,24 +1,21 @@
-# TODO
-# - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
-#      uninstall (or in service nfs stop)
+# TODO: systemd support needs cleanup (see TODOs below)

 #
 # Conditional build:
 #
 # 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
 %bcond_without tirpc           # use librpcsecgss instead of libtirpc

-#
+

 Summary:       Kernel NFS server
 Summary(pl.UTF-8):     Działający na poziomie jądra serwer NFS
 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
 Summary:       Kernel NFS server
 Summary(pl.UTF-8):     Działający na poziomie jądra serwer NFS
 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:       3.1
+Version:       2.5.3
+Release:       1

 License:       GPL v2
 Group:         Networking/Daemons
 License:       GPL v2
 Group:         Networking/Daemons

-#Source0:      http://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:       https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 24353242a96549fc697d25dc29a961db

 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da


@@ -32,8 +29,8 @@ Source8:      nfs.sysconfig
 Source9:       nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Source11:      blkmapd.init
 Source9:       nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Source11:      blkmapd.init

-Source100:     proc-fs-nfsd.mount
-Source101:     var-lib-nfs-rpc_pipefs.mount
+Source12:      sunrpc.conf
+Source13:      %{name}_env.sh

 Source102:     nfsd.service
 Source103:     nfs-blkmapd.service
 Source104:     nfs-exportfs.service
 Source102:     nfsd.service
 Source103:     nfs-blkmapd.service
 Source104:     nfs-exportfs.service


@@ -50,22 +47,29 @@ Patch1:             %{name}-statdpath.patch
 Patch2:                %{name}-subsys.patch
 Patch3:                %{name}-union-mount.patch
 Patch4:                %{name}-heimdal.patch
 Patch2:                %{name}-subsys.patch
 Patch3:                %{name}-union-mount.patch
 Patch4:                %{name}-heimdal.patch

-Patch5:                %{name}-heimdal-kcm.patch
-URL:           http://nfs.sourceforge.net/
+Patch5:                %{name}-x32.patch
+Patch6:                libnfsidmap-pluginpath.patch
+Patch7:                %{name}-sh.patch
+Patch8:                %{name}-types.patch
+URL:           http://linux-nfs.org/

 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: cpp
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: cpp

+BuildRequires: device-mapper-devel

 BuildRequires: keyutils-devel
 BuildRequires: libblkid-devel >= 1.40
 BuildRequires: keyutils-devel
 BuildRequires: libblkid-devel >= 1.40

-BuildRequires: libmount-devel

 BuildRequires: libcap-devel
 BuildRequires: libcap-devel

-BuildRequires: device-mapper-devel

 BuildRequires: libevent-devel >= 1.2
 BuildRequires: libevent-devel >= 1.2

-BuildRequires: libnfsidmap-devel >= 0.24
+BuildRequires: libmount-devel

 BuildRequires: libtool
 BuildRequires: libwrap-devel
 BuildRequires: libtool
 BuildRequires: libwrap-devel

+BuildRequires: openldap-devel

 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov

+BuildRequires: rpmbuild(macros) >= 1.623
+BuildRequires: sqlite3-devel >= 3.3
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz

 %if %{with tirpc}
 BuildRequires: libtirpc-devel >= 1:0.1.10-4
 %else
 %if %{with tirpc}
 BuildRequires: libtirpc-devel >= 1:0.1.10-4
 %else


@@ -73,23 +77,25 @@ BuildRequires:      librpcsecgss-devel >= 0.16
 %endif
 %if %{with krb5}
 BuildRequires: krb5-devel >= 1.6
 %endif
 %if %{with krb5}
 BuildRequires: krb5-devel >= 1.6

-BuildRequires: libgssglue-devel >= 0.3

 %else
 BuildRequires: heimdal-devel >= 1.0
 %endif
 %else
 BuildRequires: heimdal-devel >= 1.0
 %endif

-BuildRequires: rpmbuild(macros) >= 1.623

 # lucid context fields mismatch with current version of spkm3.h
 BuildConflicts:        gss_mech_spkm3-devel
 Requires(post):        fileutils
 Requires(post):        sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 # lucid context fields mismatch with current version of spkm3.h
 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:      %{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:      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
 Provides:      nfsdaemon
 Obsoletes:     knfsd
 Obsoletes:     nfs-server

+Obsoletes:     nfs-utils-systemd

 Obsoletes:     nfsdaemon
 Conflicts:     kernel < 2.2.5
 Conflicts:     krb5-common < 1.7
 Obsoletes:     nfsdaemon
 Conflicts:     kernel < 2.2.5
 Conflicts:     krb5-common < 1.7


@@ -121,32 +127,21 @@ do Linux.
 супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
 традиційні Linux NFS-сервери, які використовує більшість користувачів.
 
 супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
 традиційні 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
 %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:      %{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
 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
 
 Obsoletes:     nfsclient
 Conflicts:     krb5-common < 1.7
 


@@ -164,34 +159,23 @@ hoście. Na przykład, showmount potrafi pokazać klientów, którzy są
 zamountowani na tym serwerze. Ten pakiet nie jest konieczny do
 zamountowania zasobów NFS.
 
 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
 %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

-Provides:      user(rpcstatd)
-Provides:      group(rpcstatd)
-Provides:      nfslockd
-Provides:      nfs-utils-lock
-Requires:      libnfsidmap >= 0.21-3
+Requires(post,preun,postun):   systemd-units >= 38
+Requires:      libnfsidmap = %{version}-%{release}

 Requires:      rc-scripts
 Requires:      rpcbind >= 0.1.7
 Requires:      rc-scripts
 Requires:      rpcbind >= 0.1.7

-Obsoletes:     nfs-utils-lock
+Requires:      systemd-units >= 0.38
+Provides:      group(rpcstatd)
+Provides:      nfs-utils-lock
+Provides:      nfslockd
+Provides:      user(rpcstatd)

 Obsoletes:     knfsd-lock
 Obsoletes:     knfsd-lock

+Obsoletes:     nfs-utils-common-systemd
+Obsoletes:     nfs-utils-lock

 Obsoletes:     nfslockd
 Conflicts:     mount < 2.13-0.pre7.1
 
 Obsoletes:     nfslockd
 Conflicts:     mount < 2.13-0.pre7.1
 


@@ -201,19 +185,44 @@ Common programs for NFS.
 %description common -l pl.UTF-8
 Wspólne programy do obsługi NFS.
 
 %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
+%package -n libnfsidmap
+Summary:       Library to help mapping id's, mainly for NFSv4
+Summary(pl.UTF-8):     Biblioteka pomagająca w mapowaniu identyfikatorów, głównie dla NFSv4
+License:       BSD
+Group:         Libraries
+Obsoletes:     nfsidmap
+
+%description -n libnfsidmap
+Library to help mapping id's, mainly for NFSv4.
+
+%description -n libnfsidmap -l pl.UTF-8
+Biblioteka pomagająca w mapowaniu identyfikatorów, głównie dla NFSv4.
+
+%package -n libnfsidmap-devel
+Summary:       Header files for libnfsidmap library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libnfsidmap
+Group:         Development/Libraries
+Requires:      libnfsidmap = %{version}-%{release}
+Obsoletes:     nfsidmap-devel
+
+%description -n libnfsidmap-devel
+Header files for libnfsidmap library.
+
+%description -n libnfsidmap-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libnfsidmap.

 
 

-%description common-systemd
-Systemd units for common NFS services.
+%package -n libnfsidmap-static
+Summary:       Static libnfsidmap library
+Summary(pl.UTF-8):     Statyczna biblioteka libnfsidmap
+Group:         Development/Libraries
+Requires:      libnfsidmap-devel = %{version}-%{release}
+Obsoletes:     nfsidmap-static

 
 

-%description common-systemd -l pl.UTF-8
-Jednostki systemd dla wspólnych serwisów NFS.
+%description -n libnfsidmap-static
+Static libnfsidmap library.
+
+%description -n libnfsidmap-static -l pl.UTF-8
+Statyczna biblioteka libnfsidmap.

 
 %prep
 %setup -q -a1
 
 %prep
 %setup -q -a1


@@ -223,6 +232,9 @@ Jednostki systemd dla wspólnych serwisów NFS.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

+%patch6 -p1
+%patch7 -p1
+%patch8 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}


@@ -231,51 +243,67 @@ Jednostki systemd dla wspólnych serwisów NFS.
 %{__autoheader}
 %{__automake}
 %configure \
 %{__autoheader}
 %{__automake}
 %configure \

-       --enable-nfsv3 \

        --enable-nfsv4 \
        --enable-nfsv41 \
        --enable-gss \
        --enable-nfsv4 \
        --enable-nfsv41 \
        --enable-gss \

+       --enable-libmount-mount \

        --enable-mount \
        --enable-mountconfig \
        --enable-mount \
        --enable-mountconfig \

-       --enable-libmount-mount \
+       --enable-svcgss \

 %if %{with tirpc}
 %if %{with tirpc}

-       --enable-tirpc \

        --enable-ipv6 \
        --enable-ipv6 \

+       --enable-tirpc \

 %else
 %else

-       --disable-tirpc \

        --disable-ipv6 \
        --disable-ipv6 \

+       --disable-tirpc \

 %endif
        --with-statdpath=/var/lib/nfs/statd \
        --with-statedir=/var/lib/nfs \
        --with-statduser=rpcstatd \
 %endif
        --with-statdpath=/var/lib/nfs/statd \
        --with-statedir=/var/lib/nfs \
        --with-statduser=rpcstatd \

-       --with-start-statd=%{_sbindir}/start-statd \
-       --with-tcp-wrappers \
-       --with-krb5
+       --with-start-statd=/sbin/start-statd \
+       --without-gssglue \
+       --with-krb5 \
+       --with-systemd=%{systemdunitdir} \
+       --with-tcp-wrappers

 
 

-%{__make} all
+%{__make} pkgplugindir=/%{_lib}/libnfsidmap
+# all

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,exports.d,modprobe.d} \

        $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery} \
        $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery} \

-       $RPM_BUILD_ROOT{%{systemdunitdir},%{_datadir}/nfs-utils}
+       $RPM_BUILD_ROOT%{_datadir}/nfs-utils

 
 %{__make} install \
 
 %{__make} install \

-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       pkgplugindir=/%{_lib}/libnfsidmap \
+       generator_dir=/lib/systemd/system-generators
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.la
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libnfsidmap/*.{a,la}

 
 

+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libnfsidmap.so.*.*.*) \
+       $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so
+
+install -p support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}

 install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
 
 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).
 #!/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
 
 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 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock


@@ -288,19 +316,33 @@ 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 %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 

-install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
-install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+install %{SOURCE12} $RPM_BUILD_ROOT/etc/modprobe.d/sunrpc.conf
+
+#install systemd/proc-fs-nfsd.mount $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
+#install systemd/var-lib-nfs-rpc_pipefs.mount $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+# TODO: upstream installs nfs-server.service

 install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
 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
+# TODO: upstream installs nfs-blkmap.service
+install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/blkmapd.service
+install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
+# TODO: upstream installs rpc-gssd.service
+install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/gssd.service
+# TODO: upstream installs nfs-idmapd.service
+install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/idmapd.service
+# TODO: upstream installs rpc-statd.service + rpc-statd-notify.service
+install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfslock.service
+# TODO: upstream installs nfs-mountd.service
+install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-mountd.service
+# TODO: upstream installs auth-rpcgss-module.service / rpc-svcgssd.service
+install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/svcgssd.service
+# TODO: upstream installs also nfs-utils.service and nfs-client.target meta-services

 install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
 install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
 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
 
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports


@@ -320,6 +362,9 @@ ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
 cp -a nfs html
 
 
 cp -a nfs html
 

+# make python dep optional
+chmod a-x $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsdclddb,nfsdclnts,nfsiostat}
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -328,6 +373,7 @@ rm -rf $RPM_BUILD_ROOT
 %service nfs restart "NFS daemon"
 /sbin/chkconfig --add svcgssd
 %service svcgssd restart "RPC svcgssd"
 %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
 
 %preun
 if [ "$1" = "0" ]; then


@@ -336,20 +382,9 @@ if [ "$1" = "0" ]; then
        %service svcgssd stop
        /sbin/chkconfig --del svcgssd
 fi
        %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
 %systemd_reload
 
 %post clients


@@ -359,6 +394,7 @@ fi
 %service gssd restart "RPC gssd"
 /sbin/chkconfig --add blkmapd
 %service blkmapd restart "pNFS blkmapd"
 %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
 
 %preun clients
 if [ "$1" = "0" ]; then


@@ -369,16 +405,9 @@ if [ "$1" = "0" ]; then
        %service blkmapd stop
        /sbin/chkconfig --del blkmapd
 fi
        %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
 %systemd_reload
 
 %pre common


@@ -390,6 +419,7 @@ fi
 %service idmapd restart "RPC idmapd"
 /sbin/chkconfig --add nfslock
 %service nfslock restart "RPC statd"
 %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
 
 %preun common
 if [ "$1" = "0" ]; then


@@ -398,40 +428,36 @@ if [ "$1" = "0" ]; then
        %service nfslock stop
        /sbin/chkconfig --del nfslock
 fi
        %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
 
 %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
 
 %systemd_reload
 

-%triggerpostun -- %{name} < 1.2.5-4
+%triggerpostun -- %{name} < 1.2.5-7

 if [ -f /etc/sysconfig/nfsd ]; then
        . /etc/sysconfig/nfsd
 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" ] && \
        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
        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
 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
 
 %triggerpostun common -- %{name}-lock < 1.2.5-3
 if [ -f /etc/sysconfig/nfslock.rpmsave ]; then


@@ -439,24 +465,30 @@ if [ -f /etc/sysconfig/nfslock.rpmsave ]; then
        mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock
 fi
 
        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"
 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
 fi

+%systemd_trigger idmapd.service nfslock.service

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc ChangeLog README html
+%doc README html
+%attr(755,root,root) /sbin/nfsdcltrack

 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs

+%attr(755,root,root) %{_sbindir}/nfsdcld
+%attr(755,root,root) %{_sbindir}/nfsdclddb
+%attr(755,root,root) %{_sbindir}/nfsdclnts

 %attr(755,root,root) %{_sbindir}/rpc.mountd
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
 %attr(755,root,root) %{_sbindir}/rpc.svcgssd
 %attr(755,root,root) %{_sbindir}/rpc.mountd
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
 %attr(755,root,root) %{_sbindir}/rpc.svcgssd


@@ -474,10 +506,16 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/rmtab
 
 %{_mandir}/man5/exports.5*
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/rmtab
 
 %{_mandir}/man5/exports.5*

+%{_mandir}/man5/nfs.conf.5*

 %{_mandir}/man7/nfsd.7*
 %{_mandir}/man7/nfsd.7*

+%{_mandir}/man7/nfs.systemd.7*

 %{_mandir}/man8/exportfs.8*
 %{_mandir}/man8/mountd.8*
 %{_mandir}/man8/nfsd.8*
 %{_mandir}/man8/exportfs.8*
 %{_mandir}/man8/mountd.8*
 %{_mandir}/man8/nfsd.8*

+%{_mandir}/man8/nfsdcld.8*
+%{_mandir}/man8/nfsdclddb.8*
+%{_mandir}/man8/nfsdclnts.8*
+%{_mandir}/man8/nfsdcltrack.8*

 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*


@@ -485,12 +523,12 @@ fi
 %{_mandir}/man8/rpcdebug.8*
 %{_mandir}/man8/svcgssd.8*
 
 %{_mandir}/man8/rpcdebug.8*
 %{_mandir}/man8/svcgssd.8*
 

-%files systemd
-%defattr(644,root,root,755)
+%{systemdunitdir}/nfs.service

 %{systemdunitdir}/nfsd.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}/nfsdcld.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
 %{systemdunitdir}/proc-fs-nfsd.mount
 %attr(755,root,root) %{_datadir}/nfs-utils/nfsd.postconfig
 %attr(755,root,root) %{_datadir}/nfs-utils/nfsd.preconfig


@@ -506,10 +544,10 @@ fi
 %attr(4755,root,root) /sbin/umount.nfs
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
 %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/rpc.gssd

 %attr(755,root,root) %{_sbindir}/mountstats
 %attr(755,root,root) %{_sbindir}/nfsiostat
 %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*
 %attr(755,root,root) %{_sbindir}/showmount
 %{_mandir}/man5/nfsmount.conf.5*
 %{_mandir}/man8/blkmapd.8*


@@ -521,23 +559,22 @@ fi
 %{_mandir}/man8/showmount.8*
 %{_mandir}/man8/umount.nfs.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
 
 %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) /sbin/nfsidmap
+%attr(755,root,root) /sbin/rpc.idmapd
+%attr(755,root,root) /sbin/rpc.statd
+%attr(755,root,root) /sbin/start-statd
+%attr(755,root,root) %{_sbindir}/nfsconf

 %attr(755,root,root) %{_sbindir}/sm-notify
 %attr(755,root,root) %{_sbindir}/sm-notify

-%attr(755,root,root) %{_sbindir}/start-statd

 %dir %{_var}/lib/nfs
 %dir %{_var}/lib/nfs/rpc_pipefs
 %dir %{_var}/lib/nfs/v4recovery
 %dir %{_var}/lib/nfs
 %dir %{_var}/lib/nfs/rpc_pipefs
 %dir %{_var}/lib/nfs/v4recovery


@@ -545,8 +582,17 @@ fi
 %attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm
 %attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm.bak
 %attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state
 %attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm
 %attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm.bak
 %attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state

+%attr(755,root,root) /lib/systemd/system-generators/nfs-server-generator
+%attr(755,root,root) /lib/systemd/system-generators/rpc-pipefs-generator
+%{systemdunitdir}/idmapd.service
+%{systemdunitdir}/nfslock.service
+%{systemdunitdir}/rpc_pipefs.target
+%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+%dir %{_datadir}/nfs-utils
+%attr(755,root,root) %{_datadir}/nfs-utils/nfslock.preconfig

 %{_mandir}/man5/nfs.5*
 %{_mandir}/man8/idmapd.8*
 %{_mandir}/man5/nfs.5*
 %{_mandir}/man8/idmapd.8*

+%{_mandir}/man8/nfsconf.8*

 %{_mandir}/man8/nfsidmap.8*
 %{_mandir}/man8/rpc.idmapd.8*
 %{_mandir}/man8/rpc.sm-notify.8*
 %{_mandir}/man8/nfsidmap.8*
 %{_mandir}/man8/rpc.idmapd.8*
 %{_mandir}/man8/rpc.sm-notify.8*


@@ -554,10 +600,29 @@ fi
 %{_mandir}/man8/sm-notify.8*
 %{_mandir}/man8/statd.8*
 
 %{_mandir}/man8/sm-notify.8*
 %{_mandir}/man8/statd.8*
 

-%files common-systemd
+%files -n libnfsidmap

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%{systemdunitdir}/nfs-idmapd.service
-%{systemdunitdir}/nfs-lock.service
-%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
-%dir %{_datadir}/nfs-utils
-%attr(755,root,root) %{_datadir}/nfs-utils/nfs-lock.preconfig
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
+%attr(755,root,root) /%{_lib}/libnfsidmap.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libnfsidmap.so.1
+%dir /%{_lib}/libnfsidmap
+%attr(755,root,root) /%{_lib}/libnfsidmap/nsswitch.so
+%attr(755,root,root) /%{_lib}/libnfsidmap/regex.so
+%attr(755,root,root) /%{_lib}/libnfsidmap/static.so
+# -plugin-ldap subpackage?
+%attr(755,root,root) /%{_lib}/libnfsidmap/umich_ldap.so
+# -plugin-gums subpackage (BR: some datagrid software - VOMS?)
+#%attr(755,root,root) /%{_lib}/libnfsidmap/gums.so
+%{_mandir}/man5/idmapd.conf.5*
+
+%files -n libnfsidmap-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnfsidmap.so
+%{_includedir}/nfsidmap.h
+%{_includedir}/nfsidmap_plugin.h
+%{_pkgconfigdir}/libnfsidmap.pc
+%{_mandir}/man3/nfs4_uid_to_name.3*
+
+%files -n libnfsidmap-static
+%defattr(644,root,root,755)
+%{_libdir}/libnfsidmap.a