[Midnightbsd-cvs] mports [24078] trunk/x11-servers/xorg-server/files: remove sole old files.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 2 17:38:35 EDT 2018


Revision: 24078
          http://svnweb.midnightbsd.org/mports/?rev=24078
Author:   laffer1
Date:     2018-09-02 17:38:34 -0400 (Sun, 02 Sep 2018)
Log Message:
-----------
remove sole old files.

Modified Paths:
--------------
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c

Added Paths:
-----------
    trunk/x11-servers/xorg-server/files/patch-configure
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c

Removed Paths:
-------------
    trunk/x11-servers/xorg-server/files/extra-arch-i386
    trunk/x11-servers/xorg-server/files/extra-arch-ia64
    trunk/x11-servers/xorg-server/files/extra-arch-powerpc
    trunk/x11-servers/xorg-server/files/extra-arch-sparc64
    trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4
    trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4
    trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c
    trunk/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c

Deleted: trunk/x11-servers/xorg-server/files/extra-arch-i386
===================================================================
--- trunk/x11-servers/xorg-server/files/extra-arch-i386	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/extra-arch-i386	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,11 +0,0 @@
---- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
-+++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
-@@ -1335,7 +1335,7 @@
- 
- #if !defined(__SUNPRO_C)
- #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
--#ifdef GCCUSESGAS
-+#if defined(GCCUSESGAS) || defined(__clang__)
- 
- /*
-  * If gcc uses gas rather than the native assembler, the syntax of these

Deleted: trunk/x11-servers/xorg-server/files/extra-arch-ia64
===================================================================
--- trunk/x11-servers/xorg-server/files/extra-arch-ia64	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/extra-arch-ia64	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,221 +0,0 @@
---- configure.dist	2009-06-18 17:05:59.000000000 -0700
-+++ configure	2009-06-18 17:08:47.000000000 -0700
-@@ -1097,6 +1097,8 @@
- SPARC64_VIDEO_TRUE
- PPC_VIDEO_FALSE
- PPC_VIDEO_TRUE
-+IA64_VIDEO_FALSE
-+IA64_VIDEO_TRUE
- I386_VIDEO_FALSE
- I386_VIDEO_TRUE
- ARM_VIDEO_FALSE
-@@ -19134,6 +19136,7 @@
- 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- 	;;
-   ia64*)
-+	IA64_VIDEO=yes
-   	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- 	;;
-   s390*)
-@@ -19166,6 +19169,14 @@
-   I386_VIDEO_FALSE=
- fi
- 
-+ if test "x$IA64_VIDEO" = xyes; then
-+  IA64_VIDEO_TRUE=
-+  IA64_VIDEO_FALSE='#'
-+else
-+  IA64_VIDEO_TRUE='#'
-+  IA64_VIDEO_FALSE=
-+fi
-+
-  if test "x$PPC_VIDEO" = xyes; then
-   PPC_VIDEO_TRUE=
-   PPC_VIDEO_FALSE='#'
---- hw/xfree86/common/compiler.h.orig	2011-06-11 18:55:47.000000000 +0200
-+++ hw/xfree86/common/compiler.h	2011-07-21 20:34:44.000000000 +0200
-@@ -397,12 +397,10 @@
- #include <machine/pio.h>
- #endif /* __NetBSD__ */
- 
--#   elif defined(linux) && defined(__ia64__) 
-+#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__ia64__) 
-  
- #    include <inttypes.h>
- 
--#    include <sys/io.h>
--
- #    undef outb
- #    undef outw
- #    undef outl
---- hw/xfree86/os-support/bsd/Makefile.in.dist	2009-06-18 17:45:13.000000000 -0700
-+++ hw/xfree86/os-support/bsd/Makefile.in	2009-06-18 17:45:19.000000000 -0700
-@@ -63,6 +63,7 @@
- @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE at am__objects_1 = sparc64_video.lo \
- @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
- @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE at am__objects_1 = ppc_video.lo
-+ at IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
- @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE at am__objects_1 = i386_video.lo
- @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE at am__objects_1 = arm_video.lo
- @ALPHA_VIDEO_TRUE at am__objects_1 = alpha_video.lo bsd_ev56.lo \
-@@ -393,6 +394,7 @@
- 
- @ARM_VIDEO_TRUE at ARCH_SOURCES = arm_video.c
- @I386_VIDEO_TRUE at ARCH_SOURCES = i386_video.c
-+ at IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
- @PPC_VIDEO_TRUE at ARCH_SOURCES = ppc_video.c
- 
- # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
---- /dev/null	2009-06-18 18:27:23.000000000 -0700
-+++ hw/xfree86/os-support/bsd/ia64_video.c	2009-06-18 18:26:02.000000000 -0700
-@@ -0,0 +1,150 @@
-+#ifdef HAVE_XORG_CONFIG_H
-+#include <xorg-config.h>
-+#endif
-+
-+#include <X11/X.h>
-+#include "xf86.h"
-+#include "xf86Priv.h"
-+
-+#include "xf86_OSlib.h"
-+#include "xf86OSpriv.h"
-+
-+#include "bus/Pci.h"
-+
-+#ifndef MAP_FAILED
-+#define MAP_FAILED ((caddr_t)-1)
-+#endif
-+
-+
-+/***************************************************************************/
-+/* Video Memory Mapping section                                            */
-+/***************************************************************************/
-+
-+#define DEV_MEM "/dev/mem"
-+
-+static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
-+static void ia64UnmapVidMem(int, pointer, unsigned long);
-+
-+Bool xf86EnableIO(void);
-+void xf86DisableIO(void);
-+
-+void
-+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-+{
-+	pVidMem->linearSupported = TRUE;
-+	pVidMem->mapMem = ia64MapVidMem;
-+	pVidMem->unmapMem = ia64UnmapVidMem;
-+	pVidMem->initialised = TRUE;
-+	xf86EnableIO();
-+}
-+
-+
-+_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
-+
-+static pointer
-+ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-+{
-+	int fd = xf86Info.screenFd;
-+	pointer base;
-+#ifdef DEBUG
-+	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", 
-+		    Base, Size, fd);
-+#endif
-+
-+	base = mmap(0, Size,
-+		    (flags & VIDMEM_READONLY) ?
-+		     PROT_READ : (PROT_READ | PROT_WRITE),
-+		    MAP_SHARED, fd, Base);
-+	if (base == MAP_FAILED)
-+		FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
-+			   "xf86MapVidMem", Size, Base, strerror(errno));
-+
-+	return base;
-+}
-+
-+static void
-+ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-+{
-+	munmap(Base, Size);
-+}
-+
-+_X_EXPORT int
-+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-+	     int Len)
-+{
-+	int rv;
-+	static int kmem = -1;
-+
-+	if (kmem == -1) {
-+		kmem = open(DEV_MEM, 2);
-+		if (kmem == -1) {
-+			FatalError("xf86ReadBIOS: open %s", DEV_MEM);
-+		}
-+	}
-+
-+#ifdef DEBUG
-+	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", 
-+		    Base, Offset, Len);
-+#endif
-+
-+
-+	lseek(kmem, Base + Offset, 0);
-+	rv = read(kmem, Buf, Len);
-+
-+	return rv;
-+}
-+
-+Bool xf86EnableIO()
-+{
-+        int fd = xf86Info.screenFd;
-+
-+        xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
-+        if (ioBase == MAP_FAILED)
-+        {
-+                ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
-+                    0);
-+                xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
-+                if (ioBase == MAP_FAILED) {
-+                        xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
-+			return FALSE;
-+		}
-+        }
-+	return TRUE;
-+}
-+
-+void xf86DisableIO()
-+{
-+
-+        if (ioBase != MAP_FAILED)
-+        {
-+                munmap((void *)(uintptr_t)(void *)ioBase, 0x10000);
-+                ioBase = MAP_FAILED;
-+        }
-+}
-+
-+void outb(unsigned long port, unsigned char val)
-+{
-+}
-+
-+void outw(unsigned long port, unsigned short val)
-+{
-+}
-+
-+void outl(unsigned long port, unsigned int val)
-+{
-+}
-+
-+unsigned int inb(unsigned long port)
-+{
-+	return 0xff;
-+}
-+
-+unsigned int inw(unsigned long port)
-+{
-+	return 0xffff;
-+}
-+
-+unsigned int inl(unsigned long port)
-+{
-+	return 0xffffffff;
-+}

