Merge Official Source

lang/python/click/Makefile → 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 <[email protected]>
 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))

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

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 <[email protected]>
 
 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

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

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 <[email protected]>
 

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**  

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,20 +574,22 @@ 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)
 	#
 	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"