From 7ff6af04fa94537ede0a1cba03b2e37e695f61dc Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 6 Jul 2020 01:35:54 +0800 Subject: [PATCH 01/12] luci version: mod 20.07 --- package/lean/default-settings/files/zzz-default-settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 1e8792e266..9e07978e0c 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -51,7 +51,7 @@ echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release sed -i 's/LuCI openwrt-18.06 branch/LuCI 18.06 by Lean/g' /usr/lib/lua/luci/version.lua sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua -echo 'luciversion = "Mod20.06 by CTCGFW"' >> /usr/lib/lua/luci/version.lua +echo 'luciversion = "Mod20.07 by CTCGFW"' >> /usr/lib/lua/luci/version.lua sed -i '/log-facility/d' /etc/dnsmasq.conf echo "log-facility=/dev/null" >> /etc/dnsmasq.conf From 80da19d02fedbb6be42e82252658e77c6f603b1b Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sun, 5 Jul 2020 18:50:04 +0800 Subject: [PATCH 02/12] default-settings: remove sqm.zh-cn.po --- package/lean/default-settings/Makefile | 1 - .../lean/default-settings/i18n/sqm.zh-cn.po | 165 ------------------ 2 files changed, 166 deletions(-) delete mode 100644 package/lean/default-settings/i18n/sqm.zh-cn.po diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index e42ca7dbfc..cf8524dde6 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -43,7 +43,6 @@ define Package/default-settings/install $(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings po2lmo ./i18n/default.zh-cn.po $(1)/usr/lib/lua/luci/i18n/default.zh-cn.lmo po2lmo ./i18n/more.zh-cn.po $(1)/usr/lib/lua/luci/i18n/more.zh-cn.lmo - po2lmo ./i18n/sqm.zh-cn.po $(1)/usr/lib/lua/luci/i18n/sqm.zh-cn.lmo endef $(eval $(call BuildPackage,default-settings)) diff --git a/package/lean/default-settings/i18n/sqm.zh-cn.po b/package/lean/default-settings/i18n/sqm.zh-cn.po deleted file mode 100644 index fa1b927079..0000000000 --- a/package/lean/default-settings/i18n/sqm.zh-cn.po +++ /dev/null @@ -1,165 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: luci-i18n-sqm\n" -"POT-Creation-Date: 2017-03-28 04:14+0800\n" -"PO-Revision-Date: 2020-06-07 10:21+0800\n" -"Last-Translator: dingpengyu \n" -"Language-Team: player131 \n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3.1\n" -"X-Poedit-Basepath: .\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-KeywordsList: translate\n" -"X-Poedit-SearchPath-0: .\n" - -#: usr/lib/lua/luci/controller/sqm.lua:24 -msgid "SQM QoS" -msgstr "SQM QoS" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:25 -msgid "Smart Queue Management" -msgstr "智能队列管理" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:26 -msgid "" -"With SQM you can enable traffic shaping, better mixing (Fair Queueing), active queue length management " -"(AQM) and prioritisation on one network interface." -msgstr "使用 SQM 你可以启用流量整形，更好的混合(公平列队)主动列队管理(AQM) 并设置网络接口优先级。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:32 -msgid "Queues" -msgstr "队列" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:33 -msgid "Basic Settings" -msgstr "基本设置" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:34 -msgid "Queue Discipline" -msgstr "列队规则" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:35 -msgid "Link Layer Adaptation" -msgstr "链路层适配" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:40 -msgid "Enable this SQM instance." -msgstr "启用此SQM实例。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:54 -msgid "" -"The SQM GUI has just enabled the sqm initscript on your behalf. Remember to disable the sqm initscript manually under System Startup menu in case " -"this change was not wished for." -msgstr "你刚刚开启了SQM随机启动功能，如果你不希望SQM随机启动，可以在系统启动菜单下手动禁用。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:60 -msgid "Interface name" -msgstr "接口名称" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:70 -msgid "Download speed (kbit/s) (ingress) set to 0 to selectively disable ingress shaping:" -msgstr "下载速度(kbit/s)(入口)
设置为0关闭入口控制：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:74 -msgid "Upload speed (kbit/s) (egress) set to 0 to selectively disable egress shaping:" -msgstr "上传速度(kbit/s)(出口)
设置为0关闭出口控制：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:78 -msgid "Create log file for this SQM instance under /var/run/sqm/${Inerface_name}.debug.log. Make sure to delete log files manually." -msgstr "创建日志文件到/var/run/sqm/
${Inerface_name}.debug.log。
请务必手动删除日志文件。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:82 -msgid "Verbosity of SQM's output into the system log." -msgstr "SQM输出到系统日志的详细程度。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:86 usr/lib/lua/luci/model/cbi/sqm.lua:99 usr/lib/lua/luci/model/cbi/sqm.lua:148 -#: usr/lib/lua/luci/model/cbi/sqm.lua:155 usr/lib/lua/luci/model/cbi/sqm.lua:202 usr/lib/lua/luci/model/cbi/sqm.lua:243 -msgid "default" -msgstr "默认" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:98 -msgid "Queuing disciplines useable on this system. After installing a new qdisc, you need to restart the router to see updates!" -msgstr "系统上可用的列队规则。安装新的队列规则后，重新启动路由器才会看到更新！" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:112 -msgid "Queue setup script" -msgstr "队列脚本设置" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:129 -msgid "Show and Use Advanced Configuration. Advanced options will only be used as long as this box is checked." -msgstr "选中该复选框显示高级配置。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:133 -msgid "Squash DSCP on inbound packets (ingress):" -msgstr "入站数据包压缩DSCP:" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:140 -msgid "Ignore DSCP on ingress:" -msgstr "忽略入站DSCP：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:147 -msgid "Explicit congestion notification (ECN) status on inbound packets (ingress):" -msgstr "入站数据包的显式拥塞通知（ECN）状态：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:154 -msgid "Explicit congestion notification (ECN) status on outbound packets (egress)." -msgstr "出站数据包的显式拥塞通知（ECN）状态。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:161 -msgid "Show and Use Dangerous Configuration. Dangerous options will only be used as long as this box is checked." -msgstr "选中该复选框显示危险配置。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:166 -msgid "Hard limit on ingress queues; leave empty for default." -msgstr "入站队列严格限制；留空为默认。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:173 -msgid "Hard limit on egress queues; leave empty for default." -msgstr "出站队列严格限制；留空为默认。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:180 -msgid "Latency target for ingress, e.g 5ms [units: s, ms, or us]; leave empty for automatic selection, put in the word default for the qdisc's default." -msgstr "入站延迟目标，例如 5ms [单位: s, ms, 或 us]；留空为自动选择，default为列队规则默认值。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:185 -msgid "Latency target for egress, e.g. 5ms [units: s, ms, or us]; leave empty for automatic selection, put in the word default for the qdisc's default." -msgstr "出站延迟目标，例如 5ms [单位: s, ms, 或 us]；留空为自动选择，default为列队规则默认值。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:192 -msgid "Advanced option string to pass to the ingress queueing disciplines; no error checking, use very carefully." -msgstr "传递到入站队列规则的高级选项字符串；没有错误检查。请谨慎使用。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:196 -msgid "Advanced option string to pass to the egress queueing disciplines; no error checking, use very carefully." -msgstr "传递到出站队列规则的高级选项字符串；没有错误检查。请谨慎使用。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:201 -msgid "Which link layer to account for:" -msgstr "对哪个链路层生效:" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:207 -msgid "Per Packet Overhead (byte):" -msgstr "每个数据包的开销 (byte)：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:216 -msgid "Show Advanced Linklayer Options, (only needed if MTU > 1500). Advanced options will only be used as long as this box is checked." -msgstr "显示高级链路选项，（仅在MTU> 1500时才需要）。 只有选中此框时，才会使用高级选项。" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:221 -msgid "Maximal Size for size and rate calculations, tcMTU (byte); needs to be >= interface MTU + overhead:" -msgstr "大小和速率计算的最大尺寸，tcMTU（byte）; 需要> =接口MTU +开销：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:228 -msgid "Number of entries in size/rate tables, TSIZE; for ATM choose TSIZE = (tcMTU + 1) / 16:" -msgstr "大小/速率表中的条目数，TSIZE; 对于ATM选择TSIZE =（tcMTU + 1）/ 16：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:235 -msgid "Minimal packet size, MPU (byte); needs to be > 0 for ethernet size tables:" -msgstr "最小数据包大小，MPU（byte）; 在以太网中需要>0：" - -#: usr/lib/lua/luci/model/cbi/sqm.lua:242 -msgid "Which linklayer adaptation mechanism to use; for testing only" -msgstr "使用哪个链路适应机制; 仅用于测试" From 9df754590487b988d68809163e185eb7687d46dc Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 6 Jul 2020 12:01:34 +0800 Subject: [PATCH 03/12] uci: roll back to 2019-05-17 --- package/system/uci/Makefile | 8 ++++---- package/system/uci/files/lib/config/uci.sh | 20 +------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 8c11f4c576..75c67e792d 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uci -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE=2020-04-24 -PKG_SOURCE_VERSION:=ec8d3233948603485e1b97384113fac9f1bab5d6 -PKG_MIRROR_HASH:=b3cdc66a8ec4f05a102ce5520a3f8ff69ca4a49930c5bb01065467ef68f0808b +PKG_SOURCE_DATE=2019-05-17 +PKG_SOURCE_VERSION:=f199b961c2970b63cc83947ad49b327b3f48f05f +PKG_MIRROR_HASH:=bd860a1a97a5c8f1cd77875afcadba9dafff0c4a0d6743ba0c915d76e1c624cd PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:= diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh index 1e85ced834..78ec277669 100644 --- a/package/system/uci/files/lib/config/uci.sh +++ b/package/system/uci/files/lib/config/uci.sh @@ -85,15 +85,6 @@ uci_set() { /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE" } -uci_add_list() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - local VALUE="$4" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add_list "$PACKAGE.$CONFIG.$OPTION=$VALUE" -} - uci_get_state() { uci_get "$1" "$2" "$3" "$4" "/var/state" } @@ -117,7 +108,7 @@ uci_add() { local CONFIG="$3" if [ -z "$CONFIG" ]; then - export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add "$PACKAGE" "$TYPE")" + export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")" else /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE" export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG" @@ -141,15 +132,6 @@ uci_remove() { /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}" } -uci_remove_list() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - local VALUE="$4" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del_list "$PACKAGE.$CONFIG.$OPTION=$VALUE" -} - uci_commit() { local PACKAGE="$1" /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE From f450b99ba67910e9f1139a46fdd4777384e210be Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jul 2020 19:27:23 +0200 Subject: [PATCH 04/12] ar71xx: Fix mikrotik NAND compile problem There is one closing bracket too much. Fixes: ce958dd88a7e ("kernel: Update kernel 4.14 to version 4.14.187") Signed-off-by: Hauke Mehrtens --- target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c index 3479d5cc65..7dde613131 100644 --- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c +++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c @@ -356,7 +356,7 @@ static int rb4xx_nand_remove(struct platform_device *pdev) { struct rb4xx_nand_info *info = platform_get_drvdata(pdev); - nand_release(&info->chip)); + nand_release(&info->chip); platform_set_drvdata(pdev, NULL); kfree(info); gpio_free(RB4XX_NAND_GPIO_NCE); From 4939dee0a69b822e830f229ce6bfa3cce57eba12 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 6 Jul 2020 16:01:15 +0800 Subject: [PATCH 05/12] luci-app-sfe: fix config --- package/lean/luci-app-sfe/root/etc/config/sfe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-sfe/root/etc/config/sfe b/package/lean/luci-app-sfe/root/etc/config/sfe index 20697560a4..0ca91221d8 100644 --- a/package/lean/luci-app-sfe/root/etc/config/sfe +++ b/package/lean/luci-app-sfe/root/etc/config/sfe @@ -1,4 +1,5 @@ -config sfe + +config sfe 'config' option enabled '1' option ipv6 '0' option wifi '0' From ff0b338fe313043acb849b957536634a671bb662 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 7 Jul 2020 10:00:46 +0800 Subject: [PATCH 06/12] luci-app-passwall: fix Makefile --- package/lienol/luci-app-passwall/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index 6e588bc1e8..92680f5640 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -136,9 +136,6 @@ define Package/$(PKG_NAME)/install cp -pR ./root/usr/share/passwall/* $(1)/usr/share/passwall $(INSTALL_CONF) ./root/etc/config/passwall $(1)/usr/share/passwall/config.default - $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d - cp -pR ./root/usr/share/rpcd/acl.d/* $(1)/usr/share/rpcd/acl.d - $(INSTALL_DIR) $(1)/usr/lib/lua/luci cp -pR ./luasrc/* $(1)/usr/lib/lua/luci/ From c4faaf2a74331c948ead0d3cbd09f81279746567 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 7 Jul 2020 10:08:43 +0800 Subject: [PATCH 07/12] rpcd/ubox/procd: sync with upstream source --- package/system/procd/Makefile | 21 ++++++++++--- package/system/procd/files/procd.sh | 10 +++++-- package/system/procd/files/reload_config | 2 +- ...1-include-nsswitch-in-jail-for-gilbc.patch | 30 ------------------- package/system/rpcd/Makefile | 5 ++-- package/system/rpcd/files/rpcd.init | 4 --- package/system/ubox/Makefile | 20 ++++++------- package/system/ubox/files/log.init | 4 --- 8 files changed, 38 insertions(+), 58 deletions(-) delete mode 100644 package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch mode change 100755 => 100644 package/system/ubox/files/log.init diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 231a0ca058..f5ed35b27e 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-03-13 -PKG_SOURCE_VERSION:=77a6782d6e4eba2c49e642672de134aff443ef72 -PKG_MIRROR_HASH:=bb7e98a6b6f997a4fa2fb924be248febe5a7633601df2e97e7a7513c57b63870 +PKG_SOURCE_DATE:=2020-05-28 +PKG_SOURCE_VERSION:=b9b39e2061d7035a9d84eecbb4a4613deaf6d03f +PKG_MIRROR_HASH:=0d6a96a2fb38f72c72b457a2a8638bee22f91009f9686152fcf4aee97846fc84 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -56,6 +56,13 @@ define Package/procd-ujail TITLE:=OpenWrt process jail helper endef +define Package/procd-ujail-console + SECTION:=base + CATEGORY:=Base system + DEPENDS:=+procd-ujail +libubus +libubox + TITLE:=OpenWrt process jail console +endef + define Package/procd-seccomp SECTION:=base CATEGORY:=Base system @@ -110,6 +117,11 @@ define Package/procd-ujail/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail $(1)/sbin/ endef +define Package/procd-ujail-console/install + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail-console $(1)/sbin/ +endef + define Package/procd-seccomp/install $(INSTALL_DIR) $(1)/sbin $(1)/lib $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-seccomp.so $(1)/lib @@ -120,4 +132,5 @@ endef $(eval $(call BuildPackage,procd)) $(eval $(call BuildPackage,procd-ujail)) +$(eval $(call BuildPackage,procd-ujail-console)) $(eval $(call BuildPackage,procd-seccomp)) diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 17dc14ad3b..85e625c847 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -187,6 +187,9 @@ _procd_add_jail() { ronly) json_add_boolean "ronly" "1";; requirejail) json_add_boolean "requirejail" "1";; netns) json_add_boolean "netns" "1";; + userns) json_add_boolean "userns" "1";; + cgroupsns) json_add_boolean "cgroupsns" "1";; + console) json_add_boolean "console" "1";; esac done json_add_object "mount" @@ -249,7 +252,8 @@ _procd_set_param() { reload_signal) json_add_int "$type" $(kill -l "$1") ;; - pidfile|user|group|seccomp|capabilities|facility) + pidfile|user|group|seccomp|capabilities|facility|\ + extroot|overlaydir|tmpoverlaysize) json_add_string "$type" "$1" ;; stdout|stderr|no_new_privs) @@ -516,10 +520,10 @@ uci_validate_section() local _result local _error shift; shift; shift - _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null` + _result=$(/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null) _error=$? eval "$_result" - [ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null` + [ "$_error" = "0" ] || $(/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null) return $_error } diff --git a/package/system/procd/files/reload_config b/package/system/procd/files/reload_config index 8d1cdb1378..3ae0de96a3 100644 --- a/package/system/procd/files/reload_config +++ b/package/system/procd/files/reload_config @@ -7,7 +7,7 @@ for config in /etc/config/*; do done MD5FILE=/var/run/config.md5 [ -f $MD5FILE ] && { - for c in `md5sum -c $MD5FILE 2>/dev/null| grep FAILED | cut -d: -f1`; do + for c in $(md5sum -c $MD5FILE 2>/dev/null| grep FAILED | cut -d: -f1); do ubus call service event "{ \"type\": \"config.change\", \"data\": { \"package\": \"$(basename $c)\" }}" done } diff --git a/package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch b/package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch deleted file mode 100644 index 221378b8d6..0000000000 --- a/package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d200b70e5d5b0b3b61e2573f1c2fa22b3fa9d63a Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Sun, 19 Apr 2020 23:06:51 +0100 -Subject: [PATCH] jail: include /etc/nsswitch.conf in jail for glibc. - -/etc/nsswitch.conf is needed to resolve usernames and groups from -/etc/passwd and /etc/groups, name resoultion and a bunch of other -things when using glibc. -Mount /etc/nsswitch.conf in jail when building against glibc. - -Reported-by: Tobias Waldvogel -Signed-off-by: Daniel Golle ---- - jail/jail.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/jail/jail.c -+++ b/jail/jail.c -@@ -545,6 +545,11 @@ int main(int argc, char **argv) - add_mount("/etc/group", 0, -1); - } - -+#if defined(__GLIBC__) -+ if (!opts.extroot) -+ add_mount("/etc/nsswitch.conf", 0, -1); -+#endif -+ - if (!(opts.namespace & CLONE_NEWNET)) { - add_mount("/etc/resolv.conf", 0, -1); - } diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 8791cb03e0..20ec3bf17e 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -13,14 +13,15 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git PKG_SOURCE_DATE:=2020-05-26 -PKG_SOURCE_VERSION:=7be1f17138f19d1d7a86e0c27b3662d3643ff296 +PKG_SOURCE_VERSION:=078bb57e0769c987c05244abe1f7d8d53e0e323e PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=b427b2be8ebd486edbc88f6e789d1890cbdda1b4f04dcfcc8751f568c3a82674 +PKG_MIRROR_HASH:=7f626efd95eccc7b8262a7e533341e17fe765d99cfa2fafde978190cb834fced PKG_LICENSE:=ISC PKG_LICENSE_FILES:= PKG_BUILD_PARALLEL:=1 +PKG_ASLR_PIE_REGULAR:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/package/system/rpcd/files/rpcd.init b/package/system/rpcd/files/rpcd.init index 4c701a28e6..f75d0e0f0e 100755 --- a/package/system/rpcd/files/rpcd.init +++ b/package/system/rpcd/files/rpcd.init @@ -19,7 +19,3 @@ start_service() { reload_service() { procd_send_signal rpcd } - -service_running() { - procd_running rpcd -} diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 9631ac872f..e1269ca6ce 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_RELEASE:=2 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git -PKG_SOURCE_DATE:=2019-06-16 -PKG_SOURCE_VERSION:=4df34a4d0d5183135217fc8280faae8e697147bc -PKG_MIRROR_HASH:=a4064a1aa29cf612735b0da180f5bdee62304e907f57730482cad97b04f2b189 +PKG_SOURCE_DATE:=2019-12-31 +PKG_SOURCE_VERSION:=0e34af143373126fc62b43612233a158694ec643 +PKG_MIRROR_HASH:=8ad36b252419a88d1018addec84900f9601ef5aece39bd0171c918d0817688c9 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -25,6 +25,12 @@ define Package/ubox CATEGORY:=Base system DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt TITLE:=OpenWrt system helper toolbox + ALTERNATIVES:=\ + 100:/sbin/rmmod:/sbin/kmodloader \ + 100:/sbin/insmod:/sbin/kmodloader \ + 100:/sbin/lsmod:/sbin/kmodloader \ + 100:/sbin/modinfo:/sbin/kmodloader \ + 100:/sbin/modprobe:/sbin/kmodloader endef define Package/getrandom @@ -50,12 +56,6 @@ define Package/ubox/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib - - $(LN) kmodloader $(1)/sbin/rmmod - $(LN) kmodloader $(1)/sbin/insmod - $(LN) kmodloader $(1)/sbin/lsmod - $(LN) kmodloader $(1)/sbin/modinfo - $(LN) kmodloader $(1)/sbin/modprobe endef define Package/logd/install diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init old mode 100755 new mode 100644 index ba9c124c8b..250f805b44 --- a/package/system/ubox/files/log.init +++ b/package/system/ubox/files/log.init @@ -96,7 +96,3 @@ start_service() config_foreach validate_log_section system start_service_file config_foreach validate_log_section system start_service_remote } - -service_running() { - procd_running log -} From 02216285299777efd97d383c6ca084a096986db1 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 6 Jul 2020 16:13:07 +0800 Subject: [PATCH 08/12] autocore: x86 change RPS/XPS handling to all CPUs --- package/lean/autocore/files/x86/autocore | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/package/lean/autocore/files/x86/autocore b/package/lean/autocore/files/x86/autocore index 55cd519f50..614e21761e 100755 --- a/package/lean/autocore/files/x86/autocore +++ b/package/lean/autocore/files/x86/autocore @@ -8,22 +8,20 @@ start() rfc=4096 cc=$(grep -c processor /proc/cpuinfo) rsfe=$(echo $cc*$rfc | bc) - sysctl -w net.core.rps_sock_flow_entries=$rsfe + sysctl -w net.core.rps_sock_flow_entries=$rsfe >/dev/null for fileRps in $(ls /sys/class/net/eth*/queues/rx-*/rps_cpus) do echo $cc > $fileRps done - + for fileRfc in $(ls /sys/class/net/eth*/queues/rx-*/rps_flow_cnt) do echo $rfc > $fileRfc done - - for fileRps in $(ls /sys/class/net/eth*/queues/tx-*/xps_cpus) - do - echo $cc > $fileRps - done - + + uci set network.@globals[0].packet_steering=1 + uci commit network + a=$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq) b=$(echo -n ' : ') c=$(cat /proc/cpuinfo | grep 'core id' | sort -u | wc -l) From 31ff0bba38ac8b30be9c4979104c9851e92b01ab Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Mon, 6 Jul 2020 13:55:09 +0800 Subject: [PATCH 09/12] Bump v2ray-plugin to 1.3.3 (#5003) Bump v2ray-plugin to the newest version. --- package/ctcgfw/openwrt-v2ray-plugin/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/ctcgfw/openwrt-v2ray-plugin/Makefile b/package/ctcgfw/openwrt-v2ray-plugin/Makefile index 5c293f68af..69ec0fa8b2 100644 --- a/package/ctcgfw/openwrt-v2ray-plugin/Makefile +++ b/package/ctcgfw/openwrt-v2ray-plugin/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin -PKG_VERSION:=1.3.2 -PKG_RELEASE:=2 +PKG_VERSION:=1.3.3 +PKG_RELEASE:=1 + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=1cc9ed8e79347da044fa2f577bc5371dcdf0b03e131f61137b5c1d2a2be11509 +PKG_HASH:=913c6e1b6f8c57bca07685eb854ff0e00de4fd09f42b88c3b399880934410cc1 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -34,7 +35,7 @@ include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/$(PKG_NAME)/config config $(PKG_NAME)_INCLUDE_GOPROXY bool "Compiling with GOPROXY proxy" - default n + default y endef From 0c494e6b73bd52cae01c4c77b7f089a3c184a73a Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 6 Jul 2020 14:30:34 +0800 Subject: [PATCH 10/12] uci: add uci_add_list method --- package/system/uci/Makefile | 2 +- package/system/uci/files/lib/config/uci.sh | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 75c67e792d..3ae737b931 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uci -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git PKG_SOURCE_PROTO:=git diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh index 78ec277669..1e85ced834 100644 --- a/package/system/uci/files/lib/config/uci.sh +++ b/package/system/uci/files/lib/config/uci.sh @@ -85,6 +85,15 @@ uci_set() { /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE" } +uci_add_list() { + local PACKAGE="$1" + local CONFIG="$2" + local OPTION="$3" + local VALUE="$4" + + /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add_list "$PACKAGE.$CONFIG.$OPTION=$VALUE" +} + uci_get_state() { uci_get "$1" "$2" "$3" "$4" "/var/state" } @@ -108,7 +117,7 @@ uci_add() { local CONFIG="$3" if [ -z "$CONFIG" ]; then - export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")" + export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add "$PACKAGE" "$TYPE")" else /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE" export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG" @@ -132,6 +141,15 @@ uci_remove() { /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}" } +uci_remove_list() { + local PACKAGE="$1" + local CONFIG="$2" + local OPTION="$3" + local VALUE="$4" + + /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del_list "$PACKAGE.$CONFIG.$OPTION=$VALUE" +} + uci_commit() { local PACKAGE="$1" /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE From 4ef0a8f886d22852d7ee97332766ef57983120c2 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 7 Jul 2020 11:50:16 +0800 Subject: [PATCH 11/12] Revert "rpcd: update to latest snapshot version" Revert this commit due to it relies on a changed libiwinfo API, and will broke the compilation. --- package/system/rpcd/Makefile | 5 ++--- package/system/rpcd/files/rpcd.init | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 20ec3bf17e..69d7d672cf 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -13,15 +13,14 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git PKG_SOURCE_DATE:=2020-05-26 -PKG_SOURCE_VERSION:=078bb57e0769c987c05244abe1f7d8d53e0e323e +PKG_SOURCE_VERSION:=67c8a3fda26e441d3ec4a19f50ac72eca8deb14b PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=7f626efd95eccc7b8262a7e533341e17fe765d99cfa2fafde978190cb834fced +PKG_MIRROR_HASH:=cfe44e600093a424d1133b55a141c5becb708f48ee4fc8b7a98a82495ced7c72 PKG_LICENSE:=ISC PKG_LICENSE_FILES:= PKG_BUILD_PARALLEL:=1 -PKG_ASLR_PIE_REGULAR:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/package/system/rpcd/files/rpcd.init b/package/system/rpcd/files/rpcd.init index f75d0e0f0e..4c701a28e6 100755 --- a/package/system/rpcd/files/rpcd.init +++ b/package/system/rpcd/files/rpcd.init @@ -19,3 +19,7 @@ start_service() { reload_service() { procd_send_signal rpcd } + +service_running() { + procd_running rpcd +} From 0a51aa6d07ec23c8178ff8625ab30ddb2f098441 Mon Sep 17 00:00:00 2001 From: accors <61780738+accors@users.noreply.github.com> Date: Mon, 6 Jul 2020 13:55:24 +0800 Subject: [PATCH 12/12] Update v2ray version to 4.26.0 (#4983) --- package/lean/v2ray/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index 3b8766e3ed..081429db62 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.25.1 +PKG_VERSION:=4.26.0 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e6fd18d556ea52eb154eb4857759a75be4d3d77053e4ba29f9d2820763a3ca52 +PKG_HASH:=233e5acaf69a612c130655fea21291ffcce81a52771310ef97871b641e5f29d6 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE