[debian-edu-commits] debian-edu/pkg-team/ 42/159: merge some patches from Debian
Dominik George
natureshadow-guest at moszumanska.debian.org
Tue Feb 23 10:04:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository xrdp.
commit 4886bde31488e51255ddd7589bc706eb39b3367e
Author: mirabilos <tg at mirbsd.org>
Date: Thu Aug 6 20:17:10 2015 +0200
merge some patches from Debian
---
README.source | 10 ++++------
changelog | 6 ++++++
copyright | 4 ++++
patches/keymap-default.diff | 19 +++++++++++++++++++
patches/keymap-fallback.diff | 18 ++++++++++++++++++
patches/make-fixes.diff | 28 ++++++++++++++++++++++++++++
patches/series | 4 +++-
patches/submake.diff | 11 -----------
8 files changed, 82 insertions(+), 18 deletions(-)
diff --git a/README.source b/README.source
index d5e6378..5c184b9 100644
--- a/README.source
+++ b/README.source
@@ -3,16 +3,14 @@ TODO:
- provide Debian init system integration
* systemd
* sysvinit
+ - Ensure that /var/run/xrdp is owned by xrdp:xrdp
+ - Sleep a bit after stopping so that xrdp can be restarted
+ - Add an option in /etc/default/xrdp to avoid to restart on
+ upgrade, thanks to a suggestion from Ola Lundqvist
- merge some patches and other changes from Debian package
* user/group xrdp (XXX delete on purge?), Depends: adduser
* remove dirs and files on purge
- * 05-default-keymap.patch
- * maybe 06-xrdp_pidfile_early.patch
- * maybe 08-format-security.patch
- * 10-km-0414.patch plus add to Makefile.am
- * xrdp-default-keymap.patch
- => track down authors too, for d/copyright
- d/control Description: can it now connect to X.org, too?
=> test!
diff --git a/changelog b/changelog
index ad2ae23..40d4cb3 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~git20150803-1~alpha2) teckids; urgency=medium
+
+ * Merge some patches from the Debian package
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org> Thu, 06 Aug 2015 20:16:58 +0200
+
xrdp (0.9.0~git20150803-1~alpha1) teckids; urgency=medium
* New upstream git snapshot
diff --git a/copyright b/copyright
index e55383e..9929066 100644
--- a/copyright
+++ b/copyright
@@ -42,9 +42,13 @@ Vincent Bernat <bernat at luffy.cx>
The manual page xrdp-keygen.8 from Vincent Bernat, as well as
everything else taken from the original Debian packaging…
• PID path change
+• Fallback to en-us keymap
… is covered by the GNU GPLv2 or later, which can be found
at /usr/share/common-licenses/GPL-2 on Debian systems.
+The patch to fall back to a local default keymap before English
+is contributed by Dag-Erling Smørgrav and Petter Reinholdtsen.
+
common/ssl_calls.{c,h} are also Apache 2 from Jay Sorg and additionally:
Copyright (C) Idan Freiberg 2013-2014
diff --git a/patches/keymap-default.diff b/patches/keymap-default.diff
new file mode 100644
index 0000000..abfc785
--- /dev/null
+++ b/patches/keymap-default.diff
@@ -0,0 +1,19 @@
+# DP: Try a local default keymap before falling back to en-us keymap
+# DP: if the selected keymap is not found.
+# DP: Patch by Dag-Erling Smørgrav and Petter Reinholdtsen
+
+--- a/xrdp/lang.c
++++ b/xrdp/lang.c
+@@ -233,7 +233,11 @@ get_keymaps(int keylayout, struct xrdp_k
+ /* check if there is a keymap file */
+ g_snprintf(filename, 255, "%s/km-%4.4x.ini", XRDP_CFG_PATH, keylayout);
+
+- /* if the file does not exist, try again with 'en-us' as fallback */
++ /* if the file does not exist, try the local default, and finally 'en-us' as fallback */
++ if (!g_file_exist(filename))
++ {
++ g_snprintf(filename, 255, "%s/km-default.ini", XRDP_CFG_PATH);
++ }
+ if (!g_file_exist(filename))
+ {
+ g_snprintf(filename, 255, "%s/km-0409.ini", XRDP_CFG_PATH);
diff --git a/patches/keymap-fallback.diff b/patches/keymap-fallback.diff
new file mode 100644
index 0000000..493bc13
--- /dev/null
+++ b/patches/keymap-fallback.diff
@@ -0,0 +1,18 @@
+# DP: Fall back to en-us keymap if the chosen one could not be loaded.
+# DP: Patch by Vincent Bernat and Thorsten Glaser
+
+--- a/xrdp/lang.c
++++ b/xrdp/lang.c
+@@ -275,6 +275,12 @@ get_keymaps(int keylayout, struct xrdp_k
+ g_file_close(fd);
+ }
+ }
++ else if (keylayout != 0x409)
++ {
++ log_message(LOG_LEVEL_WARNING, "File does not exist: %s (keymap for 0x%4.4x; falling back to 0x0409)", filename, keylayout);
++ g_free(filename);
++ return get_keymaps(0x409, keymap);
++ }
+ else
+ {
+ log_message(LOG_LEVEL_WARNING, "File does not exist: %s", filename);
diff --git a/patches/make-fixes.diff b/patches/make-fixes.diff
new file mode 100644
index 0000000..e9ba2f9
--- /dev/null
+++ b/patches/make-fixes.diff
@@ -0,0 +1,28 @@
+# DP: recurse into xorgxrdp/ as well (make into proper configure option?)
+# DP: also, actually install keymaps shipped (should be upstreamed)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,4 +27,5 @@ SUBDIRS = \
+ instfiles \
+ genkeymap \
+ xrdpapi \
++ xorgxrdp \
+ $(XRDPVRDIR)
+--- a/instfiles/Makefile.am
++++ b/instfiles/Makefile.am
+@@ -14,10 +14,14 @@ startscript_DATA = \
+ km-040c.ini \
+ km-0410.ini \
+ km-0411.ini \
++ km-0414.ini \
+ km-0415.ini \
++ km-0416.ini \
+ km-0419.ini \
+ km-041d.ini \
+ km-0807.ini \
++ km-080c.ini \
++ km-0813.ini \
+ km-0816.ini \
+ km-e0010411.ini \
+ km-e0200411.ini \
diff --git a/patches/series b/patches/series
index 9627809..d36fc0f 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,6 @@
debian-manpage.diff
libtoolise.diff
-submake.diff
+make-fixes.diff
config.diff
+keymap-default.diff
+keymap-fallback.diff
diff --git a/patches/submake.diff b/patches/submake.diff
deleted file mode 100644
index 5ca122f..0000000
--- a/patches/submake.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-# DP: recurse into xorgxrdp/ as well
-# DP: maybe should be made into a proper configure option for upstream
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,4 +27,5 @@ SUBDIRS = \
- instfiles \
- genkeymap \
- xrdpapi \
-+ xorgxrdp \
- $(XRDPVRDIR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git
More information about the debian-edu-commits
mailing list