package/tvheadend: bump version

Drop patches included in upstream version.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2022-07-03 15:02:07 +02:00 committed by Peter Korsgaard
parent f941dfb61f
commit 70532a8e09
4 changed files with 2 additions and 77 deletions

View File

@ -1,47 +0,0 @@
From ea65f8025a9124cd7353b21f167968bdb897306f Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 6 Apr 2022 21:54:25 +0200
Subject: [PATCH] fix build with libressl
Fix the following build failure with libressl raised since
https://github.com/tvheadend/tvheadend/commit/e61acb8ad4a3411f4e7acfd8133d222299f6d47e:
utils.c:(.text+0x1614): undefined reference to `EVP_sha512_256'
Fixes:
- http://autobuild.buildroot.org/results/cb18f6533806f3729f9718bdcc719384be375b66
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/tvheadend/tvheadend/commit/ea65f8025a9124cd7353b21f167968bdb897306f]
---
src/http.c | 2 +-
src/utils.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/http.c b/src/http.c
index 06d5e76172..72a498317c 100644
--- a/src/http.c
+++ b/src/http.c
@@ -412,7 +412,7 @@ http_send_header(http_connection_t *hc, int rc, const char *content,
http_auth_header(&hdrs, realm,
config.http_auth_algo == HTTP_AUTH_ALGO_SHA256 ?
"SHA-256" :
-#if OPENSSL_VERSION_NUMBER >= 0x1010101fL
+#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
"SHA-512-256",
#else
"SHA-256",
diff --git a/src/utils.c b/src/utils.c
index d8ffe4ad5c..eecb10e116 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -616,7 +616,7 @@ sha256sum ( const char *str, int lowercase )
char *
sha512sum256 ( const char *str, int lowercase )
{
-#if OPENSSL_VERSION_NUMBER >= 0x1010101fL
+#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
return openssl_hash_hexstr(str, lowercase, EVP_sha512_256(), 32);
#else
return NULL;

View File

@ -1,28 +0,0 @@
From fd01737270d98c28465c86a688bd7d1c640486c5 Mon Sep 17 00:00:00 2001
From: Michael Marley <michael@michaelmarley.com>
Date: Wed, 6 Apr 2022 21:47:49 -0400
Subject: [PATCH] Fix FTBFS in utils.c
U+0020 SPACE and U+00A0 NO-BREAK SPACE look the same, but they
aren't the same.
[Retrieved from:
https://github.com/tvheadend/tvheadend/commit/fd01737270d98c28465c86a688bd7d1c640486c5]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils.c b/src/utils.c
index eecb10e116..bc6401d22f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -616,7 +616,7 @@ sha256sum ( const char *str, int lowercase )
char *
sha512sum256 ( const char *str, int lowercase )
{
-#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
return openssl_hash_hexstr(str, lowercase, EVP_sha512_256(), 32);
#else
return NULL;

View File

@ -1,3 +1,3 @@
# Locally computed
sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz
sha256 ed32401d1ed85f9e2d28d122a046c3f2c01b6ca5c0da1a7d78fa8f400e858107 tvheadend-fbc94aee8bfdd25baba87ab62a39234da20e8dd2.tar.gz
sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md

View File

@ -4,7 +4,7 @@
#
################################################################################
TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0
TVHEADEND_VERSION = fbc94aee8bfdd25baba87ab62a39234da20e8dd2
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md