Merge pull request #7835 from neheb/tv2

tvheadend: Fix compilation without deprecated OpenSSL 1.0.2 APIs
This commit is contained in:
Hannu Nyman 2019-01-09 23:26:35 +02:00 committed by GitHub
commit f59e834eee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

@ -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)?

View File

@ -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 */