Drop FreeRDP version semantics for the project, prepare for FreeRDPv3.HEADmaster

18 files changed, 91 insertions, 84 deletions

diff --git a/Makefile.am b/Makefile.am
index e5eadaa..3fc1058 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,52 +1,52 @@
 pam_sessiondir = $(sysconfdir)/pam.d/
 pam_session_DATA = \
-	lightdm-remote-freerdp2
+	lightdm-remote-freerdp
 
 lightdm_sessiondir = $(datadir)/lightdm/remote-sessions
 lightdm_session_DATA = \
-	freerdp2.desktop
+	freerdp.desktop
 
 %.desktop: %.desktop.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 session_startdir = $(pkgdatadir)
 session_start_SCRIPTS = \
-	freerdp2-session
+	freerdp-session
 
-freerdp2-session: freerdp2-session.in
+freerdp-session: freerdp-session.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 	@chmod +x $@
 
 apparmordir = $(sysconfdir)/apparmor.d/
 apparmor_DATA = \
-	lightdm-remote-session-freerdp2
+	lightdm-remote-session-freerdp
 
-lightdm-remote-session-freerdp2: lightdm-remote-session-freerdp2.in
+lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 libexec_PROGRAMS = \
-	freerdp2-session-wrapper
+	freerdp-session-wrapper
 
-freerdp2_session_wrapper_SOURCES = \
-	freerdp2-session-wrapper.c
-freerdp2_session_wrapper_CFLAGS = \
+freerdp_session_wrapper_SOURCES = \
+	freerdp-session-wrapper.c
+freerdp_session_wrapper_CFLAGS = \
 	-DPKGDATADIR="\"$(pkgdatadir)\"" \
 	-Wall -Werror
 
-freerdp2_known_hosts2dir = $(sysconfdir)/arctica-greeter/guest-session/skel/.config/freerdp/
-freerdp2_known_hosts2_DATA = \
+freerdp_known_hosts2dir = $(sysconfdir)/arctica-greeter/guest-session/skel/.config/freerdp/
+freerdp_known_hosts2_DATA = \
 	known_hosts2
 
 EXTRA_DIST = \
 	$(pam_session_DATA) \
-	freerdp2.desktop.in \
-	freerdp2-session.in \
-	lightdm-remote-session-freerdp2.in
+	freerdp.desktop.in \
+	freerdp-session.in \
+	lightdm-remote-session-freerdp.in
 
 CLEANFILES = \
-	freerdp2.desktop \
-	freerdp2-session \
-	lightdm-remote-session-freerdp2
+	freerdp.desktop \
+	freerdp-session \
+	lightdm-remote-session-freerdp
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
diff --git a/README.md b/README.md
index 6ea4f2d..abc1ebb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # LightDM (Arctica Greeter) Remote Logon: FreeRDP(2) #
 
 Configuration for LightDM / Arctica Greeter to launch remote FreeRDP
-sessions using FreeRDPv2.
+sessions using FreeRDPv2/FreeRDPv3.
 
 This code project was originally started by Canonical Ltd. and has been
 adapted by various authors with the purpose of making Remote Logon
@@ -22,10 +22,10 @@ For this Remote Logon Add-on to work, you have to populate
 
 with your RDP servers' host keys. Otherwise, logins will fail.
 
-Alternatively, add the /cert-ignore option to the set of FREERDP2_OPTIONS
-in /etc/default/lightdm-remote-session-freerdp2.
+Alternatively, add the /cert-ignore option to the set of FREERDP_OPTIONS
+in /etc/default/lightdm-remote-session-freerdp.
 
 ## Limitations / Known Issues
 
   * Sound not working, yet
-  * Usernames containig blanks are not supported.
\ No newline at end of file
+  * Usernames containig blanks are not supported.
diff --git a/configure.ac b/configure.ac
index ec28bf4..6ab8c87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lightdm-remote-session-freerdp2], [2.0.0])
+AC_INIT([lightdm-remote-session-freerdp], [3.0.0])
 
 AM_INIT_AUTOMAKE([1.11 -Wno-portability])
 AM_SILENT_RULES([yes])
diff --git a/debian/changelog b/debian/changelog
index 0415600..4279554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lightdm-remote-session-freerdp (3.0.0-0) UNRELEASED; urgency=low
+
+  * Upstream-provided Debian package for lightdm-remote-session-freerdp.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 16 Jan 2024 08:11:29 +0100
+
 lightdm-remote-session-freerdp2 (2.0.0-0) unstable; urgency=low
 
   * Upstream-provided Debian package for lightdm-remote-session-freerdp2.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index d20bbf9..5774b55 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,30 @@
-Source: lightdm-remote-session-freerdp2
+Source: lightdm-remote-session-freerdp
 Section: misc
 Priority: optional
 Maintainer: Artica Project <devs@lists.arctica-project.org>
 Uploaders:
  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends:
- debhelper (>= 9),
+ debhelper-compat (= 12),
  dh-apparmor,
- cdbs,
- dh-autoreconf,
-Standards-Version: 4.1.1
-Homepage: http://github.com/ArcticaProject/lightdm-remote-session-freerdp2
-Vcs-Git: https://github.com/ArcticaProject/lightdm-remote-session-freerdp2/
-Vcs-Browser: https://github.com/ArcticaProject/lightdm-remote-session-freerdp2/
+Standards-Version: 4.7.0
+Homepage: http://github.com/ArcticaProject/lightdm-remote-session-freerdp
+Vcs-Git: https://github.com/ArcticaProject/lightdm-remote-session-freerdp/
+Vcs-Browser: https://github.com/ArcticaProject/lightdm-remote-session-freerdp/
 
-Package: lightdm-remote-session-freerdp2
+Package: lightdm-remote-session-freerdp
 Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  socat,
  zenity,
- freerdp2-x11 (>= 2~),
- libpam-freerdp2,
+ freerdp3-x11 (>= 2~) | freerdp2-x11 (>= 2~),
+ libpam-freerdp,
  lightdm (>= 1.3.3-0~),
  socat,
 Suggests:
  apparmor,
 Description: Log into RDP sessions via LightDM
- The configuration files needed and scripts required to login
- to a full screen RDP session using LightDM and FreeRDPv2.
+ The configuration files needed and scripts required to login to a full
+ screen RDP session using LightDM and FreeRDPv2/FreeRDPv3.
diff --git a/debian/copyright b/debian/copyright
index 5af86cf..6f7154b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: lightdm-remote-session-freerdp2
+Upstream-Name: lightdm-remote-session-freerdp
 Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Source: https://github.com/ArcticaProject/lightdm-remote-session-freerdp2
+Source: https://github.com/ArcticaProject/lightdm-remote-session-freerdp
 
 Files: AUTHORS
  ChangeLog
@@ -10,26 +10,26 @@ Files: AUTHORS
  README.md
  autogen.sh
  configure.ac
- lightdm-remote-session-freerdp2.in
- lightdm-remote-freerdp2
- freerdp2.desktop.in
+ lightdm-remote-session-freerdp.in
+ lightdm-remote-freerdp
+ freerdp.desktop.in
 Copyright: 2012, Canonical Ltd.
-  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2018-2024, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 Comment:
  Using license and copyright holders as found in code files.
 
-Files: freerdp2-session-wrapper.c
- freerdp2-session.in
+Files: freerdp-session-wrapper.c
+ freerdp-session.in
  socket-sucker.c
 Copyright: 2012, Canonical Ltd.
-  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2018-2024, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 Files: debian/*
 Copyright:
  2012, Canonical Ltd.
- 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+ 2017-2024, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 License: GPL-3
diff --git a/debian/lightdm-remote-session-freerdp.default b/debian/lightdm-remote-session-freerdp.default
new file mode 120000
index 0000000..90ef79f
--- /dev/null
+++ b/debian/lightdm-remote-session-freerdp.default
@@ -0,0 +1 @@
+../lightdm-remote-session-freerdp.default
\ No newline at end of file
diff --git a/debian/lightdm-remote-session-freerdp2.default b/debian/lightdm-remote-session-freerdp2.default
deleted file mode 120000
index 6e11e26..0000000
--- a/debian/lightdm-remote-session-freerdp2.default
+++ /dev/null
@@ -1 +0,0 @@
-../lightdm-remote-session-freerdp2.default
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 4edf62f..657234c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
diff --git a/freerdp2-session-wrapper.c b/freerdp-session-wrapper.c
index 7b5c320..ccb3026 100644
--- a/freerdp2-session-wrapper.c
+++ b/freerdp-session-wrapper.c
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright (C) 2012 Canonical Ltd.
+ * Copyirhgt (C) 2018-2024 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
  *
  * 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
@@ -23,7 +24,7 @@ int
 main (int __attribute__((unused)) argc, char __attribute__((unused)) *argv[])
 {
 	char * args[2];
-	args[0] = PKGDATADIR "/freerdp2-session";
+	args[0] = PKGDATADIR "/freerdp-session";
 	args[1] = NULL;
 
 	execvp(args[0], args);
diff --git a/freerdp2-session.in b/freerdp-session.in
index 571330f..a438ffa 100755
--- a/freerdp2-session.in
+++ b/freerdp-session.in
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #
-# Copyright © 2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-# Copyright © 2012 Canonical Ltd.
+# Copyright (C) 2018-2024 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+# Copyright (C) 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
@@ -21,13 +21,13 @@
 #
 
 NULL=
-FREERDP2_OPTIONS=""
+FREERDP_OPTIONS=""
 
-if [ -f /etc/default/lightdm-remote-session-freerdp2 ]; then
-	. /etc/default/lightdm-remote-session-freerdp2
+if [ -f /etc/default/lightdm-remote-session-freerdp ]; then
+	. /etc/default/lightdm-remote-session-freerdp
 fi
 
-socket="$HOME/.freerdp2-socket";
+socket="$HOME/.freerdp-socket";
 if [ -e "$socket" ]; then
 	AUTH_INFO="$(socat unix-connect:"$socket" -)"
 	AUTH_INFO_USER=$(echo "$AUTH_INFO" | awk '{ print $1 }')
@@ -38,24 +38,24 @@ if [ -e "$socket" ]; then
 	# FIXME: it seems, pulseaudio is not started at this point for the guest user
 	# However, launching it here with pulseaudio -D feels wrong in the age of systemd
 
-	# give the RDP server a little bit of time to recover from libpam-freerdp2's freerdp2-auth-check test connect.
+	# give the RDP server a little bit of time to recover from libpam-freerdp's freerdp-auth-check test connect.
 	sleep 1
 
-	FREERDP2_OPTIONS="/f				\
-	                  /v:"${AUTH_INFO_HOST}"	\
-	                  /u:"${AUTH_INFO_USER}"	\
-	                  /d:"${AUTH_INFO_DOMAIN}"	\
-	                  /from-stdin			\
-	                  -toggle-fullscreen		\
-	                  ${FREERDP2_OPTIONS}		\
-	                  ${NULL}"
+	FREERDP_OPTIONS="/f				\
+	                 /v:"${AUTH_INFO_HOST}"		\
+	                 /u:"${AUTH_INFO_USER}"		\
+	                 /d:"${AUTH_INFO_DOMAIN}"	\
+	                 /from-stdin			\
+	                 -toggle-fullscreen		\
+	                 ${FREERDP_OPTIONS}		\
+	                 ${NULL}"
 
 	logger -t $(basname $0) "xfreerdp called with options: ${FREERDP_OPTIONS}."
 
 
 	# FIXME: get audio working... add /sound:sys:pulse to xfreerdp cmdline args...
 	echo "$AUTH_INFO_PASSWORD" | /usr/bin/xfreerdp ${FREERDP_OPTIONS} 2>&1 \
-	                           | logger -t lightdm-remote-session-freerdp2 -- \
+	                           | logger -t lightdm-remote-session-freerdp -- \
 	${NULL} &
 
 	unset AUTH_INFO_PASSWORD
diff --git a/freerdp.desktop.in b/freerdp.desktop.in
new file mode 100644
index 0000000..27b1b5a
--- /dev/null
+++ b/freerdp.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=FreeRDP
+Comment=Full Screen RDP session
+Exec=@libexecdir@/freerdp-session-wrapper
+TryExec=@libexecdir@/freerdp-session-wrapper
+Icon=
+Type=Application
+X-LightDM-PAM-Service=lightdm-remote-freerdp
diff --git a/freerdp2.desktop.in b/freerdp2.desktop.in
deleted file mode 100644
index 28c8076..0000000
--- a/freerdp2.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=FreeRDP
-Comment=Full Screen RDP session
-Exec=@libexecdir@/freerdp2-session-wrapper
-TryExec=@libexecdir@/freerdp2-session-wrapper
-Icon=
-Type=Application
-X-LightDM-PAM-Service=lightdm-remote-freerdp2
diff --git a/lightdm-remote-freerdp2 b/lightdm-remote-freerdp
index fb0d36f..d79bc2e 100644
--- a/lightdm-remote-freerdp2
+++ b/lightdm-remote-freerdp
@@ -2,6 +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_freerdp2.so
+auth    required        pam_freerdp.so
 session required        pam_limits.so
-session required        pam_freerdp2.so
+session required        pam_freerdp.so
diff --git a/lightdm-remote-session-freerdp.default b/lightdm-remote-session-freerdp.default
new file mode 100644
index 0000000..5de709c
--- /dev/null
+++ b/lightdm-remote-session-freerdp.default
@@ -0,0 +1,4 @@
+### lightdm-remote-session-freerdp: Tweak the default behaviour.
+
+# Ignore host keys and allow connections to any RDP server (uncomment to have it set)
+#FREERDP_OPTIONS+=" /cert-ignore"
diff --git a/lightdm-remote-session-freerdp2.in b/lightdm-remote-session-freerdp.in
index 9121afe..b597f94 100644
--- a/lightdm-remote-session-freerdp2.in
+++ b/lightdm-remote-session-freerdp.in
@@ -5,7 +5,7 @@
 
 #include <tunables/global>
 
-@libexecdir@/freerdp2-session-wrapper {
+@libexecdir@/freerdp-session-wrapper {
   #include <abstractions/authentication>
   #include <abstractions/nameservice>
   #include <abstractions/wutmp>
diff --git a/lightdm-remote-session-freerdp2.default b/lightdm-remote-session-freerdp2.default
deleted file mode 100644
index 32dfcd5..0000000
--- a/lightdm-remote-session-freerdp2.default
+++ /dev/null
@@ -1,4 +0,0 @@
-### lightdm-remote-session-freerdp2: Tweak the default behaviour.
-
-# Ignore host keys and allow connections to any RDP server (uncomment to have it set)
-#FREERDP2_OPTIONS+=" /cert-ignore"