From bc33dcd0e7f3383bfcb7b50aaba3c765304e53fc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 27 Dec 2017 10:34:33 +0000 Subject: [PATCH 1/2] samba: update to samba-4.7.4 --- 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 e48dfef56e..5739605939 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="samba" -PKG_VERSION="4.7.3" -PKG_SHA256="06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c" +PKG_VERSION="4.7.4" +PKG_SHA256="fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247" 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 6734d15922..1ed940d2fe 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,17 +127,17 @@ +@@ -127,20 +127,20 @@ rule=smbdotconf_generate_parameter_list, dep_vars=bld.dynconfig_varnames()) @@ -46,6 +46,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.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): +- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') +#def SMBDOTCONF_MANPAGE(bld, target): +# ''' assemble and build smb.conf.5 manual page''' +# bld.SAMBAMANPAGES(target, parameter_all) @@ -60,3 +63,6 @@ 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.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): ++# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') From c68c0315bba8d38da9056e661cfa8d5bd4a2fec2 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 27 Dec 2017 14:44:24 +0000 Subject: [PATCH 2/2] samba: add patch to fix compilation with disabled ADS See: https://lists.samba.org/archive/samba-technical/2017-December/124629.html --- ...ion-of-samba-4.7.4-with-disabled-ADS.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/network/samba/patches/samba-999-fix-compilation-of-samba-4.7.4-with-disabled-ADS.patch diff --git a/packages/network/samba/patches/samba-999-fix-compilation-of-samba-4.7.4-with-disabled-ADS.patch b/packages/network/samba/patches/samba-999-fix-compilation-of-samba-4.7.4-with-disabled-ADS.patch new file mode 100644 index 0000000000..6e956bb470 --- /dev/null +++ b/packages/network/samba/patches/samba-999-fix-compilation-of-samba-4.7.4-with-disabled-ADS.patch @@ -0,0 +1,20 @@ +--- a/source3/libads/kerberos_keytab.c.orig 2017-12-23 14:23:53.247467000 +0100 ++++ b/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 +@@ -32,8 +32,6 @@ + + #ifdef HAVE_KRB5 + +-#ifdef HAVE_ADS +- + /* This MAX_NAME_LEN is a constant defined in krb5.h */ + #ifndef MAX_KEYTAB_NAME_LEN + #define MAX_KEYTAB_NAME_LEN 1100 +@@ -85,6 +83,8 @@ + return ret; + } + ++#ifdef HAVE_ADS ++ + /********************************************************************** + Adds a single service principal, i.e. 'host' to the system keytab + ***********************************************************************/