jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2360 from MilhouseVH/le90_samba474

Browse Source 
samba: update to samba-4.7.4
This commit is contained in:
Christian Hewitt 2017-12-28 23:16:20 +04:00 committed by GitHub
commit 03c3de1a5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/network/samba/package.mk
View File

@ -17,8 +17,8 @@
################################################################################ ################################################################################
PKG_NAME="samba" PKG_NAME="samba"
PKG_VERSION="4.7.3" PKG_VERSION="4.7.4"
PKG_SHA256="06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c" PKG_SHA256="fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPLv3+" PKG_LICENSE="GPLv3+"
PKG_SITE="https://www.samba.org" PKG_SITE="https://www.samba.org"

8
packages/network/samba/patches/samba-950-no-man.patch
View File

@ -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 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/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 +++ 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, rule=smbdotconf_generate_parameter_list,
dep_vars=bld.dynconfig_varnames()) 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'): - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
- bld.SAMBAMANPAGES(krb5_locator_manpages) - bld.SAMBAMANPAGES(krb5_locator_manpages)
-
- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
+#def SMBDOTCONF_MANPAGE(bld, target): +#def SMBDOTCONF_MANPAGE(bld, target):
+# ''' assemble and build smb.conf.5 manual page''' +# ''' assemble and build smb.conf.5 manual page'''
+# bld.SAMBAMANPAGES(target, parameter_all) +# 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'): +# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+# bld.SAMBAMANPAGES(krb5_locator_manpages) +# bld.SAMBAMANPAGES(krb5_locator_manpages)
+#
+# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')

20
packages/network/samba/patches/samba-999-fix-compilation-of-samba-4.7.4-with-disabled-ADS.patch Normal file
View File

@ -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
***********************************************************************/