[debian-edu-commits] debian-edu/pkg-team/ 123/159: reorg TODOs; commence testing further, for now

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit fe95e392bcc34863e356caf67f2e42150f7aef0d
Author: mirabilos <tg at mirbsd.org>
Date:   Sun Aug 30 21:40:45 2015 +0000

    reorg TODOs; commence testing further, for now
---
 README.Debian | 46 ++++++++++++++++++++++++----------------------
 README.source | 36 ------------------------------------
 changelog     |  3 ++-
 rules         | 11 +++++++++++
 4 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/README.Debian b/README.Debian
index f5ac888..fffedc5 100644
--- a/README.Debian
+++ b/README.Debian
@@ -1,30 +1,15 @@
-There is currently integration with:
+Current init system integration:
 • systemd
   ‣ SESMAN_START is not honoured
-  ‣ xrdp is started as root
+  ‣ xrdp is started as root instead of as xrdp user
   ‣ /var/run/xrdp may not be created correctly
 • sysvinit (file-rc, sysv-rc)
+Please submit fixes and OpenRC and upstart integration.
 
-To start this manually, you have to do the following
-(please submit actual methods, fixes, and possibly
-upstart and OpenRC scripts, to us):
-
-Initially:
-• review /etc/xrdp/xrdp.ini
-• review /etc/xrdp/sesman.ini
-• review /etc/X11/xrdp/xorg.conf
-
-To start, in order:
-• create /var/run/xrdp root:xrdp 0775
-To start, in order (to stop, in reverse order):
-• start the xrdp-sesman daemon as superuser
-• start the xrdp daemon as superuser
-After stopping, sleep a bit to facilitate restarts.
-
-This *should* read…
-• create /var/run/xrdp xrdp:xrdp 0775
-• start the xrdp dæmon as xrdp:xrdp
-… though (xrdp-sesman must run as superuser anyway).
+The default setup since version 0.9 is xorgxrdp, not X11rdp or VNC.
+Please review configuration files accordingly. The upgrade path from
+xrdp 0.6 in Debian (conffiles, piuparts, etc.) needs testing. Maybe
+a NEWS.Debian entry should be shipped.
 
 Another security issue is the disablement of access control by default.
 Use at your own risk and inform your users that privacy is possibly not
@@ -33,3 +18,20 @@ See also: https://github.com/neutrinolabs/xrdp/issues/264
 
 Furthermore, the package maintainers would like to know what the log
 messages about /etc/xrdp/cert.pem and /etc/xrdp/key.pem are good for.
+
+The xorgxrdp drivers should be moved into a separate binary package
+which Depends on the correct Xorg server ABIs. (Rewrite both binary
+packages’ long Descriptions in the same go!)
+
+The pulseaudio plugin from sesman/chansrv/pulse should be installed
+but cannot be built due to lack of a pulseaudio-modules-dev package
+in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794692
+
+Upstream is currently working on converting librfxcodec to autotools;
+we can then pass --enable-rfxcodec but should invest time into proper
+recursive configure (not done yet) and make (partially done); SSE can
+be used iff tested beforehand. (Remember x32!)
+
+We currently do not use either --enable-neutrinordp (because it FTBFS)
+or --enable-xrdpvr (as FFmpeg in squeeze is the last supported version,
+but it may be possible to use the one in stretch/sid).
diff --git a/README.source b/README.source
deleted file mode 100644
index ff0dccb..0000000
--- a/README.source
+++ /dev/null
@@ -1,36 +0,0 @@
-origtgz:
-
-- $ git checkout upstream/devel
-- (check that the submodules are up-to-date)
-- $ cd ..
-- $ v='0.9.0~git'$(date +%Y%m%d) && find xrdp -type f -print0 | \
-    grep -Fvz -e /.git/ -e xorg/tests/xdemo/yosemite.bmp | sort -z | \
-    pax -w -0 -b 512 -M norm -s "!^xrdp/!xrdp-$v/!" -x ustar | \
-    xz -e >xrdp_$v+dfsg.orig.tar.xz
-
-We don’t provide a get-orig-source target because submodules
-don’t work with git-archive, and the manual checkout + find
-way doesn’t work well automatedly either.
-
-TODO:
-
-- improve Debian init system integration, cf. README.Debian
-
-- test upgrade path from xrdb-in-debian (conffiles, piuparts, etc.)
-
-- build and install the pulseaudio plugin
-  from sesman/chansrv/pulse but there is no pulseaudio-modules-dev
-
-- patch librfxcodec/ to be autotoolised then --enable-rfxcodec
-  and add it to Makefile.am before libxrdp
-  + can use yasm and SSE for i386 and amd64 too
-  ⇒ upstream doing that atm
-
-- recursive configure too
-
-- sync xrdp/xrdp_keyboard.ini with list of shipped keymaps
-
-- consider --enable-neutrinordp but it FTBFS
-
-- consider --enable-xrdpvr but squeeze’s FFmpeg is the last supported one
-  ⇒ maybe the one in stretch/sid works?
diff --git a/changelog b/changelog
index 537c938..ed50b3c 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,9 @@ xrdp (0.9.0~git20150830+dfsg-1~beta2) teckids; urgency=medium
   * Add sysvinit (file-rc, sysv-rc) LSB script (untested)
   * Create logfiles with correct permissions in postinst
   * Add some debugging documentation and patches
+  * Reorganise TODOs; move some to upstream and add others
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sun, 30 Aug 2015 21:12:45 +0000
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sun, 30 Aug 2015 21:40:22 +0000
 
 xrdp (0.9.0~git20150830+dfsg-1~beta1) teckids; urgency=high
 
diff --git a/rules b/rules
index 44e28e0..f0e45c6 100755
--- a/rules
+++ b/rules
@@ -54,3 +54,14 @@ override_dh_installinit:
 
 override_dh_systemd_start:
 	dh_systemd_start --no-restart-on-upgrade
+
+# We don’t provide a get-orig-source target because submodules
+# don’t work with git-archive, and the manual checkout + find
+# way doesn’t work well automatedly either.
+# - $ git checkout upstream/devel
+# - (check that the submodules are up-to-date)
+# - $ cd ..
+# - $ v='0.9.0~git'$(date +%Y%m%d) && find xrdp -type f -print0 | \
+#     grep -Fvz -e /.git/ -e xorg/tests/xdemo/yosemite.bmp | sort -z | \
+#     pax -w -0 -b 512 -M norm -s "!^xrdp/!xrdp-$v/!" -x ustar | \
+#     xz -e >xrdp_$v+dfsg.orig.tar.xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git