jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 23:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: fix ASN1 patch

Browse Source
This commit is contained in:
MilhouseVH 2019-12-04 20:16:12 +00:00
parent 71ee26894b
commit 92f63d8a5f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/network/samba/patches/samba-200-4.11-fix-ASN1-bso14164.patch
View File

@ -1,4 +1,4 @@
From b37110d0b380ec6b92a34c36ba39d73ae7590f92 Mon Sep 17 00:00:00 2001 From 2e53f331104b29db7caf1641a30d3e9316b57184 Mon Sep 17 00:00:00 2001
From: Uri Simchoni <uri@samba.org> From: Uri Simchoni <uri@samba.org>
Date: Sun, 20 Oct 2019 00:03:14 +0300 Date: Sun, 20 Oct 2019 00:03:14 +0300
Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
@ -38,7 +38,7 @@ Signed-off-by: Uri Simchoni <uri@samba.org>
2 files changed, 11 insertions(+), 11 deletions(-) 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
index 8c55ae2a938..4fdae8062c5 100644 index 8c55ae2..4fdae80 100644
--- a/wscript_configure_embedded_heimdal --- a/wscript_configure_embedded_heimdal
+++ b/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal
@@ -1 +1,12 @@ @@ -1 +1,12 @@
@ -55,10 +55,10 @@ index 8c55ae2a938..4fdae8062c5 100644
+check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("compile_et")
+check_system_heimdal_binary("asn1_compile") +check_system_heimdal_binary("asn1_compile")
diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal
index 0ff6dad2f55..f77c177442f 100644 index 235fa19..4f4a83cd 100644
--- a/wscript_configure_system_heimdal --- a/wscript_configure_system_heimdal
+++ b/wscript_configure_system_heimdal +++ b/wscript_configure_system_heimdal
@@ -36,14 +36,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): @@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None):
conf.define('USING_SYSTEM_%s' % name.upper(), 1) conf.define('USING_SYSTEM_%s' % name.upper(), 1)
return True return True
@ -73,13 +73,14 @@ index 0ff6dad2f55..f77c177442f 100644
check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
@@ -94,6 +86,3 @@ finally: @@ -96,7 +88,4 @@ finally:
# With the proper checks in place we should be able to build against the system libtommath.
#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
# conf.define('USING_SYSTEM_TOMMATH', 1) # conf.define('USING_SYSTEM_TOMMATH', 1)
-
-check_system_heimdal_binary("compile_et") -check_system_heimdal_binary("compile_et")
-check_system_heimdal_binary("asn1_compile") -check_system_heimdal_binary("asn1_compile")
-
conf.define('USING_SYSTEM_KRB5', 1)
-- --
2.21.0 2.20.1