summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAndy Walsh <andy.walsh44+github@gmail.com>2020-01-26 16:32:53 +0100
committerAndy Walsh <andy.walsh44+github@gmail.com>2020-01-26 16:32:53 +0100
commit664479fa8965c469e552eeec94e7678c28bc157b (patch)
tree43085eea2384f3c1bd128494a969420fd60861b2 /kernel
parentc488ebe588455b27a4eed8a80ba96aeaaa828b37 (diff)
smbd: update to 3.1.1, rename to "ksmbd", "ksmbd-tools"
* rename smbd->ksmbd (upstream name change) * ksmbd-tools: build with static glib2 (usmbd = ~90kb, smbuseradd = ~40kb) * new etc folder location = /etc/ksmbd/smb.conf * new database name = /etc/ksmbd/ksmbdpwd.db * fixes "map to guest = Bad User" while userdb is also used * fixes missing ipv6 support * update/rename to "luci-app-ksmbd" * remove UCI samba compatibility code for section names (ksmbd uses [share] + [globals] not [sambashare] + [global]) * ksmbd: release 3.1.1 version * ksmbd: does not work if ipv6 module is not loaded or compiled in * ksmbd: capsule ifdef CONFIG_SMB_INSECURE_SERVER with smb1 codes * ksmbd: release 3.1.0 version * ksmbd: fix over 80 character warnings * ksmbd: rename smbd-tools to ksmbd-tools in travis.yml * ksmbd: fix password db file location in travis.yml * ksmbd: rename smbd prefix function to ksmbd * ksmbd: rename smbd prefix source files to ksmbd * Revert "smbd: set connection status with SMBD_SESS_EXITING instead of direct destory" * ksmbd: rename smbd to ksmbd in .travis.yml * smbd: rename module name to ksmbd.ko * smbd: set connection status with SMBD_SESS_EXITING instead of direct destory * smbd: previous session with same user and same password should be deleted * smbd: only use global session table in smb2 session * smbd: add support for ipv6 * smbd: fix empty macro issue from smbd_debug * cifsd: fix printing of file names in find_next Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ksmbd/Makefile (renamed from kernel/smbd/Makefile)18
-rw-r--r--kernel/ksmbd/patches/01-keep_kmod_metadata.patch (renamed from kernel/smbd/patches/01-keep_kmod_metadata.patch)4
2 files changed, 11 insertions, 11 deletions
diff --git a/kernel/smbd/Makefile b/kernel/ksmbd/Makefile
index f5c541fb5..b6d93678f 100644
--- a/kernel/smbd/Makefile
+++ b/kernel/ksmbd/Makefile
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=smbd
-PKG_VERSION:=3.0.2
+PKG_NAME:=ksmbd
+PKG_VERSION:=3.1.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/cifsd-team/$(PKG_NAME)/archive/$(PKG_VERSION)/
-PKG_HASH:=13e256fed6992fddec5027d0866bc1eb4ff8da1e5f6a41b3296007f5cceb1a0a
+PKG_HASH:=5cf00902b77206a56f20b8ec499aea061292a15003bbdd8194fcb2299fb2343e
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
@@ -15,11 +15,11 @@ PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.mk
-define KernelPackage/fs-smbd
+define KernelPackage/fs-ksmbd
SUBMENU:=Filesystems
TITLE:=SMB kernel server support
- URL:=https://github.com/cifsd-team/smbd
- FILES:=$(PKG_BUILD_DIR)/smbd.ko
+ URL:=https://github.com/cifsd-team/ksmbd
+ FILES:=$(PKG_BUILD_DIR)/ksmbd.ko
DEPENDS:= \
+kmod-nls-base \
+kmod-nls-utf8 \
@@ -37,8 +37,8 @@ define KernelPackage/fs-smbd
+kmod-crypto-gcm
endef
-define KernelPackage/fs-smbd/description
- Smbd is an In-kernel SMB2/3 fileserver.
+define KernelPackage/fs-ksmbd/description
+ Ksmbd is an In-kernel SMB2/3 fileserver.
It's an implementation of the SMB protocol in kernel space for sharing files and IPC services over network.
endef
@@ -49,4 +49,4 @@ define Build/Compile
modules
endef
-$(eval $(call KernelPackage,fs-smbd))
+$(eval $(call KernelPackage,fs-ksmbd))
diff --git a/kernel/smbd/patches/01-keep_kmod_metadata.patch b/kernel/ksmbd/patches/01-keep_kmod_metadata.patch
index 9240852c8..9fc547f2a 100644
--- a/kernel/smbd/patches/01-keep_kmod_metadata.patch
+++ b/kernel/ksmbd/patches/01-keep_kmod_metadata.patch
@@ -1,8 +1,8 @@
--- a/glob.h 2019-12-08
+++ b/glob.h 2019-12-08
@@ -7,6 +7,8 @@
- #ifndef __SMBD_GLOB_H
- #define __SMBD_GLOB_H
+ #ifndef __KSMBD_GLOB_H
+ #define __KSMBD_GLOB_H
+#undef CONFIG_MODULE_STRIPPED
+