packages: openldap/openldap-contrib-modules.patch, openldap/openldap-ldapc+...

qboosh qboosh at pld-linux.org
Sun Nov 27 11:17:09 CET 2011 

Author: qboosh                       Date: Sun Nov 27 10:17:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.4.27
- updated ldapc++,contrib-modules patches

---- Files affected:
packages/openldap:
   openldap-contrib-modules.patch (1.3 -> 1.4) , openldap-ldapc++.patch (1.5 -> 1.6) , openldap.spec (1.361 -> 1.362) 

---- Diffs:

================================================================
Index: packages/openldap/openldap-contrib-modules.patch
diff -u packages/openldap/openldap-contrib-modules.patch:1.3 packages/openldap/openldap-contrib-modules.patch:1.4
--- packages/openldap/openldap-contrib-modules.patch:1.3	Sun Jul  3 15:36:44 2011
+++ packages/openldap/openldap-contrib-modules.patch	Sun Nov 27 11:17:03 2011
@@ -917,14 +917,13 @@
 +	$(MKDIR) $(DESTDIR)$(schemadir)
 +	echo $(INSTALL) $(INSTALLFLAGS) -m 444 ldapns.schema $(DESTDIR)$(schemadir)
 +	$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/ldapns.schema $(DESTDIR)$(schemadir)
-diff -urN openldap-2.4.25/contrib/slapd-modules/passwd/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile
---- openldap-2.4.25/contrib/slapd-modules/passwd/Makefile	2009-04-28 03:06:14.000000000 +0200
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile	1970-01-01 01:00:00.000000000 +0100
-@@ -1,37 +0,0 @@
+--- openldap-2.4.27/contrib/slapd-modules/passwd/Makefile	2009-04-28 03:06:14.000000000 +0200
++++ openldap-2.4.27-contrib/contrib/slapd-modules/passwd/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,46 +0,0 @@
 -# $OpenLDAP$
 -CPPFLAGS+=-I../../../include -I../../../servers/slapd
 -
--all: kerberos.la netscape.la radius.la
+-all: kerberos.la netscape.la radius.la apr1.la
 -
 -kerberos.lo:	kerberos.c
 -	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -DHAVE_KRB5 -Wall -c $?
@@ -947,24 +946,32 @@
 -	$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
 -	-rpath $(PREFIX)/lib -module -o $@ $? -lradius
 -
+-apr1.lo:	apr1.c
+-	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -Wall -c $?
+-
+-apr1.la:	apr1.lo
+-	$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
+-	-rpath $(PREFIX)/lib -module -o $@ $? 
+-
 -clean:
 -	rm -f kerberos.lo kerberos.la
 -	rm -f netscape.lo netscape.la
 -	rm -f radius.lo radius.la
+-	rm -f apr1.lo apr1.la
 -
--install: kerberos.la netscape.la radius.la
+-install: kerberos.la netscape.la radius.la apr1.la
 -	mkdir -p $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --mode=install cp kerberos.la $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --mode=install cp netscape.la $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --mode=install cp radius.la $(PREFIX)/lib/openldap
+-	$(LIBTOOL) --mode=install cp apr1.la $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --finish $(PREFIX)/lib
-diff -urN openldap-2.4.25/contrib/slapd-modules/passwd/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile.in
---- openldap-2.4.25/contrib/slapd-modules/passwd/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile.in	2011-03-28 17:51:20.148152000 +0200
-@@ -0,0 +1,61 @@
-+SRCS = kerberos.c netscape.c radius.c
+--- openldap-2.4.27/contrib/slapd-modules/passwd/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ openldap-2.4.27-contrib/contrib/slapd-modules/passwd/Makefile.in	2011-03-28 17:51:20.148152000 +0200
+@@ -0,0 +1,64 @@
++SRCS = kerberos.c netscape.c radius.c apr1.c
 +
-+OBJS = kerberos.lo netscape.lo radius.lo
++OBJS = kerberos.lo netscape.lo radius.lo apr1.lo
 +
 +LTONLY_MOD = $(LTONLY_mod)
 +LDAP_INCDIR= ../../../include       
@@ -982,7 +989,7 @@
 +UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
 +
 +LIBRARY = libpasswd.a
-+PROGRAMS = kerberos.la netscape.la radius.la
++PROGRAMS = kerberos.la netscape.la radius.la apr1.la
 +
 +XINCPATH = -I.. -I$(srcdir)/.. -I../../../servers/slapd
 +XDEFS = $(MODULES_CPPFLAGS)
