From 92f63d8a5f4555bc638d16dd23c3835dc47a2720 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 4 Dec 2019 20:16:12 +0000 Subject: [PATCH] samba: fix ASN1 patch --- .../samba-200-4.11-fix-ASN1-bso14164.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/network/samba/patches/samba-200-4.11-fix-ASN1-bso14164.patch b/packages/network/samba/patches/samba-200-4.11-fix-ASN1-bso14164.patch index 9d98856e26..03b2f31d66 100644 --- a/packages/network/samba/patches/samba-200-4.11-fix-ASN1-bso14164.patch +++ b/packages/network/samba/patches/samba-200-4.11-fix-ASN1-bso14164.patch @@ -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 Date: Sun, 20 Oct 2019 00:03:14 +0300 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -38,7 +38,7 @@ Signed-off-by: Uri Simchoni 2 files changed, 11 insertions(+), 11 deletions(-) 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 +++ b/wscript_configure_embedded_heimdal @@ -1 +1,12 @@ @@ -55,10 +55,10 @@ index 8c55ae2a938..4fdae8062c5 100644 +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") 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 +++ 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) return True @@ -73,13 +73,14 @@ index 0ff6dad2f55..f77c177442f 100644 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"): -@@ -94,6 +86,3 @@ finally: - # With the proper checks in place we should be able to build against the system libtommath. +@@ -96,7 +88,4 @@ finally: #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): # conf.define('USING_SYSTEM_TOMMATH', 1) -- + -check_system_heimdal_binary("compile_et") -check_system_heimdal_binary("asn1_compile") +- + conf.define('USING_SYSTEM_KRB5', 1) -- -2.21.0 +2.20.1