net-misc/x2goserver: clean some versions

Package-Manager: portage-2.2.27

3 files changed, 0 insertions, 104 deletions

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
deleted file mode 100644
index 11cef863be06..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 868c52a0564e..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 434deb6daa5e..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
- }
-