openldap: updated to 2.4.13

3 files changed, 68 insertions, 19 deletions

diff --git a/openldap/.footprint b/openldap/.footprint
index 67b5ed1eb..68ccc1fcf 100644
--- a/openldap/.footprint
+++ b/openldap/.footprint
@@ -4,17 +4,24 @@ drwxr-xr-x	root/root	etc/openldap/
 -rw-r--r--	root/root	etc/openldap/ldap.conf
 -rw-r--r--	root/root	etc/openldap/ldap.conf.default
 drwxr-xr-x	root/root	etc/openldap/schema/
+-r--r--r--	root/root	etc/openldap/schema/collective.schema
 -r--r--r--	root/root	etc/openldap/schema/corba.schema
 -r--r--r--	root/root	etc/openldap/schema/core.ldif
 -r--r--r--	root/root	etc/openldap/schema/core.schema
+-r--r--r--	root/root	etc/openldap/schema/cosine.ldif
 -r--r--r--	root/root	etc/openldap/schema/cosine.schema
+-r--r--r--	root/root	etc/openldap/schema/duaconf.schema
 -r--r--r--	root/root	etc/openldap/schema/dyngroup.schema
+-r--r--r--	root/root	etc/openldap/schema/inetorgperson.ldif
 -r--r--r--	root/root	etc/openldap/schema/inetorgperson.schema
 -r--r--r--	root/root	etc/openldap/schema/java.schema
 -r--r--r--	root/root	etc/openldap/schema/misc.schema
+-r--r--r--	root/root	etc/openldap/schema/nadf.schema
+-r--r--r--	root/root	etc/openldap/schema/nis.ldif
 -r--r--r--	root/root	etc/openldap/schema/nis.schema
 -r--r--r--	root/root	etc/openldap/schema/openldap.ldif
 -r--r--r--	root/root	etc/openldap/schema/openldap.schema
+-r--r--r--	root/root	etc/openldap/schema/pmi.schema
 -r--r--r--	root/root	etc/openldap/schema/ppolicy.schema
 -rw-------	root/root	etc/openldap/slapd.conf
 -rw-------	root/root	etc/openldap/slapd.conf.default
@@ -26,10 +33,12 @@ drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/ldapadd -> ldapmodify
 -rwxr-xr-x	root/root	usr/bin/ldapcompare
 -rwxr-xr-x	root/root	usr/bin/ldapdelete
+-rwxr-xr-x	root/root	usr/bin/ldapexop
 -rwxr-xr-x	root/root	usr/bin/ldapmodify
 -rwxr-xr-x	root/root	usr/bin/ldapmodrdn
 -rwxr-xr-x	root/root	usr/bin/ldappasswd
 -rwxr-xr-x	root/root	usr/bin/ldapsearch
+-rwxr-xr-x	root/root	usr/bin/ldapurl
 -rwxr-xr-x	root/root	usr/bin/ldapwhoami
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lber.h
@@ -41,23 +50,23 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/ldap_utf8.h
 -rw-r--r--	root/root	usr/include/slapi-plugin.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/liblber-2.3.so.0 -> liblber-2.3.so.0.2.31
--rw-r--r--	root/root	usr/lib/liblber-2.3.so.0.2.31
+lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.3.0
+-rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.3.0
 -rw-r--r--	root/root	usr/lib/liblber.a
 -rw-r--r--	root/root	usr/lib/liblber.la
-lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.3.so.0.2.31
+lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.3.0
 lrwxrwxrwx	root/root	usr/lib/liblber.so.2 -> liblber.so
-lrwxrwxrwx	root/root	usr/lib/libldap-2.3.so.0 -> libldap-2.3.so.0.2.31
--rw-r--r--	root/root	usr/lib/libldap-2.3.so.0.2.31
+lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.3.0
+-rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.3.0
 -rw-r--r--	root/root	usr/lib/libldap.a
 -rw-r--r--	root/root	usr/lib/libldap.la
-lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.3.so.0.2.31
+lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.3.0
 lrwxrwxrwx	root/root	usr/lib/libldap.so.2 -> libldap.so
-lrwxrwxrwx	root/root	usr/lib/libldap_r-2.3.so.0 -> libldap_r-2.3.so.0.2.31
--rw-r--r--	root/root	usr/lib/libldap_r-2.3.so.0.2.31
+lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.3.0
+-rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.3.0
 -rw-r--r--	root/root	usr/lib/libldap_r.a
 -rw-r--r--	root/root	usr/lib/libldap_r.la
-lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.3.so.0.2.31
+lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.3.0
 lrwxrwxrwx	root/root	usr/lib/libldap_r.so.2 -> libldap_r.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
