[packages/libshout] - rel 4; fix openssl 1.1.1 build

arekm arekm at pld-linux.org
Tue Sep 18 13:13:26 CEST 2018


commit 11fd81e2f8d65e45b1c9142a54600cac8dd58ec2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Sep 18 13:13:19 2018 +0200

    - rel 4; fix openssl 1.1.1 build

 libshout.spec |  4 +++-
 openssl.patch | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/libshout.spec b/libshout.spec
index 6b5811c..0b383a3 100644
--- a/libshout.spec
+++ b/libshout.spec
@@ -6,11 +6,12 @@ Summary:	libshout - icecast source streaming library
 Summary(pl.UTF-8):	Biblioteka źródeł strumieni icecast
 Name:		libshout
 Version:	2.4.1
-Release:	3
+Release:	4
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.xiph.org/releases/libshout/%{name}-%{version}.tar.gz
 # Source0-md5:	89cebf8cb0197f639cde69c95177fe47
+Patch0:		openssl.patch
 URL:		http://www.icecast.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
@@ -66,6 +67,7 @@ Statyczna biblioteka libshout - źródeł strumieni icecast.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..7045b94
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,14 @@
+--- libshout-2.4.1/src/tls.c~	2015-06-18 06:27:45.000000000 +0200
++++ libshout-2.4.1/src/tls.c	2018-09-18 13:11:18.634717702 +0200
+@@ -65,7 +65,11 @@ static inline int tls_setup(shout_tls_t
+ 
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ 	SSLeay_add_all_algorithms();
++#else
++	OpenSSL_add_all_algorithms();;
++#endif
+  	SSLeay_add_ssl_algorithms();
+ 
+ 	meth = TLSv1_client_method();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libshout.git/commitdiff/11fd81e2f8d65e45b1c9142a54600cac8dd58ec2



More information about the pld-cvs-commit mailing list