Deleted: trunk/x11-servers/xorg-server/files/extra-arch-powerpc
===================================================================
--- trunk/x11-servers/xorg-server/files/extra-arch-powerpc	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/extra-arch-powerpc	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,70 +0,0 @@
---- hw/xfree86/os-support/bsd/ppc_video.c.orig	2014-07-22 07:52:58.000000000 -0700
-+++ hw/xfree86/os-support/bsd/ppc_video.c	2014-07-22 08:00:21.000000000 -0700
-@@ -44,6 +44,8 @@
- #define DEV_MEM "/dev/xf86"
- #endif
- 
-+static int kmem = -1;
-+
- static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags);
- static void ppcUnmapVidMem(int, pointer, unsigned long);
- 
-@@ -68,6 +70,17 @@
-     int fd = xf86Info.consoleFd;
-     pointer base;
- 
-+#ifdef __FreeBSD__
-+    if (kmem == -1) {
-+        kmem = open(DEV_MEM, 2);
-+        if (kmem == -1) {
-+            FatalError("mapVidMem: open %s", DEV_MEM);
-+        }
-+    }
-+
-+    fd = kmem;
-+#endif
-+
- #ifdef DEBUG
-     xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
- #endif
-@@ -93,7 +106,6 @@
-              int Len)
- {
-     int rv;
--    static int kmem = -1;
- 
-     if (kmem == -1) {
-         kmem = open(DEV_MEM, 2);
-@@ -118,6 +130,8 @@
-     int fd = xf86Info.consoleFd;
- 
-     xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
-+
-+#ifndef __FreeBSD__
-     if (ioBase == MAP_FAILED) {
-         ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-                       0xf2000000);
-@@ -127,6 +141,12 @@
-             return FALSE;
-         }
-     }
-+#endif
-+   /*
-+    * Note that outl() etc. check for ioBase == MAP_FAILED, so leaving it that
-+    * way (e.g. on FreeBSD) is non-fatal.
-+    */
-+
-     return TRUE;
- }
- 
-@@ -134,8 +154,10 @@
- xf86DisableIO()
- {
- 
-+#ifndef __FreeBSD__
-     if (ioBase != MAP_FAILED) {
-         munmap(__UNVOLATILE(ioBase), 0x10000);
-         ioBase = MAP_FAILED;
-     }
-+#endif
- }

