2015-02-20 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* libnfsidmap, libtirpc, nfs-utils: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9364 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libn/libnfsidmap/libnfsidmap-vl.spec

@@ -1,59 +1,80 @@
 Summary:        NFSv4 ID Mapping Library
 Summary(ja):	NFSv4 ID マッピングライブラリ
 Name:           libnfsidmap
-Version:        0.25
+Version:        0.26
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+
 License:        BSD
+Group:          System Environment/Libraries
 URL:            http://nfs.sourceforge.net
 
-Source0:        http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-%{version}.tar.gz
+Source0:        https://fedorapeople.org/~steved/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch10:        idmap.conf.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  openldap-devel, tcp_wrappers
+BuildRequires:  pkgconfig
+BuildRequires:  openldap-devel
+BuildRequires:  tcp_wrappers
 
 %description
 In NFSv4, identities of users are conveyed by names rather than user ID
 and group ID. Both the NFS server and client code in the kernel need to
 translate these to numeric IDs.
 
+%package devel
+Summary: Development files for the libnfsidmap library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package includes header files and libraries necessary for
+developing programs which use the libnfsidmap library.
+
 
 %prep
 %setup -q
-
 %patch10 -p1
 
 %build
 %configure --disable-static --with-pluginpath=%{_libdir}/%{name}
-%__make %{?_smp_mflags} all
+make %{?_smp_mflags} all
 
 %install
-%?__make install DESTDIR=%{buildroot} 
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p %{buildroot}/etc
-install -m 644 idmapd.conf $RPM_BUILD_ROOT/etc/idmapd.conf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 644 idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/idmapd.conf
 
 # Delete unneeded files
-rm -rf %{buildroot}%{_libdir}/*.{a,la}
-rm -rf %{buildroot}%{_libdir}/%{name}/*.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc COPYING README
+%doc AUTHORS ChangeLog NEWS README COPYING
 %config(noreplace) /etc/idmapd.conf
-%{_libdir}/lib*.so*
+%{_libdir}/lib*.so.*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/*.h
-%{_mandir}/man?/*
+%{_mandir}/*/*
+
+%files devel
+%defattr(0644,root,root,755)
+%{_includedir}/nfsidmap.h
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/libnfsidmap.pc
 
 
 %changelog
+* Wed Feb 18 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.26-1
+- updated to 0.26
+- split develop files into devel subpackage
+
 * Sat Oct 20 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.25-1
 - new upstream release 
 - remove static libs

lib/libt/libtirpc/libtirpc-vl.spec

@@ -1,19 +1,20 @@
 Name:		libtirpc
-Version:	0.2.1
-Release:	4%{?_dist_release}
+Version:	0.2.5
+Release:	1%{?_dist_release}
 Summary:	Transport Independent RPC Library
-Group:		System Environment/Libraries
+
 License:	SISSL and BSD
+Group:		System Environment/Libraries
 URL:  		http://nfsv4.bullopensource.org/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Source0:	http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	automake, autoconf, libtool, pkgconfig
-BuildRequires:	libgssglue-devel
+BuildRequires:	krb5-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 %description
 This package contains SunLib's implementation of transport-independent
@@ -46,7 +47,7 @@ find . -name "*.orig" | xargs rm -f
 
 %build
 autoreconf -fisv
-%configure --enable-gss
+%configure --disable-static
 make all
 
 %install
@@ -55,7 +56,7 @@ mkdir -p %{buildroot}/etc
 make install DESTDIR=%{buildroot}
 
 # Don't package .a or .la files
