- updated to 1.1.1

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 0a7956201ee5b129bef37f6c21d4d99b1e0d815b..672e69997b9738d7d6aad8b422f7a3e5a74fecd2 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,6 +1,6 @@
 # TODO
-# - should unmount /proc/fs/nfsd at package uninstall (or in service nfs stop)
-# - CITI and fake patches need updating
+# - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
+#      uninstall (or in service nfs stop)
 #
 # Conditional build:
 %bcond_without nfs4            # without NFSv4 support
@@ -12,14 +12,14 @@ 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.1.0
-%define        _pre    rc1
-Release:       0.%{_pre}.1
+Version:       1.1.1
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://dl.sourceforge.net/nfs/%{name}-%{version}-%{_pre}.tar.gz
-# Source0-md5: 924dd05dc3958d4da585d74808bb84c4
-Source1:       ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
+Source0:       ftp://ftp.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.gz
+# Source0-md5: 407785488241f9db67b1874e3f36370e
+#Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
+Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
 Source2:       nfs.init
 Source3:       nfslock.init
@@ -32,15 +32,13 @@ Source9:    nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Patch0:                %{name}-eepro-support.patch
 Patch1:                %{name}-install.patch
-# http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/
-#Patch2:               %{name}-1.0.11-CITI_NFS4_ALL-1.dif
+# http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.1-1/nfs-utils-1.1.1-CITI_NFS4_ALL-1.dif
 Patch2:                %{name}-CITI_NFS4.patch
 Patch3:                %{name}-statdpath.patch
-Patch4:                %{name}-mount-fake.patch
-Patch5:                %{name}-mountd.patch
-Patch6:                %{name}-idmapd.conf.patch
-Patch7:                %{name}-keytab-path.patch
-Patch8:                %{name}-subsys.patch
+Patch4:                %{name}-mountd.patch
+Patch5:                %{name}-idmapd.conf.patch
+Patch6:                %{name}-keytab-path.patch
+Patch7:                %{name}-subsys.patch
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -49,8 +47,9 @@ BuildRequires:        e2fsprogs-devel >= 1.39-5
 %if %{with nfs4}
 BuildRequires: krb5-devel >= 1.6
 BuildRequires: libevent-devel >= 1.2
+BuildRequires: libgssglue-devel >= 0.1
 BuildRequires: libnfsidmap-devel
-BuildRequires: librpcsecgss-devel >= 0.11-3
+BuildRequires: librpcsecgss-devel >= 0.16
 %endif
 BuildRequires: libtool
 BuildRequires: libwrap-devel
@@ -61,7 +60,7 @@ Requires(post):       sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      portmap >= 4.0
-Requires:      rc-scripts >= 0.4.0
+Requires:      rc-scripts >= 0.4.1.5
 Requires:      setup >= 2.4.6-7
 Provides:      nfsdaemon
 Obsoletes:     knfsd
@@ -129,7 +128,6 @@ Summary:    Programs for NFS file locking
 Summary(pl.UTF-8):     Programy do obsługi blokowania plików poprzez NFS (lock)
 Group:         Networking
 Requires(post,preun):  /sbin/chkconfig
-#Requires:     kernel >= 2.2.5
 Requires:      portmap >= 4.0
 Requires:      rc-scripts
 Provides:      group(rpcstatd)
@@ -158,20 +156,18 @@ Common programs for NFS.
 Wspólne programy do obsługi NFS.
 
 %prep
-%setup -q -a1 -n %{name}-%{version}-%{_pre}
+%setup -q -a1
 %patch0 -p1
 %patch1 -p1
-# temporary hack
-#rm -f utils/mountd/fsloc.[ch]
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
+%{__autoconf}
 %configure \
 %if %{with nfs4}
        --enable-gss \
@@ -182,7 +178,6 @@ Wspólne programy do obsługi NFS.
        --disable-nfsv4 \
 %endif
        %{?with_mount:--enable-mount} \
-       --disable-rquotad \
        --enable-nfsv3 \
        --enable-secure-statd \
        --with-statedir=/var/lib/nfs \