Deleted: trunk/x11-servers/xorg-server/files/extra-arch-sparc64
===================================================================
--- trunk/x11-servers/xorg-server/files/extra-arch-sparc64	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/extra-arch-sparc64	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,12 +0,0 @@
---- hw/xfree86/os-support/bsd/bsd_init.c.orig	2012-05-17 19:09:03.000000000 +0200
-+++ hw/xfree86/os-support/bsd/bsd_init.c	2013-09-01 20:45:36.000000000 +0200
-@@ -230,6 +230,9 @@
-              * Add cases for other *BSD that behave the same.
-              */
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__sparc64__)
-+	    pci_system_init_dev_mem(fd);
-+#endif
-             uname(&uts);
-             i = atof(uts.release) * 100;
-             if (i >= 310)

Deleted: trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,37 +0,0 @@
-From eeae42d60bf3d5663ea088581f6c28a82cd17829 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at oracle.com>
-Date: Wed, 22 Jan 2014 21:11:16 -0800
-Subject: [PATCH 01/40] dix: integer overflow in ProcPutImage() [CVE-2014-8092
- 1/4]
-
-ProcPutImage() calculates a length field from a width, left pad and depth
-specified by the client (if the specified format is XYPixmap).
-
-The calculations for the total amount of memory the server needs for the
-pixmap can overflow a 32-bit number, causing out-of-bounds memory writes
-on 32-bit systems (since the length is stored in a long int variable).
-
-Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
-Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- dix/dispatch.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index d844a09..55b978d 100644
---- dix/dispatch.c
-+++ dix/dispatch.c
-@@ -2000,6 +2000,9 @@ ProcPutImage(ClientPtr client)
-     tmpImage = (char *) &stuff[1];
-     lengthProto = length;
- 
-+    if (lengthProto >= (INT32_MAX / stuff->height))
-+        return BadLength;
-+
-     if ((bytes_to_int32(lengthProto * stuff->height) +
-          bytes_to_int32(sizeof(xPutImageReq))) != client->req_len)
-         return BadLength;
--- 
-2.1.2
-

