ksmbd: bump version and update luci

This commit is contained in:
coolsnowwolf 2020-07-02 16:35:09 +08:00
parent 09d432ba31
commit 919a46c8dd
8 changed files with 39 additions and 21 deletions

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ksmbd-tools
PKG_VERSION:=3.2.3
PKG_RELEASE:=1
PKG_VERSION:=3.2.6
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd-tools/archive/$(PKG_VERSION)/
PKG_HASH:=d5e56b38f858736849aefd55cfbffe31ae3d4f39a13689aecb3e896f3b048866
PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/ksmbd-tools/tar.gz/$(PKG_VERSION)?
PKG_HASH:=595029adb899fd8b4c49bea75bce4e3c3466811ef7089b2a55960174e720d919
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later

View File

@ -1,3 +1,7 @@
config globals
option 'workgroup' 'WORKGROUP'
option 'description' 'Ksmbd on OpenWrt'
option workgroup 'WORKGROUP'
option description 'OpenWrt'
option name 'OpenWrt'
option autoshare '0'

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ksmbd
PKG_VERSION:=3.1.6
PKG_VERSION:=3.2.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd/archive/$(PKG_VERSION)/
PKG_HASH:=09c1eb39d9dcc9baf6bc9c5a2b91bcea377352bfc507ebdd10a370fffa7c31b4
PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/cifsd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=16ad304c09d5f04ddbe99d21ca9df8a9a6d8e35b21ff0e205f212f8c545b979b
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later

View File

@ -1,5 +1,5 @@
--- a/glob.h 2019-12-08
+++ b/glob.h 2019-12-08
--- a/glob.h
+++ b/glob.h
@@ -7,6 +7,8 @@
#ifndef __KSMBD_GLOB_H
#define __KSMBD_GLOB_H
@ -8,3 +8,4 @@
+
#include <linux/ctype.h>
#include <linux/version.h>

View File

@ -7,7 +7,7 @@ LUCI_DEPENDS:=+ksmbd-server
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-cifsd
PKG_VERSION:=1
PKG_RELEASE:=7
PKG_RELEASE:=12
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -11,7 +11,7 @@ function index()
local page
page = entry({"admin", "nas", "cifsd"}, cbi("cifsd"), _("Network Shares (CIFSD)"))
page = entry({"admin", "nas", "cifsd"}, cbi("cifsd"), _("Network Shares"))
page.dependent = true
end

View File

@ -1,6 +1,6 @@
-- Licensed to the public under the Apache License 2.0.
m = Map("ksmbd", translate("Network Shares (CIFSD)"))
m = Map("ksmbd", translate("Network Shares"))
s = m:section(TypedSection, "globals", translate("CIFSD is an opensource In-kernel SMB1/2/3 server"))
s.anonymous = true
@ -8,11 +8,18 @@ s.anonymous = true
s:tab("general", translate("General Settings"))
s:tab("template", translate("Edit Template"))
s:taboption("general", Value, "name", translate("Hostname"))
s:taboption("general", Value, "description", translate("Description"))
o = s:taboption("general", Value, "workgroup", translate("Workgroup"))
o.placeholder = 'WORKGROUP'
a = s:taboption("general", Flag, "autoshare", translate("Auto Share"),
translate("Auto share local disk which connected"))
a.rmempty = false
a.default = "0"
tmpl = s:taboption("template", Value, "_tmpl",
translate("Edit the template that is used for generating the cifsd configuration."),
translate("This is the content of the file '/etc/ksmbd/smb.conf.template' from which your cifsd configuration will be generated. \
@ -68,9 +75,9 @@ go.enabled = "yes"
go.disabled = "no"
go.default = "yes"
io = s:option(Flag, "inherit_owner", translate("Inherit owner"))
-- io = s:option(Flag, "inherit_owner", translate("Inherit owner"))
hd = s:option(Flag, "hide_dot_files", translate("Hide dot files"))
-- hd = s:option(Flag, "hide_dot_files", translate("Hide dot files"))
cm = s:option(Value, "create_mask", translate("Create mask"),
translate("Mask for new files"))

View File

@ -46,7 +46,7 @@ msgstr "编辑用来生成 cifsd 设置的模板。"
#: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:67
msgid "Force Root"
msgstr "强制 Root"
msgstr "使用 Root"
#: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:21
msgid "General Settings"
@ -102,18 +102,18 @@ msgid ""
"('|') should not be changed. They get their values from the 'General "
"Settings' tab."
msgstr ""
"这是将从其上生成 cifsd 配置的文件“/etc/ksmbd/smb.conf.template”的内容。由管道"
"这是将从其上生成 Ksmbd 配置的文件“/etc/ksmbd/smb.conf.template”的内容。由管道"
"符(“|”)包围的值不应更改。它们将从“常规设置”标签中获取其值。"
#: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:27
msgid "Workgroup"
msgstr "工作组"
msgid "Network Shares (CIFSD)"
msgstr "网络共享 (CIFSD 内核)"
msgid "Network Shares"
msgstr "网络共享"
msgid "CIFSD is an opensource In-kernel SMB1/2/3 server"
msgstr "CIFSD 是一个开源的 Linux 内核级 SMB1/2/3 高性能文件共享服务器"
msgstr "Ksmbd 是一个开源的 Linux 内核级 SMB1/2/3 高性能文件共享服务器"
msgid "Browseable"
msgstr "可浏览"
@ -126,3 +126,9 @@ msgstr "新建文件掩码"
msgid "Mask for new directories"
msgstr "新建文件夹掩码"
msgid "Auto Share"
msgstr "自动共享"
msgid "Auto share local disk which connected"
msgstr "自动匿名共享路由器所连接的硬盘"