From 6abac871e7cfa8548de994bdb06f98618e49cd50 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Tue, 21 May 2024 20:32:03 +0800 Subject: [PATCH] update 2024-05-21 20:32:03 --- haproxy/Makefile | 4 ++-- haproxy/get-latest-patches.sh | 2 +- luci-app-store/Makefile | 2 +- luci-app-store/root/bin/is-opkg | 36 ++++++++++++++++++++++++++++----- wireless-regdb/Makefile | 4 ++-- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/haproxy/Makefile b/haproxy/Makefile index 8b4a5e879..f7bb3bcfe 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.8.6 +PKG_VERSION:=2.8.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src -PKG_HASH:=9fd034368be66880bd86a300c13dc03bc13521ee2654880dddf192785aa28d51 +PKG_HASH:=7a821478f36f847607f51a51e80f4f890c37af4811d60438e7f63783f67592ff PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh index 1ee4f1e5e..1440a9450 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.8.git -BASE_TAG=v2.8.6 +BASE_TAG=v2.8.9 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/luci-app-store/Makefile b/luci-app-store/Makefile index 319b2651e..f9af2c3b9 100644 --- a/luci-app-store/Makefile +++ b/luci-app-store/Makefile @@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.17) LUCI_PKGARCH:=all -PKG_VERSION:=0.1.14-3 +PKG_VERSION:=0.1.16-1 # PKG_RELEASE MUST be empty for luci.mk PKG_RELEASE:= diff --git a/luci-app-store/root/bin/is-opkg b/luci-app-store/root/bin/is-opkg index 5bc97ae65..d89470719 100755 --- a/luci-app-store/root/bin/is-opkg +++ b/luci-app-store/root/bin/is-opkg @@ -7,7 +7,10 @@ DL_DIR=${IS_ROOT}/tmp/dl LISTS_DIR_O=/tmp/opkg-lists LISTS_DIR=${IS_ROOT}${LISTS_DIR_O} OPKG_CONF_DIR=${IS_ROOT}/etc/opkg +OPKG_CONF_DIR_M=${IS_ROOT}/etc/opkg_m FEEDS_SERVER=https://istore.linkease.com/repo +FEEDS_SERVER_MIRRORS="https://repo.istoreos.com/repo" +DISABLE_MIRROR=false ARCH=`sed -n -e 's/^Architecture: *\([^ ]\+\) *$/\1/p' /rom/usr/lib/opkg/info/libc.control /usr/lib/opkg/info/libc.control 2>/dev/null | head -1` # for istore self upgrade @@ -39,10 +42,33 @@ opkg_wrap() { OPKG_CONF_DIR=${OPKG_CONF_DIR} opkg -f ${IS_ROOT}/etc/opkg.conf "$@" } -fcurl() { - curl --fail --show-error "$@" +opkg_wrap_mirrors() { + local server + local file + if ! $DISABLE_MIRROR; then + for server in $FEEDS_SERVER_MIRRORS ; do + rm -rf "${OPKG_CONF_DIR_M}" 2>/dev/null + mkdir -p "${OPKG_CONF_DIR_M}" 2>/dev/null + ls "${OPKG_CONF_DIR}/" | while read; do + file="$REPLY" + if [ -f "${OPKG_CONF_DIR}/$file" -a "${file: -5}" = ".conf" ]; then + sed "s#$FEEDS_SERVER/#$server/#g" "${OPKG_CONF_DIR}/$file" >"${OPKG_CONF_DIR_M}/$file" + touch -r "${OPKG_CONF_DIR}/$file" "${OPKG_CONF_DIR_M}/$file" 2>/dev/null + else + cp -a "${OPKG_CONF_DIR}/$file" "${OPKG_CONF_DIR_M}/" + fi + done + echo "Try mirror server $server" + OPKG_CONF_DIR=${OPKG_CONF_DIR_M} opkg -f ${IS_ROOT}/etc/opkg.conf "$@" && return 0 + done + DISABLE_MIRROR=true + fi + echo "Try origin server $FEEDS_SERVER" + OPKG_CONF_DIR=${OPKG_CONF_DIR} opkg -f ${IS_ROOT}/etc/opkg.conf "$@" } +alias fcurl='curl -L --fail --show-error' + check_space() { local free="$((`stat -c '%a * %S' -f /` >> 20 ))" if [ "$free" -lt 1 ]; then @@ -140,10 +166,10 @@ step_upgrade() { fi done if [ -n "$pkgs" ]; then - opkg_wrap upgrade $pkgs || return 1 + opkg_wrap_mirrors upgrade $pkgs || return 1 fi if [ -n "$metapkg" ]; then - opkg_wrap upgrade $metapkg || return 1 + opkg_wrap_mirrors upgrade $metapkg || return 1 fi return 0 } @@ -186,7 +212,7 @@ case $action in ;; "install") check_space - wrapped_in_update opkg_wrap install "$@" + wrapped_in_update opkg_wrap_mirrors install "$@" ;; "upgrade") new_upgrade "$@" diff --git a/wireless-regdb/Makefile b/wireless-regdb/Makefile index a0080bdbf..5b95ec59d 100644 --- a/wireless-regdb/Makefile +++ b/wireless-regdb/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wireless-regdb -PKG_VERSION:=2024.01.23 +PKG_VERSION:=2024.05.08 PKG_RELEASE:=1 PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/wireless-regdb/ -PKG_HASH:=c8a61c9acf76fa7eb4239e89f640dee3e87098d9f69b4d3518c9c60fc6d20c55 +PKG_HASH:=9aee1d86ebebb363b714bec941b2820f31e3b7f1a485ddc9fcbd9985c7d3e7c4 PKG_MAINTAINER:=Felix Fietkau