[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server modular-xorg-server: don't req...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24c9cf3f67ad
branches:  trunk
changeset: 386679:24c9cf3f67ad
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri Oct 26 10:20:12 2018 +0000

description:
modular-xorg-server: don't require root. match wsfb (for genfb).

bump PKGREVISION

diffstat:

 x11/modular-xorg-server/Makefile                                            |   3 +-
 x11/modular-xorg-server/distinfo                                            |   4 +-
 x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c    |  17 ++++++++
 x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c |  19 ++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diffs (79 lines):

diff -r 3b16b83e121f -r 24c9cf3f67ad x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Fri Oct 26 10:18:58 2018 +0000
+++ b/x11/modular-xorg-server/Makefile  Fri Oct 26 10:20:12 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2018/05/11 13:47:35 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2018/10/26 10:20:12 maya Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org
diff -r 3b16b83e121f -r 24c9cf3f67ad x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo  Fri Oct 26 10:18:58 2018 +0000
+++ b/x11/modular-xorg-server/distinfo  Fri Oct 26 10:20:12 2018 +0000
@@ -1,15 +1,17 @@
-$NetBSD: distinfo,v 1.91 2018/10/25 22:40:57 maya Exp $
+$NetBSD: distinfo,v 1.92 2018/10/26 10:20:12 maya Exp $
 
 SHA1 (xorg-server-1.20.3.tar.bz2) = a522cd543606b4d0509d821b8061904951171c50
 RMD160 (xorg-server-1.20.3.tar.bz2) = a57a7e3d0d2e3c84f4743de6890c7d26b502e7a1
 SHA512 (xorg-server-1.20.3.tar.bz2) = ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
 Size (xorg-server-1.20.3.tar.bz2) = 6205000 bytes
 SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
+SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 0fa57d41ca2de306009f7f6256dfab34a11ea7a2
 SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
 SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
+SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
diff -r 3b16b83e121f -r 24c9cf3f67ad x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c  Fri Oct 26 10:20:12 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-hw_xfree86_common_xf86AutoConfig.c,v 1.3 2018/10/26 10:20:12 maya Exp $
+
+Look for wsfb on netbsd (needed by genfb)
+
+--- hw/xfree86/common/xf86AutoConfig.c.orig    2018-10-25 14:13:21.000000000 +0000
++++ hw/xfree86/common/xf86AutoConfig.c
+@@ -313,6 +313,10 @@ listPossibleVideoDrivers(XF86MatchedDriv
+ #elif defined(__sparc__) && !defined(__sun)
+     xf86AddMatchedDriver(md, "sunffb");
+ #endif
++#if defined(__NetBSD__)
++    xf86AddMatchedDriver(md, "wsfb");
++#endif
++
+ }
+ 
+ /* copy a screen section and enter the desired driver
diff -r 3b16b83e121f -r 24c9cf3f67ad x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c       Fri Oct 26 10:20:12 2018 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-hw_xfree86_os-support_bsd_bsd__init.c,v 1.1 2018/10/26 10:20:12 maya Exp $
+
+Don't error when running unprivileged.
+
+--- hw/xfree86/os-support/bsd/bsd_init.c.orig  2018-10-25 14:13:21.000000000 +0000
++++ hw/xfree86/os-support/bsd/bsd_init.c
+@@ -165,10 +165,12 @@ xf86OpenConsole()
+ #endif
+ 
+     if (serverGeneration == 1) {
++#if 0
+         /* check if we are run with euid==0 */
+         if (geteuid() != 0) {
+             FatalError("xf86OpenConsole: Server must be suid root");
+         }
++#endif
+ 
+         if (!KeepTty) {
+             /*