From patchwork Fri Apr 24 10:28:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2998 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 497r3w5x9xz3yCZ for ; Fri, 24 Apr 2020 10:28:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 497r3w011vz28f; Fri, 24 Apr 2020 10:28:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 497r3v6Wlcz30GD; Fri, 24 Apr 2020 10:28:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 497r3q6Ctwz2ydx for ; Fri, 24 Apr 2020 10:28:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 497r3q1j1Tz1cQ; Fri, 24 Apr 2020 10:28:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1587724103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d7lIznzNxHi9QqywZUx0TnAO4TqvkteVTwr5Z+DcspI=; b=/b+dOWmJQ4EmkNfzqZr8Q2OvGmNKLmTCjGeZ+aOC+9E9xAR/Z7P2foM1N/XsKMqSo2GKa6 DWEDOW33HVN1+2Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1587724103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d7lIznzNxHi9QqywZUx0TnAO4TqvkteVTwr5Z+DcspI=; b=Y6L+x+R3md9QPp5zPSNu4gN5iuifIEU9aB//r1S2MgoUo0Sy56kVB2j3DpiTWlH4a7jeCq ZMNfceIJRYv9MmQduxhBuMSHFAryCBh2xyKp4oVLv7lfzuNMI5kXejrwneq3iUPCCraHT/ PKsf8XU+Lp8BORWYs8InFDjXiYtkPfVDdu+imMKxqioUc3nLq3XV1BxwOkIai717jhlR5e kAhft8Hka3Fb+XUSPA56qkH+cXv/nGeI1eRuKhz0MM1XfOrbbRak0Ac69PD6hYJfqvmqy0 LixJ95afNPK28iJG9YyJwmGyNyEV90WL0faZJ/UbXqNrclR7nn6LogCbDxP5qg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/5] openldap: Update to 2.4.49 Date: Fri, 24 Apr 2020 10:28:09 +0000 Message-Id: <20200424102812.16820-2-michael.tremer@ipfire.org> In-Reply-To: <20200424102812.16820-1-michael.tremer@ipfire.org> References: <20200424102812.16820-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This patch removes slapd which is unused in IPFire. Everything linked against the old version needs to be shipped with this update. Signed-off-by: Michael Tremer --- config/rootfiles/common/openldap | 596 ++++++++---------- lfs/openldap | 33 +- .../openldap-2.4.49-consolidated-1.patch | 371 +++++++++++ 3 files changed, 637 insertions(+), 363 deletions(-) create mode 100644 src/patches/openldap-2.4.49-consolidated-1.patch diff --git a/config/rootfiles/common/openldap b/config/rootfiles/common/openldap index c501760bd..8d42b8880 100644 --- a/config/rootfiles/common/openldap +++ b/config/rootfiles/common/openldap @@ -1,35 +1,15 @@ #etc/openldap -#etc/openldap/DB_CONFIG.example #etc/openldap/ldap.conf #etc/openldap/ldap.conf.default -#etc/openldap/schema -#etc/openldap/schema/README -#etc/openldap/schema/corba.schema -#etc/openldap/schema/core.ldif -#etc/openldap/schema/core.schema -#etc/openldap/schema/cosine.schema -#etc/openldap/schema/dyngroup.schema -#etc/openldap/schema/inetorgperson.schema -#etc/openldap/schema/java.schema -#etc/openldap/schema/misc.schema -#etc/openldap/schema/nis.schema -#etc/openldap/schema/openldap.ldif -#etc/openldap/schema/openldap.schema -#etc/openldap/schema/ppolicy.schema -#etc/openldap/slapd.conf -#etc/openldap/slapd.conf.default -#srv/ldap -#srv/ldap/openldap-data -#srv/ldap/openldap-data/DB_CONFIG.example -#srv/ldap/openldap-slurp -#srv/ldap/run #usr/bin/ldapadd #usr/bin/ldapcompare #usr/bin/ldapdelete +#usr/bin/ldapexop #usr/bin/ldapmodify #usr/bin/ldapmodrdn #usr/bin/ldappasswd #usr/bin/ldapsearch +#usr/bin/ldapurl #usr/bin/ldapwhoami #usr/include/lber.h #usr/include/lber_types.h @@ -38,327 +18,265 @@ #usr/include/ldap_features.h #usr/include/ldap_schema.h #usr/include/ldap_utf8.h +#usr/include/ldif.h +#usr/include/openldap.h #usr/include/slapi-plugin.h -usr/lib/liblber-2.3.so.0 -usr/lib/liblber-2.3.so.0.2.8 +usr/lib/liblber-2.4.so.2 +usr/lib/liblber-2.4.so.2.10.12 #usr/lib/liblber.la #usr/lib/liblber.so -usr/lib/libldap-2.3.so.0 -usr/lib/libldap-2.3.so.0.2.8 +usr/lib/libldap-2.4.so.2 +usr/lib/libldap-2.4.so.2.10.12 #usr/lib/libldap.la #usr/lib/libldap.so -usr/lib/libldap_r-2.3.so.0 -usr/lib/libldap_r-2.3.so.0.2.8 +usr/lib/libldap_r-2.4.so.2 +usr/lib/libldap_r-2.4.so.2.10.12 #usr/lib/libldap_r.la #usr/lib/libldap_r.so -#usr/lib/openldap -#usr/lib/openldap/accesslog-2.3.so.0 -#usr/lib/openldap/accesslog-2.3.so.0.2.8 -#usr/lib/openldap/accesslog.la -#usr/lib/openldap/accesslog.so -#usr/lib/openldap/back_bdb-2.3.so.0 -#usr/lib/openldap/back_bdb-2.3.so.0.2.8 -#usr/lib/openldap/back_bdb.la -#usr/lib/openldap/back_bdb.so -#usr/lib/openldap/back_dnssrv-2.3.so.0 -#usr/lib/openldap/back_dnssrv-2.3.so.0.2.8 -#usr/lib/openldap/back_dnssrv.la -#usr/lib/openldap/back_dnssrv.so -#usr/lib/openldap/back_hdb-2.3.so.0 -#usr/lib/openldap/back_hdb-2.3.so.0.2.8 -#usr/lib/openldap/back_hdb.la -#usr/lib/openldap/back_hdb.so -#usr/lib/openldap/back_ldap-2.3.so.0 -#usr/lib/openldap/back_ldap-2.3.so.0.2.8 -#usr/lib/openldap/back_ldap.la -#usr/lib/openldap/back_ldap.so -#usr/lib/openldap/back_ldbm-2.3.so.0 -#usr/lib/openldap/back_ldbm-2.3.so.0.2.8 -#usr/lib/openldap/back_ldbm.la -#usr/lib/openldap/back_ldbm.so -#usr/lib/openldap/back_meta-2.3.so.0 -#usr/lib/openldap/back_meta-2.3.so.0.2.8 -#usr/lib/openldap/back_meta.la -#usr/lib/openldap/back_meta.so -#usr/lib/openldap/back_monitor-2.3.so.0 -#usr/lib/openldap/back_monitor-2.3.so.0.2.8 -#usr/lib/openldap/back_monitor.la -#usr/lib/openldap/back_monitor.so -#usr/lib/openldap/back_null-2.3.so.0 -#usr/lib/openldap/back_null-2.3.so.0.2.8 -#usr/lib/openldap/back_null.la -#usr/lib/openldap/back_null.so -#usr/lib/openldap/back_passwd-2.3.so.0 -#usr/lib/openldap/back_passwd-2.3.so.0.2.8 -#usr/lib/openldap/back_passwd.la -#usr/lib/openldap/back_passwd.so -#usr/lib/openldap/back_relay-2.3.so.0 -#usr/lib/openldap/back_relay-2.3.so.0.2.8 -#usr/lib/openldap/back_relay.la -#usr/lib/openldap/back_relay.so -#usr/lib/openldap/back_shell-2.3.so.0 -#usr/lib/openldap/back_shell-2.3.so.0.2.8 -#usr/lib/openldap/back_shell.la -#usr/lib/openldap/back_shell.so -#usr/lib/openldap/denyop-2.3.so.0 -#usr/lib/openldap/denyop-2.3.so.0.2.8 -#usr/lib/openldap/denyop.la -#usr/lib/openldap/denyop.so -#usr/lib/openldap/dyngroup-2.3.so.0 -#usr/lib/openldap/dyngroup-2.3.so.0.2.8 -#usr/lib/openldap/dyngroup.la -#usr/lib/openldap/dyngroup.so -#usr/lib/openldap/dynlist-2.3.so.0 -#usr/lib/openldap/dynlist-2.3.so.0.2.8 -#usr/lib/openldap/dynlist.la -#usr/lib/openldap/dynlist.so -#usr/lib/openldap/lastmod-2.3.so.0 -#usr/lib/openldap/lastmod-2.3.so.0.2.8 -#usr/lib/openldap/lastmod.la -#usr/lib/openldap/lastmod.so -#usr/lib/openldap/pcache-2.3.so.0 -#usr/lib/openldap/pcache-2.3.so.0.2.8 -#usr/lib/openldap/pcache.la -#usr/lib/openldap/pcache.so -#usr/lib/openldap/ppolicy-2.3.so.0 -#usr/lib/openldap/ppolicy-2.3.so.0.2.8 -#usr/lib/openldap/ppolicy.la -#usr/lib/openldap/ppolicy.so -#usr/lib/openldap/refint-2.3.so.0 -#usr/lib/openldap/refint-2.3.so.0.2.8 -#usr/lib/openldap/refint.la -#usr/lib/openldap/refint.so -#usr/lib/openldap/retcode-2.3.so.0 -#usr/lib/openldap/retcode-2.3.so.0.2.8 -#usr/lib/openldap/retcode.la -#usr/lib/openldap/retcode.so -#usr/lib/openldap/rwm-2.3.so.0 -#usr/lib/openldap/rwm-2.3.so.0.2.8 -#usr/lib/openldap/rwm.la -#usr/lib/openldap/rwm.so -#usr/lib/openldap/syncprov-2.3.so.0 -#usr/lib/openldap/syncprov-2.3.so.0.2.8 -#usr/lib/openldap/syncprov.la -#usr/lib/openldap/syncprov.so -#usr/lib/openldap/translucent-2.3.so.0 -#usr/lib/openldap/translucent-2.3.so.0.2.8 -#usr/lib/openldap/translucent.la -#usr/lib/openldap/translucent.so -#usr/lib/openldap/unique-2.3.so.0 -#usr/lib/openldap/unique-2.3.so.0.2.8 -#usr/lib/openldap/unique.la -#usr/lib/openldap/unique.so -#usr/lib/openldap/valsort-2.3.so.0 -#usr/lib/openldap/valsort-2.3.so.0.2.8 -#usr/lib/openldap/valsort.la -#usr/lib/openldap/valsort.so -#usr/lib/slapd -#usr/lib/slurpd -#usr/man/man1/ldapadd.1 -#usr/man/man1/ldapcompare.1 -#usr/man/man1/ldapdelete.1 -#usr/man/man1/ldapmodify.1 -#usr/man/man1/ldapmodrdn.1 -#usr/man/man1/ldappasswd.1 -#usr/man/man1/ldapsearch.1 -#usr/man/man1/ldapwhoami.1 -#usr/man/man3/ber_alloc_t.3 -#usr/man/man3/ber_bvarray_add.3 -#usr/man/man3/ber_bvarray_free.3 -#usr/man/man3/ber_bvdup.3 -#usr/man/man3/ber_bvecadd.3 -#usr/man/man3/ber_bvecfree.3 -#usr/man/man3/ber_bvfree.3 -#usr/man/man3/ber_bvstr.3 -#usr/man/man3/ber_bvstrdup.3 -#usr/man/man3/ber_dupbv.3 -#usr/man/man3/ber_first_element.3 -#usr/man/man3/ber_flush.3 -#usr/man/man3/ber_free.3 -#usr/man/man3/ber_get_bitstring.3 -#usr/man/man3/ber_get_boolean.3 -#usr/man/man3/ber_get_enum.3 -#usr/man/man3/ber_get_int.3 -#usr/man/man3/ber_get_next.3 -#usr/man/man3/ber_get_null.3 -#usr/man/man3/ber_get_stringa.3 -#usr/man/man3/ber_get_stringb.3 -#usr/man/man3/ber_next_element.3 -#usr/man/man3/ber_peek_tag.3 -#usr/man/man3/ber_printf.3 -#usr/man/man3/ber_put_enum.3 -#usr/man/man3/ber_put_int.3 -#usr/man/man3/ber_put_null.3 -#usr/man/man3/ber_put_ostring.3 -#usr/man/man3/ber_put_seq.3 -#usr/man/man3/ber_put_set.3 -#usr/man/man3/ber_put_string.3 -#usr/man/man3/ber_scanf.3 -#usr/man/man3/ber_skip_tag.3 -#usr/man/man3/ber_start_set.3 -#usr/man/man3/ber_str2bv.3 -#usr/man/man3/lber-decode.3 -#usr/man/man3/lber-encode.3 -#usr/man/man3/lber-memory.3 -#usr/man/man3/lber-types.3 -#usr/man/man3/ld_errno.3 -#usr/man/man3/ldap.3 -#usr/man/man3/ldap_abandon.3 -#usr/man/man3/ldap_abandon_ext.3 -#usr/man/man3/ldap_add.3 -#usr/man/man3/ldap_add_ext.3 -#usr/man/man3/ldap_add_ext_s.3 -#usr/man/man3/ldap_add_s.3 -#usr/man/man3/ldap_attributetype2name.3 -#usr/man/man3/ldap_attributetype2str.3 -#usr/man/man3/ldap_attributetype_free.3 -#usr/man/man3/ldap_bind.3 -#usr/man/man3/ldap_bind_s.3 -#usr/man/man3/ldap_compare.3 -#usr/man/man3/ldap_compare_ext.3 -#usr/man/man3/ldap_compare_ext_s.3 -#usr/man/man3/ldap_compare_s.3 -#usr/man/man3/ldap_count_entries.3 -#usr/man/man3/ldap_count_messages.3 -#usr/man/man3/ldap_count_references.3 -#usr/man/man3/ldap_count_values.3 -#usr/man/man3/ldap_count_values_len.3 -#usr/man/man3/ldap_dcedn2dn.3 -#usr/man/man3/ldap_delete.3 -#usr/man/man3/ldap_delete_ext.3 -#usr/man/man3/ldap_delete_ext_s.3 -#usr/man/man3/ldap_delete_s.3 -#usr/man/man3/ldap_dn2ad_canonical.3 -#usr/man/man3/ldap_dn2dcedn.3 -#usr/man/man3/ldap_dn2str.3 -#usr/man/man3/ldap_dn2ufn.3 -#usr/man/man3/ldap_err2string.3 -#usr/man/man3/ldap_errlist.3 -#usr/man/man3/ldap_error.3 -#usr/man/man3/ldap_explode_dn.3 -#usr/man/man3/ldap_explode_rdn.3 -#usr/man/man3/ldap_first_attribute.3 -#usr/man/man3/ldap_first_entry.3 -#usr/man/man3/ldap_first_message.3 -#usr/man/man3/ldap_first_reference.3 -#usr/man/man3/ldap_free_urldesc.3 -#usr/man/man3/ldap_get_dn.3 -#usr/man/man3/ldap_get_values.3 -#usr/man/man3/ldap_get_values_len.3 -#usr/man/man3/ldap_init.3 -#usr/man/man3/ldap_is_ldap_url.3 -#usr/man/man3/ldap_matchingrule2name.3 -#usr/man/man3/ldap_matchingrule2str.3 -#usr/man/man3/ldap_matchingrule_free.3 -#usr/man/man3/ldap_modify.3 -#usr/man/man3/ldap_modify_ext.3 -#usr/man/man3/ldap_modify_ext_s.3 -#usr/man/man3/ldap_modify_s.3 -#usr/man/man3/ldap_modrdn.3 -#usr/man/man3/ldap_modrdn2.3 -#usr/man/man3/ldap_modrdn2_s.3 -#usr/man/man3/ldap_modrdn_s.3 -#usr/man/man3/ldap_mods_free.3 -#usr/man/man3/ldap_msgfree.3 -#usr/man/man3/ldap_msgid.3 -#usr/man/man3/ldap_msgtype.3 -#usr/man/man3/ldap_next_attribute.3 -#usr/man/man3/ldap_next_entry.3 -#usr/man/man3/ldap_next_message.3 -#usr/man/man3/ldap_next_reference.3 -#usr/man/man3/ldap_objectclass2name.3 -#usr/man/man3/ldap_objectclass2str.3 -#usr/man/man3/ldap_objectclass_free.3 -#usr/man/man3/ldap_open.3 -#usr/man/man3/ldap_parse_extended_result.3 -#usr/man/man3/ldap_parse_reference.3 -#usr/man/man3/ldap_parse_result.3 -#usr/man/man3/ldap_parse_sasl_bind_result.3 -#usr/man/man3/ldap_perror.3 -#usr/man/man3/ldap_result.3 -#usr/man/man3/ldap_result2error.3 -#usr/man/man3/ldap_sasl_bind.3 -#usr/man/man3/ldap_sasl_bind_s.3 -#usr/man/man3/ldap_schema.3 -#usr/man/man3/ldap_scherr2str.3 -#usr/man/man3/ldap_search.3 -#usr/man/man3/ldap_search_ext.3 -#usr/man/man3/ldap_search_ext_s.3 -#usr/man/man3/ldap_search_s.3 -#usr/man/man3/ldap_search_st.3 -#usr/man/man3/ldap_simple_bind.3 -#usr/man/man3/ldap_simple_bind_s.3 -#usr/man/man3/ldap_sort.3 -#usr/man/man3/ldap_sort_entries.3 -#usr/man/man3/ldap_sort_strcasecmp.3 -#usr/man/man3/ldap_sort_values.3 -#usr/man/man3/ldap_str2attributetype.3 -#usr/man/man3/ldap_str2dn.3 -#usr/man/man3/ldap_str2matchingrule.3 -#usr/man/man3/ldap_str2objectclass.3 -#usr/man/man3/ldap_str2syntax.3 -#usr/man/man3/ldap_syntax2name.3 -#usr/man/man3/ldap_syntax2str.3 -#usr/man/man3/ldap_syntax_free.3 -#usr/man/man3/ldap_unbind.3 -#usr/man/man3/ldap_unbind_ext.3 -#usr/man/man3/ldap_unbind_ext_s.3 -#usr/man/man3/ldap_unbind_s.3 -#usr/man/man3/ldap_url.3 -#usr/man/man3/ldap_url_parse.3 -#usr/man/man3/ldap_value_free.3 -#usr/man/man3/ldap_value_free_len.3 -#usr/man/man5 -#usr/man/man5/ldap.conf.5 -#usr/man/man5/ldif.5 -#usr/man/man5/slapd-bdb.5 -#usr/man/man5/slapd-dnssrv.5 -#usr/man/man5/slapd-hdb.5 -#usr/man/man5/slapd-ldap.5 -#usr/man/man5/slapd-ldbm.5 -#usr/man/man5/slapd-ldif.5 -#usr/man/man5/slapd-meta.5 -#usr/man/man5/slapd-monitor.5 -#usr/man/man5/slapd-null.5 -#usr/man/man5/slapd-passwd.5 -#usr/man/man5/slapd-perl.5 -#usr/man/man5/slapd-relay.5 -#usr/man/man5/slapd-shell.5 -#usr/man/man5/slapd-sql.5 -#usr/man/man5/slapd-tcl.5 -#usr/man/man5/slapd.access.5 -#usr/man/man5/slapd.conf.5 -#usr/man/man5/slapd.plugin.5 -#usr/man/man5/slapd.replog.5 -#usr/man/man5/slapo-accesslog.5 -#usr/man/man5/slapo-auditlog.5 -#usr/man/man5/slapo-chain.5 -#usr/man/man5/slapo-dynlist.5 -#usr/man/man5/slapo-lastmod.5 -#usr/man/man5/slapo-pcache.5 -#usr/man/man5/slapo-ppolicy.5 -#usr/man/man5/slapo-refint.5 -#usr/man/man5/slapo-retcode.5 -#usr/man/man5/slapo-rwm.5 -#usr/man/man5/slapo-syncprov.5 -#usr/man/man5/slapo-translucent.5 -#usr/man/man5/slapo-unique.5 -#usr/man/man5/slapo-valsort.5 -#usr/man/man8/slapacl.8 -#usr/man/man8/slapadd.8 -#usr/man/man8/slapauth.8 -#usr/man/man8/slapcat.8 -#usr/man/man8/slapd.8 -#usr/man/man8/slapdn.8 -#usr/man/man8/slapindex.8 -#usr/man/man8/slappasswd.8 -#usr/man/man8/slaptest.8 -#usr/man/man8/slurpd.8 -#usr/sbin/slapacl -#usr/sbin/slapadd -#usr/sbin/slapauth -#usr/sbin/slapcat -#usr/sbin/slapdn -#usr/sbin/slapindex -#usr/sbin/slappasswd -#usr/sbin/slaptest +#usr/share/man/man1/ldapadd.1 +#usr/share/man/man1/ldapcompare.1 +#usr/share/man/man1/ldapdelete.1 +#usr/share/man/man1/ldapexop.1 +#usr/share/man/man1/ldapmodify.1 +#usr/share/man/man1/ldapmodrdn.1 +#usr/share/man/man1/ldappasswd.1 +#usr/share/man/man1/ldapsearch.1 +#usr/share/man/man1/ldapurl.1 +#usr/share/man/man1/ldapwhoami.1 +#usr/share/man/man3/ber_alloc_t.3 +#usr/share/man/man3/ber_bvarray_add.3 +#usr/share/man/man3/ber_bvarray_free.3 +#usr/share/man/man3/ber_bvdup.3 +#usr/share/man/man3/ber_bvecadd.3 +#usr/share/man/man3/ber_bvecfree.3 +#usr/share/man/man3/ber_bvfree.3 +#usr/share/man/man3/ber_bvstr.3 +#usr/share/man/man3/ber_bvstrdup.3 +#usr/share/man/man3/ber_dupbv.3 +#usr/share/man/man3/ber_first_element.3 +#usr/share/man/man3/ber_flush.3 +#usr/share/man/man3/ber_free.3 +#usr/share/man/man3/ber_get_bitstring.3 +#usr/share/man/man3/ber_get_boolean.3 +#usr/share/man/man3/ber_get_enum.3 +#usr/share/man/man3/ber_get_int.3 +#usr/share/man/man3/ber_get_next.3 +#usr/share/man/man3/ber_get_null.3 +#usr/share/man/man3/ber_get_stringa.3 +#usr/share/man/man3/ber_get_stringb.3 +#usr/share/man/man3/ber_next_element.3 +#usr/share/man/man3/ber_peek_tag.3 +#usr/share/man/man3/ber_printf.3 +#usr/share/man/man3/ber_put_enum.3 +#usr/share/man/man3/ber_put_int.3 +#usr/share/man/man3/ber_put_null.3 +#usr/share/man/man3/ber_put_ostring.3 +#usr/share/man/man3/ber_put_seq.3 +#usr/share/man/man3/ber_put_set.3 +#usr/share/man/man3/ber_put_string.3 +#usr/share/man/man3/ber_scanf.3 +#usr/share/man/man3/ber_skip_tag.3 +#usr/share/man/man3/ber_start_set.3 +#usr/share/man/man3/ber_str2bv.3 +#usr/share/man/man3/lber-decode.3 +#usr/share/man/man3/lber-encode.3 +#usr/share/man/man3/lber-memory.3 +#usr/share/man/man3/lber-sockbuf.3 +#usr/share/man/man3/lber-types.3 +#usr/share/man/man3/ld_errno.3 +#usr/share/man/man3/ldap.3 +#usr/share/man/man3/ldap_abandon.3 +#usr/share/man/man3/ldap_abandon_ext.3 +#usr/share/man/man3/ldap_add.3 +#usr/share/man/man3/ldap_add_ext.3 +#usr/share/man/man3/ldap_add_ext_s.3 +#usr/share/man/man3/ldap_add_s.3 +#usr/share/man/man3/ldap_attributetype2name.3 +#usr/share/man/man3/ldap_attributetype2str.3 +#usr/share/man/man3/ldap_attributetype_free.3 +#usr/share/man/man3/ldap_bind.3 +#usr/share/man/man3/ldap_bind_s.3 +#usr/share/man/man3/ldap_compare.3 +#usr/share/man/man3/ldap_compare_ext.3 +#usr/share/man/man3/ldap_compare_ext_s.3 +#usr/share/man/man3/ldap_compare_s.3 +#usr/share/man/man3/ldap_control_create.3 +#usr/share/man/man3/ldap_control_dup.3 +#usr/share/man/man3/ldap_control_find.3 +#usr/share/man/man3/ldap_control_free.3 +#usr/share/man/man3/ldap_controls.3 +#usr/share/man/man3/ldap_controls_dup.3 +#usr/share/man/man3/ldap_controls_free.3 +#usr/share/man/man3/ldap_count_entries.3 +#usr/share/man/man3/ldap_count_messages.3 +#usr/share/man/man3/ldap_count_references.3 +#usr/share/man/man3/ldap_count_values.3 +#usr/share/man/man3/ldap_count_values_len.3 +#usr/share/man/man3/ldap_dcedn2dn.3 +#usr/share/man/man3/ldap_delete.3 +#usr/share/man/man3/ldap_delete_ext.3 +#usr/share/man/man3/ldap_delete_ext_s.3 +#usr/share/man/man3/ldap_delete_s.3 +#usr/share/man/man3/ldap_destroy.3 +#usr/share/man/man3/ldap_dn2ad_canonical.3 +#usr/share/man/man3/ldap_dn2dcedn.3 +#usr/share/man/man3/ldap_dn2str.3 +#usr/share/man/man3/ldap_dn2ufn.3 +#usr/share/man/man3/ldap_dnfree.3 +#usr/share/man/man3/ldap_dup.3 +#usr/share/man/man3/ldap_err2string.3 +#usr/share/man/man3/ldap_errlist.3 +#usr/share/man/man3/ldap_error.3 +#usr/share/man/man3/ldap_explode_dn.3 +#usr/share/man/man3/ldap_explode_rdn.3 +#usr/share/man/man3/ldap_extended_operation.3 +#usr/share/man/man3/ldap_extended_operation_s.3 +#usr/share/man/man3/ldap_first_attribute.3 +#usr/share/man/man3/ldap_first_entry.3 +#usr/share/man/man3/ldap_first_message.3 +#usr/share/man/man3/ldap_first_reference.3 +#usr/share/man/man3/ldap_free_urldesc.3 +#usr/share/man/man3/ldap_get_dn.3 +#usr/share/man/man3/ldap_get_option.3 +#usr/share/man/man3/ldap_get_values.3 +#usr/share/man/man3/ldap_get_values_len.3 +#usr/share/man/man3/ldap_init.3 +#usr/share/man/man3/ldap_init_fd.3 +#usr/share/man/man3/ldap_initialize.3 +#usr/share/man/man3/ldap_install_tls.3 +#usr/share/man/man3/ldap_is_ldap_url.3 +#usr/share/man/man3/ldap_matchingrule2name.3 +#usr/share/man/man3/ldap_matchingrule2str.3 +#usr/share/man/man3/ldap_matchingrule_free.3 +#usr/share/man/man3/ldap_memalloc.3 +#usr/share/man/man3/ldap_memcalloc.3 +#usr/share/man/man3/ldap_memfree.3 +#usr/share/man/man3/ldap_memory.3 +#usr/share/man/man3/ldap_memrealloc.3 +#usr/share/man/man3/ldap_memvfree.3 +#usr/share/man/man3/ldap_modify.3 +#usr/share/man/man3/ldap_modify_ext.3 +#usr/share/man/man3/ldap_modify_ext_s.3 +#usr/share/man/man3/ldap_modify_s.3 +#usr/share/man/man3/ldap_modrdn.3 +#usr/share/man/man3/ldap_modrdn2.3 +#usr/share/man/man3/ldap_modrdn2_s.3 +#usr/share/man/man3/ldap_modrdn_s.3 +#usr/share/man/man3/ldap_mods_free.3 +#usr/share/man/man3/ldap_msgfree.3 +#usr/share/man/man3/ldap_msgid.3 +#usr/share/man/man3/ldap_msgtype.3 +#usr/share/man/man3/ldap_next_attribute.3 +#usr/share/man/man3/ldap_next_entry.3 +#usr/share/man/man3/ldap_next_message.3 +#usr/share/man/man3/ldap_next_reference.3 +#usr/share/man/man3/ldap_objectclass2name.3 +#usr/share/man/man3/ldap_objectclass2str.3 +#usr/share/man/man3/ldap_objectclass_free.3 +#usr/share/man/man3/ldap_open.3 +#usr/share/man/man3/ldap_parse_extended_result.3 +#usr/share/man/man3/ldap_parse_reference.3 +#usr/share/man/man3/ldap_parse_result.3 +#usr/share/man/man3/ldap_parse_sasl_bind_result.3 +#usr/share/man/man3/ldap_parse_sort_control.3 +#usr/share/man/man3/ldap_parse_vlv_control.3 +#usr/share/man/man3/ldap_perror.3 +#usr/share/man/man3/ldap_rename.3 +#usr/share/man/man3/ldap_rename_s.3 +#usr/share/man/man3/ldap_result.3 +#usr/share/man/man3/ldap_result2error.3 +#usr/share/man/man3/ldap_sasl_bind.3 +#usr/share/man/man3/ldap_sasl_bind_s.3 +#usr/share/man/man3/ldap_schema.3 +#usr/share/man/man3/ldap_scherr2str.3 +#usr/share/man/man3/ldap_search.3 +#usr/share/man/man3/ldap_search_ext.3 +#usr/share/man/man3/ldap_search_ext_s.3 +#usr/share/man/man3/ldap_search_s.3 +#usr/share/man/man3/ldap_search_st.3 +#usr/share/man/man3/ldap_set_option.3 +#usr/share/man/man3/ldap_set_rebind_proc.3 +#usr/share/man/man3/ldap_set_urllist_proc.3 +#usr/share/man/man3/ldap_simple_bind.3 +#usr/share/man/man3/ldap_simple_bind_s.3 +#usr/share/man/man3/ldap_sort.3 +#usr/share/man/man3/ldap_sort_entries.3 +#usr/share/man/man3/ldap_sort_strcasecmp.3 +#usr/share/man/man3/ldap_sort_values.3 +#usr/share/man/man3/ldap_start_tls.3 +#usr/share/man/man3/ldap_start_tls_s.3 +#usr/share/man/man3/ldap_str2attributetype.3 +#usr/share/man/man3/ldap_str2dn.3 +#usr/share/man/man3/ldap_str2matchingrule.3 +#usr/share/man/man3/ldap_str2objectclass.3 +#usr/share/man/man3/ldap_str2syntax.3 +#usr/share/man/man3/ldap_strdup.3 +#usr/share/man/man3/ldap_sync.3 +#usr/share/man/man3/ldap_syntax2name.3 +#usr/share/man/man3/ldap_syntax2str.3 +#usr/share/man/man3/ldap_syntax_free.3 +#usr/share/man/man3/ldap_tls.3 +#usr/share/man/man3/ldap_tls_inplace.3 +#usr/share/man/man3/ldap_unbind.3 +#usr/share/man/man3/ldap_unbind_ext.3 +#usr/share/man/man3/ldap_unbind_ext_s.3 +#usr/share/man/man3/ldap_unbind_s.3 +#usr/share/man/man3/ldap_url.3 +#usr/share/man/man3/ldap_url_parse.3 +#usr/share/man/man3/ldap_value_free.3 +#usr/share/man/man3/ldap_value_free_len.3 +#usr/share/man/man5/ldap.conf.5 +#usr/share/man/man5/ldif.5 +#usr/share/man/man5/slapd-bdb.5 +#usr/share/man/man5/slapd-config.5 +#usr/share/man/man5/slapd-dnssrv.5 +#usr/share/man/man5/slapd-hdb.5 +#usr/share/man/man5/slapd-ldap.5 +#usr/share/man/man5/slapd-ldif.5 +#usr/share/man/man5/slapd-mdb.5 +#usr/share/man/man5/slapd-meta.5 +#usr/share/man/man5/slapd-monitor.5 +#usr/share/man/man5/slapd-ndb.5 +#usr/share/man/man5/slapd-null.5 +#usr/share/man/man5/slapd-passwd.5 +#usr/share/man/man5/slapd-perl.5 +#usr/share/man/man5/slapd-relay.5 +#usr/share/man/man5/slapd-shell.5 +#usr/share/man/man5/slapd-sock.5 +#usr/share/man/man5/slapd-sql.5 +#usr/share/man/man5/slapd.access.5 +#usr/share/man/man5/slapd.backends.5 +#usr/share/man/man5/slapd.conf.5 +#usr/share/man/man5/slapd.overlays.5 +#usr/share/man/man5/slapd.plugin.5 +#usr/share/man/man5/slapo-accesslog.5 +#usr/share/man/man5/slapo-auditlog.5 +#usr/share/man/man5/slapo-chain.5 +#usr/share/man/man5/slapo-collect.5 +#usr/share/man/man5/slapo-constraint.5 +#usr/share/man/man5/slapo-dds.5 +#usr/share/man/man5/slapo-dyngroup.5 +#usr/share/man/man5/slapo-dynlist.5 +#usr/share/man/man5/slapo-memberof.5 +#usr/share/man/man5/slapo-pbind.5 +#usr/share/man/man5/slapo-pcache.5 +#usr/share/man/man5/slapo-ppolicy.5 +#usr/share/man/man5/slapo-refint.5 +#usr/share/man/man5/slapo-retcode.5 +#usr/share/man/man5/slapo-rwm.5 +#usr/share/man/man5/slapo-sock.5 +#usr/share/man/man5/slapo-sssvlv.5 +#usr/share/man/man5/slapo-syncprov.5 +#usr/share/man/man5/slapo-translucent.5 +#usr/share/man/man5/slapo-unique.5 +#usr/share/man/man5/slapo-valsort.5 +#usr/share/man/man8/slapacl.8 +#usr/share/man/man8/slapadd.8 +#usr/share/man/man8/slapauth.8 +#usr/share/man/man8/slapcat.8 +#usr/share/man/man8/slapd.8 +#usr/share/man/man8/slapdn.8 +#usr/share/man/man8/slapindex.8 +#usr/share/man/man8/slappasswd.8 +#usr/share/man/man8/slapschema.8 +#usr/share/man/man8/slaptest.8 diff --git a/lfs/openldap b/lfs/openldap index 16c3737b4..750adcaa9 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -24,17 +24,13 @@ include Config -VER = 2.3.20 +VER = 2.4.49 THISAPP = openldap-$(VER) DL_FILE = $(THISAPP).tgz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = openldap -PAK_VER = 3 - -DEPS = export CPPFLAGS = -D_GNU_SOURCE @@ -46,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 49d2c5b9378a7b57e1fb03948acb8e32 +$(DL_FILE)_MD5 = 2a47a6bb4319357ea7b032c45283e79e install : $(TARGET) @@ -56,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist : - $(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -79,25 +72,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/openldap-gcc44-fixes.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.4.49-consolidated-1.patch + cd $(DIR_APP) && autoconf cd $(DIR_APP) && ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib \ --sysconfdir=/etc \ - --localstatedir=/srv/ldap \ - --with-threads=posix \ - --disable-perl \ --enable-dynamic \ - --enable-crypt \ - --enable-modules \ - --enable-rlookups \ - --enable-backends=mod \ - --enable-overlays=mod \ - --enable-sql=no \ - --enable-ndb=no \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + --disable-perl \ + --disable-static \ + --disable-slapd + cd $(DIR_APP) && make depend + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/openldap-2.4.49-consolidated-1.patch b/src/patches/openldap-2.4.49-consolidated-1.patch new file mode 100644 index 000000000..8cd2656e3 --- /dev/null +++ b/src/patches/openldap-2.4.49-consolidated-1.patch @@ -0,0 +1,371 @@ +Submitted by: Bruce Dubbs +Date: 2012-03-26 +Initial Package Version: 2.4.40 +Upstream Status: BLFS Specific +Origin: Armin K. and Debian +Comment: Rediffed by Fernando de Oliveira for version 2.4.44 - 2016.02.06 + Rediffed by Pierre Labastie to add mdb backend and slapd.ldif. See + ticket #7394 - 2016.02.24 +Description: Consolidate earlier patches to: + 1. Update various installation options, such as ldap database path, + configuration file options, slapd install location, etc. + 2. Remove reference to bdb module + 3. Enables symbol versioning in ldap libraries. Without these changes + some applications might generate a warning about missing symbol versions. + +diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4 +--- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500 +@@ -1142,3 +1142,54 @@ + #endif + ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) + ]) ++ ++dnl ==================================================================== ++dnl check for symbol versioning support ++AC_DEFUN([OL_SYMBOL_VERSIONING], ++[AC_CACHE_CHECK([for .symver assembler directive], ++ [ol_cv_asm_symver_directive],[ ++cat > conftest.s <&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then ++ ol_cv_asm_symver_directive=yes ++else ++ ol_cv_asm_symver_directive=no ++fi ++rm -f conftest*]) ++AC_CACHE_CHECK([for ld --version-script], ++ [ol_cv_ld_version_script_option],[ ++if test $ol_cv_asm_symver_directive = yes; then ++ cat > conftest.s < conftest.map <&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then ++ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared ++ -o conftest.so conftest.o ++ -Wl,--version-script,conftest.map ++ 1>&AS_MESSAGE_LOG_FD]); ++ then ++ ol_cv_ld_version_script_option=yes ++ else ++ ol_cv_ld_version_script_option=no ++ fi ++ else ++ ol_cv_ld_version_script_option=no ++ fi ++else ++ ol_cv_ld_version_script_option=no ++fi ++rm -f conftest*])]) +diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk +--- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500 +@@ -104,6 +104,9 @@ + # LINK_LIBS referenced in library and module link commands. + LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) + ++# option to pass to $(CC) to support library symbol versioning, if any ++VERSION_OPTION = @VERSION_OPTION@ ++ + LTSTATIC = @LTSTATIC@ + + LTLINK = $(LIBTOOL) --mode=link \ +@@ -113,7 +116,7 @@ + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c + + LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ +- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) ++ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS) + + LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c +diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in +--- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500 +@@ -1916,6 +1916,13 @@ + fi + AC_SUBST(LTSTATIC)dnl + ++VERSION_OPTION="" ++OL_SYMBOL_VERSIONING ++if test $ol_cv_ld_version_script_option = yes ; then ++ VERSION_OPTION="-Wl,--version-script=" ++fi ++AC_SUBST(VERSION_OPTION) ++ + dnl ---------------------------------------------------------------- + if test $ol_enable_wrappers != no ; then + AC_CHECK_HEADERS(tcpd.h,[ +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5 +--- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500 +@@ -135,7 +135,7 @@ + associated indexes live. + A separate directory must be specified for each database. + The default is +-.BR LOCALSTATEDIR/openldap\-data . ++.BR LOCALSTATEDIR/lib/openldap . + .TP + .B dirtyread + Allow reads of modified but not yet committed data. +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5 +--- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500 +@@ -2051,7 +2051,7 @@ + # The database directory MUST exist prior to + # running slapd AND should only be accessible + # by the slapd/tools. Mode 0700 recommended. +-olcDbDirectory: LOCALSTATEDIR/openldap\-data ++olcDbDirectory: LOCALSTATEDIR/lib/openldap + # Indices to maintain + olcDbIndex: objectClass eq + olcDbIndex: cn,sn,mail pres,eq,approx,sub +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5 +--- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500 +@@ -2021,7 +2021,7 @@ + # The database directory MUST exist prior to + # running slapd AND should only be accessible + # by the slapd/tools. Mode 0700 recommended. +-directory LOCALSTATEDIR/openldap\-data ++directory LOCALSTATEDIR/lib/openldap + # Indices to maintain + index objectClass eq + index cn,sn,mail pres,eq,approx,sub +diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h +--- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500 +@@ -39,7 +39,7 @@ + #define LDAP_ENV_PREFIX "LDAP" + + /* default ldapi:// socket */ +-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" ++#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" + + /* + * SLAPD DEFINITIONS +@@ -47,7 +47,7 @@ + /* location of the default slapd config file */ + #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" + #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" +-#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" ++#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" + #define SLAPD_DEFAULT_DB_MODE 0600 + #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" + /* default max deref depth for aliases */ +diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in +--- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500 +@@ -38,6 +38,9 @@ + XXLIBS = + NT_LINK_LIBS = $(AC_LIBS) + UNIX_LINK_LIBS = $(AC_LIBS) ++ifneq (,$(VERSION_OPTION)) ++ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map" ++endif + + dtest: $(XLIBS) dtest.o + $(LTLINK) -o $@ dtest.o $(LIBS) +@@ -48,6 +51,6 @@ + + install-local: FORCE + -$(MKDIR) $(DESTDIR)$(libdir) +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) + $(LTFINISH) $(DESTDIR)$(libdir) + +diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map +--- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600 ++++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500 +@@ -0,0 +1,8 @@ ++OPENLDAP_2.4_2 { ++ global: ++ ber_*; ++ der_alloc; ++ lutil_*; ++ local: ++ *; ++}; +diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in +--- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500 +@@ -52,6 +52,9 @@ + XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) + NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) + UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) ++ifneq (,$(VERSION_OPTION)) ++ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map ++endif + + apitest: $(XLIBS) apitest.o + $(LTLINK) -o $@ apitest.o $(LIBS) +@@ -68,7 +71,7 @@ + + install-local: $(CFFILES) FORCE + -$(MKDIR) $(DESTDIR)$(libdir) +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) + $(LTFINISH) $(DESTDIR)$(libdir) + -$(MKDIR) $(DESTDIR)$(sysconfdir) + @for i in $(CFFILES); do \ +diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map +--- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600 ++++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500 +@@ -0,0 +1,7 @@ ++OPENLDAP_2.4_2 { ++ global: ++ ldap_*; ++ ldif_*; ++ local: ++ *; ++}; +diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in +--- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500 +@@ -61,6 +61,9 @@ + XXXLIBS = $(LTHREAD_LIBS) + NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) + UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) ++ifneq (,$(VERSION_OPTION)) ++ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map" ++endif + + .links : Makefile + @for i in $(XXSRCS); do \ +@@ -83,6 +86,6 @@ + + install-local: $(CFFILES) FORCE + -$(MKDIR) $(DESTDIR)$(libdir) +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) + $(LTFINISH) $(DESTDIR)$(libdir) + +diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in +--- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500 +@@ -376,10 +376,10 @@ + install-conf install-dbc-maybe install-schema install-tools + + install-slapd: FORCE +- -$(MKDIR) $(DESTDIR)$(libexecdir) ++ -$(MKDIR) $(DESTDIR)$(sbindir) + -$(MKDIR) $(DESTDIR)$(localstatedir)/run + $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ +- slapd$(EXEEXT) $(DESTDIR)$(libexecdir) ++ slapd$(EXEEXT) $(DESTDIR)$(sbindir) + @for i in $(SUBDIRS); do \ + if test -d $$i && test -f $$i/Makefile ; then \ + echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ +@@ -445,9 +445,9 @@ + + install-db-config: FORCE + @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) +- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data ++ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap + $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ +- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example ++ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example + $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ + $(DESTDIR)$(sysconfdir)/DB_CONFIG.example + +@@ -455,6 +455,6 @@ + -$(MKDIR) $(DESTDIR)$(sbindir) + for i in $(SLAPTOOLS); do \ + $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ +- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ ++ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ + done + +diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf +--- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100 ++++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100 +@@ -10,12 +10,12 @@ + # service AND an understanding of referrals. + #referral ldap://root.openldap.org + +-pidfile %LOCALSTATEDIR%/run/slapd.pid +-argsfile %LOCALSTATEDIR%/run/slapd.args ++pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid ++argsfile %LOCALSTATEDIR%/run/openldap/slapd.args + + # Load dynamic backend modules: +-# modulepath %MODULEDIR% +-# moduleload back_mdb.la ++modulepath %MODULEDIR% ++moduleload back_mdb.la + # moduleload back_ldap.la + + # Sample security restrictions +@@ -60,6 +60,6 @@ + # The database directory MUST exist prior to running slapd AND + # should only be accessible by the slapd and slap tools. + # Mode 700 recommended. +-directory %LOCALSTATEDIR%/openldap-data ++directory %LOCALSTATEDIR%/lib/openldap + # Indices to maintain + index objectClass eq +diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif +--- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100 ++++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100 +@@ -9,8 +9,8 @@ + # + # Define global ACLs to disable default read access. + # +-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args +-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid ++olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args ++olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid + # + # Do not enable referrals until AFTER you have a working directory + # service AND an understanding of referrals. +@@ -26,10 +26,11 @@ + # + # Load dynamic backend modules: + # +-#dn: cn=module,cn=config +-#objectClass: olcModuleList +-#cn: module +-#olcModulepath: %MODULEDIR% ++dn: cn=module,cn=config ++objectClass: olcModuleList ++cn: module ++olcModulepath: %MODULEDIR% ++olcModuleload: back_mdb.la + #olcModuleload: back_bdb.la + #olcModuleload: back_hdb.la + #olcModuleload: back_ldap.la +@@ -90,6 +91,6 @@ + # The database directory MUST exist prior to running slapd AND + # should only be accessible by the slapd and slap tools. + # Mode 700 recommended. +-olcDbDirectory: %LOCALSTATEDIR%/openldap-data ++olcDbDirectory: %LOCALSTATEDIR%/lib/openldap + # Indices to maintain + olcDbIndex: objectClass eq +diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in +--- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500 ++++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500 +@@ -46,6 +46,6 @@ + install-local: FORCE + if test "$(BUILD_MOD)" = "yes"; then \ + $(MKDIR) $(DESTDIR)$(libdir); \ +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \ ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \ + fi +