@@ -999,6 +1006,9 @@
 +
 +radius.la : radius.lo
 +	$(LTLINK_MOD) -module -o $@ radius.lo version.lo $(LINK_LIBS) $(RADIUS_LIBS)
++
++apr1.la : apr1.lo
++	$(LTLINK_MOD) -module -o $@ apr1.lo version.lo $(LINK_LIBS) $(RADIUS_LIBS)
 +
 +install-local:	$(PROGRAMS)
 +	@if test -n "$?" ; then \

================================================================
Index: packages/openldap/openldap-ldapc++.patch
diff -u packages/openldap/openldap-ldapc++.patch:1.5 packages/openldap/openldap-ldapc++.patch:1.6
--- packages/openldap/openldap-ldapc++.patch:1.5	Wed May 19 08:30:55 2010
+++ packages/openldap/openldap-ldapc++.patch	Sun Nov 27 11:17:03 2011
@@ -21,34 +21,32 @@
  #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
+--- openldap-2.4.27/contrib/ldapc++/examples/startTls.cpp.orig	2011-11-23 20:58:23.000000000 +0100
++++ openldap-2.4.27/contrib/ldapc++/examples/startTls.cpp	2011-11-27 10:15:54.434540198 +0100
 @@ -30,6 +30,7 @@
-     
+ 
      try {
          // 1. connect using global options
 +        {
          LDAPAsynConnection l(uri);
          try {
              l.start_tls();
-@@ -38,9 +39,11 @@
+@@ -38,8 +39,10 @@
          } catch ( LDAPException e ) {
              std::cerr << e << std::endl;
          }
 +	}
  
          // 2. connect using connection specific option
--        l = LDAPAsynConnection(uri);
 +	{
-+        LDAPAsynConnection l(uri);
-         tls=l.getTlsOptions();
+         LDAPAsynConnection l1(uri);
+         tls=l1.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.spec
diff -u packages/openldap/openldap.spec:1.361 packages/openldap/openldap.spec:1.362
--- packages/openldap/openldap.spec:1.361	Fri Oct  7 13:02:18 2011
+++ packages/openldap/openldap.spec	Sun Nov 27 11:17:03 2011
@@ -25,12 +25,12 @@
 Summary(ru.UTF-8):	Образцы клиентов LDAP
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
-Version:	2.4.26
-Release:	2
+Version:	2.4.27
+Release:	1
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5:	f36f3086031dd56ae94f722ffae8df5e
+# Source0-md5:	af754236477fea70bcf6e31824eb60a2
 Source1:	http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 # Source1-md5:	718082e7e35fc48478a2334b0bc4cd11
 Source2:	ldap.init
@@ -1982,8 +1982,9 @@
 %attr(755,root,root) %{_libdir}/libslapd_db-4.6.so
 %endif
 %dir %{_sysconfdir}/openldap/schema
-%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.conf
 %attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.access.conf
+%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.conf
+%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.ldif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/schema/*.schema
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ldap
 %attr(754,root,root) /etc/rc.d/init.d/ldap
@@ -1995,13 +1996,14 @@
 %{schemadir}/*.schema
 %exclude %{schemadir}/ldapns.schema
 %dir %{_libdir}/openldap
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/slap*
 %{_mandir}/man5/slapd.*.5*
 %{_mandir}/man5/slapd-config.5*
 %{_mandir}/man5/slapd-ldbm.5*
 %{_mandir}/man5/slapd-ldif.5*
+%{_mandir}/man5/slapd-mdb.5*
 %{_mandir}/man5/slapd-null.5*
-%{_mandir}/man8/slap*
+%{_mandir}/man8/slap*.8*
 
 %files backend-bdb
 %defattr(644,root,root,755)
@@ -2083,6 +2085,7 @@
 %attr(755,root,root) %{_libdir}/openldap/back_sock*.so*
 %{_libdir}/openldap/back_sock.la
 %{_mandir}/man5/slapd-sock.5*
+%{_mandir}/man5/slapo-sock.5*
 
 %if %{with odbc}
 %files backend-sql
@@ -2334,6 +2337,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.362  2011/11/27 10:17:03  qboosh
+- updated to 2.4.27
+- updated ldapc++,contrib-modules patches
+
 Revision 1.361  2011/10/07 11:02:18  sls
 - replaced "requires_eq cyrus-sasl" with "requires_eq_to cyrus-sasl cyrus-sasl-devel"
   (in case there's more than one cyrus-sasl on builder)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap-contrib-modules.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap-ldapc++.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.361&r2=1.362&f=u

More information about the pld-cvs-commit mailing list