From 5f8895386e2892fe1284157efb7b31a1cc90244e Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sat, 9 Sep 2023 11:30:55 +0300 Subject: [PATCH 01/23] django: bump to version 4.2.5 Signed-off-by: Alexandru Ardelean (cherry picked from commit 331b5f75f4b4d5b71c6db9bd6658b6eeef01d891) --- 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 b518cf12db..62c2a1c01f 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.2.3 +PKG_VERSION:=4.2.5 PKG_RELEASE:=1 PYPI_NAME:=Django -PKG_HASH:=45a747e1c5b3d6df1b141b1481e193b033fd1fdbda3ff52677dc81afdaacbaed +PKG_HASH:=5e5c1c9548ffb7796b4a8a4782e9a2e5a3df3615259fc1bfd3ebc73b646146c1 PKG_MAINTAINER:=Alexandru Ardelean , Peter Stadler PKG_LICENSE:=BSD-3-Clause From 6526d607db81feb99bfa58e0be11e9b3a0c00cd9 Mon Sep 17 00:00:00 2001 From: Leo Douglas Date: Fri, 15 Sep 2023 10:32:57 +0800 Subject: [PATCH 02/23] iperf3: update to 3.15 see changelog: https://github.com/esnet/iperf/releases/tag/3.15. Signed-off-by: Leo Douglas (cherry picked from commit 8a223d4724d996db13bc8077035b27562b5e8fbd) --- net/iperf3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile index c7133bd569..dbe09c1e03 100644 --- a/net/iperf3/Makefile +++ b/net/iperf3/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf -PKG_VERSION:=3.13 +PKG_VERSION:=3.15 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf -PKG_HASH:=bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865 +PKG_HASH:=bdb77c11f72bce90214883159577fa24412013e62b2083cf5f54391d79b1d8ff PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause From 6d3ff6df7f477191ce5e1d011d9732a1177e1d1a Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 26 Sep 2023 22:46:55 +0000 Subject: [PATCH 03/23] adblock-fast: bugfix: better detect ABP lists * bugfix: better detect ABP lists * update Makefile with BUSYBOX features dependencies * update the type of dnsmasq_instance setting * add error message when file type can't be detected * add reporting when file type can't be detected * bugfix: include URL on errors related to URL processing/parsing * rename resolver function to resolver_config to better reflect its use Signed-off-by: Stan Grishin (cherry picked from commit cfe85fbde3cdce2ab05e9cd888ebb3713c42299f) --- net/adblock-fast/Makefile | 6 +- .../files/etc/config/adblock-fast | 2 +- .../files/etc/init.d/adblock-fast | 67 +++++++++++++------ 3 files changed, 51 insertions(+), 24 deletions(-) diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile index 317a3d1aae..72a3324ac0 100644 --- a/net/adblock-fast/Makefile +++ b/net/adblock-fast/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock-fast PKG_VERSION:=1.0.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later @@ -18,6 +18,10 @@ define Package/adblock-fast TITLE:=AdBlock Fast Service URL:=https://docs.openwrt.melmac.net/adblock-fast/ DEPENDS:=+jshn +curl + DEPENDS+=+!BUSYBOX_DEFAULT_AWK:gawk + DEPENDS+=+!BUSYBOX_DEFAULT_GREP:grep + DEPENDS+=+!BUSYBOX_DEFAULT_SED:sed + DEPENDS+=+!BUSYBOX_DEFAULT_SORT:coreutils-sort CONFLICTS:=simple-adblock PROVIDES:=simple-adblock PKGARCH:=all diff --git a/net/adblock-fast/files/etc/config/adblock-fast b/net/adblock-fast/files/etc/config/adblock-fast index 10cdf5186e..f459411f03 100644 --- a/net/adblock-fast/files/etc/config/adblock-fast +++ b/net/adblock-fast/files/etc/config/adblock-fast @@ -13,7 +13,7 @@ config adblock-fast 'config' option curl_retry '3' option debug '0' option dns 'dnsmasq.servers' - option dnsmasq_instance '*' + list dnsmasq_instance '*' # option dnsmasq_config_file_url 'https://big.oisd.nl/dnsmasq2' option download_timeout '10' option force_dns '1' diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast index 2a75e69383..6d0cade3f4 100755 --- a/net/adblock-fast/files/etc/init.d/adblock-fast +++ b/net/adblock-fast/files/etc/init.d/adblock-fast @@ -151,6 +151,7 @@ get_text() { errorParsingList) r="failed to parse";; errorNoSSLSupport) r="no HTTPS/SSL support on device";; errorCreatingDirectory) r="failed to create output/cache/gzip file directory";; + errorDetectingFileType) r="failed to detect format";; statusNoInstall) r="$serviceName is not installed or not found";; statusStopped) r="Stopped";; @@ -268,20 +269,35 @@ append_url() { fi } -detect_file_type() { - local file="$1" - if [ "$(head -1 "$file")" = '[Adblock Plus]' ]; then - echo 'adBlockPlus' - elif grep -q '^server=' "$file"; then - echo 'dnsmasqFile' - elif grep -q '^local=' "$file"; then - echo 'dnsmasq2File' - elif grep -q '^0.0.0.0' "$file" || grep -q '^127.0.0.1' "$file"; then - echo 'hosts' - else - echo 'domains' - fi -} + detect_file_type() { + local file="$1" + if [ "$(head -1 "$file")" = '[Adblock Plus]' ] || \ + grep -q '^||' "$file"; then + echo 'adBlockPlus' + elif grep -q '^server=' "$file"; then + echo 'dnsmasqFile' + elif grep -q '^local=' "$file"; then + echo 'dnsmasq2File' + elif grep -q '^0.0.0.0' "$file" || grep -q '^127.0.0.1' "$file"; then + echo 'hosts' + elif [ -n "$(sed "$domainsFilter" "$file" | head -1)" ]; then + echo 'domains' + fi + } +# detect_file_type() { +# local file="$1" +# if [ -n "$(sed "$adBlockPlusFilter" "$file" | head -1)" ]; then +# echo 'adBlockPlus' +# elif [ -n "$(sed "$dnsmasqFileFilter" "$file" | head -1)" ]; then +# echo 'dnsmasqFile' +# elif [ -n "$(sed "$dnsmasq2FileFilter" "$file" | head -1)" ]; then +# echo 'dnsmasq2File' +# elif [ -n "$(sed "$hostsFilter" "$file" | head -1)" ]; then +# echo 'hosts' +# elif [ -n "$(sed "$domainsFilter" "$file" | head -1)" ]; then +# echo 'domains' +# fi +# } load_environment() { local i j @@ -543,7 +559,7 @@ get_local_filesize() { echo -en "$size" } -resolver() { +resolver_config() { local cfg="$1" param="$2" case "$param" in dnsmasq.addnhosts) @@ -580,10 +596,10 @@ dns() { config_load 'dhcp' if [ "$dnsmasq_instance" = "*" ]; then - config_foreach resolver 'dnsmasq' "$dns" + config_foreach resolver_config 'dnsmasq' "$dns" elif [ -n "$dnsmasq_instance" ]; then for i in $dnsmasq_instance; do - resolver "@dnsmasq[$i]" "$dns" || resolver "$i" "$dns" + resolver_config "@dnsmasq[$i]" "$dns" || resolver_config "$i" "$dns" done fi @@ -849,16 +865,23 @@ process_file_url() { format="$(detect_file_type "$R_TMP")" case "$format" in adBlockPlus) filter="$adBlockPlusFilter";; -# dnsmasqFile) filter="$dnsmasqFileFilter";; -# dnsmasq2File) filter="$dnsmasq2FileFilter";; + dnsmasqFile) filter="$dnsmasqFileFilter";; + dnsmasq2File) filter="$dnsmasq2FileFilter";; domains) filter="$domainsFilter";; hosts) filter="$hostsFilter";; + *) + output 1 "$_FAIL_" + output 2 "[DL] $type $label $__FAIL__\\n" + echo "errorDetectingFileType|${url}" >> "$sharedMemoryError" + rm -f "$R_TMP" + return 0 + ;; esac - [ -n "$filter" ] && sed -i "$filter" "$R_TMP" + sed -i "$filter" "$R_TMP" if [ ! -s "$R_TMP" ]; then output 1 "$_FAIL_" output 2 "[DL] $type $label ($format) $__FAIL__\\n" - echo "errorParsingList|${1}" >> "$sharedMemoryError" + echo "errorParsingList|${url}" >> "$sharedMemoryError" else cat "${R_TMP}" >> "$D_TMP" output 1 "$_OK_" @@ -1596,7 +1619,7 @@ killcache() { rm -f "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" rm -f "$unboundCache" "$unboundGzip" config_load 'dhcp' - config_foreach resolver 'dnsmasq' 'cleanup' + config_foreach resolver_config 'dnsmasq' 'cleanup' uci_commit 'dhcp' return 0 } From 3ceb8b36603daef4d065ef121874677a346ef987 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 26 Sep 2023 18:58:11 +0200 Subject: [PATCH 04/23] tunneldigger: add group option to UCI config The group can be used for policy routing and similar purposes. Signed-off-by: Matthias Schiffer (cherry picked from commit 21dd77f6c48f5c59beee5dccc4aee9a2afa3e137) --- net/tunneldigger/files/tunneldigger.init | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init index ea37751d5d..bacaace816 100644 --- a/net/tunneldigger/files/tunneldigger.init +++ b/net/tunneldigger/files/tunneldigger.init @@ -21,6 +21,7 @@ parse_broker() { config_get limit_bw_down "$section" limit_bw_down config_get hook_script "$section" hook_script config_get bind_interface "$section" bind_interface + config_get group "$section" group [ $enabled -eq 0 ] && return @@ -53,6 +54,7 @@ parse_broker() { procd_append_param command -i "${interface}" procd_append_param command -t "${tunnel_id}" procd_append_param command ${broker_opts} + [ -n "$group" ] && procd_set_param group "$group" procd_set_param stdout 1 procd_set_param stderr 1 procd_set_param respawn From d5fb69c0244ecd726f77270a66e4cabd76577351 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 26 Sep 2023 20:14:57 +0200 Subject: [PATCH 05/23] tunneldigger: set PKG_SOURCE_DATE opkg requires monotonically increasing version numbers to know which version of a package is newer. As git commit IDs do not satisfy this condition, PKG_SOURCE_DATE must be set to the date of the referenced commit, resulting in the complete version number '2021-03-08-4f72b305-1'. As the source date also becomes part of the paths inside the download archive, the source hash must be updated as well. Signed-off-by: Matthias Schiffer (cherry picked from commit 0a3e5dd122abb92f215369eeb0a957114b61746f) --- net/tunneldigger/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile index 8cab922f06..f314bf2bfe 100644 --- a/net/tunneldigger/Makefile +++ b/net/tunneldigger/Makefile @@ -5,8 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/wlanslovenija/tunneldigger.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2021-03-08 PKG_SOURCE_VERSION:=4f72b30578ac3dbc5482f4a54054bf870355bdf5 -PKG_MIRROR_HASH:=babc71c757b757026f63e298bd4bd0edceae220827fff5cfad0af3f04ed529c7 +PKG_MIRROR_HASH:=f4f7bbb5782771c4f775f60a52a9ecf0636ce929d89688f671ee4eb6bedb9f91 PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=AGPL-3.0 From a7e0076acdf530b096f30a282d091ac2065de468 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 23 Sep 2023 18:10:30 +0200 Subject: [PATCH 06/23] openvswitch: disable groff manpage check The openvswitch build trips over a number of warnings during the manpage-check step if groff 1.23 is installed on the build host, resulting in a failed build. As this check is optional, and we don't even install the manpages, simply override the groff configure check to never detect groff. Signed-off-by: Matthias Schiffer (cherry picked from commit db34f33cc712ef2c6c4ca2f7ace1f428e83f316c) --- net/openvswitch/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 7f47c28226..43b8bfaf55 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -251,6 +251,7 @@ CONFIGURE_ARGS+= \ CONFIGURE_VARS += \ $(if $(CONFIG_OPENVSWITCH_WITH_LIBUNBOUND),,ac_cv_lib_unbound_ub_ctx_create=no) \ ovs_cv_flake8=no \ + ovs_cv_groff=no \ ovs_cv_python3=$(PYTHON3) \ ovs_cv_python3_host=$(HOST_PYTHON3_BIN) \ SPHINXBUILD=none \ From c6656a6289d1335a229e4ddf11efbd0a1350b5f7 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 17 Sep 2023 13:06:48 +0200 Subject: [PATCH 07/23] btrfs-progs: update to version 6.5.1 Release notes: https://github.com/kdave/btrfs-progs/releases/tag/v6.5.1 Signed-off-by: Josef Schlehofer (cherry picked from commit 16e484cad1d2e9686916c0cfcafd54cf3777378f) --- utils/btrfs-progs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index ce1eae5eb7..fa297fafa7 100644 --- a/utils/btrfs-progs/Makefile +++ b/utils/btrfs-progs/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btrfs-progs -PKG_VERSION:=6.3 +PKG_VERSION:=6.5.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs -PKG_HASH:=40a0bdff787ecb490e5533dbcefd4852176daf12aae5a1158203db43d8ad6a7d +PKG_HASH:=dacbb28136e82586af802205263a428c3d1941778bc3fdc9b1b386ea12eb904e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Karel Kočí From 29ae219a23ef75cc8b307e9b3f822f37b3ae25d4 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 15 Aug 2023 11:57:28 +0800 Subject: [PATCH 08/23] golang: Update to 1.21.0, remove patch Upstream has updated the Go compiler to not use gold when building for arm, and is waiting for a fix to binutils (released in 2.41) before doing the same for aarch64.[1] Based on the above, it does not appear that https://github.com/golang/go/pull/49748 will be merged. This removes the patch from that pull request. [1]: https://github.com/golang/go/issues/22040 Signed-off-by: Jeffery To (cherry picked from commit a80af7e44347c50c745967c17f20c89385f1ea08) --- lang/golang/golang-compiler.mk | 3 +- lang/golang/golang-package.mk | 3 +- lang/golang/golang-values.mk | 3 +- lang/golang/golang/Makefile | 9 ++-- ...-ARM-ARM64-only-if-gold-is-available.patch | 48 ------------------- 5 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch diff --git a/lang/golang/golang-compiler.mk b/lang/golang/golang-compiler.mk index 144f2a4af7..50cc449051 100644 --- a/lang/golang/golang-compiler.mk +++ b/lang/golang/golang-compiler.mk @@ -60,9 +60,10 @@ define GoCompiler/Default/Install/Bin $(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),api) + $(INSTALL_DATA) -p "$(1)/go.env" "$(2)/lib/go-$(3)/" $(INSTALL_DATA) -p "$(1)/VERSION" "$(2)/lib/go-$(3)/" - for file in AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS README.md SECURITY.md; do \ + for file in CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md; do \ if [ -f "$(1)/$$$$file" ]; then \ $(INSTALL_DATA) -p "$(1)/$$$$file" "$(2)/share/go-$(3)/" ; \ fi ; \ diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index 4f164c4c12..cc00505368 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -215,7 +215,8 @@ GO_PKG_BUILD_VARS= \ GOPATH="$(GO_PKG_BUILD_DIR)" \ GOCACHE="$(GO_BUILD_CACHE_DIR)" \ GOMODCACHE="$(GO_MOD_CACHE_DIR)" \ - GOENV=off + GOENV=off \ + GOTOOLCHAIN=local GO_PKG_VARS= \ $(GO_PKG_TARGET_VARS) \ diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index 469629b7e3..1584d22fc8 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -29,6 +29,7 @@ unexport \ GOOS \ GOPATH \ GOROOT \ + GOTOOLCHAIN \ GOTMPDIR \ GOWORK # Unmodified: @@ -219,7 +220,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \ \ aix_ppc64 \ \ - linux_ppc64le linux_riscv64 linux_s390x + linux_loong64 linux_ppc64le linux_riscv64 linux_s390x # From https://go.dev/src/cmd/go/internal/work/init.go go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm windows_arm64),,shared) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 0d89cea902..1022a64567 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk -GO_VERSION_MAJOR_MINOR:=1.20 -GO_VERSION_PATCH:=7 +GO_VERSION_MAJOR_MINOR:=1.21 +GO_VERSION_PATCH:=0 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597 +PKG_HASH:=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause @@ -62,6 +62,7 @@ HOST_GO_VALID_OS_ARCH:= \ \ aix_ppc64 \ js_wasm \ + wasip1_wasm \ \ freebsd_riscv64 \ \ @@ -296,7 +297,7 @@ $(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$( PKG_GO_ZBOOTSTRAP_MODS:= \ s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \ s/defaultGOAMD64 = `[^`]*`/defaultGOAMD64 = `$(or $(GO_AMD64),v1)`/; \ - s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),5)`/; \ + s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),7)`/; \ s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \ s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \ s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/; diff --git a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch b/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch deleted file mode 100644 index aecf5309f7..0000000000 --- a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5ccf9f47bf4f5ba53e0ab7338a7fd4626714cfb2 Mon Sep 17 00:00:00 2001 -From: Jeffery To -Date: Tue, 23 Nov 2021 15:05:37 +0800 -Subject: [PATCH] cmd/link: use gold on ARM/ARM64 only if gold is available - -COPY relocation handling on ARM/ARM64 has been fixed in recent versions -of the GNU linker. This switches to gold only if gold is available. - -Fixes #22040. ---- - src/cmd/link/internal/ld/lib.go | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - ---- a/src/cmd/link/internal/ld/lib.go -+++ b/src/cmd/link/internal/ld/lib.go -@@ -1548,25 +1548,20 @@ func (ctxt *Link) hostlink() { - } - - if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) && buildcfg.GOOS == "linux" { -- // On ARM, the GNU linker will generate COPY relocations -- // even with -znocopyreloc set. -+ // On ARM, older versions of the GNU linker will generate -+ // COPY relocations even with -znocopyreloc set. - // https://sourceware.org/bugzilla/show_bug.cgi?id=19962 - // -- // On ARM64, the GNU linker will fail instead of -- // generating COPY relocations. -+ // On ARM64, older versions of the GNU linker will fail -+ // instead of generating COPY relocations. - // -- // In both cases, switch to gold. -- altLinker = "gold" -- -- // If gold is not installed, gcc will silently switch -- // back to ld.bfd. So we parse the version information -- // and provide a useful error if gold is missing. -+ // In both cases, switch to gold if gold is available. - name, args := flagExtld[0], flagExtld[1:] - args = append(args, "-fuse-ld=gold", "-Wl,--version") - cmd := exec.Command(name, args...) - if out, err := cmd.CombinedOutput(); err == nil { -- if !bytes.Contains(out, []byte("GNU gold")) { -- log.Fatalf("ARM external linker must be gold (issue #15696), but is not: %s", out) -+ if bytes.Contains(out, []byte("GNU gold")) { -+ altLinker = "gold" - } - } - } From 41c5a695dddbcf3f5e1dfa4e489c26e9963a4b35 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 11 Sep 2023 03:57:45 +0800 Subject: [PATCH 09/23] golang: Update to 1.21.1 Includes fixes for: * CVE-2023-39318: html/template: improper handling of HTML-like comments within script contexts * CVE-2023-39319: html/template: improper handling of special tags within script contexts * CVE-2023-39320: cmd/go: go.mod toolchain directive allows arbitrary execution * CVE-2023-39321 and CVE-2023-39322: crypto/tls: panic when processing partial post-handshake message in QUICConn.HandleData Signed-off-by: Jeffery To (cherry picked from commit d9a999521ea3113f3c48b65d468917bf94f83821) --- lang/golang/golang/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 1022a64567..e91f346541 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.21 -GO_VERSION_PATCH:=0 +GO_VERSION_PATCH:=1 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a +PKG_HASH:=bfa36bf75e9a1e9cbbdb9abcf9d1707e479bd3a07880a8ae3564caee5711cb99 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From 76e87af99d8f43e8f730b07789e4f68e02c3ca10 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 20 Sep 2023 17:38:49 +0800 Subject: [PATCH 10/23] python-bidict: Update to 0.22.1 The package no longer has a build dependency on setuptools-scm. Signed-off-by: Jeffery To (cherry picked from commit 04344131087473289f0d9cfff0ffb196ac3376bd) --- lang/python/python-bidict/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lang/python/python-bidict/Makefile b/lang/python/python-bidict/Makefile index f95eb07e98..1e90deb040 100644 --- a/lang/python/python-bidict/Makefile +++ b/lang/python/python-bidict/Makefile @@ -8,18 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-bidict -PKG_VERSION:=0.21.2 -PKG_RELEASE:=2 +PKG_VERSION:=0.22.1 +PKG_RELEASE:=1 PYPI_NAME:=bidict -PKG_HASH:=4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09 +PKG_HASH:=1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MPL-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=python-setuptools-scm/host - include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk @@ -28,8 +26,8 @@ define Package/python3-bidict SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=The bidirectional mapping library - URL:=https://github.com/jab/bidict + TITLE:=Bidirectional mapping library + URL:=https://bidict.readthedocs.io/ DEPENDS:= \ +python3-light endef From 032b5506c778d1510e136dead078bd5d6a5a2152 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 20 Sep 2023 17:57:00 +0800 Subject: [PATCH 11/23] python3-networkx: Update to 3.1, rename source package This renames the source package to python-networkx to match other Python packages. This also updates the list of dependencies. Signed-off-by: Jeffery To (cherry picked from commit 77cebb0d0391e7f6f8594a4b046beac702124609) --- .../{python3-networkx => python-networkx}/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename lang/python/{python3-networkx => python-networkx}/Makefile (80%) diff --git a/lang/python/python3-networkx/Makefile b/lang/python/python-networkx/Makefile similarity index 80% rename from lang/python/python3-networkx/Makefile rename to lang/python/python-networkx/Makefile index e4d75305b7..d0ea86c3d6 100644 --- a/lang/python/python3-networkx/Makefile +++ b/lang/python/python-networkx/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=python3-networkx -PKG_VERSION:=2.8.8 +PKG_NAME:=python-networkx +PKG_VERSION:=3.1 PKG_RELEASE:=1 PYPI_NAME:=networkx -PKG_HASH:=230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e +PKG_HASH:=de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61 PKG_LICENSE:=BSD-3-clause PKG_LICENSE_FILES:=LICENSE.txt @@ -25,8 +25,8 @@ define Package/python3-networkx CATEGORY:=Languages SUBMENU:=Python TITLE:=Creating and manipulating graphs and networks - URL:=https://networkx.github.io/ - DEPENDS:=+python3-light +python3-decorator + URL:=https://networkx.org/ + DEPENDS:=+python3-light +python3-uuid +python3-xml endef define Package/python3-networkx/description From 5abeef2c3808ec6cba80689f5243bed23bef3e01 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 27 Sep 2023 16:27:44 +0200 Subject: [PATCH 12/23] apache: bump to release 2.4.57 Bump apache to release 2.4.57 and refresh patch automatically. Signed-off-by: Christian Marangi (cherry picked from commit 86f9af41c1cb8670e56be5d0fec8b64daf7c7499) --- net/apache/Makefile | 4 ++-- net/apache/patches/020-openssl-deprecated.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/apache/Makefile b/net/apache/Makefile index 9a6c881585..6b01b80292 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apache -PKG_VERSION:=2.4.52 +PKG_VERSION:=2.4.57 PKG_RELEASE:=1 PKG_SOURCE_NAME:=httpd PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/httpd/ -PKG_HASH:=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 +PKG_HASH:=dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) diff --git a/net/apache/patches/020-openssl-deprecated.patch b/net/apache/patches/020-openssl-deprecated.patch index c4f600fa85..94115840a6 100644 --- a/net/apache/patches/020-openssl-deprecated.patch +++ b/net/apache/patches/020-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c -@@ -1139,23 +1139,23 @@ const char *md_cert_get_serial_number(co +@@ -1194,23 +1194,23 @@ int md_certs_are_equal(const md_cert_t * int md_cert_is_valid_now(const md_cert_t *cert) { @@ -102,7 +102,7 @@ * when the user points at an explicit non-engine flavor of OpenSSL --- a/support/ab.c +++ b/support/ab.c -@@ -652,11 +652,11 @@ static void ssl_print_cert_info(BIO *bio +@@ -665,11 +665,11 @@ static void ssl_print_cert_info(BIO *bio BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); BIO_printf(bio,"Valid from: "); @@ -116,7 +116,7 @@ BIO_printf(bio,"\n"); pk = X509_get_pubkey(cert); -@@ -2634,8 +2634,10 @@ int main(int argc, const char * const ar +@@ -2647,8 +2647,10 @@ int main(int argc, const char * const ar CRYPTO_malloc_init(); #endif #endif From 45b2d3ecd506ee8d257fccc0a8fb71c1b598ecd7 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 27 Sep 2023 16:28:14 +0200 Subject: [PATCH 13/23] apache: move to PCRE2 Move apache to PCRE2 now that PCRE is flagged EOL and won't receive any security update. Signed-off-by: Christian Marangi (cherry picked from commit d14fe0c51c0be8d66772b83a165c7fb3c4850af0) --- net/apache/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/apache/Makefile b/net/apache/Makefile index 6b01b80292..5005a233dd 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -66,7 +66,7 @@ endef define Package/apache $(call Package/apache/Default) USERID:=apache=377:apache=377 - DEPENDS:=+libapr +libaprutil +libpcre + DEPENDS:=+libapr +libaprutil +libpcre2 endef define Package/apache/description @@ -201,7 +201,7 @@ CONFIGURE_ARGS+= \ --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-mpm=prefork \ - --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + --with-pcre="$(STAGING_DIR)/usr/bin/pcre2-config" \ --with-program-name=apache2 \ --with-ssl From 8d1cf768a75a62ab0e615e35aadebe919bc5dea3 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 4 Sep 2023 14:18:28 +0200 Subject: [PATCH 14/23] dnscrypt-proxy2: update to version 2.1.5 Fixes compilation with Go 1.21+. Signed-off-by: Josef Schlehofer (cherry picked from commit 536569ca62b125994b26e7cf02c981b338f82676) --- net/dnscrypt-proxy2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dnscrypt-proxy2/Makefile b/net/dnscrypt-proxy2/Makefile index 7a5d82b159..2c0286ed0c 100644 --- a/net/dnscrypt-proxy2/Makefile +++ b/net/dnscrypt-proxy2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnscrypt-proxy2 -PKG_VERSION:=2.1.4 +PKG_VERSION:=2.1.5 PKG_RELEASE:=1 PKG_SOURCE:=dnscrypt-proxy-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/DNSCrypt/dnscrypt-proxy/tar.gz/$(PKG_VERSION)? -PKG_HASH:=05f0a3e8c8f489caf95919e2a75a1ec4598edd3428d2b9dd357caba6adb2607d +PKG_HASH:=044c4db9a3c7bdcf886ff8f83c4b137d2fd37a65477a92bfe86bf69587ea7355 PKG_BUILD_DIR:=$(BUILD_DIR)/dnscrypt-proxy-$(PKG_VERSION) PKG_MAINTAINER:=Josef Schlehofer From 42e796f8a163a7a7cf9a3f8e94ba5be1f43a294a Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Fri, 21 Jul 2023 21:08:21 +0800 Subject: [PATCH 15/23] tailscale: Update to 1.48.0 Everything is working on pure upstream code. Patching is not longer needed. Added entire /etc/tailscale/ directory to conffiles for persistent ssh host key & https certificate across sysupgrades. Signed-off-by: Zephyr Lykos (cherry picked from commit 750faf5942088c430732533e162ea5d91b17579a) --- net/tailscale/Makefile | 30 ++--------- net/tailscale/patches/010-fake_iptables.patch | 53 ------------------- .../020-tailscaled_fake_iptables.patch | 32 ----------- .../030-default_to_netfilter_off.patch | 11 ---- 4 files changed, 4 insertions(+), 122 deletions(-) delete mode 100644 net/tailscale/patches/010-fake_iptables.patch delete mode 100644 net/tailscale/patches/020-tailscaled_fake_iptables.patch delete mode 100644 net/tailscale/patches/030-default_to_netfilter_off.patch diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index d07dc502d0..13a78ebdff 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.44.0 +PKG_VERSION:=1.48.0 PKG_RELEASE:=1 -PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=dc230cf3ac290140e573268a6e8f17124752ef064c8d3a86765a9dbb6f1bd354 +PKG_HASH:=a58f9a42d2d6c0eb0517f5e11f4b7f19892d999c8969c2ca148e4222089c85fc PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause @@ -63,29 +63,7 @@ Package/tailscaled/description:=$(Package/tailscale/description) define Package/tailscaled/conffiles /etc/config/tailscale -/etc/tailscale/tailscaled.state -endef - -GO_IPTABLES_VERSION:=0.6.0 -GO_IPTABLES_FILE:=$(PKG_NAME)-go-iptables-$(GO_IPTABLES_VERSION).tar.gz - -define Download/go-iptables - URL:=https://codeload.github.com/coreos/go-iptables/tar.gz/v$(GO_IPTABLES_VERSION)? - URL_FILE:=$(GO_IPTABLES_FILE) - FILE:=$(GO_IPTABLES_FILE) - HASH:=a784cc17fcb17879f073eae47bc4c2e899f59f6906dac5a0aa7a9cc9f95ea66d -endef - -define Build/Prepare - $(PKG_UNPACK) - [ ! -d ./src/ ] || $(CP) ./src/. $(PKG_BUILD_DIR) - $(eval $(call Download,go-iptables)) - ( \ - mkdir -p $(PKG_BUILD_DIR)/patched/ ; \ - gzip -dc $(DL_DIR)/$(GO_IPTABLES_FILE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/patched $(TAR_OPTIONS) ; \ - mv $(PKG_BUILD_DIR)/patched/go-iptables-$(GO_IPTABLES_VERSION) $(PKG_BUILD_DIR)/patched/go-iptables ; \ - ) - $(Build/Patch) +/etc/tailscale/ endef define Package/tailscale/install diff --git a/net/tailscale/patches/010-fake_iptables.patch b/net/tailscale/patches/010-fake_iptables.patch deleted file mode 100644 index ca7086ed8e..0000000000 --- a/net/tailscale/patches/010-fake_iptables.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -2,6 +2,8 @@ module tailscale.com - - go 1.20 - -+replace github.com/coreos/go-iptables => ./patched/go-iptables -+ - require ( - filippo.io/mkcert v1.4.4 - github.com/Microsoft/go-winio v0.6.1 ---- a/patched/go-iptables/iptables/iptables.go -+++ b/patched/go-iptables/iptables/iptables.go -@@ -149,12 +149,39 @@ func New(opts ...option) (*IPTables, err - return ipt, nil - } - -+func NewFake(opts ...option) (*IPTables, error) { -+ -+ ipt := &IPTables{ -+ path: "/bin/false", -+ proto: ProtocolIPv4, -+ hasCheck: false, -+ hasWait: false, -+ waitSupportSecond: false, -+ hasRandomFully: false, -+ v1: 0, -+ v2: 0, -+ v3: 0, -+ mode: "legacy", -+ timeout: 0, -+ } -+ -+ for _, opt := range opts { -+ opt(ipt) -+ } -+ -+ return ipt, nil -+} -+ - // New creates a new IPTables for the given proto. - // The proto will determine which command is used, either "iptables" or "ip6tables". - func NewWithProtocol(proto Protocol) (*IPTables, error) { - return New(IPFamily(proto), Timeout(0)) - } - -+func NewFakeWithProtocol(proto Protocol) (*IPTables, error) { -+ return NewFake(IPFamily(proto), Timeout(0)) -+} -+ - // Proto returns the protocol used by this IPTables. - func (ipt *IPTables) Proto() Protocol { - return ipt.proto diff --git a/net/tailscale/patches/020-tailscaled_fake_iptables.patch b/net/tailscale/patches/020-tailscaled_fake_iptables.patch deleted file mode 100644 index a4d54bdc6d..0000000000 --- a/net/tailscale/patches/020-tailscaled_fake_iptables.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/wgengine/router/router_linux.go -+++ b/wgengine/router/router_linux.go -@@ -129,7 +129,7 @@ func newUserspaceRouter(logf logger.Logf - - ipt4, err := iptables.NewWithProtocol(iptables.ProtocolIPv4) - if err != nil { -- return nil, err -+ ipt4, err = iptables.NewFakeWithProtocol(iptables.ProtocolIPv4) - } - - v6err := checkIPv6(logf) -@@ -148,7 +148,7 @@ func newUserspaceRouter(logf logger.Logf - // if unavailable. We want that to be a non-fatal error. - ipt6, err = iptables.NewWithProtocol(iptables.ProtocolIPv6) - if err != nil { -- return nil, err -+ ipt6, err = iptables.NewFakeWithProtocol(iptables.ProtocolIPv6) - } - } - -@@ -1676,11 +1676,6 @@ func checkIPv6(logf logger.Logf) error { - return fmt.Errorf("kernel doesn't support IPv6 policy routing: %w", err) - } - -- // Some distros ship ip6tables separately from iptables. -- if _, err := exec.LookPath("ip6tables"); err != nil { -- return err -- } -- - return nil - } - diff --git a/net/tailscale/patches/030-default_to_netfilter_off.patch b/net/tailscale/patches/030-default_to_netfilter_off.patch deleted file mode 100644 index 1edd002255..0000000000 --- a/net/tailscale/patches/030-default_to_netfilter_off.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmd/tailscale/cli/up.go -+++ b/cmd/tailscale/cli/up.go -@@ -147,7 +147,7 @@ func defaultNetfilterMode() string { - if distro.Get() == distro.Synology { - return "off" - } -- return "on" -+ return "off" - } - - type upArgsT struct { From e7ca549d6ee0eb44f8eb6303dfddd6bce09d639a Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Wed, 23 Aug 2023 17:55:55 +0800 Subject: [PATCH 16/23] tailscale: Update to 1.48.1 Signed-off-by: Zephyr Lykos (cherry picked from commit a9373d6dd1782807dafbad2bf6a2c8f30b252638) --- net/tailscale/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index 13a78ebdff..8cd236efb1 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.48.0 +PKG_VERSION:=1.48.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a58f9a42d2d6c0eb0517f5e11f4b7f19892d999c8969c2ca148e4222089c85fc +PKG_HASH:=6b3152cdd9ed915c01ce30f3967c0d4e04e2a81053eddeb93792d93088fe2d72 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From eced946bd28548eb9cc7db7a4fa6f1e21f70dd4a Mon Sep 17 00:00:00 2001 From: Tyler Young Date: Sun, 27 Aug 2023 20:58:10 -0400 Subject: [PATCH 17/23] tailscale: enable autodect of fw type Signed-off-by: Tyler Young (cherry picked from commit 40d5ba9378127a852b0b4735b02798be17e2e12c) --- net/tailscale/Makefile | 2 +- net/tailscale/files/tailscale.init | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index 8cd236efb1..48152ec908 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale PKG_VERSION:=1.48.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? diff --git a/net/tailscale/files/tailscale.init b/net/tailscale/files/tailscale.init index 6548fa2200..7d5f52134c 100644 --- a/net/tailscale/files/tailscale.init +++ b/net/tailscale/files/tailscale.init @@ -23,6 +23,9 @@ start_service() { procd_open_instance procd_set_param command /usr/sbin/tailscaled + # starting with v1.48.1 ENV variable is required to enable autodetection of iptables / nftables + procd_set_param env TS_DEBUG_FIREWALL_MODE=auto + # Set the port to listen on for incoming VPN packets. # Remote nodes will automatically be informed about the new port number, # but you might want to configure this in order to set external firewall From a75e1150f174633bd8cd362715eae0d50525ed98 Mon Sep 17 00:00:00 2001 From: Tyler Young Date: Wed, 20 Sep 2023 01:37:16 +0000 Subject: [PATCH 18/23] tailscale: update to version 1.48.2 Release notes: https://github.com/tailscale/tailscale/releases/tag/v1.48.2 Signed-off-by: Tyler Young (cherry picked from commit 992807ca35ce3a8ef3dae8f71d9b1e6dbe724e22) --- net/tailscale/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index 48152ec908..f9c7488c11 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.48.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.48.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6b3152cdd9ed915c01ce30f3967c0d4e04e2a81053eddeb93792d93088fe2d72 +PKG_HASH:=1c34c5c2c3b78e59ffb824b356418ff828653c62885b126d0d05f300218b36b5 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From 131a04320108ce74861f7b0520ca6f86870d78ad Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Tue, 26 Sep 2023 19:46:01 +0800 Subject: [PATCH 19/23] tailscale: Update to 1.50.0 Signed-off-by: Zephyr Lykos (cherry picked from commit eeb1e0f057ea9463a99aa3f49cbd64ce69906713) --- net/tailscale/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index f9c7488c11..64360168a2 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.48.2 +PKG_VERSION:=1.50.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=1c34c5c2c3b78e59ffb824b356418ff828653c62885b126d0d05f300218b36b5 +PKG_HASH:=a7e024577854c07b793c4bbd81a497250e6a1b4536e303351a388810f13b7316 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From 133bddb2a92b4d1740e029c5c653b9f341b4d17f Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Thu, 17 Aug 2023 11:31:36 +0800 Subject: [PATCH 20/23] syncthing: update to 1.23.7 Signed-off-by: Van Waholtz (cherry picked from commit 0449b0f3949e720c7484df5e0569b6ff518e5898) --- utils/syncthing/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index be1d983727..50abb68d0e 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.23.2 +PKG_VERSION:=1.23.7 PKG_RELEASE:=1 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=3d0eca0e6f4eaaeba4879918b3f54f47d59fb5f4288a83af821d509271ada189 +PKG_HASH:=18d8dd74d8077f500a139752261b78217ef0b0a912a7c017192097a7196e21a1 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) From 5f79076fb647f9610f7d2cee58a0b808c5951423 Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Thu, 17 Aug 2023 11:31:36 +0800 Subject: [PATCH 21/23] syncthing: disable quic to support GO 1.21 Signed-off-by: Van Waholtz (cherry picked from commit 23113ceb97dbc1ad5d3caba83b72dbb1d0a69a37) --- utils/syncthing/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 50abb68d0e..1696a01cdd 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -26,13 +26,13 @@ GO_PKG_BUILD_PKG:=\ $(if $(CONFIG_PACKAGE_strelaysrv),$(GO_PKG)/cmd/strelaysrv/) GO_PKG_INSTALL_EXTRA:=^gui/ +GO_PKG_TAGS:=noupgrade,noquic GO_PKG_LDFLAGS_X:=\ $(GO_PKG)/lib/build.Version=v$(PKG_VERSION) \ $(GO_PKG)/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ $(GO_PKG)/lib/build.User=openwrt \ $(GO_PKG)/lib/build.Host=openwrt \ - $(GO_PKG)/lib/build.Tags=noupgrade -GO_PKG_TAGS:=noupgrade + $(GO_PKG)/lib/build.Tags=$(GO_PKG_TAGS) include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk From 13bd4642880c8d163334ad0637c0b40c08361750 Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Tue, 5 Sep 2023 23:13:03 +0800 Subject: [PATCH 22/23] syncthing: update to 1.24.0 This package can be built with Go 1.21 and QUIC can be enabled. Signed-off-by: Van Waholtz (cherry picked from commit 86522d77f1ccf7ed80ef556e0d6621efbd190275) --- utils/syncthing/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 1696a01cdd..e8b744a463 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.23.7 +PKG_VERSION:=1.24.0 PKG_RELEASE:=1 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=18d8dd74d8077f500a139752261b78217ef0b0a912a7c017192097a7196e21a1 +PKG_HASH:=4a9459667f9b70a7d1e7d572c7c9d02431ef8f055679eef368300ce1a826608f PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) @@ -26,7 +26,7 @@ GO_PKG_BUILD_PKG:=\ $(if $(CONFIG_PACKAGE_strelaysrv),$(GO_PKG)/cmd/strelaysrv/) GO_PKG_INSTALL_EXTRA:=^gui/ -GO_PKG_TAGS:=noupgrade,noquic +GO_PKG_TAGS:=noupgrade GO_PKG_LDFLAGS_X:=\ $(GO_PKG)/lib/build.Version=v$(PKG_VERSION) \ $(GO_PKG)/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ From 1542103dd39adc03e6f08e892e6d1476068a06bb Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 19 Aug 2023 11:52:35 +0300 Subject: [PATCH 23/23] adguardhome: update to v0.107.36 * Full changelog available at: * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.34 * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.35 * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.36 Signed-off-by: Hannu Nyman [ Reword commit message ] Signed-off-by: Dobroslaw Kijowski (cherry picked from commit d4fa3d0a1aa242c0aed5a5292335fe9d9ac42a31) --- net/adguardhome/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index a2622d17d1..ada453c856 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.33 +PKG_VERSION:=0.107.36 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=924c549a924b66d087d82b6c1402e4928ef176a9f742f3482cb92156956ee1fd +PKG_MIRROR_HASH:=6f32717df3654432d0c50ee730f0eef3ec806a966508f5cd82899077f1e086c8 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt