]> CyberLeo.Net >> Repos - CDN/portage-cdn.git/blob - net-misc/xrdp/files/xrdp-0.3.1-curdir.patch
app-crypt/truecrypt-6.1*, app-emulation/vmware-modules/*: remove, no longer used
[CDN/portage-cdn.git] / net-misc / xrdp / files / xrdp-0.3.1-curdir.patch
1 diff -ur xrdp-0.3.1.orig/sesman/Makefile xrdp-0.3.1/sesman/Makefile
2 --- xrdp-0.3.1.orig/sesman/Makefile     2006-08-01 19:35:48.000000000 -0400
3 +++ xrdp-0.3.1/sesman/Makefile  2006-08-01 20:48:52.000000000 -0400
4 @@ -13,7 +13,8 @@
5  DOCDIR = /usr/doc/xrdp
6  
7  DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
8 -          -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\"
9 +          -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
10 +         -DSESMAN_DESTDIR=\"$(DESTDIR)\"
11  
12  CFLAGS = $(MYCFLAGS) -I../common $(DEFINES)
13  LDFLAGS = -L /usr/gnu/lib $(DEFINES)
14 diff -ur xrdp-0.3.1.orig/sesman/sesman.c xrdp-0.3.1/sesman/sesman.c
15 --- xrdp-0.3.1.orig/sesman/sesman.c     2006-08-01 19:35:48.000000000 -0400
16 +++ xrdp-0.3.1/sesman/sesman.c  2006-08-01 20:48:15.000000000 -0400
17 @@ -137,6 +137,8 @@
18    int pid;
19    char pid_s[8];
20  
21 +  chdir(SESMAN_DESTDIR);
22 +
23    if (1 == argc)
24    {
25      /* no options on command line. normal startup */
26 diff -ur xrdp-0.3.1.orig/xrdp/Makefile xrdp-0.3.1/xrdp/Makefile
27 --- xrdp-0.3.1.orig/xrdp/Makefile       2006-08-01 19:35:48.000000000 -0400
28 +++ xrdp-0.3.1/xrdp/Makefile    2006-08-01 19:56:15.000000000 -0400
29 @@ -12,7 +12,8 @@
30  DOCDIR = /usr/doc/xrdp
31  
32  DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
33 -          -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
34 +          -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\" \
35 +          -DXRDP_DESTDIR=\"$(DESTDIR)\"
36  
37  CFLAGS = $(MYCFLAGS) -I../common -I../libxrdp $(DEFINES)
38  #CFLAGS += -DXRDP_DEBUG
39 diff -ur xrdp-0.3.1.orig/xrdp/xrdp.c xrdp-0.3.1/xrdp/xrdp.c
40 --- xrdp-0.3.1.orig/xrdp/xrdp.c 2006-08-01 19:35:48.000000000 -0400
41 +++ xrdp-0.3.1/xrdp/xrdp.c      2006-08-01 19:55:45.000000000 -0400
42 @@ -291,6 +291,8 @@
43    char text[32];
44  #endif
45  
46 +  chdir(XRDP_DESTDIR);
47 +
48    /* check compiled endian with actual endian */
49    test = 1;
50    host_be = !((int)(*(unsigned char*)(&test)));