Bump OpenLDAP to 2.4.31 oi_151a oi_151a_prestable5
authorJon Tibble <meths@btinternet.com>
Wed, 06 Jun 2012 10:36:53 +0100
branchoi_151a
changeset 154 b8fe83024c4a
parent 153 44dac104258c
child 155 d9dda262263c
Bump OpenLDAP to 2.4.31
usr/src/cmd/openldap/METADATA
usr/src/cmd/openldap/Makefile.sfw
usr/src/cmd/openldap/install-openldap
usr/src/cmd/openldap/openldap-2.4.21.tgz
usr/src/cmd/openldap/openldap-2.4.31.tgz
usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenldapr/prototype_com
usr/src/pkgdefs/SUNWopenldapu/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenldapu/prototype_com
usr/src/pkgdefs/SUNWopenldapu/prototype_i386
usr/src/pkgdefs/SUNWopenldapu/prototype_sparc
--- a/usr/src/cmd/openldap/METADATA	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/cmd/openldap/METADATA	Wed Jun 06 10:36:53 2012 +0100
@@ -1,10 +1,10 @@
 NAME:             OpenLDAP
-VERSION:          2.4.21
+VERSION:          2.4.31
 DESCRIPTION:      Open LDAP server
 LICENSE:          OpenLDAP, Oracle, Other
 PACKAGE:          SUNWopenldapr SUNWopenldapu
 PROJECT_URL:      http://www.openldap.org/
-SOURCE_DOWNLOAD:  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.21.tgz
+SOURCE_DOWNLOAD:  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.31.tgz
 SUPPORT:          C
 BUGTRAQ:          solaris/ldap/openldap
 OSR:              9145
--- a/usr/src/cmd/openldap/Makefile.sfw	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/cmd/openldap/Makefile.sfw	Wed Jun 06 10:36:53 2012 +0100
@@ -26,9 +26,9 @@
 include ../Makefile.cmd
 
 # Library subversion number
-LVER=2.5.4
+LVER=2.8.3
 # release version number
-VER=openldap-2.4.21
+VER=openldap-2.4.31
 VER64=${VER}-64
 VERP=/usr/openldap/2.4
 BDB=bdb-4.5.20.b
--- a/usr/src/cmd/openldap/install-openldap	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/cmd/openldap/install-openldap	Wed Jun 06 10:36:53 2012 +0100
@@ -93,6 +93,7 @@
 		> servers/slapd/slapd.conf.tmp
 _install N servers/slapd/slapd.conf.tmp ${ETCDIR}/slapd.conf 400
 _install N servers/slapd/DB_CONFIG ${ETCDIR}/DB_CONFIG.example 400
+_install N servers/slapd/slapd.ldif ${ETCDIR}/slapd.ldif.default 400
 
 ## Server Schema
 cd servers/slapd/schema
@@ -105,7 +106,7 @@
 ## Includes
 cd include
 for i in lber.h lber_types.h ldap_cdefs.h ldap_features.h ldap.h \
-	ldap_schema.h ldap_utf8.h slapi-plugin.h
+	ldap_schema.h ldap_utf8.h ldif.h slapi-plugin.h
 do
 	_install N ${i} ${INCDIR}/${i} 444
 done
Binary file usr/src/cmd/openldap/openldap-2.4.21.tgz has changed
Binary file usr/src/cmd/openldap/openldap-2.4.31.tgz has changed
--- a/usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl	Wed Jun 06 10:36:53 2012 +0100
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="root"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenLDAP 2.4.21"
+DESC="OpenLDAP 2.4.31"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenldapr/prototype_com	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/pkgdefs/SUNWopenldapr/prototype_com	Wed Jun 06 10:36:53 2012 +0100
@@ -45,28 +45,37 @@
 d none etc 755 root sys
 d none etc/openldap 755 root sys
 f none etc/openldap/slapd.conf 400 openldap openldap
+f none etc/openldap/slapd.ldif.default 400 openldap openldap
 f none etc/openldap/DB_CONFIG.example 400 root sys
 f none etc/openldap/ldap.conf 444 root sys
 f none etc/openldap/ldap.conf.default 444 root sys
 d none etc/openldap/schema 755 root sys
 f none etc/openldap/schema/README 444 root sys
+f none etc/openldap/schema/collective.ldif 444 root sys
 f none etc/openldap/schema/collective.schema 444 root sys
+f none etc/openldap/schema/corba.ldif 444 root sys
 f none etc/openldap/schema/corba.schema 444 root sys
 f none etc/openldap/schema/core.ldif 444 root sys
 f none etc/openldap/schema/core.schema 444 root sys
 f none etc/openldap/schema/cosine.ldif 444 root sys
 f none etc/openldap/schema/cosine.schema 444 root sys
