| 1 |
patrick 09/03/01 15:09:11 |
| 2 |
|
| 3 |
Added: xrdp-0.4.1-curdir.patch |
| 4 |
Log: |
| 5 |
Bump to 0.4.1. Fixes #171411. Ebuild contributed by schism@×××××××××.org, patch by Christoph Brill. |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-misc/xrdp/files/xrdp-0.4.1-curdir.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/files/xrdp-0.4.1-curdir.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/files/xrdp-0.4.1-curdir.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xrdp-0.4.1-curdir.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur xrdp-0.4.0.orig/sesman/Makefile xrdp-0.4.0/sesman/Makefile |
| 17 |
--- xrdp-0.4.0.orig/sesman/Makefile 2008-04-02 15:43:01.000000000 +0200 |
| 18 |
+++ xrdp-0.4.0/sesman/Makefile 2008-04-02 16:08:34.000000000 +0200 |
| 19 |
@@ -14,7 +14,8 @@ |
| 20 |
|
| 21 |
DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \ |
| 22 |
-DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \ |
| 23 |
- -DSESMAN_SESSVC_FILE=\"sessvc\" |
| 24 |
+ -DSESMAN_SESSVC_FILE=\"sessvc\" \ |
| 25 |
+ -DSESMAN_DESTDIR=\"$(DESTDIR)\" |
| 26 |
|
| 27 |
CFLAGS = $(MYCFLAGS) -I../common -I/usr/include/nptl -I./libscp $(DEFINES) |
| 28 |
LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp |
| 29 |
diff -ur xrdp-0.3.1.orig/sesman/sesman.c xrdp-0.3.1/sesman/sesman.c |
| 30 |
--- xrdp-0.3.1.orig/sesman/sesman.c 2006-08-01 19:35:48.000000000 -0400 |
| 31 |
+++ xrdp-0.3.1/sesman/sesman.c 2006-08-01 20:48:15.000000000 -0400 |
| 32 |
@@ -137,6 +137,8 @@ |
| 33 |
int pid; |
| 34 |
char pid_s[8]; |
| 35 |
|
| 36 |
+ chdir(SESMAN_DESTDIR); |
| 37 |
+ |
| 38 |
if (1 == argc) |
| 39 |
{ |
| 40 |
/* no options on command line. normal startup */ |
| 41 |
diff -ur xrdp-0.3.1.orig/xrdp/Makefile xrdp-0.3.1/xrdp/Makefile |
| 42 |
--- xrdp-0.3.1.orig/xrdp/Makefile 2006-08-01 19:35:48.000000000 -0400 |
| 43 |
+++ xrdp-0.3.1/xrdp/Makefile 2006-08-01 19:56:15.000000000 -0400 |
| 44 |
@@ -12,7 +12,8 @@ |
| 45 |
DOCDIR = /usr/doc/xrdp |
| 46 |
|
| 47 |
DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \ |
| 48 |
- -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\" |
| 49 |
+ -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\" \ |
| 50 |
+ -DXRDP_DESTDIR=\"$(DESTDIR)\" |
| 51 |
|
| 52 |
CFLAGS = $(MYCFLAGS) -I../common -I../libxrdp $(DEFINES) |
| 53 |
#CFLAGS += -DXRDP_DEBUG |
| 54 |
diff -ur xrdp-0.3.1.orig/xrdp/xrdp.c xrdp-0.3.1/xrdp/xrdp.c |
| 55 |
--- xrdp-0.3.1.orig/xrdp/xrdp.c 2006-08-01 19:35:48.000000000 -0400 |
| 56 |
+++ xrdp-0.3.1/xrdp/xrdp.c 2006-08-01 19:55:45.000000000 -0400 |
| 57 |
@@ -291,6 +291,8 @@ |
| 58 |
char text[32]; |
| 59 |
#endif |
| 60 |
|
| 61 |
+ chdir(XRDP_DESTDIR); |
| 62 |
+ |
| 63 |
/* check compiled endian with actual endian */ |
| 64 |
test = 1; |
| 65 |
host_be = !((int)(*(unsigned char*)(&test))); |
Archives