x2go-dev November 2012

x2go-dev@lists.x2go.org

18 participants
50 discussions

[PATCH] Remove redundant tool "socket-sucker"
by Jan Engelhardt 12 Nov '12

12 Nov '12

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..0000000 --- a/socket-sucker.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright © 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * 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 <http://www.gnu.org/licenses/>. - * - * Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * Author libpam-freerdp (where we forked from): Ted Gould <ted(a)canonical.com> - */ - -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> - -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/un.h> - -#define BUFFER_SIZE 256 - -int -main (int argc, char * argv[]) -{ - int socket_fd = 0; - int servlen = 0; - struct sockaddr_un serv_addr; - - bzero((char *)&serv_addr, sizeof(serv_addr)); - - const char * home = getenv("HOME"); - if (home == NULL) { - return -1; - } - - serv_addr.sun_family = AF_UNIX; - - int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket"); - if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) { - return -1; - } - - servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family); - - if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - return -1; - } - - if (connect(socket_fd, (struct sockaddr *)&serv_addr, servlen) < 0) { - return -1; - } - - char buffer[BUFFER_SIZE + 2]; - int in = 0; - int out = 0; - - in = read(socket_fd, buffer, BUFFER_SIZE); - - if (in > 0) { - out = write(1, buffer, in); - } - - close(socket_fd); - - if (in > 0 && out > 0 && in == out) { - return 0; - } else { - return -1; - } -} - diff --git a/x2go-session.in b/x2go-session.in index 7466509..1b3c739 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -20,10 +20,11 @@ # Author lightdm-remote-session-freerdp (where we forked from): Ted Gould <ted(a)canonical.com> # -if [ -e ~/.x2go-socket ]; then - @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto --sound pulse 2>&1 | logger -t lightdm-remote-session-x2go -- +socket="$HOME/.x2go-socket"; +if [ -e "$socket" ]; then + socat unix-connect:"$socket" - | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto --sound pulse 2>&1 | logger -t lightdm-remote-session-x2go -- else zenity --warning --text="Unable to locate X2GoSession/PyHoca socket" fi; -rm -f ~/.x2go-socket +rm -f "$socket" -- 1.7.10.4

3 3

[PATCH] build: continue to run even in the absence of AM_SILENT_RULES
by Jan Engelhardt 12 Nov '12

12 Nov '12

--- 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

2 1

On the new lightdm-x2go package
by Jan Engelhardt 11 Nov '12

11 Nov '12

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.)

2 2

[X2Go-Announcement] New X2Go releases: x2goserver, x2goclient, nx-libs aka x2goagent
by Mike Gabriel 11 Nov '12