+f none etc/openldap/schema/duaconf.ldif 444 root sys
 f none etc/openldap/schema/duaconf.schema 444 root sys
+f none etc/openldap/schema/dyngroup.ldif 444 root sys
 f none etc/openldap/schema/dyngroup.schema 444 root sys
 f none etc/openldap/schema/inetorgperson.ldif 444 root sys
 f none etc/openldap/schema/inetorgperson.schema 444 root sys
+f none etc/openldap/schema/java.ldif 444 root sys
 f none etc/openldap/schema/java.schema 444 root sys
+f none etc/openldap/schema/misc.ldif 444 root sys
 f none etc/openldap/schema/misc.schema 444 root sys
 f none etc/openldap/schema/nis.ldif 444 root sys
 f none etc/openldap/schema/nis.schema 444 root sys
 f none etc/openldap/schema/openldap.ldif 444 root sys
 f none etc/openldap/schema/openldap.schema 444 root sys
+f none etc/openldap/schema/pmi.ldif 444 root sys
 f none etc/openldap/schema/pmi.schema 444 root sys
+f none etc/openldap/schema/ppolicy.ldif 444 root sys
 f none etc/openldap/schema/ppolicy.schema 444 root sys
 d none etc/security 755 root sys
 d none etc/security/exec_attr.d 755 root sys
--- a/usr/src/pkgdefs/SUNWopenldapu/pkginfo.tmpl	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/pkgdefs/SUNWopenldapu/pkginfo.tmpl	Wed Jun 06 10:36:53 2012 +0100
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenLDAP 2.4.21"
+DESC="OpenLDAP 2.4.31"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenldapu/prototype_com	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/pkgdefs/SUNWopenldapu/prototype_com	Wed Jun 06 10:36:53 2012 +0100
@@ -66,17 +66,18 @@
 f none usr/include/openldap/ldap_features.h 444 root bin
 f none usr/include/openldap/ldap_schema.h 444 root bin
 f none usr/include/openldap/ldap_utf8.h 444 root bin
+f none usr/include/openldap/ldif.h 444 root bin
 f none usr/include/openldap/slapi-plugin.h 444 root bin
 d none usr/lib 755 root bin
-f none usr/lib/liblber-2.4.so.2.5.4 555 root bin
-s none usr/lib/liblber-2.4.so=liblber-2.4.so.2.5.4
-s none usr/lib/liblber-2.4.so.2=liblber-2.4.so.2.5.4
-f none usr/lib/libldap-2.4.so.2.5.4 555 root bin
-s none usr/lib/libldap-2.4.so=libldap-2.4.so.2.5.4
-s none usr/lib/libldap-2.4.so.2=libldap-2.4.so.2.5.4
-f none usr/lib/libldap_r-2.4.so.2.5.4 555 root bin
-s none usr/lib/libldap_r-2.4.so=libldap_r-2.4.so.2.5.4
-s none usr/lib/libldap_r-2.4.so.2=libldap_r-2.4.so.2.5.4
+f none usr/lib/liblber-2.4.so.2.8.3 555 root bin
+s none usr/lib/liblber-2.4.so=liblber-2.4.so.2.8.3
+s none usr/lib/liblber-2.4.so.2=liblber-2.4.so.2.8.3
+f none usr/lib/libldap-2.4.so.2.8.3 555 root bin
+s none usr/lib/libldap-2.4.so=libldap-2.4.so.2.8.3
+s none usr/lib/libldap-2.4.so.2=libldap-2.4.so.2.8.3
+f none usr/lib/libldap_r-2.4.so.2.8.3 555 root bin
+s none usr/lib/libldap_r-2.4.so=libldap_r-2.4.so.2.8.3
+s none usr/lib/libldap_r-2.4.so.2=libldap_r-2.4.so.2.8.3
 d none usr/lib/openldap 755 root bin
 d none usr/lib/openldap/bin 755 root bin
 s none usr/lib/openldap/bin/ldapcompare=../../../bin/openldapcompare
@@ -128,6 +129,7 @@
 f none usr/share/man/man3oldap/ldap_compare.3oldap 444 root bin
 f none usr/share/man/man3oldap/ldap_controls.3oldap 444 root bin
 f none usr/share/man/man3oldap/ldap_delete.3oldap 444 root bin
+f none usr/share/man/man3oldap/ldap_dup.3oldap 444 root bin
 f none usr/share/man/man3oldap/ldap_error.3oldap 444 root bin
 f none usr/share/man/man3oldap/ldap_extended_operation.3oldap 444 root bin
 f none usr/share/man/man3oldap/ldap_first_attribute.3oldap 444 root bin
