Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18145 from hauke/samba4

Browse source 
[21.02] Samba4 backports from master (Fix CVEs)
This commit is contained in:
Josef Schlehofer 2022-03-26 20:46:04 +01:00 committed by GitHub
commit c04905dd90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/samba4/Makefile
View file

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=samba PKG_NAME:=samba
PKG_VERSION:=4.14.7 PKG_VERSION:=4.14.12
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -13,7 +13,7 @@ PKG_SOURCE_URL:= \
http://www.nic.funet.fi/index/samba/pub/samba/stable/ \ http://www.nic.funet.fi/index/samba/pub/samba/stable/ \
http://samba.mirror.bit.nl/samba/ftp/stable/ \ http://samba.mirror.bit.nl/samba/ftp/stable/ \
https://download.samba.org/pub/samba/stable/ https://download.samba.org/pub/samba/stable/
PKG_HASH:=6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906 PKG_HASH:=155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com> PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-3.0-only PKG_LICENSE:=GPL-3.0-only
@ -259,7 +259,7 @@ ifdef CONFIG_KERNEL_IO_URING
SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_io_uring, SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_io_uring,
endif endif
ifeq ($(CONFIG_SAMBA4_SERVER_VFS),y) ifeq ($(CONFIG_SAMBA4_SERVER_VFS),y)
SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_fruit,vfs_shadow_copy2,vfs_recycle,vfs_fake_perms,vfs_readonly,vfs_cap,vfs_offline,vfs_crossrename,vfs_catia,vfs_streams_xattr,vfs_xattr_tdb,vfs_default_quota, SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_fruit,vfs_shadow_copy2,vfs_recycle,vfs_fake_perms,vfs_readonly,vfs_cap,vfs_offline,vfs_crossrename,vfs_catia,vfs_streams_xattr,vfs_xattr_tdb,vfs_default_quota,vfs_widelinks,
ifdef CONFIG_PACKAGE_kmod-fs-btrfs ifdef CONFIG_PACKAGE_kmod-fs-btrfs
SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_btrfs, SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_btrfs,
endif endif

15
net/samba4/patches/011-samba-4-14-disable-python-module-host-check.patch Normal file
View file

@ -0,0 +1,15 @@
--- a/python/wscript
+++ b/python/wscript
@@ -73,9 +73,9 @@ def configure(conf):
for module, package in selftest_pkgs.items():
find_third_party_module(conf, module, package)
- if not Options.options.without_ad_dc:
- for module, package in ad_dc_pkgs.items():
- find_third_party_module(conf, module, package)
+# if not Options.options.without_ad_dc:
+# for module, package in ad_dc_pkgs.items():
+# find_third_party_module(conf, module, package)
def build(bld):

2
net/samba4/patches/101-do-not-check-xsltproc-manpages.patch
View file

@ -4,7 +4,7 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
--- a/lib/ldb/wscript --- a/lib/ldb/wscript
+++ b/lib/ldb/wscript +++ b/lib/ldb/wscript
@@ -143,7 +143,7 @@ def configure(conf): @@ -144,7 +144,7 @@ def configure(conf):
conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2]))
if conf.env.standalone_ldb: if conf.env.standalone_ldb: