From ae443bd5b68d24f031d96b1a028eefae52da96ee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 27 May 2015 08:38:11 +0200 Subject: nx-X11/config/cf: Drop unnecessary xf86site.def, xf86.tmpl, xfree86.cf. --- nx-X11/programs/Xserver/include/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 210067635..d68ef940c 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 HEADERS = os.h misc.h -#if defined(XorgVersion) || defined(XFree86Version) \ +#if defined(XorgVersion) \ || defined(BSDOSArchitecture) #if DoLoadableServer LinkSourceFile(xf86Module.h,$(XF86COMSRC)) -- cgit v1.2.3 From 433d8186588698ce6a435fbff5e9d40a37b78be9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Jul 2015 16:16:40 +0200 Subject: Clear header file namespace separation ( vs. ). In the process of building nxagent against more and more system-wide installed X.org libraries, we come to the limit of including structs from this (bundled nx-X11) and that (system-wide X.Org) library. This commit introduces a clear namespace separation of headers provided by nx-X11 and headers provided by X.Org. This approach is only temporary as we want to drop all nx-X11 bundled libraries from nx-libs. However, for a while we need to make this separation clear and also ship some reduced fake X.Org headers that avoid pulling in libX* and libNX_X* symbols at the same time. This patch has been tested on Debian jessie and unstable and requires no overall testing on various distros and distro versions, as we finally will drop all libNX_X* libraries and build against X.org's client libs. For now, this hack eases our development / cleanup process. --- nx-X11/programs/Xserver/include/Imakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index d68ef940c..4c9b169a4 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -63,5 +63,5 @@ InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR)) -BuildIncludes($(HEADERS),X11,..) -InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) +BuildIncludes($(HEADERS),nx-X11,..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) -- cgit v1.2.3 From 6c7f9cdaa72a8189adf9ac26c8f7f3ec6bd10e6f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 28 Oct 2016 00:30:25 +0200 Subject: remove xf86Version.h and xf86Date.h version.def and date.def also will be no longer created --- nx-X11/programs/Xserver/include/Imakefile | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 4c9b169a4..ffe849579 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -15,7 +15,6 @@ LinkSourceFile(xf86Opt.h,$(XF86COMSRC)) #endif LinkSourceFile(xf86_libc.h,$(XF86OSSRC)) LinkSourceFile(xf86_ansic.h,$(XF86OSSRC)) -LinkSourceFile(xf86Version.h,$(XF86SRC)) LinkSourceFile(compiler.h,$(XF86COMSRC)) #endif -- cgit v1.2.3 From 4aeed7ad92ac2d4662c9a1af63c32fe6faa5b2fd Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 28 Oct 2016 01:05:03 +0200 Subject: remove hw/xfree86 altogether This is part one of ArcticaProject/nx-libs#246 --- nx-X11/programs/Xserver/include/Imakefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index ffe849579..0a64fff0c 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -13,9 +13,6 @@ HEADERS = os.h misc.h LinkSourceFile(xf86Module.h,$(XF86COMSRC)) LinkSourceFile(xf86Opt.h,$(XF86COMSRC)) #endif -LinkSourceFile(xf86_libc.h,$(XF86OSSRC)) -LinkSourceFile(xf86_ansic.h,$(XF86OSSRC)) -LinkSourceFile(compiler.h,$(XF86COMSRC)) #endif LinkSourceFile(osdep.h,../os) -- cgit v1.2.3 From fcf61d3411bc1868e53305a3777f4bcaab3eb4bd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Oct 2016 15:30:20 +0200 Subject: Imakefile cleanup: Delete all ancient Vcs comments stemming from SVN times of X.org and XFree86. Fixes ArcticaProject/nx-libs#250. --- nx-X11/programs/Xserver/include/Imakefile | 7 ------- 1 file changed, 7 deletions(-) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 0a64fff0c..03c389989 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -1,10 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 dawes Exp $ - HEADERS = os.h misc.h #if defined(XorgVersion) \ -- cgit v1.2.3 From 96c9aafd6bf6d09ce2e98a77685f5e25b9009e35 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 29 Oct 2016 22:52:53 +0200 Subject: Imake: drop DoLoadableServer, MakeDllModules and IHaveModules We do not build loadable modules, so we do not need them anywhere. Also remove the extra files requires for module builds. --- nx-X11/programs/Xserver/include/Imakefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 03c389989..8c89fbc2b 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -2,10 +2,6 @@ HEADERS = os.h misc.h #if defined(XorgVersion) \ || defined(BSDOSArchitecture) -#if DoLoadableServer -LinkSourceFile(xf86Module.h,$(XF86COMSRC)) -LinkSourceFile(xf86Opt.h,$(XF86COMSRC)) -#endif #endif LinkSourceFile(osdep.h,../os) -- cgit v1.2.3 From 289e8ce5652dda788dbed25346b3b43af70c371c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 12:32:16 +0000 Subject: Xserver/include/list.h: Add list.h from X.org (from X.org commit 63f83d1). --- nx-X11/programs/Xserver/include/Imakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 8c89fbc2b..d1d7bd651 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -30,6 +30,7 @@ InstallDriverSDKNonExecFile(gcstruct.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(globals.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(input.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(inputstr.h,$(DRIVERSDKINCLUDEDIR)) +InstallDriverSDKNonExecFile(list.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(misc.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(miscstruct.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(opaque.h,$(DRIVERSDKINCLUDEDIR)) -- cgit v1.2.3 From 239fe3d0802b12ce8947741693244ff8154fa559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rami=20Ylim=C3=A4ki?= Date: Wed, 15 Feb 2017 16:42:14 +0100 Subject: os: Add facilities for client ID tracking. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 6d6d4cb6043905d850834946e9bfc526ed5a9ef7 Author: Matthieu Herrb Date: Mon Jan 2 13:23:59 2012 +0000 Add OpenBSD support to DetermineClientCmd() Uses kvm_getargv() from libkvm. Signed-off-by: Matthieu Herrb Reviewed-by: Adam Jackson Signed-off-by: Keith Packard commit cfc4c3d7fa8bd4da4c08b2ab8e6f85435f75353a Author: Alan Coopersmith Date: Sat Dec 24 10:00:56 2011 -0800 Add Solaris support to DetermineClientCmd Uses /proc/pid/psinfo to read command & partial arguments. Moves cmdsize & argsize variables into non-Solaris #else clause to avoid unused variable warnings. Fixes format mismatch errors when building with DEBUG defined on a 64-bit platform (where Mask is defined as CARD32). Signed-off-by: Alan Coopersmith Reviewed-by: Rami Ylimäki Signed-off-by: Keith Packard commit 780133f9ae7fada462714b47e79d26075bbd9abe Author: Alan Coopersmith Date: Fri Oct 28 21:29:50 2011 -0700 Convert DetermineClientCmd to use strdup instead of malloc+strncpy *cmdname is initialized to NULL earlier in the function, so it's okay to overwrite it with NULL if strdup fails, don't need that extra check. Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit 2ef4ff45ef1fcfc4967ebe3d550408769e5f6500 Author: Erkki Seppälä Date: Fri Mar 25 10:38:23 2011 +0200 os/client: Prevent rare fd leak in DetermineClientPid DetermineClientPid didn't close file descriptor if read on /proc/pid/cmdline failed. Adjusted the code to disregard the close return value and perform the return after that, if the read failed or returned EOF. Signed-off-by: Mark Kettenis Signed-off-by: Erkki Seppälä Reviewed-by: Rami Ylimäki Signed-off-by: Keith Packard commit 1e933665bef26c74196bb7c59910e6a78bcacf0e Author: Rami Ylimäki Date: Wed Dec 22 16:51:09 2010 +0200 os: Add facilities for client ID tracking. An interface is provided for figuring out the PID and process name of a client. Make some existing functionality from SELinux and IA extensions available for general use. Signed-off-by: Rami Ylimäki Reviewed-by: Tiago Vignatti Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/include/Imakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index d1d7bd651..53f193ec8 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -16,6 +16,7 @@ depend:: InstallDriverSDKNonExecFile(XIstubs.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(bstore.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(bstorestr.h,$(DRIVERSDKINCLUDEDIR)) +InstallDriverSDKNonExecFile(client.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(colormap.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(colormapst.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(cursor.h,$(DRIVERSDKINCLUDEDIR)) -- cgit v1.2.3 From 1e3a97482840401af9ffcf73db6008ebfe6c1d52 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 7 Dec 2017 10:48:31 +0100 Subject: Add asprintf() implementation for platforms without it Backported from X.org: commit c95c1d338fdb62dbe3dba934b97324fa778b7fce Author: Alan Coopersmith Date: Sat Nov 27 18:43:12 2010 -0800 Add asprintf() implementation for platforms without it Provides a portable implementation of this common allocating sprintf() API found in many, but not yet all, of the platforms we support. If the platform provides vasprintf() we simply wrap it, otherwise we implement it - either way callers can use it regardless of platform. Since not all platforms guarantee to NULL out the return pointer on failure, we don't either, and require callers to check the return value for -1. The old Xprintf() API is deprecated, but left for compatibility for now. The new API is added in a new header so that it can be used in parts of the server such as hw/xfree86/parser that don't include all the server headers. Signed-off-by: Alan Coopersmith Reviewed-by: Mikhail Gusarov Includes re-indentation changes from 9838b7032ea9792bec21af424c53c07078636d21. Backported-to-NX-by: Mihai Moldovan --- nx-X11/programs/Xserver/include/Imakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'nx-X11/programs/Xserver/include/Imakefile') diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 53f193ec8..4c168edf1 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -14,6 +14,7 @@ all:: depend:: InstallDriverSDKNonExecFile(XIstubs.h,$(DRIVERSDKINCLUDEDIR)) +InstallDriverSDKNonExecFile(Xprintf.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(bstore.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(bstorestr.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(client.h,$(DRIVERSDKINCLUDEDIR)) -- cgit v1.2.3