From 16253831a4b5ccee736b3d5c031c2e18f76fb4b805f1d91e0c1a6ade7d89327a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 4 Jul 2017 12:00:10 +0000 Subject: [PATCH] osc copypac from project:network:ldap package:openldap2 revision:179 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=181 --- openldap-r-only.diff | 24 ------------------------ openldap2.changes | 6 ------ openldap2.spec | 2 -- 3 files changed, 32 deletions(-) delete mode 100644 openldap-r-only.diff diff --git a/openldap-r-only.diff b/openldap-r-only.diff deleted file mode 100644 index 40b03a9..0000000 --- a/openldap-r-only.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: Jan Engelhardt -Date: 2017-07-04 13:53:32.386698982 +0200 - -Build all own programs exclusively with libldap_r and not libldap. - -References: http://bugzilla.redhat.com/1370065 -References: http://bugzilla.opensuse.org/996551 ---- - build/top.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: openldap-2.4.45/build/top.mk -=================================================================== ---- openldap-2.4.45.orig/build/top.mk -+++ openldap-2.4.45/build/top.mk -@@ -171,7 +171,7 @@ LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/libl - LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a - - LDAP_L = $(LDAP_LIBLUTIL_A) \ -- $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) -+ $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \ - $(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - diff --git a/openldap2.changes b/openldap2.changes index 8473e05..81b11a4 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 4 11:58:58 UTC 2017 - jengelh@inai.de - -- Add openldap-r-only.diff so that openldap2's own tools also - link against libldap_r rather than libldap. - ------------------------------------------------------------------- Thu Jun 29 08:27:17 UTC 2017 - jengelh@inai.de diff --git a/openldap2.spec b/openldap2.spec index 88259e7..3972104 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -57,7 +57,6 @@ Patch7: 0007-Recover-on-DB-version-change.dif Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch Patch9: 0009-Fix-ldap-host-lookup-ipv6.patch Patch11: 0011-openldap-re24-its7796.patch -Patch12: openldap-r-only.diff Source200: %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz Source201: %{name_ppolicy_check_module}.Makefile Source202: %{name_ppolicy_check_module}.conf @@ -249,7 +248,6 @@ gzip -k %{S:203} %patch8 -p1 %patch9 -p1 %patch11 -p1 -%patch12 -p1 cp %{SOURCE5} . # Move ppolicy check module and its Makefile into openldap-2.4/contrib/slapd-modules/