From 7f631eb8e63b641cad47307c82b08f3a1d2083a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 00:28:26 +0800 Subject: [PATCH] update 2023-07-11 00:28:26 --- homeproxy/root/etc/init.d/homeproxy | 2 +- luci-app-nft-qos/po/sk/nft-qos.po | 7 +-- natflow/Makefile | 4 +- webd/Makefile | 84 ++++++++++++++++------------- 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/homeproxy/root/etc/init.d/homeproxy b/homeproxy/root/etc/init.d/homeproxy index b1cb866bc..d8df625e0 100755 --- a/homeproxy/root/etc/init.d/homeproxy +++ b/homeproxy/root/etc/init.d/homeproxy @@ -351,5 +351,5 @@ reload_service() { service_triggers() { procd_add_reload_trigger "$CONF" - procd_add_raw_trigger "interface.*.up" 3000 /etc/init.d/$CONF reload + procd_add_interface_trigger "interface.*.up" wan /etc/init.d/$CONF restart } diff --git a/luci-app-nft-qos/po/sk/nft-qos.po b/luci-app-nft-qos/po/sk/nft-qos.po index 99c7ccfc0..96dfaa032 100644 --- a/luci-app-nft-qos/po/sk/nft-qos.po +++ b/luci-app-nft-qos/po/sk/nft-qos.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-06-15 17:43+0000\n" +"PO-Revision-Date: 2023-07-09 09:41+0000\n" "Last-Translator: MaycoH \n" "Language-Team: Slovak \n" @@ -8,7 +8,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 4.18.1-dev\n" +"X-Generator: Weblate 5.0-dev\n" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 @@ -141,8 +141,9 @@ msgid "MAC (optional)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:248 +#, fuzzy msgid "MAC Address" -msgstr "" +msgstr "Adresa MAC" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:48 msgid "MB" diff --git a/natflow/Makefile b/natflow/Makefile index 006ae2f0c..11b5a0398 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow -PKG_VERSION:=20230701 +PKG_VERSION:=20230711 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)? -PKG_HASH:=40e01dc6c933ec00876af08519f8571d58f35f3acc7d0ac88d735a6d71c574d5 +PKG_HASH:=ade064c03816ae5cd71ae48f148ba9ac34fbb4732c0287c5f572a18b12e7f1e7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Chen Minqiang diff --git a/webd/Makefile b/webd/Makefile index ebd92acb7..bbfcff89c 100755 --- a/webd/Makefile +++ b/webd/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=webd -PKG_VERSION:=20220512 +PKG_VERSION:=20230604 PKG_RELEASE:=$(AUTORELESE) include $(INCLUDE_DIR)/package.mk @@ -17,60 +17,68 @@ define Package/$(PKG_NAME) URL:=https://webd.cf endef -ifeq ($(ARCH),aarch64) - ifeq ($(BOARD),cortex-a53) - TARGET_ARCH:=aarch64_cortex-a53.brcm2708-bcm2710 - endif - ifeq ($(BOARD),rockchip) - TARGET_ARCH:=aarch64_generic.rockchip-armv8 - endif - ifeq ($(BOARD),mvebu) - TARGET_ARCH:=arm_cortex-a9.mvebu-cortexa9 - endif -endif - -ifeq ($(ARCH),arm) - ifeq ($(BOARD),ipq806x) - TARGET_ARCH:=arm_cortex-a15.ipq806x - endif - ifeq ($(BOARD),ipq40xx) - TARGET_ARCH:=arm_cortex-a7.ipq40xx - endif - ifeq ($(BOARD),bcm53xx) - TARGET_ARCH:=arm_cortex-a9.bcm53xx - endif - ifeq ($(BOARD),oxnas) - TARGET_ARCH:=arm_mpcore.oxnas - endif - ifeq ($(BOARD),kirkwood) - TARGET_ARCH:=arm_xscale.kirkwood - endif +ifeq ($(ARCH),x86_64) + TARGET_ARCH:=x86_64 + TARGET_BOARD:=musl.x86-64 endif ifeq ($(ARCH),mipsel) + TARGET_ARCH:=mipsel ifeq ($(BOARD),bcm47xx) - TARGET_ARCH:=mipsel_74kc.brcm47xx-mips74k + TARGET_BOARD:=musl.brcm47xx-mips74k endif ifeq ($(BOARD),ramips) - TARGET_ARCH:=mipsel_24kc.ramips-mt7620 + TARGET_BOARD:=musl.ramips-mt7620 endif endif ifeq ($(ARCH),mips) + TARGET_ARCH:=mips ifeq ($(BOARD),ath79) - TARGET_ARCH:=mips_24kc.ath79 + TARGET_BOARD:=musl.ath79 endif ifeq ($(BOARD),bcm63xx) - TARGET_ARCH:=mips_mips32.brcm63xx-uClibc + TARGET_BOARD:=uclibc.brcm63xx + endif + ifeq ($(BOARD),ar71xx) + TARGET_BOARD:=uclibc.ar71xx endif endif -ifeq ($(ARCH),x86_64) - TARGET_ARCH:=x86-64 +ifeq ($(ARCH),arm) + TARGET_ARCH:=arm + ifeq ($(BOARD),ipq806x) + TARGET_BOARD:=muslgnueabi.ipq806x + endif + ifeq ($(BOARD),ipq40xx) + TARGET_BOARD:=muslgnueabi.ipq40xx + endif + ifeq ($(BOARD),bcm53xx) + TARGET_BOARD:=muslgnueabi.bcm53xx + endif + ifeq ($(BOARD),oxnas) + TARGET_BOARD:=muslgnueabi.oxnas + endif + ifeq ($(BOARD),kirkwood) + TARGET_BOARD:=muslgnueabi.kirkwood + endif + ifeq ($(BOARD),mvebu) + TARGET_BOARD:=muslgnueabi.mvebu-cortexa9 + endif endif -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-openwrt-$(TARGET_ARCH).tar.gz -PKG_SOURCE_URL:=https://gwgw.ga/webd/$(PKG_VERSION)/ +ifeq ($(ARCH),aarch64) + TARGET_ARCH:=aarch64 + ifeq ($(BOARD),cortex-a53) + TARGET_BOARD:=musl.brcm2708-bcm2710 + endif + ifeq ($(BOARD),rockchip) + TARGET_BOARD:=musl.rockchip-armv8 + endif +endif + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(TARGET_ARCH)-openwrt-linux-$(TARGET_BOARD).tar.gz +PKG_SOURCE_URL:=https://cnt2.cf/webd/$(PKG_VERSION)/ PKG_HASH:=skip UNTAR_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -88,6 +96,8 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) $(UNTAR_DIR)/webd/webd $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME) $(INSTALL_BIN) $(UNTAR_DIR)/webd/web/.player.htm $(1)/usr/share/$(PKG_NAME) + $(INSTALL_DIR) $(1)/etc + $(INSTALL_BIN) $(UNTAR_DIR)/webd/webd.conf $(1)/etc/webd.conf.example endef $(eval $(call BuildPackage,$(PKG_NAME)))