MFH: r518909

sysutils/uhidd: improve FreeBSD 12+ support

- Backport -U (forced_attach)
- Mention devmatch_blacklist and UQ_*_IGNORE in pkg-message

PR:		234916
Approved by:	ports-secteam (joneum)

3 files changed, 38 insertions, 4 deletions

diff --git a/sysutils/uhidd/Makefile b/sysutils/uhidd/Makefile
index 2d0b02964745..3f6293277f0e 100644
--- a/sysutils/uhidd/Makefile
+++ b/sysutils/uhidd/Makefile
@@ -4,9 +4,21 @@
 PORTNAME=	uhidd
 PORTVERSION=	0.2.1
 DISTVERSIONPREFIX=	REL-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	3ddfebf75bbb.patch:-p1
+PATCHFILES+=	9c0b5e3255ec.patch:-p1
+PATCHFILES+=	0d05cd7acadd.patch:-p1
+PATCHFILES+=	c040f483add2.patch:-p1
+PATCHFILES+=	d5af7099c1e9.patch:-p1
+PATCHFILES+=	e9e835c93f53.patch:-p1
+PATCHFILES+=	2ed68916f23b.patch:-p1
+PATCHFILES+=	dd1279592b04.patch:-p1
+PATCHFILES+=	498422ccef03.patch:-p1
+PATCHFILES+=	7022ca4d1a1b.patch:-p1
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Userland USB HID device driver using libusb20
 
diff --git a/sysutils/uhidd/distinfo b/sysutils/uhidd/distinfo
index c88f06a106a1..b8feb0720418 100644
--- a/sysutils/uhidd/distinfo
+++ b/sysutils/uhidd/distinfo
@@ -1,2 +1,23 @@
+TIMESTAMP = 1350244424
 SHA256 (kaiwang27-uhidd-REL-0.2.1_GH0.tar.gz) = 5072e75a374c79e538d0d42e4bf40c1cf0e5fd8a85f332787a1a07a24f44420e
 SIZE (kaiwang27-uhidd-REL-0.2.1_GH0.tar.gz) = 59091
+SHA256 (3ddfebf75bbb.patch) = 5d5827a287163e87529d472e3a5ed2a23a8fafe655ad2b2a89ae2543e6b2ea8a
+SIZE (3ddfebf75bbb.patch) = 654
+SHA256 (9c0b5e3255ec.patch) = 410d27a0a718caa99be9af4307174b2f92839b73d83002bff1142f6c51bc7c13
+SIZE (9c0b5e3255ec.patch) = 753
+SHA256 (0d05cd7acadd.patch) = b2d8656c4949877f86da340f997827b4309f5dff8ed6fd4325abe4abcac06016
+SIZE (0d05cd7acadd.patch) = 659
+SHA256 (c040f483add2.patch) = 50d020740ec0e5e8424dd0dfbf7b00d0dab78bc61ddee4e65e97ef11e20f62d8
+SIZE (c040f483add2.patch) = 2677
+SHA256 (d5af7099c1e9.patch) = 77ba630b42b895b2eaab8bcbf4f503716603d24178d73bb228f618522baaaa03
+SIZE (d5af7099c1e9.patch) = 3177
+SHA256 (e9e835c93f53.patch) = bc5fd79473f685f0bc73d20f3f21d6dbd567f84b9c818494d07a806e678c50f5
+SIZE (e9e835c93f53.patch) = 4472
+SHA256 (2ed68916f23b.patch) = b76c33b4497cf10499f563b002e25d7870b51978fbaa9119f01bbd244a6855ea
+SIZE (2ed68916f23b.patch) = 816
+SHA256 (dd1279592b04.patch) = ab6552fedd78fdae51911116e5dec4cbd2d7a3d82025882497a40e5bc42ae2bb
+SIZE (dd1279592b04.patch) = 1610
+SHA256 (498422ccef03.patch) = cfdbb3097b7f1571a36a4ee09dc029d70a7eb9710277b64f6a9f2803304ec976
+SIZE (498422ccef03.patch) = 897
+SHA256 (7022ca4d1a1b.patch) = 657be1c503f7b92920e13f53534f41280d3551b9162c4b47c3ae7cab0a1da8b6
+SIZE (7022ca4d1a1b.patch) = 676
diff --git a/sysutils/uhidd/pkg-message b/sysutils/uhidd/pkg-message
index 5fc70522e42c..0fa66528a0f5 100644
--- a/sysutils/uhidd/pkg-message
+++ b/sysutils/uhidd/pkg-message
@@ -10,9 +10,10 @@ a device, or you should remove some of those entries 'device ums',
 recompile the kernel.
 
 Note that if the USB kernel drivers are compiled as kernel modules,
-you should also remove the relevant devd(8) rules in /etc/devd/usb.conf
-config file, so those modules will not be loaded automatically by devd(8)
-when devices are attached.
+you should also remove the relevant devd(8) rules in /etc/devd/usb.conf,
+adjust devmatch_blacklist in /etc/rc.conf or define UQ_KBD_IGNORE,
+UQ_UMS_IGNORE, UQ_HID_IGNORE via usbconfig(8), so those modules will not
+be loaded automatically by devd(8) when devices are attached.
 
 If you want to run uhidd daemon at the startup, add the following lines to
 /etc/rc.conf: