packages: nfs-utils/nfs-utils-heimdal.patch, nfs-utils/nfs-utils-statdpath....

baggins baggins at pld-linux.org
Sun Sep 25 17:02:22 CEST 2011 

Author: baggins                      Date: Sun Sep 25 15:02:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 1.2.5

---- Files affected:
packages/nfs-utils:
   nfs-utils-heimdal.patch (1.10 -> 1.11) , nfs-utils-statdpath.patch (1.7 -> 1.8) , nfs-utils.spec (1.207 -> 1.208) 

---- Diffs:

================================================================
Index: packages/nfs-utils/nfs-utils-heimdal.patch
diff -u packages/nfs-utils/nfs-utils-heimdal.patch:1.10 packages/nfs-utils/nfs-utils-heimdal.patch:1.11
--- packages/nfs-utils/nfs-utils-heimdal.patch:1.10	Wed Aug  3 12:42:41 2011
+++ packages/nfs-utils/nfs-utils-heimdal.patch	Sun Sep 25 17:02:17 2011
@@ -31,10 +31,10 @@
  dnl Checks librpcsec version
  AC_DEFUN([AC_RPCSEC_VERSION], [
  
--  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
+-  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
 +  dnl libgssglue is needed only for MIT Kerberos
 +  if test "$gssapi_lib" = gssapi_krb5; then
-+    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
++    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
 +  fi
  
    dnl TI-RPC replaces librpcsecgss

================================================================
Index: packages/nfs-utils/nfs-utils-statdpath.patch
diff -u packages/nfs-utils/nfs-utils-statdpath.patch:1.7 packages/nfs-utils/nfs-utils-statdpath.patch:1.8
--- packages/nfs-utils/nfs-utils-statdpath.patch:1.7	Sun Oct  3 01:08:20 2010
+++ packages/nfs-utils/nfs-utils-statdpath.patch	Sun Sep 25 17:02:17 2011
@@ -11,19 +11,6 @@
  
  uninstall-hook:
  	rm $(DESTDIR)$(statedir)/xtab
---- nfs-utils-1.2.2/support/nsm/file.c~	2010-02-18 13:35:00.000000000 +0100
-+++ nfs-utils-1.2.2/support/nsm/file.c	2010-02-24 17:27:51.635249268 +0100
-@@ -95,8 +95,8 @@
- /*
-  * Some distributions place statd's files in a subdirectory
-  */
--#define NSM_PATH_EXTENSION
--/* #define NSM_PATH_EXTENSION	"/statd" */
-+/* #define NSM_PATH_EXTENSION */
-+#define NSM_PATH_EXTENSION	"/statd"
- 
- #define NSM_DEFAULT_STATEDIR		NFS_STATEDIR NSM_PATH_EXTENSION
- 
 --- nfs-utils-1.2.2/utils/statd/statd.man~	2010-02-18 13:35:00.000000000 +0100
 +++ nfs-utils-1.2.2/utils/statd/statd.man	2010-02-24 17:30:05.097124679 +0100
 @@ -232,7 +232,7 @@

================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.207 packages/nfs-utils/nfs-utils.spec:1.208
--- packages/nfs-utils/nfs-utils.spec:1.207	Fri Sep  2 20:57:02 2011
+++ packages/nfs-utils/nfs-utils.spec	Sun Sep 25 17:02:17 2011
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO
-# - consider enabling: nfsv41, mountconfig, libmount-mount
+# - where to package pNFS blkmapd client deamon (clients or separate package)
+# - consider enabling: libmount-mount
 # - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
 #	uninstall (or in service nfs stop)
 #
@@ -14,12 +15,13 @@
 Summary(ru.UTF-8):	Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
-Version:	1.2.4
-Release:	3
+Version:	1.2.5
+Release:	0.1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5:	938dc0574f3eb9891a8ed4746f806277
+#Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	8395ac770720b83c5c469f88306d7765
 #Source1:	ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:	nfs.doc.tar.gz
 # Source1-md5:	ae7db9c61c5ad04f83bb99e5caed73da
@@ -45,6 +47,7 @@
 BuildRequires:	keyutils-devel
 BuildRequires:	libblkid-devel >= 1.40
 BuildRequires:	libcap-devel
+BuildRequires:	device-mapper-devel
 BuildRequires:	libevent-devel >= 1.2
 BuildRequires:	libnfsidmap-devel >= 0.21-3
 BuildRequires:	libtool
@@ -186,8 +189,10 @@
 %configure \
 	--enable-nfsv3 \
 	--enable-nfsv4 \
+	--enable-nfsv41 \
 	--enable-gss \
 	--enable-mount \
+	--enable-mountconfig \
 %if %{with tirpc}
 	--enable-tirpc \
 	--enable-ipv6 \
@@ -195,6 +200,7 @@
 	--disable-tirpc \
 	--disable-ipv6 \
 %endif
+	--with-statdpath=/var/lib/nfs/statd \
 	--with-statedir=/var/lib/nfs \
 	--with-statduser=rpcstatd \
 	--with-start-statd=%{_sbindir}/start-statd \
@@ -211,6 +217,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
+
 cat >$RPM_BUILD_ROOT%{_sbindir}/start-statd <<EOF
 #!/bin/sh
 # mount.nfs calls this script when mounting a filesystem with locking
@@ -236,8 +244,7 @@
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,sm-notify}.8
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{svcgssd,gssd,idmapd}.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,sm-notify,svcgssd,gssd,idmapd}.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
@@ -385,6 +392,7 @@
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/nfsfs
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsfs
+%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) /etc/nfsmount.conf
 %attr(4755,root,root) /sbin/mount.nfs
 %attr(4755,root,root) /sbin/umount.nfs
 %attr(4755,root,root) /sbin/mount.nfs4
@@ -394,6 +402,7 @@
 %attr(755,root,root) %{_sbindir}/showmount
 %attr(755,root,root) %{_sbindir}/rpc.gssd
 %attr(754,root,root) /etc/rc.d/init.d/gssd
+%{_mandir}/man5/nfsmount.conf.5*
 %{_mandir}/man8/gssd.8*
 %{_mandir}/man8/mount.nfs.8*
 %{_mandir}/man8/mountstats.8*
@@ -423,6 +432,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.208  2011/09/25 15:02:17  baggins
+- update to 1.2.5
+
 Revision 1.207  2011/09/02 18:57:02  baggins
 - rel 3
 - typo
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-heimdal.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-statdpath.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.207&r2=1.208&f=u

More information about the pld-cvs-commit mailing list