From 774d0f624b170dc35b56e0a17c6413cba96b0b2976fec9442d50fbdaf7a0a200 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 19 Jun 2009 23:13:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=50 --- openldap-2.3.37.dif | 15 +++++++++++++++ openldap2-client.changes | 6 ++++++ openldap2-client.spec | 28 +++++++++++++++++----------- openldap2.changes | 6 ++++++ openldap2.spec | 15 +++++++++------ 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/openldap-2.3.37.dif b/openldap-2.3.37.dif index 94639f1..6cbc4a5 100644 --- a/openldap-2.3.37.dif +++ b/openldap-2.3.37.dif @@ -343,3 +343,18 @@ Index: include/ldap_pvt_thread.h #endif #endif /* !LDAP_PVT_THREAD_H_DONE */ +Index: libraries/liblutil/getpeereid.c +=================================================================== +--- libraries/liblutil/getpeereid.c.orig ++++ libraries/liblutil/getpeereid.c +@@ -13,7 +13,9 @@ + * top-level directory of the distribution or, alternatively, at + * . + */ +- ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE 1 /* Needed for glibc struct ucred */ ++#endif + #include "portable.h" + + #ifndef HAVE_GETPEEREID diff --git a/openldap2-client.changes b/openldap2-client.changes index 3d67067..e2e4592 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 15 12:12:17 CEST 2009 - rhafer@novell.com + +- Fixed complilation with newer glibc (2.3.X release needs + GNU_SOURCE defined as well in getpeerid.c) + ------------------------------------------------------------------- Wed Apr 29 17:07:33 CEST 2009 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 288b647..7af596c 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -27,21 +27,21 @@ 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.16 -Release: 2 +Release: 3 Url: http://www.openldap.org -License: BSD 3-Clause +License: BSD 3-clause (or similar) ; openldap 2.8 %if "%{name}" == "openldap2" -Group: Productivity/Networking/LDAP/Clients +Group: Productivity/Networking/LDAP/Servers Provides: ldap2 openldap2-back-ldap openldap2-back-monitor Obsoletes: openldap2-back-ldap openldap2-back-monitor Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: OpenLDAP Client Utilities +Summary: The OpenLDAP Server %else -Group: Productivity/Networking/LDAP/Clients +Group: Productivity/Networking/LDAP/Servers Conflicts: openldap-client -Summary: OpenLDAP Client Utilities +Summary: The OpenLDAP Server %endif AutoReqProv: on Source: openldap-%{version}.tar.bz2 @@ -65,7 +65,10 @@ Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This package contains the OpenLDAP client utilities. +The Lightweight Directory Access Protocol (LDAP) is used to access +online directory services. It runs directly over TCP and can be used to +access a stand-alone LDAP directory service or to access a directory +service that has an X.500 back-end. @@ -76,7 +79,7 @@ Authors: %if "%{name}" == "openldap2" %package -n openldap2-back-perl -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: OpenLDAP Perl Back-End Requires: openldap2 = %{version} perl = %{perl_version} AutoReqProv: on @@ -93,7 +96,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-meta -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: OpenLDAP Meta Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -115,7 +118,7 @@ Authors: %else %package -n openldap2-devel -License: BSD 3-Clause; openldap 2.8 +License: BSD 3-clause (or similar) ; openldap 2.8 Summary: Libraries, Header Files and Documentation for OpenLDAP AutoReqProv: on # bug437293 @@ -142,7 +145,7 @@ Authors: The OpenLDAP Project %package -n libldap-2_4-2 -License: BSD 3-Clause; openldap 2.8 +License: BSD 3-clause (or similar) ; openldap 2.8 Summary: OpenLDAP Client Libraries AutoReqProv: on Group: Productivity/Networking/LDAP/Clients @@ -536,6 +539,9 @@ fi %endif %changelog +* Mon Jun 15 2009 rhafer@novell.com +- Fixed complilation with newer glibc (2.3.X release needs + GNU_SOURCE defined as well in getpeerid.c) * Wed Apr 29 2009 rhafer@novell.com - gcc 4.4 fixes * Mon Apr 06 2009 rhafer@suse.de diff --git a/openldap2.changes b/openldap2.changes index 3d67067..e2e4592 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 15 12:12:17 CEST 2009 - rhafer@novell.com + +- Fixed complilation with newer glibc (2.3.X release needs + GNU_SOURCE defined as well in getpeerid.c) + ------------------------------------------------------------------- Wed Apr 29 17:07:33 CEST 2009 - rhafer@novell.com diff --git a/openldap2.spec b/openldap2.spec index 8c0092b..7394584 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -27,9 +27,9 @@ 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.16 -Release: 2 +Release: 3 Url: http://www.openldap.org -License: BSD 3-Clause; openldap 2.8 +License: BSD 3-clause (or similar) ; openldap 2.8 %if "%{name}" == "openldap2" Group: Productivity/Networking/LDAP/Servers Provides: ldap2 openldap2-back-ldap openldap2-back-monitor @@ -79,7 +79,7 @@ Authors: %if "%{name}" == "openldap2" %package -n openldap2-back-perl -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: OpenLDAP Perl Back-End Requires: openldap2 = %{version} perl = %{perl_version} AutoReqProv: on @@ -96,7 +96,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-meta -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: OpenLDAP Meta Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -118,7 +118,7 @@ Authors: %else %package -n openldap2-devel -License: BSD 3-Clause; openldap 2.8 +License: BSD 3-clause (or similar) ; openldap 2.8 Summary: Libraries, Header Files and Documentation for OpenLDAP AutoReqProv: on # bug437293 @@ -145,7 +145,7 @@ Authors: The OpenLDAP Project %package -n libldap-2_4-2 -License: BSD 3-Clause; openldap 2.8 +License: BSD 3-clause (or similar) ; openldap 2.8 Summary: OpenLDAP Client Libraries AutoReqProv: on Group: Productivity/Networking/LDAP/Clients @@ -539,6 +539,9 @@ fi %endif %changelog +* Mon Jun 15 2009 rhafer@novell.com +- Fixed complilation with newer glibc (2.3.X release needs + GNU_SOURCE defined as well in getpeerid.c) * Wed Apr 29 2009 rhafer@novell.com - gcc 4.4 fixes * Mon Apr 06 2009 rhafer@suse.de