From e2297fe130ca39a6c06a26e5ecc049559f91a8238bd7033a61406ca0a400a849 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 30 Apr 2009 22:11:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=49 --- openldap-2.3.37.dif | 28 +++++++++++++++++++++++++++- openldap2-client.changes | 5 +++++ openldap2-client.spec | 4 +++- openldap2.changes | 5 +++++ openldap2.spec | 4 +++- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/openldap-2.3.37.dif b/openldap-2.3.37.dif index 55b1194..94639f1 100644 --- a/openldap-2.3.37.dif +++ b/openldap-2.3.37.dif @@ -52,7 +52,7 @@ Index: libraries/liblunicode/Makefile.in =================================================================== --- libraries/liblunicode/Makefile.in.orig +++ libraries/liblunicode/Makefile.in -@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c +@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c $(MAKE) ucgendat ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt @@ -317,3 +317,29 @@ Index: servers/slapd/back-meta/Makefile.in BUILD_OPT = "--enable-meta" BUILD_MOD = @BUILD_META@ +Index: libraries/libldap/os-ip.c +=================================================================== +--- libraries/libldap/os-ip.c.orig ++++ libraries/libldap/os-ip.c +@@ -646,7 +646,7 @@ ldap_host_connected_to( Sockbuf *sb, con + char *herr; + #ifdef NI_MAXHOST + char hbuf[NI_MAXHOST]; +-#elif defined( MAXHOSTNAMELEN ++#elif defined( MAXHOSTNAMELEN ) + char hbuf[MAXHOSTNAMELEN]; + #else + char hbuf[256]; +Index: include/ldap_pvt_thread.h +=================================================================== +--- include/ldap_pvt_thread.h.orig ++++ include/ldap_pvt_thread.h +@@ -61,8 +61,6 @@ ldap_pvt_thread_set_concurrency LDAP_P(( + /* LARGE stack. Will be twice as large on 64 bit machine. */ + #define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) ) + /* May be explicitly defined to zero to disable it */ +-#elif LDAP_PVT_THREAD_STACK_SIZE == 0 +-#undef LDAP_PVT_THREAD_SET_STACK_SIZE + #endif + #endif /* !LDAP_PVT_THREAD_H_DONE */ + diff --git a/openldap2-client.changes b/openldap2-client.changes index 73ac1fa..3d67067 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 29 17:07:33 CEST 2009 - rhafer@novell.com + +- gcc 4.4 fixes + ------------------------------------------------------------------- Mon Apr 6 15:41:05 CEST 2009 - rhafer@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index a8d2a7c..288b647 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -27,7 +27,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.16 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -536,6 +536,8 @@ fi %endif %changelog +* Wed Apr 29 2009 rhafer@novell.com +- gcc 4.4 fixes * Mon Apr 06 2009 rhafer@suse.de - Update to 2.4.16. Most important fixes: * Fixed libldap segfault in checking cert/DN (ITS#5976) diff --git a/openldap2.changes b/openldap2.changes index 73ac1fa..3d67067 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 29 17:07:33 CEST 2009 - rhafer@novell.com + +- gcc 4.4 fixes + ------------------------------------------------------------------- Mon Apr 6 15:41:05 CEST 2009 - rhafer@suse.de diff --git a/openldap2.spec b/openldap2.spec index 49e7a2d..8c0092b 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -27,7 +27,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.16 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -539,6 +539,8 @@ fi %endif %changelog +* Wed Apr 29 2009 rhafer@novell.com +- gcc 4.4 fixes * Mon Apr 06 2009 rhafer@suse.de - Update to 2.4.16. Most important fixes: * Fixed libldap segfault in checking cert/DN (ITS#5976)