Re: [X2Go-Dev] "pidof: command not found" error
On Saturday 2014-02-01 15:28, Michael DePaulo wrote:
>I did some more investigation last night.
>
>1. Fedora has "pidof" under /usr/sbin .
>(Debian 7 has it under /bin/)
>
>2. Another problem is that x2gosuspend-desktopsharing is looking for
>x2gosyslog under /usr/lib/x2go/ instead of under /usr/lib64/x2go .
>(Debian 7 64-bit has it under /usr/lib/x2go/)
That sounds about right; if x2gosyslog is a runnable program
it should be in ${pkglibexecdir}.
The only "issue" is that different distros have a different idea
about what (pkg)libexecdir should be.
>3. Another problem is that x2goterminate-desktopsharing is looking for
>x2gosyslog under /usr/lib/x2go/ instead of under /usr/lib64/x2go .
>(Debian 7 64-bit has it under /usr/lib/x2go/)
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] replacing su calls in X2Go Server scripts with sudo (or ???)
On Wednesday 2014-01-08 14:11, Mike Gabriel wrote: > > Feedback? Request for comments??? Any other approach thinkable??? $ su root -s /home/jengelh/echoargs bing bang bong Password: -> bing -> bang -> bong ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#377: init scripts
I seem to remember that start-stop-daemon might have been part of LSB,
but then again, maybe not? (In the current openSUSE release with
systemd, start-stop-daemon is part of the dpkg package.)
So the following are the init scripts currently running here. They lack
in quality, are dirt hacks, and only do the one thing they were tested
for. There is a lack of quoting all over the place.#!/bin/bash
#
# Start the X2Go Session Broker PAM Authentication Service
#
# Copyright © 2012 Mike Gabriel
# Distributable under the terms of the GNU AGPL version 2.
#
### BEGIN INIT INFO
# Provides: x2gobroker-authservice
# Required-Start:$network $remote_fs $syslog x2gobroker-daemon
# Required-Stop: $network $remote_fs $syslog x2gobroker-daemon
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: X2Go Session Broker PAM Authentication Service
# Description: PAM authentication service for X2Go Session Broker
### END INIT INFO
. /etc/rc.status
# First reset status of this service
rc_reset
AUTHSERVICE=/usr/sbin/x2gobroker-authservice
test -d /run && RUNDIR=/run || RUNDIR=/var/run
PIDFILE_AUTHSERVICE=$RUNDIR/x2gobroker/x2gobroker-authservice.pid
DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker
DEBIANCONFIG_AUTHSERVICE=/etc/default/x2gobroker-authservice
test -x "$AUTHSERVICE" || exit 0
START_AUTHSERVICE=false
X2GOBROKER_DEBUG=0
X2GOBROKER_DAEMON_USER='x2gobroker'
X2GOBROKER_DAEMON_GROUP='x2gobroker'
X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket"
test -f $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON
test -f $DEBIANCONFIG_AUTHSERVICE && . $DEBIANCONFIG_AUTHSERVICE
if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then
X2GOBROKER_DAEMON_USER=nobody
fi
if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then
X2GOBROKER_DAEMON_GROUP=nogroup
fi
# create PID directory
mkdir -p $RUNDIR/x2gobroker
chown $X2GOBROKER_DAEMON_USER:$X2GOBROKER_DAEMON_GROUP $RUNDIR/x2gobroker
chmod 0770 $RUNDIR/x2gobroker
export X2GOBROKER_DEBUG
export X2GOBROKER_DAEMON_USER
export X2GOBROKER_DAEMON_GROUP
export X2GOBROKER_AUTHSERVICE_SOCKET
case "$1" in
start)
echo -n "Starting X2go Session authservice standalone daemon ... "
echo startproc -u $X2GOBROKER_DAEMON_USER -g $X2GOBROKER_DAEMON_GROUP
-p $PIDFILE_AUTHSERVICE $AUTHSERVICE -s $X2GOBROKER_AUTHSERVICE_SOCKET -o
$X2GOBROKER_DAEMON_USER -g $X2GOBROKER_DAEMON_GROUP -p 0666
startproc -u $X2GOBROKER_DAEMON_USER -g $X2GOBROKER_DAEMON_GROUP -p
$PIDFILE_AUTHSERVICE $AUTHSERVICE -s $X2GOBROKER_AUTHSERVICE_SOCKET -o
$X2GOBROKER_DAEMON_USER -g $X2GOBROKER_DAEMON_GROUP -p 0666
pidofproc x2gobroker-authservice > $PIDFILE_AUTHSERVICE
rc_status -v
;;
stop)
echo -n "Stopping X2go Session authservice standalone daemon ... "
killproc -TERM -p $PIDFILE_AUTHSERVICE x2gobroker-authservice
rm -f $X2GOBROKER_AUTHSERVICE_SOCKET $PIDFILE_AUTHSERVICE
# Remember status and be verbose
rc_status -v
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
status)
echo -n "Checking for X2go Session authservice ... "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.
# Status has a slightly different for the status command:
# 0 - service running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running
# NOTE: checkproc returns LSB compliant status values.
checkproc -p $PIDFILE_AUTHSERVICE x2gobroker-authservice
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|status|restart}"
exit 1
;;
esac
rc_exit
#!/bin/bash
#
# Start the X2Go Session Broker standalone daemon
#
# Copyright © 2012 Mike Gabriel
# Distributable under the terms of the GNU AGPL version 2.
#
### BEGIN INIT INFO
# Provides: x2gobroker-daemon
# Required-Start:$network $remote_fs $syslog sshd
# Required-Stop: $network $remote_fs $syslog sshd
# Default-Start: 3 5
# Default-Stop: 0 1 6
# Short-Description: X2Go Session Broker standalone daemon
# Description: X2Go Session Broker daemon comes with its own HTTP daemon
### END INIT INFO
. /etc/rc.status
# First reset status of this service
rc_reset
DAEMON=/usr/sbin/x2gobroker
test -d /run && RUNDIR=/run || RUNDIR=/var/run
PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid
DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker
DEBIANCONFIG_DAEMON=/etc/default/x2gobroker-daemon
test -x "$DAEMON" || exit 0
START_BROKER=false
DAEMON_BIND_ADDRESS=0.0.0.0:8080
X2GOBROKER_DEBUG=0
X2GOBROKER_DAEMON_USER='x2gobroker'
X2GOBROKER_DAEMON_GROUP=
[X2Go-Dev] Bug#377: paramiko fails to recognize known_hosts
When started from sysvinit, the HOME environment variable is not set (what to, anyway!), and startproc does not set HOME _either_. Therefore, /etc/init.d/x2gobroker-daemon needs a export HOME=/var/lib/x2gobroker or something nicer of equal footing so that /usr/sbin/x2gobroker has something to work with. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#377: paramiko fails to recognize known_hosts
strace reveals this:
2844 open("//.ssh/known_hosts", O_RDONLY) = -1 ENOENT (No such file or
directory)
Looking at the environ of a newly-started x2gobroker:
# hexdump -C /proc/20044/environ
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ||
*
0840 00 00 00 00 00 00 00 |...|
0847
#
So the environment was modified inside python and I have no
further clue on what its actual state is, whether the environ
array just moved in memory (plausible), or destroyed in-place
leaving nothing for paramiko.
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#377: paramiko fails to recognize known_hosts
Package: x2gobroker
Version: 0.0.2.3
When logging into a x2gobroker-0.0.2.3 with paramiko-1.11.0,
it so happens that, for whatever reason, it rejects the
remote side's key despite that being in
/var/lib/x2gobroker/.ssh/known_hosts.
{u'defsndport': False, u'useiconv': False, u'iconvfrom': 'UTF-8', u'height':
768, u'pack': '16m-jpeg', u'export': '', u'quality': 9, u'fullscreen': False,
u'layout': '', 'host=terminalsrv2': '172.18.7.216', 'host=terminalsrv1':
'172.18.7.205', u'width': 1024, u'speed': 4, u'soundtunnel': False,
u'soundsystem': 'pulse', u'print': True, u'type': 'auto', u'sndport': 4713,
u'xinerama': True, u'usekbd': True, u'variant': '', u'applications':
['TERMINAL', 'WWWBROWSER', 'MAILCLIENT', 'OFFICE'], u'host': ['terminalsrv1',
'terminalsrv2', 'terminalsrv3'], u'link': 'lan', u'multidisp': False,
'host=terminalsrv3': '172.18.7.214', u'fstunnel': False, u'sound': False,
u'rootless': False, u'name': 'Terminalsitzung starten LAN Einstellungen',
u'sshproxyport': 22, u'iconvto': 'UTF-8', u'directrdp': False, u'useexports':
True, u'command': 'GNOME', u'dpi': 96, u'sshport': 22, u'setdpi': 0,
u'startsoundsystem': 'false', u'user': ''}
['terminalsrv1', 'terminalsrv2', 'terminalsrv3']
['terminalsrv3', 'terminalsrv1', 'terminalsrv2']
{u'hostname': 'terminalsrv2', u'port': 22}
starting thread (client mode): 0xe8ded0L
Connected (version 2.0, client OpenSSH_5.1)
kex algos:['diffie-hellman-group-exchange-sha256',
'diffie-hellman-group-exchange-sha1', 'diffie-hellman-group14-sha1',
'diffie-hellman-group1-sha1'] server key:['ssh-rsa', 'ssh-dss'] client
encrypt:['aes128-cbc', '3des-cbc', 'blowfish-cbc', 'cast128-cbc', 'arcfour128',
'arcfour256', 'arcfour', 'aes192-cbc', 'aes256-cbc',
'rijndael-...@lysator.liu.se', 'aes128-ctr', 'aes192-ctr', 'aes256-ctr'] server
encrypt:['aes128-cbc', '3des-cbc', 'blowfish-cbc', 'cast128-cbc', 'arcfour128',
'arcfour256', 'arcfour', 'aes192-cbc', 'aes256-cbc',
'rijndael-...@lysator.liu.se', 'aes128-ctr', 'aes192-ctr', 'aes256-ctr'] client
mac:['hmac-md5', 'hmac-sha1', 'umac...@openssh.com', 'hmac-ripemd160',
'hmac-ripemd...@openssh.com', 'hmac-sha1-96', 'hmac-md5-96'] server
mac:['hmac-md5', 'hmac-sha1', 'umac...@openssh.com', 'hmac-ripemd160',
'hmac-ripemd...@openssh.com', 'hmac-sha1-96', 'hmac-md5-96'] client
compress:['none', 'z...@openssh.com'] server compress:['none',
'z...@openssh.com'] client lang:
[''] ser
ver lang:[''] kex follows?False
Ciphers agreed: local=aes128-ctr, remote=aes128-ctr
using kex diffie-hellman-group1-sha1; server key type ssh-rsa; cipher: local
aes128-ctr, remote aes128-ctr; mac: local hmac-sha1, remote hmac-sha1;
compression: local none, remote none
Switch to new keys ...
/usr/lib64/python2.6/site-packages/paramiko/client.py:95:
UserWarning: Unknown ssh-rsa host key for terminalsrv2:
4d1d9d46a16da7d8c5a3829c920ff5da
(key.get_name(), hostname, hexlify(key.get_fingerprint(
['terminalsrv3', 'terminalsrv1']
{u'hostname': 'terminalsrv1', u'port': 22}
starting thread (client mode): 0xe95cd0L
Connected (version 2.0, client OpenSSH_5.1)
kex algos:['diffie-hellman-group-exchange-sha256',
'diffie-hellman-group-exchange-sha1', 'diffie-hellman-group14-sha1',
'diffie-hellman-group1-sha1'] server key:['ssh-rsa', 'ssh-dss'] client
encrypt:['aes128-cbc', '3des-cbc', 'blowfish-cbc', 'cast128-cbc', 'arcfour128',
'arcfour256', 'arcfour', 'aes192-cbc', 'aes256-cbc',
'rijndael-...@lysator.liu.se', 'aes128-ctr', 'aes192-ctr', 'aes256-ctr'] server
encrypt:['aes128-cbc', '3des-cbc', 'blowfish-cbc', 'cast128-cbc', 'arcfour128',
'arcfour256', 'arcfour', 'aes192-cbc', 'aes256-cbc',
'rijndael-...@lysator.liu.se', 'aes128-ctr', 'aes192-ctr', 'aes256-ctr'] client
mac:['hmac-md5', 'hmac-sha1', 'umac...@openssh.com', 'hmac-ripemd160',
'hmac-ripemd...@openssh.com', 'hmac-sha1-96', 'hmac-md5-96'] server
mac:['hmac-md5', 'hmac-sha1', 'umac...@openssh.com', 'hmac-ripemd160',
'hmac-ripemd...@openssh.com', 'hmac-sha1-96', 'hmac-md5-96'] client
compress:['none', 'z...@openssh.com'] server compress:['none',
'z...@openssh.com'] client lang:
[''] ser
ver lang:[''] kex follows?False
Ciphers agreed: local=aes128-ctr, remote=aes128-ctr
using kex diffie-hellman-group1-sha1; server key type ssh-rsa; cipher: local
aes128-ctr, remote aes128-ctr; mac: local hmac-sha1, remote hmac-sha1;
compression: local none, remote none
Switch to new keys ...
/usr/lib64/python2.6/site-packages/paramiko/client.py:95:
UserWarning: Unknown ssh-rsa host key for terminalsrv1:
4d1d9d46a16da7d8c5a3829c920ff5da
(key.get_name(), hostname, hexlify(key.get_fingerprint(
thservice.logEOF in transport thread
['terminalsrv3']
{u'hostname': 'terminalsrv3', u'port': 22}
starting thread (client mode): 0xe95290L
Connected (version 2.0, client OpenSSH_5.1)
kex algos:['diffie-hellman-group-exchange-sha256',
'diffie-hellman-group-exchange-sha1', 'diffie-hellman-group14-sha1',
'diffie-hellman-group1-sha1'] server key:['ssh-rsa', 'ssh-dss'] client
encrypt:['aes128-cbc',
[X2Go-Dev] Bug#332: RPM issue of the OSBD queues
On Tuesday 2013-10-29 15:54, Mike Gabriel wrote: > Hi Jan, > > On Di 29 Okt 2013 15:41:09 CET, Jan Engelhardt wrote: > >> On Tuesday 2013-10-29 14:51, Frank Warnke wrote: >>> >>> If I have figured out the problem, it looks like the x2goserver installation >>> script on CentOS v6 may need to have "chkconfig --add x2gocleansessions" run >>> in it. >> >> Such consideration has already been done by distros, and I concur >> with openSUSE's current opinion to not enable services just because >> their constituting package got installed (possibly automated and/or >> drawing in dependent packages). > > thanks for clearing that up. > > Can you please add that bit of information to the X2Go wiki then? The X2Go > Server DB will fill with loads of dead sessions if the x2gocleansessions Perl > script (via init script) does not run. Which makes me wonder - can't you remove the dead sockets when "it" exits? ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#332: RPM issue of the OSBD queues
On Tuesday 2013-10-29 14:51, Frank Warnke wrote: > >If I have figured out the problem, it looks like the x2goserver installation >script on CentOS v6 may need to have "chkconfig --add x2gocleansessions" run >in it. Such consideration has already been done by distros, and I concur with openSUSE's current opinion to not enable services just because their constituting package got installed (possibly automated and/or drawing in dependent packages). ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#332: RPM issue of the OSBD queues
On Friday 2013-10-25 12:41, Mike Gabriel wrote: > > can you take a look at issue #332 in X2Go BTS. Obviously, you should add > something to the RPM package's init script of X2Go Server that resembles this > http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff;f=debian/x2goserver.init;h=5ae86e4832e3f4c497cc238510aa26375d9bcfd3;hp=b56a4cb5898bdf805b533d153a54fd138e06f9b9;hb=b3d9404c654c051875a1f3abcbd3ff81aa6780b7;hpb=d7f10874cafc3113afe50d0e109f084533aace3f The init script is already whatever was in debian/x2goserver.init. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] x2go no longer works after reboot on CentOS 6.4
On Monday 2013-06-10 12:46, Mike Gabriel wrote: >> >> As a note of interest, /usr/libexec/x2go is the correct directory it seems: >> >> However, there are also files in /usr/lib64/x2go/ >> >> [root@local ~]# LC_ALL=C ls -al /usr/lib64/x2go/ >> total 72 >> drwxr-xr-x. 2 root root 4096 Jun 6 13:28 . >> dr-xr-xr-x. 49 root root 36864 Jun 6 19:49 .. >> -rw-r--r--. 1 root root 20852 May 19 01:02 x2godbwrapper.pm >> -rw-r--r--. 1 root root 1834 May 19 01:02 x2gologlevel.pm >> [root@local ~]# > > All those files should be in the same folder. > The folder should be echoed to stdout by this command: > > x2gopath libexec > I am in an undecided state on that. System Perl modules also live in an *arch-dependent* directory (e.g. /usr/lib/perl5/5.16.0/x86_64-linux-thread-multi) because they can have arch-specific native code. As such, placing .pm files into an arch-specific x2go path (/usr/lib64/x2go satisfies this on current RH/SUSE) is a safe choice. This is also why the x2go perl scripts use `x2gopath lib` and not `x2gopath libexec`. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#220: Bug#219: x2gosqlitewrapper is looking for x2gosqlitewrapper.pl in /usr/local/lib/x2go directory
fixed #220 thanks #221 is implemented in the RPM as well - and there is the small mathematical chance it can break 220 :) So just please test. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#219: x2gosqlitewrapper is looking for x2gosqlitewrapper.pl in /usr/local/lib/x2go directory
On Thursday 2013-05-23 00:20, Mike Gabriel wrote: > >> Package: x2goserverVersion: 4.0.0.2 >> I recently upgraded x2goserver to 4.0.0.2 on RHEL6 and it stopped working. I >> found out that x2gosqlitewrapper is looking for x2gosqlitewrapper.pl in >> /usr/local/lib/x2go directory. So when I created a symlink in that directory >> it started working again. >> Please change the path for the file in source code or change the package to >> create the link on installation. > > @Jan: can you check the RPM packages and make sure that the PREFIX path > reaches > the main Makefile of X2Go Server? A similar change to the packaging has to be > introduced to x2gobroker.git. Fixed for x2goserver. In x2gobroker however, there are still lots of hardcoded (in the tarball!) /usr/lib/x2go instead of $(LIBDIR)/x2go... ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#211: [PATCH] build: also install defaults and manpages through `make install`
---
Makefile | 26 +++-
debian/python-x2gobroker.default | 38 ---
debian/x2gobroker-authservice.default | 19 --
debian/x2gobroker-daemon.default | 34 ---
python-x2gobroker.default | 38 +++
x2gobroker-authservice.default| 19 ++
x2gobroker-daemon.default | 34 +++
7 files changed, 112 insertions(+), 96 deletions(-)
delete mode 100644 debian/python-x2gobroker.default
delete mode 100644 debian/x2gobroker-authservice.default
delete mode 100644 debian/x2gobroker-daemon.default
create mode 100644 python-x2gobroker.default
create mode 100644 x2gobroker-authservice.default
create mode 100644 x2gobroker-daemon.default
diff --git a/Makefile b/Makefile
index 02382e5..a30ea7b 100755
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,10 @@ install:
# python-x2gobroker
python setup.py install --prefix="${PREFIX}"
$${DESTDIR+--root="${DESTDIR}"}
- mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d"
+ mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \
+ "${DESTDIR}/etc/default"
+ ${INSTALL_FILE} python-x2gobroker.default \
+ "${DESTDIR}/etc/default/python-x2gobroker"
${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/"
${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \
etc/broker/x2gobroker-loggers.conf \
@@ -87,13 +90,21 @@ install:
${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/"
# x2gobroker-agent
- mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}"
+ mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \
+ "${DESTDIR}${MANDIR}/man8"
+ ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \
+ "${DESTDIR}${MANDIR}/man8"
${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/"
${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer
"${DESTDIR}${SBINDIR}/"
# x2gobroker-authservice
mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \
- "${DESTDIR}${ETCDIR}/broker"
+ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \
+ "${DESTDIR}${MANDIR}/man8"
+ ${INSTALL_FILE} x2gobroker-authservice.default \
+ "${DESTDIR}/etc/default/x2gobroker-authservice"
+ ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \
+ "${DESTDIR}${MANDIR}/man8"
${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/"
${INSTALL_FILE} logrotate/x2gobroker-authservice \
"${DESTDIR}/etc/logrotate.d/"
@@ -101,7 +112,9 @@ install:
"${DESTDIR}${ETCDIR}/broker/"
# x2gobroker-daemon
- mkdir -p "${DESTDIR}/etc/logrotate.d/"
+ mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default"
+ ${INSTALL_FILE} x2gobroker-daemon.default \
+ "${DESTDIR}/etc/default/x2gobroker-daemon"
${INSTALL_FILE} logrotate/x2gobroker-daemon \
"${DESTDIR}/etc/logrotate.d/"
@@ -112,7 +125,10 @@ install:
${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/"
# x2gobroker
- mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}"
+ mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \
+ "${DESTDIR}${MANDIR}/man8"
+ ${INSTALL_FILE} man/man8/x2gobroker{,-keygen,-testauth}.8* \
+ "${DESTDIR}${MANDIR}/man8"
${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/"
${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \
"${DESTDIR}${SBINDIR}/"
diff --git a/debian/python-x2gobroker.default b/debian/python-x2gobroker.default
deleted file mode 100644
index 67b93cb..000
--- a/debian/python-x2gobroker.default
+++ /dev/null
@@ -1,38 +0,0 @@
-# X2Go Broker Session Broker (common) configuration for Debian
-
-# The posix user/group ID the broker runs under (do not change!)
-# if you change those nonetheless, make sure that the log file
-# directory (default: /var/log/x2gobroker) and files in there are
-# writable by that user
-#X2GOBROKER_DAEMON_USER=x2gobroker
-#X2GOBROKER_DAEMON_GROUP=x2gobroker
-
-# The posix user under which the x2gobroker-agent can be launched on
-# remote X2Go Servers.
-#X2GOBROKER_AGENT_USER=x2gobroker
-
-# Control debug mode (0=disable, 1=enable).
-#
-# Apart from verbose logging in /var/log/x2gobroker/*.log, this will
-# also make the broker available through http GET method requests
-# (otherwise: POST method requests only) and you will be able to test
-# the broker through your web browser
-#
-# This value has an effect on all (Python-based) X2Go Session Broker
-# services and can be overridden in /etc/default
[X2Go-Dev] Bug#211: 211/x2go installation
This is all I currently want, as of tonight. The init scripts I do not care so much where they live, provided they are in the tar somewhere. The following changes since commit a62fa864d38a7bad4938905782049d5d6af8d9bc: Populate install target of Makefile. (Fixes: #201). (2013-05-15 10:15:23 +0200) are available in the git repository at: git://git.inai.de/x2gobroker master for you to fetch changes up to 9a445ed1e0b9e1873079c2adb5c1d9865361969b: build: also install defaults and manpages through `make install` (2013-05-15 22:49:36 +0200) Jan Engelhardt (1): build: also install defaults and manpages through `make install` Makefile | 26 +- ...x2gobroker.default => python-x2gobroker.default | 0 ...rvice.default => x2gobroker-authservice.default | 0 ...ker-daemon.default => x2gobroker-daemon.default | 0 4 files changed, 21 insertions(+), 5 deletions(-) rename debian/python-x2gobroker.default => python-x2gobroker.default (100%) rename debian/x2gobroker-authservice.default => x2gobroker-authservice.default (100%) rename debian/x2gobroker-daemon.default => x2gobroker-daemon.default (100%) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#201: Bug#201: x2gobroker: incomplete install
On Tuesday 2013-05-14 12:48, Mike Gabriel wrote: > python-x2gobroker (mostly covered by setup.py): > > /. > /etc > /etc/default > /etc/default/python-x2gobroker [...] Ich habe keinen Plan, wo die Datei herkommen soll. Sie ist in /debian/* absolut nicht referenziert. --- yourlist2013-05-15 16:34:44.890113044 +0200 +++ susepkg 2013-05-15 16:31:32.657658085 +0200 @@ -1,22 +1,11 @@ -/etc -/etc/apache2 -/etc/apache2/conf.d -/etc/apache2/conf.d/x2gobroker-wsgi -/etc/apache2/sites-available -/etc/apache2/sites-available/x2gobroker -/etc/default -/etc/default/python-x2gobroker -/etc/default/x2gobroker-authservice -/etc/default/x2gobroker-daemon -/etc/init.d -/etc/init.d/x2gobroker-authservice -/etc/init.d/x2gobroker-daemon -/etc/logrotate.d /etc/logrotate.d/x2gobroker-authservice /etc/logrotate.d/x2gobroker-daemon /etc/logrotate.d/x2gobroker-wsgi /etc/pam.d /etc/pam.d/x2gobroker +/etc/permissions.d/x2gobroker.easy +/etc/permissions.d/x2gobroker.paranoid +/etc/permissions.d/x2gobroker.secure /etc/x2go /etc/x2go/broker /etc/x2go/broker/x2gobroker-authservice-logger.conf @@ -25,178 +14,108 @@ /etc/x2go/x2gobroker-wsgi.apache.conf /etc/x2go/x2gobroker-wsgi.apache.vhost /etc/x2go/x2gobroker.conf -/usr -/usr/bin /usr/bin/x2gobroker-testauth -/usr/lib -/usr/lib/python2.7 -/usr/lib/python2.7/site-packages /usr/lib/python2.7/site-packages/x2gobroker -/usr/lib/python2.7/site-packages/x2gobroker-0.0.2.1.egg-info -/usr/lib/python2.7/site-packages/x2gobroker-0.0.2.1.egg-info/PKG-INFO -/usr/lib/python2.7/site-packages/x2gobroker-0.0.2.1.egg-info/SOURCES.txt -/usr/lib/python2.7/site-packages/x2gobroker-0.0.2.1.egg-info/dependency_links.txt -/usr/lib/python2.7/site-packages/x2gobroker-0.0.2.1.egg-info/top_level.txt +/usr/lib/python2.7/site-packages/x2gobroker-0.0.1.2-py2.7.egg-info +/usr/lib/python2.7/site-packages/x2gobroker-0.0.1.2-py2.7.egg-info/PKG-INFO +/usr/lib/python2.7/site-packages/x2gobroker-0.0.1.2-py2.7.egg-info/SOURCES.txt +/usr/lib/python2.7/site-packages/x2gobroker-0.0.1.2-py2.7.egg-info/dependency_links.txt +/usr/lib/python2.7/site-packages/x2gobroker-0.0.1.2-py2.7.egg-info/top_level.txt /usr/lib/python2.7/site-packages/x2gobroker/__init__.py +/usr/lib/python2.7/site-packages/x2gobroker/__init__.pyc /usr/lib/python2.7/site-packages/x2gobroker/_paramiko.py +/usr/lib/python2.7/site-packages/x2gobroker/_paramiko.pyc /usr/lib/python2.7/site-packages/x2gobroker/agent.py +/usr/lib/python2.7/site-packages/x2gobroker/agent.pyc /usr/lib/python2.7/site-packages/x2gobroker/authmechs /usr/lib/python2.7/site-packages/x2gobroker/authmechs/__init__.py +/usr/lib/python2.7/site-packages/x2gobroker/authmechs/__init__.pyc /usr/lib/python2.7/site-packages/x2gobroker/authmechs/base_authmech.py +/usr/lib/python2.7/site-packages/x2gobroker/authmechs/base_authmech.pyc /usr/lib/python2.7/site-packages/x2gobroker/authmechs/htpasswd_authmech.py +/usr/lib/python2.7/site-packages/x2gobroker/authmechs/htpasswd_authmech.pyc /usr/lib/python2.7/site-packages/x2gobroker/authmechs/pam_authmech.py +/usr/lib/python2.7/site-packages/x2gobroker/authmechs/pam_authmech.pyc /usr/lib/python2.7/site-packages/x2gobroker/authmechs/testsuite_authmech.py +/usr/lib/python2.7/site-packages/x2gobroker/authmechs/testsuite_authmech.pyc /usr/lib/python2.7/site-packages/x2gobroker/authservice.py +/usr/lib/python2.7/site-packages/x2gobroker/authservice.pyc /usr/lib/python2.7/site-packages/x2gobroker/basicauth.py +/usr/lib/python2.7/site-packages/x2gobroker/basicauth.pyc /usr/lib/python2.7/site-packages/x2gobroker/brokers /usr/lib/python2.7/site-packages/x2gobroker/brokers/__init__.py +/usr/lib/python2.7/site-packages/x2gobroker/brokers/__init__.pyc /usr/lib/python2.7/site-packages/x2gobroker/brokers/base_broker.py +/usr/lib/python2.7/site-packages/x2gobroker/brokers/base_broker.pyc /usr/lib/python2.7/site-packages/x2gobroker/brokers/inifile_broker.py +/usr/lib/python2.7/site-packages/x2gobroker/brokers/inifile_broker.pyc /usr/lib/python2.7/site-packages/x2gobroker/brokers/ldap_broker.py +/usr/lib/python2.7/site-packages/x2gobroker/brokers/ldap_broker.pyc /usr/lib/python2.7/site-packages/x2gobroker/brokers/zeroconf_broker.py +/usr/lib/python2.7/site-packages/x2gobroker/brokers/zeroconf_broker.pyc /usr/lib/python2.7/site-packages/x2gobroker/config.py +/usr/lib/python2.7/site-packages/x2gobroker/config.pyc /usr/lib/python2.7/site-packages/x2gobroker/defaults.py +/usr/lib/python2.7/site-packages/x2gobroker/defaults.pyc /usr/lib/python2.7/site-packages/x2gobroker/loggers.py +/usr/lib/python2.7/site-packages/x2gobroker/loggers.pyc /usr/lib/python2.7/site-packages/x2gobroker/nameservices /usr/lib/python2.7/site-packages/x2gobroker/nameservices/__init__.py +/usr/lib/python2.7/site-packages/x2gobroker/nameservices/__init__.pyc /usr/lib/python2.7/site-packages/x2gobroker/nameservices/base_nameservice.py +/usr/lib/python2.7/site-packages/x2gobroker/nameservices/base_nameservice.pyc /usr/lib/python2.7/site-packages/x2gobroker/namese
[X2Go-Dev] Bug#201: Bug#201: x2gobroker: incomplete install
On Tuesday 2013-05-14 12:48, Mike Gabriel wrote: >> What is expected instead: >> Install the just-compiled programs and python codes. > > The source tree of x2gobroker.git provides several binary packages to install > (see /debian/control for details and dependencies [1]). I have looked at /debian/*.install and wrote the Makefile (posted to this bug) based upon that for a start. If it is not complete, this can be addresses in further patches on top. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#201: Acknowledgement (x2gobroker: incomplete install)
From 4ef541a76560dd6d9a1d322c96d06804052c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt
Date: Tue, 7 May 2013 11:57:04 +0200
Subject: [PATCH] Populate install target of Makefile
---
Makefile | 43 +++
1 file changed, 43 insertions(+)
diff --git a/Makefile b/Makefile
index b5c2148..02382e5 100755
--- a/Makefile
+++ b/Makefile
@@ -73,3 +73,46 @@ clean_indep:
test:
install:
+ mkdir -p "${DESTDIR}/var/lib/x2gobroker" \
+ "${DESTDIR}/var/log/x2gobroker"
+
+ # python-x2gobroker
+ python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"}
+ mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d"
+ ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/"
+ ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \
+ etc/broker/x2gobroker-loggers.conf \
+ "${DESTDIR}${ETCDIR}/broker/"
+ mkdir -p "${DESTDIR}/etc/pam.d"
+ ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/"
+
+ # x2gobroker-agent
+ mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}"
+ ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/"
+ ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/"
+
+ # x2gobroker-authservice
+ mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \
+ "${DESTDIR}${ETCDIR}/broker"
+ ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/"
+ ${INSTALL_FILE} logrotate/x2gobroker-authservice \
+ "${DESTDIR}/etc/logrotate.d/"
+ ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \
+ "${DESTDIR}${ETCDIR}/broker/"
+
+ # x2gobroker-daemon
+ mkdir -p "${DESTDIR}/etc/logrotate.d/"
+ ${INSTALL_FILE} logrotate/x2gobroker-daemon \
+ "${DESTDIR}/etc/logrotate.d/"
+
+ # x2gobroker-wsgi
+ mkdir -p "${DESTDIR}${ETCDIR}" "${DESTDIR}/etc/logrotate.d"
+ ${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \
+ "${DESTDIR}${ETCDIR}/"
+ ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/"
+
+ # x2gobroker
+ mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}"
+ ${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/"
+ ${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \
+ "${DESTDIR}${SBINDIR}/"
--
1.8.2
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#201: x2gobroker: incomplete install
Package: x2gobroker Version: 0.0.2.0 What is being executed: make install DESTDIR=/bla What is being observed: make: Nothing to be done for `install'. What is expected instead: Install the just-compiled programs and python codes. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#196: Make tests optional
Package: libpam-x2go Version: 0.0.1.0From 427b8eeaa4f43547cea31aacfccc197388e51d30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 11 Nov 2012 16:03:23 +0100 Subject: [PATCH] build: make building tests optional --- Makefile.am |8 +--- configure.ac |3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9477c1c..7d71690 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ -SUBDIRS = \ - src \ - tests +SUBDIRS = src + +if HAVE_GTEST +SUBDIRS += tests +endif DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/configure.ac b/configure.ac index 4cbd43d..67f9f7b 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,9 @@ AC_SUBST(PAMMODULEDIR) m4_include([m4/gtest.m4]) CHECK_GTEST if test "x$have_gtest" != "xyes"; then - AC_MSG_ERROR([tests were requested but gtest is not installed.]) + AC_MSG_WARN([tests were requested but gtest is not installed.]) fi +AM_CONDITIONAL([HAVE_GTEST], [test "$have_gtest" != "no"]) ### # gcov coverage reporting -- 1.7.10.4 ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] signtarballs: do sign .tar.xz archives
...and properly quote variables.
---
bin/signtarballs | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/bin/signtarballs b/bin/signtarballs
index 5dc236f..ae6ae80 100755
--- a/bin/signtarballs
+++ b/bin/signtarballs
@@ -2,10 +2,12 @@
test -d _releases_ && cd _releases_ || test -d ../_releases_ && cd
../_releases_ || exit -1
-find * -type f | egrep ".*(\.tar\.gz|\.exe|\.dmg)$" | while read tarball; do
- test -f $tarball.md5 || md5sum $tarball > $tarball.md5
- test -f $tarball.sha1 || sha1sum $tarball > $tarball.sha1
- test -f $tarball.asc || gpg -a -b --sign $tarball
+find * -type f "(" -name "*.tar.gz" -o -name "*.tar.xz" -o \
+ -name "*.exe" -o -name "*.dmg" ")" | \
+ while read tarball; do
+ test -f "$tarball.md5" || md5sum "$tarball" >"$tarball.md5"
+ test -f "$tarball.sha1" || sha1sum "$tarball" >"$tarball.sha1"
+ test -f "$tarball.asc" || gpg -a -b --sign "$tarball"
done
--
1.8.2
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] signing tarballs (was: Re: nx-libs 3.5.0.18 failing to build in launchpad PPA)
The following changes since commit e9fbba66dfd5c33ac39aaac5ce8407bb6a817dda: add script x2go-release-announcement (2013-03-26 23:57:44 +0100) are available in the git repository at: git://git.inai.de/x2go-buildscripts master for you to fetch changes up to 05952eef08decb18410b2fdf9146d7f9c160: signtarballs: do sign .tar.xz archives (2013-03-28 22:43:58 +0100) Jan Engelhardt (1): signtarballs: do sign .tar.xz archives bin/signtarballs | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nx-libs 3.5.0.18 failing to build in launchpad PPA
On Thursday 2013-03-28 09:14, Mike Gabriel wrote: >> Hopefully someone with a better understanding of the patch and build process >> can find a quick fix. >> >> Thanks for your hard work and let me know if you have any questions. > > Thanks for reporting this. It had become into my awareness, yesterday, as > well. > > Issue has been solved, see: > http://permalink.gmane.org/gmane.linux.terminal-server.x2go.announce/35 Could you perhaps sign the uncompressed tarball? That would make it easier for us to use xz on our side. (saves 53% and thus is a very special WIN) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#145: Bug#145: Makefile uses broken substitution
On Friday 2013-03-22 22:35, Mike Gabriel wrote:
> On So 17 Mär 2013 13:21:38 CET Jan Engelhardt wrote:
>
>> Package: nx-libs
>> Version: 3.5.0.17
>>
>> Can't use ${x//...}
>
> the provided patch has been worked in:
> http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=8f151d797b015b7d1070151e75d56587a7f3652f
I think I had a good explanation in the patch file why the ${x//}
substitution did not work, but now the entire log is lost in
8f151d79. What good are the git commit messages if they're thrown away?
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Wednesday 2013-03-13 15:17, Jan Engelhardt wrote: >> >>I believe this is the current error: >>[ 669s] RPM build errors: >>[ 669s] Bad exit status from /var/tmp/rpm-tmp.tWnA7V (%install) After enabling some trace in shell.. /* [1] /usr/lib/rpm/find-debuginfo.sh::206 */ + /usr/lib/rpm/debugedit -b /home/abuild/rpmbuild/BUILD -d /usr/src/debug -i -l /home/abuild/rpmbuild/BUILD/nx-libs-3.5.0.17/debugsources.list /home/abuild/rpmbuild/BUILDROOT/nx-libs-3.5.0.17-0.x86_64/usr/lib64/nx/X11/libxlocale.so.2 Segmentation fault So RHEL6's rpmbuild is broken. Good luck getting that fixed. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Wiki review: RPM based installation of X2Go
On Thursday 2013-03-14 21:34, Mike Gabriel wrote: > Hi all (RPM-based X2Go users), > > can anyone (Jan? Daniel?) update the wiki pages for the client-side X2Go > applications and review or explain how to install x2goclient[1], > pyhoca-gui[2], > pyhoca-cli[3] on RPM based distros? There is no Edit button on the wiki pages, so I suspect one needs a Login. There is no Register button on the Login page, so I suspect one needs a magic 1337 hacker sphere. Which I don't have at hand right now. > [2] http://wiki.x2go.org/doku.php/doc:installation:pyhoca-gui > [3] http://wiki.x2go.org/doku.php/doc:installation:pyhoca-cli ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#145: Makefile uses broken substitution
Package: nx-libs
Version: 3.5.0.17
Can't use ${x//...}
From: Jan Engelhardt
Date: 2013-03-06 23:10:19.962925458 +0100
build: avoid bash4-specific substitution
The ${a/b/c} substitution is not POSIX compatible. Additionally, in
bash 3.x, quotes do not escape slashes. This causes screwed up
installation paths.
SLES 11, bash-3.2-147.9.13
$ dirname="foo/bar"
$ echo ${dirname//"foo/bar"/"omg/nei"}
bar/omg/nei/bar
openSUSE 12.2, bash-4.2-51.6.1
$ dirname="foo/bar"
$ echo ${dirname//"foo/bar"/"omg/nei"}
omg/nei
openSUSE 12.2, dash-0.5.7-5.1.2.x86_64
$ dirname="foo/bar"
$ echo ${dirname//"foo/bar"/"omg/nei"}
dash: 2: Bad substitution
---
Makefile | 12 ++--
replace.sh | 27 +++
2 files changed, 33 insertions(+), 6 deletions(-)
Index: nx-libs-3.5.0.17/Makefile
===
--- nx-libs-3.5.0.17.orig/Makefile
+++ nx-libs-3.5.0.17/Makefile
@@ -95,23 +95,23 @@ install-full:
cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include
# copy libs (for libnx-x11), we want the targets of the links
- find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \
+ . replace.sh; set -x; find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \
libfile=$$(basename $$libpath); \
libdir=$$(dirname $$libpath); \
link=$$(readlink $$libpath); \
\
- mkdir -p $${libdir//exports/.build-exports}; \
- cp -a $${libpath/$$libfile/$$link} $${libdir//exports/.build-exports}; \
+ mkdir -p "$$(string_rep "$$libdir" exports .build-exports)"; \
+ cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \
done;
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11
$(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/
- find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
+ . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
while read dirname; do \
- $(INSTALL_DIR) $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}; \
+ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"; \
$(INSTALL_FILE) $${dirname}/*.h \
- $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}/ || true; \
+ "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"/ || true; \
done; \
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps
Index: nx-libs-3.5.0.17/replace.sh
===
--- /dev/null
+++ nx-libs-3.5.0.17/replace.sh
@@ -0,0 +1,27 @@
+# from http://mywiki.wooledge.org/BashFAQ/021
+
+string_rep()
+{
+ # initialize vars
+ in=$1
+ unset out
+
+ # SEARCH must not be empty
+ test -n "$2" || return
+
+ while true; do
+ # break loop if SEARCH is no longer in "$in"
+ case "$in" in
+ *"$2"*) : ;;
+ *) break;;
+ esac
+
+ # append everything in "$in", up to the first instance of SEARCH, and REP, to "$out"
+ out=$out${in%%"$2"*}$3
+ # remove everything up to and including the first instance of SEARCH from "$in"
+ in=${in#*"$2"}
+ done
+
+ # append whatever is left in "$in" after the last instance of SEARCH to out, and print
+ printf '%s%s\n' "$out" "$in"
+}
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Tuesday 2013-03-12 19:31, Daniel Gibbs wrote: > >I am happy to help Jan out if he requires my help. I do have RHish VMs, but that does not help the motivation :) >My current understanding of the issue is as follows. > >nxagent-3.5.0.17-3.1.x86_64 is asking for a dependency that is only available >on OpenSuse which is xorg-x11-fonts-core. I believe this issue was resolved Was indeed resolved. >however when the rpm's attempted to be built it failed for some reason. >Because of this the rpm's in the repo for RHEL_6 have not updated. > >I believe this is the current error: >[ 669s] RPM build errors: >[ 669s] Bad exit status from /var/tmp/rpm-tmp.tWnA7V (%install) The error is [ 122s] Processing files: libNX_FS6-3.5.0.17-0 [ 122s] error: File not found by glob: /var/tmp/nx-libs-3.5.0.17-build/usr/lib64/nx/libNX_FS.so.6* [ 122s] Processing files: libNX_FS-devel-3.5.0.17-0 [ 122s] error: File not found: /var/tmp/nx-libs-3.5.0.17-build/usr/lib64/nx/libNX_FS.so [ 122s] Processing files: libNX_ICE6-3.5.0.17-0 [ 122s] error: File not found by glob: /var/tmp/nx-libs-3.5.0.17-build/usr/lib64/nx/libNX_ICE.so.6* This is because some files were not properly installed, and that in turn is because of some yet undiscovered problem in nx-libs's Makefiles that only triggers on older systems. I have found some problems that exist between bash-3.x and bash-4.x (that's where RH6 differs from F18), but apparently not all. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] X2Go organigram
On Tuesday 2013-03-12 11:50, Oliver Burger wrote: >> >> Yes, distros exist to do NIH [they will write the spec from scratch again] :) > >Are you involved with any distro so you can say that? Yes, I am involved with a distro, but the viewpoint comes rather from my position as maintainer of, for example, the libHX project, where I had shipped a spec in its tarball up until I noticed all the distros pretty much seemed to ignore it. >And let's see whose spec is older and who did write it from scrath again... >My first x2go packages date back to 2008 and were actually not written >from scratch but based on ALT Linux packages that were already there. >And yours? There was no spec inside nx-libs.tar.gz, so I can in good faith claim "there was none" :-) And since the nx-libs compile procedure seems to change every other release, it would be out of date rather soon. >>>- it's kind of hard to provide universal rpm packages, as the naming >>>shema of libraries and other needed packages does vary quite a lot >> >> For libraries, it is not a problem, because their names are not used >> at all, but RPM-ELF dependencies. And the latter are the same across >> all RPM-using distros. >> >> About the names of non-library packages: not a problem either, >> as we can just make a %if that, then that, %else that, %endif. > >For each and every distro? If need be, yes. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] X2Go organigram
On Tuesday 2013-03-12 09:56, Oliver Burger wrote: >2013/3/8 Jan Engelhardt : >> On Friday 2013-03-08 16:50, Mike Gabriel wrote: >> >>> >>> Jan Engelhard[t] (X2Go for RPM-based distros) > >Wouldn't it be better to let the distros provide their packages? After >all that's what distros are there for, aren't they? Yes, distros exist to do NIH [they will write the spec from scratch again] :) >Of course it's nice for an end user, when his distro does not provide >a package and the upstream project provides it, but from a distro >packager perspective, it's bad, since >- you will necver know about conflicts between third party packages >and those provided by the distro itself. This point is valid. >- it's kind of hard to provide universal rpm packages, as the naming >shema of libraries and other needed packages does vary quite a lot For libraries, it is not a problem, because their names are not used at all, but RPM-ELF dependencies. And the latter are the same across all RPM-using distros. About the names of non-library packages: not a problem either, as we can just make a %if that, then that, %else that, %endif. >- people will always complain to the distro's bug tracker and triaging >teams have much fun explaining to those, that it's not the distro's >fault as the packages in use are not provided by the distro Can't help those souls. Sourceforge staff also gets useless requests about projects they are in no way involved in. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Sunday 2013-03-10 22:35, Moritz Strübe wrote: >Am 10.03.2013 21:28, Daniel Gibbs schrieb: > >> I cannot believe this has still not been fixed! Do the developers >> of x2go realise that no one can install x2goserver on RHEL x64 and >> it variants currently? > >Yes of course. All of us are using RHEL - it's one of the most used >distros after all. I have no idea how this could happen. Most used does not necessarily mean most developed for. I rely on user submissions, because I do not run RHEL. (N.B. I am not an x2go developer either.) RHEL is an old system, but more than that, it is also a system that lacks a lot of components that x2go requires. These two issues require additional time to what is needed to produce packages for contemporary distributions. >> Almost 2 weeks and it has yet to be fixed. > >This is open source! And it's for free. This should really be fixed so >much quicker the bugs in commercial software! It is open, and it is libre. But it is not necessarily gratis. Developers and contributors have to invest time, some do it exclusively using their spare time. If they do not, so be it. You cannot dictate what they are to do in their free time. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] X2Go organigram
On Friday 2013-03-08 16:50, Mike Gabriel wrote: > Hi all, > > I have started a project organigram for X2Go. Feel free to help editing it. > http://wiki.x2go.org/doku.php?id=doc:organigram > > Jan Engelhard (X2Go for RPM-based distros) -rdt seems so hard for many ;-( (It's really my employer who wants the RPMs..) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#143: nx-libs installs into wrong location
On Thursday 2013-03-07 19:12, Mike Gabriel wrote: >> make install \ >> INSTALL_DIR="install -dm0755" \ >> INSTALL_FILE="install -pm0644" \ >> INSTALL_PROGRAM="install -pm0755" \ >> DESTDIR="/var/tmp/whatever" PREFIX="/usr" \ >> NXLIBDIR="/usr/lib64/nx" X2GOLIBDIR="/usr/lib/x2go" >> >> And at the end of the day, rpm notices the following broken link: >> >> [ 126s] ERROR: link target doesn't exist (neither in build root nor in >> installed sys... >> [ 126s] /usr/lib/x2go/bin/x2goagent -> /usr/lib/nx/bin/nxagent >> >> This is because the top-level Makefile does a rather dumb command: >> >> cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent >> x2goagent >> >> so it creates a pointer to a non-existing target. > > Thanks for submitting this bug. Any chance you can provide a patch? This is getting above my head. I already had to endure the silent introduction of the NXLIBDIR variable.. (it's really not fun if suddenly the entire filelist in .spec or whatever else is worthless because USRLIBDIR and SHLIBDIR are no longer used) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#143: nx-libs installs into wrong location
Package: nx-libs Version: 3.5.0.17 Installation is done using make install \ INSTALL_DIR="install -dm0755" \ INSTALL_FILE="install -pm0644" \ INSTALL_PROGRAM="install -pm0755" \ DESTDIR="/var/tmp/whatever" PREFIX="/usr" \ NXLIBDIR="/usr/lib64/nx" X2GOLIBDIR="/usr/lib/x2go" And at the end of the day, rpm notices the following broken link: [ 126s] ERROR: link target doesn't exist (neither in build root nor in installed sys... [ 126s] /usr/lib/x2go/bin/x2goagent -> /usr/lib/nx/bin/nxagent This is because the top-level Makefile does a rather dumb command: cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent so it creates a pointer to a non-existing target. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Tuesday 2013-03-05 13:14, Daniel Gibbs wrote: >> > >> >Any idea when the updated RPM's are being released? >> >> As soon as the automatic compile and mirroring is done. Principally, >> it is in the order of minutes within commit. >> >> The last change was made around 2013-03-01 20:34:09, which makes >> yum complete an install for x2goserver/nx-libs on F18. > >I can see an update in F18 and RHEL_6 i686 however nothing for RHEL_6 x86_64. >So >this is still an issue the nxagent and has not been updated since 21-Feb-2013. >Please can this be checked and updated like the others. Thanks Looks like the build failed there, and the culprit is a known offender: broken debuginfo scripts part of ancient rpm releases. https://build.opensuse.org/package/live_build_log?arch=x86_64&package=nx-libs&project=X11%3ARemoteDesktop%3Ax2go&repository=RHEL_6 ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Wednesday 2013-03-06 20:30, Vincent wrote: >Jan Engelhardt inai.de> writes: > >> >> On Wednesday 2013-02-27 16:38, Mike Gabriel wrote: >> >> > Hi Jan, >> > >> > I guess, this one is yours... >> > http://serverfault.com/questions/482596/centos-6-x2go-dependancy-issues-when-trying-to-run- >yum-update >> >> Already fixed yesterday. >> > >Fixed how? I still have this issue on Scientific Linux 6 . For example, in rpm lingo, nxagent.rpm requires "libXcomp.so.3()(64bit)". Both nx.rpm as well as x2go's libXcomp3.rpm would provide it. Therefore, in the eyes of rpm, both were suitable for installation, and the two would compete. This was fixed by adding a primitive set of versioned symbols to the libraries, such that nxagent.rpm requires "libXcomp.so.3(X2GO)(64bit)" which only libXcomp3 can satisfy, not nx. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Sunday 2013-03-03 03:05, Daniel Gibbs wrote: >> > >> > http://serverfault.com/questions/482596/centos-6-x2go-dependancy-issues-when- >trying-to-run-yum-update >> >> Already fixed yesterday. > >Any idea when the updated RPM's are being released? As soon as the automatic compile and mirroring is done. Principally, it is in the order of minutes within commit. The last change was made around 2013-03-01 20:34:09, which makes yum complete an install for x2goserver/nx-libs on F18. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nxagent dependency problem on CentOS and SL
On Wednesday 2013-02-27 16:38, Mike Gabriel wrote: > Hi Jan, > > I guess, this one is yours... > http://serverfault.com/questions/482596/centos-6-x2go-dependancy-issues-when-trying-to-run-yum-update Already fixed yesterday. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] X2Go Session Broker development release 0.0.0.3 -> happy testing
On Thursday 2013-02-21 22:33, Mike Gabriel wrote: > > I have today released another development release of the generic X2Go Session > Broker. Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.vQN91z + umask 022 + cd /home/abuild/rpmbuild/BUILD + /usr/bin/rm -rf /home/abuild/rpmbuild/BUILDROOT/x2gobroker-0.0.0.3-0.x86_64 ++ dirname /home/abuild/rpmbuild/BUILDROOT/x2gobroker-0.0.0.3-0.x86_64 + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT + /usr/bin/mkdir /home/abuild/rpmbuild/BUILDROOT/x2gobroker-0.0.0.3-0.x86_64 + cd x2gobroker-0.0.0.3 + make -j10 rm -f lib/x2gobroker-agent make -f Makefile.perl realclean cc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c make[1]: Entering directory `/home/abuild/rpmbuild/BUILD/x2gobroker-0.0.0.3' make[1]: Makefile.perl: No such file or directory make[1]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. make[1]: *** No rule to make target `Makefile.perl'. Stop. make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/x2gobroker-0.0.0.3' make: [clean_indep] Error 2 (ignored) + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.tYyr9H + umask 022 + cd /home/abuild/rpmbuild/BUILD + cd x2gobroker-0.0.0.3 + make install DESTDIR=/home/abuild/rpmbuild/BUILDROOT/x2gobroker-0.0.0.3-0.x86_64 make -f Makefile.perl install make[1]: Entering directory `/home/abuild/rpmbuild/BUILD/x2gobroker-0.0.0.3' make[1]: Makefile.perl: No such file or directory make[1]: *** No rule to make target `Makefile.perl'. Stop. make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/x2gobroker-0.0.0.3' make: *** [install] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.tYyr9H (%install) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.tYyr9H (%install) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH] build: avoid using install -o/-g
On Saturday 2013-02-16 17:17, Mike Gabriel wrote: >> The -o and -g options cause installation failure in unprivileged build >> environments, and provide no benefit for root either, because files >> will be owned by the installing user anyway. > > I would really appreciate if he could start using X2Go BTS for submitting > patches. With this patch I have a hard time to find out to what X2Go component > to apply it... Sounds like a direly needed improvement in git-send-email. (Because it would have been obvious with git-request-pull) > 4. And then add the patch as attachment to your mail. Attachments are much > easier to handle than inline patch code. And prone to authorship getting lost, I would argue. Only git:// is sane, I gather, and therefore: The following changes since commit 5231ba48183cc603a5193400884dd01b360491ba: Add load balancing support. (2013-02-14 06:26:41 +0100) are available in the git repository at: git://git.inai.de/x2gobroker master for you to fetch changes up to 920234126441688eef34f48a650fd3a2e90630af: build: avoid using install -o/-g (2013-02-16 04:10:39 +0100) -------- Jan Engelhardt (1): build: avoid using install -o/-g Makefile |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] build: avoid using install -o/-g
The -o and -g options cause installation failure in unprivileged build environments, and provide no benefit for root either, because files will be owned by the installing user anyway. --- Can we please stop with the -o and -g madness? Makefile |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 07428f6..3c90c45 100755 --- a/Makefile +++ b/Makefile @@ -23,9 +23,9 @@ SRC_DIR=$(CURDIR) SHELL=/bin/bash -INSTALL_DIR=install -d -o root -g root -m 755 -INSTALL_FILE=install -o root -g root -m 644 -INSTALL_PROGRAM=install -o root -g root -m 755 +INSTALL_DIR=install -dm 755 +INSTALL_FILE=install -m 644 +INSTALL_PROGRAM=install -m 755 CC ?= gcc CFLAGS += -fPIE -- 1.7.10.4 ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Bogus requires for cups-x2go RPM on CentOS 6?
On Friday 2013-01-18 21:41, Kevin Sandy wrote: >The RPM spec has a Requires line that includes cups-client, but no such >dependency exists on my test CentOS 6 x86_64 system. I'm able to force >installation and it seems to work, but for the future I'd like to either add a >repository containing the dependency or get the spec file fixed. Requirement for "cups-client" by "cups" now. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH] x2gopath: make use of this helper
On Wednesday 2013-01-09 19:42, Mike Gabriel wrote: >Hi Jan, > >wouldn't it make sense to include a wrapping for /etc/x2go in the form >$(x2gopath etc), as well? > >If you find that useful, could you add that? I don't find it useful. Among all the different Unices and Linux distributions, the configuration directory has stayed the same.. for now at least ;) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#84: Hardcoded -O3 in CFLAGS
On Wednesday 2013-01-09 16:10, Mike Gabriel wrote: > > All kind of flags are hard-coded in linux.cf in nx-X11/cf/ (I think). You may > know imake better then I do. If you could take another look at it, that would > be awesome. > > Note: LDFLAGS appear to be named LDOPTIONS in nx-X11. > > Note, that nxcomp, nxcompshad and nxcompext are configured and built from > within nx-X11/programs/Xserver/Makefile.in (IIRC, might be the Makfile.in one > level up). So the nx* builds are prepared by imake. I guess the only way to > address it is to teach imake to let through *FLAGS. > > The nx-X11 build process is a bummer..., I agree with that. Any help and > improvement is really appreciated. Can we split nxcomp, nxcompshad, nxcompext and nxproxy into separate tarballs in any way? After all, they are "just" addons to an existing (X11|nx-libs) tree that gets installed as well and which looks usable. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#84: Hardcoded -O3 in CFLAGS
On Wednesday 2013-01-09 15:21, Reinhard Tartler wrote: >> +++ nx-libs-3.5.0.17/nxcomp/Makefile.in >> @@ -36,8 +36,7 @@ LIBVERSION=@LIBVERSION@ >> # >> >> CXX = @CXX@ >> -CXXFLAGS= @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ >> - -Wall -Wpointer-arith >> +CXXFLAGS= @X_CFLAGS@ @DEFS@ -Wall -Wpointer-arith @CXXFLAGS@ >> CXXINCLUDES = >> CXXDEFINES = >> >AFAIUI, this is not a fix. Instead of replacing the hardcoded values, >this patch ensures that all options end behind the hardcoded values. >This makes it impossible to drop compiler flags that are specified >within. > >This may be fair when your goal is to only change the optimization >level, but may be insufficient when the goal is a hardened build. I don't care about the "hardened" because that is just another case of "user wants to specify his own CFLAGS". I had hoped that @CXXFLAGS@ would be those user-specific ones, but alas, no. *Total dismay at Makefile authors who still squat on CXXFLAGS* ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-Announcement] New X2Go releases: x2goserver, x2goclient, nx-libs, x2godesktopsharing, x2golxdebindings, x2goplasmabindings, pinentry-x2go
On Tuesday 2013-01-08 01:03, Mike Gabriel wrote: > > - NX (redistributed), Version 3.5.0.17 Why was libNX_Xcomp renamed to libXcomp again? ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Bug#84: Hardcoded -O3 in CFLAGS
On Wednesday 2013-01-09 01:00, Bernard Cafarelli wrote: >Le Tue, 8 Jan 2013 17:07:12 +0100 (CET) >Jan Engelhardt a écrit: >> Why would autoreconf be rerun if you use ./configure CFLAGS=-O2 >> CXXFLAGS=-O2? > >I meant, without first removing the "-O3" from configure.in (before >autoreconf) > >With current configure.in, setting CXXFLAGS to "-O2" will give this: >nxcomp $ autoreconf && ./configure && make >[...] >g++ -c -O2 -O3 -fno-rtti -fno-exceptions -I../nx-X11/exports/include >-Wmissing-declarations -fPIC -DIN_ADDR_T=in_addr_t -DVERSION=\"3.5.0\" >-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" >-DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -Wall >-Wpointer-arith EncodeBuffer.cpp I tried the following, but it's not taking any effect. Must be some !@#$%^& going on. <<<< Give user-specified CXXFLAGS/CFLAGS/LDFLAGS/LIBS higher precedence. --- nxcomp/Makefile.in |6 ++ nxcompext/Makefile.in | 14 +++--- nxcompshad/Makefile.in |5 ++--- nxproxy/Makefile.in|4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) Index: nx-libs-3.5.0.17/nxcomp/Makefile.in === --- nx-libs-3.5.0.17.orig/nxcomp/Makefile.in +++ nx-libs-3.5.0.17/nxcomp/Makefile.in @@ -36,8 +36,7 @@ LIBVERSION=@LIBVERSION@ # CXX = @CXX@ -CXXFLAGS= @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ - -Wall -Wpointer-arith +CXXFLAGS= @X_CFLAGS@ @DEFS@ -Wall -Wpointer-arith @CXXFLAGS@ CXXINCLUDES = CXXDEFINES = @@ -46,8 +45,7 @@ CXXDEFINES = # CC = @CC@ -CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ - -Wall -Wpointer-arith +CCFLAGS = @X_CFLAGS@ @DEFS@ -Wall -Wpointer-arith @CFLAGS@ CCINCLUDES = CCDEFINES = Index: nx-libs-3.5.0.17/nxcompext/Makefile.in === --- nx-libs-3.5.0.17.orig/nxcompext/Makefile.in +++ nx-libs-3.5.0.17/nxcompext/Makefile.in @@ -28,26 +28,26 @@ LIBVERSION=@LIBVERSION@ # CXX = @CXX@ -CXXFLAGS= @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ +CXXFLAGS= @X_CFLAGS@ @DEFS@ \ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs + -Wmissing-declarations -Wnested-externs @CXXFLAGS@ CXXINCLUDES = -I. -I../nxcomp CXXDEFINES = CC = @CC@ -CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ +CCFLAGS = @X_CFLAGS@ @DEFS@ \ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs + -Wmissing-declarations -Wnested-externs @CFLAGS@ CCINCLUDES = -I. -I../nxcomp CCDEFINES = -LDFLAGS = @LDFLAGS@ -L../nxcomp -LIBS= @LIBS@ -lz -lNX_X11 -lXcomp +LDFLAGS = -L../nxcomp @LDFLAGS@ +LIBS= -lz -lNX_X11 -lXcomp @LIBS@ # # Only if THREADS is defined # -# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp +# LIBS = -lz -ljpeg -lpthread -lNX_X11 -lXcomp @LIBS@ # srcdir = @srcdir@ Index: nx-libs-3.5.0.17/nxcompshad/Makefile.in === --- nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in +++ nx-libs-3.5.0.17/nxcompshad/Makefile.in @@ -31,8 +31,7 @@ LIBVERSION=@LIBVERSION@ # CXX = @CXX@ -CXXFLAGS= @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ - -Wall -Wpointer-arith +CXXFLAGS= @X_CFLAGS@ @DEFS@ -Wall -Wpointer-arith @CXXFLAGS@ CXXINCLUDES = CXXDEFINES = @@ -48,7 +47,7 @@ CCINCLUDES = CCDEFINES = LDFLAGS = @LDFLAGS@ -LIBS= @LIBS@ -lNX_X11 +LIBS= -lNX_X11 @LIBS@ # # Only if THREADS is defined. Index: nx-libs-3.5.0.17/nxproxy/Makefile.in === --- nx-libs-3.5.0.17.orig/nxproxy/Makefile.in +++ nx-libs-3.5.0.17/nxproxy/Makefile.in @@ -11,9 +11,9 @@ LIBVERSION=@LIBVERSION@ # -Wredundant-decls # CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ +CXXFLAGS = @X_CFLAGS@ @DEFS@ \ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs + -Wmissing-declarations -Wnested-externs @CXXFLAGS@ CXXINCLUDES = -I. -I../nxcomp ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] x2gopath: make use of this helper
Note that .pm Perl modules must be placed in an arch-specific
directory (e.g. /usr/lib64/... rather than /usr/libexec/...) since
they could possibly entail XS modules.
---
x2goserver-printing/bin/x2goprint |2 +-
x2goserver/bin/x2gogetapps|2 +-
x2goserver/bin/x2gogetservers |2 +-
x2goserver/bin/x2golistdesktops |2 +-
x2goserver/bin/x2golistmounts |2 +-
x2goserver/bin/x2golistsessions |2 +-
x2goserver/bin/x2gomountdirs |2 +-
x2goserver/bin/x2gosessionlimit |2 +-
x2goserver/bin/x2goshowblocks |2 +-
x2goserver/bin/x2goumount-session |2 +-
x2goserver/lib/x2gochangestatus |2 +-
x2goserver/lib/x2gocreatesession |2 +-
x2goserver/lib/x2godbwrapper.pm |4 ++--
x2goserver/lib/x2gogetagent |2 +-
x2goserver/lib/x2gogetdisplays|2 +-
x2goserver/lib/x2gogetports |2 +-
x2goserver/lib/x2gogetstatus |2 +-
x2goserver/lib/x2goinsertport |2 +-
x2goserver/lib/x2goinsertsession |2 +-
x2goserver/lib/x2golistsessions_sql |2 +-
x2goserver/lib/x2gologlevel |2 +-
x2goserver/lib/x2goresume |2 +-
x2goserver/lib/x2gormport |2 +-
x2goserver/lib/x2gosuspend-agent |2 +-
x2goserver/lib/x2gosyslog |2 +-
x2goserver/sbin/x2godbadmin |2 +-
x2goserver/sbin/x2golistsessions_root |2 +-
27 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/x2goserver-printing/bin/x2goprint
b/x2goserver-printing/bin/x2goprint
index e3f3f8f..b5739c8 100755
--- a/x2goserver-printing/bin/x2goprint
+++ b/x2goserver-printing/bin/x2goprint
@@ -26,7 +26,7 @@ use File::Copy;
use File::Path;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2godbwrapper;
use x2gologlevel;
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index dbcd8c1..48bf865 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -24,7 +24,7 @@ use strict;
use Sys::Syslog qw( :standard :macros );
use MIME::Base64 qw(encode_base64);
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2gologlevel;
my @iconext=("png","svg","jpeg","jpg","xpm","bmp");
diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers
index d34cc98..cafc2fe 100755
--- a/x2goserver/bin/x2gogetservers
+++ b/x2goserver/bin/x2gogetservers
@@ -23,7 +23,7 @@
use strict;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2godbwrapper;
use x2gologlevel;
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index acdd7c4..71a15b0 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -24,7 +24,7 @@ use strict;
use Sys::Hostname;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2gologlevel;
openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts
index ade0c67..879ca61 100755
--- a/x2goserver/bin/x2golistmounts
+++ b/x2goserver/bin/x2golistmounts
@@ -23,7 +23,7 @@
use strict;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2godbwrapper;
use x2gologlevel;
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index e4421b3..eb24196 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -24,7 +24,7 @@ use strict;
use Sys::Hostname;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2godbwrapper;
use x2gologlevel;
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index ef7f139..d151255 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -24,7 +24,7 @@ use strict;
use Sys::Syslog qw( :standard :macros );
use File::BaseDir qw( xdg_config_home );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2godbwrapper;
use x2gologlevel;
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 91f747b..bae41f7 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -24,7 +24,7 @@ use strict;
use Config::Simple;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use lib `x2gopath lib`;
use x2gologlevel;
openlog($0,'cons,pid','user');
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index f253a73..46dd6d0 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -23,7 +23,7 @@
use strict;
use Sys::Syslog qw( :standard :macros );
-use lib `echo -n \$(x2gobasepath)/lib/x2go`
Re: [X2Go-Dev] New X2Go releases: x2goserver
The following changes since commit 3bb58b5faea060b778de8a35d6f509f42a8a7e0d: release 4.0.0.0 (2012-12-30 17:40:12 +0100) are available in the git repository at: git://git.inai.de/x2goserver master for you to fetch changes up to be6f1327683613d0ec93cc5c7e28d80abb6e013c: x2gopath: make use of this helper (2013-01-09 14:49:44 +0100) Jan Engelhardt (1): x2gopath: make use of this helper x2goserver-printing/bin/x2goprint |2 +- x2goserver/bin/x2gogetapps|2 +- x2goserver/bin/x2gogetservers |2 +- x2goserver/bin/x2golistdesktops |2 +- x2goserver/bin/x2golistmounts |2 +- x2goserver/bin/x2golistsessions |2 +- x2goserver/bin/x2gomountdirs |2 +- x2goserver/bin/x2gosessionlimit |2 +- x2goserver/bin/x2goshowblocks |2 +- x2goserver/bin/x2goumount-session |2 +- x2goserver/lib/x2gochangestatus |2 +- x2goserver/lib/x2gocreatesession |2 +- x2goserver/lib/x2godbwrapper.pm |4 ++-- x2goserver/lib/x2gogetagent |2 +- x2goserver/lib/x2gogetdisplays|2 +- x2goserver/lib/x2gogetports |2 +- x2goserver/lib/x2gogetstatus |2 +- x2goserver/lib/x2goinsertport |2 +- x2goserver/lib/x2goinsertsession |2 +- x2goserver/lib/x2golistsessions_sql |2 +- x2goserver/lib/x2gologlevel |2 +- x2goserver/lib/x2goresume |2 +- x2goserver/lib/x2gormport |2 +- x2goserver/lib/x2gosuspend-agent |2 +- x2goserver/lib/x2gosyslog |2 +- x2goserver/sbin/x2godbadmin |2 +- x2goserver/sbin/x2golistsessions_root |2 +- 27 files changed, 28 insertions(+), 28 deletions(-) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-Announcement] New X2Go releases: x2goserver, x2goclient, nx-libs, x2godesktopsharing, x2golxdebindings, x2goplasmabindings, pinentry-x2go
On Tuesday 2013-01-08 01:03, Mike Gabriel wrote: > Dear all, > > The X2Go Project is proud to announce a couple of new X2Go component releases: > > - X2Go Server (4.0.0.0) > - X2Go Client (4.0.0.1) Maybe cut back on the amount of components per version numbers? What about something simple as 4.1? > - NX (redistributed), Version 3.5.0.17 > - X2Go Desktop Sharing (3.1.0.6) > - X2Go LXDE Bindings (1.0.1.3) > - Plasma Widget for X2Go (3.0.1.5) > - Pinentry for X2Go (0.7.5.6) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Bug#83: Also support CC and LDFLAGS
On Tuesday 2013-01-08 13:15, Bernard Cafarelli wrote: > Nice to see the build system getting better :) > > I used a different style to fix this, also allowing CC override and custom > LDFLAGS. I attach the updated patch for 4.0.0.0 -pie belongs into LDFLAGS. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Bug#84: Hardcoded -O3 in CFLAGS
On Tuesday 2013-01-08 13:23, Bernard Cafarelli wrote: >Regarding the optflags patch, is it possible to drop altogether the >hardcoded "-O3" in C/CXXFLAGS in the various configure.in? This would >remove the need for 4 autoreconf when using another optimization level Why would autoreconf be rerun if you use ./configure CFLAGS=-O2 CXXFLAGS=-O2? ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Bug#93: x2goagent should create /tmp/.X11-unix directory
On Wednesday 2012-12-19 17:07, Mike Gabriel wrote: >>> >>> Apparently X2Go requires the /tmp/.X11-unix directory to exist with >>> permissions 1777. >>> >>> Could you please see to it the creation of this directory and the >>> permissions settings are performed by teh x2goserver package. >> >> I would add that on systems running vncserver, /tmp/.X11-unix may exist but >> owned by another user. It would be good if x2goserver fixed ownership in >> this >> case. > > What ownership would expect? root:root? Precisely that. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH 3/8] Rely on shlibs files instead of hard coding library dependencies
On Sunday 2012-12-16 09:01, Reinhard Tartler wrote: >> >> One would have to look at all NX3 releases that had been made by >> upstream and look at whether they changed the ABI at any point. If so, >> you're already doomed and should use libXcomp-3.5.1.so, so that _all_ of >> the version is part of the SONAME. > >When people make the complete version number part of the SONAME (which >I think is what you claim here), then it actually makes things a bit >easier from the packaging side. Indeed. >My point here is that this reasoning does not only apply to nxlibs >itself, but also to other applications outside of x2go that link >against nxcomp and friends, such as qtnx to give an example. That's why there are symbol versions, in case Xcomp.so.3 is used as SONAME instead of Xcomp.so.3.full.xyz. >Please note that RPM does not have anything similar as the debian >shlibs system. See >http://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-shlibdeps >and >http://www.netfort.gr.jp/~dancer/column/libpkg-guide/libpkg-guide.html#shlibsfile You can do "Requires: libpcap0 >= 0.1.2" in RPM, it's just not a very nice thing (because you have to update it on SONAME changes). Basically, RPM is as smart as the dynamic linker ld.so - and that sounds like a good thing, compared to strap-on solutions like that shlibs thing Debian has. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] nx-libs-3.5.0.17 whacky install
Using the following... cat >"my_configure" <<-EOF #!/bin/sh -e %configure --disable-static EOF chmod a+x my_configure; make \ CONFIGURE=/home/abuild/rpmbuild/BUILD/nx-libs-3.5.0.17/my_configure \ PREFIX=/usr/PFX PROJECTROOT=/usr/PRJ INCLUDEDIR=/usr/include/nx \ USRLIBDIR=/usr/lib64/nx SHLIBDIR=/usr/lib64/nx (plus subsequent install with the same parameters) leads to some questionable results: Why do I get two Xcomp shared libraries (Xcomp.so.1 and Xcomp.so.3) that are equal anyway? /usr/PFX/lib/nx/X11/libXcomp.so /usr/PFX/lib/nx/X11/libXcomp.so.1 /usr/lib64/nx/libXcomp.a /usr/lib64/nx/libXcomp.so /usr/lib64/nx/libXcomp.so.3 /usr/lib64/nx/libXcomp.so.3.5.0 -rw-r--r-- 1 abuild abuild 1200469 Jan 6 18:25 ./usr/PFX/lib/nx/X11/libXcomp.so lrwxrwxrwx 1 abuild abuild 11 Jan 6 18:25 ./usr/PFX/lib/nx/X11/libXcomp.so.1 -> libXcomp.so lrwxrwxrwx 1 abuild abuild 17 Jan 6 18:20 ./usr/lib64/nx/libXcomp.so -> libXcomp.so.3.5.0 lrwxrwxrwx 1 abuild abuild 17 Jan 6 18:20 ./usr/lib64/nx/libXcomp.so.3 -> libXcomp.so.3.5.0 -rw-r--r-- 1 abuild abuild 1200469 Jan 6 18:25 ./usr/lib64/nx/libXcomp.so.3.5.0 There are three nxproxy instances rather than two: /usr/PFX/bin/nxproxy /usr/PFX/lib/nx/bin/nxproxy /usr/bin/nxproxy -rwxr-xr-x 1 abuild abuild 1158 Jan 4 12:25 ./usr/PFX/bin/nxproxy -rwxr-xr-x 1 abuild abuild 8753 Jan 6 18:25 ./usr/PFX/lib/nx/bin/nxproxy -rwxr-xr-x 1 abuild abuild 8753 Jan 6 18:25 ./usr/bin/nxproxy Something got really messed up here lately. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH 4/8] disable parallel builds
On Wednesday 2012-12-12 17:29, Moritz Struebe wrote: >>> Sure, what should README.parallel contain? >> >> A warning that with two many cores you get a race condition. > >You should be also be able to get a race condition with a single core, >too - it just more unlikely. ;) The number of cores does not have anything to do with it, but the number of parallel processes spawned by make as a result of requesting them (and of course, you need "good" timing). ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH 4/8] disable parallel builds
On Wednesday 2012-12-12 14:39, Mike Gabriel wrote: > > @Jan: maybe you can take a look at that? The --parallel build patch was from > you, wasn't it? >> debian/rules |2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) I don't touch Debian. ;) (You need to Cc me if you want a timely answer, because only then will mails get highlighted in the sea of umpteenth postings from vger.kernel.org that share the same mbox file :p) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH 3/8] Rely on shlibs files instead of hard coding library dependencies
On Wednesday 2012-12-12 13:53, Mike Gabriel wrote: > Hi Reinhard, > > On Mi 12 Dez 2012 13:13:13 CET Reinhard Tartler wrote: > >> If stricter dependencies are really required, they should absolutely be >> specified in the slibs file instead > > I strongly recommend that all installed (binary) components of the NX suite > have the same version. So, out of paranoia, strict dependencies are required. And the paranoia is absolutely justified. At times, but especially when people make the SOVERSION the same as the package version - and this is the case with nxlibs - they tend to change the API without changing the SONAME. And they don't want to change the SONAME because *surprise* that would break their oh-so-important-but-anyway-flawed scheme of SOVERSION=package version. One would have to look at all NX3 releases that had been made by upstream and look at whether they changed the ABI at any point. If so, you're already doomed and should use libXcomp-3.5.1.so, so that _all_ of the version is part of the SONAME. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] x2go for Fedora packaging issues
On Thursday 2012-12-13 09:56, Mike Gabriel wrote: >> Okay, but is it strictly necessary for debian packaging to have that? I've >> never seen it in other upstream sources. > > Not necessarily. Please provide a patch that keeps the current functionality > in > case the Makefile is run as root and also makes execution possible for > non-root > users. Umm, copying a file with either of - install - cp without the --preserve option the owner of the file will be the one who invoked the copy. Therefore, if you run install as root, the file will be owned by root already. Save for cases where root has to use like install -o postfix, install -o/-g is really useless. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] x2go for Fedora packaging issues
On Wednesday 2012-12-12 00:11, Orion Poplawski wrote: > I'm looking at packaging x2go for Fedora and am running into a few issues > which > I'm hoping to get resolved. Hm, I have them mostly complete for Fedora at https://build.opensuse.org/project/show?project=X11%3ARemoteDesktop and problems like DESTDIR and unprivileged install, which naturally occur on openSUSE too, seemed resolved (at the time of the most recent working version). > General: > - Why the use of install -o root -g root? Is this a debian build specific > thing? On rpm systems this fails when builds are done as non-root (and it's > redundant when done as root). ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] x2gopath: new helper to yield distro paths
Distributions have different directory layouts and names, so files
may not necessarily be located in /lib/x2go at all times. Do
not hardcode such paths and have the programs instead use the new
x2gopath helper (obsoletes x2gobasepath).
---
Patch is also retrievable from
git://git.inai.de/x2goserver master
.../share/x2gofeature.d/x2goserver-compat.features |2 +-
.../bin/x2goserver-run-extensions |4 +--
.../man/man8/x2goserver-run-extensions.8 |4 +--
.../x2gofeature.d/x2goserver-extensions.features |2 +-
.../x2gofeature.d/x2goserver-fmbindings.features |2 +-
.../x2gofeature.d/x2goserver-printing.features |2 +-
.../share/x2gofeature.d/x2goserver-pyhoca.features |2 +-
x2goserver-xsession/etc/Xsession |4 ++-
.../x2gofeature.d/x2goserver-xsession.features |2 +-
x2goserver/bin/x2gobasepath| 31 ++--
x2goserver/bin/x2gocmdexitmessage |2 +-
x2goserver/bin/x2gofeature |4 +--
x2goserver/bin/x2gofeaturelist |4 +--
x2goserver/bin/x2gopath| 19
x2goserver/bin/x2goresume-session |2 +-
x2goserver/bin/x2goruncommand |2 +-
x2goserver/bin/x2gosetkeyboard |2 +-
x2goserver/bin/x2gostartagent |2 +-
x2goserver/bin/x2gosuspend-session |2 +-
x2goserver/bin/x2goterminate-session |2 +-
x2goserver/bin/x2goversion |2 +-
x2goserver/man/man8/x2gopath.8 | 28 ++
x2goserver/sbin/x2gocleansessions |2 +-
x2goserver/sbin/x2golistsessions_root |2 +-
x2goserver/share/x2gofeature.d/x2goserver.features |2 +-
25 files changed, 77 insertions(+), 55 deletions(-)
create mode 100755 x2goserver/bin/x2gopath
create mode 100644 x2goserver/man/man8/x2gopath.8
diff --git a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
index d180d95..f4a9376 100755
--- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
+++ b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
@@ -20,7 +20,7 @@
# Copyright (C) 2011-2012 Oleksandr Shneyder
# Copyright (C) 2011-2012 Heinz-Markus Graesing
-X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+X2GO_LIB_PATH="$(x2gopath libexec)";
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions
b/x2goserver-extensions/bin/x2goserver-run-extensions
index 70636f6..f89515c 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -25,7 +25,7 @@ set -e
test -z $2 && { echo "usage: $(basename $0) ";
exit -1; }
-X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+X2GO_LIB_PATH="$(x2gopath libexec)";
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
@@ -33,7 +33,7 @@ X2GO_SESSION="$1"
X2GO_MODALITY="$2"
# scan extensions and execute them
-find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 |
egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
+find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 |
egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with
option $X2GO_SESSION"
$x2go_extension "$X2GO_SESSION" &>/dev/null && {
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension
($(basename $0)) for session $X2GO_SESSION has finished sucessfully"
diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
index e2c0c34..3fe1e4f 100644
--- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
+++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
@@ -36,9 +36,9 @@ Calling X2Go Server core scripts currently are:
\fBx2gostartagent(8)\fR, \fBx2go
.PP
The modality names all refer to a sub-directory of the path:
- \fI/lib/x2go/extensions\fR,
+ \fI/x2go/extensions\fR,
-where mostly is /usr on commonly-used GNU/Linux systems.
+where is /usr/libexec/x2go or /usr/lib/x2go on commonly-used
GNU/Linux systems.
.PP
In any of these sub-directories third-party X2Go extension packages can place
scripts or binaries that will then get executed by the core X2Go server
commands, either before or after the essential functionality (e.g. x2goagent
startup, x2goagent suspension, x2goagent resumption, etc.) or on failure of that
diff --git
a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
b/x2goserver-extensions/share/x2
Re: [X2Go-Dev] Fixes for x2godesktopsharing
On Tuesday 2012-11-20 21:19, Mike Gabriel wrote: > HI Jan, > > On Di 20 Nov 2012 11:52:09 CET Jan Engelhardt wrote: > >> are available in the git repository at: >> >> git://git.inai.de/x2godesktopsharing master > > Is there any chance to have a WebGUI (gitweb) in front of the >git.inai.de site? I do not think so - I just recently tore it down due to maintenance effort, bots pounding on it (I did not even get to think of robots.txt); and local viewing is actually so much faster latency-wise and superior in experience by picking your viewer of choice. Here's a git-fu cookie from my jar: git fetch git://place branch gitk FETCH_HEAD No need to do a full clone, no need to do pollution of your workspace by adding a remote or branch. Just using FETCH_HEAD and forget it when done. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH] build: resolve compile error under g++-4.7
On Tuesday 2012-11-20 21:14, Mike Gabriel wrote: > Hi Jan, > > thanks for your patch. The sharetray.cpp includes sys/unistd.h. Isn't your > patch a redundancy? It seems 6ffe45d50b3dacb1725e90a985e1876a6ed44c16 already fixed the issue (last version I was on was 3.0.1.4). However, looking at 6ffe... sys/unistd.h just does not sound right *at all*. unistd.h is available on Ubuntu, so why bother with sys/unistd.h, is the question one would have to ask. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] build: resolve compile error under g++-4.7
sharetray.cpp: In member function 'void ShareTray::handleSigKeybInt()': sharetray.cpp:225:2: error: '::read' has not been declared [...] sharetray.cpp: In static member function 'static void ShareTray::keybintSignalHandler(int)': sharetray.cpp:272:2: error: '::write' has not been declared [...] sharetray.cpp: In member function 'void ShareTray::slotStartSharing()': sharetray.cpp:325:40: error: 'getuid' was not declared in this scope sharetray.cpp:325:84: error: 'chown' was not declared in this scope make: *** [sharetray.o] Error 1 --- sharetray.cpp |1 + 1 file changed, 1 insertion(+) diff --git a/sharetray.cpp b/sharetray.cpp index 7c74d24..ac210a6 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #define STAT_ACT_COUNT 10 #define VERSION "3.0.1.6" -- 1.7.10.4 ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Fixes for x2godesktopsharing
The following changes since commit db0b079d5320b0bc6b718428c9831775b3ba39a7: Continue development... (2012-11-13 16:24:25 +0100) are available in the git repository at: git://git.inai.de/x2godesktopsharing master for you to fetch changes up to 34b7b52860118831b9c10c2e899233c03621dad9: build: resolve compile error under g++-4.7 (2012-11-20 11:50:58 +0100) Jan Engelhardt (1): build: resolve compile error under g++-4.7 sharetray.cpp |1 + 1 file changed, 1 insertion(+) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nx-libs 3.5.0.16 break make install
On Monday 2012-11-12 08:49, Mike Gabriel wrote: make[1]: Leaving directory `/build/src/nx-libs-3.5.0.16/nx-X11' if test -f bin/Makefile; then make -C bin install; fi make[1]: Entering directory `/build/src/nx-libs-3.5.0.16/bin' install -d -o root -g root -m 755 /usr/local/lib/x2go/bin/ install: cannot create directory '/usr/local/lib/x2go': Permission denied make[1]: *** [install] Error 1 >>[patch] > > THANKS! > Committed: > > @all-packagers: please send in your patches against the revisited tarball > installation method, so that we can quickly release 3.5.0.17 with all your > patches in it. Also, if your packages install well again after adapting to the > new tarball installer, please report back, so that I can stop waiting for > patches and release 3.5.0.17. There's more !@#$% spooky action with nx-libs-3.5.0.16 that I am not happy about. Suddenly it installs into /usr/local and there is no obvious way to make it not do that. I already do make install PREFIX=/usr PROJECTROOT=/usr and it still squats in /usr/local. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] x2godesktopsharing versions mixed up
3.0.1.5 is newer than 3.1.0.4? Suggestion to cut down on the amount of fields in a version tag? x2godesktopsharing-3.0.1.5.tar.gz 05-Nov-2012 13:08 142K x2godesktopsharing-3.1.0.4.tar.gz 08-Jun-2012 09:31 142K ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] x2goclient: qt paths
From: Jan Engelhardt Date: 2012-11-12 18:13:30.889134720 +0100 build: resolve new compile failure in 3.99.3.0 The proper path is just . If your copy lives in a non-standard location, you have to tell configure. [ 19s] ../sshmasterconnection.cpp:45:43: fatal error: qt4/QtNetwork/qabstractsocket.h: No such file or directory [ 19s] compilation terminated. --- sshmasterconnection.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: x2goclient-3.99.3.0/sshmasterconnection.cpp === --- x2goclient-3.99.3.0.orig/sshmasterconnection.cpp +++ x2goclient-3.99.3.0/sshmasterconnection.cpp @@ -42,7 +42,7 @@ #include /* for sockaddr_in and inet_addr() */ #include #include -#include +#include #endif ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] x2goclient: resolve compile failure of sshproto.h
This patch is still lingering around in the x2goclient package that is on build.opensuse.org.From: Jan Engelhardt Date: 2012-02-05 04:47:30.922727435 +0100 g++ -c -pipe -march=i586 -mtune=i686 -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -O2 -march=i586 -mtune=i686 -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -Wall -W -D_REENTRANT -DCFGCLIENT -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/share/qt4/mkspecs/default -I../../x2goclient_3.99.0.6 -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtSvg -I/usr/include -I../../x2goclient_3.99.0.6 -I. -I. -I. -o onmainwindow_part3.o ../onmainwindow_part3.cpp In file included from ../onmainwindow_privat.h:71, from ../onmainwindow.cpp:21: ../sshprocess.h:62: error: field 'address' has incomplete type Well *clearly* the include directive for struct sockaddr_in is missing. --- sshprocess.h |1 + 1 file changed, 1 insertion(+) Index: x2goclient_3.99.0.6/sshprocess.h === --- x2goclient_3.99.0.6.orig/sshprocess.h +++ x2goclient_3.99.0.6/sshprocess.h @@ -22,6 +22,7 @@ #ifndef SSHPROCESS_H #define SSHPROCESS_H +#include #include #include ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] nx-libs 3.5.0.16 break make install
On Saturday 2012-11-10 22:25, Mike Gabriel wrote: > > please send a tested patch against the tarball of 3.5.0.16. Thanks! > >> The new 001_add-main-makefile.full+lite.patch breaks the build here >> when not running make install as root, e.g. when building a package >> with make DESTDIR="foo" install: >> >> make[1]: Leaving directory `/build/src/nx-libs-3.5.0.16/nx-X11' >> if test -f bin/Makefile; then make -C bin install; fi >> make[1]: Entering directory `/build/src/nx-libs-3.5.0.16/bin' >> install -d -o root -g root -m 755 /usr/local/lib/x2go/bin/ >> install: cannot create directory '/usr/local/lib/x2go': Permission denied >> make[1]: *** [install] Error 1 >> >> This seems to be the cause: >> >> +INSTALL_DIR=install -d -o root -g root -m 755 >> +INSTALL_FILE=install -o root -g root -m 644 >> +INSTALL_PROGRAM=install -o root -g root -m 755 Yes and no. You mention DESTDIR, and you see that the directory it creates lacks "foo", so it can't be the -o root -g root. Restore broken `make install DESTDIR=`, by adding $(DESTDIR) where necessary, as well as `mkdir -p`. --- bin/Makefile | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) Index: nx-libs-3.5.0.16/bin/Makefile === --- nx-libs-3.5.0.16.orig/bin/Makefile +++ nx-libs-3.5.0.16/bin/Makefile @@ -17,13 +17,15 @@ X2GOLIBDIR=$(PREFIX)/lib/x2go echo "Nothing to do for $@..." install: - $(INSTALL_DIR) $(X2GOLIBDIR)/bin/ - ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent - find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done - find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done + mkdir -p $(DESTDIR)$(X2GOLIBDIR)/bin + $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + ln -sf $(NXLIBDIR)/bin/nxagent $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + mkdir -p $(DESTDIR)$(BINDIR) + find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done + find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done uninstall: - find nx* | while read file; do rm -f $(BINDIR)/$$file; done - find x2go* | while read file; do rm -f $(BINDIR)/$$file; done - $(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent - $(RM_DIR) $(X2GOLIBDIR)/bin/ + find nx* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done + find x2go* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done + $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] On the new lightdm-x2go package
On Sunday 2012-11-11 13:17, Mike Gabriel wrote: > Hi Jan, > > On So 11 Nov 2012 12:36:36 CET Jan Engelhardt wrote: > >> >> The release tarball for 0.0.0.1 has configure.ac, but no configure. >> Please consider running the appropriate generators in future before >> shipping one. :) >> >> (The name "lightdm-remote-session-x2go" is also quite long, but perhaps >> that's just me.) > > They name is oriented on lightdm-remote-session-freerdp as found in Ubuntu > 12.10. > > The package is a proof-of-concept so that people at Canonical can test X2Go > with their login logic. > > I like the patch you sent me privately! The main target (To: field) was the ML. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH] Remove redundant tool "socket-sucker"
On Sunday 2012-11-11 14:01, Nable 80 wrote:
>1. There is also netcat (nc) and i'm in doubt what is more widespread
>in basic system installation: netcat or socat.
It is not about what is most spread, but what actually makes sense.
netcat in comparison is messy - https://lkml.org/lkml/2012/8/1/243
>2. It's better to use `git format-patch' and attach generated files
>(see "man git-format-patch", it's really easy).
I did use git format-patch (by way of git send-email), see the X-Mailer
header. What generated file should be attached? Remember also that (a)
attachments are frowned upon and (b) I hear git-am is very pesky in
processing mails not in the format of {verbatim format-patch text}.
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-Announcement] New X2Go releases: x2goserver, x2goclient, nx-libs aka x2goagent
On Saturday 2012-11-10 13:50, Mike Gabriel wrote: > Dear all, > > The X2Go Project is proud to announce a couple of new X2Go core component > releases: > > - x2goserver (3.1.1.6) > - x2goclient (3.99.3.0) > - nx-libs (incl. x2goagent, 3.5.0.16) The installation has regressed. [ 375s] + make install DESTDIR=/home/abuild/rpmbuild/BUILDROOT/nx-libs-3.5.0.16-0.x86_64 PREFIX=/usr 'INSTALL_DIR=install -dm0755' 'INSTALL_FILE=install -pm0644' 'INSTALL_PROGRAM=install -pm0755' [ 375s] if test -f bin/Makefile; then make -C bin install; fi [ 375s] make[1]: Entering directory `/home/abuild/rpmbuild/BUILD/nx-libs-3.5.0.16/bin' [ 375s] install -dm0755 /usr/lib/x2go/bin/ [ 375s] install: cannot create directory '/usr/lib/x2go': Permission denied [ 375s] make[1]: *** [install] Error 1 [ 375s] make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/nx-libs-3.5.0.16/bin' [ 375s] make: *** [install] Error 2 [ 375s] error: Bad exit status from /var/tmp/rpm-tmp.Gu1Til (%install) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] build: continue to run even in the absence of AM_SILENT_RULES
--- configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 67f9f7b..283f30f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_INIT([libpam-x2go], [1.0.1]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11 -Wno-portability]) -AM_SILENT_RULES([yes]) +AM_INIT_AUTOMAKE([-Wno-portability]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC # the Google Test targets are cpp -- 1.7.10.4 ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] build: continue to run even in the absence of AM_SILENT_RULES
--- configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a3688ca..b8df5bf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT([lightdm-remote-session-x2go], [0.0.0.1]) -AM_INIT_AUTOMAKE([1.11 -Wno-portability]) -AM_SILENT_RULES([yes]) +AM_INIT_AUTOMAKE([-Wno-portability]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC AC_PROG_INSTALL -- 1.7.10.4 ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] [PATCH] Remove redundant tool "socket-sucker"
There already exists a tool that does this, use it.
---
This is a suggestion; the patch may not actually work, as socket-sucker
only read 256 bytes (why 256?) while socat will read until EOF.
debian/control |1 +
socket-sucker.c | 80 ---
x2go-session.in |7 ++---
3 files changed, 5 insertions(+), 83 deletions(-)
delete mode 100644 socket-sucker.c
diff --git a/debian/control b/debian/control
index df11b2e..f0b2e36 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+ socat,
zenity,
pyhoca-cli (>= 0.2.1.0-0~),
libpam-x2go,
diff --git a/socket-sucker.c b/socket-sucker.c
deleted file mode 100644
index 403819b..000
--- a/socket-sucker.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright © 2012 Mike Gabriel
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see
[X2Go-Dev] On the new lightdm-x2go package
The release tarball for 0.0.0.1 has configure.ac, but no configure. Please consider running the appropriate generators in future before shipping one. :) (The name "lightdm-remote-session-x2go" is also quite long, but perhaps that's just me.) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Bug#41: Tarballs installation of nx-libs
On Friday 2012-09-28 10:08, Mike Gabriel wrote: > /usr/include/nx/X11/X11 > /usr/include/nx/X11/X11/DECkeysym.h > /usr/include/nx/X11/X11/HPkeysym.h It seems one level of X11 is redundant here. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Bug#41: Tarballs installation of nx-libs
On Thursday 2012-09-27 21:21, Mike Gabriel wrote: > Package: x2goagent > Severity: minor > Version: 3.5.0.15 > > The installation from tarball is quite broken in nx-libs (I guess we never > addressed it as we have the Debian packaging). > > the code in nx-X11 is installed to /usr/lib/NX3. It should get installed to > > $(PREFIX)/lib/nx > > Putting this in my queue... I don't see the problem here. /usr/lib/NX3 is the replacement location for /usr/X11R6 to please FHS check scripts, which would reject /usr/NX3. So, the XFree/NX binaries go into /usr/lib/NX3/bin and the libs into /usr/lib/NX3/lib(/nx). Of course you can try to use /usr as prefix instead of /usr/lib/NX3, but then the binaries would collide with the Xorg ones. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] New X2Go releases: x2goserver, cups-x2go, x2goplasmabindings, python-x2go
On Tuesday 2012-09-25 20:35, Mike Gabriel wrote: > > The X2Go Project is proud to announce a couple of new X2Go component releases: > > - x2goserver (3.1.1.4) > - cups-x2go (3.0.0.4) > - x2goplasmabindings (with plasma-widget-x2go, 3.0.1.4) > - python-x2go (0.2.0.10) > > All new packages will be available in our stable repositories (Debian, > Ubuntu) within the next 24h. Does the delay also apply to the plain tarballs? (There's no cups-x2go update in http://code.x2go.org/releases/source/?C=M;O=D yet) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] Libs are missing +x bit
It turns out that nxcomp* is built in such a way that the +x bit is
missing after `make install`, which in turn leads to rpm not considering
the file for dependency resolution. This should be fixed
-$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
+$(INSTALL_PROGRAM) $(LIBFULL) ...
(for nxcomp, nxcompshad and nxcompext)
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] x2goserver: enable PIE completely
build: enable PIE completely rpmlint reports: x2goserver.x86_64: E: non-position-independent-executable (Badness: 1) /usr/lib/x2go/x2gosqlitewrapper. This executable must be position independent. Check that it is built with -fPIE/-fpie in compiler flags and -pie in linker flags. Not only compile with -fPIE, but also pass -pie for the linker as LDFLAGS. --- x2goserver/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: x2goserver-3.1.1.3/x2goserver/Makefile === --- x2goserver-3.1.1.3.orig/x2goserver/Makefile +++ x2goserver-3.1.1.3/x2goserver/Makefile @@ -37,7 +37,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -fPIE -o x2gosqlitewrapper x2gosqlitewrapper.c + gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] YaIT (yet another issue tracker) for X2Go: roundup
On Friday 2012-08-03 11:04, Reinhard Tartler wrote: >On Fri, Aug 3, 2012 at 10:56 AM, Mike Gabriel > wrote: > >> My personal favourite would be something like Debian BTS (debbugs). >> >> What would be your favourite (apart from Launchpad ;-) )? > >Libav has now switched to bugzilla, which is at least commonly used. BTS is nice because it has an email interface, which, for bugzilla, is some kind of extra plugin last time I checked. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] libxul not found
When attempting to connect to a "running" session with x2goclient, I get an error report about missing libxul. This does not happen if the session is "suspended", or when creating a new one. == http://picpaste.de/libxul.png == NXPROXY - Version 3.5.0 Copyright (C) 2001, 2010 NoMachine. See http://www.nomachine.com/ for more information. Info: Proxy running in client mode with pid '6818'. Session: Starting session at 'Fri Jul 6 15:00:19 2012'. Info: Connecting to remote host 'localhost:31004'. Info: Connection to remote proxy 'localhost:31004' established. Error: The remote NX proxy closed the connection. Error: Failure negotiating the sessino in stage '7'. Session: Terminating session at 'Fri Jul 6 14:45:56 2012'. Session: Session terminated at 'Fri Jul 6 14:45:56 2012'. /usr/lib64/firefox/plugin-container: error while loading shared libraries: libxul.so: cannot open shared object file: No such file or directory ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] x2goclient-3.99.2.1 plugin crash
On Thursday 2012-07-05 14:22, Oleksandr Shneyder wrote: >Hello Jan, > >I have made some fixes in X2GoPlugin code for several minutes: >http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 >Please test it. >[...] need a configuration file any more. All settings should be saved >direct in HTML-File. I have the wiki page also updated, please check >it: > >http://www.x2go.org/doku.php/wiki:components:x2goplugin#inserting_the_object_object_code The crash can be avoided by using the new HTML code, and solely by this method. Your commit did not make a difference in that respect. v3.99.2.1+d4d0fe still crashes with the old HTML (at the same location), while v3.99.2.1^0 does not crash with the new HTML. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2Go-Dev] x2goclient-3.99.2.1 plugin crash
I can get the x2goclient firefox plugin to reproducibly crash. This
crash happens once one clicks on the blue X2go splash when the plugin
is loaded.
According to gdb,
(gdb) p stb
$1 = (QToolBar *) 0x0 [or values pointing to unmapped areas]
(gdb) l
10353 void ONMainWindow::slotEmbedToolBarToolTip()
10354 {
10355 if ( !showTbTooltip )
10356 return;
10357 QWidget* widg=stb->widgetForAction (
10358 act_embedToolBar );
10359 QToolTip::showText ( this->mapToGlobal ( QPoint ( 6,6 ) ),
10360tr ( " Click this "
10361 "button "
10362 " to restore toolbar"
(gdb) bt
#0 data (this=0x8) at ../../src/corelib/tools/qscopedpointer.h:135
#1 qGetPtrHelper > (p=...)
at ../../src/corelib/global/qglobal.h:2342
#2 d_func (this=0x0) at widgets/qtoolbar.h:167
#3 QToolBar::widgetForAction (this=0x0, action=0x0)
at widgets/qtoolbar.cpp:1285
#4 0x7fe1d9ad5c03 in ONMainWindow::slotEmbedToolBarToolTip (this=
0x7fe1d14c6800) at ../onmainwindow.cpp:10358
#5 0x7fe1d9b554fd in ONMainWindow::qt_metacall (this=0x7fe1d14c6800, _c=
QMetaObject::InvokeMetaMethod, _id=108, _a=0x7fff1d3d0440)
at moc_onmainwindow.cpp:402
#6 0x7fe1d7c235aa in QMetaObject::activate (sender=0x7fe1d1413200,
m=, local_signal_index=, argv=0x0)
at kernel/qobject.cpp:3287
#7 0x7fe1d7c2b66f in QSingleShotTimer::timerEvent (this=0x7fe1d1413200)
at kernel/qtimer.cpp:308
#8 0x7fe1d7c26e89 in QObject::event (this=0x7fe1d1413200,
e=) at kernel/qobject.cpp:1190
#9 0x7fe1d844fc34 in notify_helper (e=0x7fff1d3d0b00, receiver=
0x7fe1d1413200, this=0x7fe1db3e00b0) at kernel/qapplication.cpp:4481
#10 QApplicationPrivate::notify_helper (this=0x7fe1db3e00b0, receiver=
0x7fe1d1413200, e=0x7fff1d3d0b00) at kernel/qapplication.cpp:4453
#11 0x7fe1d8454ac1 in QApplication::notify (this=0x7fe1db3a94b0, receiver=
0x7fe1d1413200, e=0x7fff1d3d0b00) at kernel/qapplication.cpp:4360
---Type to continue, or q to quit---q
Quit
I also attempted to valgrind that, and came up with
==19917== Conditional jump or move depends on uninitialised value(s)
==19917==at 0x12237BD8: ONMainWindow::slotEmbedToolBarToolTip()
(onmainwindow.cpp:10355)
==19917==by 0x122B74FC: ONMainWindow::qt_metacall(QMetaObject::Call, int,
void**) (moc_onmainwindow.cpp:402)
==19917==by 0x1424A5A9: QMetaObject::activate(QObject*, QMetaObject const*,
int, void**) (qobject.cpp:3287)
==19917==by 0x1425266E: QSingleShotTimer::timerEvent(QTimerEvent*)
(qtimer.cpp:308)
==19917==by 0x1424DE88: QObject::event(QEvent*) (qobject.cpp:1190)
==19917==by 0x132C9C33: QApplicationPrivate::notify_helper(QObject*,
QEvent*) (qapplication.cpp:4481)
==19917==by 0x132CEAC0: QApplication::notify(QObject*, QEvent*)
(qapplication.cpp:4360)
==19917==by 0x1423782B: QCoreApplication::notifyInternal(QObject*, QEvent*)
(qcoreapplication.cpp:787)
==19917==by 0x142643A7: QTimerInfoList::activateTimers()
(qcoreapplication.h:215)
==19917==by 0x14261B93: timerSourceDispatch(_GSource*, int (*)(void*),
void*) (qeventdispatcher_glib.cpp:184)
==19917==by 0xA3E258C: g_main_context_dispatch (gmain.c:2425)
==19917==by 0xA3E2D87: g_main_context_iterate.isra.21 (gmain.c:3073)
==19917==
So, showTbTooltip seems uninitialized. I added printfs around every
place where showTbTooltip is modified. However, my printfs never made it
to screen (stdout/stderr are connected to a /dev/pts/N), which means
that initWidgetsEmbed was never called.
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] X2Go release: x2goserver
On Friday 2012-06-29 19:40, Mike Gabriel wrote:
> Dear all,
>
> The X2Go Project is proud to announce another X2Go component releases:
>
> - x2goserver (3.1.1.2)
>
> The new X2Go server packages will be available in our stable repositories
> (Debian, Ubuntu) within the next 24h.
More patches given.
From: Jan Engelhardt
Date: 2012-02-13 11:08:16.627899794 +0100
x2goserver: avoid using archaic tools
Unmaintained, full of bugs, and so on.
---
x2goserver/bin/x2goresume-session |8 ++--
x2goserver/bin/x2gostartagent | 10 +++---
2 files changed, 13 insertions(+), 5 deletions(-)
Index: x2goserver_3.1.1.1/x2goserver/bin/x2goresume-session
===
--- x2goserver_3.1.1.1.orig/x2goserver/bin/x2goresume-session
+++ x2goserver_3.1.1.1/x2goserver/bin/x2goresume-session
@@ -64,8 +64,12 @@ SERVER=`echo "$SESSIONINFO" | awk -F, {'
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "old ports: $GR_PORT, $SOUND_PORT, $FS_PORT"
-#Get all used in system ports from netstat output
-SYSTEM_PORTS=`netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'`
+#Get all used in system ports from ss output
+ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss);
+USED_PORTS=$(
+ "$ss" -lnt |
+ perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}';
+);
#check if saved in DB ports free
if grep -q "|${GR_PORT}|" <<<$SYSTEM_PORTS ; then
Index: x2goserver_3.1.1.1/x2goserver/bin/x2gostartagent
===
--- x2goserver_3.1.1.1.orig/x2goserver/bin/x2gostartagent
+++ x2goserver_3.1.1.1/x2goserver/bin/x2gostartagent
@@ -124,9 +124,13 @@ fi
USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME`
-#Get all used in system ports from X2Go database and netstat output
-USED_PORTS=`$X2GO_LIB_PATH/x2gogetports $HOSTNAME ; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'`
-
+#Get all used in system ports from X2Go database and ss output
+ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss);
+USED_PORTS=$(
+ "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME";
+ "$ss" -lnt |
+ perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}';
+);
while [ "$OUTPUT" != "inserted" ]; do
X2GO_PORT=$(($X2GO_PORT + 1))
From: Jan Engelhardt
Date: 2012-02-28 08:39:25.478170352 +0100
install: avoid useless use of ls for file globbing
Have a good read of http://partmaps.org/era/unix/award.html
---
x2goserver-compat/Makefile |8
x2goserver-extensions/Makefile |8
x2goserver-fmbindings/Makefile |8
x2goserver-printing/Makefile |8
x2goserver-pyhoca/Makefile |8
x2goserver-xsession/Makefile | 10 +-
x2goserver/Makefile|8
7 files changed, 29 insertions(+), 29 deletions(-)
Index: x2goserver_3.1.1.1/x2goserver-compat/Makefile
===
--- x2goserver_3.1.1.1.orig/x2goserver-compat/Makefile
+++ x2goserver_3.1.1.1/x2goserver-compat/Makefile
@@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
Index: x2goserver_3.1.1.1/x2goserver-extensions/Makefile
===
--- x2goserver_3.1.1.1.orig/x2goserver-extensions/Makefile
+++ x2goserver_3.1.1.1/x2goserver-extensions/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .p
Re: [X2Go-Dev] patchset by Jan Engelhard (was. Re: [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go)
On Monday 2012-06-25 17:15, Mike Gabriel wrote: >> x2goclient: >> >> Is attempting to call "lrelease", but this does not work on Fedora which >> has decided to call it lrelease-qt4 again. > > Ok, thanks for the info. In Debian/Ubuntu both exist (and are synonymous). We > will use the latter (lrelease-qt4). Easier said than done. Because on openSUSE< there is only lrelease, no lrelease-qt4. >> x2goserver: >> >> rpmlint says: >> >> "x2goserver.x86_64: E: non-position-independent-executable (Badness: >> 1) /usr/lib/x2go/x2gosqlitewrapper >> This executable must be position independent. Check that it is built >> with -fPIE/-fpie in compiler flags and -pie in linker flags." > > We (we as in upstream devs) currently do not support multiarch or configurable > libdir paths in x2goserver. It would be nice to have something like autotools > for X2Go Server working. > > Also the x2gosqlitewrapper is very picky on the location of > x2gosqlitewrapper.pl. It has to be located in the same directory. This is > intended. > > What exactly is the origin of the error message? I suspect it is simply because x2gosqlitewrapper is a suid binary, and as such should be hardened with PIE mode. (I don't have any directory issues to report ATM.) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go
Hooray for again no standardization between distributions.
---
configure.ac |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: pinentry-x2go_0.7.5.4/configure.ac
===
--- pinentry-x2go_0.7.5.4.orig/configure.ac
+++ pinentry-x2go_0.7.5.4/configure.ac
@@ -158,7 +158,13 @@ Makefile
AC_OUTPUT
-cd pinentry-x2go && qmake-qt4 PREFIX="$prefix" QMAKE_CFLAGS="$CFLAGS"
QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS $CPPFLAGS"
+for qmake in $(which qmake-qt4 qmake 2>/dev/null); do
+ break;
+done;
+if test -z "$qmake"; then
+ AC_MSG_ERROR([qmake not found])
+fi;
+cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CFLAGS"
QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS $CPPFLAGS"
AC_MSG_NOTICE([
Pinentry-X2Go v${VERSION} has been configured.
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go
The package does not use GNU mode. Mark it as such. Makefile.am: error: required file './ChangeLog' not found Also replace the totally ancient AM_INIT_AUTOMAKE syntax. --- configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pinentry-x2go_0.7.5.4/configure.ac === --- pinentry-x2go_0.7.5.4.orig/configure.ac +++ pinentry-x2go_0.7.5.4/configure.ac @@ -27,7 +27,7 @@ min_automake_version="1.7.6" AC_INIT(pinentry, 0.7.5.2, [x2go-dev@lists.berlios.de]) AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR(pinentry/pinentry.h) -AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) +AM_INIT_AUTOMAKE([foreign]) AC_GNU_SOURCE ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go
CPPFLAGS must also appear in CFLAGS. (And they are commonly
coming before compiler flags.)
---
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pinentry-x2go_0.7.5.4/configure.ac
===
--- pinentry-x2go_0.7.5.4.orig/configure.ac
+++ pinentry-x2go_0.7.5.4/configure.ac
@@ -164,7 +164,7 @@ done;
if test -z "$qmake"; then
AC_MSG_ERROR([qmake not found])
fi;
-cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CFLAGS"
QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS $CPPFLAGS"
+cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS"
QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS"
AC_MSG_NOTICE([
Pinentry-X2Go v${VERSION} has been configured.
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go
On Thursday 2012-06-21 16:26, Mike Gabriel wrote: > The X2Go Project is proud to announce a couple of new X2Go component releases: > > - x2goserver (3.1.1.1) > - pinentry-x2go (0.7.5.4) > [and others] Current issues: pinentry-x2go: 4 patches sent earlier. x2goclient: Is attempting to call "lrelease", but this does not work on Fedora which has decided to call it lrelease-qt4 again. x2godesktopsharing: 1 patch sent. x2gognomebindings: config.sub is absent from x2gognomebindings, which means ./configure runs into an error when it tries to call it. The file is normally created when you run autoreconf -i. x2goserver: rpmlint says: "x2goserver.x86_64: E: non-position-independent-executable (Badness: 1) /usr/lib/x2go/x2gosqlitewrapper This executable must be position independent. Check that it is built with -fPIE/-fpie in compiler flags and -pie in linker flags." ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go
sharetray.cpp: In member function 'void ShareTray::handleSigKeybInt()': sharetray.cpp:225:2: error: '::read' has not been declared sharetray.cpp: In member function 'void ShareTray::handleSigTerm()': sharetray.cpp:237:2: error: '::read' has not been declared sharetray.cpp: In member function 'void ShareTray::handleSigAbort()': sharetray.cpp:249:2: error: '::read' has not been declared sharetray.cpp: In member function 'void ShareTray::handleSigHup()': sharetray.cpp:261:2: error: '::read' has not been declared sharetray.cpp: In static member function 'static void ShareTray::keybintSignalHandler(int)': sharetray.cpp:272:2: error: '::write' has not been declared sharetray.cpp: In static member function 'static void ShareTray::termSignalHandler(int)': sharetray.cpp:278:2: error: '::write' has not been declared sharetray.cpp: In static member function 'static void ShareTray::abortSignalHandler(int)': sharetray.cpp:284:2: error: '::write' has not been declared sharetray.cpp: In static member function 'static void ShareTray::hupSignalHandler(int)': sharetray.cpp:290:2: error: '::write' has not been declared sharetray.cpp: In member function 'void ShareTray::slotStartSharing()': sharetray.cpp:325:40: error: 'getuid' was not declared in this scope sharetray.cpp:325:84: error: 'chown' was not declared in this scope make: *** [sharetray.o] Error 1 --- sharetray.cpp |1 + 1 file changed, 1 insertion(+) Index: x2godesktopsharing_3.1.0.4/sharetray.cpp === --- x2godesktopsharing_3.1.0.4.orig/sharetray.cpp +++ x2godesktopsharing_3.1.0.4/sharetray.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #define STAT_ACT_COUNT 10 #define VERSION "3.0.1.5" ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [X2Go-User] [X2Go-Announcement] New X2Go releases: x2goclient, pyhoca-gui, pyhoca-cli, python-x2go
Avoid error: configure.ac:103: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:193: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2590: _AC_COMPILE_IFELSE is expanded from... ../../lib/autoconf/general.m4:2606: AC_COMPILE_IFELSE is expanded from... configure.ac:103: the top level --- configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pinentry-x2go_0.7.5.4/configure.ac === --- pinentry-x2go_0.7.5.4.orig/configure.ac +++ pinentry-x2go_0.7.5.4/configure.ac @@ -100,7 +100,7 @@ if test "$GCC" = yes; then AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign]) _gcc_cflags_save=$CFLAGS CFLAGS="-Wno-pointer-sign" -AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],_gcc_psign=yes,_gcc_psign=no) AC_MSG_RESULT($_gcc_psign) CFLAGS=$_gcc_cflags_save; if test x"$_gcc_psign" = xyes ; then ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Usernames with dashes causes errors?
On Tuesday 2012-02-21 12:58, christoffer krakou wrote: >We had some strange problems, though. We contacted a school, who >would help us test the server under daily use, and made some test >users for them, called "test-*their name*". When they, and i, tried >to log into those users, the client would freeze, no error message >or anything. On the server, the x2goagent would run amok, soaking up >CPU power. The problem seems to occur only on users with dashes in >their names. Hm, and I would have expected for it to be usernames with spaces to go havoc (those occur esp. in winbind-ed environments), since the x2go stack has a notorious underquoting of shell variables all over the place. [Exhibit 1] ./x2goserver_3.0.99.10/x2goserver/bin/x2gostartagent: OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER` ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Traffic shaping nightmare - missing SSH TOS bits
On Tuesday 2012-02-21 09:43, John A. Sullivan III wrote:
>On Tue, 2012-02-21 at 09:30 +0100, Jan Engelhardt wrote:
>> On Tuesday 2012-02-21 07:05, John A. Sullivan III wrote:
>>
>> >I've been working on a project to implement traffic shaping
>> >to conform to 95th percentile billing including our X2Go virtual
>> >desktops. One of the challenges is prioritizing the interactive X2Go
>> >traffic (screen, keyboard, mouse) differently from bulk traffic like
>> >local share transfers, printing, and possibly sound. I thought this
>> >would be trivial because of the SSH transport since SSH sets the
>> >minimize-delay bit for interactive traffic and the maximize-throughput
>> >bit for bulk transfers.
>>
>> If a user has his own machine, he can of course do whatever he wants.
>> Second, if he can pass options to ssh, he can set the QOS type
>> arbitrarily, and even where that is not available for control, one
>> can still cause the openssh client to use interactive TOS marking for
>> bulk transfers, since secondary ssh channels (e.g. tunnels) do not
>> pass up the TOS mark.
>
>However, Windows and Mac clients may not be using OpenSSH.
That too. All these reasons is why TOS is not a reliable characteristic
to determine the question of bulk-or-interactive.
>PS - out of curiosity, now does one set the QoS type in OpenSSH?
ssh -o IPQoS={bulk|interactive|0x12345} ...
ssh -L 2000:localhost:22 foohost &
rsync -HPave 'ssh -p 2000' bulky.iso localhost:
and in fact, wouldn't the output `ls -Rl /` in an interactive shell also
best be count as bulk...
___
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] Traffic shaping nightmare - missing SSH TOS bits
On Tuesday 2012-02-21 07:05, John A. Sullivan III wrote: >I've been working on a project to implement traffic shaping >to conform to 95th percentile billing including our X2Go virtual >desktops. One of the challenges is prioritizing the interactive X2Go >traffic (screen, keyboard, mouse) differently from bulk traffic like >local share transfers, printing, and possibly sound. I thought this >would be trivial because of the SSH transport since SSH sets the >minimize-delay bit for interactive traffic and the maximize-throughput >bit for bulk transfers. If a user has his own machine, he can of course do whatever he wants. Second, if he can pass options to ssh, he can set the QOS type arbitrarily, and even where that is not available for control, one can still cause the openssh client to use interactive TOS marking for bulk transfers, since secondary ssh channels (e.g. tunnels) do not pass up the TOS mark. ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH] Re: x2godesktopsharing SIGSEV - how to compile with debugging info?
On Saturday 2012-02-18 10:02, Milan Knížek wrote: >> >> The 16 character limit in Arch is just like the 80 character "limit" >> in coding. But actually, it is not a limit, but a wellness target: it >> may be exceeded if there is a justification. In contrast, historic >> UNIX usernames of 8 chars - /that/ was a limit. > >This seems to be a compilation-time configure option >GROUP_NAME_MAX_LENGTH... POSIX does say something about users in section - 3.425 User ID - 3.426 User Name - 3.276 Portable Filename Character Set http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_426 Everything else should therefore be self-inflicted distro limits. :) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] New major distribution builds available for X2go
On Saturday 2012-02-18 02:33, Mike Gabriel wrote: >Hi Alex, hi Jan, > >@Alex: Could you please check if my last commit on nx-libs.git fixes >Xinerama support in with X2Go? >http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=ec47c22c264bd2f1d2ce6e434b503a701dc129f7 Would not know (I have no Xinerama setup). (N.B.: libNX_Xinerama.so.1 would normally installed into the same directory as the other libNX_* files.) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] New major distribution builds available for X2go
[I hate this Reply-To header setting crap... and the absence of the same in the archives.] On Saturday 2012-02-18 09:32, Jan Engelhardt wrote: > >On Friday 2012-02-17 09:16, Oleksandr Shneyder wrote: >>> But symlinking of /usr/lib/nx/X11/libXext.so.6 to >>> /usr/lib/nx/X11/libNX_Xext.so.6 should work (talking about LD_LIBRARY_PATH- >>> using programs) as long as the SONAME stays NX_Xext for automatic >>> dependency finding of rpm (and perhaps deb?). >> >>It is wrong solution. Only (nx|x2go)agent should be linked against >>nx-libs. X-clients should be linked against system X libraries. >>Exception is libXinerama. Against this library should be linked both - >>agent and client. But in case of agent libXinerama should use libXext >>and libX11 from nx-libs and in case of clients it should use the same >>libraries from system. For this reasons we exporting >>LD_LIBRARY_PATH=/usr/lib/nx/X11 by start of agent and > >Given that the agent naturally links against libNX_X*.so now, >do we still need the LD_LIBRARY_PATH hack for the agent? > >>LD_LIBRARY_PATH=/usr/lib/nx/X11/Xinerama (*but not /usr/lib/nx/X11*) by >>start of desktop environment. >> >>>>link system libraries libX11 and libXext into /usr/lib/nx/X11/Xinerama >>>>/usr/lib/libX11* -> /usr/lib/nx/X11/Xinerama/libNX_X11* >>>>/usr/lib/libXext* -> /usr/lib/nx/X11/Xinerama/libNX_Xext* >>[and] >>ln -s /usr/lib/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 >>ln -s /usr/lib/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 > >I would have my reservations about the formal stability of mixing >Xlib implementations within a single program. > ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2Go-Dev] [PATCH] Re: x2godesktopsharing SIGSEV - how to compile with debugging info?
On Saturday 2012-02-18 00:55, Mike Gabriel wrote: >>> >>> I get Segmentation fault when I right-click on x2godesktopsharing >>> icon in the system tray and choose "Activate Desktop Sharing". (Arch >>> Linux.) >> >> The segfault was due to non-existent "x2godesktopsharing" group in the >> system. >> >> This involves two matters: >> >> x Arch Linux does not allow for group names longer then 16 characters. >> >> x x2godesktopsharing should check for existence of the group and quit >> nicely otherwise. > >I need some feedback from the other devs how to handle this. We/I >changed from group x2godesktopshare to x2godesktopsharing more or >less recently, but was not aware of gid-lenght limitations in POSIX. > >What do other devs think of reverting the group name change? I do not see any group name length limit either, however, (a) there is a limit as to what a user can/want to take. While tabcompletion probably gets you out most of the time, nobody really wants e.g. /home/Karl\ Theodor\ Maria\ Nikolaus\ Johann\ Jacob\ Philipp\ Franz\ Joseph\ Sylvester\ Freiherr\ von\ und\ zu\ Guttenberg (21st century, though past-time, German politician serving for this example). (b) not defined by POSIX, but there is an actual sanity limit. A username length about PATH_MAX chars long becomes problematic to be used in a path, e.g. when attempting to use for /home :) The 16 character limit in Arch is just like the 80 character "limit" in coding. But actually, it is not a limit, but a wellness target: it may be exceeded if there is a justification. In contrast, historic UNIX usernames of 8 chars - /that/ was a limit. Was there a reason to put users through a name change the first time? (Note that such changes may not necessarily be automated, e.g. when users relocate the group into LDAP) ___ X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
