[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: ksmbd: add SMB v1 support kernel: bump 6.12 to 6.12.3 Revert "tools: update versions" uqmi: update to latest HEAD
BCYDTZ · Dec 6, 2024 · afe98d4 · afe98d4
2 parents e927735 + cb4244d
commit afe98d4
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 11 deletions.
diff --git a/include/kernel-6.12 b/include/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .1
-LINUX_KERNEL_HASH-6.12.1 = 0193b1d86dd372ec891bae799f6da20deef16fc199f30080a4ea9de8cef0c619
+LINUX_VERSION-6.12 = .3
+LINUX_KERNEL_HASH-6.12.3 = c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae
diff --git a/package/kernel/ksmbd/Makefile b/package/kernel/ksmbd/Makefile
@@ -42,8 +42,27 @@ endef
 # The last two DEPENDS are hacks in order to get CONFIG_ASN1 and CONFIG_OID_REGISTRY
 # which it seems can't be selected independently. Some bug in either base or upstream.
 
+define KernelPackage/fs-ksmbd/description
+  Ksmbd is an In-kernel SMBv(1)2/3 fileserver.
+  It's an implementation of the SMB protocol in kernel space for sharing files and IPC services over network.
+endef
+define KernelPackage/fs-ksmbd/config
+config KSMBD_SMB_INSECURE_SERVER
+	bool "Support for insecure SMB1/CIFS and SMB2.0 protocols"
+	depends on PACKAGE_kmod-fs-ksmbd
+	help
+		This enables deprecated insecure protocols dialects: SMB1/CIFS and SMB2.0.
+	default n
+endef
+ifeq ($(CONFIG_KSMBD_SMB_INSECURE_SERVER),y)
+PKG_EXTRA_KCONFIG:=CONFIG_SMB_INSECURE_SERVER=y
+EXTRA_CFLAGS += -DCONFIG_SMB_INSECURE_SERVER=1
+endif
+
 define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(PKG_EXTRA_KCONFIG) \
 	CONFIG_SMB_SERVER=m \
 	modules
 endef

diff --git a/package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch b/package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch
@@ -5,7 +5,7 @@
  #endif
 
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 60)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 110)
  static inline bool is_dot_dotdot(const char *name, size_t len)
  {
  	return len && unlikely(name[0] == '.') &&
diff --git a/tools/b43-tools/Makefile b/tools/b43-tools/Makefile
@@ -13,7 +13,7 @@ PKG_DATE:=2022-07-05
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mbuesch/b43-tools.git
 PKG_SOURCE_VERSION:=2fe10ea6690df9a068cb21cde537236bae784a14
-PKG_MIRROR_HASH:=4009d6c1f9ede43102897d6ebf4bd954331f3c4e2a94d4e61c0e5f303f929914
+PKG_MIRROR_HASH:=4f1cde5da35a1e768f6a01d67888549d04512073990769342381af1b2c9e7fd2
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/cbootimage-configs/Makefile b/tools/cbootimage-configs/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_DATE := 2017-04-13
 PKG_SOURCE_PROTO := git
 PKG_SOURCE_URL := https://github.com/NVIDIA/cbootimage-configs.git
 PKG_SOURCE_VERSION := 7c3b458b93ed6947cd083623f543e93f9103cc0f
-PKG_MIRROR_HASH := 6ba2dde907d3cc403720954738a92431b1f40d562db5815c08971c39374d72a1
+PKG_MIRROR_HASH := 1d24421af8cf74ec2d625e237aa8121b1273774c4380ad333e2954e052a5a4fe
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/cbootimage/Makefile b/tools/cbootimage/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION := 1.8
 PKG_SOURCE_PROTO := git
 PKG_SOURCE_URL := https://github.com/NVIDIA/cbootimage.git
 PKG_SOURCE_VERSION := 7c9db585d06cce9efffa2a82245f233233680060
-PKG_MIRROR_HASH := e38b1e9581524fcabc7b24fff1c18d13f7e3a93accf73c55caf33832249bfd03
+PKG_MIRROR_HASH := 84d9abaaa3eddde05f506dc16effe1c9e18eb94727ed59c5e0a879baeb04e0b2
 
 HOST_BUILD_PARALLEL := 1
 

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=e2fsprogs
 PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
 PKG_VERSION:=1.46.6
-PKG_HASH:=skip
+PKG_HASH:=8749efc57cda3b6cfcb16a2d2ccd8b8be676c8827e5bae338aa327219a9c2fc4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
@@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
 PKG_SOURCE_DATE:=2024-10-20
 PKG_SOURCE_VERSION:=4b7638925d3eac03e614e40bc30cb49f5877c46d
-PKG_MIRROR_HASH:=ea0e30f2b20211e4153704019ebb3f8789269893a4af6d853a85fae7c091802c
+PKG_MIRROR_HASH:=849193bcd9b7be96eada2219f3e8b2d229186cae4e4b7a8746375480fbcd2683
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk

diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile
@@ -13,7 +13,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/make_ext4fs.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2020-01-05
 PKG_SOURCE_VERSION:=5c201be7d72aff735da27e17c29852e0cefe3e52
-PKG_MIRROR_HASH:=ec8304dc06f94338e14e608a807f48e10d0987bdac4d90f235650b46994dfbd7
+PKG_MIRROR_HASH:=a9b74b7b95acc84a5a5c33d6acf493faad8f161caca3180734d9bd383c9d823f
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/sdimage/Makefile b/tools/sdimage/Makefile
@@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mhei/fsl-imx-uuc.git
 PKG_SOURCE_DATE:=2018-11-18
 PKG_SOURCE_VERSION:=c6536ac5b4388b33c217bde2c3a76a4e96d64176
-PKG_MIRROR_HASH:=c4487635ea06ea6311a28739c58f7f889b888c91b7ccc0398d225b4bcdeb76a3
+PKG_MIRROR_HASH:=747fb640a0596cab7d516979188e1f85be58c470df85cf1f7e3dcf8a4c1b36e5
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=LICENSE

diff --git a/tools/squashfs4/Makefile b/tools/squashfs4/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools
 PKG_SOURCE_DATE:=2023-03-26
 PKG_SOURCE_VERSION:=d8cb82d9840330f9344ec37b992595b5d7b44184
-PKG_MIRROR_HASH:=e84026de1ab187f3f76d1b781a29259d818f887e1651225f850a62d6f90b1b9e
+PKG_MIRROR_HASH:=fc625af657ca284d69fbc32e3bb572d0afd566cf816b7c1c1b66dda0a0c2760a
 
 HOST_BUILD_PARALLEL:=1