diff --git a/Makefile b/Makefile index 2347fa9..7ebba95 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ NAME := airgap IMAGE := local/$(NAME):latest TARGET := x86_64 -DEVICES := librem13v4 librem15v4 +DEVICES := librem_13v4 librem_15v4 GIT_REF := $(shell git log -1 --format=%H config) GIT_AUTHOR := $(shell git log -1 --format=%an config) GIT_KEY := $(shell git log -1 --format=%GP config) @@ -63,7 +63,7 @@ build-fw: mkdir -p $(RELEASE_DIR) for device in $(DEVICES); do \ cp \ - build/heads/build/$${device}/coreboot.rom \ + build/heads/build/$${device}/PureBoot*.rom \ $(RELEASE_DIR)/$${device}.rom ; \ done @@ -111,7 +111,7 @@ sign: $(RELEASE_DIR)/*.rom $(RELEASE_DIR)/*.iso .PHONY: shell shell: $(docker) inspect "$(NAME)" \ - && $(docker) exec --interactive --tty "$(NAME)" shell \ + && $(docker) exec --interactive --user=root --tty "$(NAME)" shell \ || $(contain) shell @@ -119,7 +119,7 @@ shell: menuconfig: $(contain) menuconfig -.PHONY: menuconfig +.PHONY: linux-menuconfig linux-menuconfig: $(contain) linux-menuconfig @@ -147,6 +147,9 @@ update-packages: docker cp \ "$(NAME)-update-packages:/etc/apt/sources.list" \ "$(PWD)/config/container/sources.list" + docker cp \ + "$(NAME)-update-packages:/etc/apt/package-hashes.txt" \ + "$(PWD)/config/container/package-hashes.txt" docker rm -f "$(NAME)-update-packages" ## Make Helpers @@ -163,7 +166,6 @@ contain := \ --interactive \ --name "$(NAME)" \ --hostname "$(NAME)" \ - --user $(userid):$(groupid) \ --env TARGET="$(TARGET)" \ --env DEVICES="$(DEVICES)" \ --env GIT_DATETIME="$(GIT_DATETIME)" \ @@ -172,7 +174,8 @@ contain := \ --env GIT_AUTHOR="$(GIT_AUTHOR)" \ --env GIT_KEY="$(GIT_KEY)" \ --env GIT_STATE="$(GIT_STATE)" \ - --security-opt seccomp=unconfined \ + --env UID="$(shell id -u)" \ + --env GID="$(shell id -g)" \ --volume $(PWD)/build:/home/build/build \ --volume $(PWD)/config:/home/build/config \ --volume $(PWD)/release:/home/build/release \ diff --git a/config/buildroot/configs/airgap_x86_64_defconfig b/config/buildroot/configs/airgap_x86_64_defconfig index 0986c87..6c17fca 100644 --- a/config/buildroot/configs/airgap_x86_64_defconfig +++ b/config/buildroot/configs/airgap_x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2020.05-dirty Configuration +# Buildroot 2020.08-dirty Configuration # BR2_HAVE_DOT_CONFIG=y BR2_EXTERNAL_Airgap_PATH="/home/build/config/buildroot" @@ -172,12 +172,11 @@ BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" # BR2_KERNEL_HEADERS_4_14 is not set BR2_KERNEL_HEADERS_4_19=y # BR2_KERNEL_HEADERS_5_4 is not set -# BR2_KERNEL_HEADERS_5_5 is not set -# BR2_KERNEL_HEADERS_5_6 is not set +# BR2_KERNEL_HEADERS_5_7 is not set # BR2_KERNEL_HEADERS_VERSION is not set # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set -BR2_DEFAULT_KERNEL_HEADERS="4.19.125" +BR2_DEFAULT_KERNEL_HEADERS="4.19.142" BR2_PACKAGE_LINUX_HEADERS=y BR2_PACKAGE_MUSL=y @@ -185,9 +184,9 @@ BR2_PACKAGE_MUSL=y # Binutils Options # BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI=y -# BR2_BINUTILS_VERSION_2_31_X is not set BR2_BINUTILS_VERSION_2_32_X=y # BR2_BINUTILS_VERSION_2_33_X is not set +# BR2_BINUTILS_VERSION_2_34_X is not set BR2_BINUTILS_VERSION="2.32" BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="" @@ -197,6 +196,7 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="" # BR2_GCC_VERSION_7_X is not set BR2_GCC_VERSION_8_X=y # BR2_GCC_VERSION_9_X is not set +# BR2_GCC_VERSION_10_X is not set BR2_GCC_VERSION="8.4.0" BR2_EXTRA_GCC_CONFIG_OPTIONS="" # BR2_TOOLCHAIN_BUILDROOT_CXX is not set @@ -352,7 +352,7 @@ BR2_LINUX_KERNEL_LATEST_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set -BR2_LINUX_KERNEL_VERSION="5.6.15" +BR2_LINUX_KERNEL_VERSION="5.7.19" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set @@ -527,7 +527,6 @@ BR2_PACKAGE_BZIP2=y # # lrzip needs a toolchain w/ wchar, threads, C++ # -# BR2_PACKAGE_LZ4 is not set # # lzip needs a toolchain w/ C++ @@ -643,13 +642,10 @@ BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS=y # BR2_PACKAGE_SPIDEV_TEST is not set # BR2_PACKAGE_STRACE is not set # BR2_PACKAGE_STRESS is not set +# BR2_PACKAGE_STRESS_NG is not set # -# stress-ng needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.3 -# - -# -# sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built +# sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built # # BR2_PACKAGE_SYSPROF is not set # BR2_PACKAGE_TCF_AGENT is not set @@ -670,6 +666,7 @@ BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS=y # # BR2_PACKAGE_BATS_CORE is not set # BR2_PACKAGE_BINUTILS is not set +# BR2_PACKAGE_BITWISE is not set # BR2_PACKAGE_BSDIFF is not set # BR2_PACKAGE_CHECK is not set BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y @@ -744,6 +741,7 @@ BR2_PACKAGE_TREE=y # BR2_PACKAGE_F2FS_TOOLS is not set # BR2_PACKAGE_FLASHBENCH is not set # BR2_PACKAGE_FSCRYPTCTL is not set +# BR2_PACKAGE_FUSE_OVERLAYFS is not set # BR2_PACKAGE_FWUP is not set # BR2_PACKAGE_GENEXT2FS is not set # BR2_PACKAGE_GENPART is not set @@ -823,7 +821,7 @@ BR2_PACKAGE_TREE=y # BR2_PACKAGE_SL is not set # -# solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library +# solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1 # # @@ -926,7 +924,7 @@ BR2_PACKAGE_NETSURF_ARCH_SUPPORTS=y BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y # -# Qt5 needs a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library +# Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library # # @@ -940,7 +938,7 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y # # -# midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7 +# midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9 # # @@ -1009,7 +1007,6 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y # BR2_PACKAGE_DUMP1090 is not set # BR2_PACKAGE_DVB_APPS is not set # BR2_PACKAGE_DVBSNOOP is not set -# BR2_PACKAGE_EDID_DECODE is not set BR2_PACKAGE_EUDEV=y BR2_PACKAGE_PROVIDES_UDEV="eudev" # BR2_PACKAGE_EUDEV_RULES_GEN is not set @@ -1029,6 +1026,10 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y # gptfdisk needs a toolchain w/ C++ # # BR2_PACKAGE_GVFS is not set + +# +# gvfs needs a toolchain w/ wchar, threads, dynamic library +# # BR2_PACKAGE_HDPARM is not set # BR2_PACKAGE_HWDATA is not set # BR2_PACKAGE_HWLOC is not set @@ -1061,6 +1062,7 @@ BR2_PACKAGE_KBD=y # BR2_PACKAGE_LSUIO is not set # BR2_PACKAGE_LUKSMETA is not set # BR2_PACKAGE_LVM2 is not set +# BR2_PACKAGE_MBPFAN is not set # BR2_PACKAGE_MDADM is not set # BR2_PACKAGE_MDEVD is not set # BR2_PACKAGE_MEMTEST86 is not set @@ -1079,7 +1081,7 @@ BR2_PACKAGE_KBD=y # BR2_PACKAGE_OPEN2300 is not set # -# openfpgaloader needs udev, a toolchain w/ threads, wchar, C++ +# openfpgaloader needs a toolchain w/ threads, C++ # # BR2_PACKAGE_OPENIPMI is not set # BR2_PACKAGE_OPENOCD is not set @@ -1290,7 +1292,7 @@ BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS=y BR2_PACKAGE_OPENAL_ARCH_SUPPORTS=y # -# openal needs a toolchain w/ NPTL, C++ +# openal needs a toolchain w/ NPTL, C++, gcc >= 4.9 # # @@ -1326,6 +1328,7 @@ BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS=y # libsquish needs a toolchain w/ C++ # # BR2_PACKAGE_LIBZIP is not set +# BR2_PACKAGE_LZ4 is not set # BR2_PACKAGE_LZO is not set # BR2_PACKAGE_MINIZIP is not set @@ -1408,6 +1411,10 @@ BR2_PACKAGE_PROVIDES_HOST_OPENSSL="host-libopenssl" # leveldb needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_LIBGIT2 is not set + +# +# libodb needs a toolchain w/ C++, threads +# BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y # @@ -1496,7 +1503,7 @@ BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y # # -# graphite2 needs a toolchain w/ C++, dynamic library +# graphite2 needs a toolchain w/ C++ # # @@ -1647,7 +1654,7 @@ BR2_PACKAGE_JPEG_SIMD_SUPPORT=y BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS=y # -# webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7 +# webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9 # # BR2_PACKAGE_WEBP is not set @@ -1665,7 +1672,7 @@ BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS=y BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS=y # -# wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7 +# wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9 # # @@ -1743,7 +1750,11 @@ BR2_PACKAGE_LIBUSB=y # libv4l needs a toolchain w/ threads, C++ and headers >= 3.0 # # BR2_PACKAGE_LIBXKBCOMMON is not set -# BR2_PACKAGE_MRAA is not set +BR2_PACKAGE_MRAA_ARCH_SUPPORTS=y + +# +# mraa needs a toolchain w/ C++, threads, dynamic library +# # BR2_PACKAGE_MTDEV is not set # BR2_PACKAGE_NEARDAL is not set # BR2_PACKAGE_OWFS is not set @@ -1892,7 +1903,7 @@ BR2_PACKAGE_SPIDERMONKEY_JIT_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBBLURAY is not set # -# libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5 +# libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 5 # # BR2_PACKAGE_LIBDCADEC is not set # BR2_PACKAGE_LIBDVBCSA is not set @@ -2029,7 +2040,7 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBHTTPPARSER is not set # -# libhttpserver needs a toolchain w/ C++, threads +# libhttpserver needs a toolchain w/ C++, threads, gcc >= 5 # # BR2_PACKAGE_LIBIDN is not set # BR2_PACKAGE_LIBIDN2 is not set @@ -2063,7 +2074,12 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBNFNETLINK is not set # BR2_PACKAGE_LIBNFTNL is not set # BR2_PACKAGE_LIBNICE is not set +# BR2_PACKAGE_LIBNIDS is not set # BR2_PACKAGE_LIBNL is not set + +# +# libnpupnp needs a toolchain w/ C++, threads, gcc >= 4.9 +# # BR2_PACKAGE_LIBOAUTH is not set # BR2_PACKAGE_LIBOPING is not set # BR2_PACKAGE_LIBOSIP2 is not set @@ -2108,6 +2124,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y # BR2_PACKAGE_MONGOOSE is not set # BR2_PACKAGE_NANOMSG is not set # BR2_PACKAGE_NEON is not set + +# +# netopeer2 needs a toolchain w/ gcc >= 4.8, C++, threads, dynamic library +# # BR2_PACKAGE_NGHTTP2 is not set # @@ -2142,7 +2162,7 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y # BR2_PACKAGE_PAHO_MQTT_C is not set # -# paho-mqtt-cpp needs a toolchain w/ threads, C++, dynamic library support +# paho-mqtt-cpp needs a toolchain w/ threads, C++ # # @@ -2152,6 +2172,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y # BR2_PACKAGE_QPID_PROTON is not set # BR2_PACKAGE_RABBITMQ_C is not set +# +# resiprocate needs a toolchain w/ C++, threads, wchar +# + # # restclient-cpp needs a toolchain w/ C++, gcc >= 4.8 # @@ -2289,6 +2313,7 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y # glm needs a toolchain w/ C++ # # BR2_PACKAGE_GMP is not set +BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS=y # # gobject-introspection needs python3 @@ -2308,6 +2333,11 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y # # lapack/blas needs a toolchain w/ fortran # +BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y + +# +# libabseil-cpp needs a toolchain w/ C++, threads, dynamic library +# # BR2_PACKAGE_LIBARGTABLE2 is not set BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBATOMIC_OPS is not set @@ -2415,9 +2445,10 @@ BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS=y # BR2_PACKAGE_OPENBLAS is not set # BR2_PACKAGE_ORC is not set # BR2_PACKAGE_P11_KIT is not set +BR2_PACKAGE_POCO_ARCH_SUPPORTS=y # -# poco needs a toolchain w/ wchar, NPTL, C++, dynamic library +# poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14 # BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y @@ -2477,7 +2508,7 @@ BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y # BR2_PACKAGE_FSTRCMP is not set # -# icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.8 +# icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, host gcc >= 4.9 # # BR2_PACKAGE_LIBCLI is not set # BR2_PACKAGE_LIBEDIT is not set @@ -2676,6 +2707,10 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y # gerbera needs a toolchain w/ C++, threads, gcc >= 7 # # BR2_PACKAGE_GESFTPSERVER is not set + +# +# gloox needs a toolchain w/ C++ +# # BR2_PACKAGE_GLORYTUN is not set # @@ -2822,6 +2857,7 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y # # BR2_PACKAGE_OPENVPN is not set # BR2_PACKAGE_P910ND is not set +# BR2_PACKAGE_PARPROUTED is not set # BR2_PACKAGE_PHIDGETWEBSERVICE is not set # BR2_PACKAGE_PHYTOOL is not set # BR2_PACKAGE_PIMD is not set @@ -3030,11 +3066,11 @@ BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS=y # BR2_PACKAGE_RESTORECOND is not set # BR2_PACKAGE_SELINUX_PYTHON is not set # BR2_PACKAGE_SEMODULE_UTILS is not set -# BR2_PACKAGE_SETOOLS is not set # -# setools needs a toolchain w/ threads, C++, wchar, dynamic library +# setools needs python3 # +BR2_PACKAGE_URANDOM_SCRIPTS=y # # Shell and utilities @@ -3077,7 +3113,7 @@ BR2_PACKAGE_PINENTRY_NCURSES=y # # -# pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 5.0, C++, dynamic library +# pinentry-qt5 needs a host gcc >= 5.0, and a toolchain w/ wchar, NPTL, gcc >= 5.0, C++, dynamic library # # BR2_PACKAGE_RANGER is not set # BR2_PACKAGE_RTTY is not set @@ -3086,6 +3122,7 @@ BR2_PACKAGE_PINENTRY_NCURSES=y # BR2_PACKAGE_TIME is not set # BR2_PACKAGE_TINI is not set BR2_PACKAGE_TMUX=y +# BR2_PACKAGE_TTYD is not set # BR2_PACKAGE_WHICH is not set # BR2_PACKAGE_XMLSTARLET is not set # BR2_PACKAGE_XXHASH is not set @@ -3127,6 +3164,7 @@ BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y # BR2_PACKAGE_DOCKER_CONTAINERD is not set # BR2_PACKAGE_DOCKER_ENGINE is not set # BR2_PACKAGE_DOCKER_PROXY is not set +# BR2_PACKAGE_EARLYOOM is not set # BR2_PACKAGE_EFIBOOTMGR is not set BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y # BR2_PACKAGE_EFIVAR is not set @@ -3160,6 +3198,7 @@ BR2_PACKAGE_KMOD=y # # netifrc needs openrc as init system # +BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS=y # BR2_PACKAGE_NUMACTL is not set # @@ -3363,7 +3402,6 @@ BR2_TARGET_GRUB2_BUILTIN_CONFIG="" # BR2_PACKAGE_HOST_AESPIPE is not set # BR2_PACKAGE_HOST_ANDROID_TOOLS is not set # BR2_PACKAGE_HOST_BTRFS_PROGS is not set -# BR2_PACKAGE_HOST_CARGO is not set # BR2_PACKAGE_HOST_CHECKPOLICY is not set # BR2_PACKAGE_HOST_CHECKSEC is not set # BR2_PACKAGE_HOST_CMAKE is not set @@ -3406,6 +3444,7 @@ BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_MKPASSWD=y # BR2_PACKAGE_HOST_MTD is not set # BR2_PACKAGE_HOST_MTOOLS is not set +# BR2_PACKAGE_HOST_ODB is not set # BR2_PACKAGE_HOST_OPENOCD is not set # BR2_PACKAGE_HOST_OPKG_UTILS is not set # BR2_PACKAGE_HOST_PARTED is not set @@ -3445,6 +3484,15 @@ BR2_PACKAGE_HOST_XORRISO=y # Legacy config options # +# +# Legacy options removed in 2020.08 +# +# BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 is not set +# BR2_KERNEL_HEADERS_5_6 is not set +# BR2_KERNEL_HEADERS_5_5 is not set +# BR2_BINUTILS_VERSION_2_31_X is not set +# BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER is not set + # # Legacy options removed in 2020.05 # @@ -3563,7 +3611,6 @@ BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS="" # BR2_PACKAGE_AMD_CATALYST_CCCLE is not set # BR2_PACKAGE_SDL_QTOPIA is not set # BR2_PACKAGE_PYTHON_PYQT is not set -# BR2_PACKAGE_GNURADIO_QTGUI is not set # BR2_PACKAGE_LUACRYPTO is not set # BR2_PACKAGE_TN5250 is not set # BR2_PACKAGE_BOOST_SIGNALS is not set @@ -3969,165 +4016,6 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_PACKAGE_GPU_VIV_BIN_MX6Q is not set # BR2_TARGET_UBOOT_NETWORK is not set -# -# Legacy options removed in 2015.05 -# -# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K is not set -# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K is not set -# BR2_PACKAGE_MONO_20 is not set -# BR2_PACKAGE_MONO_40 is not set -# BR2_PACKAGE_MONO_45 is not set -# BR2_CIVETWEB_WITH_LUA is not set -# BR2_PACKAGE_TIFF_TIFF2PDF is not set -# BR2_PACKAGE_TIFF_TIFFCP is not set -# BR2_LINUX_KERNEL_EXT_RTAI_PATCH is not set -# BR2_TARGET_GENERIC_PASSWD_DES is not set -# BR2_PACKAGE_GTK2_THEME_HICOLOR is not set -# BR2_PACKAGE_VALGRIND_PTRCHECK is not set - -# -# Legacy options removed in 2015.02 -# -# BR2_PACKAGE_LIBGC is not set -# BR2_PACKAGE_WDCTL is not set -# BR2_PACKAGE_UTIL_LINUX_ARCH is not set -# BR2_PACKAGE_UTIL_LINUX_DDATE is not set -# BR2_PACKAGE_RPM_BZIP2_PAYLOADS is not set -# BR2_PACKAGE_RPM_XZ_PAYLOADS is not set -# BR2_PACKAGE_M4 is not set -# BR2_PACKAGE_FLEX_BINARY is not set -# BR2_PACKAGE_BISON is not set -# BR2_PACKAGE_GOB2 is not set -# BR2_PACKAGE_DISTCC is not set -# BR2_PACKAGE_HASERL_VERSION_0_8_X is not set -# BR2_PACKAGE_STRONGSWAN_TOOLS is not set -# BR2_PACKAGE_XBMC_ADDON_XVDR is not set -# BR2_PACKAGE_XBMC_PVR_ADDONS is not set -# BR2_PACKAGE_XBMC is not set -# BR2_PACKAGE_XBMC_ALSA_LIB is not set -# BR2_PACKAGE_XBMC_AVAHI is not set -# BR2_PACKAGE_XBMC_DBUS is not set -# BR2_PACKAGE_XBMC_LIBBLURAY is not set -# BR2_PACKAGE_XBMC_GOOM is not set -# BR2_PACKAGE_XBMC_RSXS is not set -# BR2_PACKAGE_XBMC_LIBCEC is not set -# BR2_PACKAGE_XBMC_LIBMICROHTTPD is not set -# BR2_PACKAGE_XBMC_LIBNFS is not set -# BR2_PACKAGE_XBMC_RTMPDUMP is not set -# BR2_PACKAGE_XBMC_LIBSHAIRPLAY is not set -# BR2_PACKAGE_XBMC_LIBSMBCLIENT is not set -# BR2_PACKAGE_XBMC_LIBTHEORA is not set -# BR2_PACKAGE_XBMC_LIBUSB is not set -# BR2_PACKAGE_XBMC_LIBVA is not set -# BR2_PACKAGE_XBMC_WAVPACK is not set -# BR2_PREFER_STATIC_LIB is not set - -# -# Legacy options removed in 2014.11 -# -# BR2_x86_generic is not set -# BR2_GCC_VERSION_4_4_X is not set -# BR2_sparc_sparchfleon is not set -# BR2_sparc_sparchfleonv8 is not set -# BR2_sparc_sparcsfleon is not set -# BR2_sparc_sparcsfleonv8 is not set -# BR2_PACKAGE_LINUX_FIRMWARE_XC5000 is not set -# BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 is not set -# BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 is not set -# BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 is not set - -# -# Legacy options removed in 2014.08 -# -# BR2_PACKAGE_LIBELF is not set -# BR2_KERNEL_HEADERS_3_8 is not set -# BR2_PACKAGE_GETTEXT_TOOLS is not set -# BR2_PACKAGE_PROCPS is not set -# BR2_BINUTILS_VERSION_2_20_1 is not set -# BR2_BINUTILS_VERSION_2_21 is not set -# BR2_BINUTILS_VERSION_2_23_1 is not set -# BR2_UCLIBC_VERSION_0_9_32 is not set -# BR2_GCC_VERSION_4_3_X is not set -# BR2_GCC_VERSION_4_6_X is not set -# BR2_GDB_VERSION_7_4 is not set -# BR2_GDB_VERSION_7_5 is not set -# BR2_BUSYBOX_VERSION_1_19_X is not set -# BR2_BUSYBOX_VERSION_1_20_X is not set -# BR2_BUSYBOX_VERSION_1_21_X is not set -# BR2_PACKAGE_LIBV4L_DECODE_TM6000 is not set -# BR2_PACKAGE_LIBV4L_IR_KEYTABLE is not set -# BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE is not set -# BR2_PACKAGE_LIBV4L_V4L2_CTL is not set -# BR2_PACKAGE_LIBV4L_V4L2_DBG is not set - -# -# Legacy options removed in 2014.05 -# -# BR2_PACKAGE_EVTEST_CAPTURE is not set -# BR2_KERNEL_HEADERS_3_6 is not set -# BR2_KERNEL_HEADERS_3_7 is not set -# BR2_PACKAGE_VALA is not set -BR2_PACKAGE_TZDATA_ZONELIST="" -# BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE is not set -# BR2_PACKAGE_LUA_INTERPRETER_READLINE is not set -# BR2_PACKAGE_LUA_INTERPRETER_LINENOISE is not set -# BR2_PACKAGE_DVB_APPS_UTILS is not set -# BR2_KERNEL_HEADERS_SNAP is not set -# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV is not set -# BR2_PACKAGE_UDEV is not set -# BR2_PACKAGE_UDEV_RULES_GEN is not set -# BR2_PACKAGE_UDEV_ALL_EXTRAS is not set - -# -# Legacy options removed in 2014.02 -# -# BR2_sh2 is not set -# BR2_sh3 is not set -# BR2_sh3eb is not set -# BR2_KERNEL_HEADERS_3_1 is not set -# BR2_KERNEL_HEADERS_3_3 is not set -# BR2_KERNEL_HEADERS_3_5 is not set -# BR2_GDB_VERSION_7_2 is not set -# BR2_GDB_VERSION_7_3 is not set -# BR2_PACKAGE_CCACHE is not set -# BR2_HAVE_DOCUMENTATION is not set -# BR2_PACKAGE_AUTOMAKE is not set -# BR2_PACKAGE_AUTOCONF is not set -# BR2_PACKAGE_XSTROKE is not set -# BR2_PACKAGE_LZMA is not set -# BR2_PACKAGE_TTCP is not set -# BR2_PACKAGE_LIBNFC_LLCP is not set -# BR2_PACKAGE_MYSQL_CLIENT is not set -# BR2_PACKAGE_SQUASHFS3 is not set -# BR2_TARGET_ROOTFS_SQUASHFS3 is not set -# BR2_PACKAGE_NETKITBASE is not set -# BR2_PACKAGE_NETKITTELNET is not set -# BR2_PACKAGE_LUASQL is not set -# BR2_PACKAGE_LUACJSON is not set - -# -# Legacy options removed in 2013.11 -# -# BR2_PACKAGE_LVM2_DMSETUP_ONLY is not set -# BR2_PACKAGE_QT_JAVASCRIPTCORE is not set -# BR2_PACKAGE_MODULE_INIT_TOOLS is not set -BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="" -BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="" -BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="" -BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="" - -# -# Legacy options removed in 2013.08 -# -# BR2_ARM_OABI is not set -# BR2_PACKAGE_DOSFSTOOLS_DOSFSCK is not set -# BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL is not set -# BR2_PACKAGE_DOSFSTOOLS_MKDOSFS is not set -# BR2_ELF2FLT is not set -# BR2_VFP_FLOAT is not set -# BR2_PACKAGE_GCC_TARGET is not set -# BR2_HAVE_DEVFILES is not set - # # External options # diff --git a/config/buildroot/patches/cpe-info.patch b/config/buildroot/patches/cpe-info.patch deleted file mode 100644 index 3387664..0000000 --- a/config/buildroot/patches/cpe-info.patch +++ /dev/null @@ -1,1912 +0,0 @@ -diff --git a/Makefile b/Makefile -index b2afe5bcfb..ea00891aa1 100644 ---- a/Makefile -+++ b/Makefile -@@ -135,7 +135,7 @@ nobuild_targets := source %-source \ - clean distclean help show-targets graph-depends \ - %-graph-depends %-show-depends %-show-version \ - graph-build graph-size list-defconfigs \ -- savedefconfig update-defconfig printvars -+ savedefconfig update-defconfig printvars cpe-info %-cpe-info - ifeq ($(MAKECMDGOALS),) - BR_BUILDING = y - else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),) -@@ -222,6 +222,7 @@ LEGAL_MANIFEST_CSV_TARGET = $(LEGAL_INFO_DIR)/manifest.csv - LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv - LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings - LEGAL_REPORT = $(LEGAL_INFO_DIR)/README -+CPE_MANIFEST_CSV = $(BASE_DIR)/cpe-manifest.csv - - BR2_CONFIG = $(CONFIG_DIR)/.config - -@@ -864,6 +865,19 @@ legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all - mv .legal-info.sha256 legal-info.sha256) - @echo "Legal info produced in $(LEGAL_INFO_DIR)" - -+.PHONY: cpe-info-clean -+cpe-info-clean: -+ @rm -f $(CPE_MANIFEST_CSV) -+ -+.PHONY: cpe-info-prepare -+cpe-info-prepare: -+ @$(call MESSAGE,"Gathering CPE info") -+ @$(call cpe-manifest,CPE ID,CVE PATCHED,PACKAGE,VERSION,SOURCE SITE) -+ -+.PHONY: cpe-info -+cpe-info: cpe-info-clean cpe-info-prepare $(foreach p,$(PACKAGES),$(p)-cpe-info) -+ @echo "CPE info produced in $(CPE_MANIFEST_CSV)" -+ - .PHONY: show-targets - show-targets: - @echo $(sort $(PACKAGES)) $(sort $(TARGETS_ROOTFS)) -@@ -1145,6 +1159,7 @@ help: - @echo ' legal-info - generate info about license compliance' - @echo ' show-info - generate info about packages, as a JSON blurb' - @echo ' printvars - dump internal variables selected with VARS=...' -+ @echo ' cpe-info - generate info about security CPE identification' - @echo - @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' - @echo ' make O=dir - Locate all output files in "dir", including .config' -diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk -index a202525d71..280de94d2d 100644 ---- a/boot/grub2/grub2.mk -+++ b/boot/grub2/grub2.mk -@@ -18,6 +18,7 @@ GRUB2_INSTALL_TARGET = YES - else - GRUB2_INSTALL_TARGET = NO - endif -+GRUB2_CPE_ID_VENDOR = gnu - - GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)) - GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG)) -diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk -index 1d50e72846..f82e8951ba 100644 ---- a/boot/uboot/uboot.mk -+++ b/boot/uboot/uboot.mk -@@ -11,6 +11,8 @@ UBOOT_LICENSE = GPL-2.0+ - ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y) - UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt - endif -+UBOOT_CPE_ID_VENDOR = denx -+UBOOT_CPE_ID_NAME = u-boot - - UBOOT_INSTALL_IMAGES = YES - -diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt -index 568daaeb8d..54ffdee9d6 100644 ---- a/docs/manual/adding-packages-generic.txt -+++ b/docs/manual/adding-packages-generic.txt -@@ -24,57 +24,59 @@ system is based on hand-written Makefiles or shell scripts. - 09: LIBFOO_SITE = http://www.foosoftware.org/download - 10: LIBFOO_LICENSE = GPL-3.0+ - 11: LIBFOO_LICENSE_FILES = COPYING --12: LIBFOO_INSTALL_STAGING = YES --13: LIBFOO_CONFIG_SCRIPTS = libfoo-config --14: LIBFOO_DEPENDENCIES = host-libaaa libbbb --15: --16: define LIBFOO_BUILD_CMDS --17: $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all --18: endef --19: --20: define LIBFOO_INSTALL_STAGING_CMDS --21: $(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a --22: $(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h --23: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib --24: endef --25: --26: define LIBFOO_INSTALL_TARGET_CMDS --27: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib --28: $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d --29: endef --30: --31: define LIBFOO_USERS --32: foo -1 libfoo -1 * - - - LibFoo daemon --33: endef --34: --35: define LIBFOO_DEVICES --36: /dev/foo c 666 0 0 42 0 - - - --37: endef --38: --39: define LIBFOO_PERMISSIONS --40: /bin/foo f 4755 foo libfoo - - - - - --41: endef --42: --43: $(eval $(generic-package)) -+12: LIBFOO_CPE_ID_VENDOR = foosoftware -+13: LIBFOO_INSTALL_STAGING = YES -+14: LIBFOO_CONFIG_SCRIPTS = libfoo-config -+15: LIBFOO_DEPENDENCIES = host-libaaa libbbb -+16: -+17: define LIBFOO_BUILD_CMDS -+18: $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -+19: endef -+20: -+21: define LIBFOO_INSTALL_STAGING_CMDS -+22: $(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a -+23: $(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h -+24: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib -+25: endef -+26: -+27: define LIBFOO_INSTALL_TARGET_CMDS -+28: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib -+29: $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d -+30: endef -+31: -+32: define LIBFOO_USERS -+33: foo -1 libfoo -1 * - - - LibFoo daemon -+34: endef -+35: -+36: define LIBFOO_DEVICES -+37: /dev/foo c 666 0 0 42 0 - - - -+38: endef -+39: -+40: define LIBFOO_PERMISSIONS -+41: /bin/foo f 4755 foo libfoo - - - - - -+42: endef -+43: -+44: $(eval $(generic-package)) - -------------------------------- - --The Makefile begins on line 7 to 11 with metadata information: the -+The Makefile begins on line 7 to 12 with metadata information: the - version of the package (+LIBFOO_VERSION+), the name of the - tarball containing the package (+LIBFOO_SOURCE+) (xz-ed tarball recommended) - the Internet location at which the tarball can be downloaded from --(+LIBFOO_SITE+), the license (+LIBFOO_LICENSE+) and file with the --license text (+LIBFOO_LICENSE_FILES+). All variables must start with -+(+LIBFOO_SITE+), the license (+LIBFOO_LICENSE+), the file with the -+license text (+LIBFOO_LICENSE_FILES+) and the vendor for vunerability -+analysis (+LIBFOO_CPE_ID_VENDOR+). All variables must start with - the same prefix, +LIBFOO_+ in this case. This prefix is always the - uppercased version of the package name (see below to understand where - the package name is defined). - --On line 12, we specify that this package wants to install something to -+On line 13, we specify that this package wants to install something to - the staging space. This is often needed for libraries, since they must - install header files and other development files in the staging space. - This will ensure that the commands listed in the - +LIBFOO_INSTALL_STAGING_CMDS+ variable will be executed. - --On line 13, we specify that there is some fixing to be done to some -+On line 14, we specify that there is some fixing to be done to some - of the 'libfoo-config' files that were installed during - +LIBFOO_INSTALL_STAGING_CMDS+ phase. - These *-config files are executable shell script files that are -@@ -122,14 +124,14 @@ IMAGEMAGICK_CONFIG_SCRIPTS = \ - -------------------------------- - ================================ - --On line 14, we specify the list of dependencies this package relies -+On line 15, we specify the list of dependencies this package relies - on. These dependencies are listed in terms of lower-case package names, - which can be packages for the target (without the +host-+ - prefix) or packages for the host (with the +host-+) prefix). - Buildroot will ensure that all these packages are built and installed - 'before' the current package starts its configuration. - --The rest of the Makefile, lines 16..29, defines what should be done -+The rest of the Makefile, lines 17..29, defines what should be done - at the different steps of the package configuration, compilation and - installation. - +LIBFOO_BUILD_CMDS+ tells what steps should be performed to -@@ -142,16 +144,16 @@ All these steps rely on the +$(@D)+ variable, which - contains the directory where the source code of the package has been - extracted. - --On lines 31..33, we define a user that is used by this package (e.g. -+On lines 31..44, we define a user that is used by this package (e.g. - to run a daemon as non-root) (+LIBFOO_USERS+). - --On line 35..37, we define a device-node file used by this package -+On line 36..38, we define a device-node file used by this package - (+LIBFOO_DEVICES+). - --On line 39..41, we define the permissions to set to specific files -+On line 40..42, we define the permissions to set to specific files - installed by this package (+LIBFOO_PERMISSIONS+). - --Finally, on line 43, we call the +generic-package+ function, which -+Finally, on line 44, we call the +generic-package+ function, which - generates, according to the variables defined previously, all the - Makefile code necessary to make your package working. - -@@ -502,6 +504,29 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345 - LIBFOO_IGNORE_CVES += CVE-2020-54321 - ---------------------- - -+* +LIBFOO_CPE_ID_VENDOR+ -+ This variable is optional. It only must be defined if the package name -+ does not match what the CPE ID uses for the vendor. By default it's set -+ to _project. -+ -+* +LIBFOO_CPE_ID_NAME+ -+ This variable is optional. It only must be defined if the package name -+ does not match what the CPE ID uses for the name. By default it's set -+ to . -+ -+* +LIBFOO_CPE_ID_VERSION+ -+ This variable is optional. By default it's set to . -+ -+* +LIBFOO_CPE_ID_VERSION_MINOR+ -+ This variable is optional. By default it's set to *. -+ -+* +LIBFOO_CPE_ID+ is optional, as the package infrastructure hangles the -+ default case of a single package's Common Product Enumeration (CPE) -+ identification string. +make cpe-info+ copies all of these into a -+ +cpe-manifest.csv+ file. To identify a package's possible CPE, -+ the National Vunerability Database can be searched at -+ https://nvd.nist.gov/products/cpe/search. -+ - The recommended way to define these variables is to use the following - syntax: - -diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt -index 48de65ee10..fcc087f6f1 100644 ---- a/docs/manual/manual.txt -+++ b/docs/manual/manual.txt -@@ -46,6 +46,8 @@ include::legal-notice.txt[] - - include::beyond-buildroot.txt[] - -+include::cpe-reporting.txt[] -+ - = Developer guide - - include::how-buildroot-works.txt[] -diff --git a/linux/linux.mk b/linux/linux.mk -index b9f2052ee7..bf0381f44a 100644 ---- a/linux/linux.mk -+++ b/linux/linux.mk -@@ -12,6 +12,8 @@ LINUX_LICENSE_FILES = \ - LICENSES/preferred/GPL-2.0 \ - LICENSES/exceptions/Linux-syscall-note - endif -+LINUX_CPE_ID_VENDOR = $(LINUX_NAME) -+LINUX_CPE_ID_NAME = $(LINUX_NAME)_kernel - - define LINUX_HELP_CMDS - @echo ' linux-menuconfig - Run Linux kernel menuconfig' -diff --git a/package/Makefile.in b/package/Makefile.in -index 51f5cbce4f..f66f7041ee 100644 ---- a/package/Makefile.in -+++ b/package/Makefile.in -@@ -373,6 +373,10 @@ TARGET_CONFIGURE_ARGS = \ - - ################################################################################ - -+CPE_PREFIX_OS = cpe:2.3:o -+CPE_PREFIX_APP = cpe:2.3:a -+CPE_SUFFIX = *:*:*:*:*:* -+ - ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) - NLS_OPTS = --enable-nls - TARGET_NLS_DEPENDENCIES = host-gettext -diff --git a/package/audit/audit.mk b/package/audit/audit.mk -index 652e0fcd56..a20767d24b 100644 ---- a/package/audit/audit.mk -+++ b/package/audit/audit.mk -@@ -10,6 +10,8 @@ AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) - AUDIT_LICENSE_FILES = COPYING COPYING.LIB - # 0002-Add-substitue-functions-for-strndupa-rawmemchr.patch - AUDIT_AUTORECONF = YES -+AUDIT_CPE_ID_VENDOR = linux_audit_project -+AUDIT_CPE_ID_NAME = linux_audit - - AUDIT_INSTALL_STAGING = YES - -diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk -index 4e95a350a0..495e94e606 100644 ---- a/package/aufs/aufs.mk -+++ b/package/aufs/aufs.mk -@@ -7,6 +7,7 @@ - AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION)) - AUFS_LICENSE = GPL-2.0 - AUFS_LICENSE_FILES = COPYING -+AUFS_CPE_ID_VERSION = 4.1 - - ifeq ($(BR2_PACKAGE_AUFS_SERIES),3) - AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone -diff --git a/package/bash/bash.mk b/package/bash/bash.mk -index 1843862e49..b4681c1085 100644 ---- a/package/bash/bash.mk -+++ b/package/bash/bash.mk -@@ -10,6 +10,7 @@ BASH_DEPENDENCIES = ncurses readline host-bison - BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc - BASH_LICENSE = GPL-3.0+ - BASH_LICENSE_FILES = COPYING -+BASH_CPE_ID_VENDOR = gnu - - BASH_CONF_ENV += \ - ac_cv_rl_prefix="$(STAGING_DIR)" \ -diff --git a/package/bc/bc.mk b/package/bc/bc.mk -index fdfacb6c89..06b6feae4f 100644 ---- a/package/bc/bc.mk -+++ b/package/bc/bc.mk -@@ -9,6 +9,7 @@ BC_SITE = http://ftp.gnu.org/gnu/bc - BC_DEPENDENCIES = host-flex - BC_LICENSE = GPL-2.0+, LGPL-2.1+ - BC_LICENSE_FILES = COPYING COPYING.LIB -+BC_CPE_ID_VENDOR = gnu - BC_CONF_ENV = MAKEINFO=true - - # 0001-bc-use-MAKEINFO-variable-for-docs.patch and 0004-no-gen-libmath.patch -diff --git a/package/bind/bind.mk b/package/bind/bind.mk -index 362a26dce6..806ece6ccd 100644 ---- a/package/bind/bind.mk -+++ b/package/bind/bind.mk -@@ -12,6 +12,7 @@ BIND_INSTALL_STAGING = YES - BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh - BIND_LICENSE = MPL-2.0 - BIND_LICENSE_FILES = COPYRIGHT -+BIND_CPE_ID_VENDOR = isc - BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage - BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke - BIND_TARGET_SERVER_SBIN += dnssec-settime dnssec-verify genrandom -diff --git a/package/boost/boost.mk b/package/boost/boost.mk -index 2daf7f5a96..73f8e71143 100644 ---- a/package/boost/boost.mk -+++ b/package/boost/boost.mk -@@ -10,6 +10,7 @@ BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source - BOOST_INSTALL_STAGING = YES - BOOST_LICENSE = BSL-1.0 - BOOST_LICENSE_FILES = LICENSE_1_0.txt -+BOOST_CPE_ID_VENDOR = $(BOOST_NAME) - - # CVE-2009-3654 is misclassified (by our CVE tracker) as affecting to boost, - # while in fact it affects Drupal (a module called boost in there). -diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk -index 2519227471..288de8c373 100644 ---- a/package/bridge-utils/bridge-utils.mk -+++ b/package/bridge-utils/bridge-utils.mk -@@ -10,6 +10,7 @@ BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz - BRIDGE_UTILS_AUTORECONF = YES - BRIDGE_UTILS_LICENSE = GPL-2.0+ - BRIDGE_UTILS_LICENSE_FILES = COPYING -+BRIDGE_UTILS_CPE_ID_VENDOR = kernel - - # Avoid using the host's headers. Location is not important as - # required headers will anyway be found from within the sysroot. -diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk -index 24f3ba3b19..eae8aa3276 100644 ---- a/package/busybox/busybox.mk -+++ b/package/busybox/busybox.mk -@@ -9,6 +9,7 @@ BUSYBOX_SITE = http://www.busybox.net/downloads - BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 - BUSYBOX_LICENSE = GPL-2.0 - BUSYBOX_LICENSE_FILES = LICENSE -+BUSYBOX_CPE_ID_VENDOR = $(BUSYBOX_NAME) - - define BUSYBOX_HELP_CMDS - @echo ' busybox-menuconfig - Run BusyBox menuconfig' -diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk -index b4d8eea25e..c2e5f7610e 100644 ---- a/package/bzip2/bzip2.mk -+++ b/package/bzip2/bzip2.mk -@@ -9,6 +9,7 @@ BZIP2_SITE = https://sourceware.org/pub/bzip2 - BZIP2_INSTALL_STAGING = YES - BZIP2_LICENSE = bzip2 license - BZIP2_LICENSE_FILES = LICENSE -+BZIP2_CPE_ID_VENDOR = bzip - - ifeq ($(BR2_STATIC_LIBS),) - define BZIP2_BUILD_SHARED_CMDS -diff --git a/package/clang/clang.mk b/package/clang/clang.mk -index d740af5322..672c9fb3fa 100644 ---- a/package/clang/clang.mk -+++ b/package/clang/clang.mk -@@ -10,6 +10,7 @@ CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CL - CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz - CLANG_LICENSE = Apache-2.0 with exceptions - CLANG_LICENSE_FILES = LICENSE.TXT -+CLANG_CVE_ID_VENDOR = llvm - CLANG_SUPPORTS_IN_SOURCE_BUILD = NO - CLANG_INSTALL_STAGING = YES - -diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk -index 24cdad7e1b..18c69369c6 100644 ---- a/package/collectd/collectd.mk -+++ b/package/collectd/collectd.mk -@@ -12,6 +12,7 @@ COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes - COLLECTD_INSTALL_STAGING = YES - COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) - COLLECTD_LICENSE_FILES = COPYING -+COLLECTD_CPE_ID_VENDOR = $(COLLECTD_NAME) - - # These require unmet dependencies, are fringe, pointless or deprecated - COLLECTD_PLUGINS_DISABLE = \ -diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk -index 145b6d785f..55ea407924 100644 ---- a/package/conntrack-tools/conntrack-tools.mk -+++ b/package/conntrack-tools/conntrack-tools.mk -@@ -12,6 +12,7 @@ CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ - libnetfilter_queue host-bison host-flex - CONNTRACK_TOOLS_LICENSE = GPL-2.0+ - CONNTRACK_TOOLS_LICENSE_FILES = COPYING -+CONNTRACK_TOOLS_CPE_ID_VENDOR = netfilter - - CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS) - -diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk -index 3866b76243..18e9052dfd 100644 ---- a/package/coreutils/coreutils.mk -+++ b/package/coreutils/coreutils.mk -@@ -9,6 +9,7 @@ COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils - COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz - COREUTILS_LICENSE = GPL-3.0+ - COREUTILS_LICENSE_FILES = COPYING -+COREUTILS_CPE_ID_VENDOR = gnu - - COREUTILS_CONF_OPTS = --disable-rpath \ - $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) -diff --git a/package/crda/crda.mk b/package/crda/crda.mk -index c5880797be..31a64d004b 100644 ---- a/package/crda/crda.mk -+++ b/package/crda/crda.mk -@@ -9,6 +9,7 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap - CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt - CRDA_LICENSE = ISC - CRDA_LICENSE_FILES = LICENSE -+CRDA_CPE_ID_VENDOR = kernel - - define CRDA_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) \ -diff --git a/package/davici/davici.mk b/package/davici/davici.mk -index 5c08bbe0da..6c8df48b6a 100644 ---- a/package/davici/davici.mk -+++ b/package/davici/davici.mk -@@ -8,6 +8,7 @@ DAVICI_VERSION = 1.3 - DAVICI_SITE = $(call github,strongswan,davici,v$(DAVICI_VERSION)) - DAVICI_LICENSE = LGPL-2.1+ - DAVICI_LICENSE_FILES = COPYING -+DAVICI_CPE_ID_VENDOR = strongswan - DAVICI_DEPENDENCIES = strongswan - DAVICI_INSTALL_STAGING = YES - DAVICI_AUTORECONF = YES -diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk -index 372942e1c3..5eb158d954 100644 ---- a/package/dbus-glib/dbus-glib.mk -+++ b/package/dbus-glib/dbus-glib.mk -@@ -9,6 +9,7 @@ DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib - DBUS_GLIB_INSTALL_STAGING = YES - DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+ - DBUS_GLIB_LICENSE_FILES = COPYING -+DBUS_GLIB_CPE_ID_VENDOR = freedesktop - - DBUS_GLIB_CONF_ENV = \ - ac_cv_have_abstract_sockets=yes \ -diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk -index a4043864d1..958f28c60b 100644 ---- a/package/dbus/dbus.mk -+++ b/package/dbus/dbus.mk -@@ -8,6 +8,8 @@ DBUS_VERSION = 1.12.16 - DBUS_SITE = https://dbus.freedesktop.org/releases/dbus - DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) - DBUS_LICENSE_FILES = COPYING -+DBUS_CPE_ID_VENDOR = d-bus_project -+DBUS_CPE_ID_NAME = d-bus - DBUS_INSTALL_STAGING = YES - - define DBUS_PERMISSIONS -diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk -index ad59804d3b..988c7792dc 100644 ---- a/package/dhcp/dhcp.mk -+++ b/package/dhcp/dhcp.mk -@@ -10,6 +10,7 @@ DHCP_INSTALL_STAGING = YES - DHCP_LICENSE = MPL-2.0 - DHCP_LICENSE_FILES = LICENSE - DHCP_DEPENDENCIES = bind -+DHCP_CPE_ID_VENDOR = isc - - # use libtool-enabled configure.ac - define DHCP_LIBTOOL_AUTORECONF -diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk -index 4a7218a2b7..e0e8bed5aa 100644 ---- a/package/dnsmasq/dnsmasq.mk -+++ b/package/dnsmasq/dnsmasq.mk -@@ -14,6 +14,7 @@ DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ - DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) - DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 - DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 -+DNSMASQ_CPE_ID_VENDOR = thekelleys - - DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) - -diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk -index 1070a410b9..72c6928c7a 100644 ---- a/package/dropbear/dropbear.mk -+++ b/package/dropbear/dropbear.mk -@@ -11,6 +11,8 @@ DROPBEAR_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause - DROPBEAR_LICENSE_FILES = LICENSE - DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp - DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) -+DROPBEAR_CPE_ID_VENDOR = $(DROPBEAR_NAME)_ssh_project -+DROPBEAR_CPE_ID_NAME = $(DROPBEAR_NAME)_ssh - - # Disable hardening flags added by dropbear configure.ac, and let - # Buildroot add them when the relevant options are enabled. This -diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk -index 117cd5e99e..2f1e291c03 100644 ---- a/package/ebtables/ebtables.mk -+++ b/package/ebtables/ebtables.mk -@@ -9,6 +9,7 @@ EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz - EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables - EBTABLES_LICENSE = GPL-2.0+ - EBTABLES_LICENSE_FILES = COPYING -+EBTABLES_CVE_ID_VENDOR = netfilter - EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static) - EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32) - -diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk -index ce4f2d862d..759d7d6fb6 100644 ---- a/package/ethtool/ethtool.mk -+++ b/package/ethtool/ethtool.mk -@@ -9,6 +9,7 @@ ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz - ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool - ETHTOOL_LICENSE = GPL-2.0 - ETHTOOL_LICENSE_FILES = LICENSE COPYING -+ETHTOOL_CPE_ID_VENDOR = kernel - ETHTOOL_CONF_OPTS = \ - $(if $(BR2_PACKAGE_ETHTOOL_PRETTY_PRINT),--enable-pretty-dump,--disable-pretty-dump) - -diff --git a/package/expat/expat.mk b/package/expat/expat.mk -index 38e5dee75d..af3088b80c 100644 ---- a/package/expat/expat.mk -+++ b/package/expat/expat.mk -@@ -12,6 +12,7 @@ EXPAT_DEPENDENCIES = host-pkgconf - HOST_EXPAT_DEPENDENCIES = host-pkgconf - EXPAT_LICENSE = MIT - EXPAT_LICENSE_FILES = COPYING -+EXPAT_CPE_ID_VENDOR = libexpat - - EXPAT_CONF_OPTS = --without-docbook - HOST_EXPAT_CONF_OPTS = --without-docbook -diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk -index 8c74a0e2f6..ea4ec7bdc6 100644 ---- a/package/gdb/gdb.mk -+++ b/package/gdb/gdb.mk -@@ -22,6 +22,7 @@ endif - - GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ - GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB -+GDB_CPE_ID_VENDOR = gnu - - # We only want gdbserver and not the entire debugger. - ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),) -diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk -index ff7ce768ae..07718a4c42 100644 ---- a/package/gesftpserver/gesftpserver.mk -+++ b/package/gesftpserver/gesftpserver.mk -@@ -12,6 +12,8 @@ GESFTPSERVER_LICENSE_FILES = COPYING - - # "Missing prototype" warning treated as error - GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -+GESFTPSERVER_CPE_ID_VENDOR = green_end -+GESFTPSERVER_CPE_ID_NAME = sftpserver - - # forgets to link against pthread when cross compiling - GESFTPSERVER_CONF_ENV = LIBS=-lpthread -diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk -index 4621c9c2f9..81be3435b5 100644 ---- a/package/glibc/glibc.mk -+++ b/package/glibc/glibc.mk -@@ -29,6 +29,7 @@ endif - - GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) - GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES -+GLIBC_CPE_ID_VENDOR = gnu - - # glibc is part of the toolchain so disable the toolchain dependency - GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO -diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk -index d124463a98..a79d5b7d9a 100644 ---- a/package/gmp/gmp.mk -+++ b/package/gmp/gmp.mk -@@ -10,6 +10,7 @@ GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz - GMP_INSTALL_STAGING = YES - GMP_LICENSE = LGPL-3.0+ or GPL-2.0+ - GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -+GMP_CPE_ID_VENDOR = gmplib - GMP_DEPENDENCIES = host-m4 - HOST_GMP_DEPENDENCIES = host-m4 - -diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk -index 617def884e..ba424fed96 100644 ---- a/package/gnupg/gnupg.mk -+++ b/package/gnupg/gnupg.mk -@@ -10,6 +10,7 @@ GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg - GNUPG_LICENSE = GPL-3.0+ - GNUPG_LICENSE_FILES = COPYING - GNUPG_DEPENDENCIES = zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv) -+GNUPG_CPE_ID_VENDOR = $(GNUPG_NAME) - GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no - GNUPG_CONF_OPTS = \ - --disable-rpath \ -diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk -index a1dfce62a2..1e98746441 100644 ---- a/package/gnutls/gnutls.mk -+++ b/package/gnutls/gnutls.mk -@@ -17,6 +17,7 @@ GNUTLS_LICENSE_FILES += doc/COPYING - endif - - GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre -+GNUTLS_CPE_ID_VENDOR = gnu - GNUTLS_CONF_OPTS = \ - --disable-doc \ - --disable-guile \ -diff --git a/package/grep/grep.mk b/package/grep/grep.mk -index ef1bbb4487..204c74f3b8 100644 ---- a/package/grep/grep.mk -+++ b/package/grep/grep.mk -@@ -9,6 +9,7 @@ GREP_SITE = $(BR2_GNU_MIRROR)/grep - GREP_SOURCE = grep-$(GREP_VERSION).tar.xz - GREP_LICENSE = GPL-3.0+ - GREP_LICENSE_FILES = COPYING -+GREP_CPE_ID_VENDOR = gnu - GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) - # install into /bin like busybox grep - GREP_CONF_OPTS = --exec-prefix=/ -diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk -index 7f967b8bfb..fc51d9f7a2 100644 ---- a/package/gtest/gtest.mk -+++ b/package/gtest/gtest.mk -@@ -10,6 +10,8 @@ GTEST_INSTALL_STAGING = YES - GTEST_INSTALL_TARGET = NO - GTEST_LICENSE = BSD-3-Clause - GTEST_LICENSE_FILES = googletest/LICENSE -+GTEST_CPE_ID_VENDOR = google -+GTEST_CPE_ID_NAME = google_test - - ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) - GTEST_DEPENDENCIES += host-gtest -diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk -index 17b27b497c..c8fd3ddb7a 100644 ---- a/package/gzip/gzip.mk -+++ b/package/gzip/gzip.mk -@@ -11,6 +11,7 @@ GZIP_SITE = $(BR2_GNU_MIRROR)/gzip - GZIP_CONF_OPTS = --exec-prefix=/ - GZIP_LICENSE = GPL-3.0+ - GZIP_LICENSE_FILES = COPYING -+GZIP_CPE_ID_VENDOR = gnu - GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes - HOST_GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes - # configure substitutes $(SHELL) for the shell shebang in scripts like -diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk -index b94a0e4578..61576c9323 100644 ---- a/package/hostapd/hostapd.mk -+++ b/package/hostapd/hostapd.mk -@@ -16,6 +16,7 @@ HOSTAPD_LICENSE_FILES = README - # 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch - HOSTAPD_IGNORE_CVES += CVE-2019-16275 - -+HOSTAPD_CPE_ID_VENDOR = w1.fi - HOSTAPD_CONFIG_SET = - - HOSTAPD_CONFIG_ENABLE = \ -diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk -index 84d24aedab..e62c2a79c5 100644 ---- a/package/ifupdown/ifupdown.mk -+++ b/package/ifupdown/ifupdown.mk -@@ -9,6 +9,7 @@ IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz - IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown - IFUPDOWN_LICENSE = GPL-2.0+ - IFUPDOWN_LICENSE_FILES = COPYING -+IFUPDOWN_CPE_ID_VENDOR = debian - - define IFUPDOWN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ -diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk -index 7088b0f152..f1e65e7545 100644 ---- a/package/iperf/iperf.mk -+++ b/package/iperf/iperf.mk -@@ -8,6 +8,8 @@ IPERF_VERSION = 2.0.13 - IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 - IPERF_LICENSE = MIT-like - IPERF_LICENSE_FILES = COPYING -+IPERF_CPE_ID_VENDOR = $(IPERF_NAME)2_project -+IPERF_CPE_ID_NAME = $(IPERF_NAME)2 - - IPERF_CONF_OPTS = \ - --disable-web100 -diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk -index 3537b23824..d29eb8505e 100644 ---- a/package/iperf3/iperf3.mk -+++ b/package/iperf3/iperf3.mk -@@ -9,6 +9,7 @@ IPERF3_SITE = https://downloads.es.net/pub/iperf - IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz - IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT - IPERF3_LICENSE_FILES = LICENSE -+IPERF3_CPE_ID_VENDOR = es - - IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk -index 869763d322..cea3ee0e05 100644 ---- a/package/ipset/ipset.mk -+++ b/package/ipset/ipset.mk -@@ -11,6 +11,7 @@ IPSET_DEPENDENCIES = libmnl host-pkgconf - IPSET_CONF_OPTS = --with-kmod=no - IPSET_LICENSE = GPL-2.0 - IPSET_LICENSE_FILES = COPYING -+IPSET_CPE_ID_VENDOR = netfilter - IPSET_INSTALL_STAGING = YES - - $(eval $(autotools-package)) -diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk -index 7b964aaf41..f4ddbcefd8 100644 ---- a/package/iptables/iptables.mk -+++ b/package/iptables/iptables.mk -@@ -12,6 +12,7 @@ IPTABLES_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) - IPTABLES_LICENSE = GPL-2.0 - IPTABLES_LICENSE_FILES = COPYING -+IPTABLES_CPE_ID_VENDOR = netfilter - # Building static causes ugly warnings on some plugins - IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \ - $(if $(BR2_STATIC_LIBS),,--disable-static) -diff --git a/package/iw/iw.mk b/package/iw/iw.mk -index 2250ea413b..a232cc8baa 100644 ---- a/package/iw/iw.mk -+++ b/package/iw/iw.mk -@@ -9,6 +9,7 @@ IW_SOURCE = iw-$(IW_VERSION).tar.xz - IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw - IW_LICENSE = ISC - IW_LICENSE_FILES = COPYING -+IW_CPE_ID_VENDOR = kernel - IW_DEPENDENCIES = host-pkgconf libnl - IW_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ -diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk -index 0a79b2cf4d..c44764ea18 100644 ---- a/package/kmod/kmod.mk -+++ b/package/kmod/kmod.mk -@@ -15,6 +15,8 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf - KMOD_LICENSE = LGPL-2.1+ (library) - KMOD_LICENSE_FILES = libkmod/COPYING - -+KMOD_CPE_ID_VENDOR = kernel -+ - # --gc-sections triggers binutils ld segfault - # https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - ifeq ($(BR2_microblaze),y) -diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk -index 4aabbea560..366af22487 100644 ---- a/package/libarchive/libarchive.mk -+++ b/package/libarchive/libarchive.mk -@@ -9,6 +9,7 @@ LIBARCHIVE_SITE = https://www.libarchive.de/downloads - LIBARCHIVE_INSTALL_STAGING = YES - LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 - LIBARCHIVE_LICENSE_FILES = COPYING -+LIBARCHIVE_CPE_ID_VENDOR = $(LIBARCHIVE_NAME) - - ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) - ifeq ($(BR2_STATIC_LIBS),y) -diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk -index 7a29634c68..36687bb57d 100644 ---- a/package/libcurl/libcurl.mk -+++ b/package/libcurl/libcurl.mk -@@ -12,6 +12,8 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) - LIBCURL_LICENSE = curl - LIBCURL_LICENSE_FILES = COPYING -+LIBCURL_CPE_ID_VENDOR = haxx -+LIBCURL_CPE_ID_NAME = libcurl - LIBCURL_INSTALL_STAGING = YES - - # We disable NTLM support because it uses fork(), which doesn't work -diff --git a/package/libestr/libestr.mk b/package/libestr/libestr.mk -index 30960f7257..6ce22efae2 100644 ---- a/package/libestr/libestr.mk -+++ b/package/libestr/libestr.mk -@@ -8,6 +8,7 @@ LIBESTR_VERSION = 0.1.11 - LIBESTR_SITE = http://libestr.adiscon.com/files/download - LIBESTR_LICENSE = LGPL-2.1+ - LIBESTR_LICENSE_FILES = COPYING -+LIBESTR_CPE_ID_VENDOR = adiscon - LIBESTR_INSTALL_STAGING = YES - - $(eval $(autotools-package)) -diff --git a/package/libfastjson/libfastjson.mk b/package/libfastjson/libfastjson.mk -index ecca72f56c..37dbd7e03e 100644 ---- a/package/libfastjson/libfastjson.mk -+++ b/package/libfastjson/libfastjson.mk -@@ -12,5 +12,6 @@ LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' - LIBFASTJSON_AUTORECONF = YES - LIBFASTJSON_LICENSE = MIT - LIBFASTJSON_LICENSE_FILES = COPYING -+LIBFASTJSON_CPE_ID_VENDOR = rsyslog - - $(eval $(autotools-package)) -diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk -index c158df2395..c40d9c5970 100644 ---- a/package/libfcgi/libfcgi.mk -+++ b/package/libfcgi/libfcgi.mk -@@ -8,6 +8,8 @@ LIBFCGI_VERSION = 2.4.2 - LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION)) - LIBFCGI_LICENSE = OML - LIBFCGI_LICENSE_FILES = LICENSE.TERMS -+LIBFCGI_CPE_ID_VENDOR = fastcgi -+LIBFCGI_CPE_ID_NAME = fcgi - LIBFCGI_INSTALL_STAGING = YES - LIBFCGI_AUTORECONF = YES - -diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk -index 722a03dca0..e87a024040 100644 ---- a/package/libffi/libffi.mk -+++ b/package/libffi/libffi.mk -@@ -6,6 +6,8 @@ - - LIBFFI_VERSION = 3.3 - LIBFFI_SITE = $(call github,libffi,libffi,v$(LIBFFI_VERSION)) -+LIBFFI_CPE_ID_VERSION = 3.3 -+LIBFFI_CPE_ID_VERSION_MINOR = rc0 - LIBFFI_LICENSE = MIT - LIBFFI_LICENSE_FILES = LICENSE - LIBFFI_INSTALL_STAGING = YES -diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk -index d21513bd39..12fdcab422 100644 ---- a/package/libgcrypt/libgcrypt.mk -+++ b/package/libgcrypt/libgcrypt.mk -@@ -12,6 +12,7 @@ LIBGCRYPT_SITE = https://gnupg.org/ftp/gcrypt/libgcrypt - LIBGCRYPT_INSTALL_STAGING = YES - LIBGCRYPT_DEPENDENCIES = libgpg-error - LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config -+LIBGCRYPT_CPE_ID_VENDOR = gnupg - - # Patching acinclude.m4 in 0001 - # Patching configure.ac and Makefile.am in 0002 -diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk -index 7106124d72..8eea7e96e4 100644 ---- a/package/libglib2/libglib2.mk -+++ b/package/libglib2/libglib2.mk -@@ -10,6 +10,8 @@ LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz - LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) - LIBGLIB2_LICENSE = LGPL-2.1+ - LIBGLIB2_LICENSE_FILES = COPYING -+LIBGLIB2_CPE_ID_VENDOR = gnome -+LIBGLIB2_CPE_ID_NAME = glib - LIBGLIB2_INSTALL_STAGING = YES - - LIBGLIB2_CFLAGS = $(TARGET_CFLAGS) -diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk -index 6281faa662..05c7f710f2 100644 ---- a/package/libgpg-error/libgpg-error.mk -+++ b/package/libgpg-error/libgpg-error.mk -@@ -9,6 +9,7 @@ LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error - LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 - LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ - LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB -+LIBGPG_ERROR_CPE_ID_VENDOR = gnupg - LIBGPG_ERROR_INSTALL_STAGING = YES - LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config - LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -diff --git a/package/liblogging/liblogging.mk b/package/liblogging/liblogging.mk -index c756891a86..24375b56b4 100644 ---- a/package/liblogging/liblogging.mk -+++ b/package/liblogging/liblogging.mk -@@ -8,6 +8,7 @@ LIBLOGGING_VERSION = 1.0.6 - LIBLOGGING_SITE = http://download.rsyslog.com/liblogging - LIBLOGGING_LICENSE = BSD-2-Clause - LIBLOGGING_LICENSE_FILES = COPYING -+LIBLOGGING_CPE_ID_VENDOR = adiscon - LIBLOGGING_INSTALL_STAGING = YES - LIBLOGGING_CONF_OPTS = --enable-cached-man-pages - -diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk -index 67cfd2bc0b..c61315ea68 100644 ---- a/package/libmbim/libmbim.mk -+++ b/package/libmbim/libmbim.mk -@@ -9,6 +9,7 @@ LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim - LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz - LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) - LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB -+LIBMBIM_CPE_ID_VENDOR = freedesktop - LIBMBIM_INSTALL_STAGING = YES - - LIBMBIM_DEPENDENCIES = libglib2 -diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk -index 7fcce4c21f..d3b33db2e0 100644 ---- a/package/libmnl/libmnl.mk -+++ b/package/libmnl/libmnl.mk -@@ -10,5 +10,6 @@ LIBMNL_SITE = http://netfilter.org/projects/libmnl/files - LIBMNL_INSTALL_STAGING = YES - LIBMNL_LICENSE = LGPL-2.1+ - LIBMNL_LICENSE_FILES = COPYING -+LIBMNL_CPE_ID_VENDOR = netfilter - - $(eval $(autotools-package)) -diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk -index 8beefefb51..0a5a94be8f 100644 ---- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk -+++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk -@@ -11,5 +11,6 @@ LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES - LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl - LIBNETFILTER_CONNTRACK_LICENSE = GPL-2.0+ - LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING -+LIBNETFILTER_CONNTRACK_CPE_ID_VENDOR = netfilter - - $(eval $(autotools-package)) -diff --git a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk -index 61d6acd07c..d74ea4d0fd 100644 ---- a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk -+++ b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk -@@ -12,5 +12,6 @@ LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl - LIBNETFILTER_CTHELPER_AUTORECONF = YES - LIBNETFILTER_CTHELPER_LICENSE = GPL-2.0+ - LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING -+LIBNETFILTER_CTHELPER_CPE_ID_VENDOR = netfilter - - $(eval $(autotools-package)) -diff --git a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk -index 9c4c951687..f5c5067b64 100644 ---- a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk -+++ b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk -@@ -12,5 +12,6 @@ LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl - LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES - LIBNETFILTER_CTTIMEOUT_LICENSE = GPL-2.0+ - LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING -+LIBNETFILTER_CTTIMEOUT_CPE_ID_VENDOR = netfilter - - $(eval $(autotools-package)) -diff --git a/package/libnetfilter_queue/libnetfilter_queue.mk b/package/libnetfilter_queue/libnetfilter_queue.mk -index 302f9a2575..5556969fde 100644 ---- a/package/libnetfilter_queue/libnetfilter_queue.mk -+++ b/package/libnetfilter_queue/libnetfilter_queue.mk -@@ -12,5 +12,6 @@ LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl - LIBNETFILTER_QUEUE_AUTORECONF = YES - LIBNETFILTER_QUEUE_LICENSE = GPL-2.0+ - LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING -+LIBNETFILTER_QUEUE_CPE_ID_VENDOR = netfilter - - $(eval $(autotools-package)) -diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk -index 13f5d72c87..a5ad47b85e 100644 ---- a/package/libnfnetlink/libnfnetlink.mk -+++ b/package/libnfnetlink/libnfnetlink.mk -@@ -11,5 +11,6 @@ LIBNFNETLINK_AUTORECONF = YES - LIBNFNETLINK_INSTALL_STAGING = YES - LIBNFNETLINK_LICENSE = GPL-2.0 - LIBNFNETLINK_LICENSE_FILES = COPYING -+LIBNFNETLINK_CPE_ID_VENDOR = netfilter - - $(eval $(autotools-package)) -diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in -index 881518d1cb..3aa5b88017 100644 ---- a/package/libopenssl/Config.in -+++ b/package/libopenssl/Config.in -@@ -45,3 +45,14 @@ config BR2_PACKAGE_LIBOPENSSL_ENGINES - Install additional encryption engine libraries. - - endif # BR2_PACKAGE_LIBOPENSSL -+# See package/openssl/Config.in for the actual kconfig -+# of this package. This file provides a URL for CPE use. -+ -+# help -+# A collaborative effort to develop a robust, commercial-grade, -+# fully featured, and Open Source toolkit implementing the -+# Secure Sockets Layer (SSL v2/v3) and Transport Security -+# (TLS v1) as well as a full-strength general-purpose -+# cryptography library. -+# -+# http://www.openssl.org/ -diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk -index a300458f85..bb4747f4c0 100644 ---- a/package/libopenssl/libopenssl.mk -+++ b/package/libopenssl/libopenssl.mk -@@ -15,6 +15,8 @@ HOST_LIBOPENSSL_DEPENDENCIES = host-zlib - LIBOPENSSL_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH)) - LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS) - LIBOPENSSL_PROVIDES = openssl -+LIBOPENSSL_CPE_ID_VENDOR = $(LIBOPENSSL_PROVIDES) -+LIBOPENSSL_CPE_ID_NAME = $(LIBOPENSSL_PROVIDES) - - ifeq ($(BR2_m68k_cf),y) - # relocation truncated to fit: R_68K_GOT16O -diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk -index 881a109a0a..e323461529 100644 ---- a/package/libpcap/libpcap.mk -+++ b/package/libpcap/libpcap.mk -@@ -8,6 +8,7 @@ LIBPCAP_VERSION = 1.9.1 - LIBPCAP_SITE = http://www.tcpdump.org/release - LIBPCAP_LICENSE = BSD-3-Clause - LIBPCAP_LICENSE_FILES = LICENSE -+LIBPCAP_CPE_ID_VENDOR = tcpdump - LIBPCAP_INSTALL_STAGING = YES - LIBPCAP_DEPENDENCIES = host-flex host-bison - -diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk -index d0e7b66241..bd728e6bc6 100644 ---- a/package/libselinux/libselinux.mk -+++ b/package/libselinux/libselinux.mk -@@ -8,6 +8,7 @@ LIBSELINUX_VERSION = 3.0 - LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 - LIBSELINUX_LICENSE = Public Domain - LIBSELINUX_LICENSE_FILES = LICENSE -+LIBSELINUX_CPE_ID_VENDOR = selinuxproject - - LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre - -diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk -index deba5fafcd..34c9e604c5 100644 ---- a/package/libsemanage/libsemanage.mk -+++ b/package/libsemanage/libsemanage.mk -@@ -9,6 +9,7 @@ LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/2 - LIBSEMANAGE_LICENSE = LGPL-2.1+ - LIBSEMANAGE_LICENSE_FILES = COPYING - LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 -+LIBSEMANAGE_CPE_ID_VENDOR = selinuxproject - LIBSEMANAGE_INSTALL_STAGING = YES - - LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) -diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk -index 2d64c53bc3..59ba710dfe 100644 ---- a/package/libsepol/libsepol.mk -+++ b/package/libsepol/libsepol.mk -@@ -8,6 +8,7 @@ LIBSEPOL_VERSION = 3.0 - LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 - LIBSEPOL_LICENSE = LGPL-2.1+ - LIBSEPOL_LICENSE_FILES = COPYING -+LIBSEPOL_CPE_ID_VENDOR = selinuxproject - - LIBSEPOL_INSTALL_STAGING = YES - LIBSEPOL_DEPENDENCIES = host-flex -diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk -index c03fe0db55..eb66ab5643 100644 ---- a/package/libssh2/libssh2.mk -+++ b/package/libssh2/libssh2.mk -@@ -8,6 +8,7 @@ LIBSSH2_VERSION = 1.9.0 - LIBSSH2_SITE = https://www.libssh2.org/download - LIBSSH2_LICENSE = BSD - LIBSSH2_LICENSE_FILES = COPYING -+LIBSSH2_CPE_ID_VENDOR = $(LIBSSH2_NAME) - LIBSSH2_INSTALL_STAGING = YES - LIBSSH2_CONF_OPTS = --disable-examples-build - -diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk -index 13edc9a4ea..fd8bfa6724 100644 ---- a/package/libsysfs/libsysfs.mk -+++ b/package/libsysfs/libsysfs.mk -@@ -10,5 +10,7 @@ LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz - LIBSYSFS_INSTALL_STAGING = YES - LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPL-2.1+ (library) - LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL -+LIBSYSFS_CPE_ID_VENDOR = sysfsutils_project -+LIBSYSFS_CPE_ID_NAME = sysfsutils - - $(eval $(autotools-package)) -diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk -index d5a6c69965..a354716824 100644 ---- a/package/libtasn1/libtasn1.mk -+++ b/package/libtasn1/libtasn1.mk -@@ -9,6 +9,7 @@ LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 - LIBTASN1_DEPENDENCIES = host-bison host-pkgconf - LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) - LIBTASN1_LICENSE_FILES = LICENSE doc/COPYING doc/COPYING.LESSER -+LIBTASN1_CPE_ID_VENDOR = gnu - LIBTASN1_INSTALL_STAGING = YES - - # We're patching fuzz/Makefile.am -diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk -index fa51447170..1ed7ecf906 100644 ---- a/package/libunistring/libunistring.mk -+++ b/package/libunistring/libunistring.mk -@@ -10,6 +10,7 @@ LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz - LIBUNISTRING_INSTALL_STAGING = YES - LIBUNISTRING_LICENSE = LGPL-3.0+ or GPL-2.0 - LIBUNISTRING_LICENSE_FILES = COPYING COPYING.LIB -+LIBUNISTRING_CPE_ID_VENDOR = gnu - - $(eval $(autotools-package)) - $(eval $(host-autotools-package)) -diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk -index ea6a8c1f6d..76872a0d2d 100644 ---- a/package/libxml2/libxml2.mk -+++ b/package/libxml2/libxml2.mk -@@ -13,6 +13,7 @@ LIBXML2_LICENSE_FILES = COPYING - LIBXML2_IGNORE_CVES += CVE-2020-7595 - # 0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch - LIBXML2_IGNORE_CVES += CVE-2019-20388 -+LIBXML2_CPE_ID_VENDOR = xmlsoft - LIBXML2_CONFIG_SCRIPTS = xml2-config - - # relocation truncated to fit: R_68K_GOT16O -diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk -index 2f37f303ac..3c603ad9f6 100644 ---- a/package/libxslt/libxslt.mk -+++ b/package/libxslt/libxslt.mk -@@ -9,6 +9,7 @@ LIBXSLT_SITE = http://xmlsoft.org/sources - LIBXSLT_INSTALL_STAGING = YES - LIBXSLT_LICENSE = MIT - LIBXSLT_LICENSE_FILES = COPYING -+LIBXSLT_CPE_ID_VENDOR = xmlsoft - - LIBXSLT_CONF_OPTS = \ - --with-gnu-ld \ -diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk -index eea0c12f22..a1e2640bac 100644 ---- a/package/libzlib/libzlib.mk -+++ b/package/libzlib/libzlib.mk -@@ -11,6 +11,8 @@ LIBZLIB_LICENSE = Zlib - LIBZLIB_LICENSE_FILES = README - LIBZLIB_INSTALL_STAGING = YES - LIBZLIB_PROVIDES = zlib -+LIBZLIB_CPE_ID_VENDOR = gnu -+LIBZLIB_CPE_ID_NAME = $(LIBZLIB_PROVIDES) - - # It is not possible to build only a shared version of zlib, so we build both - # shared and static, unless we only want the static libs, and we eventually -diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk -index 7181465c66..39600ef94b 100644 ---- a/package/lighttpd/lighttpd.mk -+++ b/package/lighttpd/lighttpd.mk -@@ -10,6 +10,7 @@ LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz - LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x - LIGHTTPD_LICENSE = BSD-3-Clause - LIGHTTPD_LICENSE_FILES = COPYING -+LIGHTTPD_CPE_ID_VENDOR = $(LIGHTTPD_NAME) - LIGHTTPD_DEPENDENCIES = host-pkgconf - LIGHTTPD_CONF_OPTS = \ - --without-wolfssl \ -diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index cbad8d592a..632afd70bb 100644 ---- a/package/linux-firmware/linux-firmware.mk -+++ b/package/linux-firmware/linux-firmware.mk -@@ -8,6 +8,8 @@ LINUX_FIRMWARE_VERSION = 20200122 - LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - LINUX_FIRMWARE_SITE_METHOD = git - -+LINUX_FIRMWARE_CPE_ID_VENDOR = kernel -+ - # Intel SST DSP - ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) - LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master -diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk -index 4c3cb716b3..4496295f2a 100644 ---- a/package/linux-headers/linux-headers.mk -+++ b/package/linux-headers/linux-headers.mk -@@ -102,6 +102,8 @@ LINUX_HEADERS_LICENSE_FILES = \ - LICENSES/preferred/GPL-2.0 \ - LICENSES/exceptions/Linux-syscall-note - endif -+LINUX_HEADERS_CPE_ID_VENDOR = linux -+LINUX_HEADERS_CPE_ID_NAME = linux_kernel - - LINUX_HEADERS_INSTALL_STAGING = YES - -diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk -index 63610fcc57..28bb5b9de0 100644 ---- a/package/linux-pam/linux-pam.mk -+++ b/package/linux-pam/linux-pam.mk -@@ -22,6 +22,8 @@ LINUX_PAM_AUTORECONF = YES - LINUX_PAM_LICENSE = BSD-3-Clause - LINUX_PAM_LICENSE_FILES = Copyright - LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) -+LINUX_PAM_CPE_ID_VENDOR = $(LINUX_PAM_NAME) -+LINUX_PAM_CPE_ID_NAME = $(LINUX_PAM_NAME) - - ifeq ($(BR2_PACKAGE_LIBSELINUX),y) - LINUX_PAM_CONF_OPTS += --enable-selinux -diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk -index 24d033d124..177fff71bb 100644 ---- a/package/llvm/llvm.mk -+++ b/package/llvm/llvm.mk -@@ -10,6 +10,7 @@ LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLV - LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz - LLVM_LICENSE = Apache-2.0 with exceptions - LLVM_LICENSE_FILES = LICENSE.TXT -+LLVM_CPE_ID_VENDOR = $(LLVM_NAME) - LLVM_SUPPORTS_IN_SOURCE_BUILD = NO - LLVM_INSTALL_STAGING = YES - -diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk -index 53e3c85c6d..9788f04230 100644 ---- a/package/lxc/lxc.mk -+++ b/package/lxc/lxc.mk -@@ -8,6 +8,7 @@ LXC_VERSION = 3.2.1 - LXC_SITE = https://linuxcontainers.org/downloads/lxc - LXC_LICENSE = LGPL-2.1+ - LXC_LICENSE_FILES = COPYING -+LXC_CPE_ID_VENDOR = linuxcontainers - LXC_DEPENDENCIES = host-pkgconf - LXC_INSTALL_STAGING = YES - # We're patching configure.ac -diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk -index 1d32666ccc..856d791d8a 100644 ---- a/package/lz4/lz4.mk -+++ b/package/lz4/lz4.mk -@@ -9,6 +9,7 @@ LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) - LZ4_INSTALL_STAGING = YES - LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) - LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING -+LZ4_CPE_ID_VENDOR = yann_collet - - # CVE-2014-4715 is misclassified (by our CVE tracker) as affecting version - # 1.9.2, while in fact this issue has been fixed since lz4-r130: -diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk -index 0e64d8cde2..ec821adbe8 100644 ---- a/package/memtester/memtester.mk -+++ b/package/memtester/memtester.mk -@@ -8,6 +8,7 @@ MEMTESTER_VERSION = 4.3.0 - MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions - MEMTESTER_LICENSE = GPL-2.0 - MEMTESTER_LICENSE_FILES = COPYING -+MEMTESTER_CPE_ID_VENDOR = pryopus - - MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr - -diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk -index 6efd5be80d..a7c6483221 100644 ---- a/package/mii-diag/mii-diag.mk -+++ b/package/mii-diag/mii-diag.mk -@@ -10,6 +10,7 @@ MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz - MII_DIAG_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/m/mii-diag - MII_DIAG_LICENSE = GPL # No version specified - MII_DIAG_LICENSE_FILES = mii-diag.c -+MII_DIAG_CPE_ID_VENDOR = debian - - MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) - -diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk -index ef2999eb16..837aff3aa5 100644 ---- a/package/mpfr/mpfr.mk -+++ b/package/mpfr/mpfr.mk -@@ -9,6 +9,7 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) - MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz - MPFR_LICENSE = LGPL-3.0+ - MPFR_LICENSE_FILES = COPYING.LESSER -+MPFR_CPE_ID_VENDOR = gnu - MPFR_INSTALL_STAGING = YES - MPFR_DEPENDENCIES = gmp - HOST_MPFR_DEPENDENCIES = host-gmp -diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk -index b9a4eaba45..6ee7fd5dfd 100644 ---- a/package/mrouted/mrouted.mk -+++ b/package/mrouted/mrouted.mk -@@ -9,6 +9,7 @@ MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION)) - MROUTED_DEPENDENCIES = host-bison - MROUTED_LICENSE = BSD-3-Clause - MROUTED_LICENSE_FILES = LICENSE -+MROUTED_CPE_ID_VENDOR = troglobit - - define MROUTED_CONFIGURE_CMDS - (cd $(@D); \ -diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk -index 3477460200..035b624ab2 100644 ---- a/package/mtd/mtd.mk -+++ b/package/mtd/mtd.mk -@@ -9,6 +9,8 @@ MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 - MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils - MTD_LICENSE = GPL-2.0 - MTD_LICENSE_FILES = COPYING -+MTD_CPE_ID_VENDOR = mtd-utils_project -+MTD_CPE_ID_NAME = mtd-utils - MTD_INSTALL_STAGING = YES - - ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) -diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk -index c11650c766..5c5e497488 100644 ---- a/package/ncurses/ncurses.mk -+++ b/package/ncurses/ncurses.mk -@@ -10,6 +10,7 @@ NCURSES_INSTALL_STAGING = YES - NCURSES_DEPENDENCIES = host-ncurses - NCURSES_LICENSE = MIT with advertising clause - NCURSES_LICENSE_FILES = COPYING -+NCURSES_CPE_ID_VENDOR = gnu - NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config - NCURSES_PATCH = \ - $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ -diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk -index 904279d1fb..09ca33f754 100644 ---- a/package/netsnmp/netsnmp.mk -+++ b/package/netsnmp/netsnmp.mk -@@ -9,6 +9,8 @@ NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NET - NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz - NETSNMP_LICENSE = Various BSD-like - NETSNMP_LICENSE_FILES = COPYING -+NETSNMP_CPE_ID_VENDOR = net-snmp -+NETSNMP_CPE_ID_NAME = $(NETSNMP_CPE_ID_VENDOR) - NETSNMP_INSTALL_STAGING = YES - NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no - NETSNMP_CONF_OPTS = \ -diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk -index 7af229a57e..57d05b5c6b 100644 ---- a/package/nfs-utils/nfs-utils.mk -+++ b/package/nfs-utils/nfs-utils.mk -@@ -10,6 +10,8 @@ NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VE - NFS_UTILS_LICENSE = GPL-2.0+ - NFS_UTILS_LICENSE_FILES = COPYING - NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc -+NFS_UTILS_CPE_ID_VENDOR = linux-nfs -+NFS_UTILS_AUTORECONF = YES - - NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no - -diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk -index d50572128a..8b531a7a3e 100644 ---- a/package/openssh/openssh.mk -+++ b/package/openssh/openssh.mk -@@ -5,6 +5,8 @@ - ################################################################################ - - OPENSSH_VERSION = 8.2p1 -+OPENSSH_CPE_ID_VERSION = 8.2 -+OPENSSH_CPE_ID_VERSION_MINOR = p1 - OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable - OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain - OPENSSH_LICENSE_FILES = LICENCE -@@ -12,6 +14,7 @@ OPENSSH_CONF_ENV = \ - LD="$(TARGET_CC)" \ - LDFLAGS="$(TARGET_CFLAGS)" \ - LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` -+OPENSSH_CPE_ID_VENDOR = openbsd - OPENSSH_CONF_OPTS = \ - --sysconfdir=/etc/ssh \ - --with-default-path=$(BR2_SYSTEM_DEFAULT_PATH) \ -diff --git a/package/pax-utils/pax-utils.mk b/package/pax-utils/pax-utils.mk -index b31468eca2..a6618851ba 100644 ---- a/package/pax-utils/pax-utils.mk -+++ b/package/pax-utils/pax-utils.mk -@@ -9,6 +9,7 @@ PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles - PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz - PAX_UTILS_LICENSE = GPL-2.0 - PAX_UTILS_LICENSE_FILES = COPYING -+PAX_UTILS_CPE_ID_VENDOR = gentoo - - PAX_UTILS_DEPENDENCIES = host-pkgconf - PAX_UTILS_CONF_OPTS = --without-python -diff --git a/package/paxtest/paxtest.mk b/package/paxtest/paxtest.mk -index e632e222c3..1b8d6699b6 100644 ---- a/package/paxtest/paxtest.mk -+++ b/package/paxtest/paxtest.mk -@@ -8,6 +8,7 @@ PAXTEST_VERSION = 0.9.15 - PAXTEST_SITE = https://www.grsecurity.net/~spender - PAXTEST_LICENSE = GPL-2.0+ - PAXTEST_LICENSE_FILES = README -+PAXTEST_CPE_ID_VENDOR = grsecurity - - define PAXTEST_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ -diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk -index 3c280e593f..b37a2ca9b7 100644 ---- a/package/pcre/pcre.mk -+++ b/package/pcre/pcre.mk -@@ -9,6 +9,7 @@ PCRE_SITE = https://ftp.pcre.org/pub/pcre - PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 - PCRE_LICENSE = BSD-3-Clause - PCRE_LICENSE_FILES = LICENCE -+PCRE_CPE_ID_VENDOR = $(PCRE_NAME) - PCRE_INSTALL_STAGING = YES - PCRE_CONFIG_SCRIPTS = pcre-config - -diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk -index a446ebca46..52d4e36f2e 100644 ---- a/package/pixman/pixman.mk -+++ b/package/pixman/pixman.mk -@@ -9,6 +9,7 @@ PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz - PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib - PIXMAN_LICENSE = MIT - PIXMAN_LICENSE_FILES = COPYING -+PIXMAN_CPE_ID_VENDOR = $(PIXMAN_NAME) - - PIXMAN_INSTALL_STAGING = YES - PIXMAN_DEPENDENCIES = host-pkgconf -diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk -index f9385177ac..21e510365e 100644 ---- a/package/pkg-generic.mk -+++ b/package/pkg-generic.mk -@@ -971,6 +971,41 @@ else - $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) - endif - -+$(2)_CPE_ID_VENDOR ?= $$($(2)_NAME)_project -+$(2)_CPE_ID_NAME ?= $$($(2)_NAME) -+$(2)_CPE_ID_VERSION ?= $$($(2)_VERSION) -+$(2)_CPE_ID_VERSION_MINOR ?= * -+$(2)_CPE_ID ?= $$($(2)_CPE_ID_VENDOR):$$($(2)_CPE_ID_NAME):$$($(2)_CPE_ID_VERSION):$$($(2)_CPE_ID_VERSION_MINOR) -+ -+ifneq ($(filter linux linux-headers,$(1)),) -+$(2)_CPE_PREFIX = $(CPE_PREFIX_OS) -+else -+$(2)_CPE_PREFIX = $(CPE_PREFIX_APP) -+endif -+ -+$(1)-cpe-info: PKG=$(2) -+ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -+$(1)-cpe-info: toolchain -+endif -+$(1)-cpe-info: -+ifeq ($$($(2)_TYPE),target) -+ifneq ($$($(2)_NAME),toolchain-external) -+ifneq ($(findstring TOOLCHAIN_EXTERNAL, $(2)),) -+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -+ $$(eval $(2)_VERSION = $$(shell $$(call TOOLCHAIN_CPE_INFO))) -+ $$(eval $(2)_CPE_ID_VENDOR = gnu) -+ $$(eval $(2)_CPE_ID_NAME = glibc) -+ $$(eval $(2)_ACTUAL_SOURCE_SITE = https://github.com/bminor/glibc/releases) -+ $$(eval $(2)_RAWNAME = glibc) -+endif # ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC),y) -+endif # ifneq ($(findstring TOOLCHAIN_EXTERNAL, $(2)),) -+endif # ifneq ($$($(2)_NAME),toolchain-external) -+ifneq ($$(call qstrip,$$($(2)_SOURCE)),) -+ @$$(call MESSAGE,"Collecting cpe info") -+ $(Q)$$(call cpe-manifest,$$($(2)_CPE_PREFIX):$$($(2)_CPE_ID):$(CPE_SUFFIX),$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_ACTUAL_SOURCE_SITE)) -+endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) -+endif # ifeq ($$($(2)_TYPE),target) -+ - # legal-info: declare dependencies and set values used later for the manifest - ifneq ($$($(2)_LICENSE_FILES),) - $(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES) -@@ -1116,6 +1151,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) - $(1)-clean-for-reconfigure \ - $(1)-clean-for-reinstall \ - $(1)-configure \ -+ $(1)-cpe-info \ - $(1)-depends \ - $(1)-dirclean \ - $(1)-external-deps \ -diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk -index d88a14ab0f..9818eda12d 100644 ---- a/package/pkg-utils.mk -+++ b/package/pkg-utils.mk -@@ -223,3 +223,11 @@ legal-deps = \ - $(filter-out $(if $(1:host-%=),host-%),\ - $(call non-virtual-deps,\ - $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)]) -+ -+# -+# cpe-info helper functions -+# -+ -+define cpe-manifest # cpe, pkg name, version, url -+ echo '"$(1)","$(2)","$(3)","$(4)"' >>$(CPE_MANIFEST_CSV) -+endef -diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk -index a06c7847ab..183c9b4925 100644 ---- a/package/policycoreutils/policycoreutils.mk -+++ b/package/policycoreutils/policycoreutils.mk -@@ -8,6 +8,7 @@ POLICYCOREUTILS_VERSION = 3.0 - POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 - POLICYCOREUTILS_LICENSE = GPL-2.0 - POLICYCOREUTILS_LICENSE_FILES = COPYING -+POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject - - POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) - POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) -diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk -index 685666a200..118f9fc334 100644 ---- a/package/pppd/pppd.mk -+++ b/package/pppd/pppd.mk -@@ -10,6 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ - PPPD_LICENSE_FILES = \ - pppd/tdb.c pppd/plugins/pppoatm/COPYING \ - pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -+PPPD_CPE_ID_VENDOR = samba -+PPPD_CPE_ID_NAME = ppp - - # 0001-pppd-Fix-bounds-check.patch - PPPD_IGNORE_CVES += CVE-2020-8597 -diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk -index e126d0e0a4..94276233c8 100644 ---- a/package/proftpd/proftpd.mk -+++ b/package/proftpd/proftpd.mk -@@ -8,6 +8,7 @@ PROFTPD_VERSION = 1.3.6c - PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) - PROFTPD_LICENSE = GPL-2.0+ - PROFTPD_LICENSE_FILES = COPYING -+PROFTPD_CPE_ID_VENDOR = $(PROFTPD_NAME) - - PROFTPD_CONF_ENV = \ - ac_cv_func_setpgrp_void=yes \ -diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk -index 381649a4e7..27792ca082 100644 ---- a/package/protobuf/protobuf.mk -+++ b/package/protobuf/protobuf.mk -@@ -12,6 +12,7 @@ PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz - PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) - PROTOBUF_LICENSE = BSD-3-Clause - PROTOBUF_LICENSE_FILES = LICENSE -+PROTOBUF_CPE_ID_VENDOR = google - - # N.B. Need to use host protoc during cross compilation. - PROTOBUF_DEPENDENCIES = host-protobuf -diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk -index 7b7c7d9637..7e3d18b433 100644 ---- a/package/pure-ftpd/pure-ftpd.mk -+++ b/package/pure-ftpd/pure-ftpd.mk -@@ -9,6 +9,7 @@ PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases - PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 - PURE_FTPD_LICENSE = ISC - PURE_FTPD_LICENSE_FILES = COPYING -+PURE_FTPD_CPE_ID_VENDOR = pureftpd - PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) - - # 0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch -diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk -index cfb87bb6fd..2659a0b982 100644 ---- a/package/python-lxml/python-lxml.mk -+++ b/package/python-lxml/python-lxml.mk -@@ -15,6 +15,8 @@ PYTHON_LXML_LICENSE_FILES = \ - doc/licenses/BSD.txt \ - doc/licenses/elementtree.txt \ - src/lxml/isoschematron/resources/rng/iso-schematron.rng -+PYTHON_LXML_CPE_ID_VENDOR = lxml -+PYTHON_LXML_CPE_ID_NAME = lxml - - # python-lxml can use either setuptools, or distutils as a fallback. - # So, we use setuptools. -diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk -index 2cb575ae22..ade5ca5521 100644 ---- a/package/python-setuptools/python-setuptools.mk -+++ b/package/python-setuptools/python-setuptools.mk -@@ -11,6 +11,8 @@ PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip - PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 - PYTHON_SETUPTOOLS_LICENSE = MIT - PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE -+PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -+PYTHON_SETUPTOOLS_CPE_ID_NAME = setuptools - PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools - HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 - -diff --git a/package/python/python.mk b/package/python/python.mk -index ccaaadd012..2d4c5a3721 100644 ---- a/package/python/python.mk -+++ b/package/python/python.mk -@@ -10,6 +10,7 @@ PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz - PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) - PYTHON_LICENSE = Python-2.0, others - PYTHON_LICENSE_FILES = LICENSE -+PYTHON_CPE_ID_VENDOR = $(PYTHON_NAME) - PYTHON_LIBTOOL_PATCH = NO - - # Python needs itself to be built, so in order to cross-compile -diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk -index 7fe64e3605..2efc09670e 100644 ---- a/package/qemu/qemu.mk -+++ b/package/qemu/qemu.mk -@@ -12,6 +12,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB - # NOTE: there is no top-level license file for non-(L)GPL licenses; - # the non-(L)GPL license texts are specified in the affected - # individual source files. -+QEMU_CPE_ID_VENDOR = $(QEMU_NAME) - - #------------------------------------------------------------- - # Target-qemu -diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk -index 9f1c82ce40..d3bcef7df1 100644 ---- a/package/rapidjson/rapidjson.mk -+++ b/package/rapidjson/rapidjson.mk -@@ -8,6 +8,7 @@ RAPIDJSON_VERSION = 1.1.0 - RAPIDJSON_SITE = $(call github,miloyip,rapidjson,v$(RAPIDJSON_VERSION)) - RAPIDJSON_LICENSE = MIT - RAPIDJSON_LICENSE_FILES = license.txt -+RAPIDJSON_CPE_ID_VENDOR = tencent - - # rapidjson is a header-only C++ library - RAPIDJSON_INSTALL_TARGET = NO -diff --git a/package/readline/readline.mk b/package/readline/readline.mk -index f5d7d5bf9e..04872ac868 100644 ---- a/package/readline/readline.mk -+++ b/package/readline/readline.mk -@@ -14,6 +14,7 @@ READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ - READLINE_CONF_OPTS = --disable-install-examples - READLINE_LICENSE = GPL-3.0+ - READLINE_LICENSE_FILES = COPYING -+READLINE_CPE_ID_VENDOR = gnu - - define READLINE_INSTALL_INPUTRC - $(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc -diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk -index 1a5fefff06..891a0d29e6 100644 ---- a/package/refpolicy/refpolicy.mk -+++ b/package/refpolicy/refpolicy.mk -@@ -9,6 +9,7 @@ REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 - REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609 - REFPOLICY_LICENSE = GPL-2.0 - REFPOLICY_LICENSE_FILES = COPYING -+REFPOLICY_CPE_ID_VENDOR = tresys - REFPOLICY_INSTALL_STAGING = YES - REFPOLICY_DEPENDENCIES = \ - host-m4 \ -diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk -index 27d482fdec..bd129f1724 100644 ---- a/package/rsyslog/rsyslog.mk -+++ b/package/rsyslog/rsyslog.mk -@@ -8,6 +8,7 @@ RSYSLOG_VERSION = 8.2002.0 - RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog - RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 - RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 -+RSYSLOG_CPE_ID_VENDOR = $(RSYSLOG_NAME) - RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf - RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' - RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ -diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk -index abc32f4fb2..acf219a6a5 100644 ---- a/package/rt-tests/rt-tests.mk -+++ b/package/rt-tests/rt-tests.mk -@@ -9,6 +9,7 @@ RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz - RT_TESTS_VERSION = 1.6 - RT_TESTS_LICENSE = GPL-2.0+ - RT_TESTS_LICENSE_FILES = COPYING -+RT_TESTS_CPE_ID_VENDOR = kernel - - ifeq ($(BR2_PACKAGE_PYTHON3),y) - RT_TESTS_DEPENDENCIES = python3 -diff --git a/package/sed/sed.mk b/package/sed/sed.mk -index 6bb3220553..64fb2035b0 100644 ---- a/package/sed/sed.mk -+++ b/package/sed/sed.mk -@@ -9,6 +9,7 @@ SED_SOURCE = sed-$(SED_VERSION).tar.xz - SED_SITE = $(BR2_GNU_MIRROR)/sed - SED_LICENSE = GPL-3.0 - SED_LICENSE_FILES = COPYING -+SED_CPE_ID_VENDOR = gnu - - SED_CONF_OPTS = \ - --bindir=/bin \ -diff --git a/package/setools/setools.mk b/package/setools/setools.mk -index 63ca3651e8..7b1c1a4b64 100644 ---- a/package/setools/setools.mk -+++ b/package/setools/setools.mk -@@ -10,6 +10,7 @@ SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-fle - SETOOLS_INSTALL_STAGING = YES - SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ - SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL -+SETOOLS_CPE_ID_VENDOR = selinuxproject - SETOOLS_SETUP_TYPE = setuptools - HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx - -diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk -index 66ca59d79d..2e29e4c803 100644 ---- a/package/setserial/setserial.mk -+++ b/package/setserial/setserial.mk -@@ -10,6 +10,7 @@ SETSERIAL_SOURCE = setserial_$(SETSERIAL_VERSION).orig.tar.gz - SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial - SETSERIAL_LICENSE = GPL-2.0 - SETSERIAL_LICENSE_FILES = debian/copyright -+ - # make all also builds setserial.cat which needs nroff - SETSERIAL_MAKE_OPTS = setserial - -diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk -index 1a36c75d47..0db0e084f6 100644 ---- a/package/smcroute/smcroute.mk -+++ b/package/smcroute/smcroute.mk -@@ -9,6 +9,7 @@ SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz - SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) - SMCROUTE_LICENSE = GPL-2.0+ - SMCROUTE_LICENSE_FILES = COPYING -+SMCROUTE_CPE_ID_VENDOR = troglobit - - SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes - #BUG:The package Makefile uses CC?= even though the package is autotools based -diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk -index ed97d0a7b4..8caa1e2b3c 100644 ---- a/package/spawn-fcgi/spawn-fcgi.mk -+++ b/package/spawn-fcgi/spawn-fcgi.mk -@@ -9,5 +9,6 @@ SPAWN_FCGI_SITE = http://www.lighttpd.net/download - SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2 - SPAWN_FCGI_LICENSE = BSD-3-Clause - SPAWN_FCGI_LICENSE_FILES = COPYING -+SPAWN_FCGI_CPE_ID_VENDOR = lighttpd - - $(eval $(autotools-package)) -diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk -index 3283d40cb1..a3061591b1 100644 ---- a/package/sqlite/sqlite.mk -+++ b/package/sqlite/sqlite.mk -@@ -5,11 +5,13 @@ - ################################################################################ - - SQLITE_VERSION = 3310100 -+SQLITE_CPE_ID_VERSION = 3.31.1 - SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz - SQLITE_SITE = https://www.sqlite.org/2020 - SQLITE_LICENSE = Public domain - SQLITE_LICENSE_FILES = tea/license.terms - SQLITE_INSTALL_STAGING = YES -+SQLITE_CPE_ID_VENDOR = $(SQLITE_NAME) - - ifeq ($(BR2_PACKAGE_SQLITE_STAT4),y) - SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT4 -diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk -index 7f1752ce57..1f7437fa31 100644 ---- a/package/strongswan/strongswan.mk -+++ b/package/strongswan/strongswan.mk -@@ -12,6 +12,7 @@ STRONGSWAN_PATCH = \ - $(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch - STRONGSWAN_LICENSE = GPL-2.0+ - STRONGSWAN_LICENSE_FILES = COPYING LICENSE -+STRONGSWAN_CPE_ID_VENDOR = $(STRONGSWAN_NAME) - STRONGSWAN_DEPENDENCIES = host-pkgconf - STRONGSWAN_INSTALL_STAGING = YES - STRONGSWAN_CONF_OPTS += \ -diff --git a/package/tar/tar.mk b/package/tar/tar.mk -index 9e0a40e561..643eff1cbc 100644 ---- a/package/tar/tar.mk -+++ b/package/tar/tar.mk -@@ -12,6 +12,7 @@ TAR_SITE = $(BR2_GNU_MIRROR)/tar - TAR_CONF_OPTS = --exec-prefix=/ - TAR_LICENSE = GPL-3.0+ - TAR_LICENSE_FILES = COPYING -+TAR_CPE_ID_VENDOR = gnu - - ifeq ($(BR2_PACKAGE_ACL),y) - TAR_DEPENDENCIES += acl -diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk -index 6d750b3cd2..913891e897 100644 ---- a/package/tcl/tcl.mk -+++ b/package/tcl/tcl.mk -@@ -10,6 +10,7 @@ TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz - TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) - TCL_LICENSE = TCL - TCL_LICENSE_FILES = license.terms -+TCL_CPE_ID_VENDOR = $(TCL_NAME) - TCL_SUBDIR = unix - TCL_INSTALL_STAGING = YES - TCL_AUTORECONF = YES -diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk -index 01a46b9b5f..9687e3c497 100644 ---- a/package/tcpdump/tcpdump.mk -+++ b/package/tcpdump/tcpdump.mk -@@ -8,6 +8,7 @@ TCPDUMP_VERSION = 4.9.3 - TCPDUMP_SITE = http://www.tcpdump.org/release - TCPDUMP_LICENSE = BSD-3-Clause - TCPDUMP_LICENSE_FILES = LICENSE -+TCPDUMP_CPE_ID_VENDOR = $(TCPDUMP_NAME) - TCPDUMP_CONF_ENV = \ - ac_cv_linux_vers=2 \ - td_cv_buggygetaddrinfo=no \ -diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk -index 57905fda05..301a222e39 100644 ---- a/package/tftpd/tftpd.mk -+++ b/package/tftpd/tftpd.mk -@@ -10,6 +10,8 @@ TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa - TFTPD_CONF_OPTS = --without-tcpwrappers - TFTPD_LICENSE = BSD-4-Clause - TFTPD_LICENSE_FILES = tftpd/tftpd.c -+TFTPD_CPE_ID_VENDOR = $(TFTPD_NAME)-hpa_project -+TFTPD_CPE_ID_NAME = $(TFTPD_NAME)-hpa - - define TFTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp -diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk -index a06c25998f..61e22f6ae8 100644 ---- a/package/uboot-tools/uboot-tools.mk -+++ b/package/uboot-tools/uboot-tools.mk -@@ -9,6 +9,8 @@ UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 - UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot - UBOOT_TOOLS_LICENSE = GPL-2.0+ - UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt -+UBOOT_TOOLS_CPE_ID_VENDOR = denx -+UBOOT_TOOLS_CPE_ID_NAME = u-boot - UBOOT_TOOLS_INSTALL_STAGING = YES - - # u-boot 2020.01+ needs make 4.0+ -diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk -index b6ccaaa78d..42343eaf45 100644 ---- a/package/util-linux/util-linux.mk -+++ b/package/util-linux/util-linux.mk -@@ -21,6 +21,7 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \ - Documentation/licenses/COPYING.ISC \ - Documentation/licenses/COPYING.LGPL-2.1-or-later - -+UTIL_LINUX_CPE_ID_VENDOR = kernel - UTIL_LINUX_INSTALL_STAGING = YES - UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) - UTIL_LINUX_CONF_OPTS += \ -diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk -index 41b2625191..94230fd4b8 100644 ---- a/package/valgrind/valgrind.mk -+++ b/package/valgrind/valgrind.mk -@@ -9,6 +9,7 @@ VALGRIND_SITE = ftp://sourceware.org/pub/valgrind - VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 - VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 - VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS -+VALGRIND_CPE_ID_VENDOR = $(VALGRIND_NAME) - VALGRIND_CONF_OPTS = \ - --disable-ubsan \ - --without-mpicc -diff --git a/package/vim/vim.mk b/package/vim/vim.mk -index 1fbb6a6b86..2bd3d437e4 100644 ---- a/package/vim/vim.mk -+++ b/package/vim/vim.mk -@@ -23,6 +23,7 @@ VIM_CONF_ENV = \ - VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x - VIM_LICENSE = Charityware - VIM_LICENSE_FILES = README.txt -+VIM_CPE_ID_VENDOR = $(VIM_NAME) - - ifeq ($(BR2_PACKAGE_ACL),y) - VIM_CONF_OPTS += --enable-acl -diff --git a/package/wget/wget.mk b/package/wget/wget.mk -index ed3f1fdff9..65c132e453 100644 ---- a/package/wget/wget.mk -+++ b/package/wget/wget.mk -@@ -10,6 +10,7 @@ WGET_SITE = $(BR2_GNU_MIRROR)/wget - WGET_DEPENDENCIES = host-pkgconf - WGET_LICENSE = GPL-3.0+ - WGET_LICENSE_FILES = COPYING -+WGET_CPE_ID_VENDOR = gnu - - ifeq ($(BR2_PACKAGE_GNUTLS),y) - WGET_CONF_OPTS += --with-ssl=gnutls -diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk -index 31b62e36e1..f51aba75df 100644 ---- a/package/wireless-regdb/wireless-regdb.mk -+++ b/package/wireless-regdb/wireless-regdb.mk -@@ -9,6 +9,7 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz - WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb - WIRELESS_REGDB_LICENSE = ISC - WIRELESS_REGDB_LICENSE_FILES = LICENSE -+WIRELESS_REGDB_CPE_ID_VENDOR = kernel - - ifeq ($(BR2_PACKAGE_CRDA),y) - define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS -diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk -index b87ab20fb2..01d03218d6 100644 ---- a/package/wireless_tools/wireless_tools.mk -+++ b/package/wireless_tools/wireless_tools.mk -@@ -10,6 +10,8 @@ WIRELESS_TOOLS_SITE = https://hewlettpackard.github.io/wireless-tools - WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz - WIRELESS_TOOLS_LICENSE = GPL-2.0 - WIRELESS_TOOLS_LICENSE_FILES = COPYING -+WIRELESS_TOOLS_CPE_ID_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR) -+WIRELESS_TOOLS_CPE_ID_VERSION_MINOR = pre9 - WIRELESS_TOOLS_INSTALL_STAGING = YES - - WIRELESS_TOOLS_BUILD_TARGETS = iwmulticall -diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk -index 8e7b9c3a65..93763c3973 100644 ---- a/package/wpa_supplicant/wpa_supplicant.mk -+++ b/package/wpa_supplicant/wpa_supplicant.mk -@@ -8,6 +8,7 @@ WPA_SUPPLICANT_VERSION = 2.9 - WPA_SUPPLICANT_SITE = http://w1.fi/releases - WPA_SUPPLICANT_LICENSE = BSD-3-Clause - WPA_SUPPLICANT_LICENSE_FILES = README -+WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi - WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config - WPA_SUPPLICANT_SUBDIR = wpa_supplicant - WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant -diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk -index c75a8b0d35..d9dc3992ed 100644 ---- a/package/xerces/xerces.mk -+++ b/package/xerces/xerces.mk -@@ -9,6 +9,8 @@ XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz - XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources - XERCES_LICENSE = Apache-2.0 - XERCES_LICENSE_FILES = LICENSE -+XERCES_CPE_ID_VENDOR = apache -+XERCES_CPE_ID_NAME = $(XERCES_NAME)-c\+\+ - XERCES_INSTALL_STAGING = YES - - define XERCES_DISABLE_SAMPLES -diff --git a/package/xz/xz.mk b/package/xz/xz.mk -index dbf874e9b9..5c464d91dd 100644 ---- a/package/xz/xz.mk -+++ b/package/xz/xz.mk -@@ -11,6 +11,7 @@ XZ_INSTALL_STAGING = YES - XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' - XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ - XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 -+XZ_CPE_ID_VENDOR = tukaani - - ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) - XZ_CONF_OPTS = --enable-threads -diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk -index 6d91cb5d1e..14065345d7 100644 ---- a/toolchain/toolchain-external/pkg-toolchain-external.mk -+++ b/toolchain/toolchain-external/pkg-toolchain-external.mk -@@ -453,6 +453,13 @@ define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS - $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) - endef - -+define TOOLCHAIN_CPE_INFO -+ ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ -+ MAJ=`awk '{ if ($$1 = /#define/ && ($$2= /__GLIBC__/)){printf $$3};}' $${ARCH_SYSROOT_DIR}/usr/include/features.h` ; \ -+ MIN=`awk '{ if ($$1 = /#define/ && ($$2 = /_GLIBC_MINOR/)){printf $$3};}' $${ARCH_SYSROOT_DIR}/usr/include/features.h` ; \ -+ echo $${MAJ}.$${MIN} -+endef -+ - # Create a symlink from (usr/)$(ARCH_LIB_DIR) to lib. - # Note: the skeleton package additionally creates lib32->lib or lib64->lib - # (as appropriate) diff --git a/config/buildroot/patches/deterministic-cpio.patch b/config/buildroot/patches/deterministic-cpio.patch index c68ef8e..2f47249 100644 --- a/config/buildroot/patches/deterministic-cpio.patch +++ b/config/buildroot/patches/deterministic-cpio.patch @@ -1,8 +1,8 @@ diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk -index 28a435dd5e..72923ded47 100644 +index 81f8c393d1..72923ded47 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk -@@ -32,12 +32,17 @@ ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT +@@ -32,15 +32,16 @@ ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT # --reproducible option was introduced in cpio v2.12, which may not be # available in some old distributions, so we build host-cpio ifeq ($(BR2_REPRODUCIBLE),y) @@ -12,14 +12,28 @@ index 28a435dd5e..72923ded47 100644 endif define ROOTFS_CPIO_CMD -- cd $(TARGET_DIR) && find . | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc > $@ +- cd $(TARGET_DIR) && \ +- find . \ +- | LC_ALL=C sort \ +- | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc \ + cd $(TARGET_DIR) \ + && find . -mindepth 1 -execdir touch -hcd "@0" "{}" + \ + && find . -mindepth 1 -printf '%P\0' \ + | sort -z \ + | LANG=C bsdtar --null -cnf - -T - \ + | LANG=C bsdtar --uid 0 --gid 0 --null -cf - --format=newc @- \ -+ > $@ + > $@ endef - ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) +diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk +index 708ce637c2..2ba8dcab2a 100644 +--- a/package/libarchive/libarchive.mk ++++ b/package/libarchive/libarchive.mk +@@ -135,7 +135,6 @@ endif + # The only user of host-libarchive needs zlib support + HOST_LIBARCHIVE_DEPENDENCIES = host-zlib + HOST_LIBARCHIVE_CONF_OPTS = \ +- --disable-bsdtar \ + --disable-bsdcpio \ + --disable-bsdcat \ + --disable-acl \ diff --git a/config/config.env b/config/config.env index 360550e..6f6fa40 100644 --- a/config/config.env +++ b/config/config.env @@ -1,2 +1,2 @@ -BUILDROOT_REF=95fdb33f71f8a2d6a6e86fa3c6eb2968b6440b88 -HEADS_REF=648a75b32128bf839dd201b8331b42c0c33da39a +BUILDROOT_REF=2766f346195dec29b53bc09f6038193998ea3693 +HEADS_REF=e30e3bf3e540b541aa68155233ad1106c8b8631e diff --git a/config/container/Dockerfile b/config/container/Dockerfile index 23c7e8e..68eded3 100644 --- a/config/container/Dockerfile +++ b/config/container/Dockerfile @@ -1,39 +1,4 @@ -ARG DEBIAN_IMAGE_HASH=4ab3309ba955211d1db92f405be609942b595a720de789286376f030502ffd6f -ARG GOLANG_IMAGE_HASH=84349ee862d8bafff35e0d2bfd539da565b536b4dfce654773fc21a1db2da6d7 - -FROM golang@sha256:${GOLANG_IMAGE_HASH} as gotools - -ARG FIXUID_GIT_REF="0ec93d22e52bde5b7326e84cb62fd26a3d20cead" -ARG OZZOCONFIG_GIT_REF="0ff174cf5aa6480026e0b40c14fd9cfb61c4abf6" -ARG JSONPREPROCESS_GIT_REF="a4e954386171be645f1eb7c41865d2624b69259d" -ARG TOML_GIT_REF="3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" -ARG YAMLV2_GIT_REF="51d6538a90f86fe93ac480b35f37b2be17fef232" -ARG GLIDE_GIT_REF="b94b39d657d8abcccba6545e148f1201aee6ffec" - -RUN apk add bash git make - -RUN printf "\ -github.com/boxboat/fixuid.git github.com/boxboat/fixuid ${FIXUID_GIT_REF} \n\ -github.com/go-ozzo/ozzo-config github.com/go-ozzo/ozzo-config ${OZZOCONFIG_GIT_REF} \n\ -github.com/hnakamur/jsonpreprocess github.com/hnakamur/jsonpreprocess ${JSONPREPROCESS_GIT_REF} \n\ -github.com/BurntSushi/toml github.com/BurntSushi/toml ${TOML_GIT_REF} \n\ -github.com/go-yaml/yaml gopkg.in/yaml.v2 ${YAMLV2_GIT_REF} \n" \ -> /go/src/repos - -RUN echo ' \ - set -o nounset -o pipefail -o errexit; \ - cat /go/src/repos | while read -r line; do \ - repo=$(echo $line | awk "{ print \$1 }"); \ - folder=$(echo $line | awk "{ print \$2 }"); \ - ref=$(echo $line | awk "{ print \$3 }"); \ - git clone "https://${repo}" "/go/src/${folder}"; \ - git -C "/go/src/${folder}" checkout ${ref}; \ - done' \ -| bash - -RUN go build -o /usr/local/bin/fixuid github.com/boxboat/fixuid - - +ARG DEBIAN_IMAGE_HASH=8414aa82208bc4c2761dc149df67e25c6b8a9380e5d8c4e7b5c84ca2d04bb244 FROM debian@sha256:${DEBIAN_IMAGE_HASH} as debian ENV DEBIAN_FRONTEND=noninteractive \ @@ -43,27 +8,15 @@ ENV DEBIAN_FRONTEND=noninteractive \ HOME=/home/build \ PATH=/home/build/scripts:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -## Setup fixuid for mounting host-dirs with correct permissions during dev -COPY --from=gotools /usr/local/bin/ /usr/local/bin/ -RUN chown root:root /usr/local/bin/fixuid \ - && chmod 4755 /usr/local/bin/fixuid \ - && mkdir -p /etc/fixuid \ - && printf "user: build\ngroup: build\npaths:\n - /\n - /home/build/build\n" > /etc/fixuid/config.yml -ENTRYPOINT ["/usr/local/bin/fixuid", "-q"] - ADD scripts/ /usr/local/bin/ -## Install packages from packages.list with retry -ADD config/container/sources.list /etc/apt/sources.list -ADD config/container/packages.list /etc/apt/packages.list +## Download, verify, and install packages against stored lists/hashes via https +ADD config/container/sources.list /etc/apt/sources.list.new +ADD config/container/packages.list /etc/apt/packages.list.new +ADD config/container/package-hashes.txt /etc/apt/package-hashes.txt ADD config/container/apt.conf /etc/apt/apt.conf RUN apt-install -## Create build user with sudo privs -RUN useradd -G plugdev,sudo -ms /bin/bash build \ - && chown -R build:build /home/build \ - && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - WORKDIR /home/build -USER build +ENTRYPOINT ["/usr/local/bin/host-env"] diff --git a/config/container/package-hashes.txt b/config/container/package-hashes.txt new file mode 100644 index 0000000..3c9b496 --- /dev/null +++ b/config/container/package-hashes.txt @@ -0,0 +1,279 @@ +01665e698fbec3b06a50e919be5c57ae7dde678da0db14a331174eaca6d4968b patch_2.7.6-3+deb10u1_amd64.deb +01e99d68427722e64c603d45f00063c303b02afb53d85c8d1476deca70db64c6 libreadline7_7.0-5_amd64.deb +01fa41cc32bcc35fdef49720b68db1fffb7e162b29298181c1da0fef89adc0e2 debsecan_0.4.19_all.deb +0226c5853f5e48d7e99796c2e6332591383e9c337ac588e1b689f537abd0a891 libssh2-1_1.8.0-2.1_amd64.deb +02f795889390fa0e1f29c6ecdd4a30cd0aae39c0c6b1379410055404b0897c66 libx11-data_2%3a1.6.7-1+deb10u1_all.deb +03a133833154325c731291c8a87daef5962dcfb75dee7cdb11f7fb923de2db82 openssl_1.1.1d-0+deb10u3_amd64.deb +042967b8267ee537ed9a1bf012533622847aab433362e3b57c9108a53bfcb99a libkrb5-3_1.17-3_amd64.deb +05e64681a0c3037fa71c94c083a8aabb6eb5f40e974c4ec548e0376635cffeb0 gpg-wks-server_2.2.12-1+deb10u1_amd64.deb +05e90f94363055cf27cd88b7968820645180d37a649a93cf5d7ea6f3c7fe973e gcc-8_8.3.0-6_amd64.deb +0827321e85d36200759e3ec621fc05154c752534c330ffc5472ad75bbb8eb913 libbsd0_0.9.1-2_amd64.deb +083b44ac86efbb3b971674ba6e5a10c3d5a46305c1549b743e2e0f6b0993934b binfmt-support_2.2.0-2_amd64.deb +0997309c522139fc1acd58b2af2e71a9513f9337f393c0de00c9243e3e8d63b5 lib32gcc1_1%3a8.3.0-6_amd64.deb +09ba3cc46486c44b0b48a45d2fbe0f0750b6706e949a73a06d22102c00e00514 libobjc-8-dev_8.3.0-6_amd64.deb +0b7a8c30b3511f5a0de38a4300a14ccb8a9e304a3e96c0aa105e12cb4033562c perl_5.28.1-6+deb10u1_amd64.deb +0c199af9431db289ba5b34a4f21e30a4f1b6c5305203da9298096fce1cdcdb97 libkeyutils1_1.6-6_amd64.deb +0c5bc545ab92ae00274f3b33fdadfa895024877884abaaa86380846669252429 libusb-1.0-0-dev_2%3a1.0.22-2_amd64.deb +0ca12c0fe7534a5a08df265b773b6a15a9704db008c15f366dc41cd4be53a2ad libperl5.28_5.28.1-6+deb10u1_amd64.deb +0cbd86525a0a11965ffd0e106f7a0dc612b49c40f2fc11327b65dc256f592688 libxml-libxml-perl_2.0134+dfsg-1_amd64.deb +0d15d8c02d2d0cb390e61b831ef336841764724d6adad326319af042ceacd71f libdata-dump-perl_1.23-1_all.deb +0dec7696ad10153388bfa7702e9e61c0fbe1614ca07b72de48792ac2dba4738f libtsan0_8.3.0-6_amd64.deb +0e34268dcb8d037d88d038030e61c89ee7f6d0923ba828574b8acddc19519ff3 libonig5_6.9.1-1_amd64.deb +10b7416134f75b6b49afae4fc6d07c5e061509bedb1ec413747407b234564a0d python_2.7.16-1_amd64.deb +1129a248bb4585c1fb17cd40bbf87e587117e708bffd633e749fc0840daed72e libio-socket-ssl-perl_2.060-3_all.deb +1276015fa73712e78262995343c5f5313a5c2efe7eff91741c2b9de1fe721fdf libjs-jquery_3.3.1~dfsg-3_all.deb +138494ccd9661911a40460c7a90f141de397589d4b2f6c5aa2ecca1b71f46208 libmagic-mgc_1%3a5.35-4+deb10u1_amd64.deb +14554e432c6b7bbac113902dde7f1b755aa49ad0a9a7e4d7264a950bc214ecb3 libmailtools-perl_2.18-1_all.deb +14b54c6ca62c9fc8c1a9e3d7766d1b7ab5b75f4304d477b246721970d8e4662d openssh-client_1%3a7.9p1-10+deb10u2_amd64.deb +153d8a5ddb04044d10f877a8955d944612ec9035f4c73eec99d85a92c3816712 readline-common_7.0-5_all.deb +15b7aa4cdd8b0245736288661a5e497bb19ff7fe34dbc371f9df412ce1398372 liblwp-mediatypes-perl_6.02-1_all.deb +164393f9244a382decdf51fbf28359ec5e07f0f6991dbb8624ec1d08fb19994d libauthen-sasl-perl_2.1600-1_all.deb +175dc49c539fb72515f3edae4ac9f287e75dda89736b641ba119f85aebe548fe linux-libc-dev_4.19.152-1_amd64.deb +18fa901205ed21c833ff669daae26f675803147f4cc64ddc95fc9cddd7f654c8 libpcre2-8-0_10.32-5_amd64.deb +1918442d7db16b0fadb38f2ab7f15d3bb06688923ad5929fb78e706a015b0192 libllvm7_1%3a7.0.1-8+deb10u2_amd64.deb +19982dfe0de4571ec99f683bd62c74e66c2422a00b0502089247d86c1c08ce92 libglib2.0-data_2.58.3-2+deb10u2_all.deb +1ac02a14c1739d09c5b351a26617357579b4bfab2f2e8325e90d8ac24ae2174a libmagic1_1%3a5.35-4+deb10u1_amd64.deb +1b77f6395d2869047f1cb6e15fb6e154736b61c51454949af3e857e4e30fbfd4 liburi-perl_1.76-1_all.deb +1caf56785e4b679aff4f7dfbd334968c27c226b6a8e39fc854a9ae35d40b6990 libhttp-date-perl_6.02-1_all.deb +1cb272a8168138e9b8334e87cc26388259f232b74667b3a7f3856f227adcc4ba libdpkg-perl_1.19.7_all.deb +1cd5fb9bf3c570209622e35e8e5e261703c627e5b167f871c26bdb8a5f4bf6f2 python3-aiohttp_3.5.1-1_amd64.deb +1d11ee570849752969ac8586546a67804322ea9ff009dfa087d58998891e6ab3 libncurses-dev_6.1+20181013-2+deb10u2_amd64.deb +1e8dfd05441d1449847c693f2dcf3c88edf049befe6bfeb9aa13ff3a64e1d83e libgnat-8_8.3.0-6_amd64.deb +1ef2814c9be7246165f56d8bd8fa9a42ed70eed989dc6da9d0d90e5d774d4b47 python3-requests_2.21.0-1_all.deb +1fa14777a99ce2b1a254608af65da10ae4dbdff4974dc273d7096091463b11ad libomp5-7_1%3a7.0.1-8+deb10u2_amd64.deb +1fa585d507f5025f3601cd8d32ba8f78093b1c1eb63537784c832b7f8b485553 libnet-ssleay-perl_1.85-2+b1_amd64.deb +2043859f8bf39a20d075bf52206549f90dcabd66665bb9d6837273494fc6a598 sensible-utils_0.0.12_all.deb +20915dbac4d93416960bce90fd32d5263a04a12ed15a095694a34dca8e2a8920 libio-html-perl_1.001-1_all.deb +24c2e0af277992e2e18ac51ac4912427eec0e4cc7b130317ea75a3beec11ef68 libidn11_1.33-2.2_amd64.deb +24f435c4164ba014551848f79027b2d4be6c10cd51d9d15ee919b8c5722ce9d0 make_4.2.1-1.2_amd64.deb +258b3d181756c45ad806e711cd9a08918296139f2a5ddf4040870794bcc4dc37 liblwp-protocol-https-perl_6.07-2_all.deb +25cc6d68d36b13b54ca5a1c2933703681bf4694a66ee29a555616620a482fe0d libncurses6_6.1+20181013-2+deb10u2_amd64.deb +25d63ab661c3210f09b269cd8f72f56cd142b370cca5ab48f373fd9816d2f6dc python-minimal_2.7.16-1_amd64.deb +2743ce1cd7a9b44f811b743c8d8204b711e06db5bb7af2f3d239df44bcb38c69 libpipeline1_1.5.1-2_amd64.deb +28b5748b604179ade61490fb4573e16eeab26e53669980ccd6a1d5dda8988430 xauth_1%3a1.0.10-1_amd64.deb +290fc88e99d21586164d51f8562c3b4c6a3bfabdbb626d91b6541896d76a582b libpsl5_0.20.2-2_amd64.deb +2b2f418d91b27347bd471fe59a931eaab09d10acbd2abc61d53a7795154aa0d6 libksba8_1.3.5-2_amd64.deb +2b756744eed726a51f218d54244442170cb367fd5d3a36be2c752fd2e225fdd4 exim4-config_4.92-8+deb10u4_all.deb +2cd0d6cf99caf7d55263810d1a8084e6b638e3bb2dd44afd629aed02a8e9ebb0 python3-async-timeout_3.0.1-1_all.deb +2d333d0fcc49138d0411ce3442671058cc1f7e1a9a85a62ea63d4f2184bc4c04 libarchive13_3.3.3-4+deb10u1_amd64.deb +2dd69416c4e8decda8a9ed56e36275df7645aea7851b05eb16d42fed61b6a12f lsb-base_10.2019051400_all.deb +2e1e7e03505ca5cd4512c1160c5af5732c4ad2cce23dbf8a26678c23bcf9eaa6 cmake_3.13.4-1_amd64.deb +2ec640d5280101e70b6da3df254e06c10117d7baefdc3878af64e1b0f072fec5 jq_1.5+dfsg-2+b1_amd64.deb +2f04bfd5b6d594f211ed43ab92ecba445c0eb4dbce56f68b92e77d0310230bba libhtml-tree-perl_5.07-2_all.deb +2f150f7e6c4d6ef9a24fed0f283b909a7e3360bbdcf39d6191f6d048ad4b840b libusb-1.0-doc_2%3a1.0.22-2_all.deb +2ff7fbe9078ed8ed9535b4cd8388ed6eb2767e6071a26007383a520e3da0232c libgpm2_1.20.7-5_amd64.deb +309f9c1ded134f9d4626ac996e893977bc1185c914e2400fa70a688340dec56e perl-openssl-defaults_3_amd64.deb +317d150bb84857b42c55fb0eee734355d6ff3b55f7abba231e3a43bdcc0d4c36 python3-chardet_3.0.4-3_all.deb +31e6b6b4c0dca7a116031aa5369649152f61a7a09c50187d7ffaf6548d592719 python-apt-common_1.8.4.1_all.deb +329d2974829d0dd61ea5d59676ae6db10e49f97588ddff74042edd0a60b3bcd2 libxmuu1_2%3a1.1.2-2+b3_amd64.deb +329e5138cb8c1e308baef55f20d43a108bd64b58c381abe852c234e74c14a73c libalgorithm-diff-xs-perl_0.04-5+b1_amd64.deb +336e0fb622ba1db1a5985f555e0437c83339c96a3491113501dc569371b7f32c git-man_1%3a2.20.1-2+deb10u3_all.deb +340c68aaf03b9c4372467a907575b6a7c980c6d31f90f1d6abc6707a0630608a mysql-common_5.8+1.0.5_all.deb +34282ed8d61d5ceaad1492c4ef2350f2e1e2a7a1b63cd5cb27f43e4f3347e7a2 liblzo2-2_2.10-0.1_amd64.deb +342a5bb48677b0f61c9b6077ae00ae921f332075ea2ea9161024b649e5e25cbf exim4-base_4.92-8+deb10u4_amd64.deb +359e8c0524ce6a4729af5aaf581bc37ebe7b3c3919bfb18ce310e92a2948987a gnupg_2.2.12-1+deb10u1_all.deb +37076cc03a19863eb6c4ec2afb3e79328c19fdc506176bfe8ffcada6d0f7d099 m4_1.4.18-2_amd64.deb +37be9e682f0fd7533b7bb9d91af802a5070ad68eb9434036af5bc2815efb2615 libusb-1.0-0_2%3a1.0.22-2_amd64.deb +3821cee0d331cf75ee79daff716f9d320f758f9dff3eaa6d6cf12bae9ef14306 wget_1.20.1-1.1_amd64.deb +393ee6f2fb2c0edbbe76fc1aa1443bf96a09bff2a1238f9238859e81873265e6 python3-urllib3_1.24.1-1_all.deb +3b16194392acf0df4d0b386fa57d68806aad8487a2c531af5ab6279b261a30e8 build-essential_12.6_amd64.deb +3d3b623a2155b06cd523d45247fdb86dcc415684f5e64b72e04a5c2dd5fb684a libprocps7_2%3a3.3.15-2_amd64.deb +3e04a24ec61841bb6fb8b17b1af7c904272f26479001c2dc054501e839222425 gpg-wks-client_2.2.12-1+deb10u1_amd64.deb +401c65a9d435a26d1f9ea6e58be55253f5c3a9e32610e23edd3e103cc4ada0b4 libxml2_2.9.4+dfsg1-7+b3_amd64.deb +41c111077210831297c9630b407cbf223f1b2beeb6bdd1c4c3400f2c5d7d3498 libomp-7-dev_1%3a7.0.1-8+deb10u2_amd64.deb +41d7ffc45347c5841ce8ad2a6511d8c1da2f3782aa1b9f1f83549d37d50991b2 libhttp-message-perl_6.18-1_all.deb +43783cd63c996b36fcf29bfd8be8c44666148c9129ade88985876d7f9c0bf2f6 python3-pkg-resources_40.8.0-1_all.deb +43915a1d28e04039097f97c833b697b8d1703c7da9289fba7eb1834ba6fa23b0 libc6-dev_2.28-10_amd64.deb +44d09ed3873a7374ed1764d56b60f59fb5019bf1393e52f37215117c17be9bc2 libgsasl7_1.8.0-8+b2_amd64.deb +4687ba699aaa761de347ca2510457a90837e12ab06b7b4c198d6820277f45c7a libclang-common-7-dev_1%3a7.0.1-8+deb10u2_amd64.deb +4793ddb1861cfc95fa29a17b3cb2de8644f56474a3b66e8db5a085af33ad8ef9 libhtml-format-perl_2.12-1_all.deb +49a2e7f290ab0006dbc139bfe6784f71bf38d1b14feebc22c14808bbe3748f6d libgssapi-krb5-2_1.17-3_amd64.deb +49fda9b3323304ac2bf6adbd43c66fd47a6b4651d9dbbccefc3081e5c4869196 texinfo_6.5.0.dfsg.1-4+b1_amd64.deb +4a3fb6e0953789f3de455ad7c921294978d734e6395bc45bd6039dcd9634d263 libsasl2-2_2.1.27+dfsg-1+deb10u1_amd64.deb +4c16a19ee0d88669b15e708df7b66c01353deda3b9b7ba8f27cf086bb09e867f dpkg-dev_1.19.7_all.deb +4cfa1d3ffd1c75cfe5a4053cf56f63a60d0616ec8ee59a2ec7259a4e8c43fde5 git_1%3a2.20.1-2+deb10u3_amd64.deb +4ed34fb21abd770d0c05bebe0b90f367a5c64dc197ecb6b22bb0ed1379708df4 flex_2.6.4-6.2_amd64.deb +4edf6f10f1c28753e198e6993643f5aac1245e657a4fe4739211fe60f38d6ba9 gpgsm_2.2.12-1+deb10u1_amd64.deb +4f8883d378e698aa89b7bd4b68ce8e7cca01c961d3df87fafe4c079bb4668f5b libpython3-stdlib_3.7.3-1_amd64.deb +4fcc963af0d718d8edc8e1aa2436c2b7a2c3cd5862ad8bb3e50a30cbb7e9dad6 bzip2_1.0.6-9.2~deb10u1_amd64.deb +506fc9e1fc66f34e6f3f79555619cc12a15388c3bdd5387c1e89d78b19d1b5dc librtmp1_2.4+20151223.gitfa8646d.1-2_amd64.deb +51f64fec03c51e534d9825e9fe63e351ef6932cff5d67a7a0d59c14ca551f4bb libgnutls-dane0_3.6.7-4+deb10u5_amd64.deb +538d88329dd3c6d9936fae3051e4f4f0e2a4300f0ba5252afcdd8787871f2caf python2-minimal_2.7.16-1_amd64.deb +559bf1ef518fa3d29672c1902814c17d8e79106254d943f9e997c43f28f47159 less_487-0.1+b1_amd64.deb +579c11dd6004f06ac2639b338c320fde794ed3c36a1d2be559ec282ea3042dd7 libcc1-0_8.3.0-6_amd64.deb +57eec51b3c7802e03835b1d0edfd5cad8ef6eb292d77d95bdfc62f0eecdd0c2d libmailutils5_1%3a3.5-4_amd64.deb +59c6d276e4588841c6d221f319536850639096b5213790f4f864e1319a935e4b python3-certifi_2018.8.24-1_all.deb +5af8fd893c3b065f46365efa3f037c8ac22af00683fed15b1ea36970bbabd764 libgdbm-compat4_1.18.1-4_amd64.deb +5c83aafe6b83f801434c5dad7bddad8a8b459a1b590ee7d344c30667d8ca1ac5 liberror-perl_0.17027-2_all.deb +5e06dffcea8b16766498bdcbcf703e8b7e31c2d52735fa181a5f5f95db5de7ae cmake-data_3.13.4-1_all.deb +603f929d1ae548a8faa1f892ae93e623bde97de7ddbe4a796618c735ca7ff8b8 libicu63_63.1-6+deb10u1_amd64.deb +619f27785060d2d942b23a897481bb5fc068c8bba7afc710e48dbf1ec410ad08 gawk_1%3a4.2.1+dfsg-1_amd64.deb +61c00b6f4c7a242aa6aefdc07012747607cd9c6c5392c1dcd087ce27031dd1dd perl-modules-5.28_5.28.1-6+deb10u1_all.deb +61c7a740651a8f310a08d83a0c90a295916479588ae91f5222e429059560990e manpages_4.16-2_all.deb +61fc3d4e34671d05f097e4aee5c03223b66de4fcbc76887ad1dbc55885c3965b pkg-config_0.29-6_amd64.deb +637488a3c09b98c749e09ece395a00adb0ced3099bad64907ce9fbd7fbf619fc libcurl3-gnutls_7.64.0-4+deb10u1_amd64.deb +639a24fc4130b31ff9406db4fdc248cf6ce311e53136ccdfb10fa1134dd5faf4 python2.7-minimal_2.7.16-2+deb10u1_amd64.deb +63ef01488670cc0e7159bb7c56abda5f01c5306a6c88ac615d5aab3520fe89ad distro-info-data_0.41+deb10u2_all.deb +643bf19e859c9bf8f61033e48d7ba73c114039efbe851f407356edab396af317 libffi-dev_3.2.1-9_amd64.deb +64f5f6fd7559a9f431132f24aa6ec9bfd062b0473f2e403c98dbd638be65f9c0 cpp-8_8.3.0-6_amd64.deb +65dab19d52dc6e32df75841ba38bc242b52f5e7f292a3f071a45526277f14a3d llvm-7-dev_1%3a7.0.1-8+deb10u2_amd64.deb +66806538bb2c40425814f087efd66d05a0d069fce1f0f56d6ac6591ec4c98604 libc6-i386_2.28-10_amd64.deb +668896df0c5099d4b7281f6178ccbccbef477b9e264239fd042c59d3ec31d80f psmisc_23.2-1_amd64.deb +66951c2dbc143d93b6b8757eb749bbd380f340c454301a27bd45ff712b9cffb0 python2.7_2.7.16-2+deb10u1_amd64.deb +66b4a16e6540b7290a3ad757259344fb655a6e03105c8f4709108b9db988c4da libfl2_2.6.4-6.2_amd64.deb +66d1ed0aaa8865bcdaf26f657272d881bacc46501456365a931e52b8775f9e50 unzip_6.0-23+deb10u1_amd64.deb +68a09b8e7463026f53983e18365fb7eb05ed9536db456f76fa86d839759813e6 libntlm0_1.5-1+deb10u1_amd64.deb +68fdcd9ca466693f154dc5d360897a5e2f2c5fe02199bbd1bb560cfff62f1de6 guile-2.2-libs_2.2.4+1-2+deb10u1_amd64.deb +6980055df5f62aea9a32c6cc44fe231ca66cc9a251b091bd0b7e3274f4ce2a19 libnghttp2-14_1.36.0-2+deb10u1_amd64.deb +6a14237d58e31cfd970a4362263fcdb2d553684e629b9134d615c0a5d32d9681 exim4-daemon-light_4.92-8+deb10u4_amd64.deb +6a19f62c59788ba3a52c8b08750a263edde89ac98e63c7e4ccfb14b40eafaf51 shared-mime-info_1.10-1_amd64.deb +6b375ddff08752c7e512a1137c6ed5a2d183442786803cf77066be76b3482ebe gpg-agent_2.2.12-1+deb10u1_amd64.deb +6ca416e822ad051992ce56480a028724ab72784e0d846a1d8f4b3278fdcf146e python3-multidict_4.5.2-1_amd64.deb +6eab4706e8f484eefcd708b0fb26a1ae27c01442a6ca2fc1affb0197afbadab1 libpopt0_1.16-12_amd64.deb +7139d1070dfc1ed92bfdeb6ffe09280a1a2e89cbf2d64acfc3b5a4232fd05b55 libgc1c2_1%3a7.6.4-0.4_amd64.deb +724901105792e983bd0e7c2b46960cd925dd6a2b33b5ee999b4e80aaf624b082 libxext6_2%3a1.3.3-1+b2_amd64.deb +72d0589fc065005574232bf103c7d34acf5e4c805f2b0d19e6aeb639438ff253 iso-codes_4.2-1_all.deb +73d6980767bbc2fd7cf99d407352ec6ce0ccb4fd67fa1b77ef663632e8fd7607 libmpx2_8.3.0-6_amd64.deb +73e222c0920988301d973be4649210f1af37bacee66176353ca1d312ef76cd67 libjq1_1.5+dfsg-2+b1_amd64.deb +766684a231a740b434468e1c7146353fcddff7b8e14644a82672299459c53c34 libquadmath0_8.3.0-6_amd64.deb +775ef319ec0b2dac14ba8792177fd06c5b2affb768a03fbd9a404cfbcf5255a5 libhtml-form-perl_6.03-1_all.deb +776efd686af26fa26325450280e3305463b1faef75d82b383bb00da61893d8ca mime-support_3.62_all.deb +7827d98f210bd8c7635bbf7dfeac3d9434c343d3649588340909a91590e0c0fd libfakeroot_1.23-1_amd64.deb +783822ae63e3bbdadeabfc8121fc920652248acf9de6be9b1bb42d2a4a0baaf1 libpython3.7-minimal_3.7.3-2+deb10u2_amd64.deb +78d1be36433355530c2e55ac8a24c41cbbdd8f5a3c943e614c8761113a72cb8d libsigsegv2_2.12-2_amd64.deb +790a8cbdd92f31c616ff93c7a4bbcefd030f8505983381e77679fbf823843ff5 libxml-namespacesupport-perl_1.12-1_all.deb +791b343ed8c48bcaf2cbf26168cef19cb219ec77d59fed8714e6a309bf7d5cba gnupg-utils_2.2.12-1+deb10u1_amd64.deb +793311e57c5dc2cd9c8ece0c36b975989bf00a566e0491a2894a9266cb43a9ff libsasl2-modules_2.1.27+dfsg-1+deb10u1_amd64.deb +794bd3ffa0fc268dc8363f8924b2ab7cf831ab151574a6c1584790ce9945cbb2 ca-certificates_20200601~deb10u1_all.deb +79965b74e6c839e7b90d24ac5b61840f57872ecb1e4ac1007937036c85364f82 libstdc++-8-dev_8.3.0-6_amd64.deb +7aaecc42cc5bd303684c9a31a1756abaf63543127a006ab862dc7184491baa50 librhash0_1.3.8-1_amd64.deb +7dca169a3e3a5ea285c1810388a44d16445a527d4cb308b6875901aff308b576 llvm-7_1%3a7.0.1-8+deb10u2_amd64.deb +7e6d476b4dd777f84800d28eedd94f82507d46a586f645bb72ff7607a1e72c76 lsb-release_10.2019051400_all.deb +7e8e37a41075136567f39be9b469c6af87a46a1e64d252573511b46a98d8deb6 libbison-dev_2%3a3.3.2.dfsg-1_amd64.deb +8174360edf75f3dd3a12e8bd4dc0c502a470acdb6e41057672ca3f6d696a79d1 rsync_3.1.3-6_amd64.deb +82cc1d080c6921b84ff4177889f6dfc4315dd8c2f9ce31dda5fa083629d48c32 python3.7_3.7.3-2+deb10u2_amd64.deb +82f7754428246edfe11626417a20fef3506eed454cf0e3c2bb9867af5e57e310 libpython2-stdlib_2.7.16-1_amd64.deb +84329a53dbff38040c02a65cce1f63e0c18b1e7bec432124f42eec6fee1e99de python3-idna_2.6-1_all.deb +84d592a6bcd3e91d156ab9a796ede07c1068512a3ee47a41d023e2960ed9c677 libitm1_8.3.0-6_amd64.deb +8527fb368655fb64a9f49fbba3ba8741284d5700ba59ff091fdeebbf1d8b865f libmariadb3_1%3a10.3.25-0+deb10u1_amd64.deb +8743b526038e61a684b8327435c462288395d5b4f6b5b102d6ad11cbfccb52c7 libalgorithm-merge-perl_0.08-3_all.deb +87d9ed9340dc3cb6d7ce024d2e046a659d91356863083715d2c428a32e908833 libxcb1_1.13.1-2_amd64.deb +89db66e500f882d5a0a03178bbc30d671ecdbd92bf3e606a6cb3208f92773c2f manpages-dev_4.16-2_all.deb +8a072ddcbb31ff0536a2472cd034e2ffc35078c638908f734478614638068153 python3-yarl_1.3.0-1_amd64.deb +8a29da4f9e556cc709f6e1f1c26a921157818e17a3490b19a9560e141bb9c265 libxml-sax-expat-perl_0.51-1_all.deb +8a54dfa6c30ced68dafc159d88adb8c096697a993023bb5e31f2dfd93e386474 libpython2.7-minimal_2.7.16-2+deb10u1_amd64.deb +8b2390d2996dadff71c100aa81dcf7c7b09e0eabb5541c1c69b301c303dbb5df dirmngr_2.2.12-1+deb10u1_amd64.deb +8c22b005de096b5b955e273b4e9ea578bc12c57098fba77eb5b6608753b16e5d clang_1%3a7.0-47_amd64.deb +8c697b614cbb5c4edea67ec7bf34a6390550a2c08c4d8e308f97e414a2f29370 python-apt_1.8.4.1_amd64.deb +8d86e2fed0ac0d15750dc68158b0c0f74c9d9454b780da4e023d6c3aabdff62c procps_2%3a3.3.15-2_amd64.deb +8d988dde04e2d9286f37c82081e50659dd2f6ccdad68fefab43ed468c1c78d01 clang-7_1%3a7.0.1-8+deb10u2_amd64.deb +8edf7cd9db7d296e4e2152e14f1cd97a40ce1f4e60b96ed648d912ea30c8c918 libxml-parser-perl_2.44-4_amd64.deb +8ee8daa87132e1f2eb6a82370dd01565cf9d3b299b96d3054711f144dd8f174a libc-dev-bin_2.28-10_amd64.deb +909fcd28491d7ebecf44ee2e8d0269b600271b0b6d236b19f2c0469cde162d21 libgomp1_8.3.0-6_amd64.deb +910468093aa2ab3c29376fa7356e5802998342953991f1ba784019f2e742d5fe libfile-listing-perl_6.04-1_all.deb +9308fdd43ba620614945bf428efd4a07cda8c135ce49a3708c0239564ac11a7e publicsuffix_20190415.1030-1_all.deb +93b428481d80f7c44a1597ce28a129fdeb5f25d8339c3ff0822a1f9fe615798a libassuan0_2.5.2-1_amd64.deb +93c2beb8b1c455ebd86ef830bc0bfd67fb9f3af447c6c2e770dcbf83c79b893f libnpth0_1.6-1_amd64.deb +9415884e4dbe7377d8e9630db66eee86a0ae704184131b91bb0560d47937d858 bison_2%3a3.3.2.dfsg-1_amd64.deb +943113a37761708f501099d56b3298765fc691bc88d2f7544d3dd78e78981adb libhttp-negotiate-perl_6.01-1_all.deb +94e5d2a86d45b6da3658e52761c764d4e5359456e9217701cba945d1a8c42e16 libclang1-7_1%3a7.0.1-8+deb10u2_amd64.deb +955636ae3b929b2cd7382a1b7547133790f229503a457d5c0d74f31de213f8e5 llvm-7-runtime_1%3a7.0.1-8+deb10u2_amd64.deb +95c39f813e7c99f93d7de3bab571f4c2f52c917a64d4dc33be8ef7c4dad14adb binutils-common_2.31.1-16_amd64.deb +96193a4ea86876be53e9ce2f94ebfc172f3741bb41fce55d941908ab7551cc42 tex-common_6.11_all.deb +9639a6fd9f84abe2572e88fdcd9513ae26bd10991a2f1857d951a4385a19b028 mariadb-common_1%3a10.3.25-0+deb10u1_all.deb +969df027c47d301ba830fce2c802eb314bc5f83e440a922115bd508159f82184 libnet-http-perl_6.18-1_all.deb +96c9e7ad71da07f47b7356b416b7f5d6d9e8eda1404b2c8a8ba8edda3799177b libpython2.7-stdlib_2.7.16-2+deb10u1_amd64.deb +97cae1e38c030291c6b3ecb0a17ee6c6536d19912bf1d53a55172d85935420ae libpython-stdlib_2.7.16-1_amd64.deb +9844b02a3bfa8c9f89a077cc5208122f9245a6a6301cbf5fdc66b1a76f163c08 libfribidi0_1.0.5-3.1+deb10u1_amd64.deb +9b2d2c420beed1bb115b05c7766e981eab3865f9e9509d22fc621389614d2528 libglib2.0-0_2.58.3-2+deb10u2_amd64.deb +9c937923b35ac24f5cb6be81626f00dd6b810fc0889e5b3b08b7ffc9d179ff1b python3-minimal_3.7.3-1_amd64.deb +9ca85e6e2645a5e660431294320658ec7a2910d9fed90ca4e648c1211a2b844b libmpdec2_2.4.2-2_amd64.deb +9ddccf6c37b9ac540b499da06e5eb7406d52b66bc4659b48be0eea85e6f86df9 gpg_2.2.12-1+deb10u1_amd64.deb +a37897b52338012c3864a76533f536ff9e2b2c6e353fb01ef90b13c3976a788b libssl-dev_1.1.1d-0+deb10u3_amd64.deb +a396bf2da427ad250ffe89b2386c7d0288bd7321f501c79cfc55a249e555d455 python3-ijson_2.3-2_all.deb +a49f5eba4b17f237c20931976c371a5676d7c8d0ff931a1a62abedb38bf63269 krb5-locales_1.17-3_all.deb +a52d5216858c7185bc245e52ad95a6ad515d087bc25e8556df06c5626b41a837 libgcc-8-dev_8.3.0-6_amd64.deb +a52d5b3e70d964c9063d9725aff540daba1971d4e81382ebc3058bce4d815f3c libfl-dev_2.6.4-6.2_amd64.deb +a65ea1c2a2c32995ea5337dc769ea2de503dd65e0ee2cde345d565ba06575d0c file_1%3a5.35-4+deb10u1_amd64.deb +a73b05c10399636a7c7bff266205de05631dc4af502bfb441cbbc6af0a7deb2a libmpc3_1.1.0-1_amd64.deb +a7857b726c3e0d16cda2fbb9020d42e024a3160d54ef858f58578612276683e8 libxau6_1%3a1.0.8-1+b2_amd64.deb +a8ac73f3c579a7c8b16fd029792c196eb1ab446a49584c2bd94b2bbe30e3df3a libtimedate-perl_2.3000-2+deb10u1_all.deb +a93ea619d2b746663733df437e998ec06c0ef6afe1409a73d75a607ce3756f1c libxml-sax-perl_1.00+dfsg-1_all.deb +ab078c41e6720aaacb09d54fedaab3526c4bbba62e12f661add70eeaff762bf8 libhtml-tagset-perl_3.20-3_all.deb +ad2fa6d373ab18c3fc729e3a477e8b999ad33480170bd0d8966e9c7fd4843837 zlib1g-dev_1%3a1.2.11.dfsg-1_amd64.deb +ad9a4b4fd21b7cdb9a211d6f6196a93f825660632252bd566f2588b4620b4c9b gnat-8_8.3.0-6_amd64.deb +ae756853eff06749370f37f717339098d7ead8eb40d8eca9050c4dd8d64be33a g++_4%3a8.3.0-1_amd64.deb +b28c73a44f967faa49db7f7541afde8212f91ee67be8648635ab9bd0beacbd9f javascript-common_11_all.deb +b293309a892730986e779aea48e97ea94cd58f34f07fefbd432c210ee4a427e2 libssl1.1_1.1.1d-0+deb10u3_amd64.deb +b3392a29de0cea29f9e8e07793d1f03fcb84a3ca25b7471e2db0e0fa93ffa566 libldap-common_2.4.47+dfsg-3+deb10u2_all.deb +b4c657192b1ebb3df2f4670435a32012de723d7f9d6c970c9b902c82df475f72 libkyotocabinet16v5_1.2.76-4.2+b1_amd64.deb +b582f4bc549877d59254318feaaf1354020d695cfe9b9e6aab0aa26b65c29071 libubsan1_8.3.0-6_amd64.deb +b9116a8a0d7c2f878ed37517c8d714c23b0578fa5cc4002b473521d82cea62fd libtext-unidecode-perl_1.30-1_all.deb +b9db9483510589d939ee897b8b2b15661d243c8fac13dfa18e6daa10be5d0a2a liblsan0_8.3.0-6_amd64.deb +b9ded0026e9d0e006eb6d3e697919d9b2a8f7bf607d8acdebf03588e2b96b771 libk5crypto3_1.17-3_amd64.deb +bae88af666531b3b46a5c1b54f699e7354264e6fc1654b02bb537f2076694b05 libbinutils_2.31.1-16_amd64.deb +baf0872964df0ccb10e464b47d995acbba5a0d12a97afe2646d9a6bb97e8d79d netbase_5.6_all.deb +bd00051c1275de495f54a0a2006ba188f8fb2dba33bc669e5ea417ade07b2602 libcurl4_7.64.0-4+deb10u1_amd64.deb +bd36c77088f90a876f0cccbbaf28ac0ebc299198022b1451abeb35c3371f878c libtry-tiny-perl_0.30-1_all.deb +be69cda8c2a860e64c43396bf2ff1c7145259cb85753ded14e0434f15ed647a0 libwww-robotrules-perl_6.02-1_all.deb +bfa1a449fcd229456f73b6fb6af24aeb9ad3d6b998b650b7e5615b8101e5d3c0 libpython3.7-stdlib_3.7.3-2+deb10u2_amd64.deb +c1d8c2c8943f95511811eea4c85ee72cec9cf1442d16db18e135e589a77dc050 libjsoncpp1_1.7.4-3_amd64.deb +c1da1cffff8a024b5eca0a6795558d9e0ec88fbd24fe059490dc665dc5cac92f binutils-x86-64-linux-gnu_2.31.1-16_amd64.deb +c2696ba3984dd2fc90bacb01c3bbb6c5f4477bcabbc90fa084cb9fe971b66d6d binutils_2.31.1-16_amd64.deb +c27678f219146a347a99a108685c893616f4b1d0646bcfd644d6f079d319c780 libalgorithm-diff-perl_1.19.03-2_all.deb +c3f234591469e8fc3eaac9cb6a20732b10e4392d29cf8c743216c6ea841a2133 python3.7-minimal_3.7.3-2+deb10u2_amd64.deb +c453c3047a3e029ceccead76fa4b96912af75d593b59e54902e3590a3d6b91a6 libxml-sax-base-perl_1.09-1_all.deb +c472991b6fed2efac0a5eb1ba6fca02f2061172b7ae4669627c96daf6f575afb gpgconf_2.2.12-1+deb10u1_amd64.deb +c472cc849c02f03522b44e12191b6dfde496afa2a53b862f9b913dc2ae218f70 gcc_4%3a8.3.0-1_amd64.deb +c74233b04844391c62aa04ee248f9d510647b3f31982852bd3b721870d552065 libuv1_1.24.1-1_amd64.deb +c89092e2b584a945258b2e36d97c991f996b51276c349f1c92ed07fbd88cac7d libwrap0_7.6.q-28_amd64.deb +c9719552671a905045fcb33f6ae82227f85c6f6288df8621bc874cf55549ce81 libgnatvsn8_8.3.0-6_amd64.deb +c99437674b33964f44eb54b1a4d8cb5bbca0293989cd3d426bcb54e9f54d88db libsasl2-modules-db_2.1.27+dfsg-1+deb10u1_amd64.deb +c9b91b2cd288563998d9944a3b047b3ff8f61ba61e73ab11336dd23c2cc27303 libhttp-daemon-perl_6.01-3_all.deb +cae2859bfa6672e614b0bcf2062aa0eea06a9aa6456b0eb6e5fc0ac40ed4320b libwww-perl_6.36-2_all.deb +cc219cdf82ffc3d98d74b79b98687395450c43eece6712ca7784e4d2c48dea61 libfile-fcntllock-perl_0.22-3+b5_amd64.deb +ccd6cdf5ec28a92744a79f3f210f071679d12deb36917d4e8d17ae7587f218cc libedit2_3.1-20181209-1_amd64.deb +cd67ae8de2800717bd09accedcad746f294db9dfe4849e200c93d747ed871286 cron_3.0pl1-134+deb10u1_amd64.deb +cf23f2c340b048177ef3060644ec759a9002932f8c97889089d741723f8ada6c libnet-smtp-ssl-perl_1.04-1_all.deb +d005438229811b09ea9783491c98b145c9bcf6489284ad7870c19d2d09a8f571 libmpfr6_4.0.2-1_amd64.deb +d02a82455faab988a52121f37d97c528a4f967ed75e9398e1d8db571398c12f9 ucf_3.0038+nmu1_all.deb +d1e770fbb959033ab9b9056398d59cee5dc52fa2e98e9d0776d42c8605e42393 libhtml-parser-perl_3.72-3+b3_amd64.deb +d2cf8da8b3d575f0c2d7cb0a687e63b617a7bc85e434b8b1a2abe63481977619 libgdbm6_1.18.1-4_amd64.deb +d333c8986adff11fb54aed83e1b29f99996c321f7fb5b75614d66e5aa611a5d8 g++-8_8.3.0-6_amd64.deb +d384b12b278fc55e993b274c0e324ec4203f1646deaf76453bd1e6954e24dc21 libasan5_8.3.0-6_amd64.deb +d412efde85b1bbdec65f7a4f4f3fc9754eb33b4712218d51eaaa8f6b950613e0 python2_2.7.16-1_amd64.deb +d51e27d3fcba9bd0fe5f3303b61d08ebbd1a3bc57c40d467338b34f5d4ee762f libisl19_0.20-2_amd64.deb +d5fc0ab86db9a6a02c2ad517671788c08cf86cfa0186bac1b5c863b14e2e7eb6 libltdl7_2.4.6-9_amd64.deb +d60dee1f402ee0fba6d44df584512ae9ede73e866048e8476de55d9b78fa2da1 libexpat1_2.2.6-2+deb10u1_amd64.deb +d804ee5d2ce09410e2f22a50ae68edba36a15c68cba9caa374d3b2741f736c3c libunbound8_1.9.0-2+deb10u2_amd64.deb +d9d9a2e339fe6602b3c51ea0652a027159900d80b6c70187bb2fb4dca4f2a32d mailutils_1%3a3.5-4_amd64.deb +d9fd9f28350722a6c9b7e106a1db1dd220b78aa42a131dccba4452cf5fd9649b libobjc4_8.3.0-6_amd64.deb +db1cd5fed117936461f3d16eeb12e84e5eb2e9b6756beda02d7043142ff35396 libhttp-cookies-perl_6.04-1_all.deb +dd267f85672654acbc428c2b171493564a46cedffa0f5875c8ec2f1f5437a389 libapt-inst2.0_1.8.2.1_amd64.deb +de75f92b5fb4ab369c52c4a4351efad8396f06db9b15b87749d76d2cd18b4772 cpio_2.12+dfsg-9_amd64.deb +dea842d782f8b122a5551a7246781b94044713bb8c3235b0d4747a3ea15696b1 liblocale-gettext-perl_1.07-3+b4_amd64.deb +df69b110822b39f39600cd6ee889f4d7736b2105a7d9c8a100ce5f98d978abf0 lib32stdc++6_8.3.0-6_amd64.deb +df85973aa5a9939710832376b3247426ec2da314f63992041eeaf5ba280afcaf mailutils-common_1%3a3.5-4_all.deb +dfbe504791f99e8e086ed7a363d22ed6ae802e3e6c4e191878df94fa3d5e2420 xz-utils_5.2.4-1_amd64.deb +e078de84411f98b883f910483c6dec668383df84d6212ee9365650b46b8177e2 python3-attr_18.2.0-1_all.deb +e0e9d331643755db339e321c38889be13a8284cbba8ed0b7bfc062f8a68a0974 libkrb5support0_1.17-3_amd64.deb +e1751738e0f3cf798c8db1f6424789f1d388a423c158bf182c18325e109a9140 libldap-2.4-2_2.4.47+dfsg-3+deb10u2_amd64.deb +e57bd3393ba387eba57f45c99d51abf1ad762f898337ca1079cb9b2f563f8c63 curl_7.64.0-4+deb10u1_amd64.deb +e5dcd5ff5be854e9c7645f1a349701e809078051ef88dd119dc55d07c2e1f7bb libpython2.7_2.7.16-2+deb10u1_amd64.deb +e671d4fbf01230393897f3dc8a5b5699905431f1fff914320e82ba829a9420ad fakeroot_1.23-1_amd64.deb +e7157cc999402118a01919b90be27249e70ae830d06a5dc42e9069ed230926be gnupg-l10n_2.2.12-1+deb10u1_all.deb +e94da3a26503099b1787d865127687941bd527d278b59a607bfa533f9b94d232 cpp_4%3a8.3.0-1_amd64.deb +e96846869eeadd1de4e6ea594da14191cfc7838f1fa48ab880978d764d3c7ee6 libencode-locale-perl_1.05-1_all.deb +eb7862c7ad2cf5b86f3851c7103f72f8fa45b48514ddcf371a8e4ba8f02a79e5 python3_3.7.3-1_amd64.deb +eb97d5dff2db99ef44f13cc3151b3f0a666e2c96093d5e32340914608d874a59 libelf-dev_0.176-1.1_amd64.deb +ec43cea7798b07e39ad53bb4088f6db17ef1fb01abaebab0641da0ba0e6819e4 python3-six_1.12.0-1_all.deb +ecb8536f5fb34543b55bb9dc5f5b14c9dbb4150a7bddb3f2287b7cab6e9d25ef libxdmcp6_1%3a1.1.2-3_amd64.deb +ee7300195d7c28182097e81c4210ee633922a5ff74881099e456b8d42aa27ab3 pinentry-curses_1.1.0-2_amd64.deb +ef21084fc875a8ae711bda774a91a793a37b65a313789f8a642b6016a115bf91 gnat_8.0.1_all.deb +f3aed76145c49f0b6be3eb6840abc4245eebf24448b55c8ed0736fc1d45e5f8a libatomic1_8.3.0-6_amd64.deb +f499fb0f97de183cfd34a5f03de9c5429fcedd74cc2035534ee4189f2e57b6e3 xdg-user-dirs_0.17-2_amd64.deb +f54c0c6c91b7494bf5e199596334335eaf98a6a8284f96d29afe9da3636303a6 libfont-afm-perl_1.20-2_all.deb +f896eeb2215b29943ae99ac9fbac3eac500a0ca105925815117bd7b2b6d2e0e8 bc_1.07.1-2+b1_amd64.deb +f9d62eaa734828d4282fe4c17613c1a688af4cccbe2819eb691b3aaf615e882f libx11-6_2%3a1.6.7-1+deb10u1_amd64.deb +ff247b1c0527cc7322af8d47260268db079e94284ee12352b31be912d30ce2a1 libsqlite3-0_3.27.2-3_amd64.deb +ffebc078745662d2308c0026cc50e37cb54344bde61b1f92b979a2a4e8138efe libevent-2.1-6_2.1.8-stable-4_amd64.deb diff --git a/config/container/packages.list b/config/container/packages.list index d6e8701..7eed730 100644 --- a/config/container/packages.list +++ b/config/container/packages.list @@ -1,446 +1,106 @@ -aapt=1:8.1.0+r23-3 -abootimg=0.6-1+b2 -acl=2.2.53-4 -acpica-tools=20181213-1 -adduser=3.118 -adwaita-icon-theme=3.30.1-1 -android-framework-res=1:8.1.0+r23-3 -android-libaapt:amd64=1:8.1.0+r23-3 -android-libandroidfw:amd64=1:8.1.0+r23-3 -android-libbacktrace=1:8.1.0+r23-5 -android-libbase=1:8.1.0+r23-5 -android-libcutils=1:8.1.0+r23-5 -android-liblog=1:8.1.0+r23-5 -android-libunwind=8.1.0+r23-2 -android-libutils=1:8.1.0+r23-5 -android-libziparchive=1:8.1.0+r23-5 -apktool=2.3.4-1 -apparmor=2.13.2-10 -apt=1.8.2.1 -arj=3.10.22-18 -aspell=0.60.7~20110707-6 -aspell-en=2018.04.16-0-1 -at-spi2-core=2.30.0-7 -attr=1:2.4.48-4 -augeas-lenses=1.11.0-3 -base-files=10.3+deb10u6 -base-passwd=3.5.46 -bash=5.0-4 bc=1.07.1-2+b1 binfmt-support=2.2.0-2 -binutils=2.31.1-16 -binutils-common:amd64=2.31.1-16 -binutils-multiarch=2.31.1-16 +binutils-common=2.31.1-16 binutils-x86-64-linux-gnu=2.31.1-16 +binutils=2.31.1-16 bison=2:3.3.2.dfsg-1 -blt=2.5.3+dfsg-4 -bsdmainutils=11.1.2+b1 -bsdutils=1:2.33.1-0.1 -btrfs-progs=4.20.1-2 -bubblewrap=0.3.1-4 build-essential=12.6 -busybox=1:1.30.1-4 bzip2=1.0.6-9.2~deb10u1 -bzip2-doc=1.0.6-9.2~deb10u1 ca-certificates=20200601~deb10u1 -ca-certificates-java=20190405 -ca-certificates-mono=5.18.0.240+dfsg-3 -caca-utils=0.99.beta19-2.1 -ccache=3.6-1 -cli-common=0.10 -cmake=3.13.4-1 +clang-7=1:7.0.1-8+deb10u2 +clang=1:7.0-47 cmake-data=3.13.4-1 -colord=1.4.3-4 -colord-data=1.4.3-4 -coreutils=8.30-3 +cmake=3.13.4-1 cpio=2.12+dfsg-9 -cpp=4:8.3.0-1 cpp-8=8.3.0-6 -cramfsswap=1.4.1-1.1 +cpp=4:8.3.0-1 cron=3.0pl1-134+deb10u1 -cryptsetup-bin=2:2.1.0-5+deb10u2 curl=7.64.0-4+deb10u1 -dash=0.5.10.2-5 -db-util=5.3.1+nmu1 -db5.3-util=5.3.28+dfsg1-0.5 -dbus=1.12.20-0+deb10u1 -dbus-user-session=1.12.20-0+deb10u1 -dconf-gsettings-backend:amd64=0.30.1-2 -dconf-service=0.30.1-2 -debconf=1.5.71 -debian-archive-keyring=2019.1 -debianutils=4.8.6.1 debsecan=0.4.19 -default-jdk-headless=2:1.11-71 -default-jre-headless=2:1.11-71 -device-tree-compiler=1.4.7-3 -dialog=1.3-20190211-1 -dictionaries-common=1.28.1 -diffoscope=113 -diffutils=1:3.7-3 dirmngr=2.2.12-1+deb10u1 distro-info-data=0.41+deb10u2 -dmeventd=2:1.02.155-3 -dmidecode=3.2-1 -dmsetup=2:1.02.155-3 -docx2txt=1.4-1 -dosfstools=4.1-2 -dpkg=1.19.7 dpkg-dev=1.19.7 -e2fsprogs=1.44.5-1+deb10u3 -emacsen-common=3.0.4 -enchant=1.6.0-11.1+b1 -enjarify=1:1.0.3-4 -evince=3.30.2-3+deb10u1 -evince-common=3.30.2-3+deb10u1 -exfat-fuse=1.3.0-1 -exfat-utils=1.3.0-1 exim4-base=4.92-8+deb10u4 exim4-config=4.92-8+deb10u4 exim4-daemon-light=4.92-8+deb10u4 -extlinux=3:6.04~git20190206.bf6db5b4+dfsg1-1 fakeroot=1.23-1 -fdisk=2.33.1-0.1 -ffmpeg=7:4.1.6-1~deb10u1 file=1:5.35-4+deb10u1 -findutils=4.6.0+git+20190209-2 -firmware-linux-free=3.4 flex=2.6.4-6.2 -fontconfig=2.13.1-2 -fontconfig-config=2.13.1-2 -fontforge-extras=0.3-4 -fonts-dejavu=2.37-1 -fonts-dejavu-core=2.37-1 -fonts-dejavu-extra=2.37-1 -fonts-droid-fallback=1:6.0.1r16-1.1 -fonts-lyx=2.3.2-1 -fonts-noto-mono=20181227-1 -fp-compiler-3.0.4:amd64=3.0.4+dfsg-22 -fp-units-rtl-3.0.4:amd64=3.0.4+dfsg-22 -fp-utils=3.0.4+dfsg-22 -fp-utils-3.0.4=3.0.4+dfsg-22 -fpc-source-3.0.4=3.0.4+dfsg-22 -freeglut3:amd64=2.8.1-3 -fuse=2.9.9-1+deb10u1 -g++=4:8.3.0-1 g++-8=8.3.0-6 +g++=4:8.3.0-1 gawk=1:4.2.1+dfsg-1 -gcc=4:8.3.0-1 gcc-8=8.3.0-6 -gcc-8-base:amd64=8.3.0-6 -gdisk=1.0.3-1.1 -genisoimage=9:1.1.11-3+b2 -gettext=0.19.8.1-9 -gettext-base=0.19.8.1-9 -gfortran=4:8.3.0-1 -gfortran-8=8.3.0-6 -ghc=8.4.4+dfsg1-3 -ghostscript=9.27~dfsg-2+deb10u4 -giflib-tools=5.1.4-3 -git=1:2.20.1-2+deb10u3 +gcc=4:8.3.0-1 git-man=1:2.20.1-2+deb10u3 -glib-networking:amd64=2.58.0-2+deb10u2 -glib-networking-common=2.58.0-2+deb10u2 -glib-networking-services=2.58.0-2+deb10u2 -gnat=8.0.1 +git=1:2.20.1-2+deb10u3 gnat-8=8.3.0-6 -gnome-desktop3-data=3.30.2.1-2 -gnumeric=1.12.44-1 -gnumeric-common=1.12.44-1 -gnumeric-doc=1.12.44-1 -gnupg=2.2.12-1+deb10u1 +gnat=8.0.1 gnupg-l10n=2.2.12-1+deb10u1 gnupg-utils=2.2.12-1+deb10u1 -gpg=2.2.12-1+deb10u1 +gnupg=2.2.12-1+deb10u1 gpg-agent=2.2.12-1+deb10u1 gpg-wks-client=2.2.12-1+deb10u1 gpg-wks-server=2.2.12-1+deb10u1 +gpg=2.2.12-1+deb10u1 gpgconf=2.2.12-1+deb10u1 gpgsm=2.2.12-1+deb10u1 -gpgv=2.2.12-1+deb10u1 -grep=3.3-1 -groff-base=1.22.4-3 -grub-common=2.02+dfsg1-20+deb10u2 -grub2-common=2.02+dfsg1-20+deb10u2 -gsettings-desktop-schemas=3.28.1-1 -gsfonts=1:8.11+urwcyr1.0.7~pre44-4.4 -gstreamer1.0-gl:amd64=1.14.4-2 -gstreamer1.0-libav:amd64=1.15.0.1+git20180723+db823502-2 -gstreamer1.0-plugins-base:amd64=1.14.4-2 -gstreamer1.0-plugins-good:amd64=1.14.4-1 -gstreamer1.0-plugins-ugly:amd64=1.14.4-1 -gstreamer1.0-pulseaudio:amd64=1.14.4-1 -gstreamer1.0-x:amd64=1.14.4-2 -gtk-update-icon-cache=3.24.5-1 -guile-2.2-libs:amd64=2.2.4+1-2+deb10u1 -gzip=1.9-3 -hfsplus=1.0.4-15 -hicolor-icon-theme=0.17-2 -hostname=3.21 -hunspell-en-us=1:2018.04.16-1 -i965-va-driver:amd64=2.3.0+dfsg1-1 -ibverbs-providers:amd64=22.1-1 -icoutils=0.32.3-2.1 -icu-devtools=63.1-6+deb10u1 -imagemagick=8:6.9.10.23+dfsg-2.1+deb10u1 -imagemagick-6-common=8:6.9.10.23+dfsg-2.1+deb10u1 -imagemagick-6.q16=8:6.9.10.23+dfsg-2.1+deb10u1 -init-system-helpers=1.56+nmu1 -initramfs-tools=0.133+deb10u1 -initramfs-tools-core=0.133+deb10u1 -intel-media-va-driver:amd64=18.4.1+dfsg1-1 -iproute2=4.20.0-2 -iputils-ping=3:20180629-2+deb10u1 -ipxe-qemu=1.0.0+git-20190125.36a4c85-1 -isc-dhcp-client=4.4.1-2 -isc-dhcp-common=4.4.1-2 +guile-2.2-libs=2.2.4+1-2+deb10u1 iso-codes=4.2-1 -java-common=0.71 javascript-common=11 jq=1.5+dfsg-2+b1 -jsbeautifier=1.6.4-7 -junit=3.8.2-9 -klibc-utils=2.0.6-1 -kmod=26-1 krb5-locales=1.17-3 -ldmtool=0.2.4-2 -ledit=2.04-1 less=487-0.1+b1 -liba52-0.7.4:amd64=0.7.4-19 -libaa1:amd64=1.4p5-46 -libaacs0:amd64=0.9.0-2 -libacl1:amd64=2.2.53-4 -libafflib0v5=3.7.17-5 -libaio1:amd64=0.3.112-3 +lib32gcc1=1:8.3.0-6 +lib32stdc++6=8.3.0-6 libalgorithm-diff-perl=1.19.03-2 libalgorithm-diff-xs-perl=0.04-5+b1 libalgorithm-merge-perl=0.08-3 -libantlr-java=2.7.7+dfsg-9.2 -libantlr3-runtime-java=3.5.2-9 -libaom0:amd64=1.0.0-3 -libapache-pom-java=18-1 -libapparmor1:amd64=2.13.2-10 -libapt-inst2.0:amd64=1.8.2.1 -libapt-pkg5.0:amd64=1.8.2.1 -libarchive-tools=3.3.3-4+deb10u1 -libarchive13:amd64=3.3.3-4+deb10u1 -libargon2-1:amd64=0~20171227-0.2 -libasan5:amd64=8.3.0-6 -libasound2:amd64=1.1.8-1 -libasound2-data=1.1.8-1 -libaspell15:amd64=0.60.7~20110707-6 -libass9:amd64=1:0.14.0-2 -libassuan0:amd64=2.5.2-1 -libasyncns0:amd64=0.8-6 -libatinject-jsr330-api-java=1.0+ds1-5 -libatk-bridge2.0-0:amd64=2.30.0-5 -libatk1.0-0:amd64=2.30.0-2 -libatk1.0-data=2.30.0-2 -libatomic1:amd64=8.3.0-6 -libatspi2.0-0:amd64=2.30.0-7 -libattr1:amd64=1:2.4.48-4 -libaudio2:amd64=1.9.4-6 -libaudit-common=1:2.8.4-3 -libaudit1:amd64=1:2.8.4-3 -libaugeas0:amd64=1.11.0-3 +libapt-inst2.0=1.8.2.1 +libarchive13=3.3.3-4+deb10u1 +libasan5=8.3.0-6 +libassuan0=2.5.2-1 +libatomic1=8.3.0-6 libauthen-sasl-perl=2.1600-1 -libavahi-client3:amd64=0.7-4+b1 -libavahi-common-data:amd64=0.7-4+b1 -libavahi-common3:amd64=0.7-4+b1 -libavc1394-0:amd64=0.5.4-5 -libavcodec58:amd64=7:4.1.6-1~deb10u1 -libavdevice58:amd64=7:4.1.6-1~deb10u1 -libavfilter7:amd64=7:4.1.6-1~deb10u1 -libavformat58:amd64=7:4.1.6-1~deb10u1 -libavresample4:amd64=7:4.1.6-1~deb10u1 -libavutil56:amd64=7:4.1.6-1~deb10u1 -libbdplus0:amd64=0.1.2-3 -libbinutils:amd64=2.31.1-16 -libbison-dev:amd64=2:3.3.2.dfsg-1 -libblas-dev:amd64=3.8.0-2 -libblas3:amd64=3.8.0-2 -libblkid1:amd64=2.33.1-0.1 -libbluetooth3:amd64=5.50-1.2~deb10u1 -libbluray2:amd64=1:1.1.0-1 -libbrlapi0.6:amd64=5.6-10+deb10u1 -libbrotli1:amd64=1.0.7-2 -libbs2b0:amd64=3.1.0+dfsg-2.2 -libbsd-dev:amd64=0.9.1-2 -libbsd0:amd64=0.9.1-2 -libbz2-1.0:amd64=1.0.6-9.2~deb10u1 -libbz2-dev:amd64=1.0.6-9.2~deb10u1 -libc-bin=2.28-10 +libbinutils=2.31.1-16 +libbison-dev=2:3.3.2.dfsg-1 +libbsd0=0.9.1-2 libc-dev-bin=2.28-10 -libc6:amd64=2.28-10 -libc6-dev:amd64=2.28-10 -libcaca0:amd64=0.99.beta19-2.1 -libcacard0:amd64=1:2.6.1-1 -libcairo-gobject2:amd64=1.16.0-4 -libcairo2:amd64=1.16.0-4 -libcap-ng0:amd64=0.7.9-2 -libcap2:amd64=1:2.25-2 -libcap2-bin=1:2.25-2 -libcapstone3:amd64=4.0.1+really+3.0.5-1 -libcc1-0:amd64=8.3.0-6 -libcdio-cdda2:amd64=10.2+0.94+2-4 -libcdio-paranoia2:amd64=10.2+0.94+2-4 -libcdio18:amd64=2.0.0-2 -libcdparanoia0:amd64=3.10.2+debian-13 -libchromaprint1:amd64=1.4.3-3 -libcodec2-0.8.1:amd64=0.8.1-2 -libcolamd2:amd64=1:5.4.0+dfsg-1 -libcolord2:amd64=1.4.3-4 -libcolorhug2:amd64=1.4.3-4 -libcom-err2:amd64=1.44.5-1+deb10u3 -libcommons-cli-java=1.4-1 -libcommons-io-java=2.6-2 -libcommons-lang3-java=3.8-2 -libcommons-parent-java=43-1 -libcroco3:amd64=0.6.12-3 -libcryptsetup12:amd64=2:2.1.0-5+deb10u2 -libcrystalhd3:amd64=1:0.0~git20110715.fdd2f19-13 -libcups2:amd64=2.2.10-6+deb10u3 -libcupsfilters1:amd64=1.21.6-5 -libcupsimage2:amd64=2.2.10-6+deb10u3 -libcurl3-gnutls:amd64=7.64.0-4+deb10u1 -libcurl4:amd64=7.64.0-4+deb10u1 +libc6-dev=2.28-10 +libc6-i386=2.28-10 +libcc1-0=8.3.0-6 +libclang-common-7-dev=1:7.0.1-8+deb10u2 +libclang1-7=1:7.0.1-8+deb10u2 +libcurl3-gnutls=7.64.0-4+deb10u1 +libcurl4=7.64.0-4+deb10u1 libdata-dump-perl=1.23-1 -libdate-manip-perl=6.76-1 -libdatrie1:amd64=0.2.12-2 -libdb5.3:amd64=5.3.28+dfsg1-0.5 -libdbus-1-3:amd64=1.12.20-0+deb10u1 -libdc1394-22:amd64=2.2.5-1 -libdconf1:amd64=0.30.1-2 -libde265-0:amd64=1.0.3-1+b1 -libdebconfclient0:amd64=0.249 -libdevmapper-event1.02.1:amd64=2:1.02.155-3 -libdevmapper1.02.1:amd64=2:1.02.155-3 -libdigest-sha-perl=6.02-1+b1 -libdjvulibre-text=3.5.27.1-10 -libdjvulibre21:amd64=3.5.27.1-10 -libdns-export1104=1:9.11.5.P4+dfsg-5.1+deb10u2 -libdom4j-java=2.1.1-2 libdpkg-perl=1.19.7 -libdrm-amdgpu1:amd64=2.4.97-1 -libdrm-common=2.4.97-1 -libdrm-intel1:amd64=2.4.97-1 -libdrm-nouveau2:amd64=2.4.97-1 -libdrm-radeon1:amd64=2.4.97-1 -libdrm2:amd64=2.4.97-1 -libdv4:amd64=1.0.0-12 -libdvdnav4:amd64=6.0.0-1 -libdvdread4:amd64=6.0.1-1 -libedit2:amd64=3.1-20181209-1 -libefiboot1:amd64=37-2 -libefivar1:amd64=37-2 -libegl-mesa0:amd64=18.3.6-2+deb10u1 -libegl1:amd64=1.1.0-1 -libelf-dev:amd64=0.176-1.1 -libelf1:amd64=0.176-1.1 -libenchant1c2a:amd64=1.6.0-11.1+b1 +libedit2=3.1-20181209-1 +libelf-dev=0.176-1.1 libencode-locale-perl=1.05-1 -libepoxy0:amd64=1.5.3-0.1 liberror-perl=0.17027-2 -libevdocument3-4:amd64=3.30.2-3+deb10u1 -libevent-2.1-6:amd64=2.1.8-stable-4 -libevview3-3:amd64=3.30.2-3+deb10u1 -libewf2=20140804-1 -libexif12:amd64=0.6.21-5.1+deb10u4 -libexpat1:amd64=2.2.6-2+deb10u1 -libext2fs2:amd64=1.44.5-1+deb10u3 -libfakeroot:amd64=1.23-1 -libfaketime:amd64=0.9.7-3 -libfdisk1:amd64=2.33.1-0.1 -libfdt1:amd64=1.4.7-3 -libffi-dev:amd64=3.2.1-9 -libffi6:amd64=3.2.1-9 -libfftw3-double3:amd64=3.3.8-2 -libfile-basedir-perl=0.08-1 -libfile-desktopentry-perl=0.22-1 +libevent-2.1-6=2.1.8-stable-4 +libexpat1=2.2.6-2+deb10u1 +libfakeroot=1.23-1 +libffi-dev=3.2.1-9 libfile-fcntllock-perl=0.22-3+b5 libfile-listing-perl=6.04-1 -libfile-mimeinfo-perl=0.29-1 -libfl-dev:amd64=2.6.4-6.2 -libfl2:amd64=2.6.4-6.2 -libflac8:amd64=1.3.2-3 -libflite1:amd64=2.1-release-3 +libfl-dev=2.6.4-6.2 +libfl2=2.6.4-6.2 libfont-afm-perl=1.20-2 -libfontconfig1:amd64=2.13.1-2 -libfontenc1:amd64=1:1.1.3-1+b2 -libfreetype6:amd64=2.9.1-3+deb10u1 -libfribidi0:amd64=1.0.5-3.1+deb10u1 -libfuse2:amd64=2.9.9-1+deb10u1 -libgbm1:amd64=18.3.6-2+deb10u1 -libgc1c2:amd64=1:7.6.4-0.4 -libgcc-8-dev:amd64=8.3.0-6 -libgcc1:amd64=1:8.3.0-6 -libgcrypt20:amd64=1.8.4-5 -libgd3:amd64=2.2.5-5.2 -libgdbm-compat4:amd64=1.18.1-4 -libgdbm6:amd64=1.18.1-4 -libgdk-pixbuf2.0-0:amd64=2.38.1+dfsg-1 -libgdk-pixbuf2.0-bin=2.38.1+dfsg-1 -libgdk-pixbuf2.0-common=2.38.1+dfsg-1 -libgfortran-8-dev:amd64=8.3.0-6 -libgfortran5:amd64=8.3.0-6 -libgif7:amd64=5.1.4-3 -libgl1:amd64=1.1.0-1 -libgl1-mesa-dri:amd64=18.3.6-2+deb10u1 -libglapi-mesa:amd64=18.3.6-2+deb10u1 -libglib2.0-0:amd64=2.58.3-2+deb10u2 +libfribidi0=1.0.5-3.1+deb10u1 +libgc1c2=1:7.6.4-0.4 +libgcc-8-dev=8.3.0-6 +libgdbm-compat4=1.18.1-4 +libgdbm6=1.18.1-4 +libglib2.0-0=2.58.3-2+deb10u2 libglib2.0-data=2.58.3-2+deb10u2 -libglu1-mesa:amd64=9.0.0-2.1+b3 -libglvnd0:amd64=1.1.0-1 -libglx-mesa0:amd64=18.3.6-2+deb10u1 -libglx0:amd64=1.1.0-1 -libgme0:amd64=0.6.2-1 -libgmp-dev:amd64=2:6.1.2+dfsg-4 -libgmp10:amd64=2:6.1.2+dfsg-4 -libgmpxx4ldbl:amd64=2:6.1.2+dfsg-4 -libgnat-8:amd64=8.3.0-6 -libgnatvsn8:amd64=8.3.0-6 -libgnome-desktop-3-17:amd64=3.30.2.1-2 -libgnutls-dane0:amd64=3.6.7-4+deb10u5 -libgnutls30:amd64=3.6.7-4+deb10u5 -libgoffice-0.10-10=0.10.44-1 -libgoffice-0.10-10-common=0.10.44-1 -libgomp1:amd64=8.3.0-6 -libgpg-error0:amd64=1.35-1 -libgphoto2-6:amd64=2.5.22-3 -libgphoto2-l10n=2.5.22-3 -libgphoto2-port12:amd64=2.5.22-3 -libgpm2:amd64=1.20.7-5 -libgraphene-1.0-0:amd64=1.8.4-1 -libgraphite2-3:amd64=1.3.13-7 -libgs9:amd64=9.27~dfsg-2+deb10u4 -libgs9-common=9.27~dfsg-2+deb10u4 +libgnat-8=8.3.0-6 +libgnatvsn8=8.3.0-6 +libgnutls-dane0=3.6.7-4+deb10u5 +libgomp1=8.3.0-6 +libgpm2=1.20.7-5 libgsasl7=1.8.0-8+b2 -libgsf-1-114:amd64=1.14.45-1 -libgsf-1-common=1.14.45-1 -libgsm1:amd64=1.0.18-2 -libgspell-1-1:amd64=1.6.1-2 -libgspell-1-common=1.6.1-2 -libgssapi-krb5-2:amd64=1.17-3 -libgstreamer-gl1.0-0:amd64=1.14.4-2 -libgstreamer-plugins-base1.0-0:amd64=1.14.4-2 -libgstreamer1.0-0:amd64=1.14.4-1 -libgtk-3-0:amd64=3.24.5-1 -libgtk-3-bin=3.24.5-1 -libgtk-3-common=3.24.5-1 -libguava-java=19.0-1 -libgudev-1.0-0:amd64=232-2 -libguestfs-hfsplus:amd64=1:1.40.2-2 -libguestfs-reiserfs:amd64=1:1.40.2-2 -libguestfs-xfs:amd64=1:1.40.2-2 -libguestfs0:amd64=1:1.40.2-2 -libgusb2:amd64=0.3.0-1 -libgxps2:amd64=0.3.1-1 -libharfbuzz-icu0:amd64=2.3.1-1 -libharfbuzz0b:amd64=2.3.1-1 -libheif1:amd64=1.3.2-2~deb10u1 -libhfsp0=1.0.4-15 -libhivex0:amd64=1.3.18-1 -libhogweed4:amd64=3.4.1-1 +libgssapi-krb5-2=1.17-3 libhtml-form-perl=6.03-1 libhtml-format-perl=2.12-1 libhtml-parser-perl=3.72-3+b3 @@ -451,654 +111,169 @@ libhttp-daemon-perl=6.01-3 libhttp-date-perl=6.02-1 libhttp-message-perl=6.18-1 libhttp-negotiate-perl=6.01-1 -libhunspell-1.7-0:amd64=1.7.0-2 -libhyphen0:amd64=2.8.8-7 -libibverbs1:amd64=22.1-1 -libice6:amd64=2:1.0.9-2 -libicu-dev:amd64=63.1-6+deb10u1 -libicu4j-java=62.1-2 -libicu63:amd64=63.1-6+deb10u1 -libid3tag0:amd64=0.15.1b-14 -libidn11:amd64=1.33-2.2 -libidn2-0:amd64=2.0.5-1+deb10u1 -libiec61883-0:amd64=1.2.0-3 -libieee1284-3:amd64=0.2.11-13 -libigdgmm5:amd64=18.4.1+ds1-1 -libijs-0.35:amd64=0.35-14 -libilmbase23:amd64=2.2.1-2 -libimagequant0:amd64=2.12.2-1.1 -libimlib2:amd64=1.5.1-1 -libintellij-annotations-java=17.0.0-1 +libicu63=63.1-6+deb10u1 +libidn11=1.33-2.2 libio-html-perl=1.001-1 libio-socket-ssl-perl=2.060-3 -libio-stringy-perl=2.111-3 -libip4tc0:amd64=1.8.2-4 -libipc-system-simple-perl=1.25-4 -libisc-export1100:amd64=1:9.11.5.P4+dfsg-5.1+deb10u2 -libisl19:amd64=0.20-2 -libitm1:amd64=8.3.0-6 -libjack-jackd2-0:amd64=1.9.12~dfsg-2 -libjansson4:amd64=2.12-1 -libjavascriptcoregtk-4.0-18:amd64=2.28.4-1~deb10u1 -libjaxen-java=1.1.6-4 -libjaxp1.3-java=1.3.05-5 -libjbig0:amd64=2.1-3.1+b2 -libjbig2dec0:amd64=0.16-1 -libjcommander-java=1.71-3 -libjdom1-java=1.1.3-2 -libjetbrains-annotations-java=17.0.0-1 -libjpeg-dev=1:1.5.2-2 -libjpeg62-turbo:amd64=1:1.5.2-2+b1 -libjpeg62-turbo-dev:amd64=1:1.5.2-2+b1 -libjq1:amd64=1.5+dfsg-2+b1 +libisl19=0.20-2 +libitm1=8.3.0-6 +libjq1=1.5+dfsg-2+b1 libjs-jquery=3.3.1~dfsg-3 -libjs-jquery-ui=1.12.1+dfsg-5 -libjson-c3:amd64=0.12.1+ds-2+deb10u1 -libjson-glib-1.0-0:amd64=1.4.4-2 -libjson-glib-1.0-common=1.4.4-2 -libjsoncpp1:amd64=1.7.4-3 -libjsr305-java=0.1~+svn49-11 -libjxr-tools=1.1-6+b1 -libjxr0:amd64=1.1-6+b1 -libk5crypto3:amd64=1.17-3 -libkeyutils1:amd64=1.6-6 -libklibc:amd64=2.0.6-1 -libkmod2:amd64=26-1 -libkpathsea6:amd64=2018.20181218.49446-1 -libkrb5-3:amd64=1.17-3 -libkrb5support0:amd64=1.17-3 -libksba8:amd64=1.3.5-2 -libkyotocabinet16v5:amd64=1.2.76-4.2+b1 -liblapack-dev:amd64=3.8.0-2 -liblapack3:amd64=3.8.0-2 -liblcms2-2:amd64=2.9-3 -libldap-2.4-2:amd64=2.4.47+dfsg-3+deb10u2 +libjsoncpp1=1.7.4-3 +libk5crypto3=1.17-3 +libkeyutils1=1.6-6 +libkrb5-3=1.17-3 +libkrb5support0=1.17-3 +libksba8=1.3.5-2 +libkyotocabinet16v5=1.2.76-4.2+b1 +libldap-2.4-2=2.4.47+dfsg-3+deb10u2 libldap-common=2.4.47+dfsg-3+deb10u2 -libldm-1.0-0:amd64=0.2.4-2 -liblilv-0-0:amd64=0.24.2~dfsg0-2 -libllvm7:amd64=1:7.0.1-8+deb10u2 +libllvm7=1:7.0.1-8+deb10u2 liblocale-gettext-perl=1.07-3+b4 -liblqr-1-0:amd64=0.4.2-2.1 -liblsan0:amd64=8.3.0-6 -libltdl7:amd64=2.4.6-9 -liblua5.2-0:amd64=5.2.4-1.1+b2 -liblvm2cmd2.03:amd64=2.03.02-3 +liblsan0=8.3.0-6 +libltdl7=2.4.6-9 liblwp-mediatypes-perl=6.02-1 liblwp-protocol-https-perl=6.07-2 -liblz4-1:amd64=1.8.3-1 -liblzma-dev:amd64=5.2.4-1 -liblzma5:amd64=5.2.4-1 -liblzo2-2:amd64=2.10-0.1 +liblzo2-2=2.10-0.1 libmagic-mgc=1:5.35-4+deb10u1 -libmagic1:amd64=1:5.35-4+deb10u1 -libmagickcore-6.q16-6:amd64=8:6.9.10.23+dfsg-2.1+deb10u1 -libmagickcore-6.q16-6-extra:amd64=8:6.9.10.23+dfsg-2.1+deb10u1 -libmagickwand-6.q16-6:amd64=8:6.9.10.23+dfsg-2.1+deb10u1 +libmagic1=1:5.35-4+deb10u1 libmailtools-perl=2.18-1 -libmailutils5:amd64=1:3.5-4 -libmariadb3:amd64=1:10.3.23-0+deb10u1 -libmng1:amd64=1.0.10+dfsg-3.1+b5 -libmnl0:amd64=1.0.4-2 -libmono-btls-interface4.0-cil=5.18.0.240+dfsg-3 -libmono-corlib4.5-cil=5.18.0.240+dfsg-3 -libmono-i18n-west4.0-cil=5.18.0.240+dfsg-3 -libmono-i18n4.0-cil=5.18.0.240+dfsg-3 -libmono-security4.0-cil=5.18.0.240+dfsg-3 -libmono-system-configuration4.0-cil=5.18.0.240+dfsg-3 -libmono-system-core4.0-cil=5.18.0.240+dfsg-3 -libmono-system-numerics4.0-cil=5.18.0.240+dfsg-3 -libmono-system-security4.0-cil=5.18.0.240+dfsg-3 -libmono-system-xml4.0-cil=5.18.0.240+dfsg-3 -libmono-system4.0-cil=5.18.0.240+dfsg-3 -libmonoboehm-2.0-1=5.18.0.240+dfsg-3 -libmount1:amd64=2.33.1-0.1 -libmp3lame0:amd64=3.100-2+b1 -libmpc3:amd64=1.1.0-1 -libmpdec2:amd64=2.4.2-2 -libmpeg2-4:amd64=0.5.1-8 -libmpfr6:amd64=4.0.2-1 -libmpg123-0:amd64=1.25.10-2 -libmpx2:amd64=8.3.0-6 -libmysofa0:amd64=0.6~dfsg0-3+deb10u1 -libnautilus-extension1a:amd64=3.30.5-2 -libncurses-dev:amd64=6.1+20181013-2+deb10u2 -libncurses6:amd64=6.1+20181013-2+deb10u2 -libncursesw6:amd64=6.1+20181013-2+deb10u2 -libnet-dbus-perl=1.1.0-5+b1 +libmailutils5=1:3.5-4 +libmariadb3=1:10.3.25-0+deb10u1 +libmpc3=1.1.0-1 +libmpdec2=2.4.2-2 +libmpfr6=4.0.2-1 +libmpx2=8.3.0-6 +libncurses-dev=6.1+20181013-2+deb10u2 +libncurses6=6.1+20181013-2+deb10u2 libnet-http-perl=6.18-1 libnet-smtp-ssl-perl=1.04-1 libnet-ssleay-perl=1.85-2+b1 -libnetpbm10=2:10.0-15.3+b2 -libnettle6:amd64=3.4.1-1 -libnghttp2-14:amd64=1.36.0-2+deb10u1 -libnl-3-200:amd64=3.4.0-1 -libnl-route-3-200:amd64=3.4.0-1 -libnorm1:amd64=1.5.8+dfsg2-1 -libnotify4:amd64=0.7.7-4 -libnpth0:amd64=1.6-1 -libnspr4:amd64=2:4.20-1 -libnss-systemd:amd64=241-7~deb10u4 -libnss3:amd64=2:3.42.1-1+deb10u3 -libntfs-3g883=1:2017.3.23AR.3-3 -libntlm0:amd64=1.5-1+deb10u1 -libnuma1:amd64=2.0.12-1 -libogg0:amd64=1.3.2-1+b1 -libonig5:amd64=6.9.1-1 -libopenal-data=1:1.19.1-1 -libopenal1:amd64=1:1.19.1-1 -libopencore-amrnb0:amd64=0.1.3-2.1+b2 -libopencore-amrwb0:amd64=0.1.3-2.1+b2 -libopenexr23:amd64=2.2.1-4.1+deb10u1 -libopenjp2-7:amd64=2.3.0-2+deb10u1 -libopenmpt0:amd64=0.4.3-1+deb10u1 -libopus0:amd64=1.3-1 -liborc-0.4-0:amd64=1:0.4.28-3.1 -libp11-kit0:amd64=0.23.15-2 -libpam-modules:amd64=1.3.1-5 -libpam-modules-bin=1.3.1-5 -libpam-runtime=1.3.1-5 -libpam-systemd:amd64=241-7~deb10u4 -libpam0g:amd64=1.3.1-5 -libpango-1.0-0:amd64=1.42.4-8~deb10u1 -libpangocairo-1.0-0:amd64=1.42.4-8~deb10u1 -libpangoft2-1.0-0:amd64=1.42.4-8~deb10u1 -libpaper-utils=1.1.28 -libpaper1:amd64=1.1.28 -libparted2:amd64=3.2-25 -libpcap0.8:amd64=1.8.1-6 -libpci3:amd64=1:3.5.2-1 -libpciaccess0:amd64=0.14-1 -libpcre16-3:amd64=2:8.39-12 -libpcre2-8-0:amd64=10.32-5 -libpcre3:amd64=2:8.39-12 -libpcre3-dev:amd64=2:8.39-12 -libpcre32-3:amd64=2:8.39-12 -libpcrecpp0v5:amd64=2:8.39-12 -libpcsclite1:amd64=1.8.24-1 -libperl4-corelibs-perl=0.004-1+deb10u1 -libperl5.28:amd64=5.28.1-6+deb10u1 -libpgm-5.2-0:amd64=5.2.122~dfsg-3 -libpipeline1:amd64=1.5.1-2 -libpixman-1-0:amd64=0.36.0-1 -libpng-dev:amd64=1.6.36-6 -libpng-tools=1.6.36-6 -libpng16-16:amd64=1.6.36-6 -libpolkit-agent-1-0:amd64=0.105-25 -libpolkit-backend-1-0:amd64=0.105-25 -libpolkit-gobject-1-0:amd64=0.105-25 -libpoppler-glib8:amd64=0.71.0-5 -libpoppler82:amd64=0.71.0-5 -libpopt0:amd64=1.16-12 -libpostproc55:amd64=7:4.1.6-1~deb10u1 -libprocps7:amd64=2:3.3.15-2 -libprocyon-java=0.5.32-5 -libprotobuf-lite17:amd64=3.6.1.3-2 -libproxy1v5:amd64=0.4.15-5 -libpsl5:amd64=0.20.2-2 -libpulse0:amd64=12.2-4+deb10u1 -libpython-stdlib:amd64=2.7.16-1 -libpython2-stdlib:amd64=2.7.16-1 -libpython2.7:amd64=2.7.16-2+deb10u1 -libpython2.7-minimal:amd64=2.7.16-2+deb10u1 -libpython2.7-stdlib:amd64=2.7.16-2+deb10u1 -libpython3-stdlib:amd64=3.7.3-1 -libpython3.7-minimal:amd64=3.7.3-2+deb10u2 -libpython3.7-stdlib:amd64=3.7.3-2+deb10u2 -libqt4-dbus:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-declarative:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-designer:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-help:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-network:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-script:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-scripttools:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-sql:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-sql-mysql:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-svg:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-test:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-xml:amd64=4:4.8.7+dfsg-18+deb10u1 -libqt4-xmlpatterns:amd64=4:4.8.7+dfsg-18+deb10u1 -libqtassistantclient4:amd64=4.6.3-7+b1 -libqtcore4:amd64=4:4.8.7+dfsg-18+deb10u1 -libqtdbus4:amd64=4:4.8.7+dfsg-18+deb10u1 -libqtgui4:amd64=4:4.8.7+dfsg-18+deb10u1 -libquadmath0:amd64=8.3.0-6 -libraw1394-11:amd64=2.1.2-1+b1 -librdmacm1:amd64=22.1-1 -libreadline-dev:amd64=7.0-5 -libreadline5:amd64=5.2+dfsg-3+b13 -libreadline7:amd64=7.0-5 -librest-0.7-0:amd64=0.8.1-1 -librhash0:amd64=1.3.8-1 -librpm8=4.14.2.1+dfsg1-1 -librpmio8=4.14.2.1+dfsg1-1 -librsvg2-2:amd64=2.44.10-2.1 -librsvg2-common:amd64=2.44.10-2.1 -librtmp1:amd64=2.4+20151223.gitfa8646d.1-2 -librubberband2:amd64=1.8.1-7 -libsamplerate0:amd64=0.1.9-2 -libsane:amd64=1.0.27-3.2 -libsane-common=1.0.27-3.2 -libsasl2-2:amd64=2.1.27+dfsg-1+deb10u1 -libsasl2-modules:amd64=2.1.27+dfsg-1+deb10u1 -libsasl2-modules-db:amd64=2.1.27+dfsg-1+deb10u1 -libsaxonhe-java=9.9.0.2+dfsg-1 -libsdl2-2.0-0:amd64=2.0.9+dfsg1-1 -libseccomp2:amd64=2.3.3-4 -libsecret-1-0:amd64=0.18.7-1 -libsecret-common=0.18.7-1 -libselinux1:amd64=2.8-1+b1 -libsemanage-common=2.8-2 -libsemanage1:amd64=2.8-2 -libsensors-config=1:3.5.0-3 -libsensors5:amd64=1:3.5.0-3 -libsepol1:amd64=2.8-1 -libserd-0-0:amd64=0.28.0~dfsg0-1 -libshine3:amd64=3.1.1-2 -libshout3:amd64=2.4.1-2 -libsidplay1v5:amd64=1.36.59-11 -libsigsegv2:amd64=2.12-2 -libslang2:amd64=2.3.2-2 -libsm6:amd64=2:1.2.3-1 -libsmali-java=2.2.6-1 -libsmartcols1:amd64=2.33.1-0.1 -libsnappy1v5:amd64=1.1.7-1 -libsndfile1:amd64=1.0.28-6 -libsndio7.0:amd64=1.5.0-3 -libsnmp-base=5.7.3+dfsg-5+deb10u1 -libsnmp30:amd64=5.7.3+dfsg-5+deb10u1 -libsodium23:amd64=1.0.17-1 -libsord-0-0:amd64=0.16.0~dfsg0-1+b1 -libsoup-gnome2.4-1:amd64=2.64.2-2 -libsoup2.4-1:amd64=2.64.2-2 -libsoxr0:amd64=0.1.2-3 -libspectre1:amd64=0.2.8-1 -libspeex1:amd64=1.2~rc1.2-1+b2 -libspice-server1:amd64=0.14.0-1.3 -libsqlite3-0:amd64=3.27.2-3 -libsratom-0-0:amd64=0.6.0~dfsg0-1 -libss2:amd64=1.44.5-1+deb10u3 -libssh-gcrypt-4:amd64=0.8.7-1+deb10u1 -libssh2-1:amd64=1.8.0-2.1 -libssl-dev:amd64=1.1.1d-0+deb10u3 -libssl1.1:amd64=1.1.1d-0+deb10u3 -libstdc++-8-dev:amd64=8.3.0-6 -libstdc++6:amd64=8.3.0-6 -libstringtemplate-java=3.2.1-2 -libsuitesparseconfig5:amd64=1:5.4.0+dfsg-1 -libswresample3:amd64=7:4.1.6-1~deb10u1 -libswscale5:amd64=7:4.1.6-1~deb10u1 -libsynctex2:amd64=2018.20181218.49446-1 -libsystemd0:amd64=241-7~deb10u4 -libtag1v5:amd64=1.11.1+dfsg.1-0.3+deb10u1 -libtag1v5-vanilla:amd64=1.11.1+dfsg.1-0.3+deb10u1 -libtasn1-6:amd64=4.13-3 -libtcl8.6:amd64=8.6.9+dfsg-2 -libtext-iconv-perl=1.7-5+b7 +libnghttp2-14=1.36.0-2+deb10u1 +libnpth0=1.6-1 +libntlm0=1.5-1+deb10u1 +libobjc-8-dev=8.3.0-6 +libobjc4=8.3.0-6 +libomp-7-dev=1:7.0.1-8+deb10u2 +libomp5-7=1:7.0.1-8+deb10u2 +libonig5=6.9.1-1 +libpcre2-8-0=10.32-5 +libperl5.28=5.28.1-6+deb10u1 +libpipeline1=1.5.1-2 +libpopt0=1.16-12 +libprocps7=2:3.3.15-2 +libpsl5=0.20.2-2 +libpython-stdlib=2.7.16-1 +libpython2-stdlib=2.7.16-1 +libpython2.7-minimal=2.7.16-2+deb10u1 +libpython2.7-stdlib=2.7.16-2+deb10u1 +libpython2.7=2.7.16-2+deb10u1 +libpython3-stdlib=3.7.3-1 +libpython3.7-minimal=3.7.3-2+deb10u2 +libpython3.7-stdlib=3.7.3-2+deb10u2 +libquadmath0=8.3.0-6 +libreadline7=7.0-5 +librhash0=1.3.8-1 +librtmp1=2.4+20151223.gitfa8646d.1-2 +libsasl2-2=2.1.27+dfsg-1+deb10u1 +libsasl2-modules-db=2.1.27+dfsg-1+deb10u1 +libsasl2-modules=2.1.27+dfsg-1+deb10u1 +libsigsegv2=2.12-2 +libsqlite3-0=3.27.2-3 +libssh2-1=1.8.0-2.1 +libssl-dev=1.1.1d-0+deb10u3 +libssl1.1=1.1.1d-0+deb10u3 +libstdc++-8-dev=8.3.0-6 libtext-unidecode-perl=1.30-1 -libthai-data=0.1.28-2 -libthai0:amd64=0.1.28-2 -libtheora0:amd64=1.1.1+dfsg.1-15 -libtie-ixhash-perl=1.23-2 -libtiff5:amd64=4.1.0+git191117-2~deb10u1 libtimedate-perl=2.3000-2+deb10u1 -libtinfo6:amd64=6.1+20181013-2+deb10u2 -libtk8.6:amd64=8.6.9-2 libtry-tiny-perl=0.30-1 -libtsan0:amd64=8.3.0-6 -libtsk13=4.6.5-1 -libtwolame0:amd64=0.3.13-4 -libubsan1:amd64=8.3.0-6 -libuchardet0:amd64=0.0.6-3 -libudev1:amd64=241-7~deb10u4 -libunbound8:amd64=1.9.0-2+deb10u2 -libunistring2:amd64=0.9.10-1 +libtsan0=8.3.0-6 +libubsan1=8.3.0-6 +libunbound8=1.9.0-2+deb10u2 liburi-perl=1.76-1 -libusb-1.0-0:amd64=2:1.0.22-2 -libusb-1.0-0-dev:amd64=2:1.0.22-2 +libusb-1.0-0-dev=2:1.0.22-2 +libusb-1.0-0=2:1.0.22-2 libusb-1.0-doc=2:1.0.22-2 -libusbredirparser1:amd64=0.8.0-1 -libuuid1:amd64=2.33.1-0.1 -libuv1:amd64=1.24.1-1 -libv4l-0:amd64=1.16.3-3 -libv4lconvert0:amd64=1.16.3-3 -libva-drm2:amd64=2.4.0-1 -libva-x11-2:amd64=2.4.0-1 -libva2:amd64=2.4.0-1 -libvdeplug2=2.3.2+r586-2.2 -libvdpau-va-gl1:amd64=0.4.2-1+b1 -libvdpau1:amd64=1.1.1-10 -libvidstab1.1:amd64=1.1.0-2 -libvirglrenderer0:amd64=0.7.0-2 -libvirt0:amd64=5.0.0-4+deb10u1 -libvisual-0.4-0:amd64=0.4.0-15 -libvorbis0a:amd64=1.3.6-2 -libvorbisenc2:amd64=1.3.6-2 -libvorbisfile3:amd64=1.3.6-2 -libvpx5:amd64=1.7.0-3+deb10u1 -libvte-2.91-0:amd64=0.54.2-2 -libvte-2.91-common=0.54.2-2 -libwavpack1:amd64=5.1.0-6 -libwayland-client0:amd64=1.16.0-1 -libwayland-cursor0:amd64=1.16.0-1 -libwayland-egl1:amd64=1.16.0-1 -libwayland-server0:amd64=1.16.0-1 -libwebkit2gtk-4.0-37:amd64=2.28.4-1~deb10u1 -libwebp6:amd64=0.6.1-2 -libwebpdemux2:amd64=0.6.1-2 -libwebpmux3:amd64=0.6.1-2 -libwmf0.2-7:amd64=0.2.8.4-14 -libwoff1:amd64=1.0.2-1 -libwrap0:amd64=7.6.q-28 +libuv1=1.24.1-1 +libwrap0=7.6.q-28 libwww-perl=6.36-2 libwww-robotrules-perl=6.02-1 -libx11-6:amd64=2:1.6.7-1+deb10u1 +libx11-6=2:1.6.7-1+deb10u1 libx11-data=2:1.6.7-1+deb10u1 -libx11-protocol-perl=0.56-7 -libx11-xcb1:amd64=2:1.6.7-1+deb10u1 -libx264-155:amd64=2:0.155.2917+git0a84d98-2 -libx265-165:amd64=2.9-4 -libxau6:amd64=1:1.0.8-1+b2 -libxaw7:amd64=2:1.0.13-1+b2 -libxcb-dri2-0:amd64=1.13.1-2 -libxcb-dri3-0:amd64=1.13.1-2 -libxcb-glx0:amd64=1.13.1-2 -libxcb-present0:amd64=1.13.1-2 -libxcb-render0:amd64=1.13.1-2 -libxcb-shape0:amd64=1.13.1-2 -libxcb-shm0:amd64=1.13.1-2 -libxcb-sync1:amd64=1.13.1-2 -libxcb-xfixes0:amd64=1.13.1-2 -libxcb1:amd64=1.13.1-2 -libxcomposite1:amd64=1:0.4.4-2 -libxcursor1:amd64=1:1.1.15-2 -libxdamage1:amd64=1:1.1.4-3+b3 -libxdmcp6:amd64=1:1.1.2-3 -libxencall1:amd64=4.11.4+37-g3263f257ca-1 -libxendevicemodel1:amd64=4.11.4+37-g3263f257ca-1 -libxenevtchn1:amd64=4.11.4+37-g3263f257ca-1 -libxenforeignmemory1:amd64=4.11.4+37-g3263f257ca-1 -libxengnttab1:amd64=4.11.4+37-g3263f257ca-1 -libxenmisc4.11:amd64=4.11.4+37-g3263f257ca-1 -libxenstore3.0:amd64=4.11.4+37-g3263f257ca-1 -libxentoolcore1:amd64=4.11.4+37-g3263f257ca-1 -libxentoollog1:amd64=4.11.4+37-g3263f257ca-1 -libxerces2-java=2.12.0-1 -libxext6:amd64=2:1.3.3-1+b2 -libxfixes3:amd64=1:5.0.3-1 -libxft2:amd64=2.3.2-2 -libxi6:amd64=2:1.7.9-1 -libxinerama1:amd64=2:1.1.4-2 -libxkbcommon0:amd64=0.8.2-1 -libxml-commons-external-java=1.4.01-3 -libxml-commons-resolver1.1-java=1.2-9 +libxau6=1:1.0.8-1+b2 +libxcb1=1.13.1-2 +libxdmcp6=1:1.1.2-3 +libxext6=2:1.3.3-1+b2 libxml-libxml-perl=2.0134+dfsg-1 libxml-namespacesupport-perl=1.12-1 libxml-parser-perl=2.44-4 libxml-sax-base-perl=1.09-1 libxml-sax-expat-perl=0.51-1 libxml-sax-perl=1.00+dfsg-1 -libxml-twig-perl=1:3.50-1.1 -libxml-xpathengine-perl=0.14-1 -libxml2:amd64=2.9.4+dfsg1-7+b3 -libxmlbeans-java=3.0.2-1 -libxmlunit-java=1.6-1 -libxmu6:amd64=2:1.1.2-2+b3 -libxmuu1:amd64=2:1.1.2-2+b3 -libxom-java=1.2.10-1 -libxpm4:amd64=1:3.5.12-1 -libxpp3-java=1.1.4c-3 -libxrandr2:amd64=2:1.5.1-1 -libxrender1:amd64=1:0.9.10-1 -libxshmfence1:amd64=1.3-1 -libxslt1.1:amd64=1.1.32-2.2~deb10u1 -libxss1:amd64=1:1.2.3-1 -libxt6:amd64=1:1.1.5-1+b3 -libxtables12:amd64=1.8.2-4 -libxtst6:amd64=2:1.2.3-1 -libxv1:amd64=2:1.0.11-1 -libxvidcore4:amd64=2:1.3.5-1 -libxxf86dga1:amd64=2:1.1.4-1+b3 -libxxf86vm1:amd64=1:1.1.4-1+b2 -libyajl2:amd64=2.1.0-3 -libyaml-snake-java=1.23-1 -libyara3:amd64=3.9.0-1 -libyelp0:amd64=3.31.90-1 -libzip4:amd64=1.5.1-4 -libzmq5:amd64=4.3.1-4+deb10u2 -libzstd1:amd64=1.3.8+dfsg-3 -libzvbi-common=0.2.35-16 -libzvbi0:amd64=0.2.35-16 -linux-base=4.6 -linux-image-4.19.0-11-amd64=4.19.146-1 -linux-image-4.19.0-9-amd64=4.19.118-2+deb10u1 -linux-image-amd64=4.19+105+deb10u6 -linux-libc-dev:amd64=4.19.146-1 -llvm=1:7.0-47 -llvm-7=1:7.0.1-8+deb10u2 +libxml2=2.9.4+dfsg1-7+b3 +libxmuu1=2:1.1.2-2+b3 +linux-libc-dev=4.19.152-1 llvm-7-dev=1:7.0.1-8+deb10u2 llvm-7-runtime=1:7.0.1-8+deb10u2 -llvm-runtime=1:7.0-47 -login=1:4.5-1.1 -lp-solve=5.5.0.15-4+b1 +llvm-7=1:7.0.1-8+deb10u2 lsb-base=10.2019051400 lsb-release=10.2019051400 -lsscsi=0.30-0.1 -lvm2=2.03.02-3 -lz4=1.8.3-1 -lzop=1.03-4+b1 m4=1.4.18-2 -mailutils=1:3.5-4 mailutils-common=1:3.5-4 +mailutils=1:3.5-4 make=4.2.1-1.2 -man-db=2.8.5-2 -manpages=4.16-2 manpages-dev=4.16-2 -mariadb-common=1:10.3.23-0+deb10u1 -mawk=1.3.3-17+b3 -mdadm=4.1-1 -mesa-va-drivers:amd64=18.3.6-2+deb10u1 -mesa-vdpau-drivers:amd64=18.3.6-2+deb10u1 +manpages=4.16-2 +mariadb-common=1:10.3.25-0+deb10u1 mime-support=3.62 -mono-4.0-gac=5.18.0.240+dfsg-3 -mono-gac=5.18.0.240+dfsg-3 -mono-runtime=5.18.0.240+dfsg-3 -mono-runtime-common=5.18.0.240+dfsg-3 -mono-runtime-sgen=5.18.0.240+dfsg-3 -mono-utils=5.18.0.240+dfsg-3 -mount=2.33.1-0.1 -mtd-utils=1:2.0.1-1 -mtools=4.0.23-1 mysql-common=5.8+1.0.5 -nasm=2.14-1 -ncompress=4.2.4.5-3 -ncurses-base=6.1+20181013-2+deb10u2 -ncurses-bin=6.1+20181013-2+deb10u2 netbase=5.6 -netpbm=2:10.0-15.3+b2 -notification-daemon=3.20.0-4 -ntfs-3g=1:2017.3.23AR.3-3 -ocaml-base-nox=4.05.0-11 -ocaml-compiler-libs=4.05.0-11 -ocaml-interp=4.05.0-11 -ocaml-nox=4.05.0-11 -odt2txt=0.5-1+b2 -oggvideotools=0.9.1-5 -openjdk-11-jdk-headless:amd64=11.0.8+10-1~deb10u1 -openjdk-11-jre-headless:amd64=11.0.8+10-1~deb10u1 openssh-client=1:7.9p1-10+deb10u2 openssl=1.1.1d-0+deb10u3 -os-prober=1.77 -osinfo-db=0.20181120-1+deb10u1 -ovmf=0~20181115.85588389-3+deb10u1 -p7zip=16.02+dfsg-6 -p7zip-full=16.02+dfsg-6 -parted=3.2-25 -passwd=1:4.5-1.1 patch=2.7.6-3+deb10u1 -perl=5.28.1-6+deb10u1 -perl-base=5.28.1-6+deb10u1 perl-modules-5.28=5.28.1-6+deb10u1 -perl-openssl-defaults:amd64=3 -pgpdump=0.33-1 -pigz=2.4-1 +perl-openssl-defaults=3 +perl=5.28.1-6+deb10u1 pinentry-curses=1.1.0-2 pkg-config=0.29-6 -policykit-1=0.105-25 -poppler-data=0.4.9-2 -poppler-utils=0.71.0-5 procps=2:3.3.15-2 -procyon-decompiler=0.5.32-5 psmisc=23.2-1 publicsuffix=20190415.1030-1 -pxlib1=0.6.7-1 -python=2.7.16-1 -python-apt=1.8.4.1 python-apt-common=1.8.4.1 -python-asn1crypto=0.24.0-1 -python-certifi=2018.8.24-1 -python-cffi-backend=1.12.2-1 -python-chardet=3.0.4-3 -python-cryptography=2.6.1-3+deb10u2 -python-enum34=1.1.6-2 -python-idna=2.6-1 -python-ijson=2.3-2 -python-ipaddress=1.0.17-1 -python-matplotlib-data=3.0.2-2 +python-apt=1.8.4.1 python-minimal=2.7.16-1 -python-openssl=19.0.0-1 -python-pkg-resources=40.8.0-1 -python-requests=2.21.0-1 -python-six=1.12.0-1 -python-urllib3=1.24.1-1 -python2=2.7.16-1 python2-minimal=2.7.16-1 -python2.7=2.7.16-2+deb10u1 python2.7-minimal=2.7.16-2+deb10u1 -python3=3.7.3-1 -python3-apt=1.8.4.1 -python3-argcomplete=1.8.1-1 -python3-binwalk=2.1.2~git20180830+dfsg1-1 +python2.7=2.7.16-2+deb10u1 +python2=2.7.16-1 +python3-aiohttp=3.5.1-1 +python3-async-timeout=3.0.1-1 +python3-attr=18.2.0-1 +python3-certifi=2018.8.24-1 python3-chardet=3.0.4-3 -python3-cycler=0.10.0-1 -python3-dateutil=2.7.3-3 -python3-debian=0.1.35 -python3-decorator=4.3.0-1.1 -python3-defusedxml=0.5.0-2 -python3-distro=1.3.0-1 -python3-distutils=3.7.3-1 -python3-editorconfig=0.12.1-1 -python3-guestfs=1:1.40.2-2 -python3-jsbeautifier=1.6.4-7 -python3-jsondiff=1.1.1-2 -python3-kiwisolver=1.0.1-2+b1 -python3-lib2to3=3.7.3-1 -python3-libarchive-c=2.8-0.3 -python3-magic=2:0.4.15-2 -python3-matplotlib=3.0.2-2 +python3-idna=2.6-1 +python3-ijson=2.3-2 python3-minimal=3.7.3-1 -python3-numpy=1:1.16.2-1 -python3-olefile=0.46-1 -python3-opengl=3.1.0+dfsg-2 -python3-pil:amd64=5.4.1-2+deb10u2 +python3-multidict=4.5.2-1 python3-pkg-resources=40.8.0-1 -python3-progressbar=2.5-1 -python3-pyparsing=2.2.0+dfsg1-2 -python3-pypdf2=1.26.0-2 -python3-pyqt4=4.12.1+dfsg-2+b1 -python3-pyqtgraph=0.10.0-1 -python3-pyxattr=0.6.1-1 -python3-scipy=1.1.0-7 -python3-sip=4.19.14+dfsg-2 +python3-requests=2.21.0-1 python3-six=1.12.0-1 -python3-tk:amd64=3.7.3-1 -python3-tlsh=3.4.4+20151206-1.1 -python3.7=3.7.3-2+deb10u2 +python3-urllib3=1.24.1-1 +python3-yarl=1.3.0-1 python3.7-minimal=3.7.3-2+deb10u2 -qdbus=4:4.8.7+dfsg-18+deb10u1 -qemu-system-common=1:3.1+dfsg-8+deb10u8 -qemu-system-data=1:3.1+dfsg-8+deb10u8 -qemu-system-gui=1:3.1+dfsg-8+deb10u8 -qemu-system-x86=1:3.1+dfsg-8+deb10u8 -qemu-utils=1:3.1+dfsg-8+deb10u8 -qt-at-spi:amd64=0.4.0-9 -qtchooser=66-2 -qtcore4-l10n=4:4.8.7+dfsg-18+deb10u1 -r-base-core=3.5.2-1 -r-base-dev=3.5.2-1 -r-cran-boot=1.3-20-2 -r-cran-class=7.3-15-1 -r-cran-cluster=2.0.7-1-1+b3 -r-cran-codetools=0.2-16-1 -r-cran-foreign=0.8.71-1 -r-cran-kernsmooth=2.23-15-3+b4 -r-cran-lattice=0.20-38-1 -r-cran-mass=7.3-51.1-1 -r-cran-matrix=1.2-15-1 -r-cran-mgcv=1.8-27-1 -r-cran-nlme=3.1.137-1+b3 -r-cran-nnet=7.3-12-2+b2 -r-cran-rpart=4.1-13-1+b1 -r-cran-spatial=7.3-11-2+b2 -r-cran-survival=2.43-3-1 -r-doc-html=3.5.2-1 -r-recommended=3.5.2-1 +python3.7=3.7.3-2+deb10u2 +python3=3.7.3-1 +python=2.7.16-1 readline-common=7.0-5 -reiserfsprogs=1:3.6.27-3 -rpm-common=4.14.2.1+dfsg1-1 -rpm2cpio=4.14.2.1+dfsg1-1 rsync=3.1.3-6 -sane-utils=1.0.27-3.2 -scrub=2.6.1-1+b1 -seabios=1.12.0-1 -sed=4.7-1 sensible-utils=0.0.12 -sgabios=0.0~svn8-4 shared-mime-info=1.10-1 -sleuthkit=4.6.5-1 -sng=1.1.0-1+b1 -sqlite3=3.27.2-3 -squashfs-tools=1:4.3-12 -sudo=1.8.27-1+deb10u2 -supermin=5.1.20-1+b10 -syslinux=3:6.04~git20190206.bf6db5b4+dfsg1-1 -syslinux-common=3:6.04~git20190206.bf6db5b4+dfsg1-1 -systemd=241-7~deb10u4 -systemd-sysv=241-7~deb10u4 -sysvinit-utils=2.93-8 -tar=1.30+dfsg-6 -tcpdump=4.9.3-1~deb10u1 tex-common=6.11 texinfo=6.5.0.dfsg.1-4+b1 -thin-provisioning-tools=0.7.6-2.1 -tk8.6-blt2.5=2.5.3+dfsg-4 -toilet=0.3-1.2 -toilet-fonts=0.3-1.2 -ttf-bitstream-vera=1.10-8 -tzdata=2020a-0+deb10u1 ucf=3.0038+nmu1 -udev=241-7~deb10u4 unzip=6.0-23+deb10u1 -update-inetd=4.49 -util-linux=2.33.1-0.1 -uuid-dev:amd64=2.33.1-0.1 -va-driver-all:amd64=2.4.0-1 -vdpau-driver-all:amd64=1.1.1-10 wget=1.20.1-1.1 -x11-common=1:7.7+19 -x11-utils=7.7+4 -x11-xserver-utils=7.7+8 xauth=1:1.0.10-1 -xdg-dbus-proxy=0.1.1-1 xdg-user-dirs=0.17-2 -xdg-utils=1.1.3-1+deb10u1 -xfsprogs=4.20.0-1 -xkb-data=2.26-2 -xmlbeans=3.0.2-1 -xxd=2:8.1.0875-5 xz-utils=5.2.4-1 -yelp=3.31.90-1 -yelp-xsl=3.31.90-1 -zerofree=1.1.1-1 -zip=3.0-11+b1 -zlib1g:amd64=1:1.2.11.dfsg-1 -zlib1g-dev:amd64=1:1.2.11.dfsg-1 +zlib1g-dev=1:1.2.11.dfsg-1 diff --git a/config/container/sources.list b/config/container/sources.list index b6e6605..f96031c 100644 --- a/config/container/sources.list +++ b/config/container/sources.list @@ -1,6 +1,6 @@ -deb http://deb.debian.org/debian buster main -deb http://snapshot.debian.org/archive/debian/20200910T000000Z buster main -deb http://security.debian.org/debian-security buster/updates main -deb http://snapshot.debian.org/archive/debian-security/20200910T000000Z buster/updates main -deb http://deb.debian.org/debian buster-updates main -deb http://snapshot.debian.org/archive/debian/20200910T000000Z buster-updates main +deb https://deb.debian.org/debian buster main +deb https://snapshot.debian.org/archive/debian/20201021T000000Z buster main +deb https://security.debian.org/debian-security buster/updates main +deb https://snapshot.debian.org/archive/debian-security/20201021T000000Z buster/updates main +deb https://deb.debian.org/debian buster-updates main +deb https://snapshot.debian.org/archive/debian/20201021T000000Z buster-updates main diff --git a/config/heads/patches/usb-boot.patch b/config/heads/patches/usb-boot.patch index 2b4935c..968665b 100644 --- a/config/heads/patches/usb-boot.patch +++ b/config/heads/patches/usb-boot.patch @@ -1,5 +1,5 @@ diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init -index a7f97ab..f1562a9 100755 +index 38953ca..1740da6 100755 --- a/initrd/bin/gui-init +++ b/initrd/bin/gui-init @@ -13,6 +13,11 @@ mount_boot() @@ -7,15 +7,15 @@ index a7f97ab..f1562a9 100755 # Mount local disk if it is not already mounted while ! grep -q /boot /proc/mounts ; do + -+ if [ "$CONFIG_BOOT_USB" = "y" ]; then -+ enable_usb -+ fi ++ if [ "$CONFIG_BOOT_USB" = "y" ]; then ++ enable_usb ++ fi + - # ensure default boot device is set - if [ ! -e "$CONFIG_BOOT_DEV" ]; then - if (whiptail $CONFIG_ERROR_BG_COLOR --clear --title "ERROR: $CONFIG_BOOT_DEV missing!" \ + # try to mount if CONFIG_BOOT_DEV exists + if [ -e "$CONFIG_BOOT_DEV" ]; then + mount -o ro $CONFIG_BOOT_DEV /boot diff --git a/initrd/bin/mount-usb b/initrd/bin/mount-usb -index 266f9dd..556d66e 100755 +index 501171a..2196bbd 100755 --- a/initrd/bin/mount-usb +++ b/initrd/bin/mount-usb @@ -4,19 +4,6 @@ @@ -39,11 +39,11 @@ index 266f9dd..556d66e 100755 mkdir /media fi diff --git a/initrd/bin/usb-scan b/initrd/bin/usb-scan -index a9debdf..6f10a30 100755 +index d9f26b0..330d672 100755 --- a/initrd/bin/usb-scan +++ b/initrd/bin/usb-scan -@@ -4,12 +4,6 @@ set -e -o pipefail - . /etc/functions +@@ -5,12 +5,6 @@ set -e -o pipefail + . /etc/gui_functions . /tmp/config -# Unmount any previous boot device @@ -53,13 +53,13 @@ index a9debdf..6f10a30 100755 -fi - # Mount the USB boot device - if ! grep -q /media /proc/mounts ; then - mount-usb "$CONFIG_USB_BOOT_DEV" \ + mount_usb || die "Unable to mount /media" + diff --git a/initrd/etc/functions b/initrd/etc/functions -index 0c7e950..d8f4e33 100755 +index dc0fbed..00afcdb 100755 --- a/initrd/etc/functions +++ b/initrd/etc/functions -@@ -116,6 +116,18 @@ enable_usb() +@@ -122,6 +122,18 @@ enable_usb() || die "xhci_pci: module load failed" sleep 2 fi diff --git a/scripts/apt-install b/scripts/apt-install index 49b5da4..1e0cee3 100755 --- a/scripts/apt-install +++ b/scripts/apt-install @@ -1,10 +1,27 @@ #!/usr/bin/env bash set -e; +# Get latest apt-transport-https and ca-certificates for safer https apt apt-get update -until apt-get install -y $(cat /etc/apt/packages.list); do +apt-get install -y apt-transport-https ca-certificates + +mv /etc/apt/sources.list{.new,} +mv /etc/apt/packages.list{.new,} +apt-get update +until apt-get install --download-only --reinstall -y $(cat /etc/apt/packages.list); do echo "apt install failed. Likely throttled. Retrying in 10 mins..."; sleep 600; done; -rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; +( + cd /var/cache/apt/archives \ + && find . -type f \( -iname \*.deb \) -exec sha256sum {} \; \ + | sed 's/.\///g' \ + | LC_ALL=C sort +) > /etc/apt/package-hashes-compare.txt + +diff /etc/apt/package-hashes{,-compare}.txt + +apt-get install -y $(cat /etc/apt/packages.list) + +rm -rf /var/ache/apt/archives/* /var/lib/apt/lists/* /tmp/* /var/tmp/*; diff --git a/scripts/audit b/scripts/audit index 27205bf..e0aaaa6 100755 --- a/scripts/audit +++ b/scripts/audit @@ -49,11 +49,6 @@ target_os_source_cves=$( \ ) echo "done" -printf "Generating NIST CPE definitions... " -( cd ${buildroot_dir} && make cpe-info > /dev/null 2>&1 ) -cp ${buildroot_dir}/output/cpe-manifest.csv ${audit_dir}/cpe-manifest.csv -echo "done" - printf "Generating license usage reports... " ( cd ${buildroot_dir} && make legal-info > /dev/null 2>&1 ) cp -R ${buildroot_dir}/output/legal-info ${audit_dir}/legal-info @@ -64,7 +59,6 @@ echo "Wrote: build/audit/os_src_hashes.txt" echo "Wrote: build/audit/fw_src_hashes.txt" echo "Wrote: build/audit/all_hashes.txt" echo "Wrote: build/audit/pkg-stats.json" -echo "Wrote: build/audit/cpe-manifest.cve" echo "Wrote: build/audit/legal-info" echo "------------------------------------------------" echo "Build container package CVEs: ${container_package_cves}" diff --git a/scripts/fetch b/scripts/fetch index 93c7a06..9f58e2b 100755 --- a/scripts/fetch +++ b/scripts/fetch @@ -26,6 +26,11 @@ mkdir -p "$build_dir" cd $buildroot_dir; git checkout "$buildroot_ref"; git reset --hard; + git tag airgap || : + current_ref="$(git rev-parse --verify HEAD)" + [ "$current_ref" == "$buildroot_ref" ] || { + echo "Error: $buildroot_ref was not successfully checked out"; exit 1; + } if [ "$(ls -A "${buildroot_external}/patches")" ]; then for patch in "${buildroot_external}"/patches/*; do echo "Applying patch: ${patch}"; @@ -42,6 +47,11 @@ mkdir -p "$build_dir" cd "$heads_dir"; git checkout "$heads_ref"; git reset --hard; + git tag airgap || : + current_ref="$(git rev-parse --verify HEAD)" + [ "$current_ref" == "$heads_ref" ] || { + echo "Error: $heads_ref was not successfully checked out"; exit 1; + } if [ "$(ls -A "${heads_external}/patches")" ]; then for patch in "${heads_external}"/patches/*; do echo "Applying patch: ${patch}"; diff --git a/scripts/host-env b/scripts/host-env new file mode 100755 index 0000000..ec7ca98 --- /dev/null +++ b/scripts/host-env @@ -0,0 +1,20 @@ +#!/bin/bash +set -e + +uid=${UID?} +gid=${GID?} +user=${USER:-"build"} +export HOME="/home/${user}" + +groupadd -g "$gid" "${user}" +useradd \ + -g "$gid" \ + -u "$uid" \ + -md "/home/${user}" \ + -s /bin/bash \ + "${user}" + +mkdir -p "$HOME" +chown -R "$uid:$gid" "$HOME" +cd "$HOME" +setpriv --reuid="$uid" --regid="$gid" --init-groups "$@" diff --git a/scripts/update-packages b/scripts/update-packages index 3cf74a1..970fd61 100755 --- a/scripts/update-packages +++ b/scripts/update-packages @@ -5,18 +5,29 @@ set -e cat /etc/apt/packages-old.list | sed 's/=.*//g' \ > /etc/apt/packages.list +apt-get update +apt-get install -y --download-only $(cat /etc/apt/packages.list) + snapshot_date=$(date -d @${GIT_EPOCH} +"%Y%m%dT000000Z") cat <<-EOF > /etc/apt/sources.list -deb http://deb.debian.org/debian buster main -deb http://snapshot.debian.org/archive/debian/${snapshot_date} buster main -deb http://security.debian.org/debian-security buster/updates main -deb http://snapshot.debian.org/archive/debian-security/${snapshot_date} buster/updates main -deb http://deb.debian.org/debian buster-updates main -deb http://snapshot.debian.org/archive/debian/${snapshot_date} buster-updates main +deb https://deb.debian.org/debian buster main +deb https://snapshot.debian.org/archive/debian/${snapshot_date} buster main +deb https://security.debian.org/debian-security buster/updates main +deb https://snapshot.debian.org/archive/debian-security/${snapshot_date} buster/updates main +deb https://deb.debian.org/debian buster-updates main +deb https://snapshot.debian.org/archive/debian/${snapshot_date} buster-updates main EOF -set -e; +( + cd /var/cache/apt/archives \ + && find . -type f \( -iname \*.deb \) -exec sha256sum {} \; \ + | sed 's/.\///g' \ + | LC_ALL=C sort +) > /etc/apt/package-hashes.txt -apt-install - -dpkg -l | awk '{ if ($1 == "ii") print $2 "=" $3 }' > /etc/apt/packages.list +cp /dev/null /etc/apt/packages.list +for deb in /var/cache/apt/archives/*.deb; do + package=$(dpkg-deb -f $deb Package); + version=$(dpkg --info ${deb} | grep "^ Version: " | sed 's/^ Version: //g'); + echo "${package}=${version}" >> /etc/apt/packages.list; +done