From af3b230ba5b0dc419db905fb3097d4f89888d93dfd032b38a0cfa08abf8087dd Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 26 Oct 2012 14:27:11 +0000 Subject: [PATCH] Accepting request 139452 from home:rhafer:branches:network:ldap update to 2.4.33 OBS-URL: https://build.opensuse.org/request/show/139452 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=92 --- 0001-build-adjustments.dif | 6 ++-- 0002-slapd.conf.dif | 4 +-- 0003-LDAPI-socket-location.dif | 4 +-- 0004-libldap-use-gethostbyname_r.dif | 8 ++--- 0005-pie-compile.dif | 17 ++++++++-- 0006-No-Build-date-and-time-in-binaries.dif | 4 +-- 0007-Recover-on-DB-version-change.dif | 4 +-- openldap-2.4.31.tgz | 3 -- openldap-2.4.33.tgz | 3 ++ openldap2-client.changes | 35 +++++++++++++++++++++ openldap2-client.spec | 6 ++-- openldap2.changes | 35 +++++++++++++++++++++ openldap2.spec | 6 ++-- 13 files changed, 109 insertions(+), 26 deletions(-) delete mode 100644 openldap-2.4.31.tgz create mode 100644 openldap-2.4.33.tgz diff --git a/0001-build-adjustments.dif b/0001-build-adjustments.dif index 93bbdb7..f7327da 100644 --- a/0001-build-adjustments.dif +++ b/0001-build-adjustments.dif @@ -1,4 +1,4 @@ -From 33085e6724a0aa007c71a210674eca78993c10a6 Mon Sep 17 00:00:00 2001 +From 39e5cc1cbae0f7c64ba242357a5d50f23a8475ba Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:04:07 +0200 Subject: build-adjustments @@ -20,7 +20,7 @@ index 14e291e..633c9a4 100644 sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@$(ldap_subdir) diff --git a/configure.in b/configure.in -index 5d7d475..f12463e 100644 +index 792cf0c..6c357ee 100644 --- a/configure.in +++ b/configure.in @@ -69,7 +69,9 @@ dnl Determine host platform @@ -35,5 +35,5 @@ index 5d7d475..f12463e 100644 AC_SUBST(VERSION)dnl AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package) -- -1.7.7 +1.7.10.4 diff --git a/0002-slapd.conf.dif b/0002-slapd.conf.dif index aa6402b..e05f799 100644 --- a/0002-slapd.conf.dif +++ b/0002-slapd.conf.dif @@ -1,4 +1,4 @@ -From cf525874a84af16420dc8a1d0b3cd3ba5b3d6734 Mon Sep 17 00:00:00 2001 +From a8be17d4a1db1c6ee24b328f3f34e21ccb02ca3f Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:05:49 +0200 Subject: slapd.conf @@ -93,5 +93,5 @@ index 4938b85..9caf292 100644 # Indices to maintain index objectClass eq -- -1.7.7 +1.7.10.4 diff --git a/0003-LDAPI-socket-location.dif b/0003-LDAPI-socket-location.dif index f94ffea..e363d71 100644 --- a/0003-LDAPI-socket-location.dif +++ b/0003-LDAPI-socket-location.dif @@ -1,4 +1,4 @@ -From 1fe058522630506c700e94f38593760b2034db75 Mon Sep 17 00:00:00 2001 +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 @@ -18,5 +18,5 @@ index 9dba666..b9780bc 100644 /* * SLAPD DEFINITIONS -- -1.7.7 +1.7.10.4 diff --git a/0004-libldap-use-gethostbyname_r.dif b/0004-libldap-use-gethostbyname_r.dif index 2c07e6e..cc01842 100644 --- a/0004-libldap-use-gethostbyname_r.dif +++ b/0004-libldap-use-gethostbyname_r.dif @@ -1,11 +1,11 @@ -From 4996b9e093e345f49acd5d081a9db5984f6fd88e Mon Sep 17 00:00:00 2001 +From a36c907fe49e96a304c294a0d46b34c374c29c7f Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:08:03 +0200 Subject: libldap use gethostbyname_r diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c -index 85f13fc..60f640a 100644 +index 3510aec..666cdad 100644 --- a/libraries/libldap/util-int.c +++ b/libraries/libldap/util-int.c @@ -52,7 +52,7 @@ extern int h_errno; @@ -17,7 +17,7 @@ index 85f13fc..60f640a 100644 # undef HAVE_GETHOSTBYADDR_R #else -@@ -312,7 +312,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod) +@@ -317,7 +317,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod) #define BUFSTART (1024-32) #define BUFMAX (32*1024-32) @@ -27,5 +27,5 @@ index 85f13fc..60f640a 100644 #if !(defined(HAVE_GETHOSTBYNAME_R) && defined(HAVE_GETHOSTBYADDR_R)) -- -1.7.7 +1.7.10.4 diff --git a/0005-pie-compile.dif b/0005-pie-compile.dif index 2192909..84b480b 100644 --- a/0005-pie-compile.dif +++ b/0005-pie-compile.dif @@ -1,4 +1,4 @@ -From 978c3da29d90686bf0516f2ab01da4b7eb85b2d9 Mon Sep 17 00:00:00 2001 +From 60edf86023da15db7be5935c85826e16d2b78648 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 12 Nov 2010 09:39:11 +0100 Subject: pie compile @@ -87,6 +87,19 @@ index 5e4abc1..1e8c454 100644 mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(yes_DEFS) +diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in +index 9b01d2a..e37520a 100644 +--- a/servers/slapd/back-mdb/Makefile.in ++++ b/servers/slapd/back-mdb/Makefile.in +@@ -34,6 +34,8 @@ MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/libmdb + BUILD_OPT = "--enable-mdb" + BUILD_MOD = @BUILD_MDB@ + ++PIE_CFLAGS="-fPIE" ++ + mod_DEFS = -DSLAPD_IMPORT + MOD_DEFS = $(@BUILD_MDB@_DEFS) + MOD_LIBS = $(MDB_LIBS) diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in index 9aecdbc..11c962c 100644 --- a/servers/slapd/back-monitor/Makefile.in @@ -114,5 +127,5 @@ index 90ea4b3..ff2f429 100644 MOD_DEFS = $(@BUILD_RELAY@_DEFS) -- -1.7.7 +1.7.10.4 diff --git a/0006-No-Build-date-and-time-in-binaries.dif b/0006-No-Build-date-and-time-in-binaries.dif index cef2d8a..6120a7e 100644 --- a/0006-No-Build-date-and-time-in-binaries.dif +++ b/0006-No-Build-date-and-time-in-binaries.dif @@ -1,4 +1,4 @@ -From d5e870fe667d78a8915560eef687955e706afe33 Mon Sep 17 00:00:00 2001 +From a7a37111026ccb9fddfeedc22606b80d8d75557f Mon Sep 17 00:00:00 2001 From: Cristian Rodriguez Date: Tue, 5 Oct 2010 13:59:40 +0200 Subject: No Build date and time in binaries @@ -29,5 +29,5 @@ index 3fd9565..dd9a998 100755 __EOF__ -- -1.7.7 +1.7.10.4 diff --git a/0007-Recover-on-DB-version-change.dif b/0007-Recover-on-DB-version-change.dif index dbe0143..37f109b 100644 --- a/0007-Recover-on-DB-version-change.dif +++ b/0007-Recover-on-DB-version-change.dif @@ -1,4 +1,4 @@ -From 193eec1ad2033b23e5ee6497533b8f4055450d41 Mon Sep 17 00:00:00 2001 +From 895fa6d9b49344e1a92f7df3ed65458519e22f98 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 5 Oct 2010 14:20:22 +0200 Subject: Recover on DB version change @@ -25,5 +25,5 @@ index ac5a6d5..fea5cb4 100644 /* Regular open failed, probably a missing shm environment. * Start over, do a recovery. -- -1.7.7 +1.7.10.4 diff --git a/openldap-2.4.31.tgz b/openldap-2.4.31.tgz deleted file mode 100644 index 0de3cf6..0000000 --- a/openldap-2.4.31.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6 -size 5444236 diff --git a/openldap-2.4.33.tgz b/openldap-2.4.33.tgz new file mode 100644 index 0000000..5f518ea --- /dev/null +++ b/openldap-2.4.33.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81e9eca20f17a69a5d15ebc4c66a323106da4f4f80a32105bc7cdea333aca14c +size 5463850 diff --git a/openldap2-client.changes b/openldap2-client.changes index 80a4ce6..a9eca20 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Fri Oct 26 12:38:46 UTC 2012 - rhafer@suse.com + +- enabled mdb backend +- Update to 2.4.33 + * Added slapd-meta cn=config support + * Fixed slapd alock handling on Windows (ITS#7361) + * Fixed slapd acl handling with zero-length values (ITS#7350) + * Fixed slapd syncprov to not reference ops inside a lock (ITS#7172) + * Fixed slapd delta-syncrepl MMR with large attribute values (ITS#7354) + * Fixed slapd slapd_rw_destroy function (ITS#7390) + * Fixed slapd-ldap idassert bind handling (ITS#7403) + * Fixed slapo-constraint with multiple modifications (ITS#7168) + Changes in 2.4.32: + * Added slappasswd loadable module support (ITS#7284) + * Fixed tools to not clobber SASL_NOCANON (ITS#7271) + * Fixed libldap function declarations (ITS#7293) + * Fixed libldap double free (ITS#7270) + * Fixed libldap debug level setting (ITS#7290) + * Fixed libldap gettime() regression (ITS#6262) + * Fixed libldap sasl handling (ITS#7118, ITS#7133) + * Fixed libldap to correctly free socket with TLS (ITS#7241) + * Fixed slapd config index renumbering (ITS#6987) + * Fixed slapd duplicate error response (ITS#7076) + * Fixed slapd parsing of PermissiveModify control (ITS#7298) + * Fixed slapd-bdb/hdb cache hang under high load (ITS#7222) + * Fixed slapd-bdb/hdb alias checking (ITS#7303) + * Fixed slapd-bdb/hdb olcDbConfig changes work immediately (ITS#7338) + * Fixed slapd-ldap to encode user DN during password change (ITS#7319) + * Fixed slapd-ldap assertion when proxying to MS AD (ITS#6851) + * Fixed slapd-ldap monitoring (ITS#7182, ITS#7225) + * Fixed slapd-perl panic (ITS#7325) + * Fixed slapo-accesslog memory leaks with sync replication (ITS#7292) + * Fixed slapo-syncprov memory leaks with sync replication (ITS#7292) + ------------------------------------------------------------------- Fri Oct 26 08:44:23 UTC 2012 - coolo@suse.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 6ca2b92..4217040 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -31,7 +31,7 @@ BuildRequires: -libopenssl-devel BuildRequires: -pwdutils BuildRequires: openssl-devel %endif -Version: 2.4.31 +Version: 2.4.33 Release: 0 Url: http://www.openldap.org %if "%{name}" == "openldap2" @@ -200,7 +200,7 @@ export STRIP="" --enable-monitor=yes \ --enable-perl=mod \ --enable-sql=mod \ - --enable-mdb=no \ + --enable-mdb=yes \ --enable-slp \ --enable-overlays=mod \ --enable-syncprov=yes \ @@ -313,7 +313,6 @@ install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin %endif rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5 -rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-mdb.5 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-ndb.5 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-null.5 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-passwd.5 @@ -371,6 +370,7 @@ cat >openldap2.filelist <openldap2.filelist <