diff --git a/doc/lucky1.png b/doc/lucky1.png deleted file mode 100644 index a5b41b6e..00000000 Binary files a/doc/lucky1.png and /dev/null differ diff --git a/doc/lucky2.png b/doc/lucky2.png deleted file mode 100644 index ba4c026f..00000000 Binary files a/doc/lucky2.png and /dev/null differ diff --git a/doc/lucky3.png b/doc/lucky3.png deleted file mode 100644 index 6fa7982f..00000000 Binary files a/doc/lucky3.png and /dev/null differ diff --git a/doc/taskplan1.png b/doc/taskplan1.png new file mode 100644 index 00000000..1f8db7be Binary files /dev/null and b/doc/taskplan1.png differ diff --git a/doc/taskplan2.png b/doc/taskplan2.png new file mode 100644 index 00000000..edb45d6d Binary files /dev/null and b/doc/taskplan2.png differ diff --git a/doc/taskplan3.png b/doc/taskplan3.png new file mode 100644 index 00000000..d4794702 Binary files /dev/null and b/doc/taskplan3.png differ diff --git a/doc/view.png b/doc/view.png new file mode 100644 index 00000000..169e112f Binary files /dev/null and b/doc/view.png differ diff --git a/doc/view2.png b/doc/view2.png new file mode 100644 index 00000000..9058c632 Binary files /dev/null and b/doc/view2.png differ diff --git a/docker/Makefile b/docker/Makefile index 37e9ff1a..6b6b1fa1 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=29.7.1 +PKG_VERSION:=29.7.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=09c72c14870f9c34029942f4c5cf3169b69dc48ea78e7380b5ebaa316356ba1d +PKG_HASH:=225b7ab2a15f5230b482df8461069cd4bce38891266fb9898d4188d0a3cbf54a PKG_BUILD_DIR:=$(BUILD_DIR)/cli-$(PKG_VERSION) PKG_GIT_SHORT_COMMIT:=$(shell $(CURDIR)/git-short-commit.sh 'github.com/docker/cli' 'v$(PKG_VERSION)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)') diff --git a/dockerd/Makefile b/dockerd/Makefile index 41b5abc3..b27bc59f 100644 --- a/dockerd/Makefile +++ b/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=29.7.1 +PKG_VERSION:=29.7.2 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,7 +10,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=docker-v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=e852479cc37cbf151126be1c077bef5e7ceea6c854dd860d46e61004bdf70b76 +PKG_HASH:=3a93a88bff41ffa6f4dca9f4ed9fc05e7fdb08e0f9014cf1d8177f85ecbc0683 PKG_GIT_SHORT_COMMIT:=$(shell $(CURDIR)/git-short-commit.sh '$(PKG_GIT_URL)' '$(PKG_GIT_REF)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)') PKG_MAINTAINER:=Gerard Ryan diff --git a/luci-app-linkeaselite/Makefile b/luci-app-linkeaselite/Makefile deleted file mode 100644 index e6a1fc11..00000000 --- a/luci-app-linkeaselite/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2016 Openwrt.org -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI support for linkeaselite -LUCI_DEPENDS:=+linkeaselite -LUCI_PKGARCH:=all -PKG_VERSION:=1.0.0 -PKG_RELEASE:= -LUCI_MINIFY_CSS:=0 -LUCI_MINIFY_JS:=0 - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-linkeaselite/luasrc/controller/linkeaselite.lua b/luci-app-linkeaselite/luasrc/controller/linkeaselite.lua deleted file mode 100644 index b66b26c7..00000000 --- a/luci-app-linkeaselite/luasrc/controller/linkeaselite.lua +++ /dev/null @@ -1,31 +0,0 @@ -module("luci.controller.linkeaselite", package.seeall) - -function index() - if not nixio.fs.access("/etc/config/linkeaselite") then - return - end - - local page = entry({"admin", "services", "linkeaselite"}, firstchild(), _("LinkEaseLite"), 20) - page.dependent = true - entry({"admin", "services", "linkeaselite", "config"}, cbi("linkeaselite"), _("Settings"), 10).leaf = true - entry({"admin", "services", "linkeaselite_status"}, call("linkeaselite_status")) - entry({"admin", "services", "linkeaselite", "file"}, call("linkeaselite_file_removed")).leaf = true -end - -function linkeaselite_status() - local sys = require "luci.sys" - local uci = require "luci.model.uci".cursor() - local port = tonumber(uci:get_first("linkeaselite", "linkeaselite", "port")) - - local status = { - running = (sys.call("pidof linkease-lite >/dev/null") == 0), - port = (port or 8897) - } - - luci.http.prepare_content("application/json") - luci.http.write_json(status) -end - -function linkeaselite_file_removed() - luci.http.status(404, "Not Found") -end diff --git a/luci-app-linkeaselite/luasrc/model/cbi/linkeaselite.lua b/luci-app-linkeaselite/luasrc/model/cbi/linkeaselite.lua deleted file mode 100644 index c1387f8b..00000000 --- a/luci-app-linkeaselite/luasrc/model/cbi/linkeaselite.lua +++ /dev/null @@ -1,24 +0,0 @@ -local m, s -local sys = require "luci.sys" - -m = Map("linkeaselite", translate("LinkEaseLite"), translate("LinkEaseLite is an efficient data transfer tool for small-memory devices.")) -m:section(SimpleSection).template = "linkeaselite_status" - -m.on_after_commit = function(self) - sys.call("/etc/init.d/linkeaselite restart >/dev/null 2>&1") -end - -s = m:section(TypedSection, "linkeaselite", translate("Global settings")) -s.addremove = false -s.anonymous = true - -s:option(Flag, "enabled", translate("Enable")).rmempty = false - -local port = s:option(Value, "port", translate("Port")) -port.rmempty = false -port.datatype = "port" -port.default = "8897" - -s:option(Flag, "allowPublic", translate("AllowPublic"), translate("Allowing access via public IP addresses can lead to insufficient security.")).rmempty = false - -return m diff --git a/luci-app-linkeaselite/luasrc/view/linkeaselite_status.htm b/luci-app-linkeaselite/luasrc/view/linkeaselite_status.htm deleted file mode 100644 index 34a0e0c3..00000000 --- a/luci-app-linkeaselite/luasrc/view/linkeaselite_status.htm +++ /dev/null @@ -1,42 +0,0 @@ - - -
- <%:LinkEaseLite Status%> -

