[nfs-utils-lib] Updated to latest upstream release: libnfsidmap-0.24-rc1 Reset default values in /etc/idmap.conf Rem

Steve Dickson steved at fedoraproject.org
Sat Jan 15 20:08:10 UTC 2011


commit db5be1113f2160f213a2723108682f24b4643f18
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 15 15:03:29 2011 -0500

    Updated to latest upstream release: libnfsidmap-0.24-rc1
    Reset default values in /etc/idmap.conf
    Remove some warnings in the RPMdiff run
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 .gitignore                                     |    1 +
 nfs-utils-lib-1.1.5-compile.patch              |   12 ++
 nfs-utils-lib-1.1.5-libnfsidmap-0-25-rc1.patch |  144 ++++++++++++++++++++++++
 nfs-utils-lib-1.1.5-warnings.patch             |   22 ++++
 nfs-utils-lib-fedora-idmapd.conf-default.patch |   49 ++++++++
 nfs-utils-lib.spec                             |   53 ++++++---
 sources                                        |    2 +-
 7 files changed, 264 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91f7050..65d30a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ librpcsecgss-0.17.tar.gz
 libnfsidmap-0.21.tar.gz
 librpcsecgss-0.18.tar.gz
 libnfsidmap-0.23.tar.gz
+/libnfsidmap-0.24.tar.gz
diff --git a/nfs-utils-lib-1.1.5-compile.patch b/nfs-utils-lib-1.1.5-compile.patch
new file mode 100644
index 0000000..850a6e5
--- /dev/null
+++ b/nfs-utils-lib-1.1.5-compile.patch
@@ -0,0 +1,12 @@
+diff -up nfs-utils-lib-1.1.5/libnfsidmap/configure.in.orig nfs-utils-lib-1.1.5/libnfsidmap/configure.in
+--- nfs-utils-lib-1.1.5/libnfsidmap/configure.in.orig	2011-01-14 11:49:22.000000000 -0500
++++ nfs-utils-lib-1.1.5/libnfsidmap/configure.in	2011-01-14 11:49:38.000000000 -0500
+@@ -1,7 +1,7 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_PREREQ([2.66])
++AC_PREREQ([2.63])
+ AC_INIT([libnfsidmap],[0.24],[linux-nfs at vger.kernel.org])
+ AC_CONFIG_SRCDIR([nfsidmap.h])
+ AC_CONFIG_MACRO_DIR([m4])
diff --git a/nfs-utils-lib-1.1.5-libnfsidmap-0-25-rc1.patch b/nfs-utils-lib-1.1.5-libnfsidmap-0-25-rc1.patch
new file mode 100644
index 0000000..70759cb
--- /dev/null
+++ b/nfs-utils-lib-1.1.5-libnfsidmap-0-25-rc1.patch
@@ -0,0 +1,144 @@
+diff -up nfs-utils-lib-1.1.5/libnfsidmap/configure.in.orig nfs-utils-lib-1.1.5/libnfsidmap/configure.in
+--- nfs-utils-lib-1.1.5/libnfsidmap/configure.in.orig	2010-12-08 12:07:53.000000000 -0500
++++ nfs-utils-lib-1.1.5/libnfsidmap/configure.in	2011-01-14 11:21:19.000000000 -0500
+@@ -36,7 +36,20 @@ if test "x$enable_gums" = "xyes" ; then
+ fi
+ AM_CONDITIONAL(ENABLE_GUMS, test "x$enable_gums" = "xyes")
+ 
++#Where do the Plugins live
++AC_ARG_WITH(pluginpath,
++    [AS_HELP_STRING([--with-pluginpath=/foo],[Causes the library to look in /foo instead of /usr/lib/libnfsidmap for plugins
++    ])],
++    path_plugins=$withval,
++    path_plugins=""
++    )
++if test -n "$path_plugins" ; then
++	AC_DEFINE_UNQUOTED(PATH_PLUGINS, "$path_plugins",
++		[Define this to change the plugins path])
++fi
++AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins")
+ 
++AC_CONFIG_HEADERS([./config.h])
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdlib.h string.h unistd.h errno.h])
+diff -up nfs-utils-lib-1.1.5/libnfsidmap/.gitignore.orig nfs-utils-lib-1.1.5/libnfsidmap/.gitignore
+--- nfs-utils-lib-1.1.5/libnfsidmap/.gitignore.orig	2010-12-08 12:07:53.000000000 -0500
++++ nfs-utils-lib-1.1.5/libnfsidmap/.gitignore	2011-01-14 11:21:19.000000000 -0500
+@@ -28,4 +28,8 @@ umich_ldap.la
+ umich_ldap.lo
+ configure.in~
+ m4/
+-
++*.o
++cscope.*
++config.h
++config.h.in
++stamp-h1
+diff -up nfs-utils-lib-1.1.5/libnfsidmap/libnfsidmap.c.orig nfs-utils-lib-1.1.5/libnfsidmap/libnfsidmap.c
+--- nfs-utils-lib-1.1.5/libnfsidmap/libnfsidmap.c.orig	2010-12-08 12:07:53.000000000 -0500
++++ nfs-utils-lib-1.1.5/libnfsidmap/libnfsidmap.c	2011-01-14 11:21:19.000000000 -0500
+@@ -36,6 +36,8 @@
+  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#include "config.h"
++
+ #include <sys/types.h>
+ #include <errno.h>
+ #include <unistd.h>
+@@ -50,6 +52,7 @@
+ #include <syslog.h>
+ #include <stdarg.h>
+ #include <dlfcn.h>
++#include <ctype.h>
+ #include "nfsidmap.h"
+ #include "nfsidmap_internal.h"
+ #include "cfg.h"
+@@ -207,7 +210,7 @@ out:
+ 		unload_plugins(plgns);
+ 	return ret;
+ }
+-int nfs4_cleanup_name_mapping()
++void nfs4_cleanup_name_mapping()
+ {
+ 	if (nfs4_plugins)
+ 		unload_plugins(nfs4_plugins);
+@@ -219,7 +222,6 @@ int nfs4_cleanup_name_mapping()
+ int nfs4_init_name_mapping(char *conffile)
+ {
+ 	int ret = -ENOENT;
+-	char *method;
+ 	int dflt = 0;
+ 	struct conf_list *nfs4_methods, *gss_methods;
+ 
+@@ -244,7 +246,7 @@ int nfs4_init_name_mapping(char *conffil
+ 			default_domain = IDMAPD_DEFAULT_DOMAIN;
+ 		}
+ 	}
+-	IDMAP_LOG(1, ("libnfsidmap: using%s domain: %s\n",
++	IDMAP_LOG(1, ("libnfsidmap: using%s domain: %s",
+ 		(dflt ? " (default)" : ""), default_domain));
+ 
+ 	/* Get list of "local equivalent" realms.  Meaning the list of realms
+@@ -272,9 +274,30 @@ int nfs4_init_name_mapping(char *conffil
+ 		local_realms->cnt++;
+ 	}
+ 
++	if (idmap_verbosity >= 1) {
++		struct conf_list_node *r;
++		char *buf = NULL;
++		int siz=0;
++
++		if (local_realms) {
++			TAILQ_FOREACH(r, &local_realms->fields, link) {
++				siz += (strlen(r->field)+4);
++			}
++			buf = malloc(siz);
++			if (buf) {
++				TAILQ_FOREACH(r, &local_realms->fields, link) {
++					sprintf(buf, "'%s' ", r->field);
++				}
++				IDMAP_LOG(1, ("libnfsidmap: Realms list: %s", buf));
++				free(buf);
++			}
++		} else 
++			IDMAP_LOG(1, ("libnfsidmap: Realms list: <NULL> "));
++	}
++
+ 	nfs4_methods = conf_get_list("Translation", "Method");
+ 	if (nfs4_methods) {
+-		IDMAP_LOG(1, ("libnfsidmap: processing 'Method' list\n"));
++		IDMAP_LOG(1, ("libnfsidmap: processing 'Method' list"));
+ 		if (load_plugins(nfs4_methods, &nfs4_plugins) == -1)
+ 			return -ENOENT;
+ 	} else {
+@@ -292,7 +315,7 @@ int nfs4_init_name_mapping(char *conffil
+ 
+ 	gss_methods = conf_get_list("Translation", "GSS-Methods");
+ 	if (gss_methods) {
+-		IDMAP_LOG(1, ("libnfsidmap: processing 'GSS-Methods' list\n"));
++		IDMAP_LOG(1, ("libnfsidmap: processing 'GSS-Methods' list"));
+ 		if (load_plugins(gss_methods, &gss_plugins) == -1)
+ 			goto out;
+ 	}
+diff -up nfs-utils-lib-1.1.5/libnfsidmap/umich_ldap.c.orig nfs-utils-lib-1.1.5/libnfsidmap/umich_ldap.c
+--- nfs-utils-lib-1.1.5/libnfsidmap/umich_ldap.c.orig	2010-12-08 12:07:53.000000000 -0500
++++ nfs-utils-lib-1.1.5/libnfsidmap/umich_ldap.c	2011-01-14 11:21:19.000000000 -0500
+@@ -1084,7 +1084,7 @@ get_canonical_hostname(const char *innam
+ 	if (error) {
+ 		IDMAP_LOG(1, ("%s: getnameinfo for host '%s' failed (%d)\n",
+ 			  __FUNCTION__, inname));
+-		goto out_err;
++		goto out_free;
+ 	}
+ 	return_name = strdup (tmphost);
+ 
+@@ -1098,7 +1098,6 @@ static int
+ umichldap_init(void)
+ {
+ 	char *tssl, *canonicalize, *memberof;
+-	int missing_server = 0, missing_base = 0;
+ 	char missing_msg[128] = "";
+ 	char *server_in, *canon_name;
+ 
diff --git a/nfs-utils-lib-1.1.5-warnings.patch b/nfs-utils-lib-1.1.5-warnings.patch
new file mode 100644
index 0000000..417cc5e
--- /dev/null
+++ b/nfs-utils-lib-1.1.5-warnings.patch
@@ -0,0 +1,22 @@
+diff -up nfs-utils-lib-1.1.5/librpcsecgss/src/clnt_raw.c.orig nfs-utils-lib-1.1.5/librpcsecgss/src/clnt_raw.c
+--- nfs-utils-lib-1.1.5/librpcsecgss/src/clnt_raw.c.orig	2011-01-14 12:43:09.000000000 -0500
++++ nfs-utils-lib-1.1.5/librpcsecgss/src/clnt_raw.c	2011-01-14 12:46:59.000000000 -0500
+@@ -135,7 +135,7 @@ clntraw_call(h, proc, xargs, argsp, xres
+ {
+ 	register struct clntraw_private *clp = clntraw_private;
+ 	register XDR *xdrs = &clp->xdr_stream;
+-	struct rpc_msg msg;
++	struct rpc_msg msg, *pmsg;
+ 	enum clnt_stat status;
+ 	struct rpc_err error;
+ 
+@@ -147,7 +147,8 @@ call_again:
+ 	 */
+ 	xdrs->x_op = XDR_ENCODE;
+ 	XDR_SETPOS(xdrs, 0);
+-	((struct rpc_msg *)clp->mashl_callmsg)->rm_xid ++ ;
++	pmsg = (struct rpc_msg *)clp->mashl_callmsg;
++	pmsg->rm_xid++;
+ 	if ((! XDR_PUTBYTES(xdrs, clp->mashl_callmsg, clp->mcnt)) ||
+ 	    (! XDR_PUTLONG(xdrs, (long *)&proc)) ||
+ 	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
diff --git a/nfs-utils-lib-fedora-idmapd.conf-default.patch b/nfs-utils-lib-fedora-idmapd.conf-default.patch
new file mode 100644
index 0000000..ef15d5d
--- /dev/null
+++ b/nfs-utils-lib-fedora-idmapd.conf-default.patch
@@ -0,0 +1,49 @@
+diff -up nfs-utils-lib-1.1.5/libnfsidmap/idmapd.conf.orig nfs-utils-lib-1.1.5/libnfsidmap/idmapd.conf
+--- nfs-utils-lib-1.1.5/libnfsidmap/idmapd.conf.orig	2009-07-29 16:19:06.000000000 -0400
++++ nfs-utils-lib-1.1.5/libnfsidmap/idmapd.conf	2010-11-08 10:53:11.000000000 -0500
+@@ -17,8 +17,8 @@
+ 
+ [Mapping]
+ 
+-#Nobody-User = nobody
+-#Nobody-Group = nobody
++Nobody-User = nobody
++Nobody-Group = nobody
+ 
+ [Translation]
+ 
+@@ -28,7 +28,7 @@
+ # is a dynamically loadable plugin library.
+ # New methods may be defined and inserted in the list.
+ # The default is "nsswitch".
+-#Method = nsswitch
++Method = nsswitch
+ 
+ # Optional.  This is a comma-separated, ordered list of
+ # translation methods to be used for translating GSS
+@@ -40,7 +40,7 @@
+ #-------------------------------------------------------------------#
+ # The following are used only for the "static" Translation Method.
+ #-------------------------------------------------------------------#
+-[Static]
++#[Static]
+ 
+ # A "static" list of GSS-Authenticated names to
+ # local user name mappings
+@@ -52,13 +52,13 @@
+ # The following are used only for the "umich_ldap" Translation Method.
+ #-------------------------------------------------------------------#
+ 
+-[UMICH_SCHEMA]
++#[UMICH_SCHEMA]
+ 
+ # server information (REQUIRED)
+-LDAP_server = ldap-server.local.domain.edu
++#LDAP_server = ldap-server.local.domain.edu
+ 
+ # the default search base (REQUIRED)
+-LDAP_base = dc=local,dc=domain,dc=edu
++#LDAP_base = dc=local,dc=domain,dc=edu
+ 
+ #-----------------------------------------------------------#
+ # The remaining options have defaults (as shown)
diff --git a/nfs-utils-lib.spec b/nfs-utils-lib.spec
index 272f599..5d41b42 100644
--- a/nfs-utils-lib.spec
+++ b/nfs-utils-lib.spec
@@ -1,15 +1,14 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: BSD
 
-%define idmapvers 0.23
+%define idmapvers 0.24
 %define libnfsidmap libnfsidmap
 %define rpcsecgssvers 0.18
 %define librpcsecgss librpcsecgss
-%define libs %{librpcsecgss} %{libnfsidmap}
 
 %define _docdir				%{_defaultdocdir}/%{name}-%{version}
 %define librpcsecgss_docdir %{_docdir}/%{librpcsecgss}-%{rpcsecgssvers}
@@ -19,6 +18,11 @@ Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidma
 Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz
 
 Patch000: nfs-utils-lib-changelicensetoBSD.patch
+Patch001: nfs-utils-lib-1.1.5-libnfsidmap-0-25-rc1.patch
+
+Patch100: nfs-utils-lib-fedora-idmapd.conf-default.patch
+Patch101: nfs-utils-lib-1.1.5-warnings.patch
+Patch102: nfs-utils-lib-1.1.5-compile.patch
 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -48,27 +52,35 @@ mv %{libnfsidmap}-%{idmapvers} %{libnfsidmap}
 mv %{librpcsecgss}-%{rpcsecgssvers} %{librpcsecgss}
 
 %patch000 -p1
+%patch001 -p1
+
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
 
 %build
 
-for dir in %{libs} ; do
-	pushd $dir
-	%configure --disable-static
-	popd
-done
-for dir in %{libs} ; do
-	pushd $dir
-	make all
-	popd
-done
+pushd  %{libnfsidmap}
+./autogen.sh
+%configure --disable-static
+make %{?_smp_mflags} all
+popd
+
+pushd  %{librpcsecgss}
+%configure --disable-static
+make %{?_smp_mflags} all
+popd
 
 %install
 rm -rf %{buildroot}
-for dir in %{libs} ; do
-	pushd $dir
-	DESTDIR=%{buildroot} make install
-	popd
-done
+
+pushd  %{libnfsidmap}
+make install DESTDIR=%{buildroot}
+popd
+
+pushd  %{librpcsecgss}
+make install DESTDIR=%{buildroot}
+popd
 
 mkdir -p %{buildroot}/%{librpcsecgss_docdir}
 pushd %{librpcsecgss}
@@ -130,6 +142,11 @@ rm -rf %{buildroot}
 %{_libdir}/libnfsidmap*.so
 
 %changelog
+* Sat Jan 15 2011 Steve Dickson <steved at redhat.com> 1.1.5-3
+- Updated to latest upstream release: libnfsidmap-0.24-rc1
+- Reset default values in /etc/idmap.conf
+- Remove some warnings in the RPMdiff run
+
 * Fri May 28 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.5-2
 - disable static libs (bz 556087)
 - disable libtool libs
diff --git a/sources b/sources
index 111fb9b..d553bc8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 f2c4a69c5a32f62b762a569b8d962156  librpcsecgss-0.18.tar.gz
-28f3ece648c1dc5d25e8d623d55f8bd6  libnfsidmap-0.23.tar.gz
+d71a1ee9881d5b5814ff3ec41256937d  libnfsidmap-0.24.tar.gz


More information about the scm-commits mailing list