[packages/openslp] - fix exported symbols clashes with glibc and other libs, rel 2

[baggins]

commit 855d943da5a93f4c7f4c53e3b32aa425067aac01
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Apr 8 18:59:12 2014 +0200

    - fix exported symbols clashes with glibc and other libs, rel 2
    
    Restore configure check for strncasecmp and strcasecmp and make
    timeval_subtract() and timeval_add() static to avoid exporting them
    in libslp. strncasecmp visibility causes a nasty and mysterious
    crash of slapd from openldap package.

 openslp-symbol-clashes.patch | 30 ++++++++++++++++++++++++++++++
 openslp.spec                 |  5 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/openslp.spec b/openslp.spec
index 38afd12..c58ff05 100644
--- a/openslp.spec
+++ b/openslp.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8):	Otwarta implementacja Service Location Protocol V2
 Summary(pt.UTF-8):	Implementação 'open source' do protocolo Service Location Protocol V2
 Name:		openslp
 Version:	2.0.0
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/openslp/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Source0:	http://downloads.sourceforge.net/openslp/%{name}-%{version}.tar.gz
 Source1:	%{name}.init
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-build.patch
+Patch2:		%{name}-symbol-clashes.patch
 URL:		http://www.openslp.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -132,11 +133,13 @@ Biblioteki statyczne OpenSLP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--enable-slpv1 \
diff --git a/openslp-symbol-clashes.patch b/openslp-symbol-clashes.patch
new file mode 100644
index 0000000..525d82e
--- /dev/null
+++ b/openslp-symbol-clashes.patch
@@ -0,0 +1,30 @@
+--- openslp-2.0.0/configure.ac~	2014-04-08 18:43:55.000000000 +0200
++++ openslp-2.0.0/configure.ac	2014-04-08 18:46:25.821730251 +0200
+@@ -34,6 +34,7 @@
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_CHECK_LIB([m], [log10])
+ AC_CHECK_LIB([pthread], [pthread_create])
++AC_CHECK_FUNCS(strncasecmp strcasecmp)
+ 
+ #
+ # Checks for header files
+--- openslp-2.0.0/libslp/libslp_network.c~	2013-06-08 04:50:38.000000000 +0200
++++ openslp-2.0.0/libslp/libslp_network.c	2014-04-08 18:55:12.525059771 +0200
+@@ -142,7 +142,7 @@
+  *
+  * @internal
+  */
+-void timeval_subtract(struct timeval *lhs, struct timeval *rhs)
++static void timeval_subtract(struct timeval *lhs, struct timeval *rhs)
+ {
+     lhs->tv_sec -= rhs->tv_sec;
+     lhs->tv_usec -= rhs->tv_usec;
+@@ -162,7 +162,7 @@
+  *
+  * @internal
+  */
+-void timeval_add(struct timeval *lhs, struct timeval *rhs)
++static void timeval_add(struct timeval *lhs, struct timeval *rhs)
+ {
+     lhs->tv_sec += rhs->tv_sec;
+     lhs->tv_usec += rhs->tv_usec;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openslp.git/commitdiff/855d943da5a93f4c7f4c53e3b32aa425067aac01