diff options
| author | Andy Walsh <andy.walsh44+github@gmail.com> | 2019-12-31 14:59:11 +0100 |
|---|---|---|
| committer | Andy Walsh <andy.walsh44+github@gmail.com> | 2020-01-03 19:09:30 +0100 |
| commit | 6c9973a9d9392489aa033c243842fdb29041f578 (patch) | |
| tree | d9b7141363077daf1936bf7602910155db157d44 /kernel | |
| parent | 7fb36fb8d017328f28520efb7932dd0df022fd75 (diff) | |
smbd: rename from cifsd, update to 3.0.1
* follow upstream rename to 'smbd' and 'smbd-tools'
* config is '/config/smbd' and '/etc/smbd/smb.conf'
* smbd: update to 3.0.1
* smbd: fixes delete access on readonly shares
* smbd: add patch to keep version metadata in kmod
* smbd: add synchrous kill_server patches
* smbd-tools: update to 3.0.1
* smbd-tools: userspace service is now 'usmbd'
* smbd-tools: userspace tools are: 'smbuseradd', 'smbshareadd' with /etc/smbd/smbdpwd.db
* smbd-tools: split package into server/utils (reduce size)
* smbd-tools: fix init (luci save&apply)
* smbd-tools: remove kill_server related timeouts
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cifsd/Makefile | 53 | ||||
| -rw-r--r-- | kernel/smbd/Makefile | 52 | ||||
| -rw-r--r-- | kernel/smbd/patches/01-keep_kmod_metadata.patch | 10 |
3 files changed, 62 insertions, 53 deletions
diff --git a/kernel/cifsd/Makefile b/kernel/cifsd/Makefile deleted file mode 100644 index 890a5eb4c..000000000 --- a/kernel/cifsd/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=cifsd -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd.git -PKG_SOURCE_DATE:=2019-11-27 -PKG_SOURCE_VERSION:=b8675c8ac144ece00f3e6bcc5436c8ace99e23e9 -PKG_MIRROR_HASH:=3d67af87f30d837f95510663efc42f1451651dc235987408924b56cb277fc8e8 - -PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com> -PKG_LICENSE:=GPL-2.0-or-later -PKG_LICENSE_FILES:=COPYING - -include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/fs-cifsd - SUBMENU:=Filesystems - TITLE:=CIFS/SMB kernel server support - URL:=https://github.com/cifsd-team/cifsd - FILES:=$(PKG_BUILD_DIR)/cifsd.ko - DEPENDS:= \ - +kmod-nls-base \ - +kmod-nls-utf8 \ - +kmod-crypto-md4 \ - +kmod-crypto-md5 \ - +kmod-crypto-hmac \ - +kmod-crypto-ecb \ - +kmod-crypto-des \ - +kmod-crypto-sha256 \ - +kmod-crypto-cmac \ - +kmod-crypto-sha512 \ - +kmod-crypto-aead \ - +kmod-crypto-ccm -endef - -define KernelPackage/fs-cifsd/description - Kernel module for a CIFS/SMBv2,3 fileserver. -endef - -# broken atm (needs CONFIG_KEYS=y) -#EXTRA_CFLAGS+=-DCONFIG_CIFSD_ACL - -define Build/Compile - $(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" \ - EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ - CONFIG_CIFS_SERVER=m \ - modules -endef - -$(eval $(call KernelPackage,fs-cifsd)) diff --git a/kernel/smbd/Makefile b/kernel/smbd/Makefile new file mode 100644 index 000000000..cb6da11af --- /dev/null +++ b/kernel/smbd/Makefile @@ -0,0 +1,52 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=smbd +PKG_VERSION:=3.0.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:=6d1bf695aacd5a009eb30c10b31ff7c8942c8f201f7eb436b3cfa66f49d1f9f5 + +PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com> +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING + +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/fs-smbd + SUBMENU:=Filesystems + TITLE:=SMB kernel server support + URL:=https://github.com/cifsd-team/smbd + FILES:=$(PKG_BUILD_DIR)/smbd.ko + DEPENDS:= \ + +kmod-nls-base \ + +kmod-nls-utf8 \ + +kmod-crypto-md4 \ + +kmod-crypto-md5 \ + +kmod-crypto-hmac \ + +kmod-crypto-arc4 \ + +kmod-crypto-ecb \ + +kmod-crypto-des \ + +kmod-crypto-sha256 \ + +kmod-crypto-cmac \ + +kmod-crypto-sha512 \ + +kmod-crypto-aead \ + +kmod-crypto-ccm \ + +kmod-crypto-gcm +endef + +define KernelPackage/fs-smbd/description + Smbd 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 + +define Build/Compile + $(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" \ + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + CONFIG_SMB_SERVER=m \ + modules +endef + +$(eval $(call KernelPackage,fs-smbd)) diff --git a/kernel/smbd/patches/01-keep_kmod_metadata.patch b/kernel/smbd/patches/01-keep_kmod_metadata.patch new file mode 100644 index 000000000..9240852c8 --- /dev/null +++ b/kernel/smbd/patches/01-keep_kmod_metadata.patch @@ -0,0 +1,10 @@ +--- a/glob.h 2019-12-08 ++++ b/glob.h 2019-12-08 +@@ -7,6 +7,8 @@ + #ifndef __SMBD_GLOB_H + #define __SMBD_GLOB_H + ++#undef CONFIG_MODULE_STRIPPED ++ + #include <linux/ctype.h> + #include <linux/version.h> |