aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-10-06 22:22:20 +0000
committerpsykose <alice@ayaya.dev>2022-10-07 00:22:20 +0200
commitbbd01d418e74f685be746167d9bfe51d6a99ce26 (patch)
tree14402209489cd7407b016917f1e03c3a6b307e6a
parent4d3e7ab12955ef9fecde57da7ec640b1f75017b2 (diff)
main/dbus: upgrade to 1.12.24
-rw-r--r--main/dbus/APKBUILD16
-rw-r--r--main/dbus/avoid-opendir-between-fork-exec.patch18
2 files changed, 10 insertions, 24 deletions
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index c938624b40f..e720cca7378 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
-pkgver=1.12.20
-pkgrel=1
+pkgver=1.12.24
+pkgrel=0
pkgdesc="Freedesktop.org message bus system"
options="!check" # Introduces circular dependency with xorg-server (xvfb-run -> xvfb)
url="https://www.freedesktop.org/Software/dbus"
@@ -23,11 +23,14 @@ checkdepends="xvfb-run"
install="$pkgname.pre-install $pkgname.post-install"
source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
0001-_dbus_generate_random_bytes-use-getrandom-2.patch
- avoid-opendir-between-fork-exec.patch
$pkgname.initd
"
# secfixes:
+# 1.12.24-r0:
+# - CVE-2022-42010
+# - CVE-2022-42011
+# - CVE-2022-42012
# 1.12.18-r0:
# - CVE-2020-12049
# 1.12.16-r0:
@@ -87,7 +90,8 @@ x11() {
mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/
}
-sha512sums="0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz
+sha512sums="
+70e0b7c3f1071860b4243c945d640a1bab95fb83a7cbcf072cdd236def1310693f9bea07d406677d6673c53a6bedbdb02b51fe861aa6f686457dcfb4ee74b703 dbus-1.12.24.tar.gz
3db35499361e84d8e2469b88b033f49813b179188ac25f1841a989988c352af398a56dfd94383813626c6dfd032194f7a9fcdba001ccc3e005e7cd22dae7a7ed 0001-_dbus_generate_random_bytes-use-getrandom-2.patch
-cdd01f51882be4f388515441237aa6318888db6e88a4d980bafbf9b790945e4d959c6633d6d002274c0a617ac919f9355ba628c9b502b355f73fed602f997791 avoid-opendir-between-fork-exec.patch
-4c6beba2382416e60a3adfa85ef843d90d93ca5f38c23f573e058ffca6d4fc3850d11d40938c74383bba61599569b7fdfb1fcf3b9d2f1463e6b2e2cc81097c84 dbus.initd"
+4c6beba2382416e60a3adfa85ef843d90d93ca5f38c23f573e058ffca6d4fc3850d11d40938c74383bba61599569b7fdfb1fcf3b9d2f1463e6b2e2cc81097c84 dbus.initd
+"
diff --git a/main/dbus/avoid-opendir-between-fork-exec.patch b/main/dbus/avoid-opendir-between-fork-exec.patch
deleted file mode 100644
index 44b03fbd5b4..00000000000
--- a/main/dbus/avoid-opendir-between-fork-exec.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Rasmus Thomsen <oss@cogitri.dev>
-Upstream: No
-Reason: The code inside the `#ifdef __linux__` calls opendir. This can
-lead to deadlocks when act_on_fds_3_and_up is called between fork&exec since
-opendir mallocs which isn't async signal safe
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index 0288dbc9..e585136f 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -4742,7 +4742,7 @@ act_on_fds_3_and_up (void (*func) (int fd))
- {
- int maxfds, i;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- DIR *d;
-
- /* On Linux we can optimize this a bit if /proc is available. If it