From 4d56125efa2dc24561bea105183b4c5d0425c756 Mon Sep 17 00:00:00 2001 From: Jan Zeleny Date: Fri, 28 May 2010 12:34:21 +0000 Subject: [PATCH] Rebuild with connectionless support (#587722) Updated autofs schema (#584808) --- autofs.schema | 8 ++++---- openldap.spec | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/autofs.schema b/autofs.schema index d8af6f4..07e23b4 100644 --- a/autofs.schema +++ b/autofs.schema @@ -8,14 +8,14 @@ # Attribute Type Definitions -attributetype ( 1.3.6.1.1.1.1.25 NAME 'automountInformation' +attributetype ( 1.3.6.1.4.1.2312.4.1.2 NAME 'automountInformation' DESC 'Information used by the autofs automounter' - EQUALITY caseExactIA5Match + EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -objectclass ( 1.3.6.1.1.1.1.13 NAME 'automount' SUP top STRUCTURAL +objectclass ( 1.3.6.1.4.1.2312.4.2.3 NAME 'automount' SUP top STRUCTURAL DESC 'An entry in an automounter map' - MUST ( cn $ automountInformation ) + MUST ( cn $ automountInformation $ objectclass ) MAY ( description ) ) objectclass ( 1.3.6.1.4.1.2312.4.2.2 NAME 'automountMap' SUP top STRUCTURAL diff --git a/openldap.spec b/openldap.spec index 45194a6..0357c45 100644 --- a/openldap.spec +++ b/openldap.spec @@ -11,7 +11,7 @@ Summary: LDAP support libraries Name: openldap Version: %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz @@ -192,7 +192,7 @@ ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so popd export CPPFLAGS="-I${dbdir}/include" -export CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC -D_GNU_SOURCE" +export CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -DLDAP_CONNECTIONLESS -fPIC -D_GNU_SOURCE" export LDFLAGS="-L${dbdir}/%{_lib}" export LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} @@ -631,6 +631,10 @@ fi %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Tue May 18 2010 Jan Zeleny - 2.4.22-2 +- rebuild with connectionless support (#587722) +- updated autofs schema (#584808) + * Tue May 04 2010 Jan Zeleny - 2.4.22-1 - rebased to 2.4.22 (mostly bugfixes, added back-ldif, back-null testing support) - due to some possible issues pointed out in last update testing phase, I'm