commit e9ebcf533ef7c031405ca21da8ee845838683e7d
Author: Jakub Bogusz <[email protected]>
Date: Tue May 28 17:30:18 2019 +0200
- updated to 2.4.2
- updated openssl patch
libshout.spec | 11 +++++++----
openssl.patch | 18 +++++++++---------
2 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/libshout.spec b/libshout.spec
index 0b383a3..ab35ec9 100644
--- a/libshout.spec
+++ b/libshout.spec
@@ -5,12 +5,12 @@
Summary: libshout - icecast source streaming library
Summary(pl.UTF-8): Biblioteka źródeł strumieni icecast
Name: libshout
-Version: 2.4.1
-Release: 4
+Version: 2.4.2
+Release: 1
License: LGPL v2+
Group: Libraries
-Source0:
http://downloads.xiph.org/releases/libshout/%{name}-%{version}.tar.gz
-# Source0-md5: 89cebf8cb0197f639cde69c95177fe47
+Source0:
https://downloads.xiph.org/releases/libshout/%{name}-%{version}.tar.gz
+# Source0-md5: b7a33377d716a95c9159f0922d04e596
Patch0: openssl.patch
URL: http://www.icecast.org/
BuildRequires: autoconf >= 2.54
@@ -86,6 +86,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# ckport support is not maintained in PLD
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/ckport
+
cp -rf examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%clean
diff --git a/openssl.patch b/openssl.patch
index 7045b94..f5fa224 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -1,14 +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
+--- libshout-2.4.2/src/tls.c.orig 2019-05-28 17:19:44.766778317 +0200
++++ libshout-2.4.2/src/tls.c 2019-05-28 17:21:49.872767226 +0200
+@@ -90,7 +90,11 @@
- SSL_library_init();
- SSL_load_error_strings();
+ SSL_library_init();
+ SSL_load_error_strings();
+#if OPENSSL_VERSION_NUMBER < 0x10100000
- SSLeay_add_all_algorithms();
+ SSLeay_add_all_algorithms();
+#else
-+ OpenSSL_add_all_algorithms();;
++ OpenSSL_add_all_algorithms();
+#endif
- SSLeay_add_ssl_algorithms();
+ SSLeay_add_ssl_algorithms();
- meth = TLSv1_client_method();
+ meth = TLSv1_client_method();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libshout.git/commitdiff/e9ebcf533ef7c031405ca21da8ee845838683e7d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
