From 57eba7825ecfcfc5c67de109122359bc9e10f4f426e430e84286d317bbe540af Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 15 Feb 2010 11:12:23 +0000 Subject: [PATCH] Accepting request 32500 from home:rguenther:branches:network:ldap Copy from home:rguenther:branches:network:ldap/openldap2 via accept of submit request 32500 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/32500 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=29 --- openldap-2.4.21.dif | 13 +++++++++++++ openldap2-client.changes | 5 +++++ openldap2-client.spec | 6 ++++-- openldap2.changes | 5 +++++ openldap2.spec | 2 ++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 openldap-2.4.21.dif diff --git a/openldap-2.4.21.dif b/openldap-2.4.21.dif new file mode 100644 index 0000000..3efdff4 --- /dev/null +++ b/openldap-2.4.21.dif @@ -0,0 +1,13 @@ +Index: servers/slapd/back-bdb/dn2id.c +=================================================================== +--- servers/slapd/back-bdb/dn2id.c.orig 2009-06-19 23:55:57.000000000 +0200 ++++ servers/slapd/back-bdb/dn2id.c 2010-02-13 22:39:18.000000000 +0100 +@@ -676,7 +676,7 @@ hdb_dn2id_delete( + d->nrdnlen[0] = (BEI(e)->bei_nrdn.bv_len >> 8) | 0x80; + dlen[0] = d->nrdnlen[0]; + dlen[1] = d->nrdnlen[1]; +- strcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val ); ++ memcpy ( d->nrdn, BEI(e)->bei_nrdn.bv_val, strlen (BEI(e)->bei_nrdn.bv_val) + 1); + data.data = d; + + rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags ); diff --git a/openldap2-client.changes b/openldap2-client.changes index 3608616..dee135f 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de + +- Add fix for stricter fortification checks of GCC 4.5. + ------------------------------------------------------------------- Thu Jan 7 15:47:20 UTC 2010 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 469b0bc..65f155b 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.21) +# spec file for package openldap2 (Version 2.4.21) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ %define run_test_suite 1 -Name: openldap2-client +Name: openldap2-client BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel %if %sles_version == 9 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel @@ -58,6 +58,7 @@ Patch3: ldap_conf.dif Patch4: ldapi_url.dif Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif +Patch8: openldap-2.4.21.dif Patch11: slapd-bconfig-del-db.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif @@ -178,6 +179,7 @@ Authors: %if %suse_version > 920 %patch7 %endif +%patch8 %patch11 %if %suse_version == 1100 %patch200 -p1 diff --git a/openldap2.changes b/openldap2.changes index 3608616..dee135f 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de + +- Add fix for stricter fortification checks of GCC 4.5. + ------------------------------------------------------------------- Thu Jan 7 15:47:20 UTC 2010 - rhafer@novell.com diff --git a/openldap2.spec b/openldap2.spec index c7a86e9..67558d0 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -58,6 +58,7 @@ Patch3: ldap_conf.dif Patch4: ldapi_url.dif Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif +Patch8: openldap-2.4.21.dif Patch11: slapd-bconfig-del-db.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif @@ -178,6 +179,7 @@ Authors: %if %suse_version > 920 %patch7 %endif +%patch8 %patch11 %if %suse_version == 1100 %patch200 -p1