voyageur 15/01/16 15:53:46
Added: x2goserver-4.0.1.18-use_printf.patch
x2goserver-4.0.1.18-fix_local_desktop_sharing.patch
Log:
Fix invalid 'echo -n' usage (#528452), remove dangling symlink (#521126),
both by polynomial-c. Also fix local desktop sharing
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
C74525F2)
Revision Changes Path
1.1
net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch?rev=1.1&content-type=text/plain
Index: x2goserver-4.0.1.18-use_printf.patch
===================================================================
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
}
1.1
net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch?rev=1.1&content-type=text/plain
Index: x2goserver-4.0.1.18-fix_local_desktop_sharing.patch
===================================================================
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);
