update to upstream version 1.14.12
This commit is contained in:
parent
404ba5a99d
commit
35611f4b0d
@ -1,57 +0,0 @@
|
||||
diff -Naur libupnp-1.14.7/upnp/inc/ithread.h libupnp-1.14.7~/upnp/inc/ithread.h
|
||||
--- libupnp-1.14.7/upnp/inc/ithread.h 2021-05-09 05:19:44.000000000 +0800
|
||||
+++ libupnp-1.14.7~/upnp/inc/ithread.h 2021-06-12 07:24:03.890581013 +0800
|
||||
@@ -304,11 +304,8 @@
|
||||
* Returns EINVAL if the kind is not supported.
|
||||
* See man page for pthread_mutexattr_setkind_np
|
||||
*****************************************************************************/
|
||||
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
|
||||
- #define ithread_mutexattr_setkind_np pthread_mutexattr_settype
|
||||
-#else
|
||||
- #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
|
||||
-#endif /* UPNP_USE_RWLOCK */
|
||||
+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
|
||||
+#define ithread_mutexattr_settype pthread_mutexattr_settype
|
||||
|
||||
/****************************************************************************
|
||||
* Function: ithread_mutexattr_getkind_np
|
||||
@@ -329,11 +326,8 @@
|
||||
* Always returns 0.
|
||||
* See man page for pthread_mutexattr_getkind_np
|
||||
*****************************************************************************/
|
||||
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
|
||||
- #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
|
||||
-#else
|
||||
- #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
|
||||
-#endif /* UPNP_USE_RWLOCK */
|
||||
+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
|
||||
+#define ithread_mutexattr_gettype pthread_mutexattr_gettype
|
||||
|
||||
/****************************************************************************
|
||||
* Function: ithread_mutex_init
|
||||
@@ -898,15 +892,16 @@
|
||||
#ifdef _WIN32
|
||||
#define imillisleep Sleep
|
||||
#else
|
||||
-#if _POSIX_C_SOURCE < 200809L
|
||||
- #define imillisleep(x) usleep(1000 * x)
|
||||
-#else
|
||||
- #define imillisleep(x) \
|
||||
- do { \
|
||||
- const struct timespec req = {0, x * 1000 * 1000}; \
|
||||
- nanosleep(&req, NULL); \
|
||||
- } while(0)
|
||||
-#endif
|
||||
+ #if _POSIX_C_SOURCE < 200809L
|
||||
+ #define imillisleep(x) usleep(1000 * x)
|
||||
+ #else
|
||||
+ #define imillisleep(x) \
|
||||
+ do { \
|
||||
+ const struct timespec req = { \
|
||||
+ 0, x * 1000 * 1000}; \
|
||||
+ nanosleep(&req, NULL); \
|
||||
+ } while (0)
|
||||
+ #endif
|
||||
#endif
|
||||
|
||||
#if !defined(PTHREAD_MUTEX_RECURSIVE) && !defined(__DragonFly__) && \
|
||||
BIN
libupnp-1.14.12.tar.gz
Normal file
BIN
libupnp-1.14.12.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
29
libupnp.spec
29
libupnp.spec
@ -1,14 +1,14 @@
|
||||
Version: 1.14.7
|
||||
Summary: Universal Plug and Play (UPnP) SDK
|
||||
Name: libupnp
|
||||
Release: 1
|
||||
License: BSD
|
||||
URL: https://sourceforge.net/projects/pupnp
|
||||
Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
|
||||
Patch0: 0001-fix-compile-issue.patch
|
||||
Version: 1.14.12
|
||||
Summary: Universal Plug and Play (UPnP) SDK
|
||||
Name: libupnp
|
||||
Release: 1
|
||||
License: BSD
|
||||
URL: https://github.com/pupnp/pupnp
|
||||
Source: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
BuildRequires: libtool
|
||||
|
||||
|
||||
%description
|
||||
@ -17,19 +17,19 @@ support for building UPnP-compliant control points, devices,
|
||||
and bridges on Linux.
|
||||
|
||||
%package devel
|
||||
Summary: Include files needed for development with libupnp
|
||||
Requires: libupnp%{?_isa} = %{version}-%{release}
|
||||
Summary: Include files needed for development with libupnp
|
||||
Requires: libupnp%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The libupnp-devel package contains the files necessary for development with
|
||||
the UPnP SDK libraries.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p1 -n pupnp-release-%{version}
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
autoreconf -vif
|
||||
%configure \
|
||||
--enable-static=no \
|
||||
--enable-ipv6
|
||||
@ -60,6 +60,9 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
%{_libdir}/pkgconfig/libupnp.pc
|
||||
|
||||
%changelog
|
||||
* Thu Jan 13 2022 pei-jiankang <peijiankang@kylinos.cn> - 1.14.12-1
|
||||
- update to upstream version 1.14.12
|
||||
|
||||
* Fri Aug 13 2021 douyan <douyan@kylinos.cn> - 1.14.7-1
|
||||
- Update to version 1.14.7-1
|
||||
|
||||
@ -68,4 +71,4 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
- fix CVE-2020-13848
|
||||
|
||||
* Thu Jul 23 2020 Zhao Yang <yangzhao1@kylinos.cn> - 1.8.4-1
|
||||
- Initial release for openEuler
|
||||
- Initial release for openEuler
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user