From dd3c410ab9593a025ffe1990b2b6413bca7b7620 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Sat, 9 Nov 2024 18:28:01 +0800 Subject: [PATCH 01/22] lua-eco: update to 3.6.1 Signed-off-by: Jianhui Zhao --- lang/lua-eco/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/lua-eco/Makefile b/lang/lua-eco/Makefile index ac2e6f6664..a78a812fa1 100644 --- a/lang/lua-eco/Makefile +++ b/lang/lua-eco/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-eco -PKG_VERSION:=3.6.0 +PKG_VERSION:=3.6.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION) -PKG_HASH:=0fdcd8eb9e93f2d1f0ff2132298faae2e13a8bfd676bd91db4d53e48917d6a74 +PKG_HASH:=8bfd5a85a699c0ff1ba760e121f3955e817a66335be6587ef930ec61638e5ae3 PKG_MAINTAINER:=Jianhui Zhao PKG_LICENSE:=MIT @@ -98,11 +98,11 @@ define Package/lua-eco/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/local/lib/lua/5.3/eco/core \ $(1)/usr/lib $(1)/usr/local/lib/lua/5.3/eco/encoding $(INSTALL_BIN) $(PKG_BUILD_DIR)/eco $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libeco.so $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libeco.so* $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/bufio.so $(1)/usr/local/lib/lua/5.3/eco $(INSTALL_DATA) $(PKG_BUILD_DIR)/hex.lua $(1)/usr/local/lib/lua/5.3/eco/encoding $(INSTALL_BIN) $(PKG_BUILD_DIR)/{time,bufio,sys,file}.so $(1)/usr/local/lib/lua/5.3/eco/core - $(INSTALL_DATA) $(PKG_BUILD_DIR)/{time,sys,file,sync}.lua $(1)/usr/local/lib/lua/5.3/eco + $(INSTALL_DATA) $(PKG_BUILD_DIR)/{time,sys,file,sync,channel}.lua $(1)/usr/local/lib/lua/5.3/eco endef define Package/lua-eco-log/install From 1f17e41e4340dffc462b5fccbb0ea85533f7f929 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Fri, 8 Nov 2024 09:42:52 +0900 Subject: [PATCH 02/22] node: Preparing to update ICU to 76 fix building with system icu 76 ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer add `icu-uc` when linking to shared libraries. This results in undefined symbols/references when trying to build with system ICU 76. [^1]: unicode-org/icu@199bc82 ref: https://github.com/nodejs/node/pull/55563 Signed-off-by: Hirokazu MORIKAWA --- lang/node/Makefile | 2 +- .../999-fix_building_with_system_icu_76.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 lang/node/patches/999-fix_building_with_system_icu_76.patch diff --git a/lang/node/Makefile b/lang/node/Makefile index 3cc837fccc..67baeb3ec4 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node PKG_VERSION:=20.18.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nodejs.org/dist/v$(PKG_VERSION) diff --git a/lang/node/patches/999-fix_building_with_system_icu_76.patch b/lang/node/patches/999-fix_building_with_system_icu_76.patch new file mode 100644 index 0000000000..3ca448a2a3 --- /dev/null +++ b/lang/node/patches/999-fix_building_with_system_icu_76.patch @@ -0,0 +1,25 @@ +From 54299ac3a3d4e4520b8604dce43c2584092ccde2 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Sun, 27 Oct 2024 10:08:07 -0400 +Subject: [PATCH] build: fix building with system icu 76 + +ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer +add `icu-uc` when linking to shared libraries. This results in undefined +symbols/references when trying to build with system ICU 76. + +[^1]: unicode-org/icu@199bc82 +--- + configure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.py ++++ b/configure.py +@@ -1829,7 +1829,7 @@ def configure_intl(o): + elif with_intl == 'system-icu': + # ICU from pkg-config. + o['variables']['v8_enable_i18n_support'] = 1 +- pkgicu = pkg_config('icu-i18n') ++ pkgicu = pkg_config(['icu-i18n', 'icu-uc']) + if not pkgicu[0]: + error('''Could not load pkg-config data for "icu-i18n". + See above errors or the README.md.''') From c9b32b99c06bbfbd0efd756333db7e48db7442aa Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Tue, 24 Sep 2024 15:18:13 +0100 Subject: [PATCH 03/22] prometheus-node-exporter-lua: Fix typos Signed-off-by: Jack Baldry --- .../files/usr/lib/lua/prometheus-collectors/nat_traffic.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/nat_traffic.lua b/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/nat_traffic.lua index 24e4ca1f93..66d8342a6c 100644 --- a/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/nat_traffic.lua +++ b/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/nat_traffic.lua @@ -1,10 +1,10 @@ local function scrape() - -- documetation about nf_conntrack: + -- documentation about nf_conntrack: -- https://www.frozentux.net/iptables-tutorial/chunkyhtml/x1309.html - -- two dimesional table to sum bytes for the pair (src/dest) + -- two dimensional table to sum bytes for the pair (src/dest) local nat = {} - -- default constructor to init unknow pairs + -- default constructor to initialize unknown pairs setmetatable(nat, { __index = function (t, addr) t[addr] = {} From a122ec8f6ecd92a8e512217b1032bf86dbdbc6c1 Mon Sep 17 00:00:00 2001 From: Jonas Jelonek Date: Sat, 9 Nov 2024 23:19:05 +0000 Subject: [PATCH 04/22] croc: update to 10.1.0 Changelog: https://github.com/schollz/croc/releases/tag/v10.1.0 Signed-off-by: Jonas Jelonek --- net/croc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/croc/Makefile b/net/croc/Makefile index 63d62c346b..8a5eacdce1 100644 --- a/net/croc/Makefile +++ b/net/croc/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=croc -PKG_VERSION:=10.0.13 +PKG_VERSION:=10.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/schollz/croc/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=69a7e60811b97d3f6e2ceac4d24fc52596ec8982039811fb5894ef78f2dedc77 +PKG_HASH:=0968f28c0d46ff181173ae1613aea5c55757384e3c1358917f78bf0ce595d151 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From ae40d866ca6e5cad6070224d82d382dea83409dc Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Sun, 10 Nov 2024 07:57:05 +0900 Subject: [PATCH 05/22] icu: bump to 76.1 ICU 76 updates to Unicode 16 (blog), including new characters and scripts, emoji, collation & IDNA changes, and corresponding APIs and implementations. It also updates to CLDR 46 (beta blog) locale data with new locales, significant updates to existing locales, and various additions and corrections. For example, the CLDR and Unicode default sort orders are now very nearly the same. ICU 76 and CLDR 46 are major releases, including a new version of Unicode and major locale data improvements. Signed-off-by: Hirokazu MORIKAWA --- libs/icu/Makefile | 4 ++-- libs/icu/patches/001-change_optimization_option.patch | 2 +- libs/icu/patches/010-max_align_t.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/icu/Makefile b/libs/icu/Makefile index 6ffa83ca2d..c08e0ee35a 100644 --- a/libs/icu/Makefile +++ b/libs/icu/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icu4c -MAJOR_VERSION:=75 +MAJOR_VERSION:=76 MINOR_VERSION:=1 PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION) PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION) -PKG_HASH:=cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef +PKG_HASH:=dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e PKG_LICENSE:=ICU PKG_LICENSE_FILES:=LICENSE diff --git a/libs/icu/patches/001-change_optimization_option.patch b/libs/icu/patches/001-change_optimization_option.patch index 4c088ef3ac..9b6c3214e3 100644 --- a/libs/icu/patches/001-change_optimization_option.patch +++ b/libs/icu/patches/001-change_optimization_option.patch @@ -1,6 +1,6 @@ --- a/runConfigureICU +++ b/runConfigureICU -@@ -255,8 +255,8 @@ case $platform in +@@ -254,8 +254,8 @@ case $platform in THE_COMP="the GNU C++" CC=gcc; export CC CXX=g++; export CXX diff --git a/libs/icu/patches/010-max_align_t.patch b/libs/icu/patches/010-max_align_t.patch index 5dcf568964..2dd44c0cfb 100644 --- a/libs/icu/patches/010-max_align_t.patch +++ b/libs/icu/patches/010-max_align_t.patch @@ -49,7 +49,7 @@ if (ut == nullptr) { --- a/tools/toolutil/toolutil.cpp +++ b/tools/toolutil/toolutil.cpp -@@ -267,7 +267,7 @@ struct UToolMemory { +@@ -337,7 +337,7 @@ struct UToolMemory { char name[64]; int32_t capacity, maxCapacity, size, idx; void *array; From c952d4574a889e24dac39bf5c34d7d2de4bd11e9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 9 Nov 2024 00:39:07 +0000 Subject: [PATCH 06/22] libgcrypt: use pkgconfig metadata in InstallDev Install pkgconfig metadata to allow detection of libgcrypt during build of other packages which rely on pkgconfig. Signed-off-by: Daniel Golle --- libs/libgcrypt/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index bde8880321..6edfe2ac21 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -54,13 +54,14 @@ CONFIGURE_ARGS += \ TARGET_CFLAGS += $(FPIC) define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal + $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib/pkgconfig $(1)/usr/share/aclocal $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{la,a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(1)/usr/share/aclocal/ $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libgcrypt-config $(LN) ../../usr/bin/libgcrypt-config $(2)/bin/libgcrypt-config + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig endef define Package/libgcrypt/install From bec27934112d5ebfcc7d3914aab4f73804d76438 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 9 Nov 2024 16:01:22 -0800 Subject: [PATCH 07/22] tunneldigger-broker: fix APK version Need to use PKG_VERSION. Signed-off-by: Rosen Penev --- net/tunneldigger-broker/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/tunneldigger-broker/Makefile b/net/tunneldigger-broker/Makefile index c03b10377b..5badc05297 100644 --- a/net/tunneldigger-broker/Makefile +++ b/net/tunneldigger-broker/Makefile @@ -1,12 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tunneldigger-broker +PKG_VERSION:=0.4.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/wlanslovenija/tunneldigger.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=v0.4.0 -PKG_MIRROR_HASH:=2871db8492de82e8f013d42b430fbf97397df84ab428b1ebfbb370e1faa9fafb +PKG_SOURCE_VERSION:=v$(PKG_VERSION) +PKG_MIRROR_HASH:=76f97b34356ced346804e04a14b66f6bb9e315d62c4706897a2b670bccc83af9 PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=AGPL-3.0 From b74ca8feb20a9491e57a1064767e61c2bea06aa0 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 10 Nov 2024 10:29:00 +0200 Subject: [PATCH 08/22] ddns-scripts: Adjust descriptions in Makefile for apk Having both double quotes and parentheses in package description may lead into troublewith apk, if parentheses are located so that they get passed "outside" the quoted parameter, and get interpreted as a token for shell. Example: ash: -c: line 1: syntax error near unexpected token `(' bash: -c: line 1: `/OpenWrt/e8450/staging_dir/host/bin/fakeroot /OpenWrt/e8450/staging_dir/host/bin/apk mkpkg --info "name:ddns -scripts-pdns" --info "version:2.8.2-r51" --info "description:D ynamic DNS Client scripts extension for "PowerDNS" via API. It requires: "option param_opt(Optional Parameter)" to be a valid Avoid that by using single quotes in the detailed descriptions. Signed-off-by: Hannu Nyman --- net/ddns-scripts/Makefile | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index cb6b7351b5..83118750c2 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=51 +PKG_RELEASE:=52 PKG_LICENSE:=GPL-2.0 @@ -109,7 +109,7 @@ define Package/ddns-scripts-freedns endef define Package/ddns-scripts-freedns/description - Dynamic DNS Client scripts extension for "freedns.42.pl". + Dynamic DNS Client scripts extension for 'freedns.42.pl'. endef @@ -121,7 +121,7 @@ define Package/ddns-scripts-godaddy endef define Package/ddns-scripts-godaddy/description - Dynamic DNS Client scripts extension for "godaddy.com API v1". + Dynamic DNS Client scripts extension for 'godaddy.com API v1'. endef @@ -133,14 +133,14 @@ define Package/ddns-scripts-digitalocean endef define Package/ddns-scripts-digitalocean/description - Dynamic DNS Client scripts extension for "digitalocean.com API v2". + Dynamic DNS Client scripts extension for digitalocean.com API v2. The script directly updates a DNS record using the DO API. It requires: - "option dns_server" to be set to the server to be used by nsupdate. - "option domain" the dns domain to update the record for (eg. A-record: home.) - "option username" the dns record name to update (eg. A-record: .example.com) - "option param_opt" the id of the dns record to update (check using chrome inspector in the DO dns tab) - "option password" the api token generated in the DO panel + 'option dns_server' to be set to the server to be used by nsupdate. + 'option domain' the dns domain to update the record for (eg. A-record: home.) + 'option username' the dns record name to update (eg. A-record: .example.com) + 'option param_opt' the id of the dns record to update (check using chrome inspector in the DO dns tab) + 'option password' the api token generated in the DO panel endef @@ -163,7 +163,7 @@ define Package/ddns-scripts-noip endef define Package/ddns-scripts-noip/description - Dynamic DNS Client scripts extension for "no-ip.com". + Dynamic DNS Client scripts extension for 'no-ip.com'. endef define Package/ddns-scripts-ns1 @@ -173,10 +173,10 @@ define Package/ddns-scripts-ns1 endef define Package/ddns-scripts-ns1/description - Dynamic DNS Client scripts extension for "ns1.com". + Dynamic DNS Client scripts extension for 'ns1.com'. It requires: - "option username" to be a valid zone for ns1.com - "option password" to be a valid API key for ns1.com + 'option username' to be a valid zone for ns1.com + 'option password' to be a valid API key for ns1.com endef @@ -192,9 +192,9 @@ define Package/ddns-scripts-nsupdate/description The script directly updates a PowerDNS (or maybe bind server) via nsupdate from bind-client package. It requires: - "option dns_server" to be set to the server to be used by nsupdate. - "option username" should be set to the key name and - "option password" to the base64 encoded shared secret. + 'option dns_server' to be set to the server to be used by nsupdate. + 'option username' should be set to the key name and + 'option password' to the base64 encoded shared secret. endef @@ -206,12 +206,12 @@ define Package/ddns-scripts-route53 endef define Package/ddns-scripts-route53/description - Dynamic DNS Client scripts extension for Amazon AWS "route53 API v1". + Dynamic DNS Client scripts extension for Amazon AWS 'route53 API v1'. Note: You must also install ca-certificate or ca-bundle. It requires: - "option username" to be a valid AWS access key id - "option password" to be the matching AWS secret key id - "option domain" to contain the hosted zone ID + 'option username' to be a valid AWS access key id + 'option password' to be the matching AWS secret key id + 'option domain' to contain the hosted zone ID endef @@ -223,11 +223,11 @@ define Package/ddns-scripts-cnkuai endef define Package/ddns-scripts-cnkuai/description - Dynamic DNS Client scripts extension for "cnkuai.cn". + Dynamic DNS Client scripts extension for 'cnkuai.cn'. It requires: - "option username" to be a valid CnKuai control panel id - "option password" to be the matching CnKuai control panel password - "option domain" to contain the domain + 'option username' to be a valid CnKuai control panel id + 'option password' to be the matching CnKuai control panel password + 'option domain' to contain the domain endef @@ -238,10 +238,10 @@ define Package/ddns-scripts-gandi endef define Package/ddns-scripts-gandi/description - Dynamic DNS Client scripts extension for "gandi.net". + Dynamic DNS Client scripts extension for 'gandi.net'. It requires: - "option username" to be a valid subdomain for gandi.net - "option password" to be a valid API key for gandi.net + 'option username' to be a valid subdomain for gandi.net + 'option password' to be a valid API key for gandi.net endef @@ -252,11 +252,11 @@ define Package/ddns-scripts-pdns endef define Package/ddns-scripts-pdns/description - Dynamic DNS Client scripts extension for "PowerDNS" via API. + Dynamic DNS Client scripts extension for 'PowerDNS' via API. It requires: - "option param_opt(Optional Parameter)" to be a valid root URL for the PowerDNS webserver - "option username" to be a valid subdomain for the PowerDNS domain - "option password" to be a valid API key for the PowerDNS webserver + 'option param_opt(Optional Parameter)' to be a valid root URL for the PowerDNS webserver + 'option username' to be a valid subdomain for the PowerDNS domain + 'option password' to be a valid API key for the PowerDNS webserver endef @@ -267,14 +267,14 @@ define Package/ddns-scripts-transip endef define Package/ddns-scripts-transip/description - Dynamic DNS Client scripts extension for "transip.nl". + Dynamic DNS Client scripts extension for 'transip.nl'. Note: You must also install ca-certificate or ca-bundle. It requires: - "option username" to be a valid username for transip.nl - "option password" to be a valid matching private key - "option domain" to contain the base domain - "option param_enc" to contain the name of the DNS record to update - "option param_opt" to contain the TTL of the DNS record to update + 'option username' to be a valid username for transip.nl + 'option password' to be a valid matching private key + 'option domain' to contain the base domain + 'option param_enc' to contain the name of the DNS record to update + 'option param_opt' to contain the TTL of the DNS record to update endef define Package/ddns-scripts-one @@ -284,11 +284,11 @@ define Package/ddns-scripts-one endef define Package/ddns-scrtips-one/description - Dynamic DNS Client scripts extension for "one.com". + Dynamic DNS Client scripts extension for 'one.com'. It requires: - "option username" to be a valid Email for one.com Control Panel - "option password" to be the matching one.com Control Panel password - "option domain" to contain the domain / subdomain + 'option username' to be a valid Email for one.com Control Panel + 'option password' to be the matching one.com Control Panel password + 'option domain' to contain the domain / subdomain endef @@ -302,9 +302,9 @@ endef define Package/ddns-scripts-porkbun/description Dynamic DNS Client scripts extension for porkbun.com API v3 (require curl) It requires: - "option username" to be a Porkbun API key - "option password" to be the corresponding Porkbun API secret key - "option domain" to be the FQDN for which to configure DDNS + 'option username' to be a Porkbun API key + 'option password' to be the corresponding Porkbun API secret key + 'option domain' to be the FQDN for which to configure DDNS endef define Package/ddns-scripts-huaweicloud From 86e6c21006c5be7b633f8bfa0ee9c1cc5144c0cf Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 Nov 2024 14:48:30 -0800 Subject: [PATCH 09/22] portaudio: update to 19.7.0 Upstream moved. Also switch to local tarballs for smaller size. Signed-off-by: Rosen Penev --- sound/portaudio/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/portaudio/Makefile b/sound/portaudio/Makefile index 0465a01f79..2e1144664a 100644 --- a/sound/portaudio/Makefile +++ b/sound/portaudio/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=portaudio -PKG_VERSION:=190600_20161030 -PKG_RELEASE:=2 +PKG_VERSION:=19.7.0 +PKG_RELEASE:=1 -PKG_SOURCE:=pa_stable_v$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://www.portaudio.com/archives/ -PKG_HASH:=f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/PortAudio/portaudio +PKG_SOURCE_VERSION:=v$(PKG_VERSION) +PKG_MIRROR_HASH:=ddfa5d2a9a26d3337d337231c3403497373dfb1259a9ac7a6810db1e6c529f08 PKG_MAINTAINER:= PKG_LICENSE:=MIT @@ -28,7 +28,7 @@ include $(INCLUDE_DIR)/cmake.mk define Package/portaudio SECTION:=sound CATEGORY:=Sound - DEPENDS:=+alsa-lib +libpthread +librt + DEPENDS:=+alsa-lib TITLE:=Portable cross-platform audio I/O URL:=http://www.portaudio.com/ endef From 77dd5b2587928bb797c77d217d162f1d48d0c733 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 10 Nov 2024 14:00:12 +0200 Subject: [PATCH 10/22] pigeonhole: Make version apk compatible Make the version compatible with apk. Signed-off-by: Hannu Nyman --- mail/pigeonhole/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/pigeonhole/Makefile b/mail/pigeonhole/Makefile index f076d06ca2..5bb31444f9 100644 --- a/mail/pigeonhole/Makefile +++ b/mail/pigeonhole/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dovecot-pigeonhole PKG_VERSION_PLUGIN:=0.5.21 PKG_VERSION_DOVECOT:=$(shell make --no-print-directory -C ../dovecot/ val.PKG_VERSION V=s) -PKG_VERSION:=$(PKG_VERSION_DOVECOT)-$(PKG_VERSION_PLUGIN) +PKG_VERSION:=$(PKG_VERSION_DOVECOT).$(PKG_VERSION_PLUGIN) PKG_RELEASE:=1 DOVECOT_VERSION:=2.3 From bc14a5428b66e0a191417a47fb8a78884c8b607a Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 10 Nov 2024 18:09:52 +0200 Subject: [PATCH 11/22] squeezelite: Adjust versioning for apk Adjust versioning to be compatible with apk. As we fetch source via git commit hash, simply change - to . in version string. Signed-off-by: Hannu Nyman --- sound/squeezelite/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/squeezelite/Makefile b/sound/squeezelite/Makefile index b1013915d5..ae1f5271ad 100644 --- a/sound/squeezelite/Makefile +++ b/sound/squeezelite/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squeezelite -PKG_VERSION:=1.9.9-1432 +PKG_VERSION:=1.9.9.1432 PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ralph-irving/squeezelite PKG_SOURCE_VERSION:=575b59398dd19945d2038474062240fc527407fb -PKG_MIRROR_HASH:=d85c7cf1f57bee295fff263fa2c7425e1ba47394f7f82c84efa2968c0858ec3b +PKG_MIRROR_HASH:=cffa8391c9e550d5ceea168703d599442b8a53b9789231aabd3221f6a0e4902d PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-3.0-or-later From 4d8c6d18690fe264890dfef013853dba49036c12 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Sat, 2 Nov 2024 11:31:05 -0400 Subject: [PATCH 12/22] Unbound: fix file lock race in odhcpd.sh Signed-off-by: Ted Hess --- net/unbound/Makefile | 2 +- net/unbound/files/odhcpd.sh | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/net/unbound/Makefile b/net/unbound/Makefile index 810858dee6..e3d128a522 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound PKG_VERSION:=1.21.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound diff --git a/net/unbound/files/odhcpd.sh b/net/unbound/files/odhcpd.sh index b8af615a51..9a428563b6 100644 --- a/net/unbound/files/odhcpd.sh +++ b/net/unbound/files/odhcpd.sh @@ -78,7 +78,6 @@ odhcpd_zonedata() { fi fi - case $longconf in freshstart) awk -v conffile=$UB_DHCP_CONF -v pipefile=$dns_ls_new \ @@ -129,22 +128,11 @@ odhcpd_zonedata() { ############################################################################## -UB_ODHPCD_LOCK=/tmp/unbound_odhcpd.lock +UB_ODHCPD_LOCK=/var/lock/unbound_odhcpd.lock -if [ ! -f $UB_ODHPCD_LOCK ] ; then - # imperfect but it should avoid collisions - touch $UB_ODHPCD_LOCK +exec 1000>$UB_ODHCPD_LOCK +if flock -x -n 1000 ; then odhcpd_zonedata - rm -f $UB_ODHPCD_LOCK - -else - UB_ODHCPD_LOCK_AGE=$(( $( date +%s ) - $( date -r $UB_ODHPCD_LOCK +%s ) )) - - if [ $UB_ODHCPD_LOCK_AGE -gt 100 ] ; then - # unlock because something likely broke but do not write this time through - rm -f $UB_ODHPCD_LOCK - fi fi ############################################################################## - From 78a88fa73646a0f66aa571ea1538f23679304ed3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 31 Oct 2024 17:13:17 -0700 Subject: [PATCH 13/22] gatling: fix compilation with GCC14 Headers are missing. Signed-off-by: Rosen Penev --- net/gatling/Makefile | 2 +- net/gatling/patches/040-gcc14.patch | 30 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 net/gatling/patches/040-gcc14.patch diff --git a/net/gatling/Makefile b/net/gatling/Makefile index 5b64daa9d5..c6c1f75448 100644 --- a/net/gatling/Makefile +++ b/net/gatling/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gatling PKG_VERSION:=0.16 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.fefe.de/gatling/ diff --git a/net/gatling/patches/040-gcc14.patch b/net/gatling/patches/040-gcc14.patch new file mode 100644 index 0000000000..9624e30758 --- /dev/null +++ b/net/gatling/patches/040-gcc14.patch @@ -0,0 +1,30 @@ +--- a/common.c ++++ b/common.c +@@ -9,6 +9,7 @@ + #include + #include + ++#include + #include + #include + #include +--- a/ftp.c ++++ b/ftp.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #include "havealloca.h" +--- a/pssl.c ++++ b/pssl.c +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include From f2d5c861bd8ecc3fbfd7ae613de8e03f6b4166f3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 Nov 2024 15:14:10 -0800 Subject: [PATCH 14/22] python3: update to 3.11.10 Just a security bugfix. Signed-off-by: Rosen Penev --- lang/python/python3-version.mk | 2 +- lang/python/python3/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index b61b52992e..7bd437ef22 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -8,7 +8,7 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=11 -PYTHON3_VERSION_MICRO:=9 +PYTHON3_VERSION_MICRO:=10 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index b65ab2ce92..0090464511 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -PKG_HASH:=9b1e896523fc510691126c864406d9360a3d1e986acbda59cda57b5abda45b87 +PKG_HASH:=07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=Python-2.0.1 0BSD From 0b0841e2906aa55d95f678a9198a959b17c4f951 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 29 Oct 2024 21:43:22 -0700 Subject: [PATCH 15/22] atlas-probe: fix compilation with GCC14 Missing header. Signed-off-by: Rosen Penev --- net/atlas-probe/Makefile | 2 +- net/atlas-probe/patches/020-gcc14.patch | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 net/atlas-probe/patches/020-gcc14.patch diff --git a/net/atlas-probe/Makefile b/net/atlas-probe/Makefile index 3c0845c0de..8724a8729e 100644 --- a/net/atlas-probe/Makefile +++ b/net/atlas-probe/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=atlas-probe PKG_VERSION:=2.6.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_VERSION) diff --git a/net/atlas-probe/patches/020-gcc14.patch b/net/atlas-probe/patches/020-gcc14.patch new file mode 100644 index 0000000000..442ddc1268 --- /dev/null +++ b/net/atlas-probe/patches/020-gcc14.patch @@ -0,0 +1,10 @@ +--- a/networking/telnetd.c ++++ b/networking/telnetd.c +@@ -133,6 +133,7 @@ + #include + #include + #include ++#include + + #define LOGIN_PREFIX "Atlas probe, see http://atlas.ripe.net/\r\n\r\n" + #define LOGIN_PROMPT " login: " From 6b989e0ad520e0a71bc18d9e84a0b7b4e4e54c07 Mon Sep 17 00:00:00 2001 From: Jan Klos Date: Sun, 10 Nov 2024 21:24:52 +0200 Subject: [PATCH 16/22] unbound: update to 1.22.0 Signed-off-by: Jan Klos [Solve PKG_RELEASE conflict] --- net/unbound/Makefile | 6 +++--- net/unbound/patches/010-configure-uname.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/unbound/Makefile b/net/unbound/Makefile index e3d128a522..f88c44f3ad 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound -PKG_VERSION:=1.21.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.22.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound -PKG_HASH:=e7dca7d6b0f81bdfa6fa64ebf1053b5a999a5ae9278a87ef182425067ea14521 +PKG_HASH:=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43 PKG_MAINTAINER:=Eric Luehrsen PKG_LICENSE:=BSD-3-Clause diff --git a/net/unbound/patches/010-configure-uname.patch b/net/unbound/patches/010-configure-uname.patch index 609475cddb..65b9449c06 100644 --- a/net/unbound/patches/010-configure-uname.patch +++ b/net/unbound/patches/010-configure-uname.patch @@ -3,7 +3,7 @@ Fix cross compile errors by inserting an environment variable for the target. Use "uname" on host only if "UNAME" variable is empty. --- a/configure.ac +++ b/configure.ac -@@ -895,7 +895,7 @@ if test x_$ub_test_python != x_no; then +@@ -897,7 +897,7 @@ if test x_$ub_test_python != x_no; then fi fi From b1a4acd25152b47f788a19438fc44b8f65a0a63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20St=C3=B6veken?= Date: Sun, 10 Nov 2024 17:32:43 +0100 Subject: [PATCH 17/22] restic: update to 0.17.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maintainer: Tom Stöveken Compile tested: SDK for OpenWrt 23.05.5 Run tested: x86/64 @ Intel(R) Celeron(R) CPU N3160 @ 1.60GHz, OpenWrt 23.05.5 Description: Updated to version 0.17.3 Signed-off-by: Tom Stöveken --- utils/restic/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/restic/Makefile b/utils/restic/Makefile index 5a4f45b483..573156f150 100644 --- a/utils/restic/Makefile +++ b/utils/restic/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=restic -PKG_VERSION:=0.16.4 +PKG_VERSION:=0.17.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/restic/restic/tar.gz/v${PKG_VERSION}? -PKG_HASH:=d736a57972bb7ee3398cf6b45f30e5455d51266f5305987534b45a4ef505f965 +PKG_HASH:=bf0dd73edfae531c24070e2e7833938613f7b179ed165e6b681098edfdf286c8 PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE From a1e318dec3cbc5e6e4539792d8c93c9825896d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20St=C3=B6veken?= Date: Sun, 10 Nov 2024 21:56:47 +0100 Subject: [PATCH 18/22] restic-rest-server: update to 0.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maintainer: Tom Stöveken Compile tested: SDK for OpenWrt 23.05.5 Run tested: x86/64 @ Intel(R) Celeron(R) CPU N3160 @ 1.60GHz, OpenWrt 23.05.5 Description: Updated to version 0.13.0 Signed-off-by: Tom Stöveken --- net/restic-rest-server/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/restic-rest-server/Makefile b/net/restic-rest-server/Makefile index a3b8b28b0f..b124cab85a 100644 --- a/net/restic-rest-server/Makefile +++ b/net/restic-rest-server/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=restic-rest-server -PKG_VERSION:=0.12.1 +PKG_VERSION:=0.13.0 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION) PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/restic/rest-server/tar.gz/v${PKG_VERSION}? -PKG_HASH:=cfbeb4a66cac6fc36b1cb11256f06c6e4fcc7a28c2ef590550adf1c199b9aa4b +PKG_HASH:=bc2f57f07fc7affa7d419b8034f2bb7638c14976505966c93f7d75e90ad0d460 PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE From 5d3e41166251e7b14329f5f7b9c8f51508dc4f23 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Sun, 10 Nov 2024 16:29:31 +0100 Subject: [PATCH 19/22] luajit2: update to v2.1-20241104 Signed-off-by: Javier Marcet --- lang/luajit2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/luajit2/Makefile b/lang/luajit2/Makefile index e2959d7de1..dc3cb7c37b 100644 --- a/lang/luajit2/Makefile +++ b/lang/luajit2/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luajit2 -PKG_SOURCE_DATE:=2024-08-15 +PKG_SOURCE_DATE:=2024-11-04 PKG_VERSION:=2.1.$(subst -,.,$(PKG_SOURCE_DATE)) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/openresty/luajit2 -PKG_SOURCE_VERSION:=33d6b04681d2f079a6d013988a426a841c52e29e -PKG_MIRROR_HASH:=cb6687203153fd6b2f730e899728a911f8b7094f296cc11ca0f2b20ce849f952 +PKG_SOURCE_VERSION:=24d0c668883b65b13c8b5357805c6d4113e0ba6a +PKG_MIRROR_HASH:=d4e2743d7e92be51b1773fba997564a5b229f1b1cb2f3863bb7e27d4fd8a5cdb PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=MIT From 67d4fa3b05e0a8ee0724bc245d6eec318351876a Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 22 Oct 2024 16:55:23 +0530 Subject: [PATCH 20/22] openwisp-config: fix Makefile for 1.1.0 Update configuration in Makefile to fix #25168. Add "/etc/openwisp/" to conf files. Signed-off-by: Gagan Deep --- admin/openwisp-config/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/admin/openwisp-config/Makefile b/admin/openwisp-config/Makefile index e2c409c9bc..aadd5fe616 100644 --- a/admin/openwisp-config/Makefile +++ b/admin/openwisp-config/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwisp-config PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Federico Capoano PKG_LICENSE:=GPL-3.0-or-later @@ -38,6 +38,7 @@ endef define Package/openwisp-config/conffiles /etc/config/openwisp +/etc/openwisp/ endef define Package/openwisp-config/install @@ -45,16 +46,16 @@ define Package/openwisp-config/install $(1)/usr/sbin \ $(1)/etc/init.d \ $(1)/etc/config \ - $(1)/etc/openwisp \ + $(1)/usr/lib/openwisp-config \ $(1)/usr/lib/lua/openwisp $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.agent \ - $(1)/usr/sbin/openwisp_config + $(1)/usr/sbin/openwisp-config $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.init \ - $(1)/etc/init.d/openwisp_config + $(1)/etc/init.d/openwisp-config $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.config \ $(1)/etc/config/openwisp @@ -95,7 +96,11 @@ define Package/openwisp-config/install $(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-get-address.lua \ $(1)/usr/sbin/openwisp-get-address - $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/etc/openwisp/ + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-get-random-number.lua \ + $(1)/usr/sbin/openwisp-get-random-number + + $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-config/ endef $(eval $(call BuildPackage,openwisp-config)) From 886b3fa36d0b82071b10d0169d6950b0aaa6f16c Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 22 Oct 2024 22:28:46 +0530 Subject: [PATCH 21/22] openwisp-monitoring: fix Makefile for 0.2.0 update Commit 5e69da4ccb760da66f00f91e6cb2248ddcdabe5d upgraded openwisp-monitoring to version 0.2.0 but missed necessary Makefile adjustments, causing the package to break in OpenWrt feeds. This patch updates the Makefile to ensure proper functionality of openwisp-monitoring with the 0.2.0 release. Signed-off-by: Gagan Deep --- admin/openwisp-monitoring/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/admin/openwisp-monitoring/Makefile b/admin/openwisp-monitoring/Makefile index 959c788775..4395c1ffe9 100644 --- a/admin/openwisp-monitoring/Makefile +++ b/admin/openwisp-monitoring/Makefile @@ -30,7 +30,7 @@ define Package/openwisp-monitoring endef define Package/netjson-monitoring - TITLE:=NetJson Monitoring + TITLE:=NetJSON Monitoring CATEGORY:=Administration SECTION:=admin SUBMENU:=openwisp @@ -50,7 +50,7 @@ define Package/netjson-monitoring/install $(1)/usr/sbin \ $(1)/usr/libexec \ $(1)/usr/lib/lua/openwisp-monitoring \ - $(1)/etc/openwisp-monitoring + $(1)/usr/lib/openwisp-monitoring $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-monitoring/files/sbin/netjson-monitoring.lua \ @@ -88,7 +88,7 @@ define Package/netjson-monitoring/install $(PKG_BUILD_DIR)/openwisp-monitoring/files/lib/openwisp-monitoring/wifi.lua \ $(1)/usr/lib/lua/openwisp-monitoring/wifi.lua - $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/etc/openwisp-monitoring/ + $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-monitoring/ endef @@ -97,7 +97,8 @@ define Package/openwisp-monitoring/install $(1)/usr/sbin \ $(1)/etc/init.d \ $(1)/etc/config \ - $(1)/etc/openwisp-monitoring + $(1)/usr/lib/openwisp-monitoring \ + $(1)/etc/hotplug.d/openwisp $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-monitoring/files/monitoring.agent \ @@ -107,6 +108,10 @@ define Package/openwisp-monitoring/install $(PKG_BUILD_DIR)/openwisp-monitoring/files/monitoring.init \ $(1)/etc/init.d/openwisp-monitoring + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/openwisp-monitoring/files/openwisp-monitoring.hotplug \ + $(1)/etc/hotplug.d/openwisp/openwisp-monitoring + $(INSTALL_CONF) \ $(PKG_BUILD_DIR)/openwisp-monitoring/files/monitoring.config \ $(1)/etc/config/openwisp-monitoring From ca503cc4054d9a13558c7b552886a6dba359a0eb Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 29 Oct 2024 21:21:55 +0530 Subject: [PATCH 22/22] openwisp-monitoring: allow not depending on rpcd-mod-iwinfo Add option to exclude rpcd-mod-iwinfo from dependency. Signed-off-by: Gagan Deep --- admin/openwisp-monitoring/Config.in | 9 +++++++++ admin/openwisp-monitoring/Makefile | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 admin/openwisp-monitoring/Config.in diff --git a/admin/openwisp-monitoring/Config.in b/admin/openwisp-monitoring/Config.in new file mode 100644 index 0000000000..5b5bf37f25 --- /dev/null +++ b/admin/openwisp-monitoring/Config.in @@ -0,0 +1,9 @@ +menu "netjson-monitoring Configuration" + +config NETJSON_MONITORING_IWINFO + bool "Enable rpcd-mod-iwinfo" + default y + help + Whether to include the rpcd-mod-iwinfo dependency (enabled by default). + +endmenu diff --git a/admin/openwisp-monitoring/Makefile b/admin/openwisp-monitoring/Makefile index 4395c1ffe9..64aea23369 100644 --- a/admin/openwisp-monitoring/Makefile +++ b/admin/openwisp-monitoring/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwisp-monitoring PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Federico Capoano PKG_LICENSE:=GPL-3.0-or-later @@ -34,10 +34,15 @@ define Package/netjson-monitoring CATEGORY:=Administration SECTION:=admin SUBMENU:=openwisp - DEPENDS:=+libubus-lua +lua-cjson +rpcd +rpcd-mod-iwinfo + DEPENDS:=+libubus-lua +lua-cjson +rpcd + DEPENDS+=+NETJSON_MONITORING_IWINFO:rpcd-mod-iwinfo URL:=http://openwisp.org endef +define Package/netjson-monitoring/config + source "$(SOURCE)/Config.in" +endef + define Build/Compile endef @@ -88,6 +93,11 @@ define Package/netjson-monitoring/install $(PKG_BUILD_DIR)/openwisp-monitoring/files/lib/openwisp-monitoring/wifi.lua \ $(1)/usr/lib/lua/openwisp-monitoring/wifi.lua +# Iwinfo is enabled by default unless specified otherwise +ifeq ($(CONFIG_NETJSON_MONITORING_IWINFO), y) + $(CP) $(PKG_BUILD_DIR)/openwisp-monitoring/files/lib/openwisp-monitoring/iwinfo.lua $(1)/usr/lib/lua/openwisp-monitoring/iwinfo.lua +endif + $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-monitoring/ endef