[gpac] Fix build with openssl-1.1.0

commit 8c1d513706aa8b089cfbedee39e5feb0dda8cc1e Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Oct 29 11:30:21 2016 +0100 Fix build with openssl-1.1.0 gpac.spec | 11 ++++++++++- openssl-1.1.0.patch | 11 +++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/gpac.spec b/gpac.spec index 94673bf..ad1682a 100644 --- a/gpac.spec +++ b/gpac.spec @@ -17,11 +17,14 @@ Name: gpac Summary: MPEG-4 multimedia framework Version: 0.6.1 -Release: 2%{?git:.%{git}git}%{?dist} +Release: 3%{?git:.%{git}git}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.tar.gz +# https://github.com/openssl/openssl/issues/1543 +# Simply remove the call to SSLeay_add_all_algorithms, the addition is now done automatically and internally in libssl. +Patch0: openssl-1.1.0.patch #Source9: gpac-snapshot.sh BuildRequires: ImageMagick @@ -137,6 +140,9 @@ web browsers. %prep %setup -q +%if 0%{?fedora} >= 26 +%patch0 -p1 +%endif rm -r extra_lib/ # Fix encoding warnings cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine @@ -305,6 +311,9 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h %changelog +* Sat Oct 29 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.6.1-3 +- Fix build with openssl-1.1.0 + * Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.6.1-2 - Rebuilt for ffmpeg-3.1.1 diff --git a/openssl-1.1.0.patch b/openssl-1.1.0.patch new file mode 100644 index 0000000..5d95a23 --- /dev/null +++ b/openssl-1.1.0.patch @@ -0,0 +1,11 @@ +--- a/src/utils/downloader.c ++++ b/src/utils/downloader.c +@@ -391,7 +391,6 @@ + } + SSL_library_init(); + SSL_load_error_strings(); +- SSLeay_add_all_algorithms(); + SSLeay_add_ssl_algorithms(); + _ssl_is_initialized = GF_TRUE; + GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n")); +