From 76b0a3c1ec7300fefbbf205cf7b97a8b04115bbf Mon Sep 17 00:00:00 2001 From: Quintin Hill Date: Fri, 10 Mar 2023 22:48:06 +0000 Subject: [PATCH 01/11] python-aio-mqtt-mod: add package This package is a dependency of ble2mqtt. Signed-off-by: Quintin Hill --- lang/python/python-aio-mqtt-mod/Makefile | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 lang/python/python-aio-mqtt-mod/Makefile diff --git a/lang/python/python-aio-mqtt-mod/Makefile b/lang/python/python-aio-mqtt-mod/Makefile new file mode 100644 index 000000000..b5afab5cc --- /dev/null +++ b/lang/python/python-aio-mqtt-mod/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2023 +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-aio-mqtt-mod +PKG_VERSION:=0.3.3 +PKG_RELEASE:=1 + +PYPI_NAME:=aio-mqtt-mod +PKG_HASH:=2271f8a2fd6c6aea914896dc3d4dd6e384cd0da405b06dcfa566bd01f968bf9d + +PKG_MAINTAINER:=Quintin Hill +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=LICENSE + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-aio-mqtt-mod + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Asynchronous MQTT client + URL:=https://github.com/devbis/aio-mqtt + DEPENDS:=+python3-light +python3-asyncio +python3-openssl +endef + +define Package/python3-aio-mqtt-mod/description + Asynchronous MQTT client for 3.1.1 protocol version (mod). +endef + +$(eval $(call Py3Package,python3-aio-mqtt-mod)) +$(eval $(call BuildPackage,python3-aio-mqtt-mod)) +$(eval $(call BuildPackage,python3-aio-mqtt-mod-src)) From 8711653f1edfca0203006eb0203f26310c864b9d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 16 Mar 2023 11:19:10 +0800 Subject: [PATCH 02/11] golang: Update to 1.20.2, refresh patch Includes fixes for: * 1.20.1: * CVE-2022-41722: path/filepath: path traversal in filepath.Clean on Windows * CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding * CVE-2022-41724: crypto/tls: large handshake records may cause panics * CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption * 1.20.2: * CVE-2023-24532: crypto/elliptic: specific unreduced P-256 scalars produce incorrect results Signed-off-by: Jeffery To --- lang/golang/golang-compiler.mk | 6 ++- lang/golang/golang-values.mk | 11 +++-- lang/golang/golang/Makefile | 42 ++++++++++++++++--- ...-ARM-ARM64-only-if-gold-is-available.patch | 2 +- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/lang/golang/golang-compiler.mk b/lang/golang/golang-compiler.mk index 8f9c9a380..b8c278568 100644 --- a/lang/golang/golang-compiler.mk +++ b/lang/golang/golang-compiler.mk @@ -76,8 +76,10 @@ define GoCompiler/Default/Install/Bin $(INSTALL_BIN) -p "$(1)/bin/$(4)"/* "$(2)/lib/go-$(3)/bin/" endif - $(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg" - $(CP) "$(1)/pkg/$(4)$(if $(5),_$(5))" "$(2)/lib/go-$(3)/pkg/" + if [ -d "$(1)/pkg/$(4)$(if $(5),_$(5))" ]; then \ + $(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg" ; \ + $(CP) "$(1)/pkg/$(4)$(if $(5),_$(5))" "$(2)/lib/go-$(3)/pkg/" ; \ + fi $(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg/tool/$(4)" $(INSTALL_BIN) -p "$(1)/pkg/tool/$(4)"/* "$(2)/lib/go-$(3)/pkg/tool/$(4)/" diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index 2cd656dad..3c170f308 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -65,6 +65,10 @@ unexport \ GOPPC64 \ GOWASM +# Environment variables for use with code coverage: +unexport \ + GOCOVERDIR + # Special-purpose environment variables: unexport \ GCCGOTOOLDIR \ @@ -202,12 +206,11 @@ GO_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mips64||mips64el||mipsel||pow # ASLR/PIE -# From https://go.dev/src/cmd/internal/sys/supported.go +# From https://go.dev/src/internal/platform/supported.go GO_PIE_SUPPORTED_OS_ARCH:= \ android_386 android_amd64 android_arm android_arm64 \ linux_386 linux_amd64 linux_arm linux_arm64 \ - \ - windows_386 windows_amd64 windows_arm \ + windows_386 windows_amd64 windows_arm windows_arm64 \ \ darwin_amd64 darwin_arm64 \ ios_amd64 ios_arm64 \ @@ -219,7 +222,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \ linux_ppc64le linux_riscv64 linux_s390x # From https://go.dev/src/cmd/go/internal/work/init.go -go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm),,shared) +go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm windows_arm64),,shared) ifneq ($(filter $(GO_HOST_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),) GO_HOST_PIE_SUPPORTED:=1 diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 130cb75e2..535c6e4aa 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk -GO_VERSION_MAJOR_MINOR:=1.19 -GO_VERSION_PATCH:=7 +GO_VERSION_MAJOR_MINOR:=1.20 +GO_VERSION_PATCH:=2 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 +PKG_HASH:=4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause @@ -63,6 +63,8 @@ HOST_GO_VALID_OS_ARCH:= \ aix_ppc64 \ js_wasm \ \ + freebsd_riscv64 \ + \ linux_ppc64 linux_ppc64le \ linux_mips linux_mipsle linux_mips64 linux_mips64le \ linux_loong64 linux_riscv64 linux_s390x \ @@ -86,6 +88,12 @@ BOOTSTRAP_GO_VALID_OS_ARCH:= \ solaris_amd64 \ windows_386 windows_amd64 +BOOTSTRAP_1_17_SOURCE:=go1.17.13.src.tar.gz +BOOTSTRAP_1_17_SOURCE_URL:=$(GO_SOURCE_URLS) +BOOTSTRAP_1_17_HASH:=a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd + +BOOTSTRAP_1_17_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.17 + include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk include ../golang-compiler.mk @@ -94,6 +102,7 @@ include ../golang-package.mk PKG_UNPACK:=$(HOST_TAR) -C "$(PKG_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)" HOST_UNPACK:=$(HOST_TAR) -C "$(HOST_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)" BOOTSTRAP_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_SOURCE)" +BOOTSTRAP_1_17_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_17_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_17_SOURCE)" # don't strip ELF executables in test data RSTRIP:=: @@ -181,8 +190,7 @@ ifeq ($(BOOTSTRAP_ROOT_DIR),) $(eval $(call Download,golang-bootstrap)) define Bootstrap/Prepare - mkdir -p "$(BOOTSTRAP_BUILD_DIR)" - $(BOOTSTRAP_UNPACK) + mkdir -p "$(BOOTSTRAP_BUILD_DIR)" && $(BOOTSTRAP_UNPACK) ; endef Hooks/HostPrepare/Post+=Bootstrap/Prepare @@ -190,6 +198,23 @@ ifeq ($(BOOTSTRAP_ROOT_DIR),) endif +# Bootstrap 1.17 + +define Download/golang-bootstrap-1.17 + FILE:=$(BOOTSTRAP_1_17_SOURCE) + URL:=$(BOOTSTRAP_1_17_SOURCE_URL) + HASH:=$(BOOTSTRAP_1_17_HASH) +endef +$(eval $(call Download,golang-bootstrap-1.17)) + +define Bootstrap-1.17/Prepare + mkdir -p "$(BOOTSTRAP_1_17_BUILD_DIR)" && $(BOOTSTRAP_1_17_UNPACK) ; +endef +Hooks/HostPrepare/Post+=Bootstrap-1.17/Prepare + +$(eval $(call GoCompiler/AddProfile,Bootstrap-1.17,$(BOOTSTRAP_1_17_BUILD_DIR),,bootstrap-1.17,$(GO_HOST_OS_ARCH))) + + # Host ifeq ($(GO_HOST_PIE_SUPPORTED),1) @@ -220,8 +245,13 @@ define Host/Compile $(HOST_GO_VARS) \ ) - $(call GoCompiler/Host/Make, \ + $(call GoCompiler/Bootstrap-1.17/Make, \ GOROOT_BOOTSTRAP="$(BOOTSTRAP_ROOT_DIR)" \ + $(HOST_GO_VARS) \ + ) + + $(call GoCompiler/Host/Make, \ + GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_17_BUILD_DIR)" \ $(if $(HOST_GO_ENABLE_PIE),GO_LDFLAGS="-buildmode pie") \ $(HOST_GO_VARS) \ ) diff --git a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch b/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch index 7eb40a474..683480442 100644 --- a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch +++ b/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch @@ -13,7 +13,7 @@ Fixes #22040. --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1502,25 +1502,20 @@ func (ctxt *Link) hostlink() { +@@ -1535,25 +1535,20 @@ func (ctxt *Link) hostlink() { } if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) && buildcfg.GOOS == "linux" { From 3c6a6746b0da7f084a2f7e21c31cad6d898ecc46 Mon Sep 17 00:00:00 2001 From: Quintin Hill Date: Fri, 10 Mar 2023 22:49:03 +0000 Subject: [PATCH 03/11] python-dbus-fast: add package This package is a dependency of bleak. Building and installing this package via pip on a router is not difficult and the build crashes when memory is exhausted. Signed-off-by: Quintin Hill --- lang/python/python-dbus-fast/Makefile | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 lang/python/python-dbus-fast/Makefile diff --git a/lang/python/python-dbus-fast/Makefile b/lang/python/python-dbus-fast/Makefile new file mode 100644 index 000000000..ad6b0b40b --- /dev/null +++ b/lang/python/python-dbus-fast/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2023 +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-dbus-fast +PKG_VERSION:=1.84.2 +PKG_RELEASE:=1 + +PYPI_NAME:=dbus-fast +PYPI_SOURCE_NAME:=dbus_fast +PKG_HASH:=62b00b85c5835bff1d7ab5b12d494e588d92612bedbd7ca86176861729b8e4bc + +PKG_MAINTAINER:=Quintin Hill +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-dbus-fast + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=A faster version of dbus-next + URL:=https://github.com/Bluetooth-Devices/dbus-fast + DEPENDS:=+python3-light +python3-async-timeout +python3-asyncio \ + +python3-logging +python3-urllib +python3-xml +endef + +define Package/python3-dbus-fast/description + dbus-fast is a Python library for DBus that aims to be a performant fully + featured high level library primarily geared towards integration of + applications into Linux desktop and mobile environments. +endef + +$(eval $(call Py3Package,python3-dbus-fast)) +$(eval $(call BuildPackage,python3-dbus-fast)) +$(eval $(call BuildPackage,python3-dbus-fast-src)) From f0d5e470e1bc2644d86007342473b935ca18fdce Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 21 Mar 2023 14:41:48 +0800 Subject: [PATCH 04/11] CI: Add --autoremove, ignore removal errors 836b4e1c734f9705bfd8db0da0c04214c2647932 added --force-removal-of-dependent-packages but it does not do what the commit message says it does. When package A depends on package B (package B is a dependency of package A; package A is a dependent of package B), trying to remove package B while package A is installed will result in an error. Adding --force-removal-of-dependent-packages in this case will cause the removal of package B and package A (package B's dependent). But in the case of the CI testing step, it is package A that is being installed and removed. Removing package A with --force-removal-of-dependent-packages will not cause package B (package A's dependency) to be removed. This adds --autoremove to actually remove the package's dependencies. This also ignores any errors returned by opkg remove as --autoremove can sometimes falsely return an error[1]. [1]: https://github.com/openwrt/openwrt/issues/12241 Fixes: 836b4e1c734f ("github-ci: add --force-removal-of-dependent-packages") Signed-off-by: Jeffery To --- .github/workflows/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/entrypoint.sh b/.github/workflows/entrypoint.sh index 6af84b8e7..8f00a8468 100755 --- a/.github/workflows/entrypoint.sh +++ b/.github/workflows/entrypoint.sh @@ -39,5 +39,5 @@ for PKG in /ci/*.ipk; do echo "No test.sh script available" fi - opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove + opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove --autoremove || true done From 661f14c46ed43a3855f9fa4f94cd63cd031c1662 Mon Sep 17 00:00:00 2001 From: Quintin Hill Date: Mon, 20 Mar 2023 13:32:49 +0000 Subject: [PATCH 05/11] python-bleak: add package This package is a dependency of ble2mqtt. python-asyncio is a runtime dependency of this package. Signed-off-by: Quintin Hill --- lang/python/python-bleak/Makefile | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 lang/python/python-bleak/Makefile diff --git a/lang/python/python-bleak/Makefile b/lang/python/python-bleak/Makefile new file mode 100644 index 000000000..b97d65065 --- /dev/null +++ b/lang/python/python-bleak/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2023 +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-bleak +PKG_VERSION:=0.20.0 +PKG_RELEASE:=1 + +PYPI_NAME:=bleak +PKG_HASH:=7f6fe69454ad5d4c0ab05ae4a9aa1aabd6926d7128eab2fac4ef8a58a72999ee + +PKG_MAINTAINER:=Quintin Hill +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-bleak + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Bluetooth Low Energy platform Agnostic Klient + URL:=https://github.com/hbldh/bleak + DEPENDS:=+python3-light +python3-async-timeout +python3-asyncio \ + +python3-dbus-fast +python3-ctypes +python3-logging +endef + +define Package/python3-bleak/description + Bleak is an acronym for Bluetooth Low Energy platform Agnostic Klient. + Bleak is a GATT client software, capable of connecting to BLE devices acting + as GATT servers. It is designed to provide a asynchronous, cross-platform + Python API to connect and communicate with e.g. sensors. +endef + +$(eval $(call Py3Package,python3-bleak)) +$(eval $(call BuildPackage,python3-bleak)) +$(eval $(call BuildPackage,python3-bleak-src)) From 2af786a48dc3e60481f4d37dfa86400ddc28fca7 Mon Sep 17 00:00:00 2001 From: Quintin Hill Date: Fri, 10 Mar 2023 22:51:17 +0000 Subject: [PATCH 06/11] python-ble2mqtt: add package This package allows interfacing between BLE sensors and MQTT. Signed-off-by: Quintin Hill --- lang/python/python-ble2mqtt/Makefile | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 lang/python/python-ble2mqtt/Makefile diff --git a/lang/python/python-ble2mqtt/Makefile b/lang/python/python-ble2mqtt/Makefile new file mode 100644 index 000000000..9fff9beba --- /dev/null +++ b/lang/python/python-ble2mqtt/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2023 +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-ble2mqtt +PKG_VERSION:=0.1.5 +PKG_RELEASE:=1 + +PYPI_NAME:=ble2mqtt +PKG_HASH:=0015cae0c36badb48cbd4a1c8b1a8029e45ab0891a95363fe00624c2629b4510 + +PKG_MAINTAINER:=Quintin Hill +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-ble2mqtt + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Bluetooth to MQTT bridge + URL:=https://github.com/devbis/ble2mqtt/ + DEPENDS:=+python3-light +python3-aio-mqtt-mod +python3-asyncio +python3-bleak +python3-logging +endef + +define Package/python3-ble2mqtt/description + Bluetooth to MQTT bridge, add your bluetooth-capable (including controllable) + devices to your smart home +endef + +$(eval $(call Py3Package,python3-ble2mqtt)) +$(eval $(call BuildPackage,python3-ble2mqtt)) +$(eval $(call BuildPackage,python3-ble2mqtt-src)) From 40276c24dd69d12f7bb4ec157ca54eaf97977328 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 25 Mar 2023 07:47:11 -0400 Subject: [PATCH 07/11] snort3: update to 3.1.58.0 Upstream bump Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 68e2bbe1c..0f1238a43 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.57.0 +PKG_VERSION:=3.1.58.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=cec779dde2fbf7e3d20b721c04b89f6f84ef663bf1afba06535188e7c766721c +PKG_HASH:=c2b37899db42e2db9a05089abbe0ba48633c6c48496d2c64565500b4f9061d78 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From d6edd837f5d8ae18f53b474910358fad2930aa32 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 19 Oct 2022 11:00:36 +0200 Subject: [PATCH 08/11] net-snmp: fix whitespaces Replace spaces with tabs Signed-off-by: Florian Eckert --- net/net-snmp/files/snmpd.init | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/net-snmp/files/snmpd.init b/net/net-snmp/files/snmpd.init index 158871041..b0f93cdd4 100644 --- a/net/net-snmp/files/snmpd.init +++ b/net/net-snmp/files/snmpd.init @@ -200,14 +200,14 @@ snmpd_extend_add() { } snmpd_disk_add() { - local cfg="$1" - local disk='disk' + local cfg="$1" + local disk='disk' - config_get partition "$cfg" partition - [ -n "$partition" ] || return 0 - config_get size "$cfg" size - [ -n "$size" ] || return 0 - echo "$disk $partition $size" >> $CONFIGFILE + config_get partition "$cfg" partition + [ -n "$partition" ] || return 0 + config_get size "$cfg" size + [ -n "$size" ] || return 0 + echo "$disk $partition $size" >> $CONFIGFILE } snmpd_engineid_add() { From 9b67f7d1340abe08e6a0c2c80fb32572577a1441 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 19 Oct 2022 10:40:18 +0200 Subject: [PATCH 09/11] net-snmp: rename stop_service to service_stopped The commands in the function 'stop_service' do not stop the service. Rather, they are commands that are to be executed when the service has already been stopped. By renaming the function, the commands are now executed after the service has been stopped. Signed-off-by: Florian Eckert --- net/net-snmp/files/snmpd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/net-snmp/files/snmpd.init b/net/net-snmp/files/snmpd.init index b0f93cdd4..daecb73c9 100644 --- a/net/net-snmp/files/snmpd.init +++ b/net/net-snmp/files/snmpd.init @@ -336,7 +336,7 @@ start_service() { procd_close_instance } -stop_service() { +service_stopped() { [ -f "$CONFIGFILE" ] || return rm -f "$CONFIGFILE" procd_set_config_changed firewall From 797f7b44aa8dba377b0b8e2545ab9c16c0e84fe6 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Sun, 26 Mar 2023 20:23:19 +0000 Subject: [PATCH 10/11] curl: update to 8.0.1 * https://curl.se/changes.html#8_0_1 Signed-off-by: Stan Grishin --- net/curl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/curl/Makefile b/net/curl/Makefile index 0864d5143..c3ba55ac0 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/nls.mk PKG_NAME:=curl -PKG_VERSION:=7.88.1 -PKG_RELEASE:=2 +PKG_VERSION:=8.0.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \ https://dl.uxnr.de/mirror/curl/ \ https://curl.askapache.com/download/ \ https://curl.se/download/ -PKG_HASH:=1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f +PKG_HASH:=0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING From c9bf92c88d771cf4e3bbe851c271f641ff1a0957 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Thu, 30 Mar 2023 18:00:15 +0200 Subject: [PATCH 11/11] banip: update to 0.8.2-5 * fixed missing version number when installed as separate package (not in build) * fixed cornercase init and mailing issues * sorted Country list by country names ascending * fixed some shellcheck findings Signed-off-by: Dirk Brenken --- net/banip/Makefile | 2 +- net/banip/files/banip-functions.sh | 10 ++++-- net/banip/files/banip-service.sh | 7 ++++- net/banip/files/banip.countries | 50 +++++++++++++++--------------- net/banip/files/banip.init | 6 ++-- 5 files changed, 42 insertions(+), 33 deletions(-) diff --git a/net/banip/Makefile b/net/banip/Makefile index ca8b5fa37..38df1fcf4 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip PKG_VERSION:=0.8.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh index fc3c73225..a5049aa8b 100644 --- a/net/banip/files/banip-functions.sh +++ b/net/banip/files/banip-functions.sh @@ -79,7 +79,7 @@ f_system() { local cpu core ban_memory="$("${ban_awkcmd}" '/^MemAvailable/{printf "%s",int($2/1000)}' "/proc/meminfo" 2>/dev/null)" - ban_ver="$(${ban_ubuscmd} -S call rpc-sys packagelist 2>/dev/null | jsonfilter -ql1 -e '@.packages.banip')" + ban_ver="$(${ban_ubuscmd} -S call rpc-sys packagelist '{ "all": true }' 2>/dev/null | jsonfilter -ql1 -e '@.packages.banip')" ban_sysver="$(${ban_ubuscmd} -S call system board 2>/dev/null | jsonfilter -ql1 -e '@.model' -e '@.release.description' | "${ban_awkcmd}" 'BEGIN{RS="";FS="\n"}{printf "%s, %s",$1,$2}')" if [ -z "${ban_cores}" ]; then @@ -928,7 +928,7 @@ f_genstatus() { # get status information # f_getstatus() { - local key keylist type value index_key1 index_key2 index_value1 index_value2 actual="${1}" + local key keylist type value index_key1 index_key2 index_value1 index_value2 [ -z "${ban_dev}" ] && f_conf json_load_file "${ban_rtfile}" >/dev/null 2>&1 @@ -1262,7 +1262,11 @@ f_mail() { # load mail template # - [ -r "${ban_mailtemplate}" ] && . "${ban_mailtemplate}" || f_log "info" "the mail template is missing" + if [ -r "${ban_mailtemplate}" ]; then + . "${ban_mailtemplate}" + else + f_log "info" "the mail template is missing" + fi [ -z "${mail_text}" ] && f_log "info" "the 'mail_text' template variable is empty" [ "${ban_debug}" = "1" ] && msmtp_debug="--debug" diff --git a/net/banip/files/banip-service.sh b/net/banip/files/banip-service.sh index 7e3cdb3bb..e753a8810 100755 --- a/net/banip/files/banip-service.sh +++ b/net/banip/files/banip-service.sh @@ -138,8 +138,13 @@ hold="$((cnt % ban_cores))" f_rmset f_rmdir "${ban_tmpdir}" f_genstatus "active" -[ "${ban_mailnotification}" = "1" ] && [ -n "${ban_mailreceiver}" ] && [ -x "${ban_mailcmd}" ] && f_mail f_log "info" "finished banIP download processes" +if [ "${ban_mailnotification}" = "1" ] && [ -n "${ban_mailreceiver}" ] && [ -x "${ban_mailcmd}" ]; then + ( + sleep ${ban_triggerdelay} + f_mail + ) & +fi rm -rf "${ban_lock}" # start detached log service diff --git a/net/banip/files/banip.countries b/net/banip/files/banip.countries index 92aa6c15c..423876302 100644 --- a/net/banip/files/banip.countries +++ b/net/banip/files/banip.countries @@ -1,5 +1,5 @@ -tw;Taiwan af;Afghanistan +ax;Åland Islands al;Albania dz;Algeria as;American Samoa @@ -25,7 +25,6 @@ bj;Benin bm;Bermuda bt;Bhutan bo;Bolivia -bq;Caribbean Netherlands ba;Bosnia bw;Botswana bv;Bouvet Island @@ -36,32 +35,30 @@ bn;Brunei bg;Bulgaria bf;Burkina Faso bi;Burundi -cv;Cape Verde kh;Cambodia cm;Cameroon ca;Canada +cv;Cape Verde +bq;Caribbean Netherlands ky;Cayman Islands cf;Central African Republic td;Chad cl;Chile cn;China -hk;Hong Kong -mo;Macau cx;Christmas Island cc;Cocos (Keeling) Islands co;Colombia km;Comoros cg;Congo - Brazzaville +cd;Congo - Kinshasa ck;Cook Islands cr;Costa Rica +ci;Côte d’Ivoire hr;Croatia cu;Cuba cw;Curaçao cy;Cyprus cz;Czechia -ci;Côte d’Ivoire -kp;North Korea -cd;Congo - Kinshasa dk;Denmark dj;Djibouti dm;Dominica @@ -100,8 +97,8 @@ gw;Guinea-Bissau gy;Guyana ht;Haiti hm;Heard & McDonald Islands -va;Vatican City hn;Honduras +hk;Hong Kong hu;Hungary is;Iceland in;India @@ -130,6 +127,7 @@ ly;Libya li;Liechtenstein lt;Lithuania lu;Luxembourg +mo;Macau mg;Madagascar mw;Malawi my;Malaysia @@ -143,6 +141,7 @@ mu;Mauritius yt;Mayotte mx;Mexico fm;Micronesia +md;Moldova mc;Monaco mn;Mongolia me;Montenegro @@ -162,10 +161,13 @@ ng;Nigeria nu;Niue nf;Norfolk Island mp;Northern Mariana Islands +kp;North Korea +mk;North Macedonia no;Norway om;Oman pk;Pakistan pw;Palau +ps;Palestine pa;Panama pg;Papua New Guinea py;Paraguay @@ -176,19 +178,10 @@ pl;Poland pt;Portugal pr;Puerto Rico qa;Qatar -kr;South Korea -md;Moldova +re;Réunion ro;Romania ru;Russia rw;Rwanda -re;Réunion -bl;St. Barthélemy -sh;St. Helena -kn;St. Kitts & Nevis -lc;St. Lucia -mf;St. Martin -pm;St. Pierre & Miquelon -vc;St. Vincent & Grenadines ws;Samoa sm;San Marino st;São Tomé & Príncipe @@ -205,19 +198,27 @@ sb;Solomon Islands so;Somalia za;South Africa gs;South Georgia & South Sandwich Islands +kr;South Korea ss;South Sudan es;Spain lk;Sri Lanka -ps;Palestine +bl;St. Barthélemy +sh;St. Helena +kn;St. Kitts & Nevis +lc;St. Lucia +mf;St. Martin +pm;St. Pierre & Miquelon +vc;St. Vincent & Grenadines sd;Sudan sr;Suriname sj;Svalbard & Jan Mayen se;Sweden ch;Switzerland sy;Syria +tw;Taiwan tj;Tajikistan +tz;Tanzania th;Thailand -mk;North Macedonia tl;Timor-Leste tg;Togo tk;Tokelau @@ -232,13 +233,13 @@ ug;Uganda ua;Ukraine ae;United Arab Emirates gb;United Kingdom -tz;Tanzania -um;U.S. Outlying Islands -vi;U.S. Virgin Islands us;United States uy;Uruguay +um;U.S. Outlying Islands +vi;U.S. Virgin Islands uz;Uzbekistan vu;Vanuatu +va;Vatican City ve;Venezuela vn;Vietnam wf;Wallis & Futuna @@ -246,4 +247,3 @@ eh;Western Sahara ye;Yemen zm;Zambia zw;Zimbabwe -ax;Åland Islands diff --git a/net/banip/files/banip.init b/net/banip/files/banip.init index 46df4d7fc..6c7628033 100755 --- a/net/banip/files/banip.init +++ b/net/banip/files/banip.init @@ -19,6 +19,7 @@ ban_funlib="/usr/lib/banip-functions.sh" ban_pidfile="/var/run/banip.pid" ban_lock="/var/run/banip.lock" +[ "${action}" = "boot" ] && /etc/init.d/banip running && exit 0 [ "${action}" = "stop" ] && ! /etc/init.d/banip running && exit 0 [ ! -r "${ban_funlib}" ] && { [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "survey" ] || [ "${action}" = "status" ]; } && exit 1 [ -d "${ban_lock}" ] && { [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ]; } && exit 1 @@ -60,6 +61,7 @@ stop_service() { "${ban_nftcmd}" delete table inet banIP >/dev/null 2>&1 f_genstatus "stopped" f_rmpid + rm -rf "${ban_lock}" } restart() { @@ -72,10 +74,8 @@ status() { } status_service() { - local actual="${1}" - [ -z "$(command -v "f_system")" ] && . "${ban_funlib}" - [ -n "${actual}" ] && f_actual || f_getstatus + f_getstatus } report() {