jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: update to samba-4.6.14

Browse Source
This commit is contained in:
MilhouseVH 2018-03-13 16:14:13 +00:00
parent bdfc710974
commit 23c5398ba5
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="samba" PKG_NAME="samba"
PKG_VERSION="4.6.10" PKG_VERSION="4.6.14"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPLv3+" PKG_LICENSE="GPLv3+"
PKG_SITE="https://www.samba.org" PKG_SITE="https://www.samba.org"

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

@ -1,37 +1,38 @@
diff -Naur samba-4.5.5/buildtools/wafsamba/wafsamba.py samba-4.5.5.patch/buildtools/wafsamba/wafsamba.py diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
--- samba-4.5.5/buildtools/wafsamba/wafsamba.py 2016-08-11 09:51:04.000000000 +0200 index 4a47dbf..1d8db7a 100644
+++ samba-4.5.5.patch/buildtools/wafsamba/wafsamba.py 2017-02-17 15:33:36.453169574 +0100 --- a/buildtools/wafsamba/wafsamba.py
@@ -330,9 +330,9 @@ +++ b/buildtools/wafsamba/wafsamba.py
@@ -330,11 +330,6 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library: if pc_files is not None and not private_library:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
- if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and - if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
- bld.env['XSLTPROC_MANPAGES']): - bld.env['XSLTPROC_MANPAGES']):
- bld.MANPAGES(manpages, install) - bld.MANPAGES(manpages, install)
+# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and -
+# bld.env['XSLTPROC_MANPAGES']): -
+# bld.MANPAGES(manpages, install)
Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
@@ -437,8 +437,8 @@
@@ -437,9 +432,6 @@ def SAMBA_BINARY(bld, binname, source,
samba_ldflags = pie_ldflags samba_ldflags = pie_ldflags
) )
- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: - if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
- bld.MANPAGES(manpages, install) - bld.MANPAGES(manpages, install)
+# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: -
+# bld.MANPAGES(manpages, install)
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
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 diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
+++ samba-4.5.5.patch/docs-xml/wscript_build 2017-02-17 15:44:45.142392019 +0100 index 093a20d..097fd3b 100644
@@ -127,17 +127,17 @@ --- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -127,21 +127,3 @@ bld.SAMBA_GENERATOR(parameter_all,
target=parameter_all,
rule=smbdotconf_generate_parameter_list, rule=smbdotconf_generate_parameter_list,
dep_vars=bld.dynconfig_varnames()) dep_vars=bld.dynconfig_varnames())
-
-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)
@ -46,17 +47,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)
+#def SMBDOTCONF_MANPAGE(bld, target): -
+# ''' assemble and build smb.conf.5 manual page''' - if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+# bld.SAMBAMANPAGES(target, parameter_all) - bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
+#
+#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
+#
+# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
+# bld.SAMBAMANPAGES(manpages)
+#
+# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
+# bld.SAMBAMANPAGES(pam_winbind_manpages)
+#
+# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+# bld.SAMBAMANPAGES(krb5_locator_manpages)