diff options
author | 2006-08-02 00:58:36 +0000 | |
---|---|---|
committer | 2006-08-02 00:58:36 +0000 | |
commit | 95d1417bb9d63a859b9980f3461038e2815a33fe (patch) | |
tree | 5b06c4ad64d6dbabf42eaabfd2ef2ba038ea0d68 /net-misc/xrdp/files | |
parent | Stable on x86, bug #105020. (diff) | |
download | historical-95d1417bb9d63a859b9980f3461038e2815a33fe.tar.gz historical-95d1417bb9d63a859b9980f3461038e2815a33fe.tar.bz2 historical-95d1417bb9d63a859b9980f3461038e2815a33fe.zip |
New package, requested in bug #141753
Package-Manager: portage-2.1.1_pre4-r1
Diffstat (limited to 'net-misc/xrdp/files')
-rw-r--r-- | net-misc/xrdp/files/digest-xrdp-0.3.1 | 3 | ||||
-rw-r--r-- | net-misc/xrdp/files/startwm.sh | 8 | ||||
-rw-r--r-- | net-misc/xrdp/files/xrdp-0.3.1-curdir.patch | 50 | ||||
-rw-r--r-- | net-misc/xrdp/files/xrdp-0.3.1-respect-cflags.patch | 72 | ||||
-rw-r--r-- | net-misc/xrdp/files/xrdp-confd | 5 | ||||
-rw-r--r-- | net-misc/xrdp/files/xrdp-initd | 36 |
6 files changed, 174 insertions, 0 deletions
diff --git a/net-misc/xrdp/files/digest-xrdp-0.3.1 b/net-misc/xrdp/files/digest-xrdp-0.3.1 new file mode 100644 index 000000000000..a37fb8cdbebb --- /dev/null +++ b/net-misc/xrdp/files/digest-xrdp-0.3.1 @@ -0,0 +1,3 @@ +MD5 aa780f83007b849efc0e4ed0a8e07201 xrdp-0.3.1.tar.gz 163622 +RMD160 3b780bc84d4aa903c30fabc6a4e0026c3c4c6b71 xrdp-0.3.1.tar.gz 163622 +SHA256 e1d48bef8d26ff4383df4455ef1d0e3e284b45cb07421b44d374011c71e13f11 xrdp-0.3.1.tar.gz 163622 diff --git a/net-misc/xrdp/files/startwm.sh b/net-misc/xrdp/files/startwm.sh new file mode 100644 index 000000000000..21d0a08fd2a6 --- /dev/null +++ b/net-misc/xrdp/files/startwm.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# use the gentoo startDM to start the default WM +# +# see /usr/share/doc/xrdp-version/startwm.sh for the factory version of this +# script. +source /etc/rc.conf + +/etc/X11/Sessions/"${XSESSION}" diff --git a/net-misc/xrdp/files/xrdp-0.3.1-curdir.patch b/net-misc/xrdp/files/xrdp-0.3.1-curdir.patch new file mode 100644 index 000000000000..23879b9a9c09 --- /dev/null +++ b/net-misc/xrdp/files/xrdp-0.3.1-curdir.patch @@ -0,0 +1,50 @@ +diff -ur xrdp-0.3.1.orig/sesman/Makefile xrdp-0.3.1/sesman/Makefile +--- xrdp-0.3.1.orig/sesman/Makefile 2006-08-01 19:35:48.000000000 -0400 ++++ xrdp-0.3.1/sesman/Makefile 2006-08-01 20:48:52.000000000 -0400 +@@ -13,7 +13,8 @@ + DOCDIR = /usr/doc/xrdp + + DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \ +- -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" ++ -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \ ++ -DSESMAN_DESTDIR=\"$(DESTDIR)\" + + CFLAGS = $(MYCFLAGS) -I../common $(DEFINES) + LDFLAGS = -L /usr/gnu/lib $(DEFINES) +diff -ur xrdp-0.3.1.orig/sesman/sesman.c xrdp-0.3.1/sesman/sesman.c +--- xrdp-0.3.1.orig/sesman/sesman.c 2006-08-01 19:35:48.000000000 -0400 ++++ xrdp-0.3.1/sesman/sesman.c 2006-08-01 20:48:15.000000000 -0400 +@@ -137,6 +137,8 @@ + int pid; + char pid_s[8]; + ++ chdir(SESMAN_DESTDIR); ++ + if (1 == argc) + { + /* no options on command line. normal startup */ +diff -ur xrdp-0.3.1.orig/xrdp/Makefile xrdp-0.3.1/xrdp/Makefile +--- xrdp-0.3.1.orig/xrdp/Makefile 2006-08-01 19:35:48.000000000 -0400 ++++ xrdp-0.3.1/xrdp/Makefile 2006-08-01 19:56:15.000000000 -0400 +@@ -12,7 +12,8 @@ + DOCDIR = /usr/doc/xrdp + + DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \ +- -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\" ++ -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\" \ ++ -DXRDP_DESTDIR=\"$(DESTDIR)\" + + CFLAGS = $(MYCFLAGS) -I../common -I../libxrdp $(DEFINES) + #CFLAGS += -DXRDP_DEBUG +diff -ur xrdp-0.3.1.orig/xrdp/xrdp.c xrdp-0.3.1/xrdp/xrdp.c +--- xrdp-0.3.1.orig/xrdp/xrdp.c 2006-08-01 19:35:48.000000000 -0400 ++++ xrdp-0.3.1/xrdp/xrdp.c 2006-08-01 19:55:45.000000000 -0400 +@@ -291,6 +291,8 @@ + char text[32]; + #endif + ++ chdir(XRDP_DESTDIR); ++ + /* check compiled endian with actual endian */ + test = 1; + host_be = !((int)(*(unsigned char*)(&test))); diff --git a/net-misc/xrdp/files/xrdp-0.3.1-respect-cflags.patch b/net-misc/xrdp/files/xrdp-0.3.1-respect-cflags.patch new file mode 100644 index 000000000000..4ed127180dc6 --- /dev/null +++ b/net-misc/xrdp/files/xrdp-0.3.1-respect-cflags.patch @@ -0,0 +1,72 @@ +diff -ur xrdp-0.3.1.orig/libxrdp/Makefile xrdp-0.3.1/libxrdp/Makefile +--- xrdp-0.3.1.orig/libxrdp/Makefile 2006-03-12 19:58:12.000000000 -0500 ++++ xrdp-0.3.1/libxrdp/Makefile 2006-08-01 16:44:51.000000000 -0400 +@@ -13,7 +13,7 @@ + DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \ + -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\" + +-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES) ++CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES) + #CFLAGS += -DXRDP_DEBUG + C_OS_FLAGS = $(CFLAGS) -c + LDFLAGS = -shared +diff -ur xrdp-0.3.1.orig/rdp/Makefile xrdp-0.3.1/rdp/Makefile +--- xrdp-0.3.1.orig/rdp/Makefile 2006-03-03 20:02:04.000000000 -0500 ++++ xrdp-0.3.1/rdp/Makefile 2006-08-01 16:44:51.000000000 -0400 +@@ -10,7 +10,7 @@ + + DEFINES = + +-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES) ++CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES) + #CFLAGS += -DXRDP_DEBUG + C_OS_FLAGS = $(CFLAGS) -c + LDFLAGS = -shared +diff -ur xrdp-0.3.1.orig/sesman/Makefile xrdp-0.3.1/sesman/Makefile +--- xrdp-0.3.1.orig/sesman/Makefile 2006-05-26 09:10:14.000000000 -0400 ++++ xrdp-0.3.1/sesman/Makefile 2006-08-01 16:44:51.000000000 -0400 +@@ -15,7 +15,7 @@ + DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \ + -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" + +-CFLAGS = -Wall -O2 -I../common $(DEFINES) ++CFLAGS = $(MYCFLAGS) -I../common $(DEFINES) + LDFLAGS = -L /usr/gnu/lib $(DEFINES) + C_OS_FLAGS = $(CFLAGS) -c + CC = gcc +diff -ur xrdp-0.3.1.orig/vnc/Makefile xrdp-0.3.1/vnc/Makefile +--- xrdp-0.3.1.orig/vnc/Makefile 2006-03-03 20:02:06.000000000 -0500 ++++ xrdp-0.3.1/vnc/Makefile 2006-08-01 16:44:51.000000000 -0400 +@@ -9,7 +9,7 @@ + + DEFINES = + +-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES) ++CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES) + C_OS_FLAGS = $(CFLAGS) -c + LDFLAGS = -shared + LIBS = -ldl +diff -ur xrdp-0.3.1.orig/xrdp/Makefile xrdp-0.3.1/xrdp/Makefile +--- xrdp-0.3.1.orig/xrdp/Makefile 2006-03-03 20:02:08.000000000 -0500 ++++ xrdp-0.3.1/xrdp/Makefile 2006-08-01 16:44:51.000000000 -0400 +@@ -14,7 +14,7 @@ + DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \ + -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\" + +-CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES) ++CFLAGS = $(MYCFLAGS) -I../common -I../libxrdp $(DEFINES) + #CFLAGS += -DXRDP_DEBUG + C_OS_FLAGS = $(CFLAGS) -c + LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,. +diff -ur xrdp-0.3.1.orig/xup/Makefile xrdp-0.3.1/xup/Makefile +--- xrdp-0.3.1.orig/xup/Makefile 2006-03-03 20:02:09.000000000 -0500 ++++ xrdp-0.3.1/xup/Makefile 2006-08-01 16:44:51.000000000 -0400 +@@ -9,7 +9,7 @@ + + DEFINES = + +-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES) ++CFLAGS = $(MYCFLAGS) -I../common -fPIC $(DEFINES) + #CFLAGS += -DXRDP_DEBUG + C_OS_FLAGS = $(CFLAGS) -c + LDFLAGS = -shared diff --git a/net-misc/xrdp/files/xrdp-confd b/net-misc/xrdp/files/xrdp-confd new file mode 100644 index 000000000000..a1b7f1420538 --- /dev/null +++ b/net-misc/xrdp/files/xrdp-confd @@ -0,0 +1,5 @@ +# /etc/conf.d/xrdp + +# logfile locations for xrdp and sesman +XRDP_LOGFILE="/var/log/xrdp/xrdp.log" +SESMAN_LOGFILE="/var/log/xrdp/sesman.log" diff --git a/net-misc/xrdp/files/xrdp-initd b/net-misc/xrdp/files/xrdp-initd new file mode 100644 index 000000000000..20b25358a509 --- /dev/null +++ b/net-misc/xrdp/files/xrdp-initd @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/files/xrdp-initd,v 1.1 2006/08/02 00:58:36 chutzpah Exp $ + +depend() { + use net logger +} + +start() { + cd /usr/LIBDIR/xrdp + ebegin "Starting X remote desktop daemon" + start-stop-daemon --start --pidfile /var/run/xrdp.pid --exec /usr/LIBDIR/xrdp/xrdp -- >> ${XRDP_LOGFILE} + ret=${?} + eend ${ret} + [[ ${ret} != 0 ]] && return ${ret} + + ebegin "Starting remote desktop session manager" + start-stop-daemon --start --pidfile /var/run/sesman.pid --exec /usr/LIBDIR/xrdp/sesman >> ${SESMAN_LOGFILE} + ret=${?} + eend ${ret} + return ${ret} +} + +stop() { + ebegin "Stopping X remote desktop daemon" + start-stop-daemon --stop --pidfile /var/run/xrdp.pid + ret=${?} + eend ${ret} + + ebegin "Stopping remote desktop session manager" + start-stop-daemon --stop --pidfile /var/run/sesman.pid + ret=${?} + eend ${ret} + return ${ret} +} |