From f0e23935fdf2e9fd6899dec94c017aac23bf0474ac4c01d0aad30696a9d1484c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Feb 2010 15:46:12 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/openldap2 revision 59.0 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=b915c7bac61e52fd73a9200d8ff350a3 --- openldap2-client.changes | 5 +++++ openldap2-client.spec | 4 +++- openldap2.changes | 5 +++++ openldap2.spec | 4 +++- slapd-back-hdb-fortify.dif | 13 +++++++++++++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 slapd-back-hdb-fortify.dif 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..b4078ed 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -28,7 +28,7 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.21 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -56,6 +56,7 @@ Patch1: openldap2.dif Patch2: slapd_conf.dif Patch3: ldap_conf.dif Patch4: ldapi_url.dif +Patch5: slapd-back-hdb-fortify.dif Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch11: slapd-bconfig-del-db.dif @@ -174,6 +175,7 @@ Authors: %patch2 %patch3 %patch4 +%patch5 %patch6 %if %suse_version > 920 %patch7 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..764bc52 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -28,7 +28,7 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.21 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -56,6 +56,7 @@ Patch1: openldap2.dif Patch2: slapd_conf.dif Patch3: ldap_conf.dif Patch4: ldapi_url.dif +Patch5: slapd-back-hdb-fortify.dif Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch11: slapd-bconfig-del-db.dif @@ -174,6 +175,7 @@ Authors: %patch2 %patch3 %patch4 +%patch5 %patch6 %if %suse_version > 920 %patch7 diff --git a/slapd-back-hdb-fortify.dif b/slapd-back-hdb-fortify.dif new file mode 100644 index 0000000..6dcea6e --- /dev/null +++ b/slapd-back-hdb-fortify.dif @@ -0,0 +1,13 @@ +Index: servers/slapd/back-bdb/dn2id.c +=================================================================== +--- servers/slapd/back-bdb/dn2id.c.orig ++++ servers/slapd/back-bdb/dn2id.c +@@ -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, BEI(e)->bei_nrdn.bv_len + 1); + data.data = d; + + rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );