From 57eba7825ecfcfc5c67de109122359bc9e10f4f426e430e84286d317bbe540af Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 15 Feb 2010 11:12:23 +0000 Subject: [PATCH 1/4] 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 From c9b485ddb118057a44a2c66d44e6e965f27174160c7a26d1b4ba5bcace3ee479 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 16 Feb 2010 09:14:35 +0000 Subject: [PATCH 2/4] slightly reworked gcc 4.5 fortify patch (and renamed it) OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=30 --- openldap2-client.spec | 4 ++-- openldap2.spec | 4 ++-- openldap-2.4.21.dif => slapd-back-hdb-fortify.dif | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename openldap-2.4.21.dif => slapd-back-hdb-fortify.dif (62%) diff --git a/openldap2-client.spec b/openldap2-client.spec index 65f155b..792bf96 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -56,9 +56,9 @@ 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 -Patch8: openldap-2.4.21.dif Patch11: slapd-bconfig-del-db.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif @@ -175,11 +175,11 @@ Authors: %patch2 %patch3 %patch4 +%patch5 %patch6 %if %suse_version > 920 %patch7 %endif -%patch8 %patch11 %if %suse_version == 1100 %patch200 -p1 diff --git a/openldap2.spec b/openldap2.spec index 67558d0..c2dfffd 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -56,9 +56,9 @@ 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 -Patch8: openldap-2.4.21.dif Patch11: slapd-bconfig-del-db.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif @@ -175,11 +175,11 @@ Authors: %patch2 %patch3 %patch4 +%patch5 %patch6 %if %suse_version > 920 %patch7 %endif -%patch8 %patch11 %if %suse_version == 1100 %patch200 -p1 diff --git a/openldap-2.4.21.dif b/slapd-back-hdb-fortify.dif similarity index 62% rename from openldap-2.4.21.dif rename to slapd-back-hdb-fortify.dif index 3efdff4..6dcea6e 100644 --- a/openldap-2.4.21.dif +++ b/slapd-back-hdb-fortify.dif @@ -1,13 +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 +--- 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, strlen (BEI(e)->bei_nrdn.bv_val) + 1); ++ 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 ); From e7deb529434ced7d0def7320d411e7ce23cdab220646cb8bbc62c1cd8f125657 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Feb 2010 15:46:11 +0000 Subject: [PATCH 3/4] checked in (request 32670) OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=31 --- openldap2-client.changes | 5 ----- openldap2-client.spec | 6 ++---- openldap2.changes | 5 ----- openldap2.spec | 2 -- slapd-back-hdb-fortify.dif | 13 ------------- 5 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 slapd-back-hdb-fortify.dif diff --git a/openldap2-client.changes b/openldap2-client.changes index dee135f..3608616 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 792bf96..469b0bc 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2 (Version 2.4.21) +# spec file for package openldap2-client (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 @@ -56,7 +56,6 @@ 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 @@ -175,7 +174,6 @@ Authors: %patch2 %patch3 %patch4 -%patch5 %patch6 %if %suse_version > 920 %patch7 diff --git a/openldap2.changes b/openldap2.changes index dee135f..3608616 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 c2dfffd..c7a86e9 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -56,7 +56,6 @@ 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 @@ -175,7 +174,6 @@ 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 deleted file mode 100644 index 6dcea6e..0000000 --- a/slapd-back-hdb-fortify.dif +++ /dev/null @@ -1,13 +0,0 @@ -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 ); 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 4/4] 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 );