From 6bb69eda08d6d96d0782a656cca89c3e131801783f2825b0c81e42f54e54be72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Mon, 17 Jul 2017 19:02:36 +0000 Subject: [PATCH] Accepting request 509862 from home:stroeder:branches:network:ldap Postpone Jan's libldap_r symlink patch for now. Added a local patch for OpenLDAP's back-sock. OBS-URL: https://build.opensuse.org/request/show/509862 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=182 --- ...et-back-sock-generate-increment-line.patch | 28 +++++++++++++ baselibs.conf | 2 - openldap2.changes | 39 +++++-------------- openldap2.spec | 12 ++---- 4 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 0013-ITS-8692-let-back-sock-generate-increment-line.patch diff --git a/0013-ITS-8692-let-back-sock-generate-increment-line.patch b/0013-ITS-8692-let-back-sock-generate-increment-line.patch new file mode 100644 index 0000000..7fbb1f0 --- /dev/null +++ b/0013-ITS-8692-let-back-sock-generate-increment-line.patch @@ -0,0 +1,28 @@ +From 6c37844c5c52b95aff5e4e547cda8a7258e92a35 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Str=C3=B6der?= +Date: Wed, 12 Jul 2017 20:18:22 +0200 +Subject: [PATCH] ITS#8692 let back-sock generate increment: line in case of + LDAP_MOD_INCREMENT (see RFC 4525, section 3) + +--- + servers/slapd/back-sock/modify.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/servers/slapd/back-sock/modify.c b/servers/slapd/back-sock/modify.c +index c35d31bc6..9342d2702 100644 +--- a/servers/slapd/back-sock/modify.c ++++ b/servers/slapd/back-sock/modify.c +@@ -85,6 +85,10 @@ sock_back_modify( + case LDAP_MOD_REPLACE: + fprintf( fp, "replace: %s\n", mod->sm_desc->ad_cname.bv_val ); + break; ++ ++ case LDAP_MOD_INCREMENT: ++ fprintf( fp, "increment: %s\n", mod->sm_desc->ad_cname.bv_val ); ++ break; + } + + if( mod->sm_values != NULL ) { +-- +2.13.2 + diff --git a/baselibs.conf b/baselibs.conf index 83913f7..3b434dc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,4 @@ libldap-2_4-2 - targettype 32bit provides "libldap-2.4.so.2" - targettype 64bit provides "libldap-2.4.so.2()(64bit)" provides "openldap2-client- = " obsoletes "openldap2-client- <= " openldap2-devel diff --git a/openldap2.changes b/openldap2.changes index 81b11a4..9410524 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,16 +1,20 @@ ------------------------------------------------------------------- -Thu Jun 29 08:27:17 UTC 2017 - jengelh@inai.de +Wed Jul 12 18:52:42 UTC 2017 - michael@stroeder.com -- Remove all non-r libldap links so OBS has a clearer picture of - rebuilds. [boo sr#501631] +- Upgrade to upstream 2.4.45 release +- removed obsolete 0010-Enforce-minimum-DH-size-of-1024.patch + and 0012-use-system-wide-cert-dir-by-default.patch +- added 0013-ITS-8692-let-back-sock-generate-increment-line.patch + for supporting modify increment operations with back-sock +- added overlay addpartial to package openldap2-contrib -------------------------------------------------------------------- +-------------------------------------------------------------------- Wed Jun 7 09:32:52 UTC 2017 - hguo@suse.com - Remove legacy daemon control that was used to migrate from SLE 11 to 12. (bsc#1038405) -------------------------------------------------------------------- +-------------------------------------------------------------------- Tue Jun 6 13:47:18 UTC 2017 - hguo@suse.com - There is no change made about the package itself, this is only @@ -27,37 +31,12 @@ Tue Jun 6 13:47:18 UTC 2017 - hguo@suse.com - bug#916897 owned by varkoly@suse.com: VUL-0: CVE-2015-1545: openldap2: slapd crashes on search with deref control and empty attr list -------------------------------------------------------------------e -Fri Jun 2 07:26:42 UTC 2017 - michael@stroeder.com - -- Upgrade to upstream 2.4.45 release -- removed obsolete 0010-Enforce-minimum-DH-size-of-1024.patch - and 0012-use-system-wide-cert-dir-by-default.patch - -------------------------------------------------------------------- -Thu Apr 27 10:08:31 UTC 2017 - michael@stroeder.com - -- added overlay addpartial to package openldap2-contrib - ------------------------------------------------------------------- Fri Apr 7 16:47:24 UTC 2017 - jengelh@inai.de - Drop binutils requirement; the code using /usr/bin/strings has been dropped in openSUSE:Factory/openldap2 revision 112. -------------------------------------------------------------------- -Wed Mar 29 20:56:33 UTC 2017 - jengelh@inai.de - -- Work around ldconfig removing files [boo#1031464] -- Do not ignore failure to create user/groups - -------------------------------------------------------------------- -Thu Mar 23 15:06:27 UTC 2017 - jengelh@inai.de - -- Make libldap equivalent to libldap_r (like Debian) to avoid - crashes in threaded programs which unknowingly get libldap - inserted into their process image. [rh#1370065, boo#996551] - ------------------------------------------------------------------- Sat Feb 18 22:11:29 UTC 2017 - kukuk@suse.com diff --git a/openldap2.spec b/openldap2.spec index 3972104..d9acef4 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -57,6 +57,7 @@ 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 +Patch13: 0013-ITS-8692-let-back-sock-generate-increment-line.patch Source200: %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz Source201: %{name_ppolicy_check_module}.Makefile Source202: %{name_ppolicy_check_module}.conf @@ -182,8 +183,8 @@ OpenLDAP client utilities such as ldapadd, ldapsearch, ldapmodify. %package devel Summary: Libraries, Header Files and Documentation for OpenLDAP -# bug437293 Group: Development/Libraries/C and C++ +# bug437293 %ifarch ppc64 Obsoletes: openldap2-devel-64bit %endif @@ -248,6 +249,7 @@ gzip -k %{S:203} %patch8 -p1 %patch9 -p1 %patch11 -p1 +%patch13 -p1 cp %{SOURCE5} . # Move ppolicy check module and its Makefile into openldap-2.4/contrib/slapd-modules/ @@ -353,6 +355,7 @@ install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}/%{_sysconfdir}/sasl2/slapd.conf install -m 755 -d ${RPM_BUILD_ROOT}/var/lib/ldap chmod a+x ${RPM_BUILD_ROOT}/%{_libdir}/liblber.so* chmod a+x ${RPM_BUILD_ROOT}/%{_libdir}/libldap_r.so* +chmod a+x ${RPM_BUILD_ROOT}/%{_libdir}/libldap.so* install -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/usr/sbin/schema2ldif # Install ppolicy check module @@ -417,13 +420,6 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/man/man5/slapd-tcl.5 # Remove *.la files, libtool does not handle this correct rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la -# Make ldap_r the only copy in the system [rh#1370065], -# and provide only libldap.so for `gcc -lldap`, and otherwise -# not have any links [boo sr#501631] -rm -f "%{buildroot}/%{_libdir}"/libldap-2.4.so* -ln -fs libldap_r.so "%{buildroot}/%{_libdir}/libldap.so" -#ln -s libldap_r-2.4.so.2 "%{buildroot}/%{_libdir}/libldap-2.4.so.2" - %pre getent group ldap >/dev/null || /usr/sbin/groupadd -g 70 -o -r ldap getent passwd ldap >/dev/null || /usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/false -c "User for OpenLDAP" -d /var/lib/ldap ldap