@@ -68,6 +77,7 @@ lrwxrwxrwx	root/root	usr/man/man1/ldapadd.1.gz -> ldapmodify.1.gz
 -rw-r--r--	root/root	usr/man/man1/ldapmodrdn.1.gz
 -rw-r--r--	root/root	usr/man/man1/ldappasswd.1.gz
 -rw-r--r--	root/root	usr/man/man1/ldapsearch.1.gz
+-rw-r--r--	root/root	usr/man/man1/ldapurl.1.gz
 -rw-r--r--	root/root	usr/man/man1/ldapwhoami.1.gz
 drwxr-xr-x	root/root	usr/man/man3/
 lrwxrwxrwx	root/root	usr/man/man3/ber_alloc_t.3.gz -> lber-encode.3.gz
@@ -108,6 +118,7 @@ lrwxrwxrwx	root/root	usr/man/man3/ber_str2bv.3.gz -> lber-types.3.gz
 -rw-r--r--	root/root	usr/man/man3/lber-decode.3.gz
 -rw-r--r--	root/root	usr/man/man3/lber-encode.3.gz
 -rw-r--r--	root/root	usr/man/man3/lber-memory.3.gz
+-rw-r--r--	root/root	usr/man/man3/lber-sockbuf.3.gz
 -rw-r--r--	root/root	usr/man/man3/lber-types.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ld_errno.3.gz -> ldap_error.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap.3.gz
@@ -126,6 +137,13 @@ lrwxrwxrwx	root/root	usr/man/man3/ldap_bind_s.3.gz -> ldap_bind.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_compare_ext.3.gz -> ldap_compare.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_compare_ext_s.3.gz -> ldap_compare.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_compare_s.3.gz -> ldap_compare.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_control_create.3.gz -> ldap_controls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_control_dup.3.gz -> ldap_controls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_control_find.3.gz -> ldap_controls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_control_free.3.gz -> ldap_controls.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_controls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_controls_dup.3.gz -> ldap_controls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_controls_free.3.gz -> ldap_controls.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_count_entries.3.gz -> ldap_first_entry.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_count_messages.3.gz -> ldap_first_message.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_count_references.3.gz -> ldap_first_reference.3.gz
@@ -145,19 +163,30 @@ lrwxrwxrwx	root/root	usr/man/man3/ldap_errlist.3.gz -> ldap_error.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_error.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_explode_dn.3.gz -> ldap_get_dn.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_explode_rdn.3.gz -> ldap_get_dn.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_extended_operation.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_extended_operation_s.3.gz -> ldap_extended_operation.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_first_attribute.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_first_entry.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_first_message.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_first_reference.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_free_urldesc.3.gz -> ldap_url.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_get_dn.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_get_option.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_get_values.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_get_values_len.3.gz -> ldap_get_values.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_init.3.gz -> ldap_open.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_initialize.3.gz -> ldap_open.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_install_tls.3.gz -> ldap_tls.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_is_ldap_url.3.gz -> ldap_url.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_matchingrule2name.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_matchingrule2str.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_matchingrule_free.3.gz -> ldap_schema.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_memalloc.3.gz -> ldap_memory.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_memcalloc.3.gz -> ldap_memory.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_memfree.3.gz -> ldap_memory.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_memory.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_memrealloc.3.gz -> ldap_memory.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_memvfree.3.gz -> ldap_memory.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_modify.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_modify_ext.3.gz -> ldap_modify.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_modify_ext_s.3.gz -> ldap_modify.3.gz
@@ -182,7 +211,11 @@ lrwxrwxrwx	root/root	usr/man/man3/ldap_parse_extended_result.3.gz -> ldap_parse_
 -rw-r--r--	root/root	usr/man/man3/ldap_parse_reference.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_parse_result.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_parse_sasl_bind_result.3.gz -> ldap_parse_result.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_parse_sort_control.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_parse_vlv_control.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_perror.3.gz -> ldap_error.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_rename.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_rename_s.3.gz -> ldap_rename.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_result.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_result2error.3.gz -> ldap_error.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_sasl_bind.3.gz -> ldap_bind.3.gz
@@ -194,20 +227,28 @@ lrwxrwxrwx	root/root	usr/man/man3/ldap_search_ext.3.gz -> ldap_search.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_search_ext_s.3.gz -> ldap_search.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_search_s.3.gz -> ldap_search.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_search_st.3.gz -> ldap_search.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_set_option.3.gz -> ldap_get_option.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_set_rebind_proc.3.gz -> ldap_bind.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_simple_bind.3.gz -> ldap_bind.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_simple_bind_s.3.gz -> ldap_bind.3.gz
 -rw-r--r--	root/root	usr/man/man3/ldap_sort.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_sort_entries.3.gz -> ldap_sort.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_sort_strcasecmp.3.gz -> ldap_sort.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_sort_values.3.gz -> ldap_sort.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_start_tls.3.gz -> ldap_tls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_start_tls_s.3.gz -> ldap_tls.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_str2attributetype.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_str2dn.3.gz -> ldap_get_dn.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_str2matchingrule.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_str2objectclass.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_str2syntax.3.gz -> ldap_schema.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_strdup.3.gz -> ldap_memory.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_sync.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_syntax2name.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_syntax2str.3.gz -> ldap_schema.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_syntax_free.3.gz -> ldap_schema.3.gz
