diff --git a/package/ctcgfw/rclone-ng/Makefile b/package/ctcgfw/rclone-ng/Makefile index 2ddc65622d..4dc84629f2 100644 --- a/package/ctcgfw/rclone-ng/Makefile +++ b/package/ctcgfw/rclone-ng/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.3.2 PKG_RELEASE:=1 PKG_LICENSE:=GPLv3 @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=b6f7254fcb82d380ad621859a216fbf510059c95ad2df0e27bcf2872892f7c6f +PKG_HASH:=441fdfa577bdda7f58f62f6e75174a4a48e44d7c1361f7123d9699d791c08b5a define Package/$(PKG_NAME) SECTION:=net diff --git a/package/ctcgfw/rclone/Makefile b/package/ctcgfw/rclone/Makefile index 747a8f1b7a..ab7e30b840 100644 --- a/package/ctcgfw/rclone/Makefile +++ b/package/ctcgfw/rclone/Makefile @@ -10,16 +10,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.51.0 +PKG_VERSION:=1.52.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/rclone/rclone.git -PKG_SOURCE_DATE:=2020-02-01 -PKG_SOURCE_VERSION:=43daecd89b21292b112051340317927b42ccbdd3 +PKG_SOURCE_DATE:=2020-06-10 +PKG_SOURCE_VERSION:=31dc78905ea8dfb22c43724527b19e097e05c26a PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=aca159c81971a9490a6a6c323b67879dccba3860955b66787d91590f4ba8ba29 +PKG_MIRROR_HASH:=fa79f62babc2f42691c9ad83ef906e90061d4ca6adcc97150c2906605312db66 PKG_LICENSE:=GPLv3 PKG_MAINTAINER:=ElonH diff --git a/package/ctcgfw/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch b/package/ctcgfw/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch deleted file mode 100644 index 5317aa56f6..0000000000 --- a/package/ctcgfw/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch +++ /dev/null @@ -1,44 +0,0 @@ -## -# File: /patches/020-Notice-Access-Control-Allow-Origin-only-once.patch -# Project: rclone -# File Created: Sunday, 3rd May 2020 1:44:22 pm -# Author: ElonH[EH](elonhhuang@gmail.com) -# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) -# Copyright (C) 2020 [ElonH] -## -diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.go -index 4a2b5c71e..f00994e93 100644 ---- a/fs/rc/rcserver/rcserver.go -+++ b/fs/rc/rcserver/rcserver.go -@@ -14,6 +14,7 @@ import ( - "regexp" - "sort" - "strings" -+ "sync" - - "github.com/pkg/errors" - "github.com/rclone/rclone/cmd/serve/httplib" -@@ -29,6 +30,8 @@ import ( - "github.com/skratchdot/open-golang/open" - ) - -+var onlyOnce sync.Once -+ - // Start the remote control server if configured - // - // If the server wasn't configured the *Server returned may be nil -@@ -172,9 +175,11 @@ func (s *Server) handler(w http.ResponseWriter, r *http.Request) { - - allowOrigin := rcflags.Opt.AccessControlAllowOrigin - if allowOrigin != "" { -- if allowOrigin == "*" { -- fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") -- } -+ onlyOnce.Do(func() { -+ if allowOrigin == "*" { -+ fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") -+ } -+ }) - w.Header().Add("Access-Control-Allow-Origin", allowOrigin) - } else { - w.Header().Add("Access-Control-Allow-Origin", s.URL()) diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index 77bc80606f..983ab1ff1d 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic-Go PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git @@ -44,7 +44,7 @@ define Build/Prepare endef define Build/Configure - + patch -p1 -d $(BUILD_DIR)/$(PKG_NAME) <./patches/01-fix-endpoint.patch endef define Build/Compile diff --git a/package/lean/UnblockNeteaseMusic-Go/patches/01-fix-endpoint.patch b/package/lean/UnblockNeteaseMusic-Go/patches/01-fix-endpoint.patch new file mode 100644 index 0000000000..c67f83ef2c --- /dev/null +++ b/package/lean/UnblockNeteaseMusic-Go/patches/01-fix-endpoint.patch @@ -0,0 +1,13 @@ +diff --git a/processor/processor.go b/processor/processor.go +index a35f8df..a7e3015 100644 +--- a/processor/processor.go ++++ b/processor/processor.go +@@ -393,7 +393,7 @@ + //data["url"] = uri.Scheme + "://" + uri.Host + uri.EscapedPath() + //data["url"] = uri.String() + if *config.EndPoint { +- data["url"] = "http://music.163.com/unblockmusic/" + uri.String() ++ data["url"] = "https://music.163.com/unblockmusic/" + uri.String() + } else { + data["url"] = uri.String() + } diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index c2c945d585..c7386e4336 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic PKG_VERSION:=0.25.3 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=MIT PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=610ff1716aa3698cd2e9391ff808a35a05719586 +PKG_SOURCE_VERSION:=1193e29a2c8f72c738d2988d5cf5afbb2fee7463 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 1cf9e61686..e4b1903cbb 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.1 -PKG_RELEASE:=59 +PKG_RELEASE:=60 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/luci-app-kodexplorer/Makefile b/package/lean/luci-app-kodexplorer/Makefile index 5327192857..91245e646a 100644 --- a/package/lean/luci-app-kodexplorer/Makefile +++ b/package/lean/luci-app-kodexplorer/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for KodExplorer -LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +php7-mod-sqlite3 +php7-mod-pdo +php7-mod-pdo-sqlite +php7-mod-pdo-mysql LUCI_PKGARCH:=all -PKG_VERSION:=1.1 -PKG_RELEASE:=20200210 +PKG_VERSION:=13 +PKG_DATE:=20200612 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index 08ec22fba6..b8b2347c8f 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -8,15 +8,11 @@ function index() if not nixio.fs.access("/etc/config/kodexplorer") then return end entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), - _("KodExplorer"), 3).dependent = true + entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3).dependent = true - entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = - true - entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = - true - entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = - true + entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = true + entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = true + entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = true end local function http_write_json(content) @@ -26,12 +22,8 @@ end function act_status() local e = {} - e.nginx_status = luci.sys.call( - "ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == - 0 - e.php_status = luci.sys.call( - "ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == - 0 + e.nginx_status = luci.sys.call("ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 + e.php_status = luci.sys.call("ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 http_write_json(e) end diff --git a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua index ac00a4cc61..949dd094f2 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua @@ -7,26 +7,12 @@ local i18n = require "luci.i18n" module("luci.model.cbi.kodexplorer.api", package.seeall) local appname = "kodexplorer" -local api_url = - "https://api.github.com/repos/kalcaddle/KodExplorer/releases/latest" -local download_url = "https://github.com/kalcaddle/KodExplorer/archive/" +local api_url = "https://api.kodcloud.com/?app/version" local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" -} +local wget_args = { "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" } local command_timeout = 300 -function uci_get_type(type, config, default) - value = uci:get(appname, "@" .. type .. "[0]", config) or sys.exec( - "echo -n `uci -q get " .. appname .. ".@" .. type .. "[0]." .. - config .. "`") - if (value == nil or value == "") and (default and default ~= "") then - value = default - end - return value -end - local function _unpack(t, i) i = i or 1 if t[i] ~= nil then return t[i], _unpack(t, i + 1) end @@ -77,6 +63,15 @@ local function exec(cmd, args, writer, timeout) end end +function get_project_directory() + return uci:get(appname, "@global[0]", "project_directory") or "/tmp/kodcloud" +end + +function get_version() + local version = get_project_directory() .. "/config/version.php" + return sys.exec(string.format("echo -n $(cat %s 2>/dev/null | grep \"'KOD_VERSION'\" | cut -d \"'\" -f 4)", version)) +end + local function compare_versions(ver1, comp, ver2) local table = table @@ -108,42 +103,16 @@ local function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec("wget-ssl -q --no-check-certificate -O- " .. url) + local json_content = sys.exec(wget .. " --no-check-certificate --timeout=10 -t 1 -O- " .. url) if json_content == "" then return {} end return jsonc.parse(json_content) or {} end -function get_project_directory() - return uci_get_type("global", "project_directory", "/tmp/kodexplorer") -end - function to_check() local json = get_api_json(api_url) - if json.tag_name == nil then - return { - code = 1, - error = i18n.translate("Get remote version info failed.") - } - end - local remote_version = json.tag_name - local html_url = json.html_url - download_url = download_url .. json.tag_name .. ".tar.gz" - if not download_url then - return { - code = 1, - version = remote_version, - html_url = html_url, - error = i18n.translate( - "New version found, but failed to get new version download url.") - } - end - return { - code = 0, - version = remote_version, - url = {html = html_url, download = download_url} - } + return json end function to_download(url) @@ -151,13 +120,11 @@ function to_download(url) return {code = 1, error = i18n.translate("Download url is required.")} end - sys.call("/bin/rm -f /tmp/kodexplorer_download.*") + sys.call("/bin/rm -f /tmp/kodcloud_download.*") - local tmp_file = util.trim(util.exec( - "mktemp -u -t kodexplorer_download.XXXXXX")) + local tmp_file = util.trim(util.exec("mktemp -u -t kodcloud_download.XXXXXX")) - local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil, - command_timeout) == 0 + local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil, command_timeout) == 0 if not result then exec("/bin/rm", {"-f", tmp_file}) @@ -175,13 +142,11 @@ function to_extract(file) return {code = 1, error = i18n.translate("File path required.")} end - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") - local tmp_dir = util.trim(util.exec( - "mktemp -d -t kodexplorer_extract.XXXXXX")) + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") + local tmp_dir = util.trim(util.exec("mktemp -d -t kodcloud_extract.XXXXXX")) local output = {} - exec("/bin/tar", {"-C", tmp_dir, "-zxvf", file}, - function(chunk) output[#output + 1] = chunk end) + exec("/usr/bin/unzip", {"-o", file, "-d", tmp_dir}, function(chunk) output[#output + 1] = chunk end) local files = util.split(table.concat(output)) @@ -192,14 +157,14 @@ end function to_move(file) if not file or file == "" or not fs.access(file) then - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") return {code = 1, error = i18n.translate("Client file is required.")} end local client_file = get_project_directory() sys.call("mkdir -p " .. client_file) - sys.call("cp -R " .. file .. "/KodExplorer*/* " .. client_file) - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") + sys.call("cp -R " .. file .. "/* " .. client_file) + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") return {code = 0} end diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm index fa271d6a6f..21e5228362 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm @@ -1,161 +1,163 @@ -<% -local dsp = require "luci.dispatcher" --%> + + // Move file to target dir + doAjaxGet(UpdateUrl, { + token: tokenStr, + task: 'move', + file: json.file + }, function (json) { + removePageNotice(); + if (json.code) { + onRequestError(btn, json.error); + } else { + onUpdateSuccess(btn); + } + }) + } + }) + } + }) + } + //]]> + <%+cbi/valueheader%> <% if self:cfgvalue(section) ~= false then %> diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm index 8b0a84b122..61ab40ff6e 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm @@ -22,10 +22,17 @@ local dsp = require "luci.dispatcher" XHR.poll(3,'<%=dsp.build_url("admin/nas/kodexplorer/status")%>', null, function(x, json) { if (x && x.status == 200) { - if (nginx_status) - nginx_status.innerHTML = json.nginx_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; - if (php_status) + if (nginx_status) { + nginx_status.innerHTML = json.nginx_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; + } + if (php_status) { php_status.innerHTML = json.php_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; + } } - }); + } + ); + function openwebui(){ + var url = window.location.host+":<%=luci.sys.exec("uci -q get kodexplorer.@global[0].port"):gsub("^%s*(.-)%s*$", "%1")%>"; + window.open('http://'+url,'target',''); + } //]]> \ No newline at end of file diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm index 1a9c6d61a8..c51541733d 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm @@ -1,16 +1,16 @@ <% -local kodexplorer_path = luci.sys.exec("echo -n `uci get kodexplorer.@global[0].project_directory`") -local kodexplorer_version = luci.sys.exec("[ -f '" .. kodexplorer_path .. "/ChangeLog.md' ] && echo -n `cat " .. kodexplorer_path .. "/ChangeLog.md | head -1 | awk '{print $2}'`") +local api = require "luci.model.cbi.kodexplorer.api" +local app_version = api.get_version() -%> -<% if kodexplorer_version ~= nil and kodexplorer_version~="" then %> +<% if app_version and app_version ~= "" then %>
- 【 <%=kodexplorer_version%> 】 + 【 <%=app_version%> 】
diff --git a/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer b/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer index 3b91962769..4ac2bb5029 100755 --- a/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer +++ b/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer @@ -8,5 +8,5 @@ uci -q batch <<-EOF >/dev/null EOF /etc/init.d/php7-fpm disable && /etc/init.d/php7-fpm stop -rm -f /tmp/luci-indexcache +rm -rf /tmp/luci-*cache exit 0 diff --git a/package/lean/luci-app-ps3netsrv/Makefile b/package/lean/luci-app-ps3netsrv/Makefile new file mode 100644 index 0000000000..89c3dc0fd1 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Luci for PS3NETSRV +LUCI_DEPENDS:=+ps3netsrv +LUCI_PKGARCH:=all +PKG_VERSION:=1 +PKG_RELEASE:=2 + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature + diff --git a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua new file mode 100644 index 0000000000..66dc6307a8 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua @@ -0,0 +1,21 @@ +module("luci.controller.ps3netsrv",package.seeall) + +function index() +if not nixio.fs.access("/etc/config/ps3netsrv")then + return +end + +entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false + +local page + +entry({"admin", "nas","ps3netsrv"},cbi("ps3netsrv"),_("PS3 NET Server"),40).dependent=true +entry({"admin", "nas","ps3netsrv","status"},call("act_status")).leaf=true +end + +function act_status() + local e={} + e.running=luci.sys.call("ps | grep ps3netsrv |grep -v grep >/dev/null") == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end diff --git a/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua new file mode 100644 index 0000000000..94db16034a --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua @@ -0,0 +1,24 @@ +-- Copyright 2020 Lean +-- Licensed to the public under the Apache License 2.0. + +m = Map("ps3netsrv", translate("PS3 NET Server"), translate("PS3NETSRV is ISO/PKG server for Sony PlayStation 3 webMAN-MOD plugin")) + +m:section(SimpleSection).template = "ps3netsrv/ps3netsrv_status" + +s = m:section(TypedSection, "ps3netsrv") +s.addremove = false +s.anonymous = true + +enable=s:option(Flag, "enabled", translate("Enabled")) +enable.default = "0" +enable.rmempty = false + +db_path=s:option(Value, "dir", translate("Dir Path")) +db_path.default = "/root" +db_path.rmempty = false + +port=s:option(Value, "port", translate("Port")) +port.rmempty = false +port.datatype = "port" + +return m \ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm b/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm new file mode 100644 index 0000000000..ebd057020f --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm @@ -0,0 +1,22 @@ + + +
+

