jengelh/libupnp
SHA256
1
0
Fork 0
forked from pool/libupnp
Code Pull Requests Activity

Accepting request 460373 from devel:libraries:c_c++

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/460373
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libupnp?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2017-02-27 17:50:39 +00:00 committed by Git OBS Bridge
commit 5fa28b798b
7 changed files with 28 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libupnp-1.6.19.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a
size 1213439

1
libupnp-1.6.19.tar.bz2.sha1
View File

@ -1 +0,0 @@
ee9e16ff42808521b62b7fc664fc9cba479ede88 libupnp-1.6.19.tar.bz2

3
libupnp-1.6.21.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b
size 1245353

1
libupnp-1.6.21.tar.bz2.sha1 Normal file
View File

@ -0,0 +1 @@
4c2f03f8d2f52d92bfe80039a027fafa98c8c226 libupnp-1.6.21.tar.bz2

110
libupnp-configure.patch
View File

@ -1,26 +1,15 @@
--- configure.ac 2013-01-29 16:39:56.000000000 +0100 --- a/configure.ac
+++ configure.ac 2013-02-17 10:40:53.680021913 +0100 +++ b/configure.ac
@@ -7,9 +7,9 @@ @@ -7,7 +7,7 @@
# (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net> # (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
# #
-AC_PREREQ(2.60) -AC_PREREQ(2.60)
+AC_PREREQ([2.60]) +AC_PREREQ([2.60])
-AC_INIT([libupnp], [1.6.19], [mroberto@users.sourceforge.net]) AC_INIT([libupnp], [1.6.21], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp],[1.6.19],[mroberto@users.sourceforge.net])
dnl ############################################################################ dnl ############################################################################
dnl # *Independently* of the above libupnp package version, the libtool version @@ -549,10 +549,12 @@ AC_MSG_RESULT($docdir)
dnl # of the 3 libraries need to be updated whenever there is a change released:
@@ -366,7 +366,6 @@
# installed libraries.
#
AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
-#AC_SYS_LARGEFILE_SENSITIVE
AC_REVISION([$Revision: 1.11 $])
@@ -519,10 +519,13 @@
# #
# Checks for programs # Checks for programs
# #
@ -31,103 +20,16 @@
AM_PROG_CC_C_O AM_PROG_CC_C_O
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-AC_PROG_LIBTOOL -AC_PROG_LIBTOOL
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+LT_INIT +LT_INIT
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_EGREP AC_PROG_EGREP
@@ -532,9 +534,7 @@ @@ -592,8 +594,6 @@ echo "----------------------------------
#:
# Use -O0 in debug so that variables do not get optimized out
AX_CFLAGS_GCC_OPTION([-O0, -g])
- else
- # add optimise for size
- AX_CFLAGS_GCC_OPTION([-Os])
+
fi
;;
esac
@@ -548,8 +548,7 @@
# #
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_TYPE_OFF_T AC_TYPE_OFF_T
-AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support]) -AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
-AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) -AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
+
# #
--- ixml/Makefile.am.orig
+++ ixml/Makefile.am
@@ -7,7 +7,7 @@
SUBDIRS = doc
-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
AM_CFLAGS =
LDADD = libixml.la
--- threadutil/Makefile.am.orig
+++ threadutil/Makefile.am
@@ -4,7 +4,7 @@
# (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
#
-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
if ENABLE_DEBUG
AM_CPPFLAGS += -DDEBUG -DSTATS
--- upnp/src/api/UpnpString.c.orig
+++ upnp/src/api/UpnpString.c
@@ -28,38 +28,6 @@
/* Other systems have strncasecmp */
#endif
-#ifndef UPNP_USE_MSVCPP
- /* VC has strnlen which is already included but with (potentially) different linkage */
- /* strnlen() is a GNU extension. */
- #if HAVE_STRNLEN
- extern size_t strnlen(const char *s, size_t maxlen);
- #else /* HAVE_STRNLEN */
- static size_t strnlen(const char *s, size_t n)
- {
- const char *p = (const char *)memchr(s, 0, n);
- return p ? p - s : n;
- }
- #endif /* HAVE_STRNLEN */
-#endif /* WIN32 */
-
-/* strndup() is a GNU extension. */
-#if HAVE_STRNDUP && !defined(WIN32)
- extern char *strndup(__const char *__string, size_t __n);
-#else /* HAVE_STRNDUP && !defined(WIN32) */
- static char *strndup(const char *__string, size_t __n)
- {
- size_t strsize = strnlen(__string, __n);
- char *newstr = (char *)malloc(strsize + 1);
- if (newstr == NULL)
- return NULL;
-
- strncpy(newstr, __string, strsize);
- newstr[strsize] = 0;
-
- return newstr;
- }
-#endif /* HAVE_STRNDUP && !defined(WIN32) */
-
/*!
* \brief Internal implementation of the class UpnpString.
*
--- upnp/Makefile.am.orig
+++ upnp/Makefile.am
@@ -6,7 +6,7 @@
SUBDIRS = doc . sample
-AM_CPPFLAGS = \
+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \
-I$(srcdir)/inc \
-I$(top_srcdir)/threadutil/inc \
-I$(top_srcdir)/ixml/inc

9
libupnp.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Feb 24 19:26:45 UTC 2017 - olaf@aepfle.de
- Update to version 1.6.21
see included ChangeLog for details
- Replace individual packages from Packman to make migration to
Tumbleweed easier.
- Package LICENSE file
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 19 20:29:34 UTC 2015 - p.drouand@gmail.com Thu Feb 19 20:29:34 UTC 2015 - p.drouand@gmail.com

12
libupnp.spec
View File

@ -20,7 +20,7 @@
%define lname libupnp6 %define lname libupnp6
Name: libupnp Name: libupnp
Version: 1.6.19 Version: 1.6.21
Release: 0 Release: 0
Summary: Portable Universal Plug and Play (UPnP) SDK Summary: Portable Universal Plug and Play (UPnP) SDK
License: BSD-3-Clause License: BSD-3-Clause
@ -42,6 +42,11 @@ systems.
%package -n %lname %package -n %lname
Summary: Portable Universal Plug and Play (UPnP) SDK Summary: Portable Universal Plug and Play (UPnP) SDK
Group: System/Libraries Group: System/Libraries
# Replace individual packages from Packman to make migration to Tumbleweed easier.
Provides: libixml2 = %{version}-%{release}
Obsoletes: libixml2 < %{version}
Provides: libthreadutil6 = %{version}-%{release}
Obsoletes: libthreadutil6 < %{version}
%description -n %lname %description -n %lname
The portable Universal Plug and Play (UPnP) SDK provides support for building The portable Universal Plug and Play (UPnP) SDK provides support for building
@ -60,7 +65,8 @@ systems.
%prep %prep
%setup -q %setup -q
%patch %patch -p1
%build %build
autoreconf -fiv autoreconf -fiv
%configure --disable-samples --enable-ipv6 --disable-static %configure --disable-samples --enable-ipv6 --disable-static
@ -76,7 +82,7 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
%files -n %lname %files -n %lname
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog NEWS README TODO %doc ChangeLog NEWS README TODO LICENSE
%{_libdir}/libixml.so.* %{_libdir}/libixml.so.*
%{_libdir}/libthreadutil.so.* %{_libdir}/libthreadutil.so.*
%{_libdir}/libupnp.so.* %{_libdir}/libupnp.so.*