diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index 8b67832ca..b6a84a378 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo -PKG_VERSION:=1.9.13p3 +PKG_VERSION:=1.9.14p1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.sudo.ws/dist -PKG_HASH:=92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b +PKG_HASH:=e91bf5ef2e09d857ee901c3465cf7ddb37e43c763b65d19fa0862d1dec128faf PKG_MAINTAINER:=Alexandru Ardelean diff --git a/admin/sudo/patches/020-no-owner-change.patch b/admin/sudo/patches/020-no-owner-change.patch index 1dbc0a251..68c24ee05 100644 --- a/admin/sudo/patches/020-no-owner-change.patch +++ b/admin/sudo/patches/020-no-owner-change.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -73,7 +73,7 @@ EGREP = @EGREP@ +@@ -74,7 +74,7 @@ EGREP = @EGREP@ SED = @SED@ INSTALL = $(SHELL) $(scriptdir)/install-sh -c diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 7c01b6c72..263c2bdf3 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.2.7 +PKG_VERSION:=8.2.8 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0 +PKG_HASH:=cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 diff --git a/lang/php8/patches/0025-php-5.4.9-fixheader.patch b/lang/php8/patches/0025-php-5.4.9-fixheader.patch index 851b15ffe..0268f3718 100644 --- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch +++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch @@ -9,7 +9,7 @@ Make generated php_config.h constant across rebuilds. --- a/configure.ac +++ b/configure.ac -@@ -1441,7 +1441,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) +@@ -1451,7 +1451,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" diff --git a/lang/php8/patches/1004-disable-phar-command.patch b/lang/php8/patches/1004-disable-phar-command.patch index 577a23c46..2f24f968d 100644 --- a/lang/php8/patches/1004-disable-phar-command.patch +++ b/lang/php8/patches/1004-disable-phar-command.patch @@ -11,7 +11,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -1624,13 +1624,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1634,13 +1634,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/lang/python/pillow/Makefile b/lang/python/pillow/Makefile index 753ceec25..c974723a9 100644 --- a/lang/python/pillow/Makefile +++ b/lang/python/pillow/Makefile @@ -7,11 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pillow -PKG_VERSION:=9.5.0 -PKG_RELEASE:=2 +PKG_VERSION:=10.0.0 +PKG_RELEASE:=1 PYPI_NAME:=Pillow -PKG_HASH:=bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1 +PKG_HASH:=9c82b5b3e043c7af0d95792d0d20ccf68f61a1fec6b3530e718b688422727396 + +PKG_BUILD_DEPENDS:=python-setuptools-scm/host PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=HPND diff --git a/lang/python/pillow/patches/001-remove-setuptools-version-limit.patch b/lang/python/pillow/patches/001-remove-setuptools-version-limit.patch new file mode 100644 index 000000000..3dc07d992 --- /dev/null +++ b/lang/python/pillow/patches/001-remove-setuptools-version-limit.patch @@ -0,0 +1,11 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + [build-system] + build-backend = "backend" + requires = [ +- "setuptools>=67.8", ++ "setuptools", + "wheel", + ] + backend-path = [ diff --git a/lang/python/pymysql/Makefile b/lang/python/pymysql/Makefile index 469efeaf8..d5187bd57 100644 --- a/lang/python/pymysql/Makefile +++ b/lang/python/pymysql/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pymysql -PKG_VERSION:=1.0.2 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PYPI_NAME:=PyMySQL -PKG_HASH:=816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36 +PKG_HASH:=4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=MIT diff --git a/lang/python/click/Makefile b/lang/python/python-click/Makefile similarity index 56% rename from lang/python/click/Makefile rename to lang/python/python-click/Makefile index 39bf92981..47134d203 100644 --- a/lang/python/click/Makefile +++ b/lang/python/python-click/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=click -PKG_VERSION:=8.1.3 +PKG_NAME:=python-click +PKG_VERSION:=8.1.4 PKG_RELEASE:=1 PYPI_NAME:=click -PKG_HASH:=7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e +PKG_HASH:=b97d0c74955da062a7d4ef92fadb583806a585b2ea81958a81bd72726cbb8e37 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE +PKG_LICENSE_FILES:=LICENSE.rst include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -23,13 +23,16 @@ define Package/python3-click SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=Click + TITLE:=Composable command line interface toolkit URL:=https://palletsprojects.com/p/click/ - DEPENDS:=+python3-light + DEPENDS:=+python3-light +python3-urllib +python3-uuid endef define Package/python3-click/description - Composable command line interface toolkit +Click is a Python package for creating beautiful command line interfaces +in a composable way with as little code as necessary. It's the "Command +Line Interface Creation Kit". It's highly configurable but comes with +sensible defaults out of the box. endef $(eval $(call Py3Package,python3-click)) diff --git a/lang/python/python-cython/Makefile b/lang/python/python-cython/Makefile index 2c5707557..efaaa2d38 100644 --- a/lang/python/python-cython/Makefile +++ b/lang/python/python-cython/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cython -PKG_VERSION:=0.29.35 +PKG_VERSION:=0.29.36 PKG_RELEASE:=1 PYPI_NAME:=Cython -PKG_HASH:=6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527 +PKG_HASH:=41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE.txt diff --git a/lang/python/python-editables/Makefile b/lang/python/python-editables/Makefile index dc0547ed3..6a012b04a 100644 --- a/lang/python/python-editables/Makefile +++ b/lang/python/python-editables/Makefile @@ -8,18 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-editables -PKG_VERSION:=0.3 +PKG_VERSION:=0.4 PKG_RELEASE:=1 PYPI_NAME:=editables -PKG_HASH:=167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a +PKG_HASH:=dc322c42e7ccaf19600874035a4573898d88aadd07e177c239298135b75da772 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Jeffery To PKG_HOST_ONLY:=1 -HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-wheel/host +HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-flit-core/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index 8acc606d3..c6b156f16 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-requests -PKG_VERSION:=2.30.0 +PKG_VERSION:=2.31.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:python-requests:requests PYPI_NAME:=requests -PKG_HASH:=239d7d4458afcb28a692cdd298d87542235f4ca8d36d03a15bfc128a6559a2f4 +PKG_HASH:=942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/lang/python/python-trove-classifiers/Makefile b/lang/python/python-trove-classifiers/Makefile index 67c5017a0..9df7e0550 100644 --- a/lang/python/python-trove-classifiers/Makefile +++ b/lang/python/python-trove-classifiers/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-trove-classifiers -PKG_VERSION:=2023.5.24 +PKG_VERSION:=2023.7.6 PKG_RELEASE:=1 PYPI_NAME:=trove-classifiers -PKG_HASH:=fd5a1546283be941f47540a135bdeae8fb261380a6a204d9c18012f2a1b0ceae +PKG_HASH:=8a8e168b51d20fed607043831d37632bb50919d1c80a64e0f1393744691a8b22 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/libs/inih/Makefile b/libs/inih/Makefile index c499b22ac..e008447d8 100644 --- a/libs/inih/Makefile +++ b/libs/inih/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=inih -PKG_VERSION:=r56 +PKG_VERSION:=r57 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/benhoyt/inih/tar.gz/$(PKG_VERSION)? -PKG_HASH:=4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a +PKG_HASH:=f03f98ca35c3adb56b2358573c8d3eda319ccd5287243d691e724b7eafa970b3 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=BSD-3-Clause diff --git a/net/banip/Makefile b/net/banip/Makefile index a9900dbdf..fbcfd9791 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip -PKG_VERSION:=0.8.9 -PKG_RELEASE:=4 +PKG_VERSION:=0.9.0 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/banip/files/README.md b/net/banip/files/README.md index 0039b0d26..0ab0aac28 100644 --- a/net/banip/files/README.md +++ b/net/banip/files/README.md @@ -88,6 +88,7 @@ IP address blocking is commonly used to protect against brute force attacks, pre * Procd network interface trigger support * Add new or edit existing banIP feeds on your own with the LuCI integrated custom feed editor * Supports external allowlist URLs to reference additional IPv4/IPv6 feeds +* Supports allowing / blocking of certain VLAN forwards ## Prerequisites * **[OpenWrt](https://openwrt.org)**, latest stable release or a snapshot with nft/firewall 4 and logd/logread support @@ -159,6 +160,8 @@ Available commands: | ban_ifv4 | list | - / autodetect | logical wan IPv4 interfaces, e.g. 'wan' | | ban_ifv6 | list | - / autodetect | logical wan IPv6 interfaces, e.g. 'wan6' | | ban_dev | list | - / autodetect | wan device(s), e.g. 'eth2' | +| ban_vlanallow | list | - | always allow certain VLAN forwards, e.g. br-lan.20 | +| ban_vlanblock | list | - | always block certain VLAN forwards, e.g. br-lan.10 | | ban_trigger | list | - | logical startup trigger interface(s), e.g. 'wan' | | ban_triggerdelay | option | 10 | trigger timeout before banIP processing begins | | ban_triggeraction | option | start | trigger action on ifup events, e.g. start, restart or reload | @@ -230,19 +233,19 @@ Available commands: **banIP runtime information** ``` -root@blackhole:~# /etc/init.d/banip status +root@blackhole:/etc/config$ /etc/init.d/banip status ::: banIP runtime information + status : active (nft: ✔, monitor: ✔) - + version : 0.8.8-1 - + element_count : 104449 - + active_feeds : allowlistv4MAC, allowlistv6MAC, allowlistv4, allowlistv6, cinsscorev4, deblv4, countryv6, countryv4, deblv6, dropv6, dropv4, dohv6, dohv4, edropv4, threatviewv4, firehol1v4, ipthreatv4, urlvirv4, blocklistv4MAC, blocklistv6MAC, blocklistv4, blocklistv6 - + active_devices : br-wan ::: wan, wan6 + + version : 0.9.0-1 + + element_count : 111094 + + active_feeds : allowlistv4MAC, allowlistv6MAC, allowlistv4, allowlistv6, cinsscorev4, deblv4, countryv6, countryv4, deblv6, dropv6, dropv4, dohv6, dohv4, threatviewv4, firehol1v4, ipthreatv4, firehol2v4, urlvirv4, urlhausv4, blocklistv4MAC, blocklistv6MAC, blocklistv4, blocklistv6 + + active_devices : wan: br-wan, 10g-1 / wan-if: wan, wan6 / vlan-allow: - / vlan-block: - + active_uplink : 91.63.198.120, 2a12:810c:0:80:a20d:52c3:5cf:f4f + nft_info : priority: -200, policy: performance, loglevel: warn, expiry: - - + run_info : base: /mnt/data/banIP, backup: /mnt/data/banIP/backup, report: /mnt/data/banIP/report, custom feed: ✘ - + run_flags : auto: ✔, proto (4/6): ✔/✔, log (wan-inp/wan-fwd/lan-fwd): ✔/✔/✔, dedup: ✔, split: ✘, allowed only: ✘ - + last_run : action: restart, duration: 0m 19s, date: 2023-06-21 06:45:52 - + system_info : cores: 4, memory: 1634, device: Bananapi BPI-R3, OpenWrt SNAPSHOT r23398-c4be106f4d + + run_info : base: /mnt/data/banIP, backup: /mnt/data/banIP/backup, report: /mnt/data/banIP/report + + run_flags : auto: ✔, proto (4/6): ✔/✔, log (wan-inp/wan-fwd/lan-fwd): ✔/✔/✔, dedup: ✔, split: ✘, custom feed: ✘, allowed only: ✘ + + last_run : action: reload, fetch: curl, duration: 0m 36s, date: 2023-07-16 06:59:28 + + system_info : cores: 4, memory: 1663, device: Bananapi BPI-R3, OpenWrt SNAPSHOT r23565-8fb0c196e8 ``` **banIP search information** diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh index 170c7326c..545753635 100644 --- a/net/banip/files/banip-functions.sh +++ b/net/banip/files/banip-functions.sh @@ -73,6 +73,8 @@ ban_protov6="0" ban_ifv4="" ban_ifv6="" ban_dev="" +ban_vlanallow="" +ban_vlanblock="" ban_uplink="" ban_fetchcmd="" ban_fetchparm="" @@ -224,7 +226,7 @@ f_log() { # load config # f_conf() { - unset ban_dev ban_ifv4 ban_ifv6 ban_feed ban_allowurl ban_blockinput ban_blockforwardwan ban_blockforwardlan ban_logterm ban_country ban_asn + unset ban_dev ban_vlanallow ban_vlanblock ban_ifv4 ban_ifv6 ban_feed ban_allowurl ban_blockinput ban_blockforwardwan ban_blockforwardlan ban_logterm ban_country ban_asn config_cb() { option_cb() { local option="${1}" @@ -235,15 +237,21 @@ f_conf() { local option="${1}" local value="${2}" case "${option}" in - "ban_dev") - eval "${option}=\"$(printf "%s" "${ban_dev}")${value} \"" - ;; "ban_ifv4") eval "${option}=\"$(printf "%s" "${ban_ifv4}")${value} \"" ;; "ban_ifv6") eval "${option}=\"$(printf "%s" "${ban_ifv6}")${value} \"" ;; + "ban_dev") + eval "${option}=\"$(printf "%s" "${ban_dev}")${value} \"" + ;; + "ban_vlanallow") + eval "${option}=\"$(printf "%s" "${ban_vlanallow}")${value} \"" + ;; + "ban_vlanblock") + eval "${option}=\"$(printf "%s" "${ban_vlanblock}")${value} \"" + ;; "ban_trigger") eval "${option}=\"$(printf "%s" "${ban_trigger}")${value} \"" ;; @@ -435,7 +443,7 @@ f_getdev() { ban_dev="${ban_dev%%?}" [ -z "${ban_dev}" ] && f_log "err" "no wan devices" - f_log "debug" "f_getdev ::: auto/update: ${ban_autodetect}/${update}, devices: ${ban_dev}, cnt: ${cnt}" + f_log "debug" "f_getdev ::: auto/update: ${ban_autodetect}/${update}, wan_devices: ${ban_dev}, cnt: ${cnt}" } # get local uplink @@ -534,7 +542,11 @@ f_etag() { # build initial nft file with base table, chains and rules # f_nftinit() { - local feed_log feed_rc file="${1}" + local wan_dev vlan_allow vlan_block feed_log feed_rc file="${1}" + + wan_dev="$(printf "%s" "${ban_dev}" | "${ban_sedcmd}" 's/^/\"/;s/$/\"/;s/ /\", \"/g')" + [ -n "${ban_vlanallow}" ] && vlan_allow="$(printf "%s" "${ban_vlanallow%%?}" | "${ban_sedcmd}" 's/^/\"/;s/$/\"/;s/ /\", \"/g')" + [ -n "${ban_vlanblock}" ] && vlan_block="$(printf "%s" "${ban_vlanblock%%?}" | "${ban_sedcmd}" 's/^/\"/;s/$/\"/;s/ /\", \"/g')" { # nft header (tables and chains) @@ -551,7 +563,7 @@ f_nftinit() { # default wan-input rules # printf "%s\n" "add rule inet banIP wan-input ct state established,related counter accept" - printf "%s\n" "add rule inet banIP wan-input iifname != { ${ban_dev// /, } } counter accept" + printf "%s\n" "add rule inet banIP wan-input iifname != { ${wan_dev} } counter accept" printf "%s\n" "add rule inet banIP wan-input meta nfproto ipv4 udp sport 67-68 udp dport 67-68 counter accept" printf "%s\n" "add rule inet banIP wan-input meta nfproto ipv6 udp sport 547 udp dport 546 counter accept" printf "%s\n" "add rule inet banIP wan-input meta nfproto ipv4 icmp type { echo-request } limit rate 1000/second counter accept" @@ -562,12 +574,14 @@ f_nftinit() { # default wan-forward rules # printf "%s\n" "add rule inet banIP wan-forward ct state established,related counter accept" - printf "%s\n" "add rule inet banIP wan-forward iifname != { ${ban_dev// /, } } counter accept" + printf "%s\n" "add rule inet banIP wan-forward iifname != { ${wan_dev} } counter accept" # default lan-forward rules # printf "%s\n" "add rule inet banIP lan-forward ct state established,related counter accept" - printf "%s\n" "add rule inet banIP lan-forward oifname != { ${ban_dev// /, } } counter accept" + printf "%s\n" "add rule inet banIP lan-forward oifname != { ${wan_dev} } counter accept" + [ -n "${vlan_allow}" ] && printf "%s\n" "add rule inet banIP lan-forward iifname { ${vlan_allow} } counter accept" + [ -n "${vlan_block}" ] && printf "%s\n" "add rule inet banIP lan-forward iifname { ${vlan_block} } counter reject" } >"${file}" # load initial banIP table within nft (atomic load) @@ -575,7 +589,7 @@ f_nftinit() { feed_log="$("${ban_nftcmd}" -f "${file}" 2>&1)" feed_rc="${?}" - f_log "debug" "f_nftinit ::: devices: ${ban_dev}, priority: ${ban_nftpriority}, policy: ${ban_nftpolicy}, loglevel: ${ban_nftloglevel}, rc: ${feed_rc:-"-"}, log: ${feed_log:-"-"}" + f_log "debug" "f_nftinit ::: wan_dev: ${wan_dev}, vlan_allow: ${vlan_allow:-"-"}, vlan_block: ${vlan_block:-"-"}, priority: ${ban_nftpriority}, policy: ${ban_nftpolicy}, loglevel: ${ban_nftloglevel}, rc: ${feed_rc:-"-"}, log: ${feed_log:-"-"}" return "${feed_rc}" } @@ -1035,7 +1049,7 @@ f_genstatus() { cnt_elements="$((cnt_elements + $("${ban_nftcmd}" -j list set inet banIP "${item}" 2>/dev/null | "${ban_jsoncmd}" -qe '@.nftables[*].set.elem[*]' | wc -l 2>/dev/null)))" done fi - runtime="action: ${ban_action:-"-"}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")" + runtime="action: ${ban_action:-"-"}, fetch: ${ban_fetchcmd##*/}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")" fi [ -s "${ban_customfeedfile}" ] && custom_feed="1" [ "${ban_splitsize:-"0"}" -gt "0" ] && split="1" @@ -1048,33 +1062,37 @@ f_genstatus() { json_add_string "element_count" "${cnt_elements}" json_add_array "active_feeds" for object in ${table_sets:-"-"}; do - json_add_object - json_add_string "feed" "${object}" - json_close_object + json_add_string "${object}" "${object}" done json_close_array - json_add_array "active_devices" + json_add_array "wan_devices" for object in ${ban_dev:-"-"}; do - json_add_object - json_add_string "device" "${object}" - json_close_object + json_add_string "${object}" "${object}" done + json_close_array + json_add_array "wan_interfaces" for object in ${ban_ifv4:-"-"} ${ban_ifv6:-"-"}; do - json_add_object - json_add_string "interface" "${object}" - json_close_object + json_add_string "${object}" "${object}" + done + json_close_array + json_add_array "vlan_allow" + for object in ${ban_vlanallow:-"-"}; do + json_add_string "${object}" "${object}" + done + json_close_array + json_add_array "vlan_block" + for object in ${ban_vlanblock:-"-"}; do + json_add_string "${object}" "${object}" done json_close_array json_add_array "active_uplink" for object in ${ban_uplink:-"-"}; do - json_add_object - json_add_string "uplink" "${object}" - json_close_object + json_add_string "${object}" "${object}" done json_close_array json_add_string "nft_info" "priority: ${ban_nftpriority}, policy: ${ban_nftpolicy}, loglevel: ${ban_nftloglevel}, expiry: ${ban_nftexpiry:-"-"}" - json_add_string "run_info" "base: ${ban_basedir}, backup: ${ban_backupdir}, report: ${ban_reportdir}, custom feed: $(f_char ${custom_feed})" - json_add_string "run_flags" "auto: $(f_char ${ban_autodetect}), proto (4/6): $(f_char ${ban_protov4})/$(f_char ${ban_protov6}), log (wan-inp/wan-fwd/lan-fwd): $(f_char ${ban_loginput})/$(f_char ${ban_logforwardwan})/$(f_char ${ban_logforwardlan}), dedup: $(f_char ${ban_deduplicate}), split: $(f_char ${split}), allowed only: $(f_char ${ban_allowlistonly})" + json_add_string "run_info" "base: ${ban_basedir}, backup: ${ban_backupdir}, report: ${ban_reportdir}" + json_add_string "run_flags" "auto: $(f_char ${ban_autodetect}), proto (4/6): $(f_char ${ban_protov4})/$(f_char ${ban_protov6}), log (wan-inp/wan-fwd/lan-fwd): $(f_char ${ban_loginput})/$(f_char ${ban_logforwardwan})/$(f_char ${ban_logforwardlan}), dedup: $(f_char ${ban_deduplicate}), split: $(f_char ${split}), custom feed: $(f_char ${custom_feed}), allowed only: $(f_char ${ban_allowlistonly})" json_add_string "last_run" "${runtime:-"-"}" json_add_string "system_info" "cores: ${ban_cores}, memory: ${ban_memory}, device: ${ban_sysver}" json_dump >"${ban_rtfile}" @@ -1083,54 +1101,35 @@ f_genstatus() { # get status information # f_getstatus() { - local key keylist type value index_key1 index_key2 index_value1 index_value2 + local key keylist value values [ -z "${ban_dev}" ] && f_conf json_load_file "${ban_rtfile}" >/dev/null 2>&1 if json_get_keys keylist; then printf "%s\n" "::: banIP runtime information" for key in ${keylist}; do - json_get_var value "${key}" >/dev/null 2>&1 - if [ "${key}" = "status" ]; then - value="${value} ($(f_actual))" - elif [ "${key}" = "active_devices" ]; then - json_select "${key}" >/dev/null 2>&1 - index=1 - while json_get_type type "${index}" && [ "${type}" = "object" ]; do - json_get_keys index_key1 "${index}" >/dev/null 2>&1 - json_get_keys index_key2 "$((index + 1))" >/dev/null 2>&1 - json_get_values index_value1 "${index}" >/dev/null 2>&1 - if [ "${index}" = "1" ] && [ "${index_key1// /}" = "device" ] && [ "${index_key2// /}" = "interface" ]; then - json_get_values index_value2 "$((index + 1))" >/dev/null 2>&1 - value="${index_value1} ::: ${index_value2}" - index="$((index + 1))" - elif [ "${index}" = "1" ]; then - value="${index_value1}" - elif [ "${index}" != "1" ] && [ "${index_key1// /}" = "device" ] && [ "${index_key2// /}" = "interface" ]; then - json_get_values index_value2 "$((index + 1))" >/dev/null 2>&1 - value="${value}, ${index_value1} ::: ${index_value2}" - index="$((index + 1))" - elif [ "${index}" != "1" ]; then - value="${value}, ${index_value1}" - fi - index="$((index + 1))" - done - json_select ".." - elif [ "${key%_*}" = "active" ]; then - json_select "${key}" >/dev/null 2>&1 - index=1 - while json_get_type type "${index}" && [ "${type}" = "object" ]; do - json_get_values index_value1 "${index}" >/dev/null 2>&1 - if [ "${index}" = "1" ]; then - value="${index_value1}" - else - value="${value}, ${index_value1}" - fi - index="$((index + 1))" - done - json_select ".." + if [ "${key}" = "active_feeds" ] || [ "${key}" = "active_uplink" ]; then + json_get_values values "${key}" >/dev/null 2>&1 + value="${values// /, }" + elif [ "${key}" = "wan_devices" ]; then + json_get_values values "${key}" >/dev/null 2>&1 + value="wan: ${values// /, } / " + json_get_values values "wan_interfaces" >/dev/null 2>&1 + value="${value}wan-if: ${values// /, } / " + json_get_values values "vlan_allow" >/dev/null 2>&1 + value="${value}vlan-allow: ${values// /, } / " + json_get_values values "vlan_block" >/dev/null 2>&1 + value="${value}vlan-block: ${values// /, }" + key="active_devices" + else + json_get_var value "${key}" >/dev/null 2>&1 + if [ "${key}" = "status" ]; then + value="${value} ($(f_actual))" + fi + fi + if [ "${key}" != "wan_interfaces" ] && [ "${key}" != "vlan_allow" ] && [ "${key}" != "vlan_block" ]; then + printf " + %-17s : %s\n" "${key}" "${value:-"-"}" fi - printf " + %-17s : %s\n" "${key}" "${value:-"-"}" done else printf "%s\n" "::: no banIP runtime information available" diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index bb4106927..2b9f8d5bc 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudflared -PKG_VERSION:=2023.6.1 +PKG_VERSION:=2023.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)? -PKG_HASH:=7f7509bb364f107541dc810410b763721c39cdfab85799080ccae96d1c4a9cff +PKG_HASH:=9cd1a2dd60bc5de88430214578c1c2b06d48548c569e144d1b995d57ccb8a0d5 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index 01a7006ff..bb7cf4281 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.16.5 +PKG_VERSION:=3.18.0 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=198f7a3507482bfbf0fb24c24f34e17c9f5adbfdf5d8c63774ecd816708a4438 +PKG_HASH:=d28c050226c9282d7155da6cabf5547ddd43dc11eecacc485b6c05161c2d1d88 PKG_MAINTAINER:=Jan Pavlinec -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE.md +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DIR:=$(BUILD_DIR)/probe-cli-$(PKG_VERSION) PKG_BUILD_DEPENDS:=golang/host @@ -25,6 +25,7 @@ PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/ooni/probe-cli +GO_PKG_BUILD_PKG:=github.com/ooni/probe-cli/v3/cmd/ooniprobe include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk @@ -38,9 +39,15 @@ define Package/ooniprobe endef define Package/ooniprobe/description - The next generation of OONI(Open Observatory of Network Interference) + The next generation of Open Observatory of Network Interference (OONI) Probe Command Line Interface. endef +# Workaround for musl 1.2.4 compability in mattn/go-sqlite3 +# https://github.com/mattn/go-sqlite3/issues/1164 +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + $(eval $(call GoBinPackage,ooniprobe)) $(eval $(call BuildPackage,ooniprobe)) diff --git a/sound/shairport-sync/Makefile b/sound/shairport-sync/Makefile index 653aab7d0..26310d50d 100644 --- a/sound/shairport-sync/Makefile +++ b/sound/shairport-sync/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shairport-sync PKG_VERSION:=3.3.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/shairport-sync/tar.gz/$(PKG_VERSION)? diff --git a/sound/shairport-sync/files/shairport-sync.init b/sound/shairport-sync/files/shairport-sync.init index 728976829..1f0877535 100644 --- a/sound/shairport-sync/files/shairport-sync.init +++ b/sound/shairport-sync/files/shairport-sync.init @@ -26,7 +26,7 @@ append_str() { config_get val "$cfg" "$var" if [ -n "$val" ] || [ -n "$def" ]; then - printf "\t%s = \"${val:-$def}\";\n" "$opt" + printf "\t%s = \"%s\";\n" "$opt" "${val:-$def}" fi } diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index f5383c7ac..8beaf9317 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.19.1 +PKG_VERSION:=2.20.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:=869d4ffd3f6b6835dcbb5cd627e98a9d2f1d30a9ae2c8e712275db9aa3e6e97d +PKG_HASH:=983b372bfedfa832699fa18b6b9dc559ea42b3f0a97eff5d5f4f3994954993fe PKG_MAINTAINER:=Javier Marcet diff --git a/utils/yq/Makefile b/utils/yq/Makefile index 4e92a831d..882387752 100644 --- a/utils/yq/Makefile +++ b/utils/yq/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yq -PKG_VERSION:=4.34.1 +PKG_VERSION:=4.34.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=69ff6f8bbb5f9eff5ccb537597740d24200db201b2709e442ae5effdbcb8ff9d +PKG_HASH:=035b7e827eccc66907270ff7f0d35c7917d56ded4aff44f7b942fe4802b70d01 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT