From 46b4cf9b82e311982f21915c29aa8d569cbc2033 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 24 Apr 2013 17:52:49 +0200 Subject: silent release (0.0.0.2) --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2a9e73..c59f4ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -lightdm-remote-session-x2go (0.0.0.2-0~x2go1) UNRELEASED; urgency=low +lightdm-remote-session-x2go (0.0.0.2-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] * New upstream version (0.0.0.2): - Use socat instead of socket-sucker.c from lightdm-remote-session-freerdp. - -- Mike Gabriel Sun, 11 Nov 2012 13:12:23 +0100 + -- Mike Gabriel Wed, 24 Apr 2013 17:52:15 +0200 lightdm-remote-session-x2go (0.0.0.1-0~x2go1) unstable; urgency=low -- cgit v1.2.3 From 265d4aa83104ced9ca5999de06b4c4255f693203 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 24 Apr 2013 17:54:09 +0200 Subject: Continue development... --- configure.ac | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a3688ca..17df766 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lightdm-remote-session-x2go], [0.0.0.1]) +AC_INIT([lightdm-remote-session-x2go], [0.0.1.0]) AM_INIT_AUTOMAKE([1.11 -Wno-portability]) AM_SILENT_RULES([yes]) diff --git a/debian/changelog b/debian/changelog index c59f4ba..e24e883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lightdm-remote-session-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel Wed, 24 Apr 2013 17:52:57 +0200 + lightdm-remote-session-x2go (0.0.0.2-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] -- cgit v1.2.3 From 15b8e5a35a380474a1303081f8d6ad8536a1524d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 24 Apr 2013 17:56:47 +0200 Subject: =?UTF-8?q?Stop=20being=20a=20drop-in=20replacement=20for=20lightd?= =?UTF-8?q?m-remote-login-freerdp.=20Become=20an=20independent=20package?= =?UTF-8?q?=20that=20provides=20server=20type=20=C2=BBx2go=C2=AB=20to=20th?= =?UTF-8?q?e=20remote-login-service.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bzrignore | 6 +-- .gitgnore | 6 +-- Makefile.am | 14 +++---- debian/changelog | 5 ++- debian/control | 6 +-- debian/copyright | 6 ++- debian/lightdm-remote-session-x2go.links | 1 - freerdp.desktop.in | 8 ---- lightdm-remote-session-freerdp.in | 71 ------------------------------- lightdm-remote-session-x2go.in | 72 ++++++++++++++++++++++++++++++++ x2go-session-wrapper.c | 2 +- x2go-session.in | 2 +- x2go.desktop.in | 8 ++++ 13 files changed, 104 insertions(+), 103 deletions(-) delete mode 100644 debian/lightdm-remote-session-x2go.links delete mode 100644 freerdp.desktop.in delete mode 100644 lightdm-remote-session-freerdp.in create mode 100644 lightdm-remote-session-x2go.in create mode 100644 x2go.desktop.in diff --git a/.bzrignore b/.bzrignore index 127de56..2a2b5f5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,5 +1,5 @@ -socket-sucker -freerdp-session -freerdp.desktop +x2go-session +x2go.desktop +lightdm-remote-session-x2go compile .deps diff --git a/.gitgnore b/.gitgnore index 127de56..2a2b5f5 100644 --- a/.gitgnore +++ b/.gitgnore @@ -1,5 +1,5 @@ -socket-sucker -freerdp-session -freerdp.desktop +x2go-session +x2go.desktop +lightdm-remote-session-x2go compile .deps diff --git a/Makefile.am b/Makefile.am index fad0ac9..9207574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ pam_session_DATA = \ lightdm_sessiondir = $(datadir)/lightdm/remote-sessions lightdm_session_DATA = \ - freerdp.desktop + x2go.desktop %.desktop: %.desktop.in @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ @@ -20,9 +20,9 @@ x2go-session: x2go-session.in apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ - lightdm-remote-session-freerdp + lightdm-remote-session-x2go -lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in +lightdm-remote-session-x2go: lightdm-remote-session-x2go.in @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ libexec_PROGRAMS = \ @@ -36,14 +36,14 @@ x2go_session_wrapper_CFLAGS = \ EXTRA_DIST = \ $(pam_session_DATA) \ - freerdp.desktop.in \ + x2go.desktop.in \ x2go-session.in \ - lightdm-remote-session-freerdp.in + lightdm-remote-session-x2go.in CLEANFILES = \ - freerdp.desktop \ + x2go.desktop \ x2go-session \ - lightdm-remote-session-freerdp + lightdm-remote-session-x2go DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/debian/changelog b/debian/changelog index e24e883..5efdfba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ lightdm-remote-session-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.0.2): + - Stop being a drop-in replacement for lightdm-remote-login-freerdp. + Become an independent package that provides server type »x2go« to + the remote-login-service. -- Mike Gabriel Wed, 24 Apr 2013 17:52:57 +0200 diff --git a/debian/control b/debian/control index f0b2e36..81ce8ed 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: dh-apparmor, cdbs, dh-autoreconf, -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://wiki.x2go.org Vcs-Git: git://code.x2go.org/lightdm-remote-session-x2go Vcs-Browser: http://code.x2go.org/gitweb?p=lightdm-remote-session-x2go.git;a=summary @@ -24,10 +24,6 @@ Depends: pyhoca-cli (>= 0.2.1.0-0~), libpam-x2go, lightdm (>= 1.3.3-0~) -Conflicts: - lightdm-remote-session-freerdp, -Replaces: - lightdm-remote-session-freerdp, Suggests: apparmor, Description: Log into X2Go sessions via LightDM diff --git a/debian/copyright b/debian/copyright index 086c43f..9ab1749 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,14 @@ Upstream-Name: lightdm-remote-session-x2go Source: http://code.x2go.org/gitweb?p=lightdm-remote-session-x2go.git;a=summary Files: * -Copyright: 2012, Canonical Ltd. +Copyright: + 2012-2013, Mike Gabriel (X2Go Project) + 2012, Canonical Ltd. License: GPL-3 Files: debian/* Copyright: - 2012, Mike Gabriel (X2Go Project) + 2012-2013, Mike Gabriel (X2Go Project) 2012, Canonical Ltd. License: GPL-3 diff --git a/debian/lightdm-remote-session-x2go.links b/debian/lightdm-remote-session-x2go.links deleted file mode 100644 index c427b8c..0000000 --- a/debian/lightdm-remote-session-x2go.links +++ /dev/null @@ -1 +0,0 @@ -/etc/pam.d/lightdm-remote-x2go /etc/pam.d/lightdm-remote-freerdp \ No newline at end of file diff --git a/freerdp.desktop.in b/freerdp.desktop.in deleted file mode 100644 index f976b14..0000000 --- a/freerdp.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=FreeRDP -Comment=Full Screen X2Go Session -Exec=@libexecdir@/x2go-session-wrapper -TryExec=@libexecdir@/x2go-session-wrapper -Icon= -Type=Application -X-LightDM-PAM-Service=lightdm-remote-freerdp diff --git a/lightdm-remote-session-freerdp.in b/lightdm-remote-session-freerdp.in deleted file mode 100644 index 9709a92..0000000 --- a/lightdm-remote-session-freerdp.in +++ /dev/null @@ -1,71 +0,0 @@ -# vim:syntax=apparmor -# Profile for restricting lightdm remote session for X2Go -# Based on the Guest Account Apparmor script from: -# Author: Martin Pitt - -#include - -@libexecdir@/x2go-session-wrapper { - #include - #include - #include - /etc/compizconfig/config rw, # bug in compiz https://launchpad.net/bugs/697678 - - / r, - /bin/ rmix, - /bin/fusermount Px, - /bin/** rmix, - /cdrom/ rmix, - /cdrom/** rmix, - /dev/ r, - /dev/** rmw, # audio devices etc. - owner /dev/shm/** rmw, - /etc/ r, - /etc/** rmk, - /etc/gdm/Xsession ix, - /lib/ r, - /lib/** rmixk, - /lib32/ r, - /lib32/** rmixk, - /lib64/ r, - /lib64/** rmixk, - owner /media/ r, - owner /media/** rmwlixk, # we want access to USB sticks and the like - /opt/ r, - /opt/** rmixk, - @{PROC}/ r, - @{PROC}/* rm, - @{PROC}/asound rm, - @{PROC}/asound/** rm, - @{PROC}/ati rm, - @{PROC}/ati/** rm, - owner @{PROC}/** rm, - # needed for gnome-keyring-daemon - @{PROC}/*/status r, - /sbin/ r, - /sbin/** rmixk, - /sys/ r, - /sys/** rm, - /tmp/ rw, - owner /tmp/** rwlkmix, - /usr/ r, - /usr/** rmixk, - /var/ r, - /var/** rmixk, - /var/guest-data/** rw, # allow to store files permanently - /var/tmp/ rw, - owner /var/tmp/** rwlkm, - /{,var/}run/ r, - # necessary for writing to sockets, etc. - /{,var/}run/** rmkix, - /{,var/}run/shm/** wl, - - capability ipc_lock, - - # silence warnings for stuff that we really don't want to grant - deny capability dac_override, - deny capability dac_read_search, - #deny /etc/** w, # re-enable once LP#697678 is fixed - deny /usr/** w, - deny /var/crash/ w, -} diff --git a/lightdm-remote-session-x2go.in b/lightdm-remote-session-x2go.in new file mode 100644 index 0000000..6a105ca --- /dev/null +++ b/lightdm-remote-session-x2go.in @@ -0,0 +1,72 @@ +# vim:syntax=apparmor +# Profile for restricting lightdm remote session for X2Go +# Based on the Guest Account Apparmor script from: +# Author: Martin Pitt +# Mike Gabriel + +#include + +@libexecdir@/x2go-session-wrapper { + #include + #include + #include + /etc/compizconfig/config rw, # bug in compiz https://launchpad.net/bugs/697678 + + / r, + /bin/ rmix, + /bin/fusermount Px, + /bin/** rmix, + /cdrom/ rmix, + /cdrom/** rmix, + /dev/ r, + /dev/** rmw, # audio devices etc. + owner /dev/shm/** rmw, + /etc/ r, + /etc/** rmk, + /etc/gdm/Xsession ix, + /lib/ r, + /lib/** rmixk, + /lib32/ r, + /lib32/** rmixk, + /lib64/ r, + /lib64/** rmixk, + owner /media/ r, + owner /media/** rmwlixk, # we want access to USB sticks and the like + /opt/ r, + /opt/** rmixk, + @{PROC}/ r, + @{PROC}/* rm, + @{PROC}/asound rm, + @{PROC}/asound/** rm, + @{PROC}/ati rm, + @{PROC}/ati/** rm, + owner @{PROC}/** rm, + # needed for gnome-keyring-daemon + @{PROC}/*/status r, + /sbin/ r, + /sbin/** rmixk, + /sys/ r, + /sys/** rm, + /tmp/ rw, + owner /tmp/** rwlkmix, + /usr/ r, + /usr/** rmixk, + /var/ r, + /var/** rmixk, + /var/guest-data/** rw, # allow to store files permanently + /var/tmp/ rw, + owner /var/tmp/** rwlkm, + /{,var/}run/ r, + # necessary for writing to sockets, etc. + /{,var/}run/** rmkix, + /{,var/}run/shm/** wl, + + capability ipc_lock, + + # silence warnings for stuff that we really don't want to grant + deny capability dac_override, + deny capability dac_read_search, + #deny /etc/** w, # re-enable once LP#697678 is fixed + deny /usr/** w, + deny /var/crash/ w, +} diff --git a/x2go-session-wrapper.c b/x2go-session-wrapper.c index 2bf3576..a640e5c 100644 --- a/x2go-session-wrapper.c +++ b/x2go-session-wrapper.c @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel + * Copyright © 2012-2013 Mike Gabriel * Copyright © 2012 Canonical Ltd. * * This program is free software: you can redistribute it and/or modify it diff --git a/x2go-session.in b/x2go-session.in index 1b3c739..787f163 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright © 2012 Mike Gabriel +# Copyright © 2012-2013 Mike Gabriel # Copyright © 2012 Canonical Ltd. # # This program is free software: you can redistribute it and/or modify it diff --git a/x2go.desktop.in b/x2go.desktop.in new file mode 100644 index 0000000..d3c9609 --- /dev/null +++ b/x2go.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=X2Go +Comment=Full Screen X2Go Session +Exec=@libexecdir@/x2go-session-wrapper +TryExec=@libexecdir@/x2go-session-wrapper +Icon= +Type=Application +X-LightDM-PAM-Service=lightdm-remote-x2go -- cgit v1.2.3 From b415237f37b08f1a5d8dd61ae0fef28eca52c710 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 24 Apr 2013 18:42:03 +0200 Subject: fix upstream version in /debian/changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5efdfba..94dbf07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ lightdm-remote-session-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low - * New upstream version (0.0.0.2): + * New upstream version (0.0.1.0): - Stop being a drop-in replacement for lightdm-remote-login-freerdp. Become an independent package that provides server type »x2go« to the remote-login-service. -- cgit v1.2.3 From ac687b080487c02f2ed41a2a42e6a68cce638d4b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 24 Apr 2013 18:44:19 +0200 Subject: Prepare for becoming able to use PyHoca-CLI _or_ X2Go Client for handling the X2Go session being launched via remote login. --- debian/changelog | 2 ++ debian/control | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94dbf07..8373bad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ lightdm-remote-session-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low - Stop being a drop-in replacement for lightdm-remote-login-freerdp. Become an independent package that provides server type »x2go« to the remote-login-service. + - Prepare for becoming able to use PyHoca-CLI _or_ X2Go Client for + handling the X2Go session being launched via remote login. -- Mike Gabriel Wed, 24 Apr 2013 17:52:57 +0200 diff --git a/debian/control b/debian/control index 81ce8ed..596f83c 100644 --- a/debian/control +++ b/debian/control @@ -21,11 +21,12 @@ Depends: ${misc:Depends}, socat, zenity, - pyhoca-cli (>= 0.2.1.0-0~), + pyhoca-cli (>= 0.2.1.0-0~) | x2goclient (>= 4.0.1.1-0~), libpam-x2go, - lightdm (>= 1.3.3-0~) + lightdm (>= 1.3.3-0~), Suggests: apparmor, Description: Log into X2Go sessions via LightDM The configuration files needed and scripts required to login - to a full screen X2Go session using LightDM and PyHoca / Python X2Go. + to a full screen X2Go session using LightDM and PyHoca / Python X2Go + or X2Go Client. -- cgit v1.2.3 From 3590ecd60a4ce1f99f5d4c07d787dc134904894a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 26 Apr 2013 00:58:58 +0200 Subject: whitespace cleanup --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 9207574..1081752 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ - pam_sessiondir = $(sysconfdir)/pam.d/ pam_session_DATA = \ lightdm-remote-x2go -- cgit v1.2.3