1 |
commit: 197c4f0565568e2c8bee389970619fa00869cbb0 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 25 20:29:35 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 25 20:43:01 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197c4f05 |
7 |
|
8 |
net-misc/x11rdp: Remove. |
9 |
|
10 |
Bug: https://bugs.gentoo.org/607096 |
11 |
|
12 |
net-misc/x11rdp/Manifest | 2 - |
13 |
.../x11rdp/files/xorg-cve-2011-4028+4029.patch | 22 --- |
14 |
.../files/xorg-server-1.9-cve-2013-1940.patch | 31 ---- |
15 |
.../files/xorg-server-1.9-cve-2013-4396.patch | 43 ----- |
16 |
.../files/xorg-server-1.9-nouveau-default.patch | 30 ---- |
17 |
.../x11rdp/files/xorg-server-disable-acpi.patch | 31 ---- |
18 |
...1-Include-xorg-list.h-to-fix-build-errors.patch | 25 --- |
19 |
.../xrdp-0.8.0-0002-Remove-dither-printing.patch | 40 ----- |
20 |
net-misc/x11rdp/metadata.xml | 5 - |
21 |
net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild | 185 --------------------- |
22 |
10 files changed, 414 deletions(-) |
23 |
|
24 |
diff --git a/net-misc/x11rdp/Manifest b/net-misc/x11rdp/Manifest |
25 |
deleted file mode 100644 |
26 |
index 4b9d79679a..0000000000 |
27 |
--- a/net-misc/x11rdp/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1,2 +0,0 @@ |
30 |
-DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e |
31 |
-DIST xrdp-0.8.0.tar.xz 1671376 SHA256 433535039f8b8766d9c22f62de9599afa94dd553e72d9791cec85a5e2f436a60 SHA512 bb2afefce7f53b6c3bca30cb6913171211df63a700f7d70325c1722348d5d31981e1d417727e48fd14aad500d0454e4126e6e1f81f8c09da4928b02f4acff26b WHIRLPOOL 39c1d4852f6f927fd348d345a8d4f4a79824eca0d5682340908d28f3b6b497ae33bfed944294b061b118e4154ed7c5dce15878302145ffabc2ca6b3a2eb07818 |
32 |
|
33 |
diff --git a/net-misc/x11rdp/files/xorg-cve-2011-4028+4029.patch b/net-misc/x11rdp/files/xorg-cve-2011-4028+4029.patch |
34 |
deleted file mode 100644 |
35 |
index 66e77f66e0..0000000000 |
36 |
--- a/net-misc/x11rdp/files/xorg-cve-2011-4028+4029.patch |
37 |
+++ /dev/null |
38 |
@@ -1,22 +0,0 @@ |
39 |
-diff --git a/os/utils.c b/os/utils.c |
40 |
-index e8ecb71..18ff1ca 100644 |
41 |
---- a/os/utils.c |
42 |
-+++ b/os/utils.c |
43 |
-@@ -297,7 +297,7 @@ LockServer(void) |
44 |
- FatalError("Could not create lock file in %s\n", tmp); |
45 |
- (void) sprintf(pid_str, "%10ld\n", (long)getpid()); |
46 |
- (void) write(lfd, pid_str, 11); |
47 |
-- (void) chmod(tmp, 0444); |
48 |
-+ (void) fchmod(lfd, 0444); |
49 |
- (void) close(lfd); |
50 |
- |
51 |
- /* |
52 |
-@@ -318,7 +318,7 @@ LockServer(void) |
53 |
- /* |
54 |
- * Read the pid from the existing file |
55 |
- */ |
56 |
-- lfd = open(LockFile, O_RDONLY); |
57 |
-+ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); |
58 |
- if (lfd < 0) { |
59 |
- unlink(tmp); |
60 |
- FatalError("Can't read lock file %s\n", LockFile); |
61 |
|
62 |
diff --git a/net-misc/x11rdp/files/xorg-server-1.9-cve-2013-1940.patch b/net-misc/x11rdp/files/xorg-server-1.9-cve-2013-1940.patch |
63 |
deleted file mode 100644 |
64 |
index f06b923f3d..0000000000 |
65 |
--- a/net-misc/x11rdp/files/xorg-server-1.9-cve-2013-1940.patch |
66 |
+++ /dev/null |
67 |
@@ -1,31 +0,0 @@ |
68 |
-From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 |
69 |
-From: Dave Airlie <airlied@×××××.com> |
70 |
-Date: Wed, 10 Apr 2013 06:09:01 +0000 |
71 |
-Subject: xf86: fix flush input to work with Linux evdev devices. |
72 |
- |
73 |
-So when we VT switch back and attempt to flush the input devices, |
74 |
-we don't succeed because evdev won't return part of an event, |
75 |
-since we were only asking for 4 bytes, we'd only get -EINVAL back. |
76 |
- |
77 |
-This could later cause events to be flushed that we shouldn't have |
78 |
-gotten. |
79 |
- |
80 |
-This is a fix for CVE-2013-1940. |
81 |
- |
82 |
-Signed-off-by: Dave Airlie <airlied@××××××.com> |
83 |
-Reviewed-by: Peter Hutterer <peter.hutterer@×××××.net> |
84 |
-Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net> |
85 |
- |
86 |
-diff -ur a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c |
87 |
---- a/hw/xfree86/os-support/shared/posix_tty.c 2010-06-11 08:10:22.000000000 +0200 |
88 |
-+++ b/hw/xfree86/os-support/shared/posix_tty.c 2013-04-17 22:49:20.389795964 +0200 |
89 |
-@@ -460,7 +460,8 @@ |
90 |
- { |
91 |
- fd_set fds; |
92 |
- struct timeval timeout; |
93 |
-- char c[4]; |
94 |
-+ /* this needs to be big enough to flush an evdev event. */ |
95 |
-+ char c[256]; |
96 |
- |
97 |
- DebugF("FlushingSerial\n"); |
98 |
- if (tcflush(fd, TCIFLUSH) == 0) |
99 |
|
100 |
diff --git a/net-misc/x11rdp/files/xorg-server-1.9-cve-2013-4396.patch b/net-misc/x11rdp/files/xorg-server-1.9-cve-2013-4396.patch |
101 |
deleted file mode 100644 |
102 |
index fa8b4825f7..0000000000 |
103 |
--- a/net-misc/x11rdp/files/xorg-server-1.9-cve-2013-4396.patch |
104 |
+++ /dev/null |
105 |
@@ -1,43 +0,0 @@ |
106 |
-diff -ur a/dix/dixfonts.c b/dix/dixfonts.c |
107 |
---- a/dix/dixfonts.c 2011-12-18 05:44:54.000000000 +0100 |
108 |
-+++ b/dix/dixfonts.c 2013-10-10 12:06:44.579225694 +0200 |
109 |
-@@ -1479,6 +1479,7 @@ |
110 |
- GC *pGC; |
111 |
- unsigned char *data; |
112 |
- ITclosurePtr new_closure; |
113 |
-+ ITclosurePtr old_closure; |
114 |
- |
115 |
- /* We're putting the client to sleep. We need to |
116 |
- save some state. Similar problem to that handled |
117 |
-@@ -1491,6 +1492,7 @@ |
118 |
- err = BadAlloc; |
119 |
- goto bail; |
120 |
- } |
121 |
-+ old_closure = c; |
122 |
- *new_closure = *c; |
123 |
- c = new_closure; |
124 |
- |
125 |
-@@ -1498,6 +1500,7 @@ |
126 |
- if (!data) |
127 |
- { |
128 |
- free(c); |
129 |
-+ c = old_closure; |
130 |
- err = BadAlloc; |
131 |
- goto bail; |
132 |
- } |
133 |
-@@ -1509,6 +1512,7 @@ |
134 |
- { |
135 |
- free(c->data); |
136 |
- free(c); |
137 |
-+ c = old_closure; |
138 |
- err = BadAlloc; |
139 |
- goto bail; |
140 |
- } |
141 |
-@@ -1522,6 +1526,7 @@ |
142 |
- FreeScratchGC(pGC); |
143 |
- free(c->data); |
144 |
- free(c); |
145 |
-+ c = old_closure; |
146 |
- err = BadAlloc; |
147 |
- goto bail; |
148 |
- } |
149 |
|
150 |
diff --git a/net-misc/x11rdp/files/xorg-server-1.9-nouveau-default.patch b/net-misc/x11rdp/files/xorg-server-1.9-nouveau-default.patch |
151 |
deleted file mode 100644 |
152 |
index 2b05967a94..0000000000 |
153 |
--- a/net-misc/x11rdp/files/xorg-server-1.9-nouveau-default.patch |
154 |
+++ /dev/null |
155 |
@@ -1,30 +0,0 @@ |
156 |
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c |
157 |
-index 74016af..9c296f5 100644 |
158 |
---- a/hw/xfree86/common/xf86pciBus.c |
159 |
-+++ b/hw/xfree86/common/xf86pciBus.c |
160 |
-@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev, |
161 |
- break; |
162 |
- case 0x102b: driverList[0] = "mga"; break; |
163 |
- case 0x10c8: driverList[0] = "neomagic"; break; |
164 |
-- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; |
165 |
-+ case 0x10de: case 0x12d2: |
166 |
-+ switch (dev->device_id) { |
167 |
-+ /* NV1 */ |
168 |
-+ case 0x0008: |
169 |
-+ case 0x0009: |
170 |
-+ driverList[0] = "vesa"; |
171 |
-+ break; |
172 |
-+ /* NV3 */ |
173 |
-+ case 0x0018: |
174 |
-+ case 0x0019: |
175 |
-+ driverList[0] = "nv"; |
176 |
-+ break; |
177 |
-+ default: |
178 |
-+ driverList[0] = "nouveau"; |
179 |
-+ break; |
180 |
-+ } |
181 |
-+ break; |
182 |
- case 0x1106: driverList[0] = "openchrome"; break; |
183 |
- case 0x1b36: driverList[0] = "qxl"; break; |
184 |
- case 0x1163: driverList[0] = "rendition"; break; |
185 |
--- |
186 |
|
187 |
diff --git a/net-misc/x11rdp/files/xorg-server-disable-acpi.patch b/net-misc/x11rdp/files/xorg-server-disable-acpi.patch |
188 |
deleted file mode 100644 |
189 |
index cc80e6cef4..0000000000 |
190 |
--- a/net-misc/x11rdp/files/xorg-server-disable-acpi.patch |
191 |
+++ /dev/null |
192 |
@@ -1,31 +0,0 @@ |
193 |
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 |
194 |
-From: Adam Jackson <ajax@××××××.com> |
195 |
-Date: Wed, 11 Mar 2009 14:02:11 -0400 |
196 |
-Subject: [PATCH] Don't build the ACPI code. |
197 |
- |
198 |
-No good can come of this. |
199 |
---- |
200 |
- configure.ac | 2 -- |
201 |
- 1 files changed, 0 insertions(+), 2 deletions(-) |
202 |
- |
203 |
-diff --git a/configure.ac b/configure.ac |
204 |
-index 72ae67e..04716f8 100644 |
205 |
---- a/configure.ac |
206 |
-+++ b/configure.ac |
207 |
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then |
208 |
- case $host_cpu in |
209 |
- ia64*) |
210 |
- linux_ia64=yes |
211 |
-- linux_acpi="yes" |
212 |
- ;; |
213 |
- alpha*) |
214 |
- linux_alpha=yes |
215 |
- ;; |
216 |
- i*86|amd64*|x86_64*) |
217 |
-- linux_acpi="yes" |
218 |
- ;; |
219 |
- *) |
220 |
- ;; |
221 |
--- |
222 |
-1.6.1.3 |
223 |
- |
224 |
|
225 |
diff --git a/net-misc/x11rdp/files/xrdp-0.8.0-0001-Include-xorg-list.h-to-fix-build-errors.patch b/net-misc/x11rdp/files/xrdp-0.8.0-0001-Include-xorg-list.h-to-fix-build-errors.patch |
226 |
deleted file mode 100644 |
227 |
index c78d2e3fa2..0000000000 |
228 |
--- a/net-misc/x11rdp/files/xrdp-0.8.0-0001-Include-xorg-list.h-to-fix-build-errors.patch |
229 |
+++ /dev/null |
230 |
@@ -1,25 +0,0 @@ |
231 |
-From 13b7150aef9c61966d39d779c652f988232d7381 Mon Sep 17 00:00:00 2001 |
232 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
233 |
-Date: Mon, 27 Oct 2014 09:52:56 +0100 |
234 |
-Subject: [PATCH 1/2] Include <xorg/list.h> to fix build errors |
235 |
- |
236 |
---- |
237 |
- xorg/X11R7.6/rdp/rdp.h | 2 ++ |
238 |
- 1 file changed, 2 insertions(+) |
239 |
- |
240 |
-diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h |
241 |
-index 00725d1..a2f5bdc 100644 |
242 |
---- a/xorg/X11R7.6/rdp/rdp.h |
243 |
-+++ b/xorg/X11R7.6/rdp/rdp.h |
244 |
-@@ -46,6 +46,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
245 |
- |
246 |
- //#include "cfb.h" |
247 |
- |
248 |
-+#include <xorg/list.h> |
249 |
-+ |
250 |
- #include "mibstore.h" |
251 |
- #include "colormapst.h" |
252 |
- #include "gcstruct.h" |
253 |
--- |
254 |
-2.1.2 |
255 |
- |
256 |
|
257 |
diff --git a/net-misc/x11rdp/files/xrdp-0.8.0-0002-Remove-dither-printing.patch b/net-misc/x11rdp/files/xrdp-0.8.0-0002-Remove-dither-printing.patch |
258 |
deleted file mode 100644 |
259 |
index 1d004181b4..0000000000 |
260 |
--- a/net-misc/x11rdp/files/xrdp-0.8.0-0002-Remove-dither-printing.patch |
261 |
+++ /dev/null |
262 |
@@ -1,40 +0,0 @@ |
263 |
-From fef4e6d15aa42a7d3bb4b134cba9253323398cc6 Mon Sep 17 00:00:00 2001 |
264 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
265 |
-Date: Mon, 27 Oct 2014 09:55:49 +0100 |
266 |
-Subject: [PATCH 2/2] Remove dither printing |
267 |
- |
268 |
---- |
269 |
- xorg/X11R7.6/rdp/rdpComposite.c | 8 ++++---- |
270 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
271 |
- |
272 |
-diff --git a/xorg/X11R7.6/rdp/rdpComposite.c b/xorg/X11R7.6/rdp/rdpComposite.c |
273 |
-index f763783..50ee6d7 100644 |
274 |
---- a/xorg/X11R7.6/rdp/rdpComposite.c |
275 |
-+++ b/xorg/X11R7.6/rdp/rdpComposite.c |
276 |
-@@ -240,9 +240,9 @@ compsoite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, |
277 |
- if (pSrc != 0) |
278 |
- { |
279 |
- LLOGLN(0, (" src depth %d width %d height %d repeat %d repeatType %d " |
280 |
-- "dither %d filter %d alphaMap %p componentAlpha %d", pSrc->pDrawable->depth, |
281 |
-+ "filter %d alphaMap %p componentAlpha %d", pSrc->pDrawable->depth, |
282 |
- pSrc->pDrawable->width, pSrc->pDrawable->height, |
283 |
-- pSrc->repeat, pSrc->repeatType, pSrc->dither, pSrc->filter, |
284 |
-+ pSrc->repeat, pSrc->repeatType, pSrc->filter, |
285 |
- pSrc->alphaMap, pSrc->componentAlpha)); |
286 |
- LLOGLN(0, (" transform %p", pSrc->transform)); |
287 |
- LLOGLN(0, (" detail format red %d red mask %d green %d green mask %d " |
288 |
-@@ -277,9 +277,9 @@ compsoite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, |
289 |
- if (pDst != 0) |
290 |
- { |
291 |
- LLOGLN(0, (" dst depth %d width %d height %d repeat %d repeatType %d " |
292 |
-- "dither %d filter %d alphaMap %p", pDst->pDrawable->depth, |
293 |
-+ "filter %d alphaMap %p", pDst->pDrawable->depth, |
294 |
- pDst->pDrawable->width, pDst->pDrawable->height, |
295 |
-- pDst->repeat, pDst->repeatType, pDst->dither, pDst->filter, |
296 |
-+ pDst->repeat, pDst->repeatType, pDst->filter, |
297 |
- pDst->alphaMap)); |
298 |
- LLOGLN(0, (" transform %p", pDst->transform)); |
299 |
- print_format(pDst->format); |
300 |
--- |
301 |
-2.1.2 |
302 |
- |
303 |
|
304 |
diff --git a/net-misc/x11rdp/metadata.xml b/net-misc/x11rdp/metadata.xml |
305 |
deleted file mode 100644 |
306 |
index 6f49eba8f4..0000000000 |
307 |
--- a/net-misc/x11rdp/metadata.xml |
308 |
+++ /dev/null |
309 |
@@ -1,5 +0,0 @@ |
310 |
-<?xml version="1.0" encoding="UTF-8"?> |
311 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
312 |
-<pkgmetadata> |
313 |
-<!-- maintainer-needed --> |
314 |
-</pkgmetadata> |
315 |
|
316 |
diff --git a/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild b/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild |
317 |
deleted file mode 100644 |
318 |
index 236a60db7d..0000000000 |
319 |
--- a/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild |
320 |
+++ /dev/null |
321 |
@@ -1,185 +0,0 @@ |
322 |
-# Copyright 1999-2015 Gentoo Foundation |
323 |
-# Distributed under the terms of the GNU General Public License v2 |
324 |
-# $Id$ |
325 |
- |
326 |
-EAPI=5 |
327 |
- |
328 |
-inherit flag-o-matic versionator |
329 |
- |
330 |
-XRDP_P=xrdp-$(get_version_component_range 1-3) |
331 |
-XORG_P=xorg-server-$(get_version_component_range 4-6) |
332 |
- |
333 |
-DESCRIPTION="A X11 server for RDP clients (used by xrdp)" |
334 |
-HOMEPAGE="http://www.xrdp.org/" |
335 |
-# mirrored from https://github.com/neutrinolabs/xrdp/releases |
336 |
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${XRDP_P}.tar.xz |
337 |
- https://www.x.org/releases/individual/xserver/${XORG_P}.tar.bz2" |
338 |
- |
339 |
-LICENSE="Apache-2.0 MIT" |
340 |
-SLOT="0" |
341 |
-KEYWORDS="~amd64 ~x86" |
342 |
-IUSE="nptl" |
343 |
- |
344 |
-RDEPEND="dev-libs/openssl |
345 |
- media-libs/freetype |
346 |
- >=x11-apps/iceauth-1.0.2 |
347 |
- >=x11-apps/rgb-1.0.3 |
348 |
- >=x11-apps/xauth-1.0.3 |
349 |
- x11-apps/xkbcomp |
350 |
- >=x11-libs/libpciaccess-0.10.3 |
351 |
- >=x11-libs/libXau-1.0.4 |
352 |
- >=x11-libs/libXdmcp-1.0.2 |
353 |
- >=x11-libs/libXfont-1.4.2 |
354 |
- >=x11-libs/libxkbfile-1.0.4 |
355 |
- >=x11-libs/pixman-0.15.20 |
356 |
- >=x11-libs/xtrans-1.2.2 |
357 |
- >=x11-misc/xbitmaps-1.0.1 |
358 |
- >=x11-misc/xkeyboard-config-1.4 |
359 |
- >=x11-libs/libX11-1.1.5 |
360 |
- >=x11-libs/libXext-1.0.5 |
361 |
- >=media-libs/mesa-7.8_rc[nptl=] |
362 |
- <x11-base/xorg-server-1.17" |
363 |
- |
364 |
-DEPEND="${RDEPEND} |
365 |
- sys-devel/flex |
366 |
- >=x11-proto/bigreqsproto-1.1.0 |
367 |
- >=x11-proto/compositeproto-0.4 |
368 |
- >=x11-proto/damageproto-1.1 |
369 |
- >=x11-proto/fixesproto-4.1 |
370 |
- >=x11-proto/fontsproto-2.0.2 |
371 |
- >=x11-proto/glproto-1.4.11 |
372 |
- >=x11-proto/inputproto-1.9.99.902 |
373 |
- >=x11-proto/kbproto-1.0.3 |
374 |
- >=x11-proto/randrproto-1.2.99.3 |
375 |
- >=x11-proto/recordproto-1.13.99.1 |
376 |
- >=x11-proto/renderproto-0.11 |
377 |
- >=x11-proto/resourceproto-1.0.2 |
378 |
- >=x11-proto/scrnsaverproto-1.1 |
379 |
- >=x11-proto/trapproto-3.4.3 |
380 |
- >=x11-proto/videoproto-2.2.2 |
381 |
- >=x11-proto/xcmiscproto-1.2.0 |
382 |
- >=x11-proto/xextproto-7.0.99.3 |
383 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
384 |
- >=x11-proto/xf86rushproto-1.1.2 |
385 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
386 |
- >=x11-proto/xineramaproto-1.1.3 |
387 |
- >=x11-proto/xproto-7.0.17 |
388 |
- >=x11-proto/xf86driproto-2.1.0 |
389 |
- >=x11-proto/dri2proto-2.3 |
390 |
- >=x11-libs/libdrm-2.4.20 |
391 |
- >=x11-apps/xinit-1.3" |
392 |
- |
393 |
-# xrdp-specific |
394 |
-DEPEND="${DEPEND} |
395 |
- app-arch/xz-utils" |
396 |
- |
397 |
-S=${WORKDIR}/${XRDP_P} |
398 |
- |
399 |
-src_prepare() { |
400 |
- # -- xrdp patches -- |
401 |
- epatch "${FILESDIR}"/${XRDP_P}-0001-Include-xorg-list.h-to-fix-build-errors.patch |
402 |
- epatch "${FILESDIR}"/${XRDP_P}-0002-Remove-dither-printing.patch |
403 |
- |
404 |
- # missing -pthread linking |
405 |
- sed -i -e 's:LLIBS =:& -pthread:' xorg/X11R7.6/rdp/Makefile || die |
406 |
- |
407 |
- # -- xrdp fancy build layout -- |
408 |
- |
409 |
- mv "${WORKDIR}/${XORG_P}" ./ || die |
410 |
- mv "${S}"/xorg/X11R7.6/rdp "${XORG_P}/hw" || die |
411 |
- ln -s ../.. "${XORG_P}/hw/build_dir" || die |
412 |
- ln -s "${XORG_P}" xorg-server-1.9.3 || die |
413 |
- |
414 |
- # -- xorg-server patches -- |
415 |
- local xorg_patches=( |
416 |
- "${FILESDIR}"/xorg-server-disable-acpi.patch |
417 |
- "${FILESDIR}"/xorg-server-1.9-nouveau-default.patch |
418 |
- "${FILESDIR}"/xorg-cve-2011-4028+4029.patch |
419 |
- "${FILESDIR}"/xorg-server-1.9-cve-2013-1940.patch |
420 |
- "${FILESDIR}"/xorg-server-1.9-cve-2013-4396.patch |
421 |
- ) |
422 |
- cd "${XORG_P}" || die |
423 |
- epatch "${xorg_patches[@]}" |
424 |
- |
425 |
- # -- stuff copied from xorg follows -- |
426 |
- |
427 |
- # Xorg-server requires includes from OS mesa which are not visible for |
428 |
- # users of binary drivers. |
429 |
- # Due to the limitations of CONFIGURE_OPTIONS, we have to export this |
430 |
- mkdir -p "${T}/mesa-symlinks/GL" |
431 |
- for i in gl glx glxmd glxproto glxtokens; do |
432 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
433 |
- done |
434 |
- for i in glext glxext; do |
435 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
436 |
- done |
437 |
- append-cppflags "-I${T}/mesa-symlinks" |
438 |
- |
439 |
- # (#121394) Causes window corruption |
440 |
- filter-flags -fweb |
441 |
- |
442 |
- # Incompatible with GCC 3.x SSP on x86, bug #244352 |
443 |
- if use x86 ; then |
444 |
- if [[ $(gcc-major-version) -lt 4 ]]; then |
445 |
- filter-flags -fstack-protector |
446 |
- fi |
447 |
- fi |
448 |
- |
449 |
- # Incompatible with GCC 3.x CPP, bug #314615 |
450 |
- if [[ $(gcc-major-version) -lt 4 ]]; then |
451 |
- ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x" |
452 |
- ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)" |
453 |
- fi |
454 |
-} |
455 |
- |
456 |
-src_configure() { |
457 |
- local myconf=( |
458 |
- --disable-ipv6 |
459 |
- --disable-dmx |
460 |
- --disable-kdrive |
461 |
- --disable-kdrive-kbd |
462 |
- --disable-kdrive-mouse |
463 |
- --disable-kdrive-evdev |
464 |
- --disable-tslib |
465 |
- --disable-xcalibrate |
466 |
- --enable-record |
467 |
- --disable-xfree86-utils |
468 |
- --disable-install-libxf86config |
469 |
- --disable-dri |
470 |
- --disable-dri2 |
471 |
- --enable-glx |
472 |
- --disable-xnest |
473 |
- --enable-xorg |
474 |
- --disable-xvfb |
475 |
- $(use_enable nptl glx-tls) |
476 |
- --disable-config-udev |
477 |
- --without-doxygen |
478 |
- --without-xmlto |
479 |
- --sysconfdir=/etc/X11 |
480 |
- --localstatedir=/var |
481 |
- --enable-install-setuid |
482 |
- --with-fontrootdir=/usr/share/fonts |
483 |
- --with-xkb-output=/var/lib/xkb |
484 |
- --disable-config-hal |
485 |
- --without-dtrace |
486 |
- --without-fop |
487 |
- --with-os-vendor=Gentoo |
488 |
- --with-sha1=libcrypto |
489 |
- ) |
490 |
- |
491 |
- # configure xorg-server, no need to configure xrdp |
492 |
- cd "${XORG_P}" || die |
493 |
- econf "${myconf[@]}" |
494 |
-} |
495 |
- |
496 |
-src_compile() { |
497 |
- # build xorg-server |
498 |
- emake -C "${XORG_P}" |
499 |
- |
500 |
- # build x11rdp |
501 |
- emake -C "${XORG_P}"/hw/rdp X11RDPBASE=/usr |
502 |
-} |
503 |
- |
504 |
-src_install() { |
505 |
- dobin "${XORG_P}"/hw/rdp/X11rdp |
506 |
-} |