From 98d0b78401acc25a135bf65e3a0c34a02cc15708 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sat, 13 May 2023 12:47:28 +0300 Subject: [PATCH 1/9] django: bump to version 4.2.1 Signed-off-by: Alexandru Ardelean --- lang/python/django/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/django/Makefile b/lang/python/django/Makefile index 616c7f3de..c936a9a89 100644 --- a/lang/python/django/Makefile +++ b/lang/python/django/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django -PKG_VERSION:=4.1.7 +PKG_VERSION:=4.2.1 PKG_RELEASE:=1 PYPI_NAME:=Django -PKG_HASH:=44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 +PKG_HASH:=7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c PKG_MAINTAINER:=Alexandru Ardelean , Peter Stadler PKG_LICENSE:=BSD-3-Clause From 5c131f8a9075887dd47b6623f85907fe408a09b2 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sat, 13 May 2023 12:48:26 +0300 Subject: [PATCH 2/9] python-requests: bump to version 2.30.0 Signed-off-by: Alexandru Ardelean --- lang/python/python-requests/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index c375c1cd6..8acc606d3 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.28.2 +PKG_VERSION:=2.30.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:=98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf +PKG_HASH:=239d7d4458afcb28a692cdd298d87542235f4ca8d36d03a15bfc128a6559a2f4 include ../pypi.mk include $(INCLUDE_DIR)/package.mk From cf4ac0301d886b129cd25965bb4796edc2e0327b Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 16 May 2023 12:27:13 +0200 Subject: [PATCH 3/9] banip: update 0.8.6-2 * fix/rework no-op loop * small fixes & cosmetics * update readme Signed-off-by: Dirk Brenken --- net/banip/Makefile | 2 +- net/banip/files/README.md | 20 ++++++++++---------- net/banip/files/banip-functions.sh | 29 ++++++++++------------------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/net/banip/Makefile b/net/banip/Makefile index ce1d4a7df..a62540da6 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip PKG_VERSION:=0.8.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 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 ae5a4eedb..3a104ea04 100644 --- a/net/banip/files/README.md +++ b/net/banip/files/README.md @@ -82,8 +82,8 @@ IP address blocking is commonly used to protect against brute force attacks, pre * Supports external allowlist URLs to reference additional IPv4/IPv6 feeds ## Prerequisites -* **[OpenWrt](https://openwrt.org)**, latest stable release or a snapshot with nft/firewall 4 support -* A download utility with SSL support: 'wget', 'uclient-fetch' with one of the 'libustream-*' SSL libraries, 'aria2c' or 'curl' is required +* **[OpenWrt](https://openwrt.org)**, latest stable release or a snapshot with nft/firewall 4 and logd/logread support +* A download utility with SSL support: 'aria2c', 'curl', full 'wget' or 'uclient-fetch' with one of the 'libustream-*' SSL libraries * A certificate store like 'ca-bundle', as banIP checks the validity of the SSL certificates of all download sites by default * For E-Mail notifications you need to install and setup the additional 'msmtp' package @@ -232,16 +232,16 @@ Available commands: ~# /etc/init.d/banip status ::: banIP runtime information + status : active (nft: ✔, monitor: ✔) - + version : 0.8.5-1 - + element_count : 281161 - + active_feeds : allowlistvMAC, allowlistv6, allowlistv4, adawayv4, adguardtrackersv4, adawayv6, adguardv6, adguardv4, adguardtrackersv6, antipopadsv6, antipopadsv4, cinsscorev4, deblv4, countryv6, countryv4, deblv6, dohv4, dohv6, iblockadsv4, firehol1v4, oisdbigv4, yoyov6, threatviewv4, yoyov4, oisdbigv6, blocklistvMAC, blocklistv4, blocklistv6 + + version : 0.8.6-2 + + element_count : 172309 + + active_feeds : allowlistvMAC, allowlistv6, allowlistv4, adawayv4, adguardtrackersv4, adawayv6, adguardv6, adguardv4, urlvirv4, adguardtrackersv6, oisdbigv6, oisdbigv4, blocklistvMAC, blocklistv4, blocklistv6 + active_devices : br-wan ::: wan, wan6 - + active_uplink : 91.64.169.252/24, 2a02:710c:0:60:958b:3bd0:9e14:abb/128 - + nft_info : priority: -200, policy: memory, loglevel: warn, expiry: - - + run_info : base: /mnt/data/banIP, backup: /mnt/data/banIP/backup, report: /mnt/data/banIP/report, feed: /etc/banip/banip.feeds + + active_uplink : 91.64.173.145, 2a12:610c:0:80:848b:3ad0:4e05:abb + + 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: reload, duration: 1m 0s, date: 2023-04-06 12:34:10 - + system_info : cores: 4, memory: 1822, device: Bananapi BPI-R3, OpenWrt SNAPSHOT r22498-75f7e2d10b + + last_run : action: restart, duration: 0m 22s, date: 2023-05-15 22:39:15 + + system_info : cores: 4, memory: 1798, device: Bananapi BPI-R3, OpenWrt SNAPSHOT r22784-1645c34d56 ``` **banIP search information** diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh index bca7ac3a5..ac28523b9 100644 --- a/net/banip/files/banip-functions.sh +++ b/net/banip/files/banip-functions.sh @@ -173,13 +173,13 @@ f_trim() { printf "%s" "${string}" } -# remove logservice +# remove log monitor # f_rmpid() { local ppid pid pids ppid="$("${ban_catcmd}" "${ban_pidfile}" 2>/dev/null)" - [ -n "${ppid}" ] && pids="$(pgrep -P "${ppid}" 2>/dev/null)" || return 0 + [ -n "${ppid}" ] && pids="$(pgrep -P "${ppid}" 2>/dev/null)" for pid in ${pids}; do kill -INT "${pid}" >/dev/null 2>&1 done @@ -278,7 +278,7 @@ f_actual() { else nft="$(f_char "0")" fi - if pgrep -f "logread" -P "$("${ban_catcmd}" "${ban_pidfile}" 2>/dev/null)" >/dev/null 2>&1; then + if pgrep -f "${ban_logreadcmd##*/}" -P "$("${ban_catcmd}" "${ban_pidfile}" 2>/dev/null)" >/dev/null 2>&1; then monitor="$(f_char "1")" else monitor="$(f_char "0")" @@ -949,7 +949,7 @@ f_rmset() { # generate status information # f_genstatus() { - local object duration item table_sets cnt_elements="0" custom="0" split="0" status="${1}" + local object duration item table_sets cnt_elements="0" custom_feed="0" split="0" status="${1}" [ -z "${ban_dev}" ] && f_conf if [ "${status}" = "active" ]; then @@ -965,8 +965,8 @@ f_genstatus() { fi runtime="action: ${ban_action:-"-"}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")" fi - [ -s ${ban_customfeedfile} ] && custom="1" - [ ${ban_splitsize:-"0"} -gt "0" ] && split="1" + [ -s "${ban_customfeedfile}" ] && custom_feed="1" + [ "${ban_splitsize:-"0"}" -gt "0" ] && split="1" : >"${ban_rtfile}" json_init @@ -1001,7 +1001,7 @@ f_genstatus() { 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}, feed/custom: ${ban_feedfile}/$(f_char ${custom})" + 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 "last_run" "${runtime:-"-"}" json_add_string "system_info" "cores: ${ban_cores}, memory: ${ban_memory}, device: ${ban_sysver}" @@ -1369,22 +1369,18 @@ f_monitor() { local nft_expiry line proto ip log_raw log_count if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ] && [ "${ban_loglimit}" != "0" ]; then + f_log "info" "start detached banIP log service" [ -n "${ban_nftexpiry}" ] && nft_expiry="timeout $(printf "%s" "${ban_nftexpiry}" | "${ban_grepcmd}" -oE "([0-9]+[d|h|m|s])+$")" - # read log continuously with given logterms - # + "${ban_logreadcmd}" -fe "${ban_logterm%%??}" 2>/dev/null | while read -r line; do proto="" - # IPv4 log parsing - # ip="$(printf "%s" "${line}" | "${ban_awkcmd}" 'BEGIN{RS="(([0-9]{1,3}\\.){3}[0-9]{1,3})+"}{if(!seen[RT]++)printf "%s ",RT}')" ip="$(f_trim "${ip}")" ip="${ip##* }" [ -n "${ip}" ] && proto="v4" if [ -z "${proto}" ]; then - # IPv6 log parsing - # ip="$(printf "%s" "${line}" | "${ban_awkcmd}" 'BEGIN{RS="([A-Fa-f0-9]{1,4}::?){3,7}[A-Fa-f0-9]{1,4}"}{if(!seen[RT]++)printf "%s ",RT}')" ip="$(f_trim "${ip}")" ip="${ip##* }" @@ -1405,14 +1401,9 @@ f_monitor() { fi fi done - - # start detached no-op service loop - # else f_log "info" "start detached no-op banIP service" - while :; do - sleep 1 - done + sleep infinity fi } From 54cc4cc7f6e90fd16139d3e4f98f6fe9b577f2f6 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Fri, 12 May 2023 12:49:06 +0200 Subject: [PATCH 4/9] gcc: copy patches from 12.2.0 to 12.3.0 This simplifies reviewing process. Signed-off-by: Nick Hainke --- devel/gcc/patches/{12.2.0 => 12.3.0}/002-case_insensitive.patch | 0 .../003-dont-choke-when-building-32bit-on-64bit.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/010-documentation.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/110-Fix-MIPS-PR-84790.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/230-musl_libssp.patch | 0 .../{12.2.0 => 12.3.0}/300-mips_Os_cpu_rtx_cost_model.patch | 0 .../gcc/patches/{12.2.0 => 12.3.0}/810-arm-softfloat-libgcc.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/820-libgcc_pic.patch | 0 .../{12.2.0 => 12.3.0}/840-armv4_pass_fix-v4bx_to_ld.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/850-use_shared_libgcc.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/851-libgcc_no_compat.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/870-ppc_no_crtsavres.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/881-no_tm_section.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/900-bad-mips16-crt.patch | 0 devel/gcc/patches/{12.2.0 => 12.3.0}/910-mbsd_multi.patch | 0 .../patches/{12.2.0 => 12.3.0}/920-specs_nonfatal_getenv.patch | 0 .../960-gotools-fix-compilation-when-making-cross-compiler.patch | 0 .../patches/{12.2.0 => 12.3.0}/970-macos_arm64-building-fix.patch | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename devel/gcc/patches/{12.2.0 => 12.3.0}/002-case_insensitive.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/003-dont-choke-when-building-32bit-on-64bit.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/010-documentation.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/110-Fix-MIPS-PR-84790.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/230-musl_libssp.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/300-mips_Os_cpu_rtx_cost_model.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/810-arm-softfloat-libgcc.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/820-libgcc_pic.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/840-armv4_pass_fix-v4bx_to_ld.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/850-use_shared_libgcc.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/851-libgcc_no_compat.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/870-ppc_no_crtsavres.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/881-no_tm_section.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/900-bad-mips16-crt.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/910-mbsd_multi.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/920-specs_nonfatal_getenv.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%) rename devel/gcc/patches/{12.2.0 => 12.3.0}/970-macos_arm64-building-fix.patch (100%) diff --git a/devel/gcc/patches/12.2.0/002-case_insensitive.patch b/devel/gcc/patches/12.3.0/002-case_insensitive.patch similarity index 100% rename from devel/gcc/patches/12.2.0/002-case_insensitive.patch rename to devel/gcc/patches/12.3.0/002-case_insensitive.patch diff --git a/devel/gcc/patches/12.2.0/003-dont-choke-when-building-32bit-on-64bit.patch b/devel/gcc/patches/12.3.0/003-dont-choke-when-building-32bit-on-64bit.patch similarity index 100% rename from devel/gcc/patches/12.2.0/003-dont-choke-when-building-32bit-on-64bit.patch rename to devel/gcc/patches/12.3.0/003-dont-choke-when-building-32bit-on-64bit.patch diff --git a/devel/gcc/patches/12.2.0/010-documentation.patch b/devel/gcc/patches/12.3.0/010-documentation.patch similarity index 100% rename from devel/gcc/patches/12.2.0/010-documentation.patch rename to devel/gcc/patches/12.3.0/010-documentation.patch diff --git a/devel/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch b/devel/gcc/patches/12.3.0/110-Fix-MIPS-PR-84790.patch similarity index 100% rename from devel/gcc/patches/12.2.0/110-Fix-MIPS-PR-84790.patch rename to devel/gcc/patches/12.3.0/110-Fix-MIPS-PR-84790.patch diff --git a/devel/gcc/patches/12.2.0/230-musl_libssp.patch b/devel/gcc/patches/12.3.0/230-musl_libssp.patch similarity index 100% rename from devel/gcc/patches/12.2.0/230-musl_libssp.patch rename to devel/gcc/patches/12.3.0/230-musl_libssp.patch diff --git a/devel/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch b/devel/gcc/patches/12.3.0/300-mips_Os_cpu_rtx_cost_model.patch similarity index 100% rename from devel/gcc/patches/12.2.0/300-mips_Os_cpu_rtx_cost_model.patch rename to devel/gcc/patches/12.3.0/300-mips_Os_cpu_rtx_cost_model.patch diff --git a/devel/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch b/devel/gcc/patches/12.3.0/810-arm-softfloat-libgcc.patch similarity index 100% rename from devel/gcc/patches/12.2.0/810-arm-softfloat-libgcc.patch rename to devel/gcc/patches/12.3.0/810-arm-softfloat-libgcc.patch diff --git a/devel/gcc/patches/12.2.0/820-libgcc_pic.patch b/devel/gcc/patches/12.3.0/820-libgcc_pic.patch similarity index 100% rename from devel/gcc/patches/12.2.0/820-libgcc_pic.patch rename to devel/gcc/patches/12.3.0/820-libgcc_pic.patch diff --git a/devel/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch b/devel/gcc/patches/12.3.0/840-armv4_pass_fix-v4bx_to_ld.patch similarity index 100% rename from devel/gcc/patches/12.2.0/840-armv4_pass_fix-v4bx_to_ld.patch rename to devel/gcc/patches/12.3.0/840-armv4_pass_fix-v4bx_to_ld.patch diff --git a/devel/gcc/patches/12.2.0/850-use_shared_libgcc.patch b/devel/gcc/patches/12.3.0/850-use_shared_libgcc.patch similarity index 100% rename from devel/gcc/patches/12.2.0/850-use_shared_libgcc.patch rename to devel/gcc/patches/12.3.0/850-use_shared_libgcc.patch diff --git a/devel/gcc/patches/12.2.0/851-libgcc_no_compat.patch b/devel/gcc/patches/12.3.0/851-libgcc_no_compat.patch similarity index 100% rename from devel/gcc/patches/12.2.0/851-libgcc_no_compat.patch rename to devel/gcc/patches/12.3.0/851-libgcc_no_compat.patch diff --git a/devel/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch b/devel/gcc/patches/12.3.0/870-ppc_no_crtsavres.patch similarity index 100% rename from devel/gcc/patches/12.2.0/870-ppc_no_crtsavres.patch rename to devel/gcc/patches/12.3.0/870-ppc_no_crtsavres.patch diff --git a/devel/gcc/patches/12.2.0/881-no_tm_section.patch b/devel/gcc/patches/12.3.0/881-no_tm_section.patch similarity index 100% rename from devel/gcc/patches/12.2.0/881-no_tm_section.patch rename to devel/gcc/patches/12.3.0/881-no_tm_section.patch diff --git a/devel/gcc/patches/12.2.0/900-bad-mips16-crt.patch b/devel/gcc/patches/12.3.0/900-bad-mips16-crt.patch similarity index 100% rename from devel/gcc/patches/12.2.0/900-bad-mips16-crt.patch rename to devel/gcc/patches/12.3.0/900-bad-mips16-crt.patch diff --git a/devel/gcc/patches/12.2.0/910-mbsd_multi.patch b/devel/gcc/patches/12.3.0/910-mbsd_multi.patch similarity index 100% rename from devel/gcc/patches/12.2.0/910-mbsd_multi.patch rename to devel/gcc/patches/12.3.0/910-mbsd_multi.patch diff --git a/devel/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch b/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch similarity index 100% rename from devel/gcc/patches/12.2.0/920-specs_nonfatal_getenv.patch rename to devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch diff --git a/devel/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/devel/gcc/patches/12.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch similarity index 100% rename from devel/gcc/patches/12.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch rename to devel/gcc/patches/12.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch diff --git a/devel/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch b/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch similarity index 100% rename from devel/gcc/patches/12.2.0/970-macos_arm64-building-fix.patch rename to devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch From 7a251bd3ff3d775d231bec390b8002f0c48096a6 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Fri, 12 May 2023 13:53:32 +0200 Subject: [PATCH 5/9] gcc: update to 12.3.0 Release notes: https://gcc.gnu.org/gcc-12/changes.html Refresh patches: - 230-musl_libssp.patch - 910-mbsd_multi.patch - 920-specs_nonfatal_getenv.patch - 970-macos_arm64-building-fix.patch Signed-off-by: Nick Hainke --- devel/gcc/Makefile | 4 ++-- devel/gcc/patches/12.3.0/230-musl_libssp.patch | 2 +- devel/gcc/patches/12.3.0/910-mbsd_multi.patch | 2 +- devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch | 2 +- devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/gcc/Makefile b/devel/gcc/Makefile index 934de788b..e45372e4f 100644 --- a/devel/gcc/Makefile +++ b/devel/gcc/Makefile @@ -46,8 +46,8 @@ ifeq ($(PKG_VERSION),11.3.0) PKG_HASH:=b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39 endif -ifeq ($(PKG_VERSION),12.2.0) - PKG_HASH:=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff +ifeq ($(PKG_VERSION),12.3.0) + PKG_HASH:=949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b endif PATCH_DIR=./patches/$(GCC_VERSION) diff --git a/devel/gcc/patches/12.3.0/230-musl_libssp.patch b/devel/gcc/patches/12.3.0/230-musl_libssp.patch index 3ce5e4958..a909d6387 100644 --- a/devel/gcc/patches/12.3.0/230-musl_libssp.patch +++ b/devel/gcc/patches/12.3.0/230-musl_libssp.patch @@ -1,6 +1,6 @@ --- a/gcc/gcc.cc +++ b/gcc/gcc.cc -@@ -985,7 +985,9 @@ proper position among the other output f +@@ -987,7 +987,9 @@ proper position among the other output f #endif #ifndef LINK_SSP_SPEC diff --git a/devel/gcc/patches/12.3.0/910-mbsd_multi.patch b/devel/gcc/patches/12.3.0/910-mbsd_multi.patch index 4033c5b23..0f75d0ce0 100644 --- a/devel/gcc/patches/12.3.0/910-mbsd_multi.patch +++ b/devel/gcc/patches/12.3.0/910-mbsd_multi.patch @@ -134,7 +134,7 @@ Date: Tue Jul 31 00:52:27 2007 +0000 @opindex Wno-stack-protector --- a/gcc/opts.cc +++ b/gcc/opts.cc -@@ -2692,6 +2692,9 @@ common_handle_option (struct gcc_options +@@ -2699,6 +2699,9 @@ common_handle_option (struct gcc_options add_comma_separated_to_vector (&opts->x_flag_ignored_attributes, arg); break; diff --git a/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch b/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch index 0f7d40b24..59bd35004 100644 --- a/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch +++ b/devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch @@ -7,7 +7,7 @@ Date: Sat Apr 21 03:02:39 2012 +0000 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc -@@ -10213,8 +10213,10 @@ getenv_spec_function (int argc, const ch +@@ -10186,8 +10186,10 @@ getenv_spec_function (int argc, const ch } if (!value) diff --git a/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch b/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch index 86fa68e1b..89730449f 100644 --- a/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch +++ b/devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch @@ -17,7 +17,7 @@ Date: Mon Aug 16 13:16:21 2021 +0100 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h -@@ -1290,7 +1290,7 @@ extern const char *aarch64_rewrite_mcpu +@@ -1293,7 +1293,7 @@ extern const char *aarch64_rewrite_mcpu #define MCPU_TO_MARCH_SPEC_FUNCTIONS \ { "rewrite_mcpu", aarch64_rewrite_mcpu }, From 4c9ab981e2702db66f6c4e31d5b2684d1f7e1a20 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 16 May 2023 15:57:08 +0000 Subject: [PATCH 6/9] frr: update to 8.5.1 branch also fixes gcc 13 compile Signed-off-by: Lucian Cristian --- net/frr/Makefile | 8 ++++---- net/frr/patches/997-reverse_python_test.patch | 2 +- net/frr/patches/999-thread_reverse.patch | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/frr/Makefile b/net/frr/Makefile index 0f9f7fba8..b985c1f40 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -7,15 +7,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frr -PKG_VERSION:=8.4.2 +PKG_VERSION:=8.5.1 PKG_RELEASE:=1 -PKG_SOURCE_DATE:=2023-02-17 +PKG_SOURCE_DATE:=2023-05-12 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz -PKG_SOURCE_VERSION:=410d78b7a4f2c8b4d4c3736c6d6cdb710287ca80 +PKG_SOURCE_VERSION:=05469ab2b553302c2a7032f4c89e4510dc3fa6d9 PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)? -PKG_HASH:=1334b050ea3d4144efeb7bdfe9c6976ebc91744810c5d8a7381a53fac2877ea9 +PKG_HASH:=caf3fcf1998ecd9a08e67373921a2d4bf49dbfc707008d20a1d38fd1606ef298 PKG_MAINTAINER:=Lucian Cristian PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) diff --git a/net/frr/patches/997-reverse_python_test.patch b/net/frr/patches/997-reverse_python_test.patch index 04a2884c0..8e454a456 100644 --- a/net/frr/patches/997-reverse_python_test.patch +++ b/net/frr/patches/997-reverse_python_test.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -835,7 +835,6 @@ fi +@@ -839,7 +839,6 @@ fi # AS_IF([test "$host" = "$build"], [ diff --git a/net/frr/patches/999-thread_reverse.patch b/net/frr/patches/999-thread_reverse.patch index e7bf99e38..0f5b24bf6 100644 --- a/net/frr/patches/999-thread_reverse.patch +++ b/net/frr/patches/999-thread_reverse.patch @@ -1,6 +1,6 @@ --- a/lib/thread.c +++ b/lib/thread.c -@@ -870,13 +870,9 @@ static void thread_free(struct thread_ma +@@ -868,13 +868,9 @@ static void thread_free(struct thread_ma XFREE(MTYPE_THREAD, thread); } @@ -16,7 +16,7 @@ /* * If timer_wait is null here, that means poll() should block * indefinitely, unless the thread_master has overridden it by setting -@@ -907,58 +903,15 @@ static int fd_poll(struct thread_master +@@ -905,58 +901,15 @@ static int fd_poll(struct thread_master rcu_assert_read_unlocked(); /* add poll pipe poker */ @@ -82,7 +82,7 @@ while (read(m->io_pipe[0], &trash, sizeof(trash)) > 0) ; -@@ -1768,7 +1721,7 @@ struct thread *thread_fetch(struct threa +@@ -1766,7 +1719,7 @@ struct thread *thread_fetch(struct threa struct timeval zerotime = {0, 0}; struct timeval tv; struct timeval *tw = NULL; @@ -91,7 +91,7 @@ int num = 0; do { -@@ -1844,14 +1797,14 @@ struct thread *thread_fetch(struct threa +@@ -1842,14 +1795,14 @@ struct thread *thread_fetch(struct threa pthread_mutex_unlock(&m->mtx); { From c64d6135bffecc1f891e9af52890eea2db8a11af Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 30 Apr 2023 13:01:55 +0200 Subject: [PATCH 7/9] arp-scan: update to 1.10.0 ieee-iab is removed, see: https://github.com/royhills/arp-scan/commit/2a56a066494cb67e1c932cc64e739b326ef9a272 Release Notes: https://github.com/royhills/arp-scan/releases/tag/1.10.0 Signed-off-by: Nick Hainke --- net/arp-scan/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/arp-scan/Makefile b/net/arp-scan/Makefile index 6419fbb99..853a4b117 100644 --- a/net/arp-scan/Makefile +++ b/net/arp-scan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arp-scan -PKG_VERSION:=1.9.8 +PKG_VERSION:=1.10.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/royhills/arp-scan/tar.gz/$(PKG_VERSION)? -PKG_HASH:=b9b75ceaef6348f5951b06c773ec7a243a9e780e160eafebc369f9c27f6a7d3f +PKG_HASH:=204b13487158b8e46bf6dd207757a52621148fdd1d2467ebd104de17493bab25 PKG_MAINTAINER:=Sergey Urushkin PKG_LICENSE:=GPL-3.0-or-later @@ -70,7 +70,6 @@ endef define Package/arp-scan-database/install $(INSTALL_DIR) $(1)/usr/share/arp-scan - $(INSTALL_DATA) $(PKG_BUILD_DIR)/ieee-iab.txt $(1)/usr/share/arp-scan/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/ieee-oui.txt $(1)/usr/share/arp-scan/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/mac-vendor.txt $(1)/usr/share/arp-scan/ endef From 342a2d4295915db484c745274d534e8e68741982 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 26 Apr 2023 09:09:37 +0200 Subject: [PATCH 8/9] tiff: update to 4.5.0 Release Notes: http://www.simplesystems.org/libtiff/releases/v4.5.0.html Remove upstreamed: - 010-CVE-2022-2519.patch - 020-CVE-2022-2520.patch Fixes: CVE-2022-2056, CVE-2022-2057, CVE-2022-2058, CVE-2022-3570, CVE-2022-3598, CVE-2022-3627, CVE-2022-3597, CVE-2022-3626, CVE-2022-3599, CVE-2022-34526 Signed-off-by: Nick Hainke --- libs/tiff/Makefile | 8 +- libs/tiff/patches/010-CVE-2022-2519.patch | 93 ----------------------- libs/tiff/patches/020-CVE-2022-2520.patch | 28 ------- 3 files changed, 4 insertions(+), 125 deletions(-) delete mode 100644 libs/tiff/patches/010-CVE-2022-2519.patch delete mode 100644 libs/tiff/patches/020-CVE-2022-2520.patch diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 39d705232..722f26203 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff -PKG_VERSION:=4.4.0 -PKG_RELEASE:=2 +PKG_VERSION:=4.5.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.osgeo.org/libtiff -PKG_HASH:=917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed +PKG_HASH:=c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=BSD-3-Clause @@ -34,7 +34,7 @@ $(call Package/tiff/Default) CATEGORY:=Libraries TITLE+= library DEPENDS:=+zlib +libjpeg - ABI_VERSION:=5 + ABI_VERSION:=6 endef define Package/tiff-utils diff --git a/libs/tiff/patches/010-CVE-2022-2519.patch b/libs/tiff/patches/010-CVE-2022-2519.patch deleted file mode 100644 index 6c61ed01b..000000000 --- a/libs/tiff/patches/010-CVE-2022-2519.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 8fe3735942ea1d90d8cef843b55b3efe8ab6feaf Mon Sep 17 00:00:00 2001 -From: Su_Laus -Date: Mon, 15 Aug 2022 22:11:03 +0200 -Subject: [PATCH] =?UTF-8?q?According=20to=20Richard=20Nolde=20https://gitl?= - =?UTF-8?q?ab.com/libtiff/libtiff/-/issues/401#note=5F877637400=20the=20ti?= - =?UTF-8?q?ffcrop=20option=20=E2=80=9E-S=E2=80=9C=20is=20also=20mutually?= - =?UTF-8?q?=20exclusive=20to=20the=20other=20crop=20options=20(-X|-Y),=20-?= - =?UTF-8?q?Z=20and=20-z.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is now checked and ends tiffcrop if those arguments are not mutually exclusive. - -This MR will fix the following tiffcrop issues: #349, #414, #422, #423, #424 ---- - tools/tiffcrop.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -108,12 +108,12 @@ - * lower level, scanline level routines. Debug reports a limited set - * of messages to monitor progress without enabling dump logs. - * -- * Note: The (-X|-Y), -Z and -z options are mutually exclusive. -+ * Note: The (-X|-Y), -Z, -z and -S options are mutually exclusive. - * In no case should the options be applied to a given selection successively. - */ - --static char tiffcrop_version_id[] = "2.5"; --static char tiffcrop_rev_date[] = "02-09-2022"; -+static char tiffcrop_version_id[] = "2.5.1"; -+static char tiffcrop_rev_date[] = "15-08-2022"; - - #include "tif_config.h" - #include "libport.h" -@@ -173,12 +173,12 @@ static char tiffcrop_rev_date[] = "02- - #define ROTATECW_270 32 - #define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270) - --#define CROP_NONE 0 --#define CROP_MARGINS 1 --#define CROP_WIDTH 2 --#define CROP_LENGTH 4 --#define CROP_ZONES 8 --#define CROP_REGIONS 16 -+#define CROP_NONE 0 /* "-S" -> Page_MODE_ROWSCOLS and page->rows/->cols != 0 */ -+#define CROP_MARGINS 1 /* "-m" */ -+#define CROP_WIDTH 2 /* "-X" */ -+#define CROP_LENGTH 4 /* "-Y" */ -+#define CROP_ZONES 8 /* "-Z" */ -+#define CROP_REGIONS 16 /* "-z" */ - #define CROP_ROTATE 32 - #define CROP_MIRROR 64 - #define CROP_INVERT 128 -@@ -316,7 +316,7 @@ struct crop_mask { - #define PAGE_MODE_RESOLUTION 1 - #define PAGE_MODE_PAPERSIZE 2 - #define PAGE_MODE_MARGINS 4 --#define PAGE_MODE_ROWSCOLS 8 -+#define PAGE_MODE_ROWSCOLS 8 /* for -S option */ - - #define INVERT_DATA_ONLY 10 - #define INVERT_DATA_AND_TAG 11 -@@ -781,7 +781,7 @@ static const char usage_info[] = - " The four debug/dump options are independent, though it makes little sense to\n" - " specify a dump file without specifying a detail level.\n" - "\n" --"Note: The (-X|-Y), -Z and -z options are mutually exclusive.\n" -+"Note: The (-X|-Y), -Z, -z and -S options are mutually exclusive.\n" - " In no case should the options be applied to a given selection successively.\n" - "\n" - ; -@@ -2131,13 +2131,14 @@ void process_command_opts (int argc, ch - /*NOTREACHED*/ - } - } -- /*-- Check for not allowed combinations (e.g. -X, -Y and -Z and -z are mutually exclusive) --*/ -- char XY, Z, R; -+ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ -+ char XY, Z, R, S; - XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); - Z = (crop_data->crop_mode & CROP_ZONES); - R = (crop_data->crop_mode & CROP_REGIONS); -- if ((XY && Z) || (XY && R) || (Z && R)) { -- TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z and -z are mutually exclusive.->Exit"); -+ S = (page->mode & PAGE_MODE_ROWSCOLS); -+ if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { -+ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); - exit(EXIT_FAILURE); - } - } /* end process_command_opts */ diff --git a/libs/tiff/patches/020-CVE-2022-2520.patch b/libs/tiff/patches/020-CVE-2022-2520.patch deleted file mode 100644 index 5cfa52e76..000000000 --- a/libs/tiff/patches/020-CVE-2022-2520.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bad48e90b410df32172006c7876da449ba62cdba Mon Sep 17 00:00:00 2001 -From: Su_Laus -Date: Sat, 20 Aug 2022 23:35:26 +0200 -Subject: [PATCH] tiffcrop -S option: Make decision simpler. - ---- - tools/tiffcrop.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -2133,11 +2133,11 @@ void process_command_opts (int argc, ch - } - /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ - char XY, Z, R, S; -- XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); -- Z = (crop_data->crop_mode & CROP_ZONES); -- R = (crop_data->crop_mode & CROP_REGIONS); -- S = (page->mode & PAGE_MODE_ROWSCOLS); -- if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { -+ XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)) ? 1 : 0; -+ Z = (crop_data->crop_mode & CROP_ZONES) ? 1 : 0; -+ R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0; -+ S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0; -+ if (XY + Z + R + S > 1) { - TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); - exit(EXIT_FAILURE); - } From 539a2f4478f7b654312d7bd470d564d7033b8881 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 26 Apr 2023 08:39:14 +0200 Subject: [PATCH 9/9] libpng: update to 1.6.39 Changelog: https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES Fixes CVE-2019-6129. Signed-off-by: Nick Hainke --- libs/libpng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index cd4aef7a7..767e4e960 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpng -PKG_VERSION:=1.6.38 +PKG_VERSION:=1.6.39 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/libpng -PKG_HASH:=b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be +PKG_HASH:=1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=Libpng GPL-2.0-or-later BSD-3-Clause