7106938 Problem with ldap/openldap
7150070 openldap is finding libnet again
7162280 update openldap 2.4.25 to openldap 2.4.30
--- a/components/openldap/Makefile Thu Apr 19 11:41:52 2012 -0700
+++ b/components/openldap/Makefile Thu Apr 19 16:34:57 2012 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
@@ -28,11 +28,11 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= openldap
-COMPONENT_VERSION= 2.4.25
+COMPONENT_VERSION= 2.4.30
COMPONENT_PROJECT_URL= http://www.openldap.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz
-COMPONENT_ARCHIVE_HASH= sha1:56efaf3656cc68d3b5be66422c0c89f0104d7183
+COMPONENT_ARCHIVE_HASH= sha1:7447e89b9a5199f9bb2231bda42c308a1b6513d9
COMPONENT_ARCHIVE_URL= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$(COMPONENT_ARCHIVE)
SDFVER= sdf-2.001
@@ -62,6 +62,9 @@
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
+CONFIGURE_ENV += "ac_cv_lib_net_main=no"
+CONFIGURE_ENV += "ac_cv_lib_net_socket==no"
+CONFIGURE_ENV += "ac_cv_lib_inet_socket==no"
CONFIGURE_OPTIONS += --sysconfdir=/etc
CONFIGURE_OPTIONS.32 += --libexecdir=/usr/lib
--- a/components/openldap/openldap.license Thu Apr 19 11:41:52 2012 -0700
+++ b/components/openldap/openldap.license Thu Apr 19 16:34:57 2012 -0700
@@ -1,3 +1,9 @@
+-------------------
+- openldap 2.4.30 -
+-------------------
+
+Oracle Internal Tracking Number 5295
+
The OpenLDAP Public License
Version 2.8, 17 August 2003
--- a/components/openldap/openldap.p5m Thu Apr 19 11:41:52 2012 -0700
+++ b/components/openldap/openldap.p5m Thu Apr 19 16:34:57 2012 -0700
@@ -137,14 +137,15 @@
file path=usr/include/openldap/ldap_features.h
file path=usr/include/openldap/ldap_schema.h
file path=usr/include/openldap/ldap_utf8.h
+file path=usr/include/openldap/ldif.h
file path=usr/include/openldap/slapi-plugin.h
-file path=usr/lib/$(MACH64)/liblber-2.4.so.2.7.0
-file path=usr/lib/$(MACH64)/libldap-2.4.so.2.7.0
-file path=usr/lib/$(MACH64)/libldap_r-2.4.so.2.7.0
+file path=usr/lib/$(MACH64)/liblber-2.4.so.2.8.3
+file path=usr/lib/$(MACH64)/libldap-2.4.so.2.8.3
+file path=usr/lib/$(MACH64)/libldap_r-2.4.so.2.8.3
file path=usr/lib/$(MACH64)/slapd mode=0555
-file path=usr/lib/liblber-2.4.so.2.7.0
-file path=usr/lib/libldap-2.4.so.2.7.0
-file path=usr/lib/libldap_r-2.4.so.2.7.0
+file path=usr/lib/liblber-2.4.so.2.8.3
+file path=usr/lib/libldap-2.4.so.2.8.3
+file path=usr/lib/libldap_r-2.4.so.2.8.3
file path=usr/lib/slapd mode=0555
file path=usr/share/doc/openldap/admin24/guide.html
file path=usr/share/doc/openldap/admin24/index.html
@@ -272,22 +273,22 @@
license openldap.license license="openldap license"
link path=usr/bin/$(MACH64)/openldapadd target=openldapmodify
link path=usr/bin/openldapadd target=openldapmodify
-link path=usr/lib/$(MACH64)/liblber-2.4.so target=liblber-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/liblber-2.4.so.2 target=liblber-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/liblber.so target=liblber-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/libldap-2.4.so target=libldap-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/libldap-2.4.so.2 target=libldap-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/libldap_r-2.4.so target=libldap_r-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.7.0
-link path=usr/lib/$(MACH64)/libldap_r.so target=libldap_r-2.4.so.2.7.0
-link path=usr/lib/liblber-2.4.so target=liblber-2.4.so.2.7.0
-link path=usr/lib/liblber-2.4.so.2 target=liblber-2.4.so.2.7.0
-link path=usr/lib/liblber.so target=liblber-2.4.so.2.7.0
-link path=usr/lib/libldap-2.4.so target=libldap-2.4.so.2.7.0
-link path=usr/lib/libldap_r-2.4.so target=libldap_r-2.4.so.2.7.0
-link path=usr/lib/libldap-2.4.so.2 target=libldap-2.4.so.2.7.0
-link path=usr/lib/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.7.0
-link path=usr/lib/libldap_r.so target=libldap_r-2.4.so.2.7.0
+link path=usr/lib/$(MACH64)/liblber-2.4.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/liblber.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap-2.4.so target=libldap-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap_r.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/liblber-2.4.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
+link path=usr/lib/liblber.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/libldap-2.4.so target=libldap-2.4.so.2.8.3
+link path=usr/lib/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
+link path=usr/lib/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/libldap_r.so target=libldap_r-2.4.so.2.8.3
link path=usr/lib/openldap/bin/$(MACH64)/ldapadd target=../../../../bin/openldapmodify
link path=usr/lib/openldap/bin/$(MACH64)/ldapcompare target=../../../../bin/openldapcompare
link path=usr/lib/openldap/bin/$(MACH64)/ldapdelete target=../../../../bin/openldapdelete