diff options
| author | PÁLI Gábor János <pali.gabor@gmail.com> | 2022-07-21 01:29:16 +0200 |
|---|---|---|
| committer | PÁLI Gábor János <pali.gabor@gmail.com> | 2022-07-21 01:29:16 +0200 |
| commit | 74a203337343b8e7615f335146592536aa577bd5 (patch) | |
| tree | 7ab9c558ed28013def39df4158057f9becf352da /aports/busybox | |
| parent | f8fd8cdb1a0e545272917fe1dc1f9544cf74e383 (diff) | |
| download | freebsd-wifibox-alpine-74a203337343b8e7615f335146592536aa577bd5.zip | |
busybox: import changes from upstream (without tests)
References:
- https://git.alpinelinux.org/aports/commit/main/busybox?h=3.16-stable&id=e58f0e341603e9facc1e675722367174b45e0d0c
- https://git.alpinelinux.org/aports/commit/main/busybox?h=3.16-stable&id=19218bdfa3f0798fad9a878789336099e038151f
- https://git.alpinelinux.org/aports/commit/main/busybox-initscripts?h=3.16-stable&id=5df3afdec03f10e706c10fd2653a51aa39eae601
- https://git.alpinelinux.org/aports/commit/main/busybox-initscripts?h=3.16-stable&id=0ce8430810dd7ae8917b4e17cb67d8ed6b4cd41d
Diffstat (limited to 'aports/busybox')
| -rw-r--r-- | aports/busybox/APKBUILD | 8 | ||||
| -rw-r--r-- | aports/busybox/persistent-storage | 27 |
2 files changed, 27 insertions, 8 deletions
diff --git a/aports/busybox/APKBUILD b/aports/busybox/APKBUILD index ec0d3fb..8539a51 100644 --- a/aports/busybox/APKBUILD +++ b/aports/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Gabor Pali <pali.gabor@gmail.com> pkgname=busybox pkgver=1.35.0 -pkgrel=0 # base: 14, -initscripts: 4.1-r1 +pkgrel=1 # base: 15, -initscripts: 4.2-r0 pkgdesc="Size optimized toolbox of many common UNIX utilities" url="https://busybox.net/" arch="all" @@ -43,6 +43,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 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 + CVE-2022-30065.patch acpid.logrotate config @@ -61,6 +62,8 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 " # secfixes: +# 1.35.0-r15: +# - CVE-2022-30065 # 1.35.0-r7: # - ALPINE-13661 # - CVE-2022-28391 @@ -205,6 +208,7 @@ e33dbc27d77c4636f4852d5d5216ef60a9a4343484e4559e391c13c813bf65c782b889914eff2e1f b52050678e79e4da856956906d07fcb620cbf35f2ef6b5a8ee3b8d244ea63b4b98eef505451184d5b4937740d91eef154ed748c30d329ac485be51b37626f251 0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch ead4ad65d270d8659e1898fa16f76b6cbcf567d8aba238eacccda3764edb4362240d9359d6389873bedc126d405f805fc6dfce653a7181618ebcc67c94bd08d2 0002-nslookup-sanitize-all-printed-strings-with-printable.patch 4f6ddd59d6096943f617b0938fca428114190b8b37732d6783faab291451a2c30c452ed39299db22d1d9679d007022f87d43e93b38a4f6ced64a8659e9233773 0001-modinfo-add-k-option-for-kernel-version.patch +22e2fa8f7a6105fd9990f93b71c235980fd4eab62269939a0e3a920fe517ee4f913c6bd0148a554b67fe01d1660bf0fd76a80e9dcac290b4b8b2c304ef6080a9 CVE-2022-30065.patch aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate 0b92eafab0722a6c9cc4880e3be4976de9713e1e1c715c6c727a948cbd68268fce01ce308291834f70d0cf3328f7c8a44cbdb5b7c70d90f91b15efcb5b90acb3 config c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script @@ -216,5 +220,5 @@ acfd45bda4526ab551a30faec1742ad1569aa85e0d315959c3e3a3d6a693f94c74efeb57a00b8791 34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5 crond.confd bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c syslog.confd 634fa067629febcdd8ba9516fbaafddd5be2d38ac37bff9eccfacce0fcf3b259426c12ff967b179bd93b2962401a4a2f15709d32da0623bd078688b8611817cd mdev.conf -0f54666072a8ee32965cc1b5205a6d35bc2ba6655f298c37ba9ccd72949fa7c41b1e540ec91f41b11f4b261ace614cdcc42dccf390bf0a22698d0ba499feae39 persistent-storage +2873ec2ba41fe96b010b14fe3fc87d347b71eb6079c12e05ac72eac6c7f146e25096c0b29b2b9d69cbe6840e16dbf4a93ee81132de9fac497e41ab5e8bce2243 persistent-storage " diff --git a/aports/busybox/persistent-storage b/aports/busybox/persistent-storage index ea68948..4b821bc 100644 --- a/aports/busybox/persistent-storage +++ b/aports/busybox/persistent-storage @@ -7,10 +7,12 @@ symlink_action() { esac } +: ${SYSFS:=/sys} + # cdrom symlink case "$MDEV" in sr*|xvd*) - caps="$(cat /sys/block/$MDEV/capability 2>/dev/null)" + caps="$(cat $SYSFS/block/$MDEV/capability 2>/dev/null)" if [ $(( 0x${caps:-0} & 8 )) -gt 0 ]; then symlink_action $MDEV cdrom fi @@ -19,13 +21,13 @@ esac # by-id symlinks mkdir -p disk/by-id -partition=$(cat /sys/class/block/$MDEV/partition 2>/dev/null) +partition=$(cat $SYSFS/class/block/$MDEV/partition 2>/dev/null) case "$partition" in [0-9]*) partsuffix="-part$partition";; esac -wwid=$(cat /sys/class/block/$MDEV/wwid 2>/dev/null) -: ${wwid:=$(cat /sys/class/block/$MDEV/device/wwid 2>/dev/null)} +wwid=$(cat $SYSFS/class/block/$MDEV/wwid 2>/dev/null) +: ${wwid:=$(cat $SYSFS/class/block/$MDEV/device/wwid 2>/dev/null)} if [ -n "$wwid" ]; then case "$MDEV" in @@ -37,10 +39,10 @@ if [ -n "$wwid" ]; then fi serial=$(sed -E -e 's/^\s+//' -e 's/\s+$//' -e 's/ /_/g' \ - /sys/class/block/$MDEV/device/serial 2>/dev/null) + $SYSFS/class/block/$MDEV/device/serial 2>/dev/null) model=$(sed -E -e 's/^\s+//' -e 's/\s+$//' -e 's/ /_/g' \ - /sys/class/block/$MDEV/device/model 2>/dev/null) + $SYSFS/class/block/$MDEV/device/model 2>/dev/null) if [ -n "$serial" ] && [ -n "$model" ]; then case "$MDEV" in @@ -66,3 +68,16 @@ if [ -n "$PARTUUID" ]; then symlink_action ../../$MDEV disk/by-partuuid/$PARTUUID fi +# backwards compatibility with /dev/usbdisk for /dev/sd* +if [ "${MDEV#sd}" != "$MDEV" ]; then + sysdev=$(readlink $SYSFS/class/block/$MDEV) + case "$sysdev" in + *usb[0-9]*) + # require vfat for devices without partition + if ! [ -e $SYSFS/block/$MDEV ] || [ TYPE="vfat" ]; then + symlink_action $MDEV usbdisk + fi + ;; + esac +fi + |