Author: arekm                        Date: Sun Feb 27 21:50:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable gss and nfs4

---- Files affected:
SPECS:
   nfs-utils.spec (1.87 -> 1.88) 

---- Diffs:

================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.87 SPECS/nfs-utils.spec:1.88
--- SPECS/nfs-utils.spec:1.87   Wed Dec 22 15:10:27 2004
+++ SPECS/nfs-utils.spec        Sun Feb 27 22:50:53 2005
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# TODO:
+#      - where to put idmapd binaries (server/client/both)?
+#      - gss daemons, main or separate package?
+
 Summary:       Kernel NFS server
 Summary(pl):   Działający na poziomie jądra serwer NFS
 Summary(pt_BR):        Os utilitários para o cliente e servidor NFS do Linux
@@ -6,7 +10,7 @@
 Summary(uk):   őÔÉĚŚÔÉ ÄĚŃ NFS ÔÁ ÄĹÍĎÎÉ ĐŚÄÔŇÉÍËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Name:          nfs-utils
 Version:       1.0.7
-Release:       2
+Release:       2.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/nfs/%{name}-%{version}.tar.gz
@@ -26,8 +30,13 @@
 Patch3:                %{name}-install.patch
 Patch4:                %{name}-nolibs.patch
 Patch5:                %{name}-usn36.patch
+Patch6:                %{name}-gss.patch
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf
+BuildRequires: libevent-devel
+BuildRequires: nfsidmap-devel
+BuildRequires: heimdal-devel
+BuildRequires: libwrap-devel
 PreReq:                rc-scripts >= 0.4.0
 PreReq:                setup >= 2.4.6-7
 Requires(post,preun):  /sbin/chkconfig
@@ -142,16 +151,18 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 chmod u+w configure
 
 %build
+rm -rf support/gssapi/*
+echo -ne "all:\ndep:\ninstall:\ninstallman:\n" > support/gssapi/Makefile
+ln -sf %{_includedir}/gssapi.h support/include/gssapi/gssapi.h
 %{__autoconf}
-# nfsv4 needs libevent and libnfsidmap
-# gss needs nfsidmap.h
 %configure \
-       --disable-gss \
-       --disable-nfsv4 \
+       --enable-gss \
+       --enable-nfsv4 \
        --enable-nfsv3 \
        --enable-secure-statd \
        --with-statedir=/var/lib/nfs
@@ -165,6 +176,7 @@
 %{__make} install \
        install_prefix=$RPM_BUILD_ROOT
 
+install utils/idmapd/idmapd.conf       $RPM_BUILD_ROOT/etc
 install tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
@@ -177,19 +189,25 @@
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,rquotad,statd,lockd}.8
+rm -f 
$RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,rquotad,statd,lockd,gssd,idmapd,svcgssd}.8
 echo ".so lockd.8"   >         $RPM_BUILD_ROOT%{_mandir}/man8/rpc.lockd.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 rquotad.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.rquotad.8
 echo ".so statd.8"   > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.statd.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
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/rpc.idmapd.conf.5
+echo ".so idmapd.conf.5" > $RPM_BUILD_ROOT%{_mandir}/man5/rpc.idmapd.conf.5
 
 touch $RPM_BUILD_ROOT/var/lib/nfs/xtab
 
 ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
-mv -f nfs/*.ps ./
-mv -f nfs html
+cp -a nfs nfs-copy
+mv -f nfs-copy/*.ps ./
+mv -f nfs-copy html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -269,6 +287,7 @@
 %attr(755,root,root) %{_sbindir}/exportfs
 %attr(755,root,root) %{_sbindir}/rpc.mountd
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
+%attr(755,root,root) %{_sbindir}/rpc.idmapd
 %attr(755,root,root) %{_sbindir}/nfsstat
 %attr(755,root,root) %{_sbindir}/nhfsgraph
 %attr(755,root,root) %{_sbindir}/nhfsnums
@@ -279,12 +298,14 @@
 
 %attr(755,root,root) %dir %{_var}/lib/nfs
 
+%attr(660,root,root) %config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/idmapd.conf
 %attr(664,root,fileshare) %config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/exports
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/nfsd
 %config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/xtab
 %config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/etab
 %config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/rmtab
 
+%{_mandir}/man[58]/*idmap*
 %{_mandir}/man5/exports.5*
 %{_mandir}/man7/nfsd.7*
 %{_mandir}/man8/exportfs.8*
@@ -329,6 +350,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2005/02/27 21:50:53  arekm
+- enable gss and nfs4
+
 Revision 1.87  2004/12/22 14:10:27  hawk
 - oops
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nfs-utils.spec?r1=1.87&r2=1.88&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to