From f1c8f1423b53c4c53db07e2889993b346284b427 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Fri, 23 Dec 2022 23:38:25 +0000 Subject: [PATCH 01/15] pbr: add provides: pbr to variants Signed-off-by: Stan Grishin --- net/pbr/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net/pbr/Makefile b/net/pbr/Makefile index 7ec156ac7..ddcd9e123 100644 --- a/net/pbr/Makefile +++ b/net/pbr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pbr PKG_VERSION:=1.0.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin @@ -20,25 +20,27 @@ define Package/pbr/default URL:=https://docs.openwrt.melmac.net/pbr/ DEPENDS:=+ip-full +jshn +jsonfilter +resolveip CONFLICTS:=vpnbypass vpn-policy-routing - PROVIDES:=vpnbypass vpn-policy-routing PKGARCH:=all endef define Package/pbr $(call Package/pbr/default) - TITLE+= with nft/nft set support - DEPENDS+=+firewall4 +kmod-nft-core +kmod-nft-nat +nftables-json + TITLE+= with nft/nft set support + DEPENDS+=+firewall4 +kmod-nft-core +kmod-nft-nat +nftables-json + PROVIDES:=vpnbypass vpn-policy-routing endef define Package/pbr-iptables $(call Package/pbr/default) - TITLE+= with iptables/ipset support - DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt + TITLE+= with iptables/ipset support + DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt + PROVIDES:=pbr vpnbypass vpn-policy-routing endef define Package/pbr-netifd $(call Package/pbr/default) - TITLE+= with netifd support + TITLE+= with netifd support + PROVIDES:=pbr vpnbypass vpn-policy-routing endef define Package/pbr/description From 21a558522d1c05e45d7f01c5566ce7921d0ea0e9 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Fri, 16 Dec 2022 15:34:06 +0100 Subject: [PATCH 02/15] python-websocket-client: update to 1.4.2 Signed-off-by: Javier Marcet --- lang/python/python-websocket-client/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-websocket-client/Makefile b/lang/python/python-websocket-client/Makefile index d5b6f758e..5376e8cc2 100644 --- a/lang/python/python-websocket-client/Makefile +++ b/lang/python/python-websocket-client/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-websocket-client -PKG_VERSION:=1.4.1 +PKG_VERSION:=1.4.2 PKG_RELEASE:=1 PYPI_NAME:=websocket-client -PKG_HASH:=f9611eb65c8241a67fb373bef040b3cf8ad377a9f6546a12b620b6511e8ea9ef +PKG_HASH:=d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59 PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=Apache-2.0 From 9fc88c846bc832990875e6480086c06936cfd020 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Fri, 16 Dec 2022 15:34:25 +0100 Subject: [PATCH 03/15] python3-texttable: update to version 1.6.7 Signed-off-by: Javier Marcet --- lang/python/python-texttable/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-texttable/Makefile b/lang/python/python-texttable/Makefile index e93ce00cd..98f6ec98e 100644 --- a/lang/python/python-texttable/Makefile +++ b/lang/python/python-texttable/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-texttable -PKG_VERSION:=1.6.4 +PKG_VERSION:=1.6.7 PKG_RELEASE:=1 PYPI_NAME:=texttable -PKG_HASH:=42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9 +PKG_HASH:=290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2 PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=MIT From 2ee0f893e3bbc63e1d7cd98617ce9624b46c2422 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Fri, 16 Dec 2022 15:34:52 +0100 Subject: [PATCH 04/15] python3-paramiko: update to version 2.12.0 Signed-off-by: Javier Marcet --- lang/python/python-paramiko/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-paramiko/Makefile b/lang/python/python-paramiko/Makefile index 7c09683c5..7cf714604 100644 --- a/lang/python/python-paramiko/Makefile +++ b/lang/python/python-paramiko/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-paramiko -PKG_VERSION:=2.11.0 +PKG_VERSION:=2.12.0 PKG_RELEASE:=1 PYPI_NAME:=paramiko -PKG_HASH:=003e6bee7c034c21fbb051bf83dc0a9ee4106204dd3c53054c71452cc4ec3938 +PKG_HASH:=376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49 PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=LGPL-2.1-or-later From b80213e65e1a2f40728fbb5cac178de4e2b6dd11 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Fri, 16 Dec 2022 15:35:12 +0100 Subject: [PATCH 05/15] python-jsonschema: Update to 4.17.3 Signed-off-by: Javier Marcet --- lang/python/python-jsonschema/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-jsonschema/Makefile b/lang/python/python-jsonschema/Makefile index 859dcbb56..4167ef29c 100644 --- a/lang/python/python-jsonschema/Makefile +++ b/lang/python/python-jsonschema/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-jsonschema -PKG_VERSION:=4.16.0 +PKG_VERSION:=4.17.3 PKG_RELEASE:=1 PYPI_NAME:=jsonschema -PKG_HASH:=165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23 +PKG_HASH:=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=MIT From 360383a997baa8e076d9b50d3f7509e8b4fea6ac Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Fri, 16 Dec 2022 15:35:29 +0100 Subject: [PATCH 06/15] python-docker: Update to 6.0.1 Signed-off-by: Javier Marcet --- lang/python/python-docker/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-docker/Makefile b/lang/python/python-docker/Makefile index 6ffc9a4bf..cb23ea010 100644 --- a/lang/python/python-docker/Makefile +++ b/lang/python/python-docker/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-docker -PKG_VERSION:=6.0.0 +PKG_VERSION:=6.0.1 PKG_RELEASE:=1 PYPI_NAME:=docker -PKG_HASH:=19e330470af40167d293b0352578c1fa22d74b34d3edf5d4ff90ebc203bbb2f1 +PKG_HASH:=896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97 PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=Apache-2.0 From a7b770eec4370087a5ccd27887386dac9266214e Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 27 Dec 2022 17:54:16 -0700 Subject: [PATCH 07/15] bind: start up with -4 if not listening on ipv6 addresses Signed-off-by: Philip Prindeville --- net/bind/Makefile | 2 +- net/bind/files/named.init | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/net/bind/Makefile b/net/bind/Makefile index e53a7e7f8..699f93550 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind PKG_VERSION:=9.18.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 USERID:=bind=57:bind=57 PKG_MAINTAINER:=Noah Meyerhans diff --git a/net/bind/files/named.init b/net/bind/files/named.init index 7c61b5e2a..312e297fb 100644 --- a/net/bind/files/named.init +++ b/net/bind/files/named.init @@ -30,6 +30,10 @@ fix_perms() { done } +no_ipv6() { + [ -z "$(ip -6 -o route show default)" ] +} + reload_service() { rndc -q reload } @@ -68,8 +72,11 @@ start_service() { touch $conf_local_file + local args= + [ no_ipv6 ] && args="-4" + procd_open_instance - procd_set_param command /usr/sbin/named -u bind -f -c $config_file + procd_set_param command /usr/sbin/named -u bind -f $args -c $config_file procd_set_param file $config_file \ $config_dir/bind.keys \ $named_options_file \ From e40f766da151f4a4471f9252218d9866e02d970f Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Tue, 3 Jan 2023 14:18:20 +1000 Subject: [PATCH 08/15] dockerd: Update to v20.10.22 Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 414bf9694..ba3f30143 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=20.10.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=20.10.22 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=9907aaaf39fb1c2c3fd427192e4a63d7adf8ddc9fb0e29c692a6ca10de9c34f6 -PKG_GIT_SHORT_COMMIT:=e42327a # SHA1 used within the docker executables +PKG_HASH:=ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 +PKG_GIT_SHORT_COMMIT:=42c8b31 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan From dad87d556fecce14a467bd9ec1d13c8e4472557b Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Tue, 3 Jan 2023 14:19:15 +1000 Subject: [PATCH 09/15] docker: Update to v20.10.22 Signed-off-by: Gerard Ryan --- utils/docker/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index 90988af9a..b21b65081 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=20.10.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=20.10.22 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=87ba64f76d3bb98666fa44552c3eb0b1c10e5e9c43010e8dbc180ba22690413a -PKG_GIT_SHORT_COMMIT:=b40c2f6 # SHA1 used within the docker executables +PKG_HASH:=84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 +PKG_GIT_SHORT_COMMIT:=3a2c30b # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan From 1f2dcba6b0fd66d5132167b8608e678f52007248 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Tue, 3 Jan 2023 14:19:38 +1000 Subject: [PATCH 10/15] containerd: Update to v1.6.13 for Docker v20.10.22 Signed-off-by: Gerard Ryan --- utils/containerd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 7065f4479..da49541cf 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.6.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.6.13 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? -PKG_HASH:=f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 +PKG_HASH:=d6d022385c4dadd81edf4fb5ad4b084dcfc3d6d921ed433bb3aa0d2e0bfbb19d PKG_MAINTAINER:=Gerard Ryan From ce0679b61a5927ffdbc8a1505ce52756c6c394d4 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Tue, 3 Jan 2023 14:20:03 +1000 Subject: [PATCH 11/15] libnetwork: Update to dcdf8f1 for Docker v20.10.22 Signed-off-by: Gerard Ryan --- utils/libnetwork/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/libnetwork/Makefile b/utils/libnetwork/Makefile index aa4aee9d7..e77f15860 100644 --- a/utils/libnetwork/Makefile +++ b/utils/libnetwork/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetwork -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -12,9 +12,9 @@ GO_PKG_BUILD_PKG:= \ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://$(GO_PKG) -PKG_SOURCE_VERSION:=0dde5c895075df6e3630e76f750a447cf63f4789 -PKG_SOURCE_DATE:=2022-07-16 -PKG_MIRROR_HASH:=ff5c7f30777c5fec50a59b79ff0e056fd09e3e55f3475816a21376bf72812d42 +PKG_SOURCE_VERSION:=dcdf8f176d1e13ad719e913e796fb698d846de98 +PKG_SOURCE_DATE:=2022-11-11 +PKG_MIRROR_HASH:=bece10d04ab07cc557b424082a1c2fdf46afe0501541b4a05123b7e90fb42f89 PKG_MAINTAINER:=Gerard Ryan From df13b03e506ec8036a4a1558ff8925187a94e464 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 26 Dec 2022 18:31:39 +0100 Subject: [PATCH 12/15] libwebsockets: fix uloop support The commit adding uloop support failed to actually install the .so and add the correct dependencies. [2022/12/26 18:19:38:1835] E: lws_create_context: failed to load evlib_uloop Fixes: 1557ac367a ("libwebsockets: enable built in uloop support") Signed-off-by: John Crispin --- libs/libwebsockets/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 2920cb039..bb54b6655 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -45,7 +45,7 @@ define Package/libwebsockets/Default SECTION:=libs CATEGORY:=Libraries TITLE:=libwebsockets - DEPENDS:=+zlib +libcap + DEPENDS:=+zlib +libcap +libubox URL:=https://libwebsockets.org MAINTAINER:=Karl Palsson endef @@ -97,7 +97,7 @@ endif define Package/libwebsockets/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets*.so* $(1)/usr/lib/ endef Package/libwebsockets-mbedtls/install = $(Package/libwebsockets/install) From 991c2d452cd12bd49c65a945a966f09223542c4b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 1 Jan 2023 16:33:26 +0800 Subject: [PATCH 13/15] libtorrent-rasterbar: Update to 2.0.8 Signed-off-by: Tianling Shen --- libs/libtorrent-rasterbar/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/libtorrent-rasterbar/Makefile b/libs/libtorrent-rasterbar/Makefile index fe99c3426..1e5b3e00c 100644 --- a/libs/libtorrent-rasterbar/Makefile +++ b/libs/libtorrent-rasterbar/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent-rasterbar -PKG_VERSION:=2.0.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.0.8 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/arvidn/libtorrent/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=1c8209fdf765be7bc989e9cbd1d9dc3d5a6a57cb979205e73e925c9c72ebe8ce +PKG_HASH:=29e5c5395de8126ed1b24d0540a9477fbb158b536021cd65aaf9de34d0aadb46 PKG_MAINTAINER:=David Yang PKG_LICENSE:=BSD-3-Clause @@ -47,11 +47,11 @@ endef #endef define Download/try_signal - VERSION:=751a7e5a5be14892bcfdff1e63c653bcbf71cf39 + VERSION:=105cce59972f925a33aa6b1c3109e4cd3caf583d SUBDIR:=deps/try_signal FILE:=$(PKG_NAME)-try_signal-$$(VERSION).tar.xz URL:=https://github.com/arvidn/try_signal.git - MIRROR_HASH:=32a432e35e81c79f21c49744f00696c112e0deab45d15d91c61ceb63fe25a5f8 + MIRROR_HASH:=da81da67d52b7a731c21148573b68bf8dc7863616d6ae1f81845b7afb29e8f00 PROTO:=git endef $(eval $(call Download,try_signal)) From fe018482f83d51b9005c44d25652ea323aa338a2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 3 Jan 2023 16:15:16 -0800 Subject: [PATCH 14/15] libmaxminddb: install pkgconfig file Signed-off-by: Rosen Penev --- libs/libmaxminddb/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/libmaxminddb/Makefile b/libs/libmaxminddb/Makefile index 02bd2f473..b1bc2452f 100644 --- a/libs/libmaxminddb/Makefile +++ b/libs/libmaxminddb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmaxminddb PKG_VERSION:=1.7.1 -PKG_RELEASE=$(AUTORELEASE) +PKG_RELEASE=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/maxmind/libmaxminddb/releases/download/$(PKG_VERSION)/ @@ -42,6 +42,8 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmaxminddb.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmaxminddb.pc $(1)/usr/lib/pkgconfig endef define Package/libmaxminddb/install From a4bfe48e273476e15f3689a1afcaf7dcb8f859c9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 4 Jan 2023 20:42:58 +0100 Subject: [PATCH 15/15] libwebsockets: update PKG_RELEASE Fixes: df13b03e50 ("libwebsockets: fix uloop support") Signed-off-by: John Crispin --- libs/libwebsockets/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index bb54b6655..c71510b01 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets PKG_VERSION:=4.3.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)