diff options
| author | Rosen Penev <rosenp@gmail.com> | 2018-11-19 14:48:02 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2018-11-25 17:42:51 -0800 |
| commit | 5033e594ccca4368ee0562abd7ea618f19f10948 (patch) | |
| tree | 267515c5f83a2be26bbd86b2c2e1bf29993b079c /multimedia/tvheadend | |
| parent | eae9f8cb9e90677d0bc1f51baa0f3b9b3fe468af (diff) | |
tvheadend: Fix compilation without OpenSSL deprecated APIs
Also switched to codeload for Makefile simplicity.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'multimedia/tvheadend')
| -rw-r--r-- | multimedia/tvheadend/Makefile | 14 | ||||
| -rw-r--r-- | multimedia/tvheadend/patches/010-openssl-deprecated.patch | 35 |
2 files changed, 40 insertions, 9 deletions
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile index c026a50f3..634ed7eac 100644 --- a/multimedia/tvheadend/Makefile +++ b/multimedia/tvheadend/Makefile @@ -9,15 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tvheadend PKG_VERSION:=4.0.10 -PKG_RELEASE:=1 - -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=afe42bcf683e8576ca8ccd4755ea308f79195e92f7c30fc5961973e238f49105 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend.git -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/tvheadend/tvheadend/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=f610e7d9f3bf6cff05cd73830a66ee0c74bc5291c4c9d08369364c4c681ebf23 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=LICENSE.md diff --git a/multimedia/tvheadend/patches/010-openssl-deprecated.patch b/multimedia/tvheadend/patches/010-openssl-deprecated.patch new file mode 100644 index 000000000..93b6072d3 --- /dev/null +++ b/multimedia/tvheadend/patches/010-openssl-deprecated.patch @@ -0,0 +1,35 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -965,10 +965,12 @@ main(int argc, char **argv) + sigprocmask(SIG_BLOCK, &set, NULL); + trap_init(argv[0]); + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* SSL library init */ + OPENSSL_config(NULL); + SSL_load_error_strings(); + SSL_library_init(); ++#endif + + /* Initialise configuration */ + notify_init(); +@@ -1159,8 +1161,11 @@ main(int argc, char **argv) + #endif + free(opt_satip_xml.str); + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* OpenSSL - welcome to the "cleanup" hell */ ++#ifndef OPENSSL_NO_ENGINE + ENGINE_cleanup(); ++#endif + RAND_cleanup(); + CRYPTO_cleanup_all_ex_data(); + EVP_cleanup(); +@@ -1174,6 +1179,7 @@ main(int argc, char **argv) + sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); + #endif + /* end of OpenSSL cleanup code */ ++#endif + + #if ENABLE_DBUS_1 + extern void dbus_shutdown(void); |