From e5830dc584ec9b2c141dc783e7e8ec15b701e697 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 16 Feb 2022 11:04:16 +0000 Subject: [PATCH] samba: update to 4.16.0 release notes: - https://www.samba.org/samba/history/samba-4.16.0.html Please review: - Heimdal-8.0pre used for Samba Internal Kerberos, adds FAST support --- packages/network/samba/config/samba4-cache.txt | 2 ++ packages/network/samba/package.mk | 5 ++--- .../patches/samba-200-4.11-fix-ASN1-bso14164.patch | 10 ++++++---- ...1-no-man-4.13.patch => samba-951-no-man-4.16.patch} | 5 ++++- 4 files changed, 14 insertions(+), 8 deletions(-) rename packages/network/samba/patches/{samba-951-no-man-4.13.patch => samba-951-no-man-4.16.patch} (91%) diff --git a/packages/network/samba/config/samba4-cache.txt b/packages/network/samba/config/samba4-cache.txt index 1989baa285..bd1cd5cefd 100644 --- a/packages/network/samba/config/samba4-cache.txt +++ b/packages/network/samba/config/samba4-cache.txt @@ -43,4 +43,6 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking whether fcntl supports setting/geting hints: OK +Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 7370423ee8..e0b2b5c925 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="samba" -PKG_VERSION="4.13.17" -PKG_SHA256="17bdb9ea60d30af22851c8e134d67b43a22fb1e20f159152a647c69dc2a58a68" +PKG_VERSION="4.16.0" +PKG_SHA256="97c47de35915d1637b254f02643c3230c3e73617851700edc7a2a8c958a3310c" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz" @@ -61,7 +61,6 @@ configure_package() { --without-ad-dc \ --without-automount \ --without-cluster-support \ - --without-dnsupdate \ --without-fam \ --without-gettext \ --without-gpgme \ 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 03b2f31d66..5d3cb17e40 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 @@ -41,8 +41,10 @@ diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_hei index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -1 +1,12 @@ - conf.RECURSE('source4/heimdal_build') +@@ -6,3 +6,14 @@ + + conf.define('USING_EMBEDDED_HEIMDAL', 1) + conf.RECURSE('third_party/heimdal_build') + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): @@ -73,14 +75,14 @@ index 235fa19..4f4a83cd 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"): -@@ -96,7 +88,4 @@ finally: +@@ -86,7 +78,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) + conf.env.KRB5_VENDOR = 'heimdal' -- 2.20.1 diff --git a/packages/network/samba/patches/samba-951-no-man-4.13.patch b/packages/network/samba/patches/samba-951-no-man-4.16.patch similarity index 91% rename from packages/network/samba/patches/samba-951-no-man-4.13.patch rename to packages/network/samba/patches/samba-951-no-man-4.16.patch index 1db3f9f4cc..4639ee7de9 100644 --- a/packages/network/samba/patches/samba-951-no-man-4.13.patch +++ b/packages/network/samba/patches/samba-951-no-man-4.16.patch @@ -1,7 +1,7 @@ diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build --- a/docs-xml/wscript_build 2020-12-05 09:01:19.652459634 +0000 +++ b/docs-xml/wscript_build 2020-12-05 09:10:10.639446971 +0000 -@@ -153,28 +153,3 @@ +@@ -154,31 +154,3 @@ target=parameter_all, rule=smbdotconf_generate_parameter_list, dep_vars=bld.dynconfig_varnames()) @@ -27,6 +27,9 @@ diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build - if conf.env.build_winexe == True: - bld.SAMBAMANPAGES(winexe_manpages) - +- if bld.CONFIG_SET('ENABLE_SELFTEST'): +- bld.SAMBAMANPAGES('manpages/vfstest.1') +- - for manpage in vfs_module_manpages: - if bld.SAMBA3_IS_ENABLED_MODULE(manpage): - bld.SAMBAMANPAGES('manpages/%s.8' % manpage)