-rm -f %{buildroot}%{_libdir}/*.{a,la}
+rm -f %{buildroot}%{_libdir}/*.la
 
 # Creat the man diretory
 #mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t
@@ -114,6 +115,10 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Thu Feb 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.2.5-1
+- updated to 0.2.5
+- BR: krb5-devel instead of libgssglue-devel
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.1-4
 - rebuild with VineSeed environment
 

n/nfs-utils/nfs-utils-vl.spec

@@ -1,35 +1,39 @@
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
 Name: nfs-utils
-URL: http://sourceforge.net/projects/nfs
-Version: 1.2.6
-Release: 2%{?_dist_release}
+Version: 1.3.2
+Release: 1%{?_dist_release}
 
-%define enablegss 0
+%define enablegss 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
+License: MIT and GPLv2 and GPLv2+ and BSD
+Group: System Environment/Daemons
+URL: http://sourceforge.net/projects/nfs
+
 Source0: %{name}-%{version}.tar.bz2
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
 Source10: nfs.init
 Source11: nfslock.init
 Source12: rpcidmapd.init
-%if %{enablegss}
 Source13: rpcgssd.init
-Source14: rpcsvcgssd.init
-%endif
-Source15: nfs.sysconfig
+#Source14: rpcsvcgssd.init
 
-Patch001: nfs-utils-1.2.7-rc5.patch
+Source21: id_resolver.conf
+Source22: lockd.conf
+Source23: nfs.sysconfig
+
+Patch001: nfs-utils-1.3.2-statd-bg.patch
+Patch002: nfs-utils-1.3.2-statd-nowait.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
 Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
 Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
 
-Group: System Environment/Daemons
 Provides: exportfs    = %{version}-%{release}
 Provides: nfsstat     = %{version}-%{release}
 Provides: showmount   = %{version}-%{release}
@@ -40,7 +44,6 @@ Provides: rpc.nfsd    = %{version}-%{release}
 Provides: rpc.statd   = %{version}-%{release}
 %if %{enablegss}
 Provides: rpc.gssd    = %{version}-%{release}
-Provides: rpc.svcgssd = %{version}-%{release}
 %endif
 Provides: mount.nfs   = %{version}-%{release}
 Provides: mount.nfs4  = %{version}-%{release}
@@ -49,31 +52,27 @@ Provides: umount.nfs4 = %{version}-%{release}
 Provides: sm-notify   = %{version}-%{release}
 Provides: start-statd = %{version}-%{release}
 
-License: GPL
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-# Vine still uses portmap instead of rpcbind, as of this writing
-#Requires: rpcbind
-Requires: portmap >= 4.0
-Requires: sed, gawk, sh-utils, fileutils, textutils, grep
-Requires: modutils >= 2.4.26-9
-BuildRequires: libevent-devel >= 1.3b
-BuildRequires: libnfsidmap >= 0.20
-BuildRequires: libblkid-devel
-%if %{enablegss}
-BuildRequires: libgssglue-devel >= 0.3
-BuildRequires: librpcsecgss >= 0.17
-%endif
-BuildRequires: autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool, glibc-headers
-BuildRequires: e2fsprogs-devel, tcp_wrappers
-BuildRequires: libtirpc-devel
-BuildRequires: device-mapper-devel
+Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
+Requires: kmod, keyutils, quota
+BuildRequires: libevent-devel libcap-devel
+BuildRequires: libnfsidmap-devel libtirpc-devel libblkid-devel
+BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
+BuildRequires: automake, libtool, glibc-headers, device-mapper-devel
+BuildRequires: krb5-devel, tcp_wrappers, libmount-devel
+BuildRequires: sqlite3-devel
+#if %{enablegss}
+#BuildRequires: libgssglue-devel
+#BuildRequires: librpcsecgss >= 0.17
+#endif
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
-Requires: libnfsidmap >= 0.20 libevent >= 1.3b
-%if %{enablegss}
-Requires: librpcsecgss >= 0.17 libgssglue
-%endif
+Requires: libnfsidmap libevent
+Requires: libtirpc >= 0.2.3 libblkid libcap libmount
+#if %{enablegss}
+#Requires: libgssglue
+#Requires: librpcsecgss >= 0.17
+#endif
 
 
 %description
@@ -106,6 +105,7 @@ NFS サーバに関する情報を得ることができます。
 %setup -q
 
 %patch001 -p1
+%patch002 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -136,31 +136,35 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
     --enable-mountconfig \
     --enable-ipv6 \
     --with-statdpath=/var/lib/nfs/statd \
+    --enable-libmount-mount \
 %if !%{enablegss}
-    --disable-gss \
-%endif    
-    --enable-mount
+    --disable-gss
+%endif
 
-make all
+make %{?_smp_mflags} all
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
-mkdir -p $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig}
-mkdir -p $RPM_BUILD_ROOT/etc/request-key.d
+mkdir -p $RPM_BUILD_ROOT%{_initdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
 make DESTDIR=$RPM_BUILD_ROOT install
-install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/usr/sbin
-install -m 644 utils/mount/nfsmount.conf  $RPM_BUILD_ROOT/etc
-install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
-install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd
+install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir}
+install -m 644 utils/mount/nfsmount.conf  $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_initdir}/nfs
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_initdir}/nfslock
+install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_initdir}/rpcidmapd
 %if %{enablegss}
-install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd
-install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd
+install -m 755 %{SOURCE13} $RPM_BUILD_ROOT%{_initdir}/rpcgssd
 %endif
-install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/nfs
+
+install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
+install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
+install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
 
@@ -170,7 +174,7 @@ mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
-mkdir -p $RPM_BUILD_ROOT/etc/exports.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
 
 # temporarily remove nfs.5 man page until util-linux gets upgraded...
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/nfs.5*
@@ -192,9 +196,9 @@ done
         -s /sbin/nologin -u 29 -d /var/lib/nfs rpcuser 2>/dev/null || :
 cat /etc/group | cut -d':' -f 1 | grep --quiet nfsnobody 2>/dev/null
 if [ "$?" -eq 1 ]; then
-  /usr/sbin/groupadd -g 29 rpcuser 2>/dev/null || :
+    /usr/sbin/groupadd -g 29 rpcuser 2>/dev/null || :
 else
-  /usr/sbin/groupmod -g 29 rpcuser 2>/dev/null || :
+    /usr/sbin/groupmod -g 29 rpcuser 2>/dev/null || :
 fi
 
 # Using the 16-bit value of -2 for the nfsnobody uid and gid
@@ -225,47 +229,54 @@ fi
 /sbin/chkconfig --add rpcidmapd
 %if %{enablegss}
 /sbin/chkconfig --add rpcgssd
-/sbin/chkconfig --add rpcsvcgssd
 %endif
 # Make sure statd used the correct uid/gid.
-if [ -f /var/lock/subsys/nfslock ]; then
-	/etc/rc.d/init.d/nfslock stop > /dev/null
-	chown -R rpcuser:rpcuser /var/lib/nfs/statd
-	/etc/rc.d/init.d/nfslock start > /dev/null
+if [ -f /var/lock/subsys/rpc.statd ]; then
+    /etc/rc.d/init.d/nfslock stop > /dev/null
+    chown -R rpcuser:rpcuser /var/lib/nfs/statd
+    /etc/rc.d/init.d/nfslock start > /dev/null
 else
 	chown -R rpcuser:rpcuser /var/lib/nfs/statd
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-    /etc/rc.d/init.d/nfs condrestart
+    /etc/rc.d/init.d/nfs condstop > /dev/null
 %if %{enablegss}
-    /etc/rc.d/init.d/rpcgssd condrestart
+    /etc/rc.d/init.d/rpcgssd condstop > /dev/null
 %endif    
-    /etc/rc.d/init.d/rpcidmapd condrestart
-    /etc/rc.d/init.d/nfslock condrestart
+    /etc/rc.d/init.d/rpcidmapd condstop > /dev/null
+    /etc/rc.d/init.d/nfslock condstop > /dev/null
     /sbin/chkconfig --del rpcidmapd
 %if %{enablegss}
     /sbin/chkconfig --del rpcgssd
-    /sbin/chkconfig --del rpcsvcgssd
 %endif
     /sbin/chkconfig --del nfs
     /sbin/chkconfig --del nfslock
     /usr/sbin/userdel rpcuser 2>/dev/null || :
     /usr/sbin/groupdel rpcuser 2>/dev/null || :
     /usr/sbin/userdel nfsnobody 2>/dev/null || :
+    /usr/sbin/groupdel nfsnobody 2>/dev/null || :
     rm -rf /var/lib/nfs/statd
     rm -rf /var/lib/nfs/v4recovery
 fi
 
 %postun
 if [ "$1" -ge 1 ]; then
-    /etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
+    if [ -f /etc/rc.d/init.d/rpcidmapd ]; then
+	/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
+    fi
 %if %{enablegss}
-    /etc/rc.d/init.d/rpcgssd condrestart > /dev/null
+    if [ -f /etc/rc.d/init.d/rpcgssd ]; then
+	/etc/rc.d/init.d/rpcgssd condrestart > /dev/null
+    fi
 %endif
-    /etc/rc.d/init.d/nfs condrestart > /dev/null
+    if [ -f /etc/rc.d/init.d/nfs ]; then
+	/etc/rc.d/init.d/nfs condrestart > /dev/null
+    fi
+    if [ -f /etc/rc.d/init.d/nfslock ]; then
 	/etc/rc.d/init.d/nfslock condrestart > /dev/null
+    fi
 fi
 
 %triggerpostun -- nfs-server
@@ -279,16 +290,18 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc linux-nfs/*
-%config /etc/rc.d/init.d/nfs
-%config /etc/rc.d/init.d/rpcidmapd
+%doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
+%doc linux-nfs/THANKS linux-nfs/TODO
+%config %{_initdir}/nfs
+%config %{_initdir}/rpcidmapd
 %if %{enablegss}
-%config /etc/rc.d/init.d/rpcgssd
-%config /etc/rc.d/init.d/rpcsvcgssd
+%config %{_initdir}/rpcgssd
 %endif
-%config(noreplace) /etc/sysconfig/nfs
-%config(noreplace) /etc/nfsmount.conf
-%dir /etc/exports.d
+%config(noreplace) %{_sysconfdir}/sysconfig/nfs
+%config(noreplace) %{_sysconfdir}/nfsmount.conf
+%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
+%config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf
+%dir %{_sysconfdir}/exports.d
 %dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
 %dir /var/lib/nfs
@@ -298,37 +311,45 @@ fi
 %config(noreplace) /var/lib/nfs/xtab
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
-%config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/state
+%config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
 /sbin/rpc.statd
 /sbin/osd_login
-/usr/sbin/exportfs
-/usr/sbin/nfsstat
-/usr/sbin/rpcdebug
-/usr/sbin/rpc.mountd
-/usr/sbin/rpc.nfsd
-/usr/sbin/showmount
-/usr/sbin/rpc.idmapd
+/sbin/nfsdcltrack
+%{_sbindir}/exportfs
+%{_sbindir}/nfsstat
+%{_sbindir}/rpcdebug
+%{_sbindir}/rpc.mountd
+%{_sbindir}/rpc.nfsd
+%{_sbindir}/showmount
+%{_sbindir}/rpc.idmapd
 %if %{enablegss}
-/usr/sbin/rpc.gssd
-/usr/sbin/rpc.svcgssd
-/usr/sbin/gss_clnt_send_err
-/usr/sbin/gss_destroy_creds
+%{_sbindir}/rpc.gssd
 %endif
-/usr/sbin/sm-notify
-/usr/sbin/start-statd
-/usr/sbin/mountstats
-/usr/sbin/nfsiostat
-/usr/sbin/blkmapd
+%{_sbindir}/sm-notify
+%{_sbindir}/start-statd
+%{_sbindir}/mountstats
+%{_sbindir}/nfsiostat
+%{_sbindir}/nfsidmap
+%{_sbindir}/blkmapd
 %{_mandir}/*/*
-%config /etc/rc.d/init.d/nfslock
+%config %{_initdir}/nfslock
 
 %attr(4755,root,root)   /sbin/mount.nfs
-%attr(4755,root,root)   /sbin/mount.nfs4
-%attr(4755,root,root)   /sbin/umount.nfs
-%attr(4755,root,root)   /sbin/umount.nfs4
+/sbin/mount.nfs4
+/sbin/umount.nfs
+/sbin/umount.nfs4
 
 
 %changelog
+* Thu Feb 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.3.2-1
+- new upstream release
+- updated Source10-13
+- added Patch1 and 2 from Fedora
+- added BR: libmount-devel, sqlite3-devel
+- used BR: libnfsidmap-devel instead of libnfsidmap
+- used more macros
+- set %%enablegss to 1
+
 * Sun Oct 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.6-2
 - update to 1.2.7-rc5