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

Merge pull request #2919 from MilhouseVH/le90_samba_4.8.5

Browse Source 
samba: update to samba-4.8.5
This commit is contained in:
Christian Hewitt 2018-08-25 09:37:41 +04:00 committed by GitHub
commit 10cba266d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 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

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="samba" PKG_NAME="samba"
PKG_VERSION="4.8.4" PKG_VERSION="4.8.5"
PKG_SHA256="f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406" PKG_SHA256="e58ee6b1262d4128b8932ceee59d5f0b0a9bbe00547eb3cc4c41552de1a65155"
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,20 +127,20 @@ @@ -127,23 +127,23 @@
rule=smbdotconf_generate_parameter_list, rule=smbdotconf_generate_parameter_list,
dep_vars=bld.dynconfig_varnames()) 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'): - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
- bld.SAMBAMANPAGES(krb5_locator_manpages) - 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'): - if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') - bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
+#def SMBDOTCONF_MANPAGE(bld, target): +#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'): +# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+# bld.SAMBAMANPAGES(krb5_locator_manpages) +# 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'): +# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') +# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
--- a/source4/scripting/wscript_build 2018-03-20 12:19:12.059332486 +0100 --- a/source4/scripting/wscript_build 2018-03-20 12:19:12.059332486 +0100