packages: openldap/openldap-ldapc++.patch, openldap/openldap-nssov.patch, o...

[qboosh]

Author: qboosh                       Date: Wed May 19 06:31:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.4.22
- updated nssov,ldapc++ patches
- (re)added db patch to support db 5.x

---- Files affected:
packages/openldap:
   openldap-ldapc++.patch (1.4 -> 1.5) , openldap-nssov.patch (1.2 -> 1.3) , openldap.spec (1.335 -> 1.336) 

---- Diffs:

================================================================
Index: packages/openldap/openldap-ldapc++.patch
diff -u packages/openldap/openldap-ldapc++.patch:1.4 packages/openldap/openldap-ldapc++.patch:1.5
--- packages/openldap/openldap-ldapc++.patch:1.4	Tue May 26 14:26:29 2009
+++ packages/openldap/openldap-ldapc++.patch	Wed May 19 08:30:55 2010
@@ -21,3 +21,34 @@
  #include "config.h"
  
  #ifdef HAVE_TERMIOS_H
+--- openldap-2.4.22/contrib/ldapc++/examples/startTls.cpp.orig	2010-04-15 01:50:43.000000000 +0200
++++ openldap-2.4.22/contrib/ldapc++/examples/startTls.cpp	2010-05-19 07:22:39.855313030 +0200
+@@ -30,6 +30,7 @@
+     
+     try {
+         // 1. connect using global options
++        {
+         LDAPAsynConnection l(uri);
+         try {
+             l.start_tls();
+@@ -38,9 +39,11 @@
+         } catch ( LDAPException e ) {
+             std::cerr << e << std::endl;
+         }
++	}
+ 
+         // 2. connect using connection specific option
+-        l = LDAPAsynConnection(uri);
++	{
++        LDAPAsynConnection l(uri);
+         tls=l.getTlsOptions();
+         std::cout << "Current connection specific settings:" << std::endl;
+         std::cout << "    CaCertfile: " << tls.getStringOption( TlsOptions::CACERTFILE) << std::endl;
+@@ -58,6 +61,7 @@
+         } catch ( LDAPException e ) {
+             std::cerr << e << std::endl;
+         }
++	}
+         
+         // 3. and once again using the globals
+         try {

================================================================
Index: packages/openldap/openldap-nssov.patch
diff -u packages/openldap/openldap-nssov.patch:1.2 packages/openldap/openldap-nssov.patch:1.3
--- packages/openldap/openldap-nssov.patch:1.2	Wed Jul  8 16:41:27 2009
+++ packages/openldap/openldap-nssov.patch	Wed May 19 08:30:55 2010
@@ -1,10 +1,11 @@
---- openldap-2.4.16/contrib/slapd-modules/nssov/nss-ldapd/common/tio.c~	2008-07-08 20:53:58.000000000 +0200
-+++ openldap-2.4.16/contrib/slapd-modules/nssov/nss-ldapd/common/tio.c	2009-07-08 15:15:52.498212146 +0200
-@@ -20,11 +20,7 @@
+--- openldap-2.4.22/contrib/slapd-modules/nssov/nss-pam-ldapd/tio.c.orig	2010-04-15 23:33:10.000000000 +0200
++++ openldap-2.4.22/contrib/slapd-modules/nssov/nss-pam-ldapd/tio.c	2010-05-18 21:40:39.694932556 +0200
+@@ -20,12 +20,7 @@
     02110-1301 USA
  */
  
--#include "config.h"
+-//#include "config.h"
+-#include "portable.h"
 -
 -#ifdef HAVE_STDINT_H
  #include <stdint.h>
@@ -22,3 +23,14 @@
  
  nssov.la:	$(OBJS) $(XOBJS)
  	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
+--- openldap-2.4.22/contrib/slapd-modules/nssov/network.c.orig	2010-04-13 22:22:28.000000000 +0200
++++ openldap-2.4.22/contrib/slapd-modules/nssov/network.c	2010-05-18 22:14:04.522932556 +0200
+@@ -91,7 +91,7 @@
+ 	addrs = a->a_vals;
+ 	numaddr = a->a_numvals;
+ 	/* write the entry */
+-	WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
++	WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
+ 	WRITE_BERVAL(cbp->fp,&name);
+ 	if ( dupname >= 0 ) {
+ 		WRITE_INT32(cbp->fp,numname-1);

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.335 packages/openldap/openldap.spec:1.336
--- packages/openldap/openldap.spec:1.335	Mon Apr 12 14:12:59 2010
+++ packages/openldap/openldap.spec	Wed May 19 08:30:55 2010
@@ -31,12 +31,12 @@
 Summary(ru.UTF-8):	Образцы клиентов LDAP
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
-Version:	2.4.21
-Release:	5
+Version:	2.4.22
+Release:	1
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5:	e7128c57b2bacd940e8906057c94ff26
+# Source0-md5:	ef01b52255ce8e3fbf8aa34f6fe7598b
 Source1:	http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 # Source1-md5:	718082e7e35fc48478a2334b0bc4cd11
 Source2:	ldap.init
@@ -56,6 +56,7 @@
 Patch9:		%{name}-ltinstall-mode.patch
 Patch10:	%{name}-whowhere.patch
 Patch11:	%{name}-ldaprc.patch
+Patch12:	%{name}-db.patch
 Patch13:	%{name}-nosql.patch
 Patch14:	%{name}-smbk5pwd.patch
 Patch15:	%{name}-ldapc++.patch
@@ -936,6 +937,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %patch13 -p1
 %if %{with krb5}
 %patch14 -p1
@@ -1853,6 +1855,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.336  2010/05/19 06:30:55  qboosh
+- updated to 2.4.22
+- updated nssov,ldapc++ patches
+- (re)added db patch to support db 5.x
+
 Revision 1.335  2010/04/12 12:12:59  baggins
 - rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap-ldapc++.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap-nssov.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.335&r2=1.336&f=u