From 079edf9d81c76a14df8115f4e567fdcddac419a824ffcdb9345b1f6d6a212d7a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 25 May 2022 10:53:16 +0000 Subject: [PATCH 1/2] Accepting request 978686 from home:stroeder:branches:network:ldap Update to release 2.6.2 OBS-URL: https://build.opensuse.org/request/show/978686 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=301 --- 0003-LDAPI-socket-location.dif | 22 +++++----------- openldap-2.6.1.tgz | 3 --- openldap-2.6.1.tgz.asc | 16 ------------ openldap-2.6.2.tgz | 3 +++ openldap-2.6.2.tgz.asc | 16 ++++++++++++ openldap2.changes | 47 ++++++++++++++++++++++++++++++++++ openldap2.spec | 2 +- 7 files changed, 73 insertions(+), 36 deletions(-) delete mode 100644 openldap-2.6.1.tgz delete mode 100644 openldap-2.6.1.tgz.asc create mode 100644 openldap-2.6.2.tgz create mode 100644 openldap-2.6.2.tgz.asc diff --git a/0003-LDAPI-socket-location.dif b/0003-LDAPI-socket-location.dif index e363d71..49e84e2 100644 --- a/0003-LDAPI-socket-location.dif +++ b/0003-LDAPI-socket-location.dif @@ -1,22 +1,12 @@ -From 73f1a31ec1d90872ac6f09ffac5adfb199eba963 Mon Sep 17 00:00:00 2001 -From: Ralf Haferkamp -Date: Wed, 16 Jun 2010 14:06:42 +0200 -Subject: LDAPI socket location - - -diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h -index 9dba666..b9780bc 100644 ---- a/include/ldap_defaults.h -+++ b/include/ldap_defaults.h -@@ -39,7 +39,7 @@ - #define LDAP_ENV_PREFIX "LDAP" +diff -ur openldap-2.6.2.orig/include/ldap_defaults.h openldap-2.6.2/include/ldap_defaults.h +--- openldap-2.6.2.orig/include/ldap_defaults.h 2022-05-04 16:55:23.000000000 +0200 ++++ openldap-2.6.2/include/ldap_defaults.h 2022-05-23 12:55:05.059335200 +0200 +@@ -40,7 +40,7 @@ /* default ldapi:// socket */ + #ifndef LDAPI_SOCK -#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" +#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi" + #endif /* - * SLAPD DEFINITIONS --- -1.7.10.4 - diff --git a/openldap-2.6.1.tgz b/openldap-2.6.1.tgz deleted file mode 100644 index 5a7d60f..0000000 --- a/openldap-2.6.1.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d576ea6962d7db8a2e2808574e8c257c15aef55f403a1fb5a0faf35de70e6f3 -size 6440418 diff --git a/openldap-2.6.1.tgz.asc b/openldap-2.6.1.tgz.asc deleted file mode 100644 index fd68d30..0000000 --- a/openldap-2.6.1.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmHphhsACgkQf2fV/Rzh -y86Bqg//QUzenlqoqJFCmcKT2FuyH0+pABKrQ5kK9MigWdkTQBIMFjxIEySm8kYb -wm55Sp+Q67TVqqgVY4kvNlmrvmey8ONlSXGhYK0Vr0rzb2uAMRD+GVGFfrDpERTY -QOe0rKUIxAN1tnOtnG4M3lY6PmdmpPTopdvkntSUG+/sQNBMURwtDx/xSrr+bgC3 -33HQKUjXo8N/XrZQrYDYhJXrphGKxbI7avU3O1gFnQA1P7wFzrWFcu/HStdyZAz/ -02jl7fmrNcY2U1N792Y6VfYqZ/Tnli503i5ABshkTK+eOmOHVvoVOqaDNXghAP/y -FmXnhNizGSJLqHWGfRSzXDUxTK9BpoqJZIafPUZOoAlvcyk2ok486d+NmcLxBq38 -ZeSmKJX/UPfzocXjZKnn/A5d0tLEcXtDis18huxqPqODGh7DFF+K60t+u0o9nwsJ -7yAB676Qz6NuwQ+7sZP617Cb41qyCTdd0FbwQKBaQXhe0RGUh+9QdI12QT+aQe5r -vD5bIcINhWX75n0Q/E5w6MmBvCPNBJ4LGDnwJUXjNMV3r1CF3WXk7sFOpt4xVbjj -s1c5aOR776Pm2yrHKWBPi8VkyJw85capIvdcXOqhP4c+Jwk88ee6h8OhofgXloFg -lU/Tcd41NA69MQDk2PBZ4FjM99zIQRz0pannomZXgL6QjYU11h8= -=R0hv ------END PGP SIGNATURE----- diff --git a/openldap-2.6.2.tgz b/openldap-2.6.2.tgz new file mode 100644 index 0000000..7f51361 --- /dev/null +++ b/openldap-2.6.2.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87 +size 6448362 diff --git a/openldap-2.6.2.tgz.asc b/openldap-2.6.2.tgz.asc new file mode 100644 index 0000000..c1a2b47 --- /dev/null +++ b/openldap-2.6.2.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmJyokQACgkQf2fV/Rzh +y85/Vg//UdnmWd0hZf7nNrTAe+nCuPoMn9b/P1vkIae3IKkcCqYq/rfN63f/rP+0 +JEQkiGcFT38KhK+4P7b2wm/CY7nqj6lL+WAv5k+yXRf8hgIEsr/grS5NhyRo02rc +GNBoA8Y1gTGRrDRYaahzSnJyJuG1gJY1/uE2zkbttOadzkFRCp8RW9KfIBeyR41w +v+01CQHciPwpzy9GLKWVZG/uhPB5m3U7d4TRZrFF6qUwVdn+pr38MB8wj/VqeBaK +MAIb89HwTRmPYhRLcmEWeOXHhpgbBtvfGj0BXM6CxrITxyQxfdRZSKhPoC5Qzi1G +N2Oj+55EekvsrLPblmgAeu+frR2OgcXEliwL4l+6exBLksQBhruSyhWJ/gYgiTen +28lCHDoW0MCjIcBtp82E5MUroIxu33+JEJyI+8tgfnOhHGHwp86q18SKKRwMJrOp +JnYqJROsuzRBs9wmzccFYvANrfp1DzMjmepV9EGVtygqRrU2Apw0B1yogXDnO2Ew +GR+arMv5XNs7LG6kExnkS8xu26ahxZzSjfsitJwOu8XXRRmdZWhPvxVAJViZ7Gt0 +/vDYBkDfn3aSV36XNRCk2/6s318jNHDAbJjSyjYJKnnud5IBiSsK56w/R0HRqlYu +jeDtTU2SEkF2VdBITFwOMpSdYZN9hNk90EIDEZl3RT/C2Ny+fYg= +=4XTT +-----END PGP SIGNATURE----- diff --git a/openldap2.changes b/openldap2.changes index 2af6e92..811aac3 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Mon May 23 10:51:45 UTC 2022 - Michael Ströder + +- Update to release 2.6.2 + +OpenLDAP 2.6.2 Release (2022/05/04) + Added libldap support for OpenSSL 3.0 (ITS#9436) + Added slapd support for OpenSSL 3.0 (ITS#9436) + Fixed ldapdelete to prune LDAP subentries (ITS#9737) + Fixed libldap to drop connection when non-LDAP data is received (ITS#9803) + Fixed libldap to allow newlines at end of included file (ITS#9811) + Fixed slapd slaptest conversion of olcLastBind (ITS#9808) + Fixed slapd to correctly init global_host earlier (ITS#9787) + Fixed slapd bconfig locking for cn=config replication (ITS#9584) + Fixed slapd usage of thread local counters (ITS#9789) + Fixed slapd to clear runqueue task correctly (ITS#9785) + Fixed slapd idletimeout handling (ITS#9820) + Fixed slapd syncrepl handling of new sessions (ITS#9584) + Fixed slapd to clear connections on bind (ITS#9799) + Fixed slapd to correctly advance connections index (ITS#9831) + Fixed slapd syncrepl ODSEE replication of unknown attr (ITS#9801) + Fixed slapd-asyncmeta memory leak in keepalive setting (ITS#9802) + Fixed slapd-ldap memory leak in keepalive setting (ITS#9802) + Fixed slapd-meta SEGV on config rewrite (ITS#9802) + Fixed slapd-meta ordering on config rewrite (ITS#9802) + Fixed slapd-meta memory leak in keepalive setting (ITS#9802) + Fixed slapd-monitor SEGV on shutdown (ITS#9809) + Fixed slapd-monitor crash when hitting sizelimit (ITS#9832) + Fixed slapd-sql to properly escape filter value (ITS#9815) + Added slapo-autoca support for OpenSSL 3.0 (ITS#9436) + Added slapo-otp support for OpenSSL 3.0 (ITS#9436) + Fixed slapo-dynlist dynamic group regression (ITS#9825) + Fixed slapo-pcache SEGV on shutdown (ITS#9809) + Fixed slapo-ppolicy operation handling to be consistent (ITS#9794) + Fixed slapo-translucent to correctly duplicate substring filters (ITS#9818) + Build Environment + Add ability to override default compile time paths (ITS#9675) + Fix compilation with certain versions of gcc (ITS#9790) + Fix compilation with openssl exclusions (ITS#9791) + Fix warnings from make jobserver (ITS#9788) + Contrib + Update ppm module to the 2.1 release (ITS#9814) + Documentation + admin26 Document new lloadd features (ITS#9780) + Fixed slapd.conf(5)/slapd-config(5) syncrepl sizelimit/timelimit documentation (ITS#9804) + Fixed slapd-sock(5) to clarify "sockresps result" behavior (ITS#8255) + ------------------------------------------------------------------- Thu May 12 02:48:19 UTC 2022 - William Brown diff --git a/openldap2.spec b/openldap2.spec index 2ee78f7..4352ec8 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -17,7 +17,7 @@ %define run_test_suite 0 -%define version_main 2.6.1 +%define version_main 2.6.2 %define slapdrundir %{_rundir}/slapd %define flavor @BUILD_FLAVOR@%{nil} %if "%flavor" == "contrib" From 02af4aa37ec415dc351a321f16d5dfb5a07c3ead35d5338ba0c213323252f282 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 25 May 2022 10:56:35 +0000 Subject: [PATCH 2/2] heed changelog syntax OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=302 --- openldap2.changes | 81 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/openldap2.changes b/openldap2.changes index 811aac3..b42dfc8 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -2,48 +2,45 @@ Mon May 23 10:51:45 UTC 2022 - Michael Ströder - Update to release 2.6.2 - -OpenLDAP 2.6.2 Release (2022/05/04) - Added libldap support for OpenSSL 3.0 (ITS#9436) - Added slapd support for OpenSSL 3.0 (ITS#9436) - Fixed ldapdelete to prune LDAP subentries (ITS#9737) - Fixed libldap to drop connection when non-LDAP data is received (ITS#9803) - Fixed libldap to allow newlines at end of included file (ITS#9811) - Fixed slapd slaptest conversion of olcLastBind (ITS#9808) - Fixed slapd to correctly init global_host earlier (ITS#9787) - Fixed slapd bconfig locking for cn=config replication (ITS#9584) - Fixed slapd usage of thread local counters (ITS#9789) - Fixed slapd to clear runqueue task correctly (ITS#9785) - Fixed slapd idletimeout handling (ITS#9820) - Fixed slapd syncrepl handling of new sessions (ITS#9584) - Fixed slapd to clear connections on bind (ITS#9799) - Fixed slapd to correctly advance connections index (ITS#9831) - Fixed slapd syncrepl ODSEE replication of unknown attr (ITS#9801) - Fixed slapd-asyncmeta memory leak in keepalive setting (ITS#9802) - Fixed slapd-ldap memory leak in keepalive setting (ITS#9802) - Fixed slapd-meta SEGV on config rewrite (ITS#9802) - Fixed slapd-meta ordering on config rewrite (ITS#9802) - Fixed slapd-meta memory leak in keepalive setting (ITS#9802) - Fixed slapd-monitor SEGV on shutdown (ITS#9809) - Fixed slapd-monitor crash when hitting sizelimit (ITS#9832) - Fixed slapd-sql to properly escape filter value (ITS#9815) - Added slapo-autoca support for OpenSSL 3.0 (ITS#9436) - Added slapo-otp support for OpenSSL 3.0 (ITS#9436) - Fixed slapo-dynlist dynamic group regression (ITS#9825) - Fixed slapo-pcache SEGV on shutdown (ITS#9809) - Fixed slapo-ppolicy operation handling to be consistent (ITS#9794) - Fixed slapo-translucent to correctly duplicate substring filters (ITS#9818) - Build Environment - Add ability to override default compile time paths (ITS#9675) - Fix compilation with certain versions of gcc (ITS#9790) - Fix compilation with openssl exclusions (ITS#9791) - Fix warnings from make jobserver (ITS#9788) - Contrib - Update ppm module to the 2.1 release (ITS#9814) - Documentation - admin26 Document new lloadd features (ITS#9780) - Fixed slapd.conf(5)/slapd-config(5) syncrepl sizelimit/timelimit documentation (ITS#9804) - Fixed slapd-sock(5) to clarify "sockresps result" behavior (ITS#8255) + * Added support for OpenSSL 3.0 (ITS#9436) + * Fixed ldapdelete to prune LDAP subentries (ITS#9737) + * Fixed libldap to drop connection when non-LDAP data is + received (ITS#9803) + * Fixed libldap to allow newlines at end of included file + (ITS#9811) + * Fixed slapd slaptest conversion of olcLastBind (ITS#9808) + * Fixed slapd to correctly init global_host earlier (ITS#9787) + * Fixed slapd bconfig locking for cn=config replication + (ITS#9584) + * Fixed slapd usage of thread local counters (ITS#9789) + * Fixed slapd to clear runqueue task correctly (ITS#9785) + * Fixed slapd idletimeout handling (ITS#9820) + * Fixed slapd syncrepl handling of new sessions (ITS#9584) + * Fixed slapd to clear connections on bind (ITS#9799) + * Fixed slapd to correctly advance connections index (ITS#9831) + * Fixed slapd syncrepl ODSEE replication of unknown attr + (ITS#9801) + * Fixed slapd-asyncmeta memory leak in keepalive setting, + slapd-ldap memory leak in keepalive setting, SEGV on config + rewrite, ordering on config rewrite, memory leak in keepalive + setting (ITS#9802) + * Fixed slapo-pcache SEGV & slapd-monitor SEGV on shutdown + (ITS#9809) + * Fixed slapd-monitor crash when hitting sizelimit (ITS#9832) + * Fixed slapd-sql to properly escape filter value (ITS#9815) + * Fixed slapo-dynlist dynamic group regression (ITS#9825) + * Fixed slapo-ppolicy operation handling to be consistent + (ITS#9794) + * Fixed slapo-translucent to correctly duplicate substring + filters (ITS#9818) + * Contrib: + * Update ppm module to the 2.1 release (ITS#9814) + * Documentation: + * admin26: Document new lloadd features (ITS#9780) + * Fixed slapd.conf(5)/slapd-config(5) syncrepl + sizelimit/timelimit documentation (ITS#9804) + * Fixed slapd-sock(5) to clarify "sockresps result" behavior + (ITS#8255) ------------------------------------------------------------------- Thu May 12 02:48:19 UTC 2022 - William Brown