From owner-svn-ports-branches@freebsd.org Sun Jan 6 09:37:38 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38CF514822EC; Sun, 6 Jan 2019 09:37:38 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A80686C143; Sun, 6 Jan 2019 09:37:37 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80DDD26613; Sun, 6 Jan 2019 09:37:37 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x069bbop011844; Sun, 6 Jan 2019 09:37:37 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x069bbER011842; Sun, 6 Jan 2019 09:37:37 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201901060937.x069bbER011842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sun, 6 Jan 2019 09:37:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489451 - in branches/2019Q1/x11/libinput: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2019Q1/x11/libinput: . files X-SVN-Commit-Revision: 489451 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A80686C143 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2019 09:37:38 -0000 Author: zeising Date: Sun Jan 6 09:37:36 2019 New Revision: 489451 URL: https://svnweb.freebsd.org/changeset/ports/489451 Log: MFH: r489372 x11/libinput: Fix crash when listing devices Fix a crash in x11/libinput when listing devices with libinput list-devices. This is done by removing an old patch previously used to work arond permission issues with /dev/input/* PR: 234638 Reported by: Jan Beich Fix from: Greg V Reviewed by: Greg V Approved by: ports-secteam (miwi) Modified: branches/2019Q1/x11/libinput/Makefile branches/2019Q1/x11/libinput/files/patch-src_evdev.c Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/x11/libinput/Makefile ============================================================================== --- branches/2019Q1/x11/libinput/Makefile Sun Jan 6 09:30:25 2019 (r489450) +++ branches/2019Q1/x11/libinput/Makefile Sun Jan 6 09:37:36 2019 (r489451) @@ -2,6 +2,7 @@ PORTNAME= libinput PORTVERSION= 1.11.3 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ Modified: branches/2019Q1/x11/libinput/files/patch-src_evdev.c ============================================================================== --- branches/2019Q1/x11/libinput/files/patch-src_evdev.c Sun Jan 6 09:30:25 2019 (r489450) +++ branches/2019Q1/x11/libinput/files/patch-src_evdev.c Sun Jan 6 09:37:36 2019 (r489451) @@ -35,53 +35,3 @@ so we just use them instead of the original (enumerate device->source = NULL; } } -@@ -1785,9 +1796,9 @@ evdev_notify_added_device(struct evdev_device *device) - } - - static bool --evdev_device_have_same_syspath(struct udev_device *udev_device, int fd) -+evdev_device_have_same_syspath(struct udev_device **udev_device, int fd, bool reopen) - { -- struct udev *udev = udev_device_get_udev(udev_device); -+ struct udev *udev = udev_device_get_udev(*udev_device); - struct udev_device *udev_device_new = NULL; - struct stat st; - bool rc = false; -@@ -1800,10 +1811,16 @@ evdev_device_have_same_syspath(struct udev_device *ude - goto out; - - rc = streq(udev_device_get_syspath(udev_device_new), -- udev_device_get_syspath(udev_device)); -+ udev_device_get_syspath(*udev_device)); - out: -- if (udev_device_new) -- udev_device_unref(udev_device_new); -+ if (udev_device_new) { -+ if (reopen) { -+ udev_device_unref(*udev_device); -+ *udev_device = udev_device_new; -+ } else { -+ udev_device_unref(udev_device_new); -+ } -+ } - return rc; - } - -@@ -2003,7 +2020,7 @@ evdev_device_create(struct libinput_seat *seat, - return NULL; - } - -- if (!evdev_device_have_same_syspath(udev_device, fd)) -+ if (!evdev_device_have_same_syspath(&udev_device, fd, true)) - goto err; - - device = zalloc(sizeof *device); -@@ -2559,7 +2576,7 @@ evdev_device_resume(struct evdev_device *device) - if (fd < 0) - return -errno; - -- if (!evdev_device_have_same_syspath(device->udev_device, fd)) { -+ if (!evdev_device_have_same_syspath(&device->udev_device, fd, false)) { - close_restricted(libinput, fd); - return -ENODEV; - }