lightdm-remote-session-arctica: Fork from latest known version of lightdm-remote-session-x2go.

13 files changed, 59 insertions, 95 deletions

diff --git a/Makefile.am b/Makefile.am
index 1081752..ca50aa2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,48 +1,48 @@
 pam_sessiondir = $(sysconfdir)/pam.d/
 pam_session_DATA = \
-	lightdm-remote-x2go
+	lightdm-remote-arctica
 
 lightdm_sessiondir = $(datadir)/lightdm/remote-sessions
 lightdm_session_DATA = \
-	x2go.desktop
+	arctica.desktop
 
 %.desktop: %.desktop.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 session_startdir = $(pkgdatadir)
 session_start_SCRIPTS = \
-	x2go-session
+	arctica-session
 
-x2go-session: x2go-session.in
+arctica-session: arctica-session.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 	@chmod +x $@
 
 apparmordir = $(sysconfdir)/apparmor.d/
 apparmor_DATA = \
-	lightdm-remote-session-x2go
+	lightdm-remote-session-arctica
 
-lightdm-remote-session-x2go: lightdm-remote-session-x2go.in
+lightdm-remote-session-arctica: lightdm-remote-session-arctica.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 libexec_PROGRAMS = \
-	x2go-session-wrapper
+	arctica-session-wrapper
 
-x2go_session_wrapper_SOURCES = \
-	x2go-session-wrapper.c
-x2go_session_wrapper_CFLAGS = \
+arctica_session_wrapper_SOURCES = \
+	arctica-session-wrapper.c
+arctica_session_wrapper_CFLAGS = \
 	-DPKGDATADIR="\"$(pkgdatadir)\"" \
 	-Wall -Werror
 
 EXTRA_DIST = \
 	$(pam_session_DATA) \
-	x2go.desktop.in \
-	x2go-session.in \
-	lightdm-remote-session-x2go.in
+	arctica.desktop.in \
+	arctica-session.in \
+	lightdm-remote-session-arctica.in
 
 CLEANFILES = \
-	x2go.desktop \
-	x2go-session \
-	lightdm-remote-session-x2go
+	arctica.desktop \
+	arctica-session \
+	lightdm-remote-session-arctica
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
diff --git a/README.md b/README.md
index adfbc2e..04f4e8c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# LightDM (Arctica Greeter) Remote Logon: X2Go #
+# LightDM (Arctica Greeter) Remote Logon: Arctica #
 
-Configuration for LightDM / Arctica Greeter to launch remote X2Go sessions.
+Configuration for LightDM / Arctica Greeter to launch remote Arctica Sessions.
 
 This code project was originally started by Canonical Ltd. and has been
 adapted by various authors with the purpose of making Remote Logon
-against X2Go via Arctica Greeter (formerly known as Unity Greeter)
+against Arctica via Arctica Greeter (formerly known as Unity Greeter)
 available on Ubuntu and non-Ubuntu systems alike.
diff --git a/x2go-session-wrapper.c b/arctica-session-wrapper.c
index a640e5c..ef4687e 100644
--- a/x2go-session-wrapper.c
+++ b/arctica-session-wrapper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+ * Copyright © 2012-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
  * Copyright © 2012 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -25,7 +25,7 @@ int
 main (int argc, char * argv[])
 {
 	char * args[2];
-	args[0] = PKGDATADIR "/x2go-session";
+	args[0] = PKGDATADIR "/arctica-session";
 	args[1] = NULL;
 
 	execvp(args[0], args);
diff --git a/x2go-session.in b/arctica-session.in
index 787f163..1caec66 100755
--- a/x2go-session.in
+++ b/arctica-session.in
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright © 2012-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+# Copyright © 2012-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 # Copyright © 2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -20,11 +20,11 @@
 # Author lightdm-remote-session-freerdp (where we forked from): Ted Gould <ted@canonical.com>
 #
 
-socket="$HOME/.x2go-socket";
+socket="$HOME/.arctica-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 --
+	socat unix-connect:"$socket" - | /usr/bin/arctica-cli --from-stdin 2>&1 | logger -t lightdm-remote-session-arctica --
 else
-	zenity --warning --text="Unable to locate X2GoSession/PyHoca socket"
+	zenity --warning --text="Unable to locate Arctica Session socket"
 fi;
 
 rm -f "$socket"
diff --git a/arctica.desktop.in b/arctica.desktop.in
new file mode 100644
index 0000000..df9b913
--- /dev/null
+++ b/arctica.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Arctica
+Comment=Full Screen Arctica Session
+Exec=@libexecdir@/arctica-session-wrapper
+TryExec=@libexecdir@/arctica-session-wrapper
+Icon=
+Type=Application
+X-LightDM-PAM-Service=lightdm-remote-arctica
diff --git a/configure.ac b/configure.ac
index c6e68c3..5c2c5ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lightdm-remote-session-x2go], [0.0.1.1])
+AC_INIT([lightdm-remote-session-arctica], [0.0.1.1])
 
 AM_INIT_AUTOMAKE([1.11 -Wno-portability])
 AM_SILENT_RULES([yes])
diff --git a/debian/changelog b/debian/changelog
index 56f837b..a52b12a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,42 +1,6 @@
-lightdm-remote-session-x2go (0.0.1.1-0) UNRELEASED; urgency=low
+lightdm-remote-session-arctica (0.0.1.1-0) UNRELEASED; urgency=low
 
