rpms/nfs-utils-lib/devel libnfsidmap-0.12-set_debug.patch, 1.1, 1.2 nfs-utils-lib.spec, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 20 13:52:24 UTC 2006
Author: steved
Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26132
Modified Files:
libnfsidmap-0.12-set_debug.patch nfs-utils-lib.spec
Log Message:
Recreated set_debug.patch with the -p argument so procedures are shown
Fixed a typo in the make prep rules.
libnfsidmap-0.12-set_debug.patch:
libnfsidmap.c | 34 +++++++++++++++++++++++++++++++---
nfsidmap.h | 1 +
nfsidmap_internal.h | 1 +
nss.c | 21 ++++++++++++++++++++-
4 files changed, 53 insertions(+), 4 deletions(-)
Index: libnfsidmap-0.12-set_debug.patch
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/libnfsidmap-0.12-set_debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnfsidmap-0.12-set_debug.patch 20 Jan 2006 13:07:35 -0000 1.1
+++ libnfsidmap-0.12-set_debug.patch 20 Jan 2006 13:52:17 -0000 1.2
@@ -1,5 +1,5 @@
---- libnfsidmap-0.12/nss.c.orig 2005-11-01 10:04:45.000000000 -0500
-+++ libnfsidmap-0.12/nss.c 2006-01-19 17:03:17.515117000 -0500
+--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/nss.c.orig 2005-11-01 10:04:45.000000000 -0500
++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/nss.c 2006-01-20 08:41:59.623145000 -0500
@@ -47,6 +47,12 @@
#include "nfsidmap.h"
#include "nfsidmap_internal.h"
@@ -13,7 +13,7 @@
/*
* NSS Translation Methods
-@@ -159,8 +165,11 @@
+@@ -159,8 +165,11 @@ static struct passwd *nss_getpwnam(const
err = EINVAL;
localname = strip_domain(name, domain);
@@ -26,7 +26,7 @@
err = getpwnam_r(localname, &buf->pwbuf, buf->buf, buflen, &pw);
free(localname);
-@@ -168,6 +177,9 @@
+@@ -168,6 +177,9 @@ static struct passwd *nss_getpwnam(const
*err_p = 0;
return &buf->pwbuf;
}
@@ -36,7 +36,7 @@
err_free_buf:
free(buf);
err:
-@@ -259,6 +271,12 @@
+@@ -259,6 +271,12 @@ out:
return ret;
}
@@ -49,21 +49,21 @@
struct trans_func nss_trans = {
.name = "nsswitch",
-@@ -269,4 +287,5 @@
+@@ -269,4 +287,5 @@ struct trans_func nss_trans = {
.uid_to_name = nss_uid_to_name,
.gid_to_name = nss_gid_to_name,
.gss_princ_to_grouplist = nss_gss_princ_to_grouplist,
+ .set_debug = nss_set_debug,
};
---- libnfsidmap-0.12/nfsidmap.h.orig 2004-11-14 19:03:05.000000000 -0500
-+++ libnfsidmap-0.12/nfsidmap.h 2006-01-19 15:19:01.391867000 -0500
-@@ -46,3 +46,4 @@
+--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap.h.orig 2004-11-14 19:03:05.000000000 -0500
++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap.h 2006-01-20 08:41:59.665145000 -0500
+@@ -46,3 +46,4 @@ int nfs4_name_to_uid(char *name, uid_t *
int nfs4_name_to_gid(char *name, gid_t *gid);
int nfs4_gss_princ_to_ids(char *secname, char *princ, uid_t *uid, gid_t *gid);
int nfs4_gss_princ_to_grouplist(char *secname, char *princ, gid_t *groups, int *ngroups);
+void nfs4_set_debug(int verbose, void (*logger)(const char *, ...));
---- libnfsidmap-0.12/libnfsidmap.c.orig 2004-12-16 11:35:02.000000000 -0500
-+++ libnfsidmap-0.12/libnfsidmap.c 2006-01-19 17:04:35.044067000 -0500
+--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/libnfsidmap.c.orig 2004-12-16 11:35:02.000000000 -0500
++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/libnfsidmap.c 2006-01-20 08:41:59.672145000 -0500
@@ -45,10 +45,13 @@
#include <grp.h>
#include <netdb.h>
@@ -78,7 +78,7 @@
/* forward declarations */
int set_trans_method(char *);
-@@ -57,6 +60,23 @@
+@@ -57,6 +60,23 @@ static char *default_domain;
#ifndef PATH_IDMAPDCONF
#define PATH_IDMAPDCONF "/etc/idmapd.conf"
#endif
@@ -102,7 +102,7 @@
static int domain_from_dns(char **domain)
{
-@@ -92,18 +112,26 @@
+@@ -92,18 +112,26 @@ int nfs4_init_name_mapping(char *conffil
if (default_domain == NULL) {
ret = domain_from_dns(&default_domain);
if (ret) {
@@ -131,7 +131,7 @@
if (trans->init) {
ret = trans->init();
-@@ -124,7 +152,7 @@
+@@ -124,7 +152,7 @@ char * get_default_domain(void)
return default_domain;
ret = domain_from_dns(&default_domain);
if (ret) {
@@ -140,9 +140,9 @@
" consider specifying one in idmapd.conf\n");
default_domain = "";
}
---- libnfsidmap-0.12/nfsidmap_internal.h.orig 2004-12-20 12:23:26.000000000 -0500
-+++ libnfsidmap-0.12/nfsidmap_internal.h 2006-01-19 15:52:45.110420000 -0500
-@@ -46,6 +46,7 @@
+--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap_internal.h.orig 2004-12-20 12:23:26.000000000 -0500
++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap_internal.h 2006-01-20 08:41:59.678145000 -0500
+@@ -46,6 +46,7 @@ struct trans_func {
int (*uid_to_name)(uid_t uid, char *domain, char *name, size_t len);
int (*gid_to_name)(gid_t gid, char *domain, char *name, size_t len);
int (*gss_princ_to_grouplist)(char *secname, char *princ, gid_t *groups, int *ngroups);
Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfs-utils-lib.spec 20 Jan 2006 13:07:35 -0000 1.2
+++ nfs-utils-lib.spec 20 Jan 2006 13:52:17 -0000 1.3
@@ -41,8 +41,9 @@
%prep
%setup -c -q -a1
-%patch1 -p0
+%patch1 -p1
+%build
top=`pwd`
for dir in %{libs} ; do
pushd $dir
@@ -50,7 +51,6 @@
popd
done
-%build
for dir in %{libs} ; do
pushd $dir
%configure --prefix=$RPM_BUILD_ROOT
More information about the fedora-cvs-commits
mailing list