From 37510db6361ba8dbb77ed8f7f790dbfdf690432d15c44f71f72ee181adef95e8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 15 Jul 2022 07:53:50 +0000 Subject: [PATCH 1/2] Accepting request 989267 from home:stroeder:branches:network:ldap update to 2.6.3 OBS-URL: https://build.opensuse.org/request/show/989267 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=304 --- ...rror-handling-in-new-ctx-when-global.patch | 25 ------------ openldap-2.6.2.tgz | 3 -- openldap-2.6.2.tgz.asc | 16 -------- openldap-2.6.3.tgz | 3 ++ openldap-2.6.3.tgz.asc | 16 ++++++++ openldap2.changes | 39 +++++++++++++++++++ openldap2.spec | 4 +- 7 files changed, 59 insertions(+), 47 deletions(-) delete mode 100644 0017-Resolve-error-handling-in-new-ctx-when-global.patch delete mode 100644 openldap-2.6.2.tgz delete mode 100644 openldap-2.6.2.tgz.asc create mode 100644 openldap-2.6.3.tgz create mode 100644 openldap-2.6.3.tgz.asc diff --git a/0017-Resolve-error-handling-in-new-ctx-when-global.patch b/0017-Resolve-error-handling-in-new-ctx-when-global.patch deleted file mode 100644 index 6426f8c..0000000 --- a/0017-Resolve-error-handling-in-new-ctx-when-global.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 43778f8b24f86af411fb5ed6df69851459abe561 Mon Sep 17 00:00:00 2001 -From: William Brown -Date: Thu, 12 May 2022 12:46:57 +1000 -Subject: [PATCH] Resolve error handling in new ctx when global - ---- - libraries/libldap/tls2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c -index 6d36db1984..f18992e781 100644 ---- a/libraries/libldap/tls2.c -+++ b/libraries/libldap/tls2.c -@@ -989,7 +989,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg ) - lo->ldo_tls_ctx = NULL; - errmsg[0] = 0; - rc = ldap_int_tls_init_ctx( lo, *(int *)arg, errmsg ); -- if ( rc && errmsg[0] ) { -+ if ( ld && rc && errmsg[0] ) { - if ( ld->ld_error ) - LDAP_FREE( ld->ld_error ); - ld->ld_error = LDAP_STRDUP( errmsg ); --- -2.36.1 - diff --git a/openldap-2.6.2.tgz b/openldap-2.6.2.tgz deleted file mode 100644 index 7f51361..0000000 --- a/openldap-2.6.2.tgz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index c1a2b47..0000000 --- a/openldap-2.6.2.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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/openldap-2.6.3.tgz b/openldap-2.6.3.tgz new file mode 100644 index 0000000..5066c48 --- /dev/null +++ b/openldap-2.6.3.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46 +size 6474169 diff --git a/openldap-2.6.3.tgz.asc b/openldap-2.6.3.tgz.asc new file mode 100644 index 0000000..e3baeef --- /dev/null +++ b/openldap-2.6.3.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmLQYoAACgkQf2fV/Rzh +y846bA/8D5jpa0lCiKy5jAsIp5i2PU2BaxItZ8Y45PaHtxQkCmqEGadV/WzTXAzW +TywO12MjClYLK5XkWEOu2XvCoGRIkD36JvK0WUdO5grk3ZhT9d0xgPvW1WshVm6W +R1oZuP3GReGQQNTw4EcRaWc4zH1qWfbhqp7yj2556BLO1ume8ANdGKiWnVrxQFwG +KYqW9EsSku0of5nAhLeKXD+qh2i6EoBwlNpsisISVcmXzCZw9N7jwb1m3ysBQ43i +/2TUICxDWsUi2EDoEX3qEEFuvKB1NAPbdUi2z4chZyUGeqyHqg/Z8QSDm1FB/oyo +9IxytTDY8q+8n4GvAIsyCC2QgtfB+kmr+RufLEgqbEZD+W84CqwdqxRTxjAzeeV+ +T8duoeU97zlp4TnBA69QtSQILMpdvd5buDsGhvctP1AdqImhAia7jpeb3ZJTwl/o +dsD8BAATiZuGj0RABdRwezuLVgmwoa41yCRcTVMTR8eCvHVRvTPO4tKkxYozxmMt +jWKG4sVAGTUPN5USs30PhjTBJp7Md1B9gNwNq2zpgHzafN0Et5i47mtwB9oMfdbO +Z063cT4iDbW+kByXttgOB+zIbnyvuPGHh6qAhsTiEBcJrifdlF5GCPF9YcbOcIOI +hHz8Nujd812xNnphd9YvAPpDJ9Qx25KwVYFrAe+N9eNg3zJZmlY= +=T2r6 +-----END PGP SIGNATURE----- diff --git a/openldap2.changes b/openldap2.changes index b42dfc8..6f90fa1 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Thu Jul 14 21:22:41 UTC 2022 - Michael Ströder + +- update to 2.6.3 +- removed obsolete 0017-Resolve-error-handling-in-new-ctx-when-global.patch + +OpenLDAP 2.6.3 Release (2022/07/14) + Fixed librewrite declaration of calloc (ITS#9841) + Fixed libldap to check for NULL ld (ITS#9157) + Fixed libldap memory leaks (ITS#9876) + Fixed lloadd to correctly tag Notice of Disconnection (ITS#9856) + Fixed slapd kqueue support (ITS#9847) + Fixed slapd delta-sync DN leak on ADD ops (ITS#9866) + Fixed slapd replication with back-glue (ITS#9868) + Fixed slapd lastbind replication with chaining (ITS#9863) + Fixed slapd-ldap to correctly set authzid (ITS#9863) + Fixed slapd-mdb to check for stale readers on MDB_READERS_FULL (ITS#7165) + Fixed slapd-mdb indexer task with replicated config (ITS#9858) + Fixed slapo-accesslog onetime memory leak (ITS#9864) + Fixed slapo-ppolicy interaction with slapo-rwm (ITS#9871) + Fixed slapo-rwm to handle escaping special characters (ITS#9817) + Fixed slapo-syncprov memory leaks (ITS#9867) + Fixed slapo-syncprov fallback in delta-sync mode (ITS#9823) + Fixed slapo-unique to not release NULL entry (ITS#8245) + Build Environment + Added slapd-watcher -c contextDN option (ITS#9865) + Fixed parallel builds (ITS#9840) + Fixed test020 to skip back-wt (ITS#9859) + Fixed slapd-watcher SID handling with single URI (ITS#9850) + Fixed test043 with workaround for ITS#9878 + Contrib + Added slapo-emptyds contrib module (ITS#8882) + Added slapo-ciboolean contrib module (ITS#9855) + Fixed slapo-autogroup backwards compat (ITS#9020) + Update ppm module to the 2.2 release (ITS#9846) + Documentation + Fixed ldap_get_option(3) to clarify ldap_get/set_option restrictions (ITS#9824) + Fixed slapd-ldap(5),slapd-meta(5) missing bold tag on authz parameter (ITS#9872) + ------------------------------------------------------------------- Mon May 23 10:51:45 UTC 2022 - Michael Ströder diff --git a/openldap2.spec b/openldap2.spec index 4352ec8..e94685d 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -17,7 +17,7 @@ %define run_test_suite 0 -%define version_main 2.6.2 +%define version_main 2.6.3 %define slapdrundir %{_rundir}/slapd %define flavor @BUILD_FLAVOR@%{nil} %if "%flavor" == "contrib" @@ -56,7 +56,6 @@ Patch3: 0003-LDAPI-socket-location.dif Patch5: 0005-pie-compile.dif Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch Patch16: 0016-Clear-shared-key-only-in-close-function.patch -Patch17: 0017-Resolve-error-handling-in-new-ctx-when-global.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: argon2-devel @@ -244,7 +243,6 @@ Servers %patch5 -p1 %patch8 -p1 %patch16 -p1 -%patch17 -p1 cp %{SOURCE5} . %build From 5c86a602e3ec9e167f50e696e2192eb6a2eb7b5aa16b2fed88de179f1f2fb2b1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 15 Jul 2022 07:57:41 +0000 Subject: [PATCH 2/2] trim changelog of non-user visible parts (BSD, build system) and heed syntax requirements OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=305 --- openldap2.changes | 54 ++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/openldap2.changes b/openldap2.changes index 6f90fa1..fc7f6da 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,41 +1,27 @@ ------------------------------------------------------------------- Thu Jul 14 21:22:41 UTC 2022 - Michael Ströder -- update to 2.6.3 - removed obsolete 0017-Resolve-error-handling-in-new-ctx-when-global.patch - -OpenLDAP 2.6.3 Release (2022/07/14) - Fixed librewrite declaration of calloc (ITS#9841) - Fixed libldap to check for NULL ld (ITS#9157) - Fixed libldap memory leaks (ITS#9876) - Fixed lloadd to correctly tag Notice of Disconnection (ITS#9856) - Fixed slapd kqueue support (ITS#9847) - Fixed slapd delta-sync DN leak on ADD ops (ITS#9866) - Fixed slapd replication with back-glue (ITS#9868) - Fixed slapd lastbind replication with chaining (ITS#9863) - Fixed slapd-ldap to correctly set authzid (ITS#9863) - Fixed slapd-mdb to check for stale readers on MDB_READERS_FULL (ITS#7165) - Fixed slapd-mdb indexer task with replicated config (ITS#9858) - Fixed slapo-accesslog onetime memory leak (ITS#9864) - Fixed slapo-ppolicy interaction with slapo-rwm (ITS#9871) - Fixed slapo-rwm to handle escaping special characters (ITS#9817) - Fixed slapo-syncprov memory leaks (ITS#9867) - Fixed slapo-syncprov fallback in delta-sync mode (ITS#9823) - Fixed slapo-unique to not release NULL entry (ITS#8245) - Build Environment - Added slapd-watcher -c contextDN option (ITS#9865) - Fixed parallel builds (ITS#9840) - Fixed test020 to skip back-wt (ITS#9859) - Fixed slapd-watcher SID handling with single URI (ITS#9850) - Fixed test043 with workaround for ITS#9878 - Contrib - Added slapo-emptyds contrib module (ITS#8882) - Added slapo-ciboolean contrib module (ITS#9855) - Fixed slapo-autogroup backwards compat (ITS#9020) - Update ppm module to the 2.2 release (ITS#9846) - Documentation - Fixed ldap_get_option(3) to clarify ldap_get/set_option restrictions (ITS#9824) - Fixed slapd-ldap(5),slapd-meta(5) missing bold tag on authz parameter (ITS#9872) +- update to 2.6.3 + * Fixed librewrite declaration of calloc (ITS#9841) + * Fixed libldap to check for NULL ld (ITS#9157) + * Fixed libldap memory leaks (ITS#9876) + * Fixed lloadd to correctly tag Notice of Disconnection (ITS#9856) + * Fixed slapd delta-sync DN leak on ADD ops (ITS#9866) + * Fixed slapd replication with back-glue (ITS#9868) + * Fixed slapd lastbind replication with chaining (ITS#9863) + * Fixed slapd-ldap to correctly set authzid (ITS#9863) + * Fixed slapd-mdb to check for stale readers on + MDB_READERS_FULL (ITS#7165) + * Fixed slapd-mdb indexer task with replicated config (ITS#9858) + * Fixed slapo-accesslog onetime memory leak (ITS#9864) + * Fixed slapo-ppolicy interaction with slapo-rwm (ITS#9871) + * Fixed slapo-rwm to handle escaping special characters (ITS#9817) + * Fixed slapo-syncprov memory leaks (ITS#9867) + * Fixed slapo-syncprov fallback in delta-sync mode (ITS#9823) + * Fixed slapo-unique to not release NULL entry (ITS#8245) + * doc: Fixed ldap_get_option(3) to clarify ldap_get/set_option + restrictions (ITS#9824) ------------------------------------------------------------------- Mon May 23 10:51:45 UTC 2022 - Michael Ströder