@@ -214,10 +216,12 @@
 s none usr/share/man/man3oldap/ldap_delete_ext.3oldap=ldap_delete.3oldap
 s none usr/share/man/man3oldap/ldap_delete_ext_s.3oldap=ldap_delete.3oldap
 s none usr/share/man/man3oldap/ldap_delete_s.3oldap=ldap_delete.3oldap
+s none usr/share/man/man3oldap/ldap_destroy.3oldap=ldap_dup.3oldap
 s none usr/share/man/man3oldap/ldap_dn2ad_canonical.3oldap=ldap_get_dn.3oldap
 s none usr/share/man/man3oldap/ldap_dn2dcedn.3oldap=ldap_get_dn.3oldap
 s none usr/share/man/man3oldap/ldap_dn2str.3oldap=ldap_get_dn.3oldap
 s none usr/share/man/man3oldap/ldap_dn2ufn.3oldap=ldap_get_dn.3oldap
+s none usr/share/man/man3oldap/ldap_dnfree.3oldap=ldap_get_dn.3oldap
 s none usr/share/man/man3oldap/ldap_err2string.3oldap=ldap_error.3oldap
 s none usr/share/man/man3oldap/ldap_errlist.3oldap=ldap_error.3oldap
 s none usr/share/man/man3oldap/ldap_explode_dn.3oldap=ldap_get_dn.3oldap
@@ -226,6 +230,7 @@
 s none usr/share/man/man3oldap/ldap_free_urldesc.3oldap=ldap_url.3oldap
 s none usr/share/man/man3oldap/ldap_get_values_len.3oldap=ldap_get_values.3oldap
 s none usr/share/man/man3oldap/ldap_init.3oldap=ldap_open.3oldap
+s none usr/share/man/man3oldap/ldap_init_fd.3oldap=ldap_open.3oldap
 s none usr/share/man/man3oldap/ldap_initialize.3oldap=ldap_open.3oldap
 s none usr/share/man/man3oldap/ldap_install_tls.3oldap=ldap_tls.3oldap
 s none usr/share/man/man3oldap/ldap_is_ldap_url.3oldap=ldap_url.3oldap
@@ -268,6 +273,7 @@
 s none usr/share/man/man3oldap/ldap_search_st.3oldap=ldap_search.3oldap
 s none usr/share/man/man3oldap/ldap_set_option.3oldap=ldap_get_option.3oldap
 s none usr/share/man/man3oldap/ldap_set_rebind_proc.3oldap=ldap_bind.3oldap
+s none usr/share/man/man3oldap/ldap_set_urllist_proc.3oldap=ldap_open.3oldap
 s none usr/share/man/man3oldap/ldap_simple_bind.3oldap=ldap_bind.3oldap
 s none usr/share/man/man3oldap/ldap_simple_bind_s.3oldap=ldap_bind.3oldap
 s none usr/share/man/man3oldap/ldap_sort_entries.3oldap=ldap_sort.3oldap
@@ -304,6 +310,7 @@
 f none usr/share/man/man5oldap/slapd-ldap.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-ldbm.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-ldif.5oldap 444 root bin
+f none usr/share/man/man5oldap/slapd-mdb.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-meta.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-monitor.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-ndb.5oldap 444 root bin
@@ -325,6 +332,7 @@
 f none usr/share/man/man5oldap/slapo-dyngroup.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-dynlist.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-memberof.5oldap 444 root bin
+f none usr/share/man/man5oldap/slapo-pbind.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-pcache.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-ppolicy.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-refint.5oldap 444 root bin
@@ -336,6 +344,7 @@
 f none usr/share/man/man5oldap/slapo-unique.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-valsort.5oldap 444 root bin
 s none usr/share/man/man5oldap/slapd-hdb.5oldap=slapd-bdb.5oldap
+s none usr/share/man/man5oldap/slapo-sock.5oldap=slapd-sock.5oldap
 f none usr/share/man/man8oldap/slapacl.8oldap 444 root bin
 f none usr/share/man/man8oldap/slapadd.8oldap 444 root bin
 f none usr/share/man/man8oldap/slapauth.8oldap 444 root bin
--- a/usr/src/pkgdefs/SUNWopenldapu/prototype_i386	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/pkgdefs/SUNWopenldapu/prototype_i386	Wed Jun 06 10:36:53 2012 +0100
@@ -60,15 +60,15 @@
 f none usr/bin/amd64/openldapurl 555 root bin
 f none usr/bin/amd64/openldapwhoami 555 root bin
 d none usr/lib/amd64 755 root bin
