Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
Date: Wed, 07 Feb 2018 12:19:47
Message-Id: 1518005962.e1b6c26ad078a85dc8e15054169176c96406955f.blueness@gentoo
1 commit: e1b6c26ad078a85dc8e15054169176c96406955f
2 Author: stefson <herrtimson <AT> yahoo <DOT> de>
3 AuthorDate: Sun Feb 4 10:34:54 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 7 12:19:22 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e1b6c26a
7
8 x11-base/xorg-server: fix for #646390
9
10 .../files/xorg-server-1.19.6-fix-NULL-value-detection.patch | 13 +++++++++++++
11 x11-base/xorg-server/xorg-server-1.19.6.ebuild | 2 ++
12 2 files changed, 15 insertions(+)
13
14 diff --git a/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
15 new file mode 100644
16 index 0000000..94c319a
17 --- /dev/null
18 +++ b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
19 @@ -0,0 +1,13 @@
20 +diff --git a/config/udev.c b/config/udev.c
21 +index e198e8609..3a73189e2 100644
22 +--- a/config/udev.c
23 ++++ b/config/udev.c
24 +@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
25 + #endif
26 +
27 + value = udev_device_get_property_value(udev_device, "ID_INPUT");
28 +- if (value && !strcmp(value, "0")) {
29 ++ if (!value || !strcmp(value, "0")) {
30 + LogMessageVerb(X_INFO, 10,
31 + "config/udev: ignoring device %s without "
32 + "property ID_INPUT set\n", path);
33
34 diff --git a/x11-base/xorg-server/xorg-server-1.19.6.ebuild b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
35 index 22e4152..6d816a8 100644
36 --- a/x11-base/xorg-server/xorg-server-1.19.6.ebuild
37 +++ b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
38 @@ -146,6 +146,8 @@ PATCHES=(
39 "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
40 "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530
41 "${FILESDIR}"/${PN}-1.17.4-arm-musl.patch
42 + # see https://bugs.gentoo.org/646390
43 + "${FILESDIR}"/${PN}-1.19.6-fix-NULL-value-detection.patch
44 )
45
46 pkg_pretend() {