rpms/nfs-utils-lib/devel nfs-utils-lib-1.1.3-compile.patch, NONE, 1.1 nfs-utils-lib-1.1.3-idmapd-default.patch, NONE, 1.1 nfs-utils-lib-1.1.3-plugin-version.patch, NONE, 1.1 nfs-utils-lib-1.0.8-idmap.conf.patch, 1.2, 1.3 nfs-utils-lib.spec, 1.29, 1.30

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13858

Modified Files:
	nfs-utils-lib-1.0.8-idmap.conf.patch nfs-utils-lib.spec 
Added Files:
	nfs-utils-lib-1.1.3-compile.patch 
	nfs-utils-lib-1.1.3-idmapd-default.patch 
	nfs-utils-lib-1.1.3-plugin-version.patch 
Log Message:
Upgraded libnfsidmap to latest upstream version: 0.21


nfs-utils-lib-1.1.3-compile.patch:

--- NEW FILE nfs-utils-lib-1.1.3-compile.patch ---
--- nfs-utils-lib-1.1.3/libnfsidmap/aclocal.m4.orig	2008-07-30 18:23:53.000000000 -0400
+++ nfs-utils-lib-1.1.3/libnfsidmap/aclocal.m4	2008-08-27 11:26:39.763243000 -0400
@@ -11,10 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.60],,
-[m4_fatal([this file was generated for autoconf 2.60.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+#m4_if(m4_PACKAGE_VERSION, [2.60],,
+#[m4_fatal([this file was generated for autoconf 2.60.
+#You have another version of autoconf.  If you want to use that,
+#you should regenerate the build system entirely.], [63])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 

nfs-utils-lib-1.1.3-idmapd-default.patch:

--- NEW FILE nfs-utils-lib-1.1.3-idmapd-default.patch ---
diff -up nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c.orig nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c
--- nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c.orig	2008-04-01 10:22:22.000000000 -0400
+++ nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c	2008-08-27 11:00:19.620075000 -0400
@@ -53,6 +53,10 @@
 #include "nfsidmap_internal.h"
 #include "cfg.h"
 
+#ifndef IDMAPD_DEFAULT_DOMAIN
+#define IDMAPD_DEFAULT_DOMAIN "localdomain"
+#endif
+
 static char *default_domain;
 static struct conf_list *local_realms;
 int idmap_verbosity = 0;
@@ -212,10 +216,12 @@ int nfs4_init_name_mapping(char *conffil
 		dflt = 1;
 		ret = domain_from_dns(&default_domain);
 		if (ret) {
-			IDMAP_LOG(0, ("libnfsidmap: Unable to determine "
-				  "a default nfsv4 domain; consider "
-				  "specifying one in idmapd.conf\n"));
-			return -ENOENT;
+			IDMAP_LOG(1, ("libnfsidmap: Unable to determine "
+				"the NFSv4 domain; Using '%s' as the NFSv4 domain "
+				"which means UIDs will be mapped to the 'Nobody-User' "
+				"user defined in %s\n",
+				IDMAPD_DEFAULT_DOMAIN, conf_path));
+			default_domain = IDMAPD_DEFAULT_DOMAIN;
 		}
 	}
 	IDMAP_LOG(1, ("libnfsidmap: using%s domain: %s\n",

nfs-utils-lib-1.1.3-plugin-version.patch:

--- NEW FILE nfs-utils-lib-1.1.3-plugin-version.patch ---
diff -up nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c.orig nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c
--- nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c.orig	2008-08-27 11:45:00.014211000 -0400
+++ nfs-utils-lib-1.1.3/libnfsidmap/libnfsidmap.c	2008-08-27 13:29:42.687477000 -0400
@@ -63,6 +63,10 @@ int idmap_verbosity = 0;
 static struct mapping_plugin **nfs4_plugins = NULL;
 static struct mapping_plugin **gss_plugins = NULL;
 
+#ifndef PLUGIN_VERSION
+#define PLUGIN_VERSION "0"
+#endif
+
 #define PLUGIN_PREFIX "libnfsidmap_"
 #define PLUGIN_INIT_FUNC "libnfsidmap_plugin_init"
 
@@ -105,7 +109,8 @@ static int load_translation_plugin(char 
 	char plgname[128];
 	int ret = 0;
 
-	snprintf(plgname, sizeof(plgname), "%s%s.so", PLUGIN_PREFIX, method);
+	snprintf(plgname, sizeof(plgname), "%s%s.so.%s", 
+		PLUGIN_PREFIX, method, PLUGIN_VERSION);
 
 	dl = dlopen(plgname, RTLD_NOW | RTLD_LOCAL);
 	if (dl == NULL) {

nfs-utils-lib-1.0.8-idmap.conf.patch:

Index: nfs-utils-lib-1.0.8-idmap.conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/devel/nfs-utils-lib-1.0.8-idmap.conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfs-utils-lib-1.0.8-idmap.conf.patch	27 Jun 2008 17:05:13 -0000	1.2
+++ nfs-utils-lib-1.0.8-idmap.conf.patch	27 Aug 2008 19:29:29 -0000	1.3
@@ -1,11 +1,14 @@
---- nfs-utils-lib-1.0.8/libnfsidmap/idmapd.conf.orig	2006-08-14 17:19:45.000000000 -0400
-+++ nfs-utils-lib-1.0.8/libnfsidmap/idmapd.conf	2007-07-14 08:26:06.000000000 -0400
-@@ -1,29 +1,29 @@
+diff -up nfs-utils-lib-1.1.3/libnfsidmap/idmapd.conf.orig nfs-utils-lib-1.1.3/libnfsidmap/idmapd.conf
+--- nfs-utils-lib-1.1.3/libnfsidmap/idmapd.conf.orig	2008-03-28 11:40:35.000000000 -0400
++++ nfs-utils-lib-1.1.3/libnfsidmap/idmapd.conf	2008-08-27 11:07:22.693400000 -0400
+@@ -1,12 +1,13 @@
  [General]
  #Verbosity = 0
- # The following should be set to the local NFSv4 domain name (REQUIRED)
+-# The following should be set to the local NFSv4 domain name (REQUIRED)
 -Domain = local.domain.edu
++# The following should be set to the local NFSv4 domain name
 +#Domain = local.domain.edu
++
  
  [Mapping]
  
@@ -16,12 +19,17 @@
  
  [Translation]
  
- # Translation method is either "nsswitch" (DEFAULT) or "umich_ldap"
+@@ -16,7 +17,7 @@ Domain = local.domain.edu
+ # is a dynamically loadable plugin library.
+ # New methods may be defined and inserted in the list.
+ # The default is "nsswitch".
 -#Method = nsswitch
 +Method = nsswitch
  
- #-------------------------------------------------------------------#
- # The following are only used if Translation Method is umich_ldap.
+ # Optional.  This is a comma-separated, ordered list of
+ # translation methods to be used for translating GSS
+@@ -40,13 +41,13 @@ Domain = local.domain.edu
+ # The following are used only for the "umich_ldap" Translation Method.
  #-------------------------------------------------------------------#
  
 -[UMICH_SCHEMA]


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nfs-utils-lib.spec	27 Jun 2008 17:05:13 -0000	1.29
+++ nfs-utils-lib.spec	27 Aug 2008 19:29:30 -0000	1.30
@@ -1,11 +1,11 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
-Version: 1.1.1
-Release: 4%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
-%define idmapvers 0.20
+%define idmapvers 0.21
 %define libnfsidmap libnfsidmap
 %define rpcsecgssvers 0.17
 %define librpcsecgss librpcsecgss
@@ -18,7 +18,11 @@
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidmap}-%{idmapvers}.tar.gz
 Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz
 
-Patch00: nfs-utils-lib-1.0.8-idmap.conf.patch
+Patch00: nfs-utils-lib-1.1.3-idmapd-default.patch
+Patch01: nfs-utils-lib-1.0.8-idmap.conf.patch
+Patch02: nfs-utils-lib-1.1.3-plugin-version.patch
+
+Patch100: nfs-utils-lib-1.1.3-compile.patch
 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -48,6 +52,10 @@
 mv %{librpcsecgss}-%{rpcsecgssvers} %{librpcsecgss}
 
 %patch00 -p1
+%patch01 -p1
+%patch02 -p1
+
+%patch100 -p1
 
 %build
 top=`pwd`
@@ -112,8 +120,8 @@
 %{_libdir}/pkgconfig/librpcsecgss.pc
 
 %config(noreplace) /etc/idmapd.conf
-%{_libdir}/libnfsidmap.so.*
-%{_libdir}/libnfsidmap.la
+%{_libdir}/libnfsidmap*.so.*
+%{_libdir}/libnfsidmap*.la
 %dir %{libnfsidmap_docdir}
 %{libnfsidmap_docdir}/*
 %{_libdir}/pkgconfig/libnfsidmap.pc
@@ -130,10 +138,13 @@
 %{_includedir}/rpcsecgss/rpc/rpc.h
 %{_includedir}/rpcsecgss/rpc/rpcsecgss_rename.h
 %{_includedir}/nfsidmap.h
-%{_libdir}/libnfsidmap.so
-%{_libdir}/libnfsidmap.a
+%{_libdir}/libnfsidmap*.so
+%{_libdir}/libnfsidmap*.a
 
 %changelog
+* Wed Aug 27 2008 Steve Dickson <steved at redhat.com> 1.1.3-1
+- Upgraded libnfsidmap to latest upstream version: 0.21
+
 * Fri Jun 27 2008 Steve Dickson <steved at redhat.com> 1.1.1-4
 - In idmapd.conf, commented out 'Domain' so DNS will be
   used to define the domainname. (bz 447237)