rpms/nss_ldap/F-7 nss_ldap-256-resolver.patch, NONE, 1.1 nss_ldap-257-slash.patch, NONE, 1.1 nss_ldap.spec, 1.81, 1.82 pam_ldap-180-local_users.patch, 1.3, 1.4 sources, 1.38, 1.39 nss_ldap-realloc.patch, 1.1, NONE

Fri Aug 24 16:17:29 UTC 2007

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30345

Modified Files:
	nss_ldap.spec pam_ldap-180-local_users.patch sources 
Added Files:
	nss_ldap-256-resolver.patch nss_ldap-257-slash.patch 
Removed Files:
	nss_ldap-realloc.patch 
Log Message:
backport from raw hide

nss_ldap-256-resolver.patch:

--- NEW FILE nss_ldap-256-resolver.patch ---
Check for resolver functions a little more thoroughly if we don't find
them the first time we check.

--- nss_ldap/configure.in	2007-08-17 17:24:17.000000000 -0400
+++ nss_ldap/configure.in	2007-08-17 17:23:41.000000000 -0400
@@ -192,6 +192,35 @@
 AC_CHECK_FUNCS(sigset)
 AC_CHECK_FUNCS(res_search)
 AC_CHECK_FUNCS(dn_expand)
+AC_CHECK_HEADERS(resolv.h)
+if test x$ac_cv_func_res_search = xno ; then
+	AC_MSG_CHECKING([for res_search again])
+	AC_TRY_LINK([#ifdef HAVE_RESOLV_H
+		     #include <resolv.h>
+		     #endif
+		     #ifdef HAVE_STDLIB_H
+		     #include <stdlib.h>
+		     #endif],
+		    [res_search(NULL,0,0,NULL,0);],
+		    AC_DEFINE(HAVE_RES_SEARCH,1,
+		    	      [Define if you have res_search().])
+		    ac_cv_func_res_search=yes)
+	AC_CHECK_FUNCS(res_search)
+fi
+if test x$ac_cv_func_dn_expand = xno ; then
+	AC_MSG_CHECKING([for dn_expand again])
+	AC_TRY_LINK([#ifdef HAVE_RESOLV_H
+		     #include <resolv.h>
+		     #endif
+		     #ifdef HAVE_STDLIB_H
+		     #include <stdlib.h>
+		     #endif],
+		    [dn_expand(NULL,NULL,NULL,NULL,0);],
+		    AC_DEFINE(HAVE_DN_EXPAND,1,
+		    	      [Define if you have dn_expand().])
+		    ac_cv_func_dn_expand=yes)
+	AC_CHECK_FUNCS(dn_expand)
+fi
 AC_CHECK_FUNCS(snprintf)
 AC_CHECK_FUNCS(gethostbyname)
 AC_CHECK_FUNCS(nsdispatch)

nss_ldap-257-slash.patch:

--- NEW FILE nss_ldap-257-slash.patch ---
diff -up nss_ldap-257/dnsconfig.c nss_ldap-257/dnsconfig.c
--- nss_ldap-257/dnsconfig.c	2007-08-24 11:27:22.000000000 -0400
+++ nss_ldap-257/dnsconfig.c	2007-08-24 11:27:30.000000000 -0400
@@ -165,7 +165,7 @@ _nss_ldap_mergeconfigfromdns (ldap_confi
     {
       if (rr->type == T_SRV)
 	{
-	  snprintf (uribuf, sizeof(uribuf), "ldap%s:%s:%d",
+	  snprintf (uribuf, sizeof(uribuf), "ldap%s://%s:%d",
 	    (rr->u.srv->port == LDAPS_PORT) ? "s" : "",
 	    rr->u.srv->target,
 	    rr->u.srv->port);


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-7/nss_ldap.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- nss_ldap.spec	29 Mar 2007 17:47:32 -0000	1.81
+++ nss_ldap.spec	24 Aug 2007 16:16:56 -0000	1.82
@@ -1,8 +1,8 @@
-%define pam_ldap_version 183
+%define pam_ldap_version 184
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
-Version: 254
-Release: 2
+Version: 257
+Release: 3%{?dist}
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -19,10 +19,11 @@
 Patch6: nss_ldap-254-over-recursion.patch
 Patch7: pam_ldap-182-manpointer.patch
 Patch8: nss_ldap-254-soname.patch
-Patch9: nss_ldap-realloc.patch
+Patch9: nss_ldap-256-resolver.patch
+Patch10: nss_ldap-257-slash.patch
 
 URL: http://www.padl.com/
-License: LGPL
+License: LGPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool
@@ -62,7 +63,8 @@
 %patch5 -p1 -b .mock64
 #%patch6 -p1 -b .over-recursion
 %patch8 -p1 -b .soname
-%patch9 -p1 -b .realloc
+%patch9 -p1 -b .resolver
+%patch10 -p1 -b .slash
 autoreconf
 popd
 
@@ -183,6 +185,21 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Fri Aug 24 2007 Nalin Dahyabhai <nalin at redhat.com> - 257-3
+- tack on a disttag
+
+* Fri Aug 24 2007 Nalin Dahyabhai <nalin at redhat.com> - 257-2
+- construct LDAP URIs correctly during DNS autoconfiguration (upstream #338)
+
+* Tue Aug 21 2007 Nalin Dahyabhai <nalin at redhat.com> - 257-1
+- update to nss_ldap 257
+- look harder when we're looking for symbols provided by the resolver library
+  (upstream #337)
+- clarify license (both under LGPLv2 or later)
+
+* Thu Jul 19 2007 Nalin Dahyabhai <nalin at redhat.com> - 256-1
+- update to nss_ldap 256, pam_ldap 184
+
 * Wed Mar 21 2007 Nalin Dahyabhai <nalin at redhat.com> - 254-2
 - resize the supplemental GID array when it gets too large and an array size
   limit isn't set (Gavin Romig-Koch, #232713)

pam_ldap-180-local_users.patch:

Index: pam_ldap-180-local_users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-7/pam_ldap-180-local_users.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_ldap-180-local_users.patch	8 May 2006 17:44:09 -0000	1.3
+++ pam_ldap-180-local_users.patch	24 Aug 2007 16:16:56 -0000	1.4
@@ -1,6 +1,6 @@
 Configure by default to fail, quickly, requests for supplemental group
-information for "root", "ldap", and assorted other users whose names are
-known to D-BUS.  This patch will never be pretty.
+information for "root", "ldap", and assorted other users as whom services
+run.  This patch will never be pretty.
 
 --- pam_ldap-180/ldap.conf	2005-08-17 18:35:13.000000000 -0400
 +++ pam_ldap-180/ldap.conf	2006-02-09 14:14:05.000000000 -0500
@@ -9,7 +9,7 @@
  #nss_base_netgroup	ou=Netgroup,dc=padl,dc=com?one
  
 +# Just assume that there are no supplemental groups for these named users
-+nss_initgroups_ignoreusers root,ldap,named,avahi,haldaemon
++nss_initgroups_ignoreusers root,ldap,named,avahi,haldaemon,dbus,radvd,tomcat,radiusd,news,mailman,nscd
 +
  # attribute/objectclass mapping
  # Syntax:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-7/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	26 Feb 2007 22:34:17 -0000	1.38
+++ sources	24 Aug 2007 16:16:56 -0000	1.39
@@ -1,2 +1,2 @@
-c0ad81e9d9712ddc6599a6e7a1688778  pam_ldap-183.tar.gz
-00475b790d3aff3ccd40a1ab4520965e  nss_ldap-254.tar.gz
+5e4ad4aa9ed2514927a23bf94b9fc5a3  nss_ldap-257.tar.gz
+01bf1ad8576f0d1b58d9eddc68987a47  pam_ldap-184.tar.gz


--- nss_ldap-realloc.patch DELETED ---