- <%:Collecting data...%> -

-
diff --git a/luci-app-linkeaselite/po/zh-cn/linkeaselite.po b/luci-app-linkeaselite/po/zh-cn/linkeaselite.po deleted file mode 100644 index 93b611b7..00000000 --- a/luci-app-linkeaselite/po/zh-cn/linkeaselite.po +++ /dev/null @@ -1,35 +0,0 @@ -msgid "LinkEaseLite" -msgstr "易有云Lite" - -msgid "LinkEaseLite is an efficient data transfer tool for small-memory devices." -msgstr "易有云Lite是面向小内存设备的轻量数据传输工具。" - -msgid "Global settings" -msgstr "全局设置" - -msgid "Enable" -msgstr "启用" - -msgid "Port" -msgstr "端口" - -msgid "AllowPublic" -msgstr "公网访问" - -msgid "Allowing access via public IP addresses can lead to insufficient security." -msgstr "允许公网IP访问,会导致不够安全。" - -msgid "Click to open LinkEaseLite" -msgstr "点击打开易有云Lite" - -msgid "The LinkEaseLite service is running." -msgstr "易有云Lite服务已启动" - -msgid "The LinkEaseLite service is not running." -msgstr "易有云Lite服务未启动" - -msgid "LinkEaseLite Status" -msgstr "易有云Lite服务状态" - -msgid "Collecting data..." -msgstr "收集数据..." diff --git a/luci-app-linkeaselite/root/etc/uci-defaults/50_luci-linkeaselite b/luci-app-linkeaselite/root/etc/uci-defaults/50_luci-linkeaselite deleted file mode 100644 index 048f3caf..00000000 --- a/luci-app-linkeaselite/root/etc/uci-defaults/50_luci-linkeaselite +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -rm -f /tmp/luci-indexcache /tmp/luci-indexcache.* -exit 0