[packages/libupnp] - do not redefine strndup from glibc - rel 2

baggins baggins at pld-linux.org
Fri Mar 13 19:38:58 CET 2015


commit b3347e298e811108f693933ae454f20c78692410
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 13 19:38:39 2015 +0100

    - do not redefine strndup from glibc
    - rel 2

 glibc-string.patch | 11 +++++++++++
 libupnp.spec       |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/libupnp.spec b/libupnp.spec
index a99e4e6..13bc675 100644
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -2,12 +2,13 @@ Summary:	The Universal Plug and Play (UPnP) SDK for Linux
 Summary(pl.UTF-8):	Pakiet programistyczny Universal Plug and Play (UPnP) dla Linuksa
 Name:		libupnp
 Version:	1.6.19
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
 # Source0-md5:	ee16e5d33a3ea7506f38d71facc057dd
 Patch0:		%{name}-opt.patch
+Patch1:		glibc-string.patch
 URL:		http://pupnp.sourceforge.net/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.8
@@ -55,6 +56,7 @@ Statyczne biblioteki upnp.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/glibc-string.patch b/glibc-string.patch
new file mode 100644
index 0000000..e1b77c8
--- /dev/null
+++ b/glibc-string.patch
@@ -0,0 +1,11 @@
+--- libupnp-1.6.19/upnp/src/api/UpnpString.c~	2012-03-26 18:49:42.000000000 +0200
++++ libupnp-1.6.19/upnp/src/api/UpnpString.c	2015-03-13 19:37:42.271188730 +0100
+@@ -44,7 +44,7 @@
+ 
+ /* strndup() is a GNU extension. */
+ #if HAVE_STRNDUP && !defined(WIN32)
+-	extern char *strndup(__const char *__string, size_t __n);
++//	extern char *strndup(__const char *__string, size_t __n);
+ #else /* HAVE_STRNDUP && !defined(WIN32) */
+ 	static char *strndup(const char *__string, size_t __n)
+ 	{
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libupnp.git/commitdiff/b3347e298e811108f693933ae454f20c78692410



More information about the pld-cvs-commit mailing list