-  * New upstream version (0.0.1.1):
-    - Add apparmor rule that grants read access to the kernel's random UUID
-      generator.
-    - Another apparmor rule: allow rw access to /var/lib/libuuid/clock.txt".
-  * debian/source/format:
-    + Switch to format 1.0.
+  * Upstream-provided Debian package for lightdm-remote-session-arctica.
+    See upstream ChangeLog for recent changes.
 
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 30 Apr 2013 17:04:25 +0200
-
-lightdm-remote-session-x2go (0.0.1.0-0~x2go1) unstable; urgency=low
-
-  * 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.
-    - Prepare for becoming able to use PyHoca-CLI _or_ X2Go Client for
-      handling the X2Go session being launched via remote login.
-
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 27 Apr 2013 13:49:02 +0200
-
-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 <mike.gabriel@das-netzwerkteam.de>  Wed, 24 Apr 2013 17:52:15 +0200
-
-lightdm-remote-session-x2go (0.0.0.1-0~x2go1) unstable; urgency=low
-
-  * Initial upstream release. Forked from Canonical's
-    lightdm-remote-session-freerdp (by  Ted Gould <ted@canonical.com>).
-  * /debian/control:
-    + Be a drop-in replacement for lightdm-remote-session-freerdp for now
-      until Canonical offers X2Go sessions on
-      https://uccs.landscape.canonical.com.
-      -> Thus, conflict with and replace lightdm-remote-session-freerdp.
-    + Versioned dependency on pyhoca-cli (>= 0.2.1.0).
-
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 10 Nov 2012 22:19:55 +0100
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sun, 09 Nov 2016 01:19:55 +0200
diff --git a/debian/control b/debian/control
index 596f83c..590b876 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
-Source: lightdm-remote-session-x2go
+Source: lightdm-remote-session-arctica
 Section: misc
 Priority: extra
-Maintainer: X2Go Developers <x2go-dev@lists.berlios.de>
+Maintainer: Arctica Developers <devs@lists.arctica-project.org>
 Uploaders:
  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends:
@@ -10,23 +10,23 @@ Build-Depends:
  cdbs,
  dh-autoreconf,
 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
+Homepage: http://wiki.arctica.org
+Vcs-Git: https://github.com/ArcticaProject/lightdm-remote-session-arctica
+Vcs-Browser: https://github.com/ArcticaProject/lightdm-remote-session-arctica
 
-Package: lightdm-remote-session-x2go
+Package: lightdm-remote-session-arctica
 Architecture: any
 Depends: 
  ${shlibs:Depends},
  ${misc:Depends},
  socat,
  zenity,
- pyhoca-cli (>= 0.2.1.0-0~) | x2goclient (>= 4.0.1.1-0~),
- libpam-x2go,
+ arctica-cli,
+ libpam-arctica,
  lightdm (>= 1.3.3-0~),
 Suggests:
  apparmor,
-Description: Log into X2Go sessions via LightDM
+Description: Log into Arctica Sessions via LightDM
  The configuration files needed and scripts required to login
- to a full screen X2Go session using LightDM and PyHoca / Python X2Go
- or X2Go Client.
+ to a full screen Arctica Session using LightDM and the
+ Arctica Client (command line version).
diff --git a/debian/copyright b/debian/copyright
index 9ab1749..71e9d7c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,16 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: lightdm-remote-session-x2go
-Source: http://code.x2go.org/gitweb?p=lightdm-remote-session-x2go.git;a=summary
+Upstream-Name: lightdm-remote-session-arctica
+Source: https://github.com/ArcticaProject/lightdm-remote-session-arctica
 
 Files: *
 Copyright:
- 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de>
+ 2012-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
  2012, Canonical Ltd.
 License: GPL-3
 
 Files: debian/*
 Copyright:
- 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de>
+ 2012-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
  2012, Canonical Ltd.
 License: GPL-3
 
diff --git a/debian/watch b/debian/watch
index 3ca055a..b2965a5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://code.x2go.org/releases/source/lightdm-remote-session-x2go/lightdm-remote-session-x2go-(.+)\.tar\.gz
+opts=filenamemangle=s/.*\/.*?([\d\.-]+)\.tar\.gz/lightdm-remote-session-arctica-$1.tar.gz/ \
+https://github.com/ArcticaProject/lightdm-remote-session-arctica/tags .*/archive/.*?([\d\.]+).tar.gz
diff --git a/lightdm-remote-x2go b/lightdm-remote-arctica
index 4a524d1..4b62cf6 100644
--- a/lightdm-remote-x2go
+++ b/lightdm-remote-arctica
@@ -2,7 +2,6 @@
 auth    requisite       pam_nologin.so
 auth    required        pam_env.so readenv=1
 auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
-auth    required        pam_x2go.so
+auth    required        pam_arctica.so
 session required        pam_limits.so
-session required        pam_x2go.so
-
+session required        pam_arctica.so
diff --git a/lightdm-remote-session-x2go.in b/lightdm-remote-session-arctica.in
index db225c3..25fe133 100644
--- a/lightdm-remote-session-x2go.in
+++ b/lightdm-remote-session-arctica.in
@@ -6,7 +6,7 @@
 
 #include <tunables/global>
 
-@libexecdir@/x2go-session-wrapper {
+@libexecdir@/arctica-session-wrapper {
   #include <abstractions/authentication>
   #include <abstractions/nameservice>
   #include <abstractions/wutmp>
@@ -64,7 +64,7 @@
   @{PROC}/sys/kernel/random/uuid r,
   /var/lib/libuuid/clock.txt rw,
   /run/systemd/journal/dev-log w,
-  /tmp/**/.x2go-socket r,
+  /tmp/**/.arctica-socket r,
   /tmp/.X11-unix/X[0-9]* wr,
   /run/uuidd/request w,
   /proc/sys/kernel/ngroups_max r,
diff --git a/x2go.desktop.in b/x2go.desktop.in
deleted file mode 100644
index d3c9609..0000000
--- a/x2go.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[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