From c2c24ecb23b66ab8e62bcb1ccab89c04a5212bcb Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 24 Aug 2018 17:25:27 +0100 Subject: [PATCH] samba: update to samba-4.8.5 --- packages/network/samba/package.mk | 4 ++-- packages/network/samba/patches/samba-950-no-man.patch | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 693ce23f7d..8e20b1ecb2 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.8.4" -PKG_SHA256="f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406" +PKG_VERSION="4.8.5" +PKG_SHA256="e58ee6b1262d4128b8932ceee59d5f0b0a9bbe00547eb3cc4c41552de1a65155" PKG_ARCH="any" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" diff --git a/packages/network/samba/patches/samba-950-no-man.patch b/packages/network/samba/patches/samba-950-no-man.patch index 4bb0195b45..69867e9f75 100644 --- a/packages/network/samba/patches/samba-950-no-man.patch +++ b/packages/network/samba/patches/samba-950-no-man.patch @@ -28,7 +28,7 @@ diff -Naur samba-4.5.5/buildtools/wafsamba/wafsamba.py samba-4.5.5.patch/buildto diff -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript_build --- samba-4.5.5/docs-xml/wscript_build 2016-08-11 09:51:04.000000000 +0200 +++ samba-4.5.5.patch/docs-xml/wscript_build 2017-02-17 15:44:45.142392019 +0100 -@@ -127,20 +127,20 @@ +@@ -127,23 +127,23 @@ rule=smbdotconf_generate_parameter_list, dep_vars=bld.dynconfig_varnames()) @@ -47,6 +47,9 @@ diff -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): - bld.SAMBAMANPAGES(krb5_locator_manpages) - +- if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): +- bld.SAMBAMANPAGES(krb5_localauth_manpages) +- - if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): - bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') +#def SMBDOTCONF_MANPAGE(bld, target): @@ -64,6 +67,9 @@ diff -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript +# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): +# bld.SAMBAMANPAGES(krb5_locator_manpages) +# ++# if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): ++# bld.SAMBAMANPAGES(krb5_localauth_manpages) ++# +# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): +# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') --- a/source4/scripting/wscript_build 2018-03-20 12:19:12.059332486 +0100