Deleted: trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,49 +0,0 @@
-From bc8e20430b6f6378daf6ce4329029248a88af08b Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at oracle.com>
-Date: Mon, 6 Jan 2014 23:30:14 -0800
-Subject: [PATCH 02/40] dix: integer overflow in GetHosts() [CVE-2014-8092 2/4]
-
-GetHosts() iterates over all the hosts it has in memory, and copies
-them to a buffer. The buffer length is calculated by iterating over
-all the hosts and adding up all of their combined length. There is a
-potential integer overflow, if there are lots and lots of hosts (with
-a combined length of > ~4 gig). This should be possible by repeatedly
-calling ProcChangeHosts() on 64bit machines with enough memory.
-
-This patch caps the list at 1mb, because multi-megabyte hostname
-lists for X access control are insane.
-
-Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
-Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- os/access.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/os/access.c b/os/access.c
-index 5c510de..f393c8d 100644
---- os/access.c
-+++ os/access.c
-@@ -1296,6 +1296,10 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
-     for (host = validhosts; host; host = host->next) {
-         nHosts++;
-         n += pad_to_int32(host->len) + sizeof(xHostEntry);
-+        /* Could check for INT_MAX, but in reality having more than 1mb of
-+           hostnames in the access list is ridiculous */
-+        if (n >= 1048576)
-+            break;
-     }
-     if (n) {
-         *data = ptr = malloc(n);
-@@ -1304,6 +1308,8 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
-         }
-         for (host = validhosts; host; host = host->next) {
-             len = host->len;
-+            if ((ptr + sizeof(xHostEntry) + len) > (data + n))
-+                break;
-             ((xHostEntry *) ptr)->family = host->family;
-             ((xHostEntry *) ptr)->length = len;
-             ptr += sizeof(xHostEntry);
--- 
-2.1.2
-

Deleted: trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,34 +0,0 @@
-From e0e11644622a589129a01e11e5d105dc74a098de Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at oracle.com>
-Date: Wed, 22 Jan 2014 23:44:46 -0800
-Subject: [PATCH 04/40] dix: integer overflow in REQUEST_FIXED_SIZE()
- [CVE-2014-8092 4/4]
-
-Force use of 64-bit integers when evaluating data provided by clients
-in 32-bit fields which can overflow when added or multiplied during
-checks.
-
-Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
-Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- include/dix.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/dix.h b/include/dix.h
-index 991a3ce..e0c6ed8 100644
---- include/dix.h
-+++ include/dix.h
-@@ -76,7 +76,8 @@ SOFTWARE.
- 
- #define REQUEST_FIXED_SIZE(req, n)\
-     if (((sizeof(req) >> 2) > client->req_len) || \
--        (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \
-+        ((n >> 2) >= client->req_len) || \
-+        ((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len))  \
-          return(BadLength)
- 
- #define LEGAL_NEW_RESOURCE(id,client)\
--- 
-2.1.2
-

Added: trunk/x11-servers/xorg-server/files/patch-configure
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-configure	                        (rev 0)
+++ trunk/x11-servers/xorg-server/files/patch-configure	2018-09-02 21:38:34 UTC (rev 24078)
@@ -0,0 +1,27 @@
+--- configure.orig	2016-07-19 17:27:31 UTC
++++ configure
+@@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
+ 	esac
+ 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
+ 	;;
+-  arm*)
++  arm*|aarch64*)
+ 	ARM_VIDEO=yes
+ 	DEFAULT_INT10="stub"
++	case $host_os in
++		*freebsd*)
++			$as_echo "#define USE_DEV_IO 1" >>confdefs.h
++		 ;;
++	esac
+ 	;;
+   i*86)
+ 	I386_VIDEO=yes
+@@ -26057,7 +26062,7 @@ fi
+ case "x$XTRANS_SEND_FDS" in
+ xauto)
+ 	case "$host_os" in
+-	linux*|solaris*)
++	linux*|solaris*|freebsd*|dragonfly*|openbsd*)
+ 		XTRANS_SEND_FDS=yes
+ 		;;
+ 	*)


