diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-01-09 23:26:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 23:26:35 +0200 |
| commit | f59e834eee230f4c6c3c812b34e9228f5b670675 (patch) | |
| tree | bee8f985eb766729d10fb61fbd3f6805e716f42e /multimedia | |
| parent | e9816ae1f2bc50475c67a50c1b4736aae22d3319 (diff) | |
| parent | c59e53619e0b0b3c19651023456e500e6906dbd2 (diff) | |
Merge pull request #7835 from neheb/tv2
tvheadend: Fix compilation without deprecated OpenSSL 1.0.2 APIs
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/tvheadend/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/tvheadend/patches/010-openssl-deprecated.patch | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile index 634ed7eac..4a41a9f38 100644 --- a/multimedia/tvheadend/Makefile +++ b/multimedia/tvheadend/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tvheadend PKG_VERSION:=4.0.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tvheadend/tvheadend/tar.gz/v$(PKG_VERSION)? diff --git a/multimedia/tvheadend/patches/010-openssl-deprecated.patch b/multimedia/tvheadend/patches/010-openssl-deprecated.patch index 93b6072d3..5416ef7fa 100644 --- a/multimedia/tvheadend/patches/010-openssl-deprecated.patch +++ b/multimedia/tvheadend/patches/010-openssl-deprecated.patch @@ -25,7 +25,14 @@ RAND_cleanup(); CRYPTO_cleanup_all_ex_data(); EVP_cleanup(); -@@ -1174,6 +1179,7 @@ main(int argc, char **argv) +@@ -1168,12 +1173,13 @@ main(int argc, char **argv) + #ifndef OPENSSL_NO_COMP + COMP_zlib_cleanup(); + #endif +- ERR_remove_state(0); ++ ERR_remove_thread_state(NULL); + ERR_free_strings(); + #ifndef OPENSSL_NO_COMP sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); #endif /* end of OpenSSL cleanup code */ |