@@ -199,6 +194,16 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_mandir}/man{5,8}} \
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+cat >$RPM_BUILD_ROOT%{_sbindir}/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
+EOF
+
+sed -e "s|#!/bin/bash|#!/bin/sh|" utils/gssd/gss_destroy_creds > $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
+
 mv $RPM_BUILD_ROOT%{_sbindir}/rpcdebug $RPM_BUILD_ROOT/sbin
 install utils/idmapd/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/
 
@@ -215,11 +220,13 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,svcgssd,gssd,idmapd}.8
+rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,sm-notify}.8
 echo ".so mountd.8"  >         $RPM_BUILD_ROOT%{_mandir}/man8/rpc.mountd.8
 echo ".so nfsd.8"    > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.nfsd.8
 echo ".so statd.8"   > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.statd.8
+echo ".so sm-notify.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.sm-notify.8
 %if %{with nfs4}
+rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{svcgssd,gssd,idmapd}.8
 echo ".so gssd.8"    > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.gssd.8
 echo ".so idmapd.8"  > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.8
 echo ".so svcgssd.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
@@ -229,7 +236,6 @@ touch $RPM_BUILD_ROOT/var/lib/nfs/xtab
 
 ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
-rm -rf html
 cp -a nfs html
 
 %clean
@@ -240,7 +246,7 @@ rm -rf $RPM_BUILD_ROOT
 %service nfs restart "NFS daemon"
 %if %{with nfs4}
 /sbin/chkconfig --add svcgssd
-%service svcgssd restart "RPC svcgssd daemon"
+%service svcgssd restart "RPC svcgssd"
 %endif
 
 %preun
@@ -258,7 +264,7 @@ fi
 %service nfsfs restart
 %if %{with nfs4}
 /sbin/chkconfig --add gssd
-%service gssd restart "RPC gssd daemon"
+%service gssd restart "RPC gssd"
 %endif
 
 %preun clients
@@ -277,7 +283,7 @@ fi
 
 %post lock
 /sbin/chkconfig --add nfslock
-%service nfslock restart "nfslock daemon"
+%service nfslock restart "RPC statd"
 
 %preun lock
 if [ "$1" = "0" ]; then
@@ -294,7 +300,7 @@ fi
 %if %{with nfs4}
 %post common
 /sbin/chkconfig --add idmapd
-%service idmapd restart "RPC idmapd daemon"
+%service idmapd restart "RPC idmapd"
 
 %preun common
 if [ "$1" = "0" ]; then
@@ -303,18 +309,29 @@ if [ "$1" = "0" ]; then
 fi
 %endif
 
-%triggerpostun -- %{name} <= 1.0.12-7
+%triggerpostun -- %{name} <= 1.1.0-0.rc1.1
 /sbin/chkconfig nfs reset
+%if %{with nfs4}
+/sbin/chkconfig svcgssd reset
+%endif
 
-%triggerpostun lock -- %{name}-lock <= 1.0.12-5
+%triggerpostun lock -- %{name}-lock <= 1.1.0-0.rc1.1
 /sbin/chkconfig nfslock reset
 
-%triggerpostun clients -- %{name}-clients < 1.0.10-1.2
+%triggerpostun clients -- %{name}-clients < 1.1.0-0.rc1.1
 if [ -f /etc/sysconfig/nfsclient.rpmsave ]; then
        mv -f /etc/sysconfig/nfsfs{,.rpmnew}
        mv -f /etc/sysconfig/nfsclient.rpmsave /etc/sysconfig/nfsfs
 fi
 /sbin/chkconfig nfsfs reset
+%if %{with nfs4}
+/sbin/chkconfig gssd reset
+%endif
+
+%if %{with nfs4}
+%triggerpostun common -- %{name}-common <= 1.1.0-0.rc1.1
+/sbin/chkconfig idmapd reset
+%endif
 
 %files
 %defattr(644,root,root,755)
@@ -358,7 +375,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/nfslock
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock
 %{_mandir}/man8/*statd.8*
-%{_mandir}/man8/sm-notify.8*
+%{_mandir}/man8/*sm-notify.8*
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/state
 
 %files clients