[packages/libupnp/DEVEL-1.12] - updated to 1.12.0 (new libupnp soname) - added openssl patch (fix for 1.1.x), enable openssl suppo
qboosh
qboosh at pld-linux.org
Tue Mar 17 17:37:42 CET 2020
commit 22e21b7eb4d731e0c00a928e68ca6fead9cc2741
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Mar 17 17:38:36 2020 +0100
- updated to 1.12.0 (new libupnp soname)
- added openssl patch (fix for 1.1.x), enable openssl support
libupnp-openssl.patch | 12 ++++++++++++
libupnp.spec | 15 +++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/libupnp.spec b/libupnp.spec
index f565234..02ac29e 100644
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -2,17 +2,20 @@
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.10.1
+Version: 1.12.0
Release: 1
License: BSD
Group: Libraries
Source0: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
-# Source0-md5: 6060b9b7233996d174bf12f804f34d5f
+# Source0-md5: 9c4f2d5d412c802a54c861ec3395a57d
Patch0: %{name}-opt.patch
+Patch1: %{name}-openssl.patch
URL: http://pupnp.sourceforge.net/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.8
BuildRequires: libtool >= 2:1.5
+BuildRequires: openssl-devel
+BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -32,6 +35,7 @@ Summary: Header files for libupnp
Summary(pl.UTF-8): Pliki nagłówkowe libupnp
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: openssl-devel
%description devel
This package contains header files for the Linux SDK for UPnP Devices
@@ -70,6 +74,7 @@ Dokumentacja API bibliotek upnp.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# LFS is required in library clients (including examples)
%{__sed} -i -e '/^Cflags/ s/$/ -D_FILE_OFFSET_BITS=64/' libupnp.pc.in
@@ -82,7 +87,9 @@ Dokumentacja API bibliotek upnp.
%{__autoheader}
%{__automake}
%configure \
- %{?debug:--enable-debug}
+ %{?debug:--enable-debug} \
+ --enable-open-ssl \
+ --disable-silent-rules
%{__make}
%install
@@ -103,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libixml.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libixml.so.11
%attr(755,root,root) %{_libdir}/libupnp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libupnp.so.15
+%attr(755,root,root) %ghost %{_libdir}/libupnp.so.16
%files devel
%defattr(644,root,root,755)
diff --git a/libupnp-openssl.patch b/libupnp-openssl.patch
new file mode 100644
index 0000000..825e3e8
--- /dev/null
+++ b/libupnp-openssl.patch
@@ -0,0 +1,12 @@
+--- libupnp-1.12.0/upnp/src/api/upnpapi.c.orig 2020-01-22 21:25:01.000000000 +0100
++++ libupnp-1.12.0/upnp/src/api/upnpapi.c 2020-03-17 17:31:32.941450155 +0100
+@@ -591,7 +591,9 @@
+ if (initOpenSslLib) {
+ SSL_load_error_strings();
+ SSL_library_init();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ OpenSSL_add_all_algorithms();
++#endif
+ }
+ gSslCtx = SSL_CTX_new(sslMethod);
+ if (!gSslCtx) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libupnp.git/commitdiff/22e21b7eb4d731e0c00a928e68ca6fead9cc2741
More information about the pld-cvs-commit
mailing list