From 0a880d7c31e19f062f69538ce2911e8c2748fa22 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:09:31 +0000 Subject: [PATCH 01/11] update base image to Fedora 37 Signed-off-by: Ben Cressey --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bd27233d..0e6fa757 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/docker/library/fedora:36 as base +FROM public.ecr.aws/docker/library/fedora:37 as base # Everything we need to build our SDK and packages. RUN \ @@ -15,6 +15,8 @@ RUN \ perl-FindBin perl-IPC-Cmd perl-open policycoreutils \ secilc qemu-img glib2-devel rpcgen erofs-utils jq ShellCheck \ json-c-devel libcurl-devel p11-kit-devel && \ + dnf config-manager --set-disabled \ + fedora-modular updates-modular fedora-cisco-openh264 && \ dnf clean all && \ useradd builder COPY ./sdk-fetch /usr/local/bin From 54db7df8255119b77d6dd9d3fdfe3a88961d8043 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Tue, 3 Jan 2023 15:54:30 +0000 Subject: [PATCH 02/11] update Buildroot to 2022.11 Signed-off-by: Ben Cressey --- Dockerfile | 14 ++++++------- hashes/buildroot | 20 +++++++++---------- hashes/kernel | 4 ++-- ...-for-host-builds-of-gmp-isl-mpc-mpfr.patch | 10 +++++----- ...IR-and-SYSROOT_DIR-to-control-output.patch | 16 +++++++-------- ...utils-with-TOOLS_DIR-and-SYSROOT_DIR.patch | 19 ++++++++++-------- ...d-gcc-with-TOOLS_DIR-and-SYSROOT_DIR.patch | 16 ++++++++------- ...tils-bring-back-sysroot-fix-for-2.38.patch | 4 ++-- 8 files changed, 54 insertions(+), 49 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e6fa757..45fb5edf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,8 +45,8 @@ RUN \ git config --global user.name "Builder" && \ git config --global user.email "builder@localhost" -ARG BRVER="2022.05.2" -ARG KVER="5.10.129" +ARG BRVER="2022.11" +ARG KVER="5.10.155" WORKDIR /home/builder COPY ./hashes/buildroot ./hashes @@ -68,7 +68,7 @@ RUN \ FROM toolchain as toolchain-gnu ARG ARCH -ARG KVER="5.10.129" +ARG KVER="5.10.155" RUN \ make O=output/${ARCH}-gnu defconfig BR2_DEFCONFIG=configs/sdk_${ARCH}_gnu_defconfig && \ make O=output/${ARCH}-gnu toolchain && \ @@ -92,7 +92,7 @@ RUN \ FROM toolchain as toolchain-musl ARG ARCH -ARG KVER="5.10.129" +ARG KVER="5.10.155" RUN \ make O=output/${ARCH}-musl defconfig BR2_DEFCONFIG=configs/sdk_${ARCH}_musl_defconfig && \ make O=output/${ARCH}-musl toolchain && \ @@ -126,7 +126,7 @@ FROM base as sdk USER root ARG ARCH -ARG KVER="5.10.129" +ARG KVER="5.10.155" WORKDIR / @@ -172,7 +172,7 @@ ARG SYSROOT="/${TARGET}/sys-root" ARG CFLAGS="-O2 -g -Wp,-D_GLIBCXX_ASSERTIONS -fstack-clash-protection" ARG CXXFLAGS="${CFLAGS}" ARG CPPFLAGS="" -ARG KVER="5.4" +ARG KVER="5.10.155" WORKDIR /home/builder/glibc/build RUN \ @@ -451,7 +451,7 @@ FROM sdk-libc as sdk-bootconfig USER root -ARG KVER="5.10.129" +ARG KVER="5.10.155" RUN \ mkdir -p /usr/libexec/tools /usr/share/licenses/bootconfig && \ diff --git a/hashes/buildroot b/hashes/buildroot index 2d17a5c6..5408b7a7 100644 --- a/hashes/buildroot +++ b/hashes/buildroot @@ -1,23 +1,23 @@ -# https://github.com/buildroot/buildroot/archive/2022.05.2.tar.gz -SHA512 (buildroot-2022.05.2.tar.gz) = 15f9c521d93a48d43b6201cc1ab246d72ce295063fb3e1a4e963703f420053c6b01dac416b81679a04937eb0f54b0bde7a3e85bab4e434e2e6237443bab2ecc2 +# https://buildroot.org/downloads/buildroot-2022.11.tar.gz +SHA512 (buildroot-2022.11.tar.gz) = 467241a472b4eef484e756100f348214c469ae0bed31afa8536681816742b2ac00a0b4ca50f14829d1dfc6fdfba75a4885555f9aeab47b0cde3226d5086d5687 # https://mirrors.kernel.org/gnu/binutils/binutils-2.38.tar.xz SHA512 (binutils-2.38.tar.xz) = 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d # https://mirrors.kernel.org/gnu/bison/bison-3.8.2.tar.xz SHA512 (bison-3.8.2.tar.xz) = d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 -# https://mirrors.kernel.org/gnu/gawk/gawk-5.1.1.tar.xz -SHA512 (gawk-5.1.1.tar.xz) = 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43 +# https://mirrors.kernel.org/gnu/gawk/gawk-5.2.0.tar.xz +SHA512 (gawk-5.2.0.tar.xz) = e81e1efb1be06f82602e704d10e8de4b78797d058d9718d353e0837660dc8adf952965240c0a3b1a71c3e295f2e9641eacf64496d1d896edd81b101e09a656ac # https://mirrors.kernel.org/gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz SHA512 (gcc-10.4.0.tar.xz) = 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 -# https://github.com/bminor/glibc/archive/b6aade18a7e5719c942aa2da6cf3157aca993fa4.tar.gz -SHA512 (glibc-2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4.tar.gz) = 6b800a60d67fd499e797550e5aad9ffacdb7fd0ba1d2520379d3a0cdf19475f60aafde387c7afa5185fd5c9e5584cf15c741991267dfa64910aa1e40825453ba +# https://github.com/bminor/glibc/archive/a1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz +SHA512 (glibc-2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz) = d6dec5934fbd83a0b544b84dd4a1185c78cf4f965ee2d28bbdf3f72c1c206d72b13e52a9e79b663b6111decc0472b7cdb41024b3c2674f8b86eac1642870bc9a # https://mirrors.kernel.org/gnu/gmp/gmp-6.2.1.tar.xz SHA512 (gmp-6.2.1.tar.xz) = c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 -# https://libisl.sourceforge.io/isl-0.23.tar.xz -SHA512 (isl-0.23.tar.xz) = da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20 +# https://libisl.sourceforge.io/isl-0.25.tar.xz +SHA512 (isl-0.25.tar.xz) = 81ac6b404a71e146bb705efe647ecf3bee19c3254f534cb44228cec13ffc7a33d7d58b980106dbb120ffdc557403d966619e219328edd0a4b3cbc4ac66acb255 # https://musl.libc.org/releases/musl-1.2.3.tar.gz SHA512 (musl-1.2.3.tar.gz) = 9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c -# https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.129.tar.xz -SHA512 (linux-5.10.129.tar.xz) = fa3080b5f0f135d721b25786a658c984c454bc40e68b2c408a5bb23a21cf5f8b91deba9ee11480b89c8a0cd3d951f9217756b6aa0b14fd7aa51c14d1ee4a0e49 +# https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.155.tar.xz +SHA512 (linux-5.10.155.tar.xz) = fc763f7854ed5e8964fee2acc2f521caa215cbfa76dd7a054173fcf37f74ef543820e7b026c0ee2c01c178eb22c89ad334ec9559950772ec278d78d95b32d33c # https://mirrors.kernel.org/gnu/m4/m4-1.4.19.tar.xz SHA512 (m4-1.4.19.tar.xz) = 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b # https://mirrors.kernel.org/gnu/mpc/mpc-1.2.1.tar.gz diff --git a/hashes/kernel b/hashes/kernel index a707c5bb..c58e0cdc 100644 --- a/hashes/kernel +++ b/hashes/kernel @@ -1,2 +1,2 @@ -# https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.129.tar.xz -SHA512 (linux-5.10.129.tar.xz) = fa3080b5f0f135d721b25786a658c984c454bc40e68b2c408a5bb23a21cf5f8b91deba9ee11480b89c8a0cd3d951f9217756b6aa0b14fd7aa51c14d1ee4a0e49 +# https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.155.tar.xz +SHA512 (linux-5.10.155.tar.xz) = fc763f7854ed5e8964fee2acc2f521caa215cbfa76dd7a054173fcf37f74ef543820e7b026c0ee2c01c178eb22c89ad334ec9559950772ec278d78d95b32d33c diff --git a/patches/buildroot/0001-disable-shared-for-host-builds-of-gmp-isl-mpc-mpfr.patch b/patches/buildroot/0001-disable-shared-for-host-builds-of-gmp-isl-mpc-mpfr.patch index e36aaf12..39c086ba 100644 --- a/patches/buildroot/0001-disable-shared-for-host-builds-of-gmp-isl-mpc-mpfr.patch +++ b/patches/buildroot/0001-disable-shared-for-host-builds-of-gmp-isl-mpc-mpfr.patch @@ -1,4 +1,4 @@ -From dc72132b09daa401e9631c9af6463d93f035682d Mon Sep 17 00:00:00 2001 +From 9e6d1c176a007d6751e3acd02f96becee48ef361 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 6 Aug 2017 23:15:02 +0000 Subject: [PATCH] disable shared for host builds of gmp, isl, mpc, mpfr @@ -17,10 +17,10 @@ Signed-off-by: Ben Cressey 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in -index 580e9d14ca..0021a07922 100644 +index 43d214bcbe..3e9036b96f 100644 --- a/package/Makefile.in +++ b/package/Makefile.in -@@ -252,7 +252,7 @@ HOST_CPPFLAGS = -I$(HOST_DIR)/include +@@ -243,7 +243,7 @@ HOST_CPPFLAGS = -I$(HOST_DIR)/include HOST_CFLAGS ?= -O2 HOST_CFLAGS += $(HOST_CPPFLAGS) HOST_CXXFLAGS += $(HOST_CFLAGS) @@ -45,7 +45,7 @@ index 9b402767fd..fe7cf05d8e 100644 GMP_IGNORE_CVES += CVE-2021-43618 diff --git a/package/isl/isl.mk b/package/isl/isl.mk -index df57c83f55..1607ed9c6d 100644 +index ce9aaecebc..883bf3a830 100644 --- a/package/isl/isl.mk +++ b/package/isl/isl.mk @@ -11,4 +11,8 @@ ISL_LICENSE = MIT @@ -86,5 +86,5 @@ index cd558dae0e..74080ec884 100644 $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- -2.36.1 +2.37.2 diff --git a/patches/buildroot/0002-add-TOOLS_DIR-and-SYSROOT_DIR-to-control-output.patch b/patches/buildroot/0002-add-TOOLS_DIR-and-SYSROOT_DIR-to-control-output.patch index 4d235379..df157218 100644 --- a/patches/buildroot/0002-add-TOOLS_DIR-and-SYSROOT_DIR-to-control-output.patch +++ b/patches/buildroot/0002-add-TOOLS_DIR-and-SYSROOT_DIR-to-control-output.patch @@ -1,4 +1,4 @@ -From 83d5eb34a63c6a098d7bdfc11cc3be5839df60a6 Mon Sep 17 00:00:00 2001 +From c137f14fade2ae3c23ab389b2e3e99f8bb5a55ab Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 6 Aug 2017 23:35:06 +0000 Subject: [PATCH] add TOOLS_DIR and SYSROOT_DIR to control output @@ -24,7 +24,7 @@ Signed-off-by: Ben Cressey 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 412e1decd3..e85c2cd15e 100644 +index 89f3648bb7..84591e22de 100644 --- a/Makefile +++ b/Makefile @@ -218,6 +218,7 @@ PER_PACKAGE_DIR := $(BASE_DIR)/per-package @@ -35,7 +35,7 @@ index 412e1decd3..e85c2cd15e 100644 LEGAL_INFO_DIR = $(BASE_DIR)/legal-info REDIST_SOURCES_DIR_TARGET = $(LEGAL_INFO_DIR)/sources -@@ -488,7 +489,9 @@ export BR2_CONFIG +@@ -487,7 +488,9 @@ export BR2_CONFIG export BR2_REPRODUCIBLE export TARGET_DIR export STAGING_DIR @@ -45,7 +45,7 @@ index 412e1decd3..e85c2cd15e 100644 export BINARIES_DIR export BASE_DIR -@@ -1037,7 +1040,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +@@ -1036,7 +1039,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else @@ -54,7 +54,7 @@ index 412e1decd3..e85c2cd15e 100644 @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a -@@ -1093,7 +1096,7 @@ show-vars: check-make-version +@@ -1099,7 +1102,7 @@ show-vars: clean: rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ @@ -64,10 +64,10 @@ index 412e1decd3..e85c2cd15e 100644 .PHONY: distclean diff --git a/package/Makefile.in b/package/Makefile.in -index 0021a07922..2a140b66f8 100644 +index 3e9036b96f..75dd28daa4 100644 --- a/package/Makefile.in +++ b/package/Makefile.in -@@ -117,8 +117,9 @@ ifeq ($(BR2_xtensa),y) +@@ -108,8 +108,9 @@ ifeq ($(BR2_xtensa),y) TARGET_ABI += -mlongcalls -mauto-litpools endif @@ -79,5 +79,5 @@ index 0021a07922..2a140b66f8 100644 ifeq ($(BR2_OPTIMIZE_0),y) TARGET_OPTIMIZATION = -O0 -- -2.36.1 +2.37.2 diff --git a/patches/buildroot/0003-build-binutils-with-TOOLS_DIR-and-SYSROOT_DIR.patch b/patches/buildroot/0003-build-binutils-with-TOOLS_DIR-and-SYSROOT_DIR.patch index 8a949327..703f4505 100644 --- a/patches/buildroot/0003-build-binutils-with-TOOLS_DIR-and-SYSROOT_DIR.patch +++ b/patches/buildroot/0003-build-binutils-with-TOOLS_DIR-and-SYSROOT_DIR.patch @@ -1,4 +1,4 @@ -From 27cfb1671cf32ad1c8bdc430aa0ad41aea3bb0e3 Mon Sep 17 00:00:00 2001 +From 1fb43df9f191688a043758e6af44b9c188a40f12 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 6 Aug 2017 23:40:50 +0000 Subject: [PATCH] build binutils with TOOLS_DIR and SYSROOT_DIR @@ -16,10 +16,10 @@ Signed-off-by: Ben Cressey 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk -index c94ebe0995..4682c90b37 100644 +index 1ef7ee57d2..5fbaef88bb 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk -@@ -64,9 +64,10 @@ endif +@@ -65,9 +65,10 @@ endif BINUTILS_CONF_ENV += MAKEINFO=true BINUTILS_MAKE_OPTS += MAKEINFO=true BINUTILS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MAKEINFO=true install @@ -31,7 +31,7 @@ index c94ebe0995..4682c90b37 100644 # Workaround a build issue with -Os for ARM Cortex-M cpus. # (Binutils 2.25.1 and 2.26.1) -@@ -83,12 +84,16 @@ HOST_BINUTILS_CONF_OPTS = \ +@@ -84,8 +85,7 @@ HOST_BINUTILS_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ --disable-shared \ --enable-static \ @@ -39,8 +39,11 @@ index c94ebe0995..4682c90b37 100644 - --enable-poison-system-directories \ + --with-sysroot=$(SYSROOT_DIR) \ --without-debuginfod \ - $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ - $(BINUTILS_EXTRA_CONFIG_OPTIONS) + --enable-plugins \ + --enable-lto \ +@@ -99,6 +99,11 @@ else + HOST_BINUTILS_CONF_OPTS += --disable-gprofng + endif +HOST_BINUTILS_CONF_OPTS += \ + --prefix="/usr" \ @@ -50,7 +53,7 @@ index c94ebe0995..4682c90b37 100644 # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) -@@ -137,5 +142,17 @@ define HOST_BINUTILS_FIXUP_HARDLINKS +@@ -143,5 +148,17 @@ define HOST_BINUTILS_FIXUP_HARDLINKS endef HOST_BINUTILS_POST_INSTALL_HOOKS += HOST_BINUTILS_FIXUP_HARDLINKS @@ -69,5 +72,5 @@ index c94ebe0995..4682c90b37 100644 $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- -2.36.1 +2.37.2 diff --git a/patches/buildroot/0004-build-gcc-with-TOOLS_DIR-and-SYSROOT_DIR.patch b/patches/buildroot/0004-build-gcc-with-TOOLS_DIR-and-SYSROOT_DIR.patch index d01eeece..a2e1bd1e 100644 --- a/patches/buildroot/0004-build-gcc-with-TOOLS_DIR-and-SYSROOT_DIR.patch +++ b/patches/buildroot/0004-build-gcc-with-TOOLS_DIR-and-SYSROOT_DIR.patch @@ -1,4 +1,4 @@ -From ed6f8ff7bc4d686d6cdd0df4725a820086c67f27 Mon Sep 17 00:00:00 2001 +From 37b4493d05be97ecec83d814e65e77a2d11631d2 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 6 Aug 2017 23:58:27 +0000 Subject: [PATCH] build gcc with TOOLS_DIR and SYSROOT_DIR @@ -166,7 +166,7 @@ index aa883beb7b..0f61ff0df1 100644 + $(eval $(host-autotools-package)) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk -index f5bc6c5b77..9f34effd10 100644 +index ebd8e8f017..ec9fcd13c1 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -34,6 +34,7 @@ HOST_GCC_INITIAL_CONF_OPTS = \ @@ -177,7 +177,7 @@ index f5bc6c5b77..9f34effd10 100644 --without-headers \ --disable-threads \ --with-newlib \ -@@ -46,9 +47,11 @@ HOST_GCC_INITIAL_CONF_ENV = \ +@@ -53,9 +54,11 @@ endif HOST_GCC_INITIAL_MAKE_OPTS = $(HOST_GCC_COMMON_MAKE_OPTS) all-gcc all-target-libgcc HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc @@ -190,10 +190,10 @@ index f5bc6c5b77..9f34effd10 100644 $(eval $(host-autotools-package)) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk -index 128cf8421d..5066ed55c5 100644 +index ec6f3b550a..6d4f6e0b20 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk -@@ -69,12 +69,12 @@ HOST_GCC_COMMON_DEPENDENCIES = \ +@@ -69,7 +69,6 @@ HOST_GCC_COMMON_DEPENDENCIES = \ HOST_GCC_COMMON_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ @@ -201,12 +201,14 @@ index 128cf8421d..5066ed55c5 100644 --enable-__cxa_atexit \ --with-gnu-ld \ --disable-libssp \ - --disable-multilib \ +@@ -77,6 +76,7 @@ HOST_GCC_COMMON_CONF_OPTS = \ --disable-decimal-float \ + --enable-plugins \ + --enable-lto \ + --enable-linker-build-id \ --with-gmp=$(HOST_DIR) \ --with-mpc=$(HOST_DIR) \ --with-mpfr=$(HOST_DIR) \ -- -2.36.1 +2.37.2 diff --git a/patches/buildroot/0005-package-binutils-bring-back-sysroot-fix-for-2.38.patch b/patches/buildroot/0005-package-binutils-bring-back-sysroot-fix-for-2.38.patch index 4b51fe96..e7d68554 100644 --- a/patches/buildroot/0005-package-binutils-bring-back-sysroot-fix-for-2.38.patch +++ b/patches/buildroot/0005-package-binutils-bring-back-sysroot-fix-for-2.38.patch @@ -1,4 +1,4 @@ -From 958d6b24f0eab8b00392cee3c973ac9bed5a027a Mon Sep 17 00:00:00 2001 +From a6df7ffb2d109177a97bf6e9da08028c17f2bcc7 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Fri, 15 Mar 2019 18:32:49 +0000 Subject: [PATCH] package/binutils: bring back sysroot fix for 2.38 @@ -69,5 +69,5 @@ index 0000000000..7674fa3ad9 +2.36.1 + -- -2.36.1 +2.37.2 From 9a348078306aa0859c7ddf7723ff002b4a261aee Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Tue, 3 Jan 2023 15:54:50 +0000 Subject: [PATCH 03/11] switch to GCC 11 Signed-off-by: Ben Cressey --- configs/buildroot/sdk_aarch64_gnu_defconfig | 2 +- configs/buildroot/sdk_aarch64_musl_defconfig | 2 +- configs/buildroot/sdk_x86_64_gnu_defconfig | 2 +- configs/buildroot/sdk_x86_64_musl_defconfig | 2 +- hashes/buildroot | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/buildroot/sdk_aarch64_gnu_defconfig b/configs/buildroot/sdk_aarch64_gnu_defconfig index a67ad0fe..9d23697c 100644 --- a/configs/buildroot/sdk_aarch64_gnu_defconfig +++ b/configs/buildroot/sdk_aarch64_gnu_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_VENDOR="bottlerocket" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_KERNEL_HEADERS_5_10=y BR2_BINUTILS_VERSION_2_38_X=y -BR2_GCC_VERSION_10_X=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_GCC_ENABLE_GRAPHITE=y diff --git a/configs/buildroot/sdk_aarch64_musl_defconfig b/configs/buildroot/sdk_aarch64_musl_defconfig index 5b231aaa..1fbf6bf3 100644 --- a/configs/buildroot/sdk_aarch64_musl_defconfig +++ b/configs/buildroot/sdk_aarch64_musl_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_VENDOR="bottlerocket" BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_KERNEL_HEADERS_5_10=y BR2_BINUTILS_VERSION_2_38_X=y -BR2_GCC_VERSION_10_X=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_GCC_ENABLE_GRAPHITE=y diff --git a/configs/buildroot/sdk_x86_64_gnu_defconfig b/configs/buildroot/sdk_x86_64_gnu_defconfig index fb12223b..627a964a 100644 --- a/configs/buildroot/sdk_x86_64_gnu_defconfig +++ b/configs/buildroot/sdk_x86_64_gnu_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_VENDOR="bottlerocket" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_KERNEL_HEADERS_5_10=y BR2_BINUTILS_VERSION_2_38_X=y -BR2_GCC_VERSION_10_X=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_GCC_ENABLE_GRAPHITE=y diff --git a/configs/buildroot/sdk_x86_64_musl_defconfig b/configs/buildroot/sdk_x86_64_musl_defconfig index 555319f9..939a2650 100644 --- a/configs/buildroot/sdk_x86_64_musl_defconfig +++ b/configs/buildroot/sdk_x86_64_musl_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_VENDOR="bottlerocket" BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_KERNEL_HEADERS_5_10=y BR2_BINUTILS_VERSION_2_38_X=y -BR2_GCC_VERSION_10_X=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_GCC_ENABLE_GRAPHITE=y diff --git a/hashes/buildroot b/hashes/buildroot index 5408b7a7..60e375c3 100644 --- a/hashes/buildroot +++ b/hashes/buildroot @@ -6,8 +6,8 @@ SHA512 (binutils-2.38.tar.xz) = 8bf0b0d193c9c010e0518ee2b2e5a830898af20651099248 SHA512 (bison-3.8.2.tar.xz) = d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 # https://mirrors.kernel.org/gnu/gawk/gawk-5.2.0.tar.xz SHA512 (gawk-5.2.0.tar.xz) = e81e1efb1be06f82602e704d10e8de4b78797d058d9718d353e0837660dc8adf952965240c0a3b1a71c3e295f2e9641eacf64496d1d896edd81b101e09a656ac -# https://mirrors.kernel.org/gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz -SHA512 (gcc-10.4.0.tar.xz) = 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 +# https://mirrors.kernel.org/gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz +SHA512 (gcc-11.3.0.tar.xz) = f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 # https://github.com/bminor/glibc/archive/a1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz SHA512 (glibc-2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz) = d6dec5934fbd83a0b544b84dd4a1185c78cf4f965ee2d28bbdf3f72c1c206d72b13e52a9e79b663b6111decc0472b7cdb41024b3c2674f8b86eac1642870bc9a # https://mirrors.kernel.org/gnu/gmp/gmp-6.2.1.tar.xz From fc9b1e6b7f6dc243e69d21338fd17e3ae09a6107 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:15:58 +0000 Subject: [PATCH 04/11] update LLVM to 15.0.6 Signed-off-by: Ben Cressey --- Dockerfile | 5 ++++- hashes/libunwind | 14 ++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45fb5edf..b19402ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -241,7 +241,7 @@ RUN make install RUN \ install -p -m 0644 -Dt ${SYSROOT}/usr/share/licenses/musl COPYRIGHT -ARG LLVMVER="14.0.6" +ARG LLVMVER="15.0.6" USER builder WORKDIR /home/builder @@ -250,6 +250,9 @@ WORKDIR /home/builder COPY ./hashes/libunwind ./hashes RUN \ sdk-fetch hashes && \ + tar xf cmake-${LLVMVER}.src.tar.xz && \ + rm cmake-${LLVMVER}.src.tar.xz && \ + mv cmake-${LLVMVER}.src cmake && \ tar xf llvm-${LLVMVER}.src.tar.xz && \ rm llvm-${LLVMVER}.src.tar.xz && \ mv llvm-${LLVMVER}.src llvm && \ diff --git a/hashes/libunwind b/hashes/libunwind index 235c8b2c..03b6ec76 100644 --- a/hashes/libunwind +++ b/hashes/libunwind @@ -1,6 +1,8 @@ -# https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-14.0.6.src.tar.xz -SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d -# https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/libcxx-14.0.6.src.tar.xz -SHA512 (libcxx-14.0.6.src.tar.xz) = c39bb01317e8ae7e5b23a677754a866953b6c45188c194d3d76fbd276de9565df8bcbcab8cf6606584af7dd30a61f39376c0e2de6b8c32c69f7fc592587e710d -# https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/libunwind-14.0.6.src.tar.xz -SHA512 (libunwind-14.0.6.src.tar.xz) = c8f3804c47ac33273238899e5682f9cb52465dcceff0e0ecf9925469620c6c9a62cc2c708a35a0e156b666e1198df52c5fff1da9d5ee3194605dfd62c296b058 +# https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-15.0.6.src.tar.xz +SHA512 (llvm-15.0.6.src.tar.xz) = 91b53674c140f8eda6e8373a9e3ea013807236e98702b6666f3b4144d95d97dcfa0a59591ab74aa7a320c32f88d579a585dc5a6db6666f1754f68493f95cff1e +# https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/libcxx-15.0.6.src.tar.xz +SHA512 (libcxx-15.0.6.src.tar.xz) = 9ad8bc3d547e3f5e7fe123a9a1e39be523dff71c10feaed773c6a2698fbba54fb8c89760409e3b982007787c63ce7ae410fc1fe05aa7b3cb284589f85cb3bbc8 +# https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/libunwind-15.0.6.src.tar.xz +SHA512 (libunwind-15.0.6.src.tar.xz) = 9e888d66112ee2b275cad03c102a2c07ddfd01167a0c88fab17a4a190008f5c1a7a21c7e78b449f48321bc920f9fb8d64508075e4e175617c8cc0b4aeb343c3e +# https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/cmake-15.0.6.src.tar.xz +SHA512 (cmake-15.0.6.src.tar.xz) = a078b9b426515414dae41c8732d7cd955e8ddc9638b4ba9c7dd0925db68e5ea760096f08fd7e1cb9d55b6d73da75f9b4318a2fac36d7aa64f47536ac383b3edc From 767ed59306449fb1bb878b155c9d82298775df46 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:16:15 +0000 Subject: [PATCH 05/11] update Rust to 1.66.1 Signed-off-by: Ben Cressey --- Dockerfile | 2 +- hashes/rust | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index b19402ba..b83d884f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -378,7 +378,7 @@ RUN \ ARG ARCH ARG HOST_ARCH ARG VENDOR="bottlerocket" -ARG RUSTVER="1.64.0" +ARG RUSTVER="1.66.1" USER builder WORKDIR /home/builder diff --git a/hashes/rust b/hashes/rust index 10cf9fef..2c76274b 100644 --- a/hashes/rust +++ b/hashes/rust @@ -1,15 +1,15 @@ -# https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz -SHA512 (rustc-1.64.0-src.tar.xz) = 919f40acd8c6eaaef399aa3248503bea19feb96697ab221aaede9ee789ce340b47cb899d1e0e41a31e5d7756653968a10d2faaa4aee83294c9f1243949b43516 -### See https://github.com/rust-lang/rust/blob/1.64.0/src/stage0.json for what to use below. ### -# https://static.rust-lang.org/dist/2022-08-11/rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.xz -SHA512 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = eca41446533676b9601aafafa18d97868ed00f459b7ab5888edc5113d5526d0c52d285264c80dc0a3da58a309799b9e773873f0135f02628deddd6aceed173a6 -# https://static.rust-lang.org/dist/2022-08-11/rustc-1.63.0-x86_64-unknown-linux-gnu.tar.xz -SHA512 (rustc-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = 65e37539519a60c1bf18a64fcac25f8f70b8f51ab823451f6db378097dc4d02e2afb93ed8f1419e8cae8fcb28acc0cf3a2218fd32c3e8388ec508e57274d4462 -# https://static.rust-lang.org/dist/2022-08-11/cargo-1.63.0-x86_64-unknown-linux-gnu.tar.xz -SHA512 (cargo-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = dfa9bf7b46dd73bb68578d5292183e4551b90df33b0908040993afeb15dd695714fcc5a362025a199660f51e93a26f8c19ef1d81a7dbe39235999344248e829f -# https://static.rust-lang.org/dist/2022-08-11/rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.xz -SHA512 (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.xz) = 8193e0fc56a6bac6765c9d778de0670deda620f0afde84fc55b82c4f8b57fd2b01e24da9318279052ca09ca122c7f2a4b564de8f690d78f82c9f50fda3ab24c0 -# https://static.rust-lang.org/dist/2022-08-11/rustc-1.63.0-aarch64-unknown-linux-gnu.tar.xz -SHA512 (rustc-1.63.0-aarch64-unknown-linux-gnu.tar.xz) = 96f2e5826da165bd5b642f2f80a658a9a7389441530f83b5176aa711902c607c84cdcc215b60fdb6e90dfe31bca702620e5d7a387d8e61524fdbf659612c1f27 -# https://static.rust-lang.org/dist/2022-08-11/cargo-1.63.0-aarch64-unknown-linux-gnu.tar.xz -SHA512 (cargo-1.63.0-aarch64-unknown-linux-gnu.tar.xz) = 3a24279b3c9834dc78c3033ce245977b6ba0c1e24900edeb73156991abf8c2559dda850e3af309ad4b1cadfcaa5eb5dbc688fe94051e7a29d526100d1281e1c1 +# https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz +SHA512 (rustc-1.66.1-src.tar.xz) = 1944c024c603140d0a9236043a3bd1d0d211dd8d368d6d82a3a620f1ff43b29624755b0943f2b38b40a188c7eee77a840238ea757eaf435e2a3fa6a0e6b82832 +### See https://github.com/rust-lang/rust/blob/1.66.1/src/stage0.json for what to use below. ### +# https://static.rust-lang.org/dist/2022-11-03/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz +SHA512 (rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz) = 409d1466fa1b457bba20424509b6a7dc8864c64c05061f62b09cdc977d2e3967fdbe543ed73703736d525dd35ef8e74ca7304d4efa13622adf835172a65867d1 +# https://static.rust-lang.org/dist/2022-11-03/rustc-1.65.0-x86_64-unknown-linux-gnu.tar.xz +SHA512 (rustc-1.65.0-x86_64-unknown-linux-gnu.tar.xz) = 52601c4fb5057a55f504585f804e0c275d1268c4acd9ba5c5948b5e2d2d2de9ffee499810fe0bac8cd3773fadbdc049ecc55be606675562374a99c0fa06a8cb0 +# https://static.rust-lang.org/dist/2022-11-03/cargo-1.65.0-x86_64-unknown-linux-gnu.tar.xz +SHA512 (cargo-1.65.0-x86_64-unknown-linux-gnu.tar.xz) = b5735c8c39d04212e1ff9c214b15d76370ee10b0630490b3596ba6fbd5ad4025921d7d5e54177a7ba19bbefe4832f3741ee71eb90aa722d5fed161150e794258 +# https://static.rust-lang.org/dist/2022-11-03/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz +SHA512 (rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz) = 36af2e94c92faca1544d628d80bd2085ad678ed4e380f38a7219d714cb7586e1fbeebafe7702694a3fe0c44c1cc55a645f415fb100a12e4bed468507147a423a +# https://static.rust-lang.org/dist/2022-11-03/rustc-1.65.0-aarch64-unknown-linux-gnu.tar.xz +SHA512 (rustc-1.65.0-aarch64-unknown-linux-gnu.tar.xz) = f9c38b7b70ce9d34c9b288bb440e4c2a63e9e33524c01d04b9c349f468a2def70feced8e2500a8299c571ea701a57adfc0ac197805a37fa08940e0e25b405248 +# https://static.rust-lang.org/dist/2022-11-03/cargo-1.65.0-aarch64-unknown-linux-gnu.tar.xz +SHA512 (cargo-1.65.0-aarch64-unknown-linux-gnu.tar.xz) = ef774f892fcfc19c9598ae929d0da67a058e158651b94006f8d31028701cc16e6ccf2a4120eb71cd1fd7833922bd7ffd09739976565d4e398a3294c6a1dac0d8 From eee45ddd7b1b87c5e7d09a46fdb0b0e9b447ceaf Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:18:59 +0000 Subject: [PATCH 06/11] update SPDX license data to 3.19 Signed-off-by: Ben Cressey --- Dockerfile | 2 +- hashes/license-scan | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b83d884f..d33d3de6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -554,7 +554,7 @@ RUN rm /license-{scan,tool}/{clarify,deny}.toml FROM sdk-cargo as sdk-license-scan -ARG SPDXVER="3.18" +ARG SPDXVER="3.19" USER builder WORKDIR /home/builder/license-scan diff --git a/hashes/license-scan b/hashes/license-scan index c57f49d3..9a3f4d62 100644 --- a/hashes/license-scan +++ b/hashes/license-scan @@ -1,2 +1,2 @@ -# https://github.com/spdx/license-list-data/archive/v3.18.tar.gz#/license-list-data-3.18.tar.gz -SHA512 (license-list-data-3.18.tar.gz) = 44316691bb362f7e2ad3eb36a0e11a444634e2a8a07dc7efab55dafafd154c0469fcc6da7f75dc00b143dfaee7547ca3ae4ca8ee254f9219c01214c906d58814 +# https://github.com/spdx/license-list-data/archive/v3.19.tar.gz#/license-list-data-3.19.tar.gz +SHA512 (license-list-data-3.19.tar.gz) = 23d90eece2f164a00ad710c84c3f3194bf54830b4c2b5c2739c4bf713c95ab161697850eecb20d1c3dfbdad24aa795a75bf11f9473982824fc9fe885962b7433 From 4d2b88c0d2bf15502be2b005b21c59394cc46736 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:32:23 +0000 Subject: [PATCH 07/11] update cargo-deny to 0.13.5 Signed-off-by: Ben Cressey --- Dockerfile | 2 +- configs/cargo-deny/clarify.toml | 1 + hashes/cargo-deny | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d33d3de6..72435cca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -581,7 +581,7 @@ RUN cargo build --release --locked FROM sdk-cargo as sdk-cargo-deny -ARG DENYVER="0.12.2" +ARG DENYVER="0.13.5" USER builder WORKDIR /home/builder diff --git a/configs/cargo-deny/clarify.toml b/configs/cargo-deny/clarify.toml index 6cf550f1..d1867a86 100644 --- a/configs/cargo-deny/clarify.toml +++ b/configs/cargo-deny/clarify.toml @@ -203,6 +203,7 @@ skip-files = [ "src/text/licenses/CC-BY-3.0", "src/text/licenses/CC-BY-3.0-AT", "src/text/licenses/CC-BY-3.0-DE", + "src/text/licenses/CC-BY-3.0-IGO", "src/text/licenses/CC-BY-3.0-NL", "src/text/licenses/CC-BY-3.0-US", "src/text/licenses/CC-BY-4.0", diff --git a/hashes/cargo-deny b/hashes/cargo-deny index 1f30c5e9..3f1c6e6c 100644 --- a/hashes/cargo-deny +++ b/hashes/cargo-deny @@ -1,2 +1,2 @@ -# https://github.com/EmbarkStudios/cargo-deny/archive/0.12.2.tar.gz#/cargo-deny-0.12.2.tar.gz -SHA512 (cargo-deny-0.12.2.tar.gz) = 9810f0e3cbab91152979146be8a996967b1b25edc14e3b7e039154785e58618a00c9a13ad3ea436879b86ca93b7ab7f5df751baab5bbe15e1c52b604c46d9042 +# https://github.com/EmbarkStudios/cargo-deny/archive/0.13.5.tar.gz#/cargo-deny-0.13.5.tar.gz +SHA512 (cargo-deny-0.13.5.tar.gz) = 76da39d1924c640fa21998415360b6a0e8c1d0661913dd9485fa468897b2763bb74cda4bfe5a3177302de995969d39ddd02ec0a2f897596676186696a042dedf From 5d04e7368899d226ad73e76e562371421507e289 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:35:55 +0000 Subject: [PATCH 08/11] license-tool: update dependencies Signed-off-by: Ben Cressey --- license-tool/Cargo.lock | 331 ++++++++++++++++++++++------------------ license-tool/Cargo.toml | 2 +- license-tool/deny.toml | 4 + 3 files changed, 185 insertions(+), 152 deletions(-) diff --git a/license-tool/Cargo.lock b/license-tool/Cargo.lock index 1e5b65b1..35b4f772 100644 --- a/license-tool/Cargo.lock +++ b/license-tool/Cargo.lock @@ -4,24 +4,24 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.64" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "argh" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" +checksum = "c375edecfd2074d5edcc31396860b6e54b6f928714d0e097b983053fac0cabe3" dependencies = [ "argh_derive", "argh_shared", @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "argh_derive" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" +checksum = "aa013479b80109a1bf01a039412b0f0013d716f36921226d86c6709032fb7a03" dependencies = [ "argh_shared", "heck", @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "argh_shared" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" +checksum = "149f75bbec1827618262e0855a68f0f9a7f2edc13faebf33c4f16d6725edb6a9" [[package]] name = "autocfg" @@ -54,9 +54,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "bitflags" @@ -92,21 +98,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" [[package]] name = "cfg-if" @@ -126,12 +132,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -169,9 +174,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -183,9 +188,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -193,21 +198,21 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", @@ -216,21 +221,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -246,9 +251,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes", "fnv", @@ -271,18 +276,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -345,9 +347,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -369,9 +371,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -392,9 +394,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -411,15 +413,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" @@ -438,9 +440,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "log" @@ -465,40 +467,21 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mio" -version = "0.7.14" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", + "wasi", + "windows-sys", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", @@ -506,9 +489,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "percent-encoding" @@ -530,18 +513,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -557,9 +540,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -574,9 +557,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -589,11 +572,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -605,9 +588,9 @@ dependencies = [ "hyper-rustls", "ipnet", "js-sys", - "lazy_static", "log", "mime", + "once_cell", "percent-encoding", "pin-project-lite", "rustls", @@ -643,9 +626,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ "log", "ring", @@ -655,18 +638,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "sct" @@ -680,18 +663,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.144" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -700,9 +683,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -748,9 +731,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -788,9 +771,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.8.5" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc46ca74dd45faeaaf96a8fbe2406f425829705ee62100ccaa9b34a2145cff8" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" dependencies = [ "autocfg", "bytes", @@ -799,15 +782,16 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", + "socket2", "tokio-macros", - "winapi", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -827,9 +811,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", @@ -841,9 +825,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -856,41 +840,29 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "unicode-bidi" @@ -900,25 +872,19 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - [[package]] name = "untrusted" version = "0.7.1" @@ -947,6 +913,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.83" @@ -1035,9 +1007,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -1064,6 +1036,63 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.10.1" diff --git a/license-tool/Cargo.toml b/license-tool/Cargo.toml index 58a0d3cf..c555f103 100644 --- a/license-tool/Cargo.toml +++ b/license-tool/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1" argh = "0.1.7" reqwest = { version = "0.11.7", default-features = false, features = ["rustls-tls"] } serde = { version = "1", features = ["derive"] } -tokio = { version = "~1.8", default-features = false, features = ["macros", "rt-multi-thread"] } # LTS +tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread"] } toml = "0.5" url = { version = "2.2.2", features = ["serde"] } diff --git a/license-tool/deny.toml b/license-tool/deny.toml index 96751e66..fc334f69 100644 --- a/license-tool/deny.toml +++ b/license-tool/deny.toml @@ -43,6 +43,10 @@ license-files = [ # Deny multiple versions or wildcard dependencies. multiple-versions = "deny" wildcards = "deny" +skip = [ + # older version used by reqwest 0.11.13 + { name = "base64", version = "0.13.1" }, +] [sources] # Deny crates from unknown registries or git repositories. From e2e8b68396622eca977a4bbb04d61b7b38e37c12 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:37:16 +0000 Subject: [PATCH 09/11] license-scan: update dependencies Signed-off-by: Ben Cressey --- license-scan/Cargo.lock | 169 +++++++++++++++++++------------------- license-scan/clarify.toml | 3 +- 2 files changed, 88 insertions(+), 84 deletions(-) diff --git a/license-scan/Cargo.lock b/license-scan/Cargo.lock index 26d89b35..28ac2cc1 100644 --- a/license-scan/Cargo.lock +++ b/license-scan/Cargo.lock @@ -10,18 +10,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.64" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "askalono" @@ -73,11 +73,12 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.17" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" dependencies = [ "memchr", + "serde", ] [[package]] @@ -99,9 +100,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -155,26 +156,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -185,9 +184,9 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -201,9 +200,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -212,9 +211,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", "bstr", @@ -234,20 +233,19 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" dependencies = [ - "crossbeam-utils", "globset", "lazy_static", "log", @@ -261,15 +259,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" dependencies = [ "libc", ] @@ -282,9 +280,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "log" @@ -303,18 +301,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -330,9 +328,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", @@ -340,21 +338,27 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -382,18 +386,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -421,30 +425,28 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -454,9 +456,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -465,9 +467,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rmp" @@ -493,9 +495,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "same-file" @@ -530,18 +532,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.144" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -550,9 +552,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -561,9 +563,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "spdx" @@ -608,9 +610,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -652,9 +654,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -672,30 +674,30 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "version_check" @@ -772,10 +774,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/license-scan/clarify.toml b/license-scan/clarify.toml index b6f29f64..aab6f882 100644 --- a/license-scan/clarify.toml +++ b/license-scan/clarify.toml @@ -18,7 +18,7 @@ license-files = [ [clarify.bstr] expression = "(MIT OR Apache-2.0) AND Unicode-DFS-2016" license-files = [ - { path = "COPYING", hash = 0x28398560 }, + { path = "COPYING", hash = 0x278afbcf }, { path = "LICENSE-APACHE", hash = 0x24b54f4b }, { path = "LICENSE-MIT", hash = 0x462dee44 }, { path = "src/unicode/data/LICENSE-UNICODE", hash = 0x70f7339 }, @@ -88,6 +88,7 @@ license-files = [ { path = "LICENSE", hash = 0x742401ae }, { path = "LICENSE.Apache-2.0", hash = 0x7b466be4 }, { path = "LICENSE.Mit", hash = 0xa237d234 }, + { path = "LICENSE.BSD-3-Clause", hash = 0xc9f5c4f6 }, { path = "zstd/LICENSE", hash = 0x79cda15 }, ] skip-files = [ From 0bfb362c77a90b3ad2cdbb63851043bdd9aaeb77 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Wed, 14 Dec 2022 22:25:15 +0000 Subject: [PATCH 10/11] refactor package install stages Instead of the full Development Tools group, install the packages we actually need to build the various toolchains and other host tools. Move the packages that are only needed to build Bottlerocket to the later stage that's intended for that purpose. Signed-off-by: Ben Cressey --- Dockerfile | 107 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 88 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72435cca..209e0f9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,20 +4,45 @@ FROM public.ecr.aws/docker/library/fedora:37 as base RUN \ dnf makecache && \ dnf -y update && \ - dnf -y groupinstall "C Development Tools and Libraries" && \ dnf -y install --setopt=install_weak_deps=False \ - rpmdevtools dnf-plugins-core createrepo_c \ - cmake git meson perl-ExtUtils-MakeMaker python which \ - bc hostname intltool gperf kmod rsync wget openssl \ - dwarves elfutils-devel libcap-devel openssl-devel \ - createrepo_c e2fsprogs gdisk python3-jinja2 \ - kpartx lz4 veritysetup dosfstools mtools squashfs-tools \ - perl-FindBin perl-IPC-Cmd perl-open policycoreutils \ - secilc qemu-img glib2-devel rpcgen erofs-utils jq ShellCheck \ - json-c-devel libcurl-devel p11-kit-devel && \ + bc \ + bison \ + cmake \ + cpio \ + curl \ + dnf-plugins-core \ + dwarves \ + elfutils-devel \ + flex \ + g++ \ + gcc \ + git \ + gperf \ + hostname \ + intltool \ + jq \ + json-c-devel \ + kmod \ + libcurl-devel \ + libtool \ + meson \ + openssl \ + openssl-devel \ + p11-kit-devel \ + perl-ExtUtils-MakeMaker \ + perl-FindBin \ + perl-IPC-Cmd \ + perl-open \ + python \ + rsync \ + wget \ + which \ + && \ dnf config-manager --set-disabled \ - fedora-modular updates-modular fedora-cisco-openh264 && \ - dnf clean all && \ + fedora-modular \ + updates-modular \ + fedora-cisco-openh264 \ + && \ useradd builder COPY ./sdk-fetch /usr/local/bin @@ -30,8 +55,22 @@ RUN \ apt-get update && \ apt-get -y dist-upgrade && \ apt-get -y install \ - autoconf automake bc build-essential cpio curl file git \ - libexpat1-dev libtool libz-dev pkgconf python3 unzip wget && \ + autoconf \ + automake \ + bc \ + build-essential \ + cpio \ + curl \ + file \ + git \ + libexpat1-dev \ + libtool \ + libz-dev \ + pkgconf \ + python3 \ + unzip \ + wget \ + && \ useradd -m -u 1000 builder COPY ./sdk-fetch /usr/local/bin @@ -818,11 +857,41 @@ FROM sdk as sdk-plus USER root RUN \ dnf -y install --setopt=install_weak_deps=False \ - java-11-openjdk-devel maven-openjdk11 maven-local \ - maven-clean-plugin maven-shade-plugin \ - efitools gnutls-utils gnupg-pkcs11-scd nss-tools \ - openssl-pkcs11 pesign python3-virt-firmware sbsigntools \ - awscli && \ + awscli \ + ccache \ + createrepo_c \ + dosfstools \ + e2fsprogs \ + efitools \ + erofs-utils \ + gdisk \ + glib2-devel \ + gnupg-pkcs11-scd \ + gnutls-utils \ + java-11-openjdk-devel \ + kpartx \ + libcap-devel \ + lz4 \ + maven-clean-plugin \ + maven-local \ + maven-openjdk11 \ + maven-shade-plugin \ + mtools \ + nss-tools \ + openssl-pkcs11 \ + pesign \ + policycoreutils \ + python3-jinja2 \ + python3-virt-firmware \ + qemu-img \ + rpcgen \ + rpmdevtools \ + sbsigntools \ + secilc \ + ShellCheck \ + squashfs-tools \ + veritysetup \ + && \ dnf clean all # =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= From 8074a184929d323297b7bc347c6b7ac0752d9ad0 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 3 Dec 2022 23:10:52 +0000 Subject: [PATCH 11/11] bump version to 0.29.0 Signed-off-by: Ben Cressey --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 31950dac..91d002b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.28.0 +v0.29.0