From 373d8e3dcb62f76a5c2b3608251529c608b98b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=81LI=20G=C3=A1bor=20J=C3=A1nos?= Date: Sat, 25 Jun 2022 23:04:28 +0200 Subject: Move to Linux 5.15.49 + Alpine 3.16.0. --- aports/busybox/APKBUILD | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) (limited to 'aports/busybox/APKBUILD') diff --git a/aports/busybox/APKBUILD b/aports/busybox/APKBUILD index 40b1d3f..ec0d3fb 100644 --- a/aports/busybox/APKBUILD +++ b/aports/busybox/APKBUILD @@ -1,13 +1,16 @@ # Maintainer: Gabor Pali pkgname=busybox -pkgver=1.34.1 -pkgrel=5 +pkgver=1.35.0 +pkgrel=0 # base: 14, -initscripts: 4.1-r1 pkgdesc="Size optimized toolbox of many common UNIX utilities" url="https://busybox.net/" arch="all" license="GPL-2.0-only" makedepends_build="perl" -makedepends_host="linux-headers openssl1.1-compat-dev libretls-dev" +makedepends_host="linux-headers openssl-dev" +# Only build with UTMPS support if we are not bootstrapping. +# skalibs-static is needed for utmps-static +[ -z "$BOOTSTRAP" ] && makedepends_host="$makedepends_host utmps-dev utmps-static skalibs-static" makedepends="$makedepends_build $makedepends_host" checkdepends= provides="/bin/sh" @@ -15,8 +18,6 @@ install= subpackages= options="!check" source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 - 0001-rev-correct-output-for-long-input-lines.patch - 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch 0001-properly-fix-wget-https-support.patch @@ -31,16 +32,17 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 0009-depmod-support-generating-kmod-binary-index-files.patch 0010-Add-flag-for-not-following-symlinks-when-recursing.patch 0012-udhcpc-Don-t-background-if-n-is-given.patch - + 0013-ash-fix-unsafe-use-of-mempcpy.patch + 0014-ash-fix-use-after-free-in-bash-pattern-substitution.patch + 0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch + 0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch + 0017-ash-Fix-use-after-free-on-idx-variable.patch 0001-ash-add-built-in-BB_ASH_VERSION-variable.patch - - 0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch - 0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch - 0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch - + 0001-avoid-redefined-warnings-when-building-with-utmps.patch 0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch 0002-nslookup-sanitize-all-printed-strings-with-printable.patch + 0001-modinfo-add-k-option-for-kernel-version.patch acpid.logrotate config @@ -59,6 +61,9 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 " # secfixes: +# 1.35.0-r7: +# - ALPINE-13661 +# - CVE-2022-28391 # 1.34.1-r5: # - ALPINE-13661 # - CVE-2022-28391 @@ -162,7 +167,8 @@ EOF install -m644 "$srcdir"/$i "$pkgdir"/etc/conf.d/${i%.*} || return 1 done install -m644 mdev.conf "$pkgdir"/etc - install -m755 persistent-storage "$pkgdir"/lib/mdev/ + install -m755 persistent-storage \ + "$pkgdir"/lib/mdev/ # poweroff script for acpid cat >"$pkgdir"/etc/acpi/PWRF/00000080 <