diff --git a/lang/python/Flask/Makefile b/lang/python/Flask/Makefile index 136761748..70c386ae7 100644 --- a/lang/python/Flask/Makefile +++ b/lang/python/Flask/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Flask PKG_VERSION:=2.0.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=6 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2 -PKG_MAINTAINER:=Šimon Bořek +PKG_MAINTAINER:=Michal Vasilek PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.rst PKG_CPE_ID:=cpe:/a:palletsprojects:flask diff --git a/lang/python/Jinja2/Makefile b/lang/python/Jinja2/Makefile index ba7d54259..37e006557 100644 --- a/lang/python/Jinja2/Makefile +++ b/lang/python/Jinja2/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Jinja2 PKG_VERSION:=3.0.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 -PKG_MAINTAINER:=Šimon Bořek +PKG_MAINTAINER:=Michal Vasilek PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:pocoo:jinja2 diff --git a/lang/python/python-websocket-client/Makefile b/lang/python/python-websocket-client/Makefile index 5376e8cc2..473065474 100644 --- a/lang/python/python-websocket-client/Makefile +++ b/lang/python/python-websocket-client/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-websocket-client -PKG_VERSION:=1.4.2 +PKG_VERSION:=1.5.1 PKG_RELEASE:=1 PYPI_NAME:=websocket-client -PKG_HASH:=d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59 +PKG_HASH:=3f09e6d8230892547132177f575a4e3e73cfdf06526e20cc02aa1c3b47184d40 PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=Apache-2.0 diff --git a/net/adblock/Makefile b/net/adblock/Makefile index b8458ca1b..bd549920a 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015-2022 Dirk Brenken (dev@brenken.org) +# Copyright (c) 2015-2023 Dirk Brenken (dev@brenken.org) # This is free software, licensed under the GNU General Public License v3. # @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=4.1.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md index c46e0e4e5..5bb1ecea2 100644 --- a/net/adblock/files/README.md +++ b/net/adblock/files/README.md @@ -16,6 +16,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but | android_tracking | | S | tracking | [Link](https://github.com/Perflyst/PiHoleBlocklist) | | andryou | | L | compilation | [Link](https://gitlab.com/andryou/block/-/blob/master/readme.md) | | anti_ad | | L | compilation | [Link](https://github.com/privacy-protection-tools/anti-AD/blob/master/README.md) | +| antipopads | | L | compilation | [Link](https://github.com/AdroitAdorKhan/antipopads-re) | | anudeep | | M | compilation | [Link](https://github.com/anudeepND/blacklist) | | bitcoin | | S | mining | [Link](https://github.com/hoshsadiq/adblock-nocoin-list) | | cpbl | | XL | compilation | [Link](https://github.com/bongochong/CombinedPrivacyBlockLists) | @@ -23,15 +24,14 @@ A lot of people already use adblocker plugins within their desktop browsers, but | doh_blocklist | | S | doh_server | [Link](https://github.com/dibdot/DoH-IP-blocklists) | | easylist | | M | compilation | [Link](https://easylist.to) | | easyprivacy | | M | tracking | [Link](https://easylist.to) | -| energized | | VAR | compilation | [Link](https://energized.pro) | | firetv_tracking | | S | tracking | [Link](https://github.com/Perflyst/PiHoleBlocklist) | | games_tracking | | S | tracking | [Link](https://www.gameindustry.eu) | | hblock | | XL | compilation | [Link](https://hblock.molinero.dev) | | lightswitch05 | | XL | compilation | [Link](https://github.com/lightswitch05/hosts) | | notracking | | XL | tracking | [Link](https://github.com/notracking/hosts-blocklists) | -| oisd_basic | | L | general | [Link](https://oisd.nl) | +| oisd_big | | XXL | general | [Link](https://oisd.nl) | | oisd_nsfw | | XL | general | [Link](https://oisd.nl) | -| oisd_full | | XXL | general | [Link](https://oisd.nl) | +| oisd_small | | L | general | [Link](https://oisd.nl) | | openphish | | S | phishing | [Link](https://openphish.com) | | phishing_army | | S | phishing | [Link](https://phishing.army) | | reg_cn | | S | reg_china | [Link](https://easylist.to) | @@ -79,7 +79,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but * Full IPv4 and IPv6 support * Provides top level domain compression ('tld compression'), this feature removes thousands of needless host entries from the blocklist and lowers the memory footprint for the DNS backend * Provides a 'DNS File Reset', where the generated DNS blocklist file will be purged after DNS backend loading to save storage space -* Source parsing by fast & flexible regex rulesets, all rules and source information are placed in an external/compredd JSON file ('/etc/adblock/adblock.sources.gz') +* Source parsing by fast & flexible regex rulesets, all rules and source information are placed in an external/compredd JSON file ('/etc/adblock/adblock.sources.gz') * Overall duplicate removal in generated blocklist file 'adb_list.overall' * Additional local blacklist for manual overrides, located in '/etc/adblock/adblock.blacklist' * Additional local whitelist for manual overrides, located in '/etc/adblock/adblock.whitelist' @@ -302,7 +302,7 @@ A valid JSON source object contains the following required information, e.g.: }, [...] -Add an unique object name, make the required changes to 'url', 'rule', 'size' and 'descurl' and finally compress the changed JSON file _gzip /etc/adblock/adblock.sources.gz_ to use the new source object in adblock. +Add an unique object name, make the required changes to 'url', 'rule', 'size' and 'descurl' and finally compress the changed JSON file _gzip /etc/adblock/adblock.sources_ to use the new source object in adblock. Please note: if you're going to add new sources on your own, please make a copy of the default file and work with that copy further on, cause the default will be overwritten with every adblock update. To reference your copy set the option 'adb\_srcarc' which points by default to '/etc/adblock/adblock.sources.gz' Please note: when adblock starts, it looks for the uncompressed 'adb\_srcfile', only if this file is not found the archive 'adb\_srcarc' is unpacked once and then the uncompressed file is used diff --git a/net/adblock/files/adblock.categories b/net/adblock/files/adblock.categories index 0cfd3d0b2..1d1118837 100644 --- a/net/adblock/files/adblock.categories +++ b/net/adblock/files/adblock.categories @@ -1,14 +1,3 @@ -eng;basic;basic/formats/domains.txt -eng;blu;blu/formats/domains.txt -eng;blugo;bluGo/formats/domains.txt -eng;ext-extreme;extensions/xtreme/formats/domains.txt -eng;ext-pornlite;extensions/porn-lite/formats/domains.txt -eng;ext-regional;extensions/regional/formats/domains.txt -eng;ext-social;extensions/social/formats/domains.txt -eng;porn;porn/formats/domains.txt -eng;spark;spark/formats/domains.txt -eng;ultimate;ultimate/formats/domains.txt -eng;unified;unified/formats/domains.txt stb;fakenews;alternates/fakenews/hosts stb;fakenews-gambling;alternates/fakenews-gambling/hosts stb;fakenews-gambling-porn;alternates/fakenews-gambling-porn/hosts diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources index 8ec10400b..e46a007ac 100644 --- a/net/adblock/files/adblock.sources +++ b/net/adblock/files/adblock.sources @@ -41,6 +41,13 @@ "focus": "compilation", "descurl": "https://github.com/privacy-protection-tools/anti-AD/blob/master/README.md" }, + "antipopads": { + "url": "https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt", + "rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}", + "size": "L", + "focus": "compilation", + "descurl": "https://github.com/AdroitAdorKhan/antipopads-re" + }, "anudeep": { "url": "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt", "rule": "/^0\\.0\\.0\\.0[[:space:]]+([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}", @@ -90,13 +97,6 @@ "focus": "tracking", "descurl": "https://easylist.to" }, - "energized": { - "url": "https://block.energized.pro/", - "rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}", - "size": "VAR", - "focus": "compilation", - "descurl": "https://energized.pro" - }, "firetv_tracking": { "url": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt", "rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}", @@ -132,10 +132,10 @@ "focus": "tracking", "descurl": "https://github.com/notracking/hosts-blocklists" }, - "oisd_basic": { - "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_basic.txt", + "oisd_big": { + "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_big.txt", "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}", - "size": "L", + "size": "XXL", "focus": "general", "descurl": "https://oisd.nl" }, @@ -146,10 +146,10 @@ "focus": "general", "descurl": "https://oisd.nl" }, - "oisd_full": { - "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_full.txt", + "oisd_small": { + "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_small.txt", "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}", - "size": "XXL", + "size": "L", "focus": "general", "descurl": "https://oisd.nl" }, diff --git a/net/cloudreve/Makefile b/net/cloudreve/Makefile index feee89f34..21a1443b1 100644 --- a/net/cloudreve/Makefile +++ b/net/cloudreve/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudreve -PKG_VERSION:=3.6.2 +PKG_VERSION:=3.7.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=134dc707f8befaa9a193a2b0ae2eb2eebd3c5c70c291b5104bed458c63eedbb7 +PKG_MIRROR_HASH:=b70601111e727d879a709884bc28237861216b99abac02b6f542f5984ddd8c0d PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE @@ -35,7 +35,7 @@ define Package/cloudreve SUBMENU:=Cloud Manager TITLE:=A project helps you build your own cloud in minutes URL:=https://cloudreve.org - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle + DEPENDS:=@(aarch64||arm||i386||i686||x86_64) +ca-bundle endef define Package/cloudreve/description diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index ee6166d68..26cdb3a1e 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.46.5 +PKG_VERSION:=0.47.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=604b7e78956ec6d6421807e30ff44d87d85f10203b3d68d397af34ca2013e696 +PKG_HASH:=be88e9db73b7d5fa42afd4bc38c901a7e589c503bfb091c43362c956e2669915 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/net/gg/Makefile b/net/gg/Makefile index 5f369bc5b..4d68c343e 100644 --- a/net/gg/Makefile +++ b/net/gg/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gg -PKG_VERSION:=0.2.15 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.2.18 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mzz2017/gg/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8fde9a593daa535a186bacf909e41a4154ce666fb7c395bdccf81994c4658089 +PKG_HASH:=e49ec76f64941b89381fa2fd1060f40ad1f172483a42a56e3a39c5bc67ef0b99 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=AGPL-3.0-only diff --git a/net/gsocket/Makefile b/net/gsocket/Makefile index 2c84f4ed5..d09b81ab2 100644 --- a/net/gsocket/Makefile +++ b/net/gsocket/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gsocket -PKG_VERSION:=1.4.37 +PKG_VERSION:=1.4.39 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/hackerschoice/gsocket/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=4f64f71a7d6b8be79754e7bf2109675ffc8a3e37a4a55b08c95a1b1d25e458e5 +PKG_HASH:=2042b3773e03285939fe7f0d0597a77c8d4958644b1d8a366cc71d384f1e5c30 PKG_MAINTAINER:=Ralf Kaiser PKG_LICENSE:=BSD-2-Clause @@ -71,3 +71,4 @@ define Package/gsocket/install endef $(eval $(call BuildPackage,gsocket)) + diff --git a/net/kcptun/Makefile b/net/kcptun/Makefile index ddb9935d6..18829384d 100644 --- a/net/kcptun/Makefile +++ b/net/kcptun/Makefile @@ -1,13 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kcptun -PKG_VERSION:=20210922 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=20230207 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/xtaci/kcptun/tar.gz/v${PKG_VERSION}? -PKG_SOURCE_DATE:=2021-09-22 -PKG_HASH:=f6a08f0fe75fa85d15f9c0c28182c69a5ad909229b4c230a8cbe38f91ba2d038 +PKG_HASH:=09054b52d5799a8e47edb36f2db335d929d5bbb63a26f7ba2fe03c64ec39d550 PKG_MAINTAINER:=Dengfeng Liu , Chao Liu PKG_LICENSE:=MIT diff --git a/net/kcptun/files/kcptun.config b/net/kcptun/files/kcptun.config index fc548ea7c..57ec246ba 100644 --- a/net/kcptun/files/kcptun.config +++ b/net/kcptun/files/kcptun.config @@ -1,6 +1,6 @@ config server option disabled 1 - option listen 29900 + option listen '29900-30000' option target '127.0.0.1' option target_port 12948 option crypt 'aes' @@ -23,7 +23,7 @@ config client option bind_address '0.0.0.0' option local_port 12948 option server 'vps' - option server_port 29900 + option server_port '29900-30000' option crypt 'aes' option key 'secret' option mode 'fast' diff --git a/net/kcptun/files/kcptun.init b/net/kcptun/files/kcptun.init index 2e6c53a1d..757510bc7 100644 --- a/net/kcptun/files/kcptun.init +++ b/net/kcptun/files/kcptun.init @@ -150,7 +150,7 @@ validate_common_options() { validate_server_options() { validate_common_options server "$@" \ - 'listen:port' \ + 'listen:or(port,portrange):29900-30000' \ 'target:host' \ 'target_port:port' \ 'pprof:bool' @@ -161,7 +161,7 @@ validate_client_options() { 'bind_address:ipaddr' \ 'local_port:port' \ 'server:host' \ - 'server_port:port' \ + 'server_port:or(port,portrange):29900-30000' \ 'conn:uinteger' \ 'autoexpire:uinteger' \ 'scavengettl:uinteger' diff --git a/net/unbound/Makefile b/net/unbound/Makefile index a137686bc..0620944cf 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound -PKG_VERSION:=1.17.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.17.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound -PKG_HASH:=dcbc95d7891d9f910c66e4edc9f1f2fde4dea2eec18e3af9f75aed44a02f1341 +PKG_HASH:=ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 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 ca9c47631..aa1075738 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 -@@ -818,7 +818,7 @@ if test x_$ub_test_python != x_no; then +@@ -819,7 +819,7 @@ if test x_$ub_test_python != x_no; then fi fi diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile index 887511ab9..c78c97554 100644 --- a/utils/conmon/Makefile +++ b/utils/conmon/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=conmon -PKG_VERSION:=2.1.5 +PKG_VERSION:=2.1.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION) -PKG_HASH:=ee3179ee2b9a9107acec00eb546062cf7deb847f135a3b81503d22b0d226b3ed +PKG_HASH:=340453f7aac43e6a1f9a5efe31f24471f8a7a997a849ad6d1ff3fb530a9e2874 PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=Apache-2.0 diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 71d9800e6..34ff2e08a 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.15.1 +PKG_VERSION:=2.16.0 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=8ace5441826c6f07f5aa12c1864f73d30a362703492d9ed4b2e2314d3b353b1b +PKG_HASH:=556dc59075280442128f5b45a8ff37638fb357c2a956bd751dd0ba747c93e71d PKG_MAINTAINER:=Javier Marcet diff --git a/utils/hamlib/Makefile b/utils/hamlib/Makefile index 84e05530b..553aa57b7 100644 --- a/utils/hamlib/Makefile +++ b/utils/hamlib/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hamlib -PKG_VERSION:=3.3 -PKG_RELEASE:=1 +PKG_VERSION:=4.5.4 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/hamlib -PKG_HASH:=c90b53949c767f049733b442cd6e0a48648b55d99d4df5ef3f852d985f45e880 +PKG_HASH:=b1aea97d6093990b77d5dc4bde6b9ca06183ddb7e24da7e2367a2acc957b7ac2 PKG_MAINTAINER:=Vasilis Tsiligiannis PKG_LICENSE:=GPLv2 @@ -43,6 +43,10 @@ define Package/hamlib DEPENDS:=+libhamlib endef +define Package/hamlib/conffiles +/etc/config/rigctld +endef + define Package/hamlib/description $(call Package/hamlib/Default/description) @@ -90,6 +94,12 @@ CONFIGURE_VARS+= \ define Package/hamlib/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/{rig,rot}* $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/rigctld.init $(1)/etc/init.d/rigctld + + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_CONF) ./files/rigctld.conf $(1)/etc/config/rigctld endef define Package/libhamlib/install diff --git a/utils/hamlib/files/rigctld.conf b/utils/hamlib/files/rigctld.conf new file mode 100644 index 000000000..55fe18aaf --- /dev/null +++ b/utils/hamlib/files/rigctld.conf @@ -0,0 +1,25 @@ +config rig 'kx3' + option enabled '0' + option model '2045' + option rig_file '/dev/ttyUSB0' + option serial_speed '38400' + +config rig 'example' + option enabled '0' + option model '' + option rig_file '' + option ptt_file '' + option dcd_file '' + option ptt_type '' + option dcd_type '' + option serial_speed '' + option civaddr '' + option listen_addr '' + option port '' + option set_conf '' + option vfo '' + option verbose '' + option twiddle_timeout '' + option uplink '' + option debug_time_stamps '' + diff --git a/utils/hamlib/files/rigctld.init b/utils/hamlib/files/rigctld.init new file mode 100755 index 000000000..ab15e4e43 --- /dev/null +++ b/utils/hamlib/files/rigctld.init @@ -0,0 +1,77 @@ +#!/bin/sh /etc/rc.common + +USE_PROCD=1 + +START=50 +STOP=50 + +NAME=rigctld +TYPE=rig +BIN=/usr/bin/rigctld + +# option model '1234' => --model=1234 +OPTIONS_STRING="model rig_file ptt_file dcd_file ptt_type dcd_type serial_speed civaddr listen_addr port set_conf twiddle_timeout uplink" +# option vfo '1' => --vfo +OPTIONS_BOOL="debug_time_stamps vfo" +# option verbose '3' => --verbose --verbose --verbose +OPTIONS_CUMULATIVE="verbose" + +start_service() { + local instance="$1" + + config_load "${NAME}" + + if [ -n "$instance" ]; then + start_instance "$instance" + else + config_foreach start_instance "$TYPE" + fi +} + +start_instance() { + local instance="$1" + + config_get_bool "enabled" "$instance" "enabled" 0 + [ "$enabled" -gt 0 ] || return + + procd_open_instance "$instance" + + procd_set_param command "$BIN" + procd_set_param stdout 1 + procd_set_param stderr 1 + + local option + local value + + for option in $OPTIONS_STRING; do + config_get value "$instance" "$option" + [ -n "$value" ] || continue + + option="${option//_/-}" + procd_append_param command "--$option=$value" + done + + for option in $OPTIONS_BOOL; do + config_get_bool value "$instance" "$option" 0 + [ "$value" -eq 1 ] || continue + + option="${option//_/-}" + procd_append_param command "--$option" + done + + for option in $OPTIONS_CUMULATIVE; do + config_get value "$instance" "$option" 0 + [ -n "$value" ] || continue + + option="${option//_/-}" + + local i=0 + while [ $i -lt "$value" ]; do + procd_append_param command "--$option" + let i++ + done + done + + procd_close_instance +} + diff --git a/utils/irqbalance/Makefile b/utils/irqbalance/Makefile index 164e32a4e..903900e75 100644 --- a/utils/irqbalance/Makefile +++ b/utils/irqbalance/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irqbalance PKG_VERSION:=1.9.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Irqbalance/irqbalance.git diff --git a/utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch b/utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch new file mode 100644 index 000000000..33213f067 --- /dev/null +++ b/utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch @@ -0,0 +1,68 @@ +From bbcd9a42c3cec0935b960b7f2046f1fdfab4f7ef Mon Sep 17 00:00:00 2001 +From: Vignesh Raghavendra +Date: Wed, 7 Dec 2022 19:46:19 +0530 +Subject: [PATCH] procinterrupts: Fix IRQ name parsing on certain arm64 SoC + +On arm64 SoCs like TI's K3 SoC and few other SoCs, IRQ names don't get +parsed correct due to which they end up being classified into wrong +class. Fix this by considering last token to contain IRQ name always. + +Eg.: /proc/interrupt + +cat /proc/interrupts + CPU0 CPU1 CPU2 CPU3 + 11: 7155 8882 7235 7791 GICv3 30 Level arch_timer + 14: 0 0 0 0 GICv3 23 Level arm-pmu + 15: 0 0 0 0 GICv3 208 Level 4b00000.spi + 16: 0 0 0 0 GICv3 209 Level 4b10000.spi +116: 0 0 0 0 MSI-INTA 1716234 Level 485c0100.dma-controller chan6 +134: 166 0 0 0 MSI-INTA 1970707 Level 8000000.ethernet-tx0 +224: 149 0 0 0 MSI-INTA 1971731 Level 8000000.ethernet + +W/o patch irqbalance -d +IRQ (11) guessed as class 0 +IRQ (14) guessed as class 0 +IRQ (15) guessed as class 0 +IRQ (16) guessed as class 0 +IRQ 485c0100.dma-controller chan6(116) guessed as class 0 +IRQ (134) guessed as class 0 +IRQ (224) guessed as class 0 + +W/ this patch +IRQ arch_timer(11) guessed as class 0 +IRQ arm-pmu(14) guessed as class 0 +IRQ 4b00000.spi(15) guessed as class 0 +IRQ 4b10000.spi(16) guessed as class 0 +IRQ 485c0100.dma-controller chan6(116) guessed as class 0 +IRQ 8000000.ethernet-tx0(134) guessed as class 5 +IRQ 8000000.ethernet(224) guessed as class 5 +IRQ 8000000.ethernet(257) guessed as class 5 +IRQ -davinci_gpio wl18xx(362) guessed as class + +Signed-off-by: Vignesh Raghavendra +--- + procinterrupts.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/procinterrupts.c ++++ b/procinterrupts.c +@@ -178,12 +178,14 @@ void init_irq_class_and_type(char *saved + } + + #ifdef AARCH64 +- if (savedptr && strlen(savedptr) > 0) { ++ if (savedptr && strlen(savedptr) > 0) + snprintf(irq_fullname, PATH_MAX, "%s %s", last_token, savedptr); +- tmp = strchr(irq_fullname, '\n'); +- if (tmp) +- *tmp = 0; +- } ++ else ++ snprintf(irq_fullname, PATH_MAX, "%s", last_token); ++ ++ tmp = strchr(irq_fullname, '\n'); ++ if (tmp) ++ *tmp = 0; + #else + snprintf(irq_fullname, PATH_MAX, "%s", last_token); + #endif diff --git a/utils/podman/Makefile b/utils/podman/Makefile index 2e9a0e5cb..d18411e7c 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman -PKG_VERSION:=4.3.1 +PKG_VERSION:=4.4.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) -PKG_HASH:=455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813 +PKG_HASH:=0b84dbc3ca1d3cc75708635e3a322c481bb679103040866024b1fa2be6826455 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/podman/patches/010-do-not-build-docs.patch b/utils/podman/patches/010-do-not-build-docs.patch index 43f62b65a..67317fda3 100644 --- a/utils/podman/patches/010-do-not-build-docs.patch +++ b/utils/podman/patches/010-do-not-build-docs.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -200,7 +200,7 @@ GV_SHA=e943b1806d94d387c4c38d96719432d50 +@@ -206,7 +206,7 @@ GV_SHA=aab0ac9367fc5142f5857c36ac2352bcb default: all .PHONY: all @@ -9,7 +9,7 @@ .PHONY: binaries ifeq ($(shell uname -s),FreeBSD) -@@ -744,7 +744,7 @@ package-install: package ## Install rpm +@@ -792,7 +792,7 @@ package-install: package ## Install rpm /usr/bin/podman info # will catch a broken conmon .PHONY: install diff --git a/utils/restic/Makefile b/utils/restic/Makefile index 4551ae0ff..e3cde4282 100644 --- a/utils/restic/Makefile +++ b/utils/restic/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=restic -PKG_VERSION:=0.14.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.15.1 +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:=78cdd8994908ebe7923188395734bb3cdc9101477e4163c67e7cc3b8fd3b4bd6 +PKG_HASH:=fce382fdcdac0158a35daa640766d5e8a6e7b342ae2b0b84f2aacdff13990c52 PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/utils/uvol/Makefile b/utils/uvol/Makefile index 256dbfbd1..1524fc16f 100644 --- a/utils/uvol/Makefile +++ b/utils/uvol/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uvol PKG_VERSION:=0.9 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/uvol/files/ubi.uc b/utils/uvol/files/ubi.uc index 7d0872b16..8b46112c7 100644 --- a/utils/uvol/files/ubi.uc +++ b/utils/uvol/files/ubi.uc @@ -29,7 +29,7 @@ function mkdtemp() { function ubi_get_dev(vol_name) { let wcstring = sprintf("uvol-[rw][owpd]-%s", vol_name); - for (vol_dir in fs.glob(sprintf("/sys/devices/virtual/ubi/%s/%s_*", ubidev, ubidev))) { + for (vol_dir in fs.glob(sprintf("/sys/class/ubi/%s_*", ubidev))) { let vol_ubiname = read_file(sprintf("%s/name", vol_dir)); if (wildcard(vol_ubiname, wcstring)) return fs.basename(vol_dir); @@ -38,7 +38,7 @@ function ubi_get_dev(vol_name) { } function vol_get_mode(vol_dev, mode) { - let vol_name = read_file(sprintf("/sys/devices/virtual/ubi/%s/%s/name", ubidev, vol_dev)); + let vol_name = read_file(sprintf("/sys/class/ubi/%s/name", vol_dev)); return substr(vol_name, 5, 2); } @@ -57,19 +57,23 @@ function block_hotplug(action, devname) { function ubi_init(ctx) { cursor = ctx.cursor; fs = ctx.fs; + ubidev = null; let ubiver = read_file("/sys/class/ubi/version"); if (ubiver != 1) return false; - let ubidevpath = null; - for (ubidevpath in fs.glob("/sys/devices/virtual/ubi/*")) - break; + for (ubidevpath in fs.glob("/sys/class/ubi/*")) { + if (!fs.stat(sprintf("%s/eraseblock_size", ubidevpath))) + continue; - if (!ubidevpath) + ubidev = fs.basename(ubidevpath); + break; + } + + if (!ubidev) return false; - ubidev = fs.basename(ubidevpath); ebsize = read_file(sprintf("%s/eraseblock_size", ubidevpath)); uvol_uci_add = ctx.uci_add; @@ -81,7 +85,7 @@ function ubi_init(ctx) { } function ubi_free() { - let availeb = read_file(sprintf("/sys/devices/virtual/ubi/%s/avail_eraseblocks", ubidev)); + let availeb = read_file(sprintf("/sys/class/ubi/%s/avail_eraseblocks", ubidev)); return sprintf("%d", availeb * ebsize); } @@ -90,7 +94,7 @@ function ubi_align() { } function ubi_total() { - let totaleb = read_file(sprintf("/sys/devices/virtual/ubi/%s/total_eraseblocks", ubidev)); + let totaleb = read_file(sprintf("/sys/class/ubi/%s/total_eraseblocks", ubidev)); return sprintf("%d", totaleb * ebsize); } @@ -114,7 +118,7 @@ function ubi_size(vol_name) { if (!vol_dev) return 2; - let vol_size = read_file(sprintf("/sys/devices/virtual/ubi/%s/%s/data_bytes", ubidev, vol_dev)); + let vol_size = read_file(sprintf("/sys/class/ubi/%s/data_bytes", vol_dev)); return sprintf("%d", vol_size); } @@ -255,7 +259,7 @@ function ubi_down(vol_name) { function ubi_list(search_name) { let volumes = []; - for (vol_dir in fs.glob(sprintf("/sys/devices/virtual/ubi/%s/%s_*", ubidev, ubidev))) { + for (vol_dir in fs.glob(sprintf("/sys/class/ubi/%s_*", ubidev))) { let vol = {}; let vol_ubiname = read_file(sprintf("%s/name", vol_dir)); if (!wildcard(vol_ubiname, "uvol-[rw][wod]-*")) @@ -277,7 +281,7 @@ function ubi_list(search_name) { function ubi_detect() { let tmpdev = []; - for (vol_dir in fs.glob(sprintf("/sys/devices/virtual/ubi/%s/%s_*", ubidev, ubidev))) { + for (vol_dir in fs.glob(sprintf("/sys/class/ubi/%s_*", ubidev))) { let vol_ubiname = read_file(sprintf("%s/name", vol_dir)); if (!wildcard(vol_ubiname, "uvol-r[od]-*")) @@ -297,7 +301,7 @@ function ubi_detect() { uvol_uci_init(); - for (vol_dir in fs.glob(sprintf("/sys/devices/virtual/ubi/%s/%s_*", ubidev, ubidev))) { + for (vol_dir in fs.glob(sprintf("/sys/class/ubi/%s_*", ubidev))) { let vol_ubiname = read_file(sprintf("%s/name", vol_dir)); if (!wildcard(vol_ubiname, "uvol-[rw][wod]-*")) continue; @@ -321,7 +325,7 @@ function ubi_detect() { } function ubi_boot() { - for (vol_dir in fs.glob(sprintf("/sys/devices/virtual/ubi/%s/%s_*", ubidev, ubidev))) { + for (vol_dir in fs.glob(sprintf("/sys/class/ubi/%s_*", ubidev))) { let vol_dev = fs.basename(vol_dir); let vol_ubiname = read_file(sprintf("%s/name", vol_dir)); diff --git a/utils/uvol/files/uvol.defaults b/utils/uvol/files/uvol.defaults index 43c971154..927f8c115 100644 --- a/utils/uvol/files/uvol.defaults +++ b/utils/uvol/files/uvol.defaults @@ -4,7 +4,9 @@ uvol_init() { local metasz freesz totalsz uvol detect metasz="$(uvol size .meta 2>/dev/null)" - [ "$((metasz))" -gt 0 ] && return + if [ "$metasz" ]; then + [ "$((metasz))" -gt 0 ] && return + fi totalsz="$(uvol total)" freesz="$(uvol free)" metasz="$((totalsz / 10240))"