11 Nov '12

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) All new packages are already available in our stable repositories (Debian, Ubuntu). The binaries for Windows / Mac OS of X2Go Client will follow ASAP. PING@: Mihai (Mac OS build?), Alex (Windows build?) In the new X2Go Server release several issues got addressed: o X2Go server now works with i18n ,,Desktop'' folder names (using XDG for detecting the folder name) o Prevent x2gocleansessions from leaving zombie processes behind In x2goclient, several new features have been added. We urgently ask to report back new issue that may have come up by this massive code change: o Native / local RDP client support (Linux only, use it on your thinclients!!!) o Encapsulate X2Go-proxied fullscreen RDP session in desktop X2Go sessions, not rootless anymore. => X2GO logo appears on screen after session startup of such an RDP session o Add SSH proxy and HTTP proxy support (HTTP proxy is only usable with a libssh version not yet released, so this feature won't work for most of you...) o Fix creation of desktop shortcut icons for launching individual session profiles in hidden mode o Fix broken Xinerama support (got broken when we fixed x2goclient being able to handle non-bash login sessions) o new desktop shell in session type configuration: XFCE o add package: x2goplugin-provider, shows an example plugin configuration (visit: http://localhost/x2goplugin.html) o Much work on the HTTP broker client code o SSH broker added to the client code o Fix x2goplugin (Failed to resolve hostname issue) o New translations: Spanish, Danish (Thanks to Ricardo and Christoffer!!!) o Updated translation files (thanks to the other translators, too!!!) In nx-libs the tarball installer has been improve. It now installs in the same way as is done by the Debian packaging intelligence (only difference, it installs to /usr/local). No configure script for nx-libs.git, yet, but hopefully we have someone (Ralf) working on it for some future release of nx-libs. People packaging nx-libs should thoroughly check their packaging mechanism!!! light+love, Mike X2GOSERVER ========== x2goserver (3.1.1.6-0~x2go1) RELEASE; urgency=low * Bugfix release (3.1.1.6): - Fix for non-well-tested x2gomountdirs script. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 20:57:54 +0100 x2goserver (3.1.1.5-0~x2go1) RELEASE; urgency=low [ Stéphane Graber ] * New upstream version (3.1.1.5): - Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD let the script wait for cleaning up after its children. (Closes upstream issue #38). [ Mike Gabriel ] * New upstream version (3.1.1.5): - Fix x2gogetapps when rendering multi-section .desktop files. (Closes upstream issue #43). - Remove redundant setting of loglevel in x2gogetapps. - Fix ,,Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.'' from last release. - Detect i18n name of Desktop folder via XDG_DESKTOP_DIR environment variable. - Put option of database call in x2gogetagent into parantheses. * /debian/control: + Depend on libfile-basedir-perl. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 16:36:36 +0100 X2GOCLIENT ========== x2goclient (3.99.3.0-0~x2go1) RELEASE; urgency=low [ Mike Gabriel ] * New upstream version (3.99.3.0): - Rebuild i18n files, add x2goclient_dk.ts for the new Danish translator (Christoffer Krakou). - Update German translation. - Run X2Go-proxied RDP session with fullscreen mode as sessions of X2Go session type "D". (Closes upstream issue #22) - Allow pass-through of username and password for X2Go-proxied RDP sessions. The strings X2GO_USER and X2GO_PASSWORD in rdpoptions will be replaced by username+password enter into X2Go Clients login dialog. Only replace username+password if they received a value from the login widget of the main window. - Drop i18n idea to translate English to English. - Fix creation of session profile icon on desktop. The .desktop files need the x-bit set. Also: add a compatibility profile name rewrite for PyHoca-GUI profile names containing a slash, PyHoca-GUI uses a slash as separator character for submenu cascades. - Use ,,printf'' instead of ,,echo -e'' (Bashism). Fixes creation of xinerama.conf files. - Add XFCE as possible session type. (Closes upstream issue: #51) * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Add rdesktop and xfreerdp to Recommends. + Priority: optional. + Bin:package x2goplugin-provider: depend on x2goplugin. * New bin:package (all): x2goplugin-provider. Provide basic Apache2 configuration for a demo x2goplugin website. * Bump Standards version to 3.9.3. [ Daniel Lindgren ] * New upstream version (3.99.3.0): - Update Swedish translation. [ Terje Andersen ] * New upstream version (3.99.3.0): - Update Norwegian Bokmal translation. [ Christoffer Krakou ] * New upstream version (3.99.3.0): - Add Danish translation to x2goclient. - Proof read Danish translation. - Update DirectRDP in Danish translation. [ Oleksandr Shneyder ] * New upstream version (3.99.3.0): - Add settings for direct RDP connection. - Implement direct RDP connection using standalone client. - Build direct RDP feature only for linux. - Add DEFINES += __linux__ to project file when building linux binaries (need to define Q_OS_LINUX in moc generator). - Update "ts" files. - Fixed label "SSH port" and "RDP port" to "SSH port:" and "RDP port:". Update "ts" files once again. - Add translation for label "RDP port:". Update "ts" files updated Russian translation. - Add translation for checkbox "Direct RDP Connection" and update Russian and German translation. - Restart pulse server on windows if it crashed. - Show "Advanced Options" button only if RDP session chosen. - Fixing kbd focus issue for all kinds of sessions in thinclient mode. (Closes upstream issue #20). - Add command line parameter --ssh-key and --autologin. - Disable check box "use default sound port" if sound disabled. - Add support for HTTP proxy - developed by Heinrich Schuchardt (xypron.glpk(a)gmx.de) Closes upstream issue #34. - Add support for SSH proxy in class SshMasterConnection. - SshMasterConnection emit signal to GUI thread if it need a passphrase to decrypt a ssh key. GUI thread use input dialog to read a passphrase from user. - Add support for SSH proxy (HTTP and SSH) to X2Go Client GUI. - Clean some broker code. - It is possible to add several ssh keys from commandline in form: --ssh-key=[user@][server:][port:]<path to key> it can be useful for TCE or login over broker. - Improve broker code, add support for "usebrokerpass" config variable to use broker pass for ssh auth on X2Go server. - Commandline options --broker-noauth. - Support for SSH broker. --broker-user removed, use username in broker url instead. - Reduce listen interval for ssh-tunnel to 100 msec. - Fix visibility of SSH-proxy box with direct RDP sessions. - SshProcess is only usable over SshMasterConnection. - Fixing SSH proxy support for Windows. - Hide system tray icon before close. - Fix error "Failed to resolve hostname" in plugin mode (Closes upstream issue #55). - Do not show "RDP Settings" group box in plugin mode (Closes upstream issue #56). [ Ricardo Diaz ] * New upstream version (3.99.3.0): - Add Spanish translation file. - Update Spanish translation file. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 16:07:43 +0100 NX-LIBS ======= nx-libs (2:3.5.0.16-0) RELEASE; urgency=low * Fix installation of header files in Debian package. * Fix patch file names concerning component nx-X11. * Modify patch: 032_no-x11r6.full.patch. Install nx-X11 to /usr/local/lib/nx. * Add patch: 032_no-x11r6.debian.patch. Use /usr/lib/nx for nx-X11 on Debian. * Drop patch 032, fix other patches so that installation via make install installs NX components to /usr/local/lib/nx and /usr/local/include/nx. * Add patches: 024_fix-make-clean.full.patch, 024_fix-make-clean.full+lite.patch. Fix clean-up of build tree after make build has run. * Add patch: 025_nxproxy_no-configure-file.full+lite.patch. Remove unneeded build file from NoMachine's nxproxy sources. * Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and x2goagent wrapper scripts during make install. * Fix wrapper scripts: make sure all NX executables can be launched if NX gets installed via the tarball installation method. * Modify patch: 001_add-main-makefile.full+lite.patch. Add uninstall routine. * Dropping empty override rules for quilt patch from /debian/rules. * Bump Debian Standards to 3.9.3 (no changes needed). Update Home page and Vcs information. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 21:07:49 +0100 -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

3 2

[PATCH] build: continue to run even in the absence of AM_SILENT_RULES
by Jan Engelhardt 11 Nov '12

11 Nov '12

--- 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

1 0

x2go with git submodules
by Ralf Hemmecke 10 Nov '12

10 Nov '12

I'm sorry, my last mail should have been sent to the developers list (of course). On 11/07/2012 12:25 PM, Reinhard Tartler wrote: > On Wed, Nov 7, 2012 at 11:42 AM, Ralf Hemmecke <hemmecke(a)gmail.com> wrote: >>>> Maybe I should rather subscribe to the x2go-developer list. Looking at >>>> http://www.x2go.org/doku.php/wiki:development:git >>>> tells me about "Checkout all repos:". A bash-script? That looks like >>>> x2go should rather use "git submodules" no? >> >> Hi, >> >> maybe I shouldn't do this before knowing x2go better, but since I was >> somehow shocked by this bash script... >> >> I've actually executed it and found out that I should delete the >> deprecated line *and* the line >> >> x2goagent.git \ >> >> since also that gives a 'permission denied error'. >> >> Furthermore, when I look at http://code.x2go.org/gitweb, I somehow get >> the impression that the list on the webpage is completely outdated. >> >> So, here my suggestion. Use git submodules and tell developers to clone >> the sources like >> >> git clone git://code.x2go.org/x2org.git >> cd x2org >> git submodule init >> git submodule update >> >> Someone from the core developers should (of course create the initial >> x2org.git. >> >> For demonstration purposes you can start with >> >> git clone git://github.com/hemmecke/x2go.git >> >> but some core developer should actually produce a x2go.git like >> >> mkdir x2go >> cd x2go >> git init >> for r in buildscripts.git ,,, ; do \ >> git submodule add git://code.x2go.org/$r; \ >> done >> git commit >> >> with the correct list of (sub-)projects or simply clone my x2go.git and >> add the missing projects via >> >> git submodule add git://code.x2go.org/libjpeg-turbo.git >> >> and then publish that x2go.git repo somewhere. >> >> >> This probably doesn't give you the exactly same setup as you had before, >> since (as you can see from the git://, everyone would only get read >> access to the repository. >> >> But hey, we are dealing with git, nobody actually needs write access to >> anybody elses repository. The X2GO project has just to declare some of >> the many repositories as the OFFICIAL one and one or two people would be >> responsible to push into this OFFICIAL repository. For collaboration >> there is github and all the other free git-repository hosting providers. >> >> But of course, that is all up to the inner core of developers who >> decide. I've just made my suggestion. Feel free to adapt to your actual >> needs. (Since I am too new, I don't yet know them.) > > Implementing what you suggest is very likely to break our build > infrastructure, which automatically builds nightly debian packages for > debian and ubuntu. I'm not saying that it was impossible to do what > you suggest, but we must ensure first that changing the repository > organization does not cause regressions for our users. Huh? I don't understand this. All I suggested was to add a new "super" repository that pulls in the existing ones for a local setup. All your official repositories can stay where they are. You could even leave the bash script in place if you like. I think I forgot to include a link. http://git-scm.com/book/en/Git-Tools-Submodules Ralf

5 23

Bug#41: Closing bug, resolved in nx-libs release 3.5.0.16
by Mike Gabriel 10 Nov '12

10 Nov '12

close #41 thanks This issue is resolved by the new release 3.5.0.16 of nx-libs (NX redistributed). Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

3 3

Bug#38: Closing bug, resolved in x2goclient release 3.99.3.0
by Mike Gabriel 07 Nov '12

07 Nov '12

close #38 close #43 thanks This issue is resolved by the new release 3.1.1.5 of x2goserver. Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#22: Closing bug, resolved in x2goclient release 3.99.3.0
by Mike Gabriel 07 Nov '12

07 Nov '12

close #20 close #22 close #51 close #55 close #56 close #34 thanks This issue is resolved by the new release 3.99.3.0 of x2goclient. Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#57: #57 is not an upstream bug anymore, the report was meant for bugs.debian.org
by Mike Gabriel 07 Nov '12

07 Nov '12

reassign #57 not-a-bug close #57 thanks ahhhh... mixing up bugs.x2go.org and bugs.debian.org... Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

x2go-dev November 2012