From 4d25a44d5c905ad0c49e736c479641e3df077111 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Mon, 6 Mar 2023 12:14:14 +0000 Subject: [PATCH 01/18] curl: enable unix sockets by default - changed Config.in to enable unix sockets support by default - release number bumped Description: socket support is very handy when communicating with various REST APIs. Size increases are very small, nearly unnoticiable. Tested-by: Stan Grishin Signed-off-by: Oskari Rauta --- net/curl/Config.in | 2 +- net/curl/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/curl/Config.in b/net/curl/Config.in index 5e7e554d7..24b7b9627 100644 --- a/net/curl/Config.in +++ b/net/curl/Config.in @@ -139,7 +139,7 @@ config LIBCURL_ZSTD config LIBCURL_UNIX_SOCKETS bool "Enable unix domain socket support" - default n + default y help Enable HTTP over unix domain sockets. To use this with the curl command line, you specify the socket path to the new --unix-domain option. diff --git a/net/curl/Makefile b/net/curl/Makefile index 94dd07ff6..0864d5143 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/nls.mk PKG_NAME:=curl PKG_VERSION:=7.88.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \ From 1ccfc029401b93755a4528e454ded9b7db34d960 Mon Sep 17 00:00:00 2001 From: Alexandros Kosiaris Date: Thu, 23 Mar 2023 12:02:07 +0200 Subject: [PATCH 02/18] collectd: Fix ltq-dsl compilation errors Per https://github.com/openwrt/packages/pull/19396#issuecomment-1480780893 prefix ltq-dsl-app with a @ character to fix the compilation issues witnessed in PR #19396 and #20662 Signed-off-by: Alexandros Kosiaris --- utils/collectd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index c3d2b8b6b..270d93d7f 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -528,4 +528,4 @@ $(eval $(call BuildPlugin,write-graphite,Carbon/Graphite output,write_graphite,+ $(eval $(call BuildPlugin,write-http,HTTP POST output,write_http,+PACKAGE_collectd-mod-write-http:libcurl)) $(eval $(call BuildScriptPlugin,sqm,SQM/qdisc collection,sqm_collectd,+PACKAGE_collectd-mod-sqm:collectd-mod-exec)) -$(eval $(call BuildScriptLuaPlugin,ltq-dsl,Lantiq DSL collection,dsl,ltq-dsl-app +PACKAGE_collectd-mod-ltq-dsl:collectd-mod-lua +libubus-lua)) +$(eval $(call BuildScriptLuaPlugin,ltq-dsl,Lantiq DSL collection,dsl,@ltq-dsl-app +PACKAGE_collectd-mod-ltq-dsl:collectd-mod-lua +libubus-lua)) From 2d9e475444a12240013c68dcfbf89776bdab5c4f Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 23 Mar 2023 08:39:50 +0200 Subject: [PATCH 03/18] sudo: bump to verison 1.9.13p3 Signed-off-by: Alexandru Ardelean --- admin/sudo/Makefile | 4 ++-- admin/sudo/patches/020-no-owner-change.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index fbb6adcc0..9b90d1fc5 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo -PKG_VERSION:=1.9.12p2 +PKG_VERSION:=1.9.13p3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.sudo.ws/dist -PKG_HASH:=b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539 +PKG_HASH:=92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b PKG_MAINTAINER:=Alexandru Ardelean diff --git a/admin/sudo/patches/020-no-owner-change.patch b/admin/sudo/patches/020-no-owner-change.patch index 31184469b..1dbc0a251 100644 --- a/admin/sudo/patches/020-no-owner-change.patch +++ b/admin/sudo/patches/020-no-owner-change.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -75,7 +75,7 @@ GREP = @GREP@ +@@ -73,7 +73,7 @@ EGREP = @EGREP@ SED = @SED@ INSTALL = $(SHELL) $(scriptdir)/install-sh -c From a65c7f06e752603033cb81420403f280fc3abaea Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 22 Mar 2023 00:15:22 +0800 Subject: [PATCH 04/18] syncthing: Update to 1.23.2 Fixed build with go 1.20 Signed-off-by: Tianling Shen --- utils/syncthing/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 9feb2e93c..ecd21ad7d 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.23.0 +PKG_VERSION:=1.23.2 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:=0f66d3dd2a7915a6f3ca6773c1dc02345444b2644a533211ce1ee57b371ae458 +PKG_HASH:=3d0eca0e6f4eaaeba4879918b3f54f47d59fb5f4288a83af821d509271ada189 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) From ed06075ff60e0cff69a60824081d83fd8133ae95 Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Sun, 26 Mar 2023 11:23:32 +0200 Subject: [PATCH 05/18] haproxy: update to v2.6.11 - Update haproxy PKG_VERSION and PKG_HASH - This release includes a fix for an OOB write. The official notes do not list a CVE entry but I guess there is a chance for security implications - See changes: http://git.haproxy.org/?p=haproxy-2.6.git;a=shortlog Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 4 ++-- net/haproxy/get-latest-patches.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index f45cfcda6..f1ca348cf 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.6.10 +PKG_VERSION:=2.6.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=e71b2cd9ca1043345f083a5225078ccf824dced2b5779d86f11fa4e88f451773 +PKG_HASH:=e0bc430ac407747b077bc88ee6922b4616fa55a9e0f3ec84438dfb055eb9a715 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index a082c690d..3ba8f872e 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.6.git -BASE_TAG=v2.6.10 +BASE_TAG=v2.6.11 TMP_REPODIR=tmprepo PATCHESDIR=patches From 8cd08e15fe5d342e0561dc44ab89bc73f4d09d57 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 26 Mar 2023 15:04:35 +0300 Subject: [PATCH 06/18] xz: update to version 5.4.2 Update to 5.4.2 (keep in sync with xz in tools/) Signed-off-by: Hannu Nyman --- utils/xz/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/xz/Makefile b/utils/xz/Makefile index fe989b798..3d26b1f52 100644 --- a/utils/xz/Makefile +++ b/utils/xz/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz -PKG_VERSION:=5.4.1 +PKG_VERSION:=5.4.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/lzmautils -PKG_HASH:=dd172acb53867a68012f94c17389401b2f274a1aa5ae8f84cbfb8b7e383ea8d3 +PKG_HASH:=aa49909cbd9028c4666a35fa4975f9a6203ed98154fbb8223ee43ef9ceee97c3 PKG_MAINTAINER:= PKG_LICENSE:=Public-Domain LGPL-2.1-or-later GPL-2.0-or-later GPL-3.0-or-later From 1ac880fb12264144aedcb756ba0763626598a25a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 27 Mar 2023 03:34:06 +0800 Subject: [PATCH 07/18] dnsproxy: Update to 0.48.2 Signed-off-by: Tianling Shen --- net/dnsproxy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index dc3e07ea1..3ff8f834a 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.48.1 +PKG_VERSION:=0.48.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=c671c69879e1a76d7a079a311c6eeb10abc5471277ecaecf3ef8666b057f7a57 +PKG_HASH:=fd385b3414e616aef5d96b7b007d5fc4fd21b73d6bc097811508e9ddb9b3f4cb PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 From 275eb110bb1951e965cdb8daca090b970fe6e35c Mon Sep 17 00:00:00 2001 From: Andrew Sim Date: Wed, 22 Mar 2023 08:20:14 +0100 Subject: [PATCH 08/18] samba4: update to 4.18.0 Samba release history: https://www.samba.org/samba/history/samba-4.18.0.html Signed-off-by: Andrew Sim --- net/samba4/Makefile | 4 +-- ...mba-4-11-fix-host-tools-checks.patch.patch | 27 ------------------- .../021-source4-msgsock-nvram-fix.patch | 2 +- .../102-samba-4.11-unbundle-libbsd.patch | 8 +++--- 4 files changed, 7 insertions(+), 34 deletions(-) diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 6ed983a2d..ee1ac2620 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba -PKG_VERSION:=4.17.5 +PKG_VERSION:=4.18.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -13,7 +13,7 @@ PKG_SOURCE_URL:= \ http://www.nic.funet.fi/index/samba/pub/samba/stable/ \ http://samba.mirror.bit.nl/samba/ftp/stable/ \ https://download.samba.org/pub/samba/stable/ -PKG_HASH:=ebb7880d474ffc09d73b5fc77bcbd657f6235910337331a9c24d7f69ca11442b +PKG_HASH:=70348656ef807be9c8be4465ca157cef4d99818e234253d2c684cc18b8408149 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=COPYING diff --git a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch index 5c5c52db8..4f06db369 100644 --- a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch +++ b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch @@ -15,30 +15,3 @@ + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, funct - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -86,9 +78,6 @@ finally: - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) diff --git a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch index db846b904..2bd1e79c6 100644 --- a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch +++ b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch @@ -1,6 +1,6 @@ --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c -@@ -525,7 +525,7 @@ static struct imessaging_context *imessa +@@ -526,7 +526,7 @@ static struct imessaging_context *imessa goto fail; } diff --git a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch index f5a6924df..766fefc52 100644 --- a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch +++ b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch @@ -1,6 +1,6 @@ --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -436,22 +436,13 @@ def configure(conf): +@@ -434,22 +434,13 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -29,7 +29,7 @@ conf.CHECK_CODE(''' struct ucred cred; -@@ -834,9 +825,6 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL +@@ -832,9 +823,6 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: @@ -39,7 +39,7 @@ if conf.CHECK_CODE(''' #define %s 1 #define NO_CONFIG_H 1 -@@ -849,7 +837,7 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL +@@ -847,7 +835,7 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL #include "tests/getifaddrs.c" ''' % method, method, @@ -48,7 +48,7 @@ addmain=False, execute=True): break -@@ -897,7 +885,6 @@ def build(bld): +@@ -895,7 +883,6 @@ def build(bld): break extra_libs = '' From 6b1df72e64628dbeb68a2b5fd2cfb68db87a2d2f Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 26 Mar 2023 22:52:05 +0200 Subject: [PATCH 09/18] banip: update to 0.8.2-4 * fixed a race condition if the service is in a disabled state Signed-off-by: Dirk Brenken --- net/banip/Makefile | 2 +- net/banip/files/banip-functions.sh | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/net/banip/Makefile b/net/banip/Makefile index 9983e08b0..ca8b5fa37 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip PKG_VERSION:=0.8.2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh index 692a9bd49..fc3c73225 100644 --- a/net/banip/files/banip-functions.sh +++ b/net/banip/files/banip-functions.sh @@ -168,9 +168,15 @@ f_log() { fi fi if [ "${class}" = "err" ]; then - f_genstatus "error" - [ "${ban_mailnotification}" = "1" ] && [ -n "${ban_mailreceiver}" ] && [ -x "${ban_mailcmd}" ] && f_mail + "${ban_nftcmd}" delete table inet banIP >/dev/null 2>&1 + if [ "${ban_enabled}" = "1" ]; then + f_genstatus "error" + [ "${ban_mailnotification}" = "1" ] && [ -n "${ban_mailreceiver}" ] && [ -x "${ban_mailcmd}" ] && f_mail + else + f_genstatus "disabled" + fi f_rmdir "${ban_tmpdir}" + f_rmpid rm -rf "${ban_lock}" exit 1 fi @@ -859,7 +865,6 @@ f_genstatus() { fi runtime="action: ${ban_action:-"-"}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")" fi - f_system [ ${ban_splitsize:-"0"} -gt "0" ] && split="1" : >"${ban_rtfile}" @@ -1034,7 +1039,6 @@ f_report() { local detail set_details jsnval timestamp autoadd_allow autoadd_block sum_sets sum_setinput sum_setforwardwan sum_setforwardlan sum_setelements sum_cntinput sum_cntforwardwan sum_cntforwardlan [ -z "${ban_dev}" ] && f_conf - f_system f_mkdir "${ban_reportdir}" report_jsn="${ban_reportdir}/ban_report.jsn" report_txt="${ban_reportdir}/ban_report.txt" @@ -1196,9 +1200,6 @@ f_report() { f_search() { local table_sets ip proto run_search search="${1}" - f_system - run_search="/var/run/banIP.search" - if [ -n "${search}" ]; then ip="$(printf "%s" "${search}" | "${ban_awkcmd}" 'BEGIN{RS="(([0-9]{1,3}\\.){3}[0-9]{1,3})+"}{printf "%s",RT}')" [ -n "${ip}" ] && proto="v4" @@ -1217,6 +1218,7 @@ f_search() { printf "%s\n" " Looking for IP '${ip}' on $(date "+%Y-%m-%d %H:%M:%S")" printf "%s\n" " ---" cnt="1" + run_search="/var/run/banIP.search" for set in ${table_sets}; do ( if "${ban_nftcmd}" get element inet banIP "${set}" "{ ${ip} }" >/dev/null 2>&1; then @@ -1241,7 +1243,6 @@ f_search() { f_survey() { local set_elements set="${1}" - f_system [ -n "${set}" ] && set_elements="$("${ban_nftcmd}" -j list set inet banIP "${set}" 2>/dev/null | jsonfilter -qe '@.nftables[*].set.elem[*]')" if [ -z "${set}" ] || [ -z "${set_elements}" ]; then @@ -1279,6 +1280,7 @@ f_mail() { # check banIP availability and initial sourcing # +f_system if [ "${ban_action}" != "stop" ]; then if [ -r "/lib/functions.sh" ] && [ -r "/lib/functions/network.sh" ] && [ -r "/usr/share/libubox/jshn.sh" ]; then . "/lib/functions.sh" From 1f25be97b6c73691ec5a00a9deb9a7456e59be8c Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 7 Feb 2023 23:34:10 +0100 Subject: [PATCH 10/18] borgbackup: add missing dependencies The initial package submission was missing some required and optional dependencies due to lack of testing on a system without any python related packages pre-installed. Some optional but highly recommended dependencies were discovered with the stdlib module as described in: https://github.com/openwrt/packages/blob/392a68e24774294590abf9c08ea1832f2cee190d/lang/python/README.md Fixes #20441 Signed-off-by: Julien Malik --- lang/python/borgbackup/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lang/python/borgbackup/Makefile b/lang/python/borgbackup/Makefile index 0637d1b0b..09bf915af 100644 --- a/lang/python/borgbackup/Makefile +++ b/lang/python/borgbackup/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2022 Julien Malik +# Copyright (C) 2023 Julien Malik # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=borgbackup PKG_VERSION:=1.2.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=borgbackup PKG_HASH:=e32418f8633c96fa9681352a56eb63b98e294203472c114a5242709d36966785 @@ -22,6 +22,7 @@ include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk +# see #20462 and #12942: email and urllib shall come with python3-light define Package/borgbackup SECTION:=lang CATEGORY:=Languages @@ -30,8 +31,17 @@ define Package/borgbackup URL:=https://github.com/borgbackup/borg DEPENDS:= \ +python3-light \ + +python3-codecs \ + +python3-email \ + +python3-logging \ + +python3-lzma \ +python3-msgpack \ + +python3-packaging \ +python3-pyfuse3 \ + +python3-readline \ + +python3-unittest \ + +python3-urllib \ + +python3-uuid \ +libacl \ +libopenssl \ +liblz4 \ From 45a3afbfb771f43c39051916c6e920482d25fd09 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Sun, 26 Mar 2023 22:55:00 +0200 Subject: [PATCH 11/18] borgbackup: bump to 1.2.4 Signed-off-by: Julien Malik --- lang/python/borgbackup/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/borgbackup/Makefile b/lang/python/borgbackup/Makefile index 09bf915af..9a825a370 100644 --- a/lang/python/borgbackup/Makefile +++ b/lang/python/borgbackup/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=borgbackup -PKG_VERSION:=1.2.3 -PKG_RELEASE:=2 +PKG_VERSION:=1.2.4 +PKG_RELEASE:=1 PYPI_NAME:=borgbackup -PKG_HASH:=e32418f8633c96fa9681352a56eb63b98e294203472c114a5242709d36966785 +PKG_HASH:=a4bd54e9469e81b7a30a6711423115abc818d9cd844ecb1ca0e6104bc5374da8 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE From 6a6a25523e35403b7b61c7e4cdf8464fd7b87e01 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Sun, 26 Mar 2023 20:10:39 +0200 Subject: [PATCH 12/18] docker-compose: Update to version 2.17.2 Signed-off-by: Javier Marcet --- utils/docker-compose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 34ff2e08a..b172870e0 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.16.0 +PKG_VERSION:=2.17.2 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=556dc59075280442128f5b45a8ff37638fb357c2a956bd751dd0ba747c93e71d +PKG_HASH:=d6e6de858ecdb0104991c86c66dde5dd4fb6a1160d707308d8ad3167450c8094 PKG_MAINTAINER:=Javier Marcet From 12f8ebc4b1adf63989c366c36509b54da59ba426 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 26 Mar 2023 20:10:55 +0300 Subject: [PATCH 13/18] netbird: update to 0.14.5 Release Notes Management - Introduce a new ACL engine based on Rego (Open Policy Agent) for firewall control - Personal access tokens generation as a first iteration toward public API release - Add Keycloak support as an IDP manager Agent - Introduce a Firewall interface to apply granular access control (e.g., connection direction, port, or protocol level) - Make the agent run on Android (mobile support) Changelog - Feat rego default policy - Don't drop Rules from file storage after migration to Policies - Add version info command to signal server - Feat firewall controller interface - Adding Personal Access Token generation - Exchange proxy mode via signal - Fix connstate indication - Mobile - PAT persistence - Add Keycloak Idp Manager - Adjustments for the change server flow - Disable peer expiration of peers added with setup keys - Add JWT middleware validation failure log Signed-off-by: Oskari Rauta --- net/netbird/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netbird/Makefile b/net/netbird/Makefile index d5a628bb7..44defd354 100644 --- a/net/netbird/Makefile +++ b/net/netbird/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netbird -PKG_VERSION:=0.14.4 +PKG_VERSION:=0.14.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7cfad70cd0fecc2d0f7bf68a03efe05e5f6e1a3627998169dc07b7c9f8e3b8d2 +PKG_HASH:=2ea6be9c50a5ac241fbae35934c9c710697de39e8a0393f8e1800285a7904d0d PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=BSD-3-Clause From e2cf4fa9a119076d23f26e3803247b5d83c71547 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 27 Mar 2023 19:43:11 +0800 Subject: [PATCH 14/18] yq: Update to 4.33.1 Signed-off-by: Tianling Shen --- utils/yq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/yq/Makefile b/utils/yq/Makefile index 67005c08e..66637965e 100644 --- a/utils/yq/Makefile +++ b/utils/yq/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yq -PKG_VERSION:=4.32.2 +PKG_VERSION:=4.33.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=769b77a01fe8c389b17b3a5eb606a395540eb7ccdc533e2db2542baeceefcbc9 +PKG_HASH:=c38b8210fb5a80ac88314fa346ea31f3dc9324cae9fe93cb334cacf909e09bc3 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT From fc73886b456e0b9ccadf155231bced63106e73fe Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Mon, 27 Mar 2023 18:19:54 +0800 Subject: [PATCH 15/18] sing-box: update to 1.2.1 Changelogs: https://github.com/SagerNet/sing-box/releases/tag/v1.2.1 Signed-off-by: Van Waholtz --- net/sing-box/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile index 9150c06c5..15d4368f6 100644 --- a/net/sing-box/Makefile +++ b/net/sing-box/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=ec70c2eecf85788e82c29ec4ca129e25292d5fc66a510b4b713fe337650740a9 +PKG_HASH:=0f304b75c2e9f61e3f7808f23fe8fbe08161553475d9bec0dea4a5acf4452d2d PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE From feccbf86124724d30e2e95773c4defb01b6b5732 Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Wed, 22 Mar 2023 21:51:35 +0800 Subject: [PATCH 16/18] natmap: update to 20230322 Signed-off-by: Ray Wang --- net/natmap/Makefile | 4 ++-- net/natmap/files/natmap.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/natmap/Makefile b/net/natmap/Makefile index 4f79967ac..7c70475b3 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natmap -PKG_VERSION:=20221225 +PKG_VERSION:=20230322 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) -PKG_HASH:=cc19a5b876fd75424619ae90aa6b0414a438c1f6f55537b9b28f1c23d925f6ff +PKG_HASH:=d1abe36eb4deac725e2d20674590fc726b8c79d21b053b40059b093592fd8b8a PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=MIT diff --git a/net/natmap/files/natmap.config b/net/natmap/files/natmap.config index 01328c1bb..6e8862b33 100644 --- a/net/natmap/files/natmap.config +++ b/net/natmap/files/natmap.config @@ -4,7 +4,7 @@ config natmap option udp_mode '1' option interface '' option interval '' - option stun_server 'stun.stunprotocol.org' + option stun_server 'stunserver.stunprotocol.org' option http_server 'example.com' option port '8080' option forward_target '' From 31dca7668864103da6fffba4c599843dcb5ff1ef Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 26 Mar 2023 08:50:28 +0300 Subject: [PATCH 17/18] gummiboot: update to 48.1 - disable man pages generation Mostly bug fixes. Full list of changes: https://cgit.freedesktop.org/gummiboot/log/ Signed-off-by: Oskari Rauta --- utils/gummiboot/Makefile | 15 +-- .../015-gummiboot-aarch64-support.patch | 121 ++++++++++++++++++ 2 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 utils/gummiboot/patches/015-gummiboot-aarch64-support.patch diff --git a/utils/gummiboot/Makefile b/utils/gummiboot/Makefile index 3e2037d2c..b1e6d052e 100644 --- a/utils/gummiboot/Makefile +++ b/utils/gummiboot/Makefile @@ -6,14 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gummiboot -PKG_VERSION:=45 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=48.1 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/rzr/gummiboot.git -PKG_SOURCE_DATE:=2021-04-11 -PKG_SOURCE_VERSION:=eb3daf2ca4cb1657cf1f780957485d690a552bf6 -PKG_MIRROR_HASH:=4c57791693b57bbe36e85b49d70310728b8008c4c545006a71c5a5f71b8df501 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://dev.alpinelinux.org/archive/gummiboot/ +PKG_HASH:=2b649a6eb22007cd34bb355ba4ca6c1a8058e115c13048985f09a0f11f3d5295 PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENSE @@ -42,7 +40,8 @@ endef CONFIGURE_ARGS += \ --with-efi-libdir=$(STAGING_DIR)/usr/lib \ --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ - --with-efi-includedir=$(STAGING_DIR)/usr/include + --with-efi-includedir=$(STAGING_DIR)/usr/include \ + --disable-manpages define Build/Compile +$(MAKE_VARS) EFI_CFLAGS="-I$(TOOLCHAIN_DIR)/include $(TARGET_CFLAGS)" \ diff --git a/utils/gummiboot/patches/015-gummiboot-aarch64-support.patch b/utils/gummiboot/patches/015-gummiboot-aarch64-support.patch new file mode 100644 index 000000000..84e3ee9a0 --- /dev/null +++ b/utils/gummiboot/patches/015-gummiboot-aarch64-support.patch @@ -0,0 +1,121 @@ +From koen.kooi at linaro.org Sat Apr 11 01:23:22 2015 +From: koen.kooi at linaro.org (Koen Kooi) +Date: Sat, 11 Apr 2015 10:23:22 +0200 +Subject: [systemd-devel] [gummiboot][PATCH 1/5] Makefile: support non-x86 + builds +Message-ID: <1428740606-30060-1-git-send-email-koen.kooi@linaro.org> + +Move the no-mmx/no-sse CFLAGS to X86-64 and IA32 defines in preparation +for ARM32 and Aarch64 support. + +Signed-off-by: Koen Kooi +--- + Makefile.am | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -94,17 +94,23 @@ efi_cflags = \ + -ffreestanding \ + -fno-strict-aliasing \ + -fno-stack-protector \ +- -Wsign-compare \ +- -mno-sse \ +- -mno-mmx ++ -Wsign-compare + + if ARCH_X86_64 + efi_cflags += \ + -mno-red-zone \ ++ -mno-sse \ ++ -mno-mmx + -DEFI_FUNCTION_WRAPPER \ + -DGNU_EFI_USE_MS_ABI + endif + ++if ARCH_IA32 ++efi_cflags += \ ++ -mno-sse \ ++ -mno-mmx ++endif ++ + efi_ldflags = \ + $(EFI_LDFLAGS) \ + -T $(EFI_LDS_DIR)/elf_$(ARCH)_efi.lds \ +@@ -115,6 +121,17 @@ efi_ldflags = \ + -L $(EFI_LIB_DIR) \ + $(EFI_LDS_DIR)/crt0-efi-$(ARCH).o + ++# Aarch64 and ARM32 don't have an EFI capable objcopy ++if ARCH_AARCH64 ++efi_ldflags += \ ++ --defsym=EFI_SUBSYSTEM=0xa ++ ++FORMAT = -O binary ++else ++FORMAT = --target=efi-app-$(ARCH) ++endif ++ ++ + # ------------------------------------------------------------------------------ + gummiboot_headers = \ + src/efi/util.h \ +@@ -150,7 +167,7 @@ $(gummiboot_solib): $(gummiboot_objects) + $(gummiboot): $(gummiboot_solib) + $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc \ +- --target=efi-app-$(ARCH) $< $@ ++ $(FORMAT) $< $@ + + # ------------------------------------------------------------------------------ + stub_headers = \ +@@ -185,7 +202,7 @@ $(stub_solib): $(stub_objects) + $(stub): $(stub_solib) + $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc \ +- --target=efi-app-$(ARCH) $< $@ ++ $(FORMAT) $< $@ + + # ------------------------------------------------------------------------------ + CLEANFILES += test-disk.img +--- a/src/efi/util.c ++++ b/src/efi/util.c +@@ -33,12 +33,17 @@ UINT64 ticks_read(VOID) { + __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d)); + return (d << 32) | a; + } +-#else ++#elif __i386__ + UINT64 ticks_read(VOID) { + UINT64 val; + __asm__ volatile ("rdtsc" : "=A" (val)); + return val; + } ++#else ++UINT64 ticks_read(VOID) { ++ UINT64 val = 1; ++ return val; ++} + #endif + + /* count TSC ticks during a millisecond delay */ +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,7 @@ dnl Define ARCH_ conditionals + SET_ARCH(IA32, i*86*) + SET_ARCH(X86_64, x86_64*) + SET_ARCH(IA64, ia64*) ++SET_ARCH(AARCH64, aarch64*) + + ARCH=`echo $host | sed "s/\(-\).*$//"` + +@@ -61,6 +62,9 @@ AM_COND_IF(ARCH_IA32, [ + AM_COND_IF(ARCH_X86_64, [ + MACHINE_TYPE_NAME=x64]) + ++AM_COND_IF(ARCH_AARCH64, [ ++ MACHINE_TYPE_NAME=aa64]) ++ + AC_SUBST([ARCH]) + AC_SUBST([MACHINE_TYPE_NAME]) + From feac018603f0e6c0dc74987fe7cd39f7b12bfef7 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 26 Mar 2023 19:58:42 +0300 Subject: [PATCH 18/18] cni-plugins-nft: update to 1.0.12 Changelog: - docs: update install instructions - upgrade to go1.19 Signed-off-by: Oskari Rauta --- utils/cni-plugins-nft/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/cni-plugins-nft/Makefile b/utils/cni-plugins-nft/Makefile index 5a3720b1f..b82a162b7 100644 --- a/utils/cni-plugins-nft/Makefile +++ b/utils/cni-plugins-nft/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cni-plugins-nft -PKG_VERSION:=1.0.11 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.0.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/greenpau/cni-plugins/archive/v$(PKG_VERSION) -PKG_HASH:=f6c68268893c9d9967dd4d8f3684df0f4f989e7ebf373e72b20d1f290ff9e240 +PKG_HASH:=51c4b41c61f46c7dfc691d52dba301e7d8189589e1a625772f761ea3ae804fb3 PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=Apache-2.0