Property changes on: trunk/x11-servers/xorg-server/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,6 +1,6 @@
---- hw/xfree86/common/xf86Config.c.orig	2014-04-15 01:01:57 UTC
+--- hw/xfree86/common/xf86Config.c.orig	2016-07-19 17:14:30 UTC
 +++ hw/xfree86/common/xf86Config.c
-@@ -1376,13 +1376,16 @@ checkCoreInputDevices(serverLayoutPtr se
+@@ -1410,13 +1410,16 @@ checkCoreInputDevices(serverLayoutPtr se
      }
  
      if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {

Modified: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,7 +1,7 @@
---- hw/xfree86/common/xf86Globals.c.orig	2014-04-12 15:29:14 UTC
+--- hw/xfree86/common/xf86Globals.c.orig	2016-07-19 17:07:29 UTC
 +++ hw/xfree86/common/xf86Globals.c
-@@ -123,7 +123,8 @@ xf86InfoRec xf86Info = {
-     .log = LogNone,
+@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = {
+     .pmFlag = TRUE,
      .disableRandR = FALSE,
      .randRFrom = X_DEFAULT,
 -#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)

Deleted: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,11 +0,0 @@
---- hw/xfree86/loader/loadmod.c.orig	2014-04-12 15:29:14 UTC
-+++ hw/xfree86/loader/loadmod.c
-@@ -490,7 +490,7 @@ LoaderListDirs(const char **subdirlist, 
-     char **elem;
-     const char **subdirs;
-     const char **s;
--    PatternPtr patterns;
-+    PatternPtr patterns = NULL;
-     PatternPtr p;
-     DIR *d;
-     struct dirent *dp;

Deleted: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c	2018-09-02 21:37:41 UTC (rev 24077)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -1,12 +0,0 @@
---- hw/xfree86/modes/xf86Crtc.c.orig	2014-04-15 01:01:57 UTC
-+++ hw/xfree86/modes/xf86Crtc.c
-@@ -1774,6 +1774,9 @@ SetCompatOutput(xf86CrtcConfigPtr config
-     DisplayModePtr maxmode = NULL, testmode, mode;
-     int o, compat = -1, count, mincount = 0;
- 
-+    if (config->num_output == 0)
-+        return NULL;
-+
-     /* Look for one that's definitely connected */
-     for (o = 0; o < config->num_output; o++) {
-         test = config->output[o];

Added: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c	                        (rev 0)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -0,0 +1,12 @@
+--- hw/xfree86/os-support/bsd/bsd_init.c.orig	2016-07-19 17:07:29 UTC
++++ hw/xfree86/os-support/bsd/bsd_init.c
+@@ -230,6 +230,9 @@ xf86OpenConsole()
+              * Add cases for other *BSD that behave the same.
+              */
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__sparc64__)
++	    pci_system_init_dev_mem(fd);
++#endif
+             uname(&uts);
+             i = atof(uts.release) * 100;
+             if (i >= 310)


Property changes on: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c	                        (rev 0)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -0,0 +1,11 @@
+Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+--- hw/xfree86/os-support/bsd/i386_video.c.orig	2016-07-15 16:18:11 UTC
++++ hw/xfree86/os-support/bsd/i386_video.c
+@@ -32,6 +32,7 @@
+ #include "xf86Priv.h"
+ 
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ 
+ #include "xf86_OSlib.h"


Property changes on: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c	                        (rev 0)
+++ trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c	2018-09-02 21:38:34 UTC (rev 24078)
@@ -0,0 +1,14 @@
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2016-07-15 16:18:11 UTC
++++ hw/xfree86/os-support/bsd/ppc_video.c
+@@ -79,7 +79,11 @@ xf86DisableIO()
+ {
+ 
+     if (ioBase != MAP_FAILED) {
++#if defined(__FreeBSD__)
++        munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
++#else
+         munmap(__UNVOLATILE(ioBase), 0x10000);
++#endif
+         ioBase = MAP_FAILED;
+     }
+ }


Property changes on: trunk/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list