diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/x2goserver/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/x2goserver/files')
5 files changed, 135 insertions, 0 deletions
diff --git a/net-misc/x2goserver/files/x2gocleansessions.service b/net-misc/x2goserver/files/x2gocleansessions.service new file mode 100644 index 000000000000..393d841c5acd --- /dev/null +++ b/net-misc/x2goserver/files/x2gocleansessions.service @@ -0,0 +1,10 @@ +[Unit] +Description=x2go - remote desktop server +After=syslog.target network.target + +[Service] +ExecStart=/usr/sbin/x2gocleansessions +PIDFile=/run/x2goserver.pid + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch new file mode 100644 index 000000000000..11cef863be06 --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch @@ -0,0 +1,19 @@ +diff -Naur x2goserver-4.0.1.18.orig/x2goserver/bin/x2golistdesktops x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops +--- x2goserver-4.0.1.18.orig/x2goserver/bin/x2golistdesktops 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops 2015-01-14 10:52:55.044479499 +0100 +@@ -60,7 +60,15 @@ + $rdisp="I${rdisp}I"; + + my $uname=$ENV{'USER'}; ++ ++# on Debian the ss command is in /usr/bin, on Fedora, it is in /usr/sbin... ++# -> so we need to tweak the PATH env var a little here... ++my $old_PATH=$ENV{'PATH'}; ++$ENV{'PATH'}="$ENV{'PATH'}:/usr/sbin:/sbin"; + my $lines=`ss -lxu`; ++$ENV{'PATH'}=$old_PATH; ++undef $old_PATH; ++ + my @lines=split("\n", "$lines"); + + my @outp = grep ( /(@| )\/tmp\/.X11-unix\/X.*/, @lines); diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch new file mode 100644 index 000000000000..868c52a0564e --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch @@ -0,0 +1,27 @@ +diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession +index b9ef15e..94692db 100755 +--- a/x2goserver-xsession/etc/Xsession ++++ b/x2goserver-xsession/etc/Xsession +@@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then + + # Set up i18n environment + if [ -r /etc/profile.d/lang.sh ]; then ++ set +e + . /etc/profile.d/lang.sh ++ set -e + fi + + # merge in defaults +@@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then + + # run all system xinitrc shell scripts. + for file in /etc/x2go/xinitrc.d/* ; do ++ set +e + [ -r "$file" ] && . $file ++ set -e + done + + # Prefix launch of session with ssh-agent if available and not already running. +-- +1.7.9.5 + diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch new file mode 100644 index 000000000000..434deb6daa5e --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch @@ -0,0 +1,58 @@ +diff -Naur x2goserver-4.0.1.18.orig/rpm/x2goserver.init x2goserver-4.0.1.18/rpm/x2goserver.init +--- x2goserver-4.0.1.18.orig/rpm/x2goserver.init 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/rpm/x2goserver.init 2015-01-14 11:23:42.840796430 +0100 +@@ -35,7 +35,7 @@ + mkdir $XSOCKDIR + chmod 1777 $XSOCKDIR + fi +- echo -n $"Starting $prog: " ++ printf '%s' $"Starting $prog: " + daemon $exec $OPTS + retval=$? + echo +@@ -43,7 +43,7 @@ + } + + stop() { +- echo -n $"Stopping $prog: " ++ printf '%s' $"Stopping $prog: " + killproc $exec + retval=$? + echo +diff -Naur x2goserver-4.0.1.18.orig/x2goserver/bin/x2gopath x2goserver-4.0.1.18/x2goserver/bin/x2gopath +--- x2goserver-4.0.1.18.orig/x2goserver/bin/x2gopath 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/x2goserver/bin/x2gopath 2015-01-14 11:25:57.105755690 +0100 +@@ -32,12 +32,12 @@ + + # The following section is subject to substitution by distro packaging tools. + case "$1" in +- base) echo -n "$base";; +- lib) echo -n "$base/lib/x2go";; +- libexec) echo -n "$base/lib/x2go";; +- share) echo -n "$base/share/x2go";; +- nx-x11) echo -n "$base/lib/nx/X11";; +- xinerama) echo -n "$base/lib/nx/X11/Xinerama";; ++ base) printf '%s' "$base";; ++ lib) printf '%s' "$base/lib/x2go";; ++ libexec) printf '%s' "$base/lib/x2go";; ++ share) printf '%s' "$base/share/x2go";; ++ nx-x11) printf '%s' "$base/lib/nx/X11";; ++ xinerama) printf '%s' "$base/lib/nx/X11/Xinerama";; + *) exit 1;; + esac; + +diff -Naur x2goserver-4.0.1.18.orig/x2goserver-xsession/etc/Xsession x2goserver-4.0.1.18/x2goserver-xsession/etc/Xsession +--- x2goserver-4.0.1.18.orig/x2goserver-xsession/etc/Xsession 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/x2goserver-xsession/etc/Xsession 2015-01-14 11:23:42.840796430 +0100 +@@ -26,9 +26,9 @@ + # pretty-print messages of arbitrary length (no trailing newline); use + # xmessage if it is available and $DISPLAY is set + MESSAGE="$PROGNAME: $*" +- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; ++ printf '%s' "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; + if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then +- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - ++ printf '%s' "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - + fi + } + diff --git a/net-misc/x2goserver/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init new file mode 100644 index 000000000000..a6b7a66f7889 --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver.init @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +DAEMON=/usr/sbin/x2gocleansessions +PIDFILE=/var/run/x2goserver.pid + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ + --exec ${DAEMON} -- $DAEMON_OPTS + + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + eend $? +} |