+-rw-r--r--	root/root	usr/man/man3/ldap_tls.3.gz
+lrwxrwxrwx	root/root	usr/man/man3/ldap_tls_inplace.3.gz -> ldap_tls.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_unbind.3.gz -> ldap_bind.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_unbind_ext.3.gz -> ldap_bind.3.gz
 lrwxrwxrwx	root/root	usr/man/man3/ldap_unbind_ext_s.3.gz -> ldap_bind.3.gz
@@ -220,6 +261,7 @@ drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/ldap.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/ldif.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-bdb.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapd-config.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-dnssrv.5.gz
 lrwxrwxrwx	root/root	usr/man/man5/slapd-hdb.5.gz -> slapd-bdb.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-ldap.5.gz
@@ -227,22 +269,28 @@ lrwxrwxrwx	root/root	usr/man/man5/slapd-hdb.5.gz -> slapd-bdb.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-ldif.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-meta.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-monitor.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapd-ndb.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-null.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-passwd.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-perl.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-relay.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-shell.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapd-sock.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd-sql.5.gz
--rw-r--r--	root/root	usr/man/man5/slapd-tcl.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd.access.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapd.backends.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd.conf.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapd.overlays.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapd.plugin.5.gz
--rw-r--r--	root/root	usr/man/man5/slapd.replog.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-accesslog.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-auditlog.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-chain.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapo-collect.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapo-constraint.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapo-dds.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapo-dyngroup.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-dynlist.5.gz
--rw-r--r--	root/root	usr/man/man5/slapo-lastmod.5.gz
+-rw-r--r--	root/root	usr/man/man5/slapo-memberof.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-pcache.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-ppolicy.5.gz
 -rw-r--r--	root/root	usr/man/man5/slapo-refint.5.gz
@@ -262,7 +310,6 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/slapindex.8.gz
 -rw-r--r--	root/root	usr/man/man8/slappasswd.8.gz
 -rw-r--r--	root/root	usr/man/man8/slaptest.8.gz
--rw-r--r--	root/root	usr/man/man8/slurpd.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 lrwxrwxrwx	root/root	usr/sbin/slapacl -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slapadd -> slapd
@@ -273,10 +320,8 @@ lrwxrwxrwx	root/root	usr/sbin/slapdn -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slapindex -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slappasswd -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slaptest -> slapd
--rwxr-xr-x	root/root	usr/sbin/slurpd
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/openldap/
 drwxr-xr-x	root/root	var/openldap/openldap-data/
 -rw-------	root/root	var/openldap/openldap-data/DB_CONFIG.example
-drwxr-xr-x	root/root	var/openldap/openldap-slurp/
 drwxr-xr-x	root/root	var/openldap/run/
diff --git a/openldap/.md5sum b/openldap/.md5sum
index 2a4a56c90..77d80e901 100644
--- a/openldap/.md5sum
+++ b/openldap/.md5sum
@@ -1,4 +1,4 @@
-1b25281086eb146b8e11ebd33de086dc  openldap-2.3.43.tgz
+5382bbb4c67172c48c871b6d24b7f8cc  openldap-2.4.13.tgz
 fb9881e7bfcdfb4e93baeeb8060c254a  openldap-config.patch
 c9320d172211a2c3172b23d5066e0a60  slapd
 68bf404f5cd3e259bb828d77dd75ba97  slurpd
diff --git a/openldap/Pkgfile b/openldap/Pkgfile
index 07141a5c0..072f1f2f3 100644
--- a/openldap/Pkgfile
+++ b/openldap/Pkgfile
@@ -5,15 +5,19 @@
 # Depends on: perl, openssl, cyrus-sasl
 
 name=openldap
-version=2.3.43
+version=2.4.13
 release=1
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$name-$version.tgz \
 	$name-config.patch slurpd slapd)
 
-build(){
+build() {
 	cd $name-$version
 	patch -p0 -i $SRC/$name-config.patch
 
+	# Workaround for: (ITS#5464) ucred guarded by __USE_GNU in glibc 2.8
+	# http://www.openldap.org/lists/openldap-bugs/200804/msg00074.html
+	export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/sbin \
@@ -54,7 +58,7 @@ build(){
 	sed -i -e "s|-L${PKG}/usr/lib||g" $PKG/usr/lib/*.la
 	/sbin/ldconfig -n $PKG/usr/lib
 
-# compatiblity links
+	# compatiblity links
 	(cd $PKG/usr/lib; 
 	 ln -s liblber.so liblber.so.2;
 	 ln -s libldap.so libldap.so.2;