-f none usr/lib/amd64/liblber-2.4.so.2.5.4 555 root bin
-s none usr/lib/amd64/liblber-2.4.so=liblber-2.4.so.2.5.4
-s none usr/lib/amd64/liblber-2.4.so.2=liblber-2.4.so.2.5.4
-f none usr/lib/amd64/libldap-2.4.so.2.5.4 555 root bin
-s none usr/lib/amd64/libldap-2.4.so=libldap-2.4.so.2.5.4
-s none usr/lib/amd64/libldap-2.4.so.2=libldap-2.4.so.2.5.4
-f none usr/lib/amd64/libldap_r-2.4.so.2.5.4 555 root bin
-s none usr/lib/amd64/libldap_r-2.4.so=libldap_r-2.4.so.2.5.4
-s none usr/lib/amd64/libldap_r-2.4.so.2=libldap_r-2.4.so.2.5.4
+f none usr/lib/amd64/liblber-2.4.so.2.8.3 555 root bin
+s none usr/lib/amd64/liblber-2.4.so=liblber-2.4.so.2.8.3
+s none usr/lib/amd64/liblber-2.4.so.2=liblber-2.4.so.2.8.3
+f none usr/lib/amd64/libldap-2.4.so.2.8.3 555 root bin
+s none usr/lib/amd64/libldap-2.4.so=libldap-2.4.so.2.8.3
+s none usr/lib/amd64/libldap-2.4.so.2=libldap-2.4.so.2.8.3
+f none usr/lib/amd64/libldap_r-2.4.so.2.8.3 555 root bin
+s none usr/lib/amd64/libldap_r-2.4.so=libldap_r-2.4.so.2.8.3
+s none usr/lib/amd64/libldap_r-2.4.so.2=libldap_r-2.4.so.2.8.3
 d none usr/lib/openldap/bin/amd64 755 root bin
 s none usr/lib/openldap/bin/amd64/ldapcompare=../../../../bin/amd64/openldapcompare
 s none usr/lib/openldap/bin/amd64/ldapdelete=../../../../bin/amd64/openldapdelete
--- a/usr/src/pkgdefs/SUNWopenldapu/prototype_sparc	Tue Jun 05 16:09:08 2012 +0100
+++ b/usr/src/pkgdefs/SUNWopenldapu/prototype_sparc	Wed Jun 06 10:36:53 2012 +0100
@@ -60,15 +60,15 @@
 f none usr/bin/sparcv9/openldapurl 555 root bin
 f none usr/bin/sparcv9/openldapwhoami 555 root bin
 d none usr/lib/sparcv9 755 root bin
-f none usr/lib/sparcv9/liblber-2.4.so.2.5.4 555 root bin
-s none usr/lib/sparcv9/liblber-2.4.so=liblber-2.4.so.2.5.4
-s none usr/lib/sparcv9/liblber-2.4.so.2=liblber-2.4.so.2.5.4
-f none usr/lib/sparcv9/libldap-2.4.so.2.5.4 555 root bin
-s none usr/lib/sparcv9/libldap-2.4.so=libldap-2.4.so.2.5.4
-s none usr/lib/sparcv9/libldap-2.4.so.2=libldap-2.4.so.2.5.4
-f none usr/lib/sparcv9/libldap_r-2.4.so.2.5.4 555 root bin
-s none usr/lib/sparcv9/libldap_r-2.4.so=libldap_r-2.4.so.2.5.4
-s none usr/lib/sparcv9/libldap_r-2.4.so.2=libldap_r-2.4.so.2.5.4
+f none usr/lib/sparcv9/liblber-2.4.so.2.8.3 555 root bin
+s none usr/lib/sparcv9/liblber-2.4.so=liblber-2.4.so.2.8.3
+s none usr/lib/sparcv9/liblber-2.4.so.2=liblber-2.4.so.2.8.3
+f none usr/lib/sparcv9/libldap-2.4.so.2.8.3 555 root bin
+s none usr/lib/sparcv9/libldap-2.4.so=libldap-2.4.so.2.8.3
+s none usr/lib/sparcv9/libldap-2.4.so.2=libldap-2.4.so.2.8.3
+f none usr/lib/sparcv9/libldap_r-2.4.so.2.8.3 555 root bin
+s none usr/lib/sparcv9/libldap_r-2.4.so=libldap_r-2.4.so.2.8.3
+s none usr/lib/sparcv9/libldap_r-2.4.so.2=libldap_r-2.4.so.2.8.3
 d none usr/lib/openldap/bin/sparcv9 755 root bin
 s none usr/lib/openldap/bin/sparcv9/ldapcompare=../../../../bin/sparcv9/openldapcompare
 s none usr/lib/openldap/bin/sparcv9/ldapdelete=../../../../bin/sparcv9/openldapdelete