From 12544affe9d9a47c767f9e7a314e165b293ece22 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Thu, 9 Mar 2023 13:06:06 +0000 Subject: [PATCH 01/28] ddns-scripts: Add v2 API for mythic-beasts.com provider Use USERNAME as the key, PASSWORD as the secret. Signed-off-by: Jim Hague --- net/ddns-scripts/Makefile | 2 +- .../usr/share/ddns/default/mythic-beasts.com-v2.json | 9 +++++++++ net/ddns-scripts/files/usr/share/ddns/list | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 net/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 1f35ed7d8..19bebeef0 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=36 +PKG_RELEASE:=37 PKG_LICENSE:=GPL-2.0 diff --git a/net/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json b/net/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json new file mode 100644 index 000000000..e24622380 --- /dev/null +++ b/net/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json @@ -0,0 +1,9 @@ +{ + "name": "mythic-beasts.com (API v2)", + "ipv4": { + "url": "https://[USERNAME]:[PASSWORD]@ipv4.api.mythic-beasts.com/dns/v2/dynamic/[DOMAIN]" + }, + "ipv6": { + "url": "https://[USERNAME]:[PASSWORD]@ipv6.api.mythic-beasts.com/dns/v2/dynamic/[DOMAIN]" + } +} diff --git a/net/ddns-scripts/files/usr/share/ddns/list b/net/ddns-scripts/files/usr/share/ddns/list index c55115c15..86902313a 100644 --- a/net/ddns-scripts/files/usr/share/ddns/list +++ b/net/ddns-scripts/files/usr/share/ddns/list @@ -41,6 +41,7 @@ moniker.com mydns.jp myonlineportal.net mythic-beasts.com +mythic-beasts.com-v2 namecheap.com njal.la no-ip.pl From 35f4830de79f332dd532fcb26e704d1356f99c94 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Sat, 11 Mar 2023 10:43:48 +0000 Subject: [PATCH 02/28] simple-adblock: update init file and config * move network.sh and jshn.sh includes into load_validate_config function to prevent errors when adding the package to image with the Image Builder * add @bongochong compressed domains block-list to the config Signed-off-by: Stan Grishin --- net/simple-adblock/Makefile | 2 +- net/simple-adblock/files/simple-adblock.conf | 4 ++++ net/simple-adblock/files/simple-adblock.init | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index bb4852502..15169eacb 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.9.4 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.conf b/net/simple-adblock/files/simple-adblock.conf index 46518c6ee..7949156aa 100644 --- a/net/simple-adblock/files/simple-adblock.conf +++ b/net/simple-adblock/files/simple-adblock.conf @@ -64,6 +64,10 @@ config simple-adblock 'config' # block-list too big for most routers # list blocked_hosts_url 'https://cdn.jsdelivr.net/gh/StevenBlack/hosts/hosts' +# File size: 2.0M +# block-list too big for most routers +# list blocked_domains_url https://cdn.jsdelivr.net/gh/bongochong/CombinedPrivacyBlockLists/NoFormatting/cpbl-ctld.txt + # File size: 3.1M # block-list too big for most routers # list blocked_hosts_url 'https://hostsfile.mine.nu/Hosts' diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index 1522569ab..87fdfdef7 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -88,9 +88,6 @@ outputCache= awk='awk' load_environment_flag= -. /lib/functions/network.sh -. /usr/share/libubox/jshn.sh - debug() { local i j; for i in "$@"; do eval "j=\$$i"; echo "${i}: ${j} "; done; } uci_add_list_if_new() { @@ -1562,6 +1559,8 @@ stop_service() { load_validate_config 'config' adb_stop "'$*'"; } version() { echo "$PKG_VERSION"; } load_validate_config() { + . /lib/functions/network.sh + . /usr/share/libubox/jshn.sh local enabled local force_dns local force_dns_port From 2bf3832193fdfe86e948f35fcc08b3ea5a341562 Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Sat, 11 Mar 2023 14:17:19 -0500 Subject: [PATCH 03/28] mv88e6xxx_dump: update to 2023.03.08 This fixes 2 issues where mv88e6xxx_dump was displaying data incorrectly for --vtu and --global2 Signed-off-by: Etienne Champetier --- utils/mv88e6xxx_dump/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/mv88e6xxx_dump/Makefile b/utils/mv88e6xxx_dump/Makefile index 52bcea5ab..f3042be77 100644 --- a/utils/mv88e6xxx_dump/Makefile +++ b/utils/mv88e6xxx_dump/Makefile @@ -12,9 +12,9 @@ PKG_FIXUP:=autoreconf PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/lunn/mv88e6xxx_dump -PKG_MIRROR_HASH:=2f1bce89212a10be89e106398ccc2f7eedcc1a7299bf8a1a05b3baf061f779f5 -PKG_SOURCE_DATE:=2022.03.29 -PKG_SOURCE_VERSION:=a3f713f99e0004d17d9282e0cb253505b9ca35b6 +PKG_MIRROR_HASH:=cee56d21347496ca38a15d7572dbd2b0db32dfbfbb19a8ce679b9095f7b5a247 +PKG_SOURCE_DATE:=2023.03.08 +PKG_SOURCE_VERSION:=b4c5247ee8bb5512fb80081503aae183b35ed3c6 PKG_MAINTAINER:=Etienne Champetier PKG_LICENSE:=GPL-2.0-only From a6d063fee29922ebcac2f613f92852202fe43b16 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Mon, 28 Nov 2022 07:52:13 +0000 Subject: [PATCH 04/28] lolcat: update to version 1.4 Bump to the latest stable release. Signed-off-by: Rui Salvaterra --- utils/lolcat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/lolcat/Makefile b/utils/lolcat/Makefile index 644bd25f8..8bd5e0080 100644 --- a/utils/lolcat/Makefile +++ b/utils/lolcat/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lolcat -PKG_VERSION:=1.2 +PKG_VERSION:=1.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jaseg/lolcat/tar.gz/refs/tags/v$(PKG_VERSION)? -PKG_HASH:=b6e1a0e24479fbdd4eb907531339e2cafc0c00b78d19caf70e8377b8b7546331 +PKG_HASH:=6ea43ee2b2bb2f15fc91812b72ebcdaa883052853ed8f055b6f8b38637bda909 PKG_MAINTAINER:=Rui Salvaterra PKG_LICENSE:=WTFPL From 0cec657274fe963c7f6e02447cf6ce03a7b1ab66 Mon Sep 17 00:00:00 2001 From: John Audia Date: Fri, 24 Feb 2023 12:16:36 -0500 Subject: [PATCH 05/28] snort3: update to 3.1.56.0 Upstream bump Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 9ba031871..2c989ccb3 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.53.0 +PKG_VERSION:=3.1.56.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=e76429903cc56353ab21c0f4c0ec495054ba82f56d8d94943930bc0c3165be4c +PKG_HASH:=b757705e1ee2a560b94791b3f474fe1c562c98049ebb0c807e8f612c7c38032d PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From 96d2610994d4bb40c9ef8a63305ba1a97b6988af Mon Sep 17 00:00:00 2001 From: John Audia Date: Fri, 24 Feb 2023 12:10:24 -0500 Subject: [PATCH 06/28] libdaq3: update to 3.0.11 Upstream bump Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index 7d386a1de..a97eb7755 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.10 +PKG_VERSION:=3.0.11 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -17,7 +17,7 @@ PKG_LICENSE:=GPL-2.0-only PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a540b8657dbacab61e23ead203564f351ee30af85f0261979f14f2b7159f701f +PKG_HASH:=c9b691e113960cc19c4df6e93eacbdb45c96491da9c81471f3e419b91c04579a PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf From 4a2645b33f5586a85339572619565a034f57edbf Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 12 Mar 2023 17:47:46 +0100 Subject: [PATCH 07/28] mmc-utils: update to latest upstream revision Signed-off-by: Michael Heimpold --- utils/mmc-utils/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/mmc-utils/Makefile b/utils/mmc-utils/Makefile index c0221e0df..eeb35777d 100644 --- a/utils/mmc-utils/Makefile +++ b/utils/mmc-utils/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git -PKG_SOURCE_DATE:=2022-11-03 -PKG_SOURCE_VERSION:=c62dd8e415b12cc7f9a362db23cd384caf77ff03 -PKG_MIRROR_HASH:=eb67ba303338d385cd577b9cd78ef2bbe4903420cf20b4307f31076179fd05c4 +PKG_SOURCE_DATE:=2023-01-16 +PKG_SOURCE_VERSION:=d4c2910981ff99b983734426dfa99632fb81ac6b +PKG_MIRROR_HASH:=b124409d3482db1e63822a7860b7e4a0dfe6c3545da967283979fe805a287893 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:= From ae0a8072d6f51076c5b2e38ef645e4b3431ce7b5 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 10 Jan 2023 22:28:53 -0700 Subject: [PATCH 08/28] strongswan: Update to 5.9.9 Add patch to remove definition of RNG leaking in from wolfssl.h. Signed-off-by: Philip Prindeville --- net/strongswan/Makefile | 6 +++--- net/strongswan/patches/0905-undef-wolfssl-RNG.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 net/strongswan/patches/0905-undef-wolfssl-RNG.patch diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 35cf0fec1..cab4f5892 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan -PKG_VERSION:=5.9.8 -PKG_RELEASE:=5 +PKG_VERSION:=5.9.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ -PKG_HASH:=d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c +PKG_HASH:=5e16580998834658c17cebfb31dd637e728669cf2fdd325460234a4643b8d81d PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Philip Prindeville , Noel Kuntze PKG_CPE_ID:=cpe:/a:strongswan:strongswan diff --git a/net/strongswan/patches/0905-undef-wolfssl-RNG.patch b/net/strongswan/patches/0905-undef-wolfssl-RNG.patch new file mode 100644 index 000000000..dfca722c9 --- /dev/null +++ b/net/strongswan/patches/0905-undef-wolfssl-RNG.patch @@ -0,0 +1,12 @@ +--- a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c ++++ b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c +@@ -50,6 +50,9 @@ + #ifndef FIPS_MODE + #define FIPS_MODE 0 + #endif ++#ifdef RNG ++#undef RNG ++#endif + + typedef struct private_wolfssl_plugin_t private_wolfssl_plugin_t; + From 0e96d2f862a67763f0809c80aa5990a5bfbe23fc Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 13 Mar 2023 16:39:10 +0800 Subject: [PATCH 09/28] xray-core: Update to 1.8.0 Signed-off-by: Tianling Shen --- net/xray-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index d06c5a50f..eb5246b40 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=1.7.5 +PKG_VERSION:=1.8.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a5fc936136a57a463bf9a895d068fdfa895b168ae6093c58a10208e098b6b2d3 +PKG_HASH:=35339ee4c2ebd46cebd95ad7791d38a97db3a6afd97277a33e4ee7be35c9a3b2 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 From 4dd80ed51995ca9e8047003ada33fc98cb9ec57d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 13 Mar 2023 16:40:57 +0800 Subject: [PATCH 10/28] v2ray-geodata: Update to latest version Signed-off-by: Tianling Shen --- net/v2ray-geodata/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index 9d67d1419..d3c790af5 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202302090046 +GEOIP_VER:=202303090050 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=38e200a655c3e401dde6a438e79d493c3dbdd224e104a5158bef01f78ad4a151 + HASH:=a17a7ad10116f2cdd7e5f5dfbfff99695641e6dddf57d35c8c32e3f07960b1ab endef -GEOSITE_VER:=20230208103804 +GEOSITE_VER:=20230312104722 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=479fe1557bf873a2951483315eb75d769e7e74e4523fd130c6762b30b7c49a2c + HASH:=505e214574f1ec516381cfa17a0c8d08d4bec03b3d3de7c4d06ff0e7fb479647 endef define Package/v2ray-geodata/template From 29041e8f8eb42dcd8eee03602348b39dbf9d0c70 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 9 Mar 2023 14:17:35 +0800 Subject: [PATCH 11/28] CI: update build architectures Removed arc_archs - archs38 was marked as source-only [1]. Renamed powerpc_8540 to powerpc_8548 [2]. 1. https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=c01641bcc7236d2e2de3ea65444b0cf2898df351 2. https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=2cad88b99fdae9766de84e6c1cb56f111eb53748 Signed-off-by: Tianling Shen --- .github/workflows/multi-arch-test-build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/multi-arch-test-build.yml b/.github/workflows/multi-arch-test-build.yml index 87ed8f4f4..514c276f2 100644 --- a/.github/workflows/multi-arch-test-build.yml +++ b/.github/workflows/multi-arch-test-build.yml @@ -11,10 +11,6 @@ jobs: fail-fast: false matrix: include: - - arch: arc_archs - target: archs38-generic - runtime_test: false - - arch: arm_cortex-a9_vfpv3-d16 target: mvebu-cortexa9 runtime_test: false @@ -31,7 +27,7 @@ jobs: target: apm821xx-nand runtime_test: false - - arch: powerpc_8540 + - arch: powerpc_8548 target: mpc85xx-p1010 runtime_test: false From f9e3af87f516b285daffc01636083f2db369c27b Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Mon, 13 Mar 2023 01:16:25 +0200 Subject: [PATCH 12/28] netbird: update to 0.14.3 Bug fixes & refactor Release notes: - Fix: send remote agents updates when peer re-authenticates 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 6f0a0d716..2820be2bc 100644 --- a/net/netbird/Makefile +++ b/net/netbird/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netbird -PKG_VERSION:=0.14.2 +PKG_VERSION:=0.14.3 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:=8ffef4569572b9eb93891e881cb7b3b9ba98b5596f3ffda3b433b32e364adb56 +PKG_HASH:=ce56a0419cea1296f4b61d1ecb04e5f812805538e17f5211c5f05ed2b5b98dbc PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=BSD-3-Clause From e784c54b76e00cbb518ed447747a80d7afe85004 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 10 Mar 2023 16:49:01 +0000 Subject: [PATCH 13/28] rust-lang: update to 1.68.0 Signed-off-by: Luca Barbato --- lang/rust/Makefile | 4 +- .../0001-Update-xz2-and-use-it-static.patch | 472 +----------------- 2 files changed, 18 insertions(+), 458 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 97d861f58..2b247069a 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rust -PKG_VERSION:=1.67.1 +PKG_VERSION:=1.68.0 PKG_RELEASE:=1 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL:=https://static.rust-lang.org/dist/ -PKG_HASH:=46483d3e5de85a3bd46f8e7a3ae1837496391067dbe713a25d3cf051b3d9ff6e +PKG_HASH:=eaf4d8b19f23a232a4770fb53ab5e7acdedec11da1d02b0e5d491ca92ca96d62 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/rustc-$(PKG_VERSION)-src/ PKG_MAINTAINER:=Luca Barbato diff --git a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch index 8c4ec683e..aa8884867 100644 --- a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch +++ b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch @@ -1,384 +1,23 @@ -From cfa7506a303537ee7211bd46c39a96bbc5cea9cf Mon Sep 17 00:00:00 2001 +From b74dbd080ea75ebcc371732ddbfeb81c96b8c5d5 Mon Sep 17 00:00:00 2001 From: Luca Barbato -Date: Fri, 27 Jan 2023 15:34:36 +0100 +Date: Fri, 10 Mar 2023 18:24:14 +0100 Subject: [PATCH] Update xz2 and lzma-sys -And use the static build. --- - Cargo.lock | 140 +++++++-------------------------------- - src/bootstrap/Cargo.lock | 8 +-- - src/bootstrap/Cargo.toml | 2 +- - 3 files changed, 28 insertions(+), 122 deletions(-) + Cargo.lock | 8 ++++---- + src/bootstrap/Cargo.lock | 8 ++++---- + src/bootstrap/Cargo.toml | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 6a15105805e..d4ecc363071 100644 +index 64df70f68e9..dff61db9893 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -295,45 +295,44 @@ version = "1.0.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" - dependencies = [ - "serde", - ] - - [[package]] - name = "cargo" --version = "0.68.0" -+version = "0.67.1" - dependencies = [ - "anyhow", -+ "atty", - "base64", - "bytesize", - "cargo-platform 0.1.2", - "cargo-test-macro", - "cargo-test-support", - "cargo-util", - "clap 4.0.15", - "crates-io", - "curl", - "curl-sys", -- "env_logger 0.10.0", -+ "env_logger 0.9.0", - "filetime", - "flate2", - "fwdansi", - "git2", - "git2-curl", - "glob", - "hex 0.4.2", - "hmac", - "home", -- "http-auth", - "humantime 2.0.1", - "ignore", - "im-rc", - "indexmap", -- "is-terminal", - "itertools", - "jobserver", - "lazy_static", - "lazycell", - "libc", - "libgit2-sys", - "log", - "memchr", -@@ -363,38 +362,38 @@ dependencies = [ - "unicode-xid", - "url", - "walkdir", - "winapi", - ] - - [[package]] - name = "cargo-credential" --version = "0.2.0" -+version = "0.1.0" - - [[package]] - name = "cargo-credential-1password" --version = "0.2.0" -+version = "0.1.0" - dependencies = [ - "cargo-credential", - "serde", - "serde_json", - ] - - [[package]] - name = "cargo-credential-macos-keychain" --version = "0.2.0" -+version = "0.1.0" - dependencies = [ - "cargo-credential", - "security-framework", - ] - - [[package]] - name = "cargo-credential-wincred" --version = "0.2.0" -+version = "0.1.0" - dependencies = [ - "cargo-credential", - "winapi", - ] - - [[package]] - name = "cargo-miri" - version = "0.1.0" -@@ -438,38 +437,39 @@ dependencies = [ - "cargo-util", - "crates-io", - "filetime", - "flate2", - "git2", - "glob", - "itertools", - "lazy_static", -+ "remove_dir_all", - "serde_json", - "snapbox", - "tar", - "termcolor", - "toml_edit", - "url", - "winapi", - ] - - [[package]] - name = "cargo-util" --version = "0.2.3" -+version = "0.2.2" - dependencies = [ - "anyhow", - "core-foundation", - "crypto-hash", - "filetime", - "hex 0.4.2", - "jobserver", - "libc", - "log", -- "miow 0.5.0", -+ "miow", - "same-file", - "shell-escape", - "tempfile", - "walkdir", - "winapi", - ] - - [[package]] -@@ -832,17 +832,17 @@ version = "0.0.0" - dependencies = [ - "colored", - "diff", - "getopts", - "glob", - "lazy_static", - "lazycell", - "libc", -- "miow 0.3.7", -+ "miow", - "miropt-test-tools", - "regex", - "rustfix", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", - "unified-diff", -@@ -857,43 +857,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "70489bbb718aea4f92e5f48f2e3b5be670c2051de30e57cb6e5377b4aa08b372" - dependencies = [ - "diff", - "filetime", - "getopts", - "lazy_static", - "libc", - "log", -- "miow 0.3.7", -+ "miow", - "regex", - "rustfix", - "serde", - "serde_derive", - "serde_json", - "tempfile", - "tester", - "winapi", - ] - - [[package]] - name = "concolor" --version = "0.0.9" -+version = "0.0.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b90f9dcd9490a97db91a85ccd79e38a87e14323f0bb824659ee3274e9143ba37" -+checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af" - dependencies = [ - "atty", - "bitflags", - "concolor-query", - ] - - [[package]] - name = "concolor-query" --version = "0.1.0" -+version = "0.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317" -+checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449" - - [[package]] - name = "content_inspector" - version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" - dependencies = [ - "memchr", -@@ -939,17 +939,17 @@ version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" - dependencies = [ - "libc", - ] - - [[package]] - name = "crates-io" --version = "0.35.0" -+version = "0.34.0" - dependencies = [ - "anyhow", - "curl", - "percent-encoding", - "serde", - "serde_json", - "url", - ] -@@ -1258,50 +1258,16 @@ checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" - dependencies = [ - "atty", - "humantime 2.0.1", - "log", - "regex", - "termcolor", - ] - --[[package]] --name = "env_logger" --version = "0.10.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" --dependencies = [ -- "humantime 2.0.1", -- "is-terminal", -- "log", -- "regex", -- "termcolor", --] -- --[[package]] --name = "errno" --version = "0.2.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" --dependencies = [ -- "errno-dragonfly", -- "libc", -- "winapi", --] -- --[[package]] --name = "errno-dragonfly" --version = "0.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" --dependencies = [ -- "cc", -- "libc", --] -- - [[package]] - name = "error_index_generator" - version = "0.0.0" - dependencies = [ - "mdbook", - ] - - [[package]] -@@ -1795,25 +1761,16 @@ dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", - ] - --[[package]] --name = "http-auth" --version = "0.1.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c0b40b39d66c28829a0cf4d09f7e139ff8201f7500a5083732848ed3b4b4d850" --dependencies = [ -- "memchr", --] -- - [[package]] - name = "humantime" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" - dependencies = [ - "quick-error", - ] -@@ -2004,38 +1961,16 @@ dependencies = [ - name = "intl_pluralrules" - version = "7.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" - dependencies = [ - "unic-langid", - ] - --[[package]] --name = "io-lifetimes" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656" --dependencies = [ -- "libc", -- "windows-sys", --] -- --[[package]] --name = "is-terminal" --version = "0.4.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" --dependencies = [ -- "hermit-abi 0.2.6", -- "io-lifetimes", -- "rustix", -- "windows-sys", --] -- - [[package]] - name = "itertools" - version = "0.10.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" - dependencies = [ - "either", - ] -@@ -2235,22 +2170,16 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - name = "lint-docs" - version = "0.1.0" - dependencies = [ - "serde_json", - "tempfile", - "walkdir", - ] - --[[package]] --name = "linux-raw-sys" --version = "0.1.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" -- - [[package]] - name = "litemap" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f34a3f4798fac63fb48cf277eefa38f94d3443baff555bb98e4f56bc9092368e" - - [[package]] - name = "lld-wrapper" -@@ -2272,19 +2201,19 @@ version = "0.4.14" +@@ -2490,19 +2490,19 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -396,86 +35,7 @@ index 6a15105805e..d4ecc363071 100644 [[package]] name = "mac" -@@ -2434,25 +2363,16 @@ dependencies = [ - name = "miow" - version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" - dependencies = [ - "winapi", - ] - --[[package]] --name = "miow" --version = "0.5.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" --dependencies = [ -- "windows-sys", --] -- - [[package]] - name = "miri" - version = "0.1.0" - dependencies = [ - "colored", - "env_logger 0.9.0", - "getrandom 0.2.0", - "lazy_static", -@@ -4637,30 +4557,16 @@ dependencies = [ - "term", - "thiserror", - "toml", - "unicode-segmentation", - "unicode-width", - "unicode_categories", - ] - --[[package]] --name = "rustix" --version = "0.36.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" --dependencies = [ -- "bitflags", -- "errno", -- "io-lifetimes", -- "libc", -- "linux-raw-sys", -- "windows-sys", --] -- - [[package]] - name = "rustversion" - version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" - - [[package]] - name = "ryu" -@@ -4879,19 +4785,19 @@ checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2" - [[package]] - name = "snap" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e" - - [[package]] - name = "snapbox" --version = "0.4.1" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "827c00e91b15e2674d8a5270bae91f898693cbf9561cbb58d8eaa31974597293" -+checksum = "44d199ccf8f606592df2d145db26f2aa45344e23c64b074cc5a4047f1d99b0f7" - dependencies = [ - "concolor", - "content_inspector", - "dunce", - "filetime", - "normalize-line-endings", - "similar", - "snapbox-macros", -@@ -5866,19 +5772,19 @@ version = "0.2.2" +@@ -6341,19 +6341,19 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" dependencies = [ @@ -498,10 +58,10 @@ index 6a15105805e..d4ecc363071 100644 version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock -index efe8ae3169f..ad115c46110 100644 +index 4a0ba592577..e75b4dbd12e 100644 --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock -@@ -346,19 +346,19 @@ version = "0.4.17" +@@ -351,19 +351,19 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ @@ -523,7 +83,7 @@ index efe8ae3169f..ad115c46110 100644 [[package]] name = "memchr" -@@ -780,19 +780,19 @@ version = "0.2.3" +@@ -785,19 +785,19 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ @@ -546,10 +106,10 @@ index efe8ae3169f..ad115c46110 100644 version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml -index ccc7ec1fce9..6d5838439db 100644 +index 22ceeca941e..9131fa5c341 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml -@@ -46,17 +46,17 @@ object = { version = "0.29.0", default-features = false, features = ["archive", +@@ -42,17 +42,17 @@ object = { version = "0.29.0", default-features = false, features = ["archive", serde = { version = "1.0.8", features = ["derive"] } serde_json = "1.0.2" sha2 = "0.10" @@ -569,5 +129,5 @@ index ccc7ec1fce9..6d5838439db 100644 version = "0.3" features = [ -- -2.38.0 +2.39.1 From b5cde91594a858b823270e50fed27bb7985ddebe Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Mon, 13 Mar 2023 19:16:05 +0100 Subject: [PATCH 14/28] zerotier: update to 1.10.4 Signed-off-by: Moritz Warning --- net/zerotier/Makefile | 4 ++-- net/zerotier/patches/0001-fix-makefile.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 05c14ef4b..47e3f7a63 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.10.3 +PKG_VERSION:=1.10.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? -PKG_HASH:=f2ce8a63a459a5fab129fb398e379b8c0875bdfeccb7bf15f9683ad22e43e629 +PKG_HASH:=5dc185a65baf8caa3fb739cbc8043677aa117604be9036a28c34f8fda5d6eafe PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_MAINTAINER:=Moritz Warning diff --git a/net/zerotier/patches/0001-fix-makefile.patch b/net/zerotier/patches/0001-fix-makefile.patch index fd8d05e21..eacb72352 100644 --- a/net/zerotier/patches/0001-fix-makefile.patch +++ b/net/zerotier/patches/0001-fix-makefile.patch @@ -38,7 +38,7 @@ Subject: [PATCH 1/2] fix makefile RUSTFLAGS=--release endif -@@ -313,7 +313,7 @@ ifeq ($(ZT_CONTROLLER),1) +@@ -316,7 +316,7 @@ ifeq ($(ZT_CONTROLLER),1) endif # ARM32 hell -- use conservative CFLAGS @@ -47,7 +47,7 @@ Subject: [PATCH 1/2] fix makefile ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel) override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm -@@ -340,8 +340,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1) +@@ -343,8 +343,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1) endif # Position Independence From d0d40023b8802885e20eabd5b73e2bf486e5e7d5 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 2 Mar 2023 21:54:46 +1000 Subject: [PATCH 15/28] libnetwork: Remove unused package Signed-off-by: Gerard Ryan --- utils/libnetwork/Makefile | 52 --------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 utils/libnetwork/Makefile diff --git a/utils/libnetwork/Makefile b/utils/libnetwork/Makefile deleted file mode 100644 index e77f15860..000000000 --- a/utils/libnetwork/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=libnetwork -PKG_RELEASE:=1 -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -GO_PKG:=github.com/docker/libnetwork -GO_PKG_BUILD_PKG:= \ - $(GO_PKG)/cmd/proxy \ - $(GO_PKG)/cmd/dnet - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://$(GO_PKG) -PKG_SOURCE_VERSION:=dcdf8f176d1e13ad719e913e796fb698d846de98 -PKG_SOURCE_DATE:=2022-11-11 -PKG_MIRROR_HASH:=bece10d04ab07cc557b424082a1c2fdf46afe0501541b4a05123b7e90fb42f89 - -PKG_MAINTAINER:=Gerard Ryan - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -include $(INCLUDE_DIR)/package.mk -include ../../lang/golang/golang-package.mk - -define Package/libnetwork - SECTION:=utils - CATEGORY:=Utilities - TITLE:=networking for containers - URL:=https://github.com/docker/libnetwork - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/libnetwork/description -Libnetwork provides a native Go implementation for connecting containers. -The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications. -endef - -GO_PKG_BUILD_VARS += GO111MODULE=auto - -define Package/libnetwork/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnet $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/proxy $(1)/usr/bin/docker-proxy -endef - -$(eval $(call GoBinPackage,libnetwork)) -$(eval $(call BuildPackage,libnetwork)) From ad8705484d5302a52a5453760fd4276a0d09939b Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 2 Mar 2023 22:13:36 +1000 Subject: [PATCH 16/28] containerd: Update to 1.6.16 for dockerd Signed-off-by: Gerard Ryan --- utils/containerd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index da49541cf..2181235df 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.6.13 +PKG_VERSION:=1.6.16 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:=d6d022385c4dadd81edf4fb5ad4b084dcfc3d6d921ed433bb3aa0d2e0bfbb19d +PKG_HASH:=e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a PKG_MAINTAINER:=Gerard Ryan From 61029785ed018048278ba4ca7046feb4599a823c Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 2 Mar 2023 22:15:43 +1000 Subject: [PATCH 17/28] docker: Update to 23.0.1 Signed-off-by: Gerard Ryan --- utils/docker/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index b21b65081..7586bd4dc 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=20.10.22 +PKG_VERSION:=23.0.1 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:=84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 -PKG_GIT_SHORT_COMMIT:=3a2c30b # SHA1 used within the docker executables +PKG_HASH:=37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94 +PKG_GIT_SHORT_COMMIT:=a5ee5b1 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan @@ -40,6 +40,7 @@ GO_PKG_BUILD_VARS += GO111MODULE=auto TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lc -lgcc_eh) +GO_PKG_INSTALL_EXTRA:=cli/compose/schema/data define Build/Prepare $(Build/Prepare/Default) From 3cc32d9728f995e91db104574dc329608de880c8 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 2 Mar 2023 22:18:12 +1000 Subject: [PATCH 18/28] dockerd: Update to 23.0.1 Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 9 ++++----- .../patches/001-libdevmapper_name_fix.patch | 14 +++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index ba3f30143..d7e82ffa1 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=20.10.22 +PKG_VERSION:=23.0.1 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:=ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 -PKG_GIT_SHORT_COMMIT:=42c8b31 # SHA1 used within the docker executables +PKG_HASH:=c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56 +PKG_GIT_SHORT_COMMIT:=bc3805a # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan @@ -45,7 +45,6 @@ define Package/dockerd +kmod-ipt-physdev \ +kmod-nf-ipvs \ +kmod-veth \ - +libnetwork \ +tini \ +uci-firewall USERID:=docker:docker @@ -96,7 +95,6 @@ define Build/Prepare # Verify dependencies are the vendored version $(call EnsureVendoredVersion,../containerd/Makefile,containerd.installer) - $(call EnsureVendoredCommit,../libnetwork/Makefile,proxy.installer) $(call EnsureVendoredVersion,../runc/Makefile,runc.installer) $(call EnsureVendoredVersion,../tini/Makefile,tini.installer) @@ -142,6 +140,7 @@ endef define Package/dockerd/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bundles/binary-daemon/dockerd $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bundles/binary-daemon/docker-proxy $(1)/usr/bin/ $(INSTALL_DIR) $(1)/opt/docker/ diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch index b9b0a6b8c..ec3fc649f 100644 --- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch +++ b/utils/dockerd/patches/001-libdevmapper_name_fix.patch @@ -1,11 +1,11 @@ --- a/hack/make.sh +++ b/hack/make.sh -@@ -95,7 +95,7 @@ fi +@@ -100,7 +100,7 @@ fi + # functionality. We favour libdm_dlsym_deferred_remove over + # libdm_no_deferred_remove in dynamic cases because the binary could be shipped # with a newer libdevmapper than the one it was built with. - if - command -v gcc &> /dev/null \ -- && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(pkg-config --libs devmapper) &> /dev/null) \ -+ && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(pkg-config --libs libdevmapper) &> /dev/null) \ - ; - then +-if command -v gcc &> /dev/null && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs devmapper 2> /dev/null) &> /dev/null); then ++if command -v gcc &> /dev/null && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs libdevmapper 2> /dev/null) &> /dev/null); then add_buildtag libdm dlsym_deferred_remove + fi + From 5597e3cf0643d52f8713de8738095e3df31a26c3 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Sun, 12 Mar 2023 14:43:36 +1000 Subject: [PATCH 19/28] dockerd: Disabled MIPS * Buildkit doesn't appear to compile Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index d7e82ffa1..4246fe1ad 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -46,7 +46,8 @@ define Package/dockerd +kmod-nf-ipvs \ +kmod-veth \ +tini \ - +uci-firewall + +uci-firewall \ + @!(mips||mipsel) USERID:=docker:docker MENU:=1 endef From 8677ed11e30b78de526dfacca58f24e041ff7833 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 14 Mar 2023 14:23:35 +0800 Subject: [PATCH 20/28] golang: Update to 1.19.7 Includes fix for CVE-2023-2453 (crypto/elliptic: specific unreduced P-256 scalars produce incorrect results). This also includes makefile updates for Go 1.19. Signed-off-by: Jeffery To --- lang/golang/golang-values.mk | 1 + lang/golang/golang/Makefile | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index ef77c8d80..2cd656dad 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -77,6 +77,7 @@ unexport \ # From https://pkg.go.dev/runtime#hdr-Environment_Variables unexport \ GOGC \ + GOMEMLIMIT \ GOMAXPROCS \ GORACE \ GOTRACEBACK diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index d89f5258d..130cb75e2 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.19 -GO_VERSION_PATCH:=6 +GO_VERSION_PATCH:=7 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:=d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 +PKG_HASH:=775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause @@ -65,7 +65,7 @@ HOST_GO_VALID_OS_ARCH:= \ \ linux_ppc64 linux_ppc64le \ linux_mips linux_mipsle linux_mips64 linux_mips64le \ - linux_riscv64 linux_s390x \ + linux_loong64 linux_riscv64 linux_s390x \ \ openbsd_mips64 @@ -295,10 +295,9 @@ PKG_GO_LDFLAGS= \ -extldflags '$(patsubst -z%,-Wl$(comma)-z$(comma)%,$(TARGET_LDFLAGS))' \ $(if $(CONFIG_NO_STRIP)$(CONFIG_DEBUG),,-s -w) -# setting -trimpath is not necessary here because the paths inside the -# compiler binary are relative to GOROOT_FINAL (PKG_GO_ROOT), which is -# static / not dependent on the build environment PKG_GO_INSTALL_ARGS= \ + -buildvcs=false \ + -trimpath \ -ldflags "all=$(PKG_GO_LDFLAGS)" \ $(if $(PKG_GO_GCFLAGS),-gcflags "all=$(PKG_GO_GCFLAGS)") \ $(if $(PKG_GO_ASMFLAGS),-asmflags "all=$(PKG_GO_ASMFLAGS)") \ From a7dfb006fe7478841e9a0f81ea594ab1a2fb04bf Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 12 Mar 2023 17:19:14 +0800 Subject: [PATCH 21/28] sqlite3: Update to 3.41.1 Removed `SQLITE3_JSON1` option as it was dropped by upstream. Signed-off-by: Tianling Shen --- libs/sqlite3/Config-lib.in | 6 ------ libs/sqlite3/Makefile | 10 ++++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/libs/sqlite3/Config-lib.in b/libs/sqlite3/Config-lib.in index 7fcdb1bde..12313c63d 100644 --- a/libs/sqlite3/Config-lib.in +++ b/libs/sqlite3/Config-lib.in @@ -39,12 +39,6 @@ config SQLITE3_FTS5 help Enable FTS5 support. -config SQLITE3_JSON1 - bool "JSON1 extension" - default y - help - Include JSON1 support. This is the default. - config SQLITE3_RTREE bool "R-Tree support" default y diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index 3f271e7d8..aad769dcb 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqlite -PKG_VERSION:=3400000 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3410100 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.sqlite.org/2022/ -PKG_HASH:=0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 +PKG_SOURCE_URL:=https://www.sqlite.org/2023/ +PKG_HASH:=4dadfbeab9f8e16c695d4fbbc51c16b2f77fb97ff4c1c3d139919dfc038c9e33 PKG_CPE_ID:=cpe:/a:sqlite:sqlite PKG_LICENSE:=PUBLICDOMAIN @@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS := \ CONFIG_SQLITE3_FTS3 \ CONFIG_SQLITE3_FTS4 \ CONFIG_SQLITE3_FTS5 \ - CONFIG_SQLITE3_JSON1 \ CONFIG_SQLITE3_LIBEDIT \ CONFIG_SQLITE3_READLINE \ CONFIG_SQLITE3_RTREE \ @@ -110,7 +109,6 @@ CONFIGURE_ARGS += \ $(if $(CONFIG_SQLITE3_FTS3),--enable-fts3,--disable-fts3) \ $(if $(CONFIG_SQLITE3_FTS4),--enable-fts4,--disable-fts4) \ $(if $(CONFIG_SQLITE3_FTS5),--enable-fts5,--disable-fts5) \ - $(if $(CONFIG_SQLITE3_JSON1),--enable-json1,--disable-json1) \ $(if $(CONFIG_SQLITE3_RTREE),--enable-rtree,--disable-rtree) \ $(if $(CONFIG_SQLITE3_SESSION),--enable-session,--disable-session) From cdf5f9b0e91ff4d71c532a9415b608e91bc6d3a7 Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 13 Mar 2023 09:41:01 -0400 Subject: [PATCH 22/28] snort3: update to 3.1.57.0 Upstream bump Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 2c989ccb3..68e2bbe1c 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.56.0 +PKG_VERSION:=3.1.57.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=b757705e1ee2a560b94791b3f474fe1c562c98049ebb0c807e8f612c7c38032d +PKG_HASH:=cec779dde2fbf7e3d20b721c04b89f6f84ef663bf1afba06535188e7c766721c PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From 0729764f96d7ee8430eb63b2a7e640f1e1148ebd Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 14 Mar 2023 21:47:06 +0100 Subject: [PATCH 23/28] php8: update to 8.2.3 This fixes: - CVE-2023-0567 - CVE-2023-0568 - CVE-2023-0662 Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index b2c138f1e..0ca19d979 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.2.2 +PKG_VERSION:=8.2.3 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 +PKG_HASH:=b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 From 1e02e30622a43fa1d115240d1b7906bdc05d5955 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 12 Mar 2023 18:42:26 +0200 Subject: [PATCH 24/28] libjpeg-turbo: enable static library Allow build of libjpeg as a static library as well; one is provided for libpng and possibly for other formats as well. Signed-off-by: Oskari Rauta --- libs/libjpeg-turbo/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile index ecf6a1f94..7aed20d33 100644 --- a/libs/libjpeg-turbo/Makefile +++ b/libs/libjpeg-turbo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libjpeg-turbo PKG_VERSION:=2.1.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -50,7 +50,7 @@ endef CMAKE_OPTIONS += \ -DENABLE_SHARED=ON \ - -DENABLE_STATIC=OFF \ + -DENABLE_STATIC=ON \ -DREQUIRE_SIMD=OFF \ -DWITH_12BIT=OFF \ -DWITH_ARITH_DEC=OFF \ @@ -73,6 +73,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.a $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/ $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libjpeg.pc From 56f30520f2413f9f1434def5b533a265912aea1c Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 12 Mar 2023 18:30:35 +0200 Subject: [PATCH 25/28] zerotier: do not allow executable stack zerotier as default has executable stack. [ 11.343143] process '/usr/bin/zerotier-one' started with executable stack executable stacks are not recommend, possibly provide a threat and there seems to be no advantage of executable stack with zerotier-one - so let's build it without instead. Stack is executable on x86_64, but not on all archs, such as ramips. Signed-off-by: Oskari Rauta --- net/zerotier/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 47e3f7a63..01ad05248 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -58,8 +58,8 @@ endif endef # Make binary smaller -TARGET_CFLAGS += -ffunction-sections -fdata-sections -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed +TARGET_CFLAGS += -ffunction-sections -fdata-sections -Wl,-z,noexecstack +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -Wl,-z,noexecstack define Package/zerotier/conffiles /etc/config/zerotier From 7833429fd4542c428c68437c5607cfd80d2f0bd8 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 15 Mar 2023 17:34:17 +0100 Subject: [PATCH 26/28] udpspeeder: bump to 20230206.0 Signed-off-by: Toni Uhlig --- net/udpspeeder/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/udpspeeder/Makefile b/net/udpspeeder/Makefile index 255bd05e6..cfa6a7f19 100644 --- a/net/udpspeeder/Makefile +++ b/net/udpspeeder/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UDPspeeder -PKG_VERSION:=20210116.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=20230206.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/wangyu-/$(PKG_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=657ae24dfd592a1f6f114342231b24d09baec712957969f425477b9f9fd5994a +PKG_HASH:=c6b0c45e971360b25cd49be0369e94b2fb12f649d39c7e60c172c14a9e3a4e0d PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Nishant Sharma +PKG_MAINTAINER:=Nishant Sharma , Toni Uhlig PKG_BUILD_PARALLEL:=1 From c35736da491ae863c6ced7b63d731e948bb6b000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=A1k?= Date: Wed, 15 Mar 2023 14:01:56 +0100 Subject: [PATCH 27/28] liburcu: update to version 0.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Hák --- libs/liburcu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/liburcu/Makefile b/libs/liburcu/Makefile index 7d4d84d4c..6db265c89 100644 --- a/libs/liburcu/Makefile +++ b/libs/liburcu/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburcu -PKG_VERSION:=0.13.2 +PKG_VERSION:=0.14.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Salzman @@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=lgpl-2.1.txt gpl-2.0.txt lgpl-relicensing.txt PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://lttng.org/files/urcu/ -PKG_HASH:=1213fd9f1b0b74da7de2bb74335b76098db9738fec5d3cdc07c0c524f34fc032 +PKG_HASH:=ca43bf261d4d392cff20dfae440836603bf009fce24fdc9b2697d837a2239d4f PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION) PKG_FIXUP:=autoreconf From a71341148c47b4e8a0f00c38a60c41f4888d2ff2 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 22 Feb 2023 13:23:33 +0100 Subject: [PATCH 28/28] libndpi: Update to 4.6 Signed-off-by: Toni Uhlig --- libs/libndpi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile index a4142c66d..41878f57e 100644 --- a/libs/libndpi/Makefile +++ b/libs/libndpi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libndpi -PKG_VERSION:=4.4 +PKG_VERSION:=4.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ntop/nDPI/tar.gz/$(PKG_VERSION)? -PKG_HASH:=5df3a7bc251e3838079c403707334c1cd93f20c17b33e31e090f30a16adb3702 +PKG_HASH:=6f307e23ab11b2b9e84a696120810e27a854072576a49783ff84fd37a1d7411b PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION) PKG_MAINTAINER:=Banglang Huang , Toni Uhlig