+ <%:Collecting data...%> +

+
\ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po b/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po new file mode 100644 index 0000000000..81c9734887 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po @@ -0,0 +1,26 @@ +msgid "" +msgstr "" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-06-23 20:16+0800\n" +"PO-Revision-Date: 2015-06-23 20:17+0800\n" +"Last-Translator: coolsnowwolf \n" +"Language-Team: PandoraBox Team\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.8.1\n" +"X-Poedit-SourceCharset: UTF-8\n" + +msgid "PS3 NET Server" +msgstr "PS3 NET 服务器" + +msgid "PS3NETSRV is ISO/PKG server for Sony PlayStation 3 webMAN-MOD plugin" +msgstr "PS3NETSRV 是一个 Sony PlayStation 3 自制系统 webMAN-MOD 插件的服务器端（用于加载蓝光/游戏ISO/PKG）" + +msgid "Dir Path" +msgstr "目录路径" + +msgid "Port" +msgstr "端口" diff --git a/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv b/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv new file mode 100755 index 0000000000..40b8f9fa05 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@ps3netsrv[-1] + add ucitrack ps3netsrv + set ucitrack.@ps3netsrv[-1].init=ps3netsrv + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 7b99aac30e..58c1cecd8a 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=3 +PKG_RELEASE:=7 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index ad0957b60a..28eba6abc3 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -47,20 +47,20 @@ cloudserver.rmempty = true cloudserver:depends("apptype", "cloud") flac = s:option(Flag, "flac_enabled", translate("启用无损音质")) -flac.default = 1 +flac.default = "1" flac.rmempty = false flac.description = translate("目前仅支持酷我、QQ、咪咕") flac:depends("apptype", "nodejs") force = s:option(Flag, "force_enabled", translate("强制替换为高音质歌曲")) -force.default = 1 +force.default = "1" force.rmempty = false force.description = translate("如果歌曲音质在 320Kbps 以内，则尝试强制替换为高音质版本") force:depends("apptype", "nodejs") o = s:option(Flag, "autoupdate") o.title = translate("自动检查更新主程序") -o.default = 0 +o.default = "1" o.rmempty = false o.description = translate("每天自动检测并更新到最新版本") o:depends("apptype", "nodejs") diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index b3de31158c..1020406812 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -179,13 +179,14 @@ start() else sed -i '/item.br < 320000/ { s/item.br < 320000/item.code != 200 || item.freeTrialInfo/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js fi - node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 & + node /usr/share/UnblockNeteaseMusic/app.js -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 & node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & add_cron echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log elif [ "$APPTYPE" == "go" ]; then - UnblockNeteaseMusic -p 5200 -sp 5201 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & + UnblockNeteaseMusic -p 5200 -sp 5202 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 >>/tmp/unblockmusic.log 2>&1 & echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log + UnblockNeteaseMusic -p 5203 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & else kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /usr/bin/UnblockNeteaseMusicCloud >/dev/null 2>&1 & diff --git a/package/zxlhhyccc/verysync/Makefile b/package/zxlhhyccc/verysync/Makefile index a0d469b714..35e22eca21 100644 --- a/package/zxlhhyccc/verysync/Makefile +++ b/package/zxlhhyccc/verysync/Makefile @@ -28,8 +28,16 @@ ifeq ($(ARCH),powerpc64) PKG_ARCH_VERYSYNC:=ppc64 endif +LATEST_VERSION:=$(shell curl http://www.verysync.com/shell/latest) + PKG_NAME:=verysync -PKG_VERSION:=v1.4.3 + +ifneq ($(LATEST_VERSION),) + PKG_VERSION:=$(LATEST_VERSION) +else + PKG_VERSION:=v1.4.3 +endif + PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz