From 7a4da76bd8c0876c1de348fcdf7ead0ec32c6b63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 23:15:19 +0800 Subject: [PATCH] update 2023-06-25 23:15:19 --- haproxy/Makefile | 6 +-- haproxy/get-latest-patches.sh | 4 +- luci-app-webd/Makefile | 0 luci-app-webd/luasrc/controller/webd.lua | 0 luci-app-webd/luasrc/model/cbi/webd.lua | 0 .../luasrc/view/webd/webd_status.htm | 0 luci-app-webd/po/zh-cn/webd.po | 0 luci-app-webd/po/zh_Hans/webd.po | 0 luci-app-webd/root/etc/config/webd | 0 luci-app-webd/root/etc/init.d/webd | 0 luci-app-webd/root/etc/uci-defaults/luci-webd | 0 webd/Makefile | 41 +++++++++---------- 12 files changed, 24 insertions(+), 27 deletions(-) mode change 100644 => 100755 luci-app-webd/Makefile mode change 100644 => 100755 luci-app-webd/luasrc/controller/webd.lua mode change 100644 => 100755 luci-app-webd/luasrc/model/cbi/webd.lua mode change 100644 => 100755 luci-app-webd/luasrc/view/webd/webd_status.htm mode change 100644 => 100755 luci-app-webd/po/zh-cn/webd.po mode change 100644 => 100755 luci-app-webd/po/zh_Hans/webd.po mode change 100644 => 100755 luci-app-webd/root/etc/config/webd mode change 100644 => 100755 luci-app-webd/root/etc/init.d/webd mode change 100644 => 100755 luci-app-webd/root/etc/uci-defaults/luci-webd mode change 100644 => 100755 webd/Makefile diff --git a/haproxy/Makefile b/haproxy/Makefile index 70b776f6a..a1f858c4c 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.6.13 +PKG_VERSION:=2.8.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243 +PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src +PKG_HASH:=61cdafb5db7e9174d0757b8e4bcde938352306fb7cc8ff2b5f55c26dd48a6cf7 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh index 2e312cc0a..6b60869c0 100755 --- a/haproxy/get-latest-patches.sh +++ b/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh -CLONEURL=https://git.haproxy.org/git/haproxy-2.6.git -BASE_TAG=v2.6.13 +CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git +BASE_TAG=v2.8.0 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/luci-app-webd/Makefile b/luci-app-webd/Makefile old mode 100644 new mode 100755 diff --git a/luci-app-webd/luasrc/controller/webd.lua b/luci-app-webd/luasrc/controller/webd.lua old mode 100644 new mode 100755 diff --git a/luci-app-webd/luasrc/model/cbi/webd.lua b/luci-app-webd/luasrc/model/cbi/webd.lua old mode 100644 new mode 100755 diff --git a/luci-app-webd/luasrc/view/webd/webd_status.htm b/luci-app-webd/luasrc/view/webd/webd_status.htm old mode 100644 new mode 100755 diff --git a/luci-app-webd/po/zh-cn/webd.po b/luci-app-webd/po/zh-cn/webd.po old mode 100644 new mode 100755 diff --git a/luci-app-webd/po/zh_Hans/webd.po b/luci-app-webd/po/zh_Hans/webd.po old mode 100644 new mode 100755 diff --git a/luci-app-webd/root/etc/config/webd b/luci-app-webd/root/etc/config/webd old mode 100644 new mode 100755 diff --git a/luci-app-webd/root/etc/init.d/webd b/luci-app-webd/root/etc/init.d/webd old mode 100644 new mode 100755 diff --git a/luci-app-webd/root/etc/uci-defaults/luci-webd b/luci-app-webd/root/etc/uci-defaults/luci-webd old mode 100644 new mode 100755 diff --git a/webd/Makefile b/webd/Makefile old mode 100644 new mode 100755 index 96c132a93..ebd92acb7 --- a/webd/Makefile +++ b/webd/Makefile @@ -1,10 +1,10 @@ -# Copyright (C) 2020-2023 Hyy2001X +# Copyright (C) 2020-2022 Hyy2001X # See more information at https://webd.cf/ include $(TOPDIR)/rules.mk PKG_NAME:=webd -PKG_VERSION:=20230604 +PKG_VERSION:=20220512 PKG_RELEASE:=$(AUTORELESE) include $(INCLUDE_DIR)/package.mk @@ -19,61 +19,58 @@ endef ifeq ($(ARCH),aarch64) ifeq ($(BOARD),cortex-a53) - TARGET_ARCH:=musl.brcm2708-bcm2710 + TARGET_ARCH:=aarch64_cortex-a53.brcm2708-bcm2710 endif ifeq ($(BOARD),rockchip) - TARGET_ARCH:=musl.rockchip-armv8 + 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:=muslgnueabi.ipq806x + TARGET_ARCH:=arm_cortex-a15.ipq806x endif ifeq ($(BOARD),ipq40xx) - TARGET_ARCH:=muslgnueabi.ipq40xx + TARGET_ARCH:=arm_cortex-a7.ipq40xx endif ifeq ($(BOARD),bcm53xx) - TARGET_ARCH:=muslgnueabi.bcm53xx + TARGET_ARCH:=arm_cortex-a9.bcm53xx endif ifeq ($(BOARD),oxnas) - TARGET_ARCH:=muslgnueabi.oxnas + TARGET_ARCH:=arm_mpcore.oxnas endif ifeq ($(BOARD),kirkwood) - TARGET_ARCH:=muslgnueabi.kirkwood - endif - ifeq ($(BOARD),mvebu) - TARGET_ARCH:=muslgnueabi.mvebu-cortexa9 + TARGET_ARCH:=arm_xscale.kirkwood endif endif ifeq ($(ARCH),mipsel) ifeq ($(BOARD),bcm47xx) - TARGET_ARCH:=musl.brcm47xx-mips74k + TARGET_ARCH:=mipsel_74kc.brcm47xx-mips74k endif ifeq ($(BOARD),ramips) - TARGET_ARCH:=musl.ramips-mt7620 + TARGET_ARCH:=mipsel_24kc.ramips-mt7620 endif endif ifeq ($(ARCH),mips) ifeq ($(BOARD),ath79) - TARGET_ARCH:=musl.ath79 + TARGET_ARCH:=mips_24kc.ath79 endif ifeq ($(BOARD),bcm63xx) - TARGET_ARCH:=uclibc.brcm63xx - endif - ifeq ($(BOARD),ar71xx) - TARGET_ARCH:=uclibc.ar71xx + TARGET_ARCH:=mips_mips32.brcm63xx-uClibc endif endif ifeq ($(ARCH),x86_64) - TARGET_ARCH:=musl.x86-64 + TARGET_ARCH:=x86-64 endif -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(ARCH)-openwrt-linux-$(TARGET_ARCH).tar.gz -PKG_SOURCE_URL:=https://cnt2.cf/webd/$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-openwrt-$(TARGET_ARCH).tar.gz +PKG_SOURCE_URL:=https://gwgw.ga/webd/$(PKG_VERSION)/ PKG_HASH:=skip UNTAR_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)