[debian-edu-commits] debian-edu/ 01/01: Update patch headers.

Dominik George natureshadow-guest at moszumanska.debian.org
Fri Oct 28 15:30:13 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 bed2ef99fa05e9fb85d8867625fa5497d7dfc96d
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Oct 28 17:20:47 2016 +0200

    Update patch headers.
    
    Also, forwarded a lot to upstream.
---
 debian/changelog                    |  6 ++++++
 debian/patches/chansrvlog.diff      |  5 +++--
 debian/patches/config.diff          | 17 +++++++++++------
 debian/patches/fix_perms.diff       | 13 ++++++++-----
 debian/patches/fusepath.diff        |  5 +++--
 debian/patches/keymap-default.diff  |  8 ++++----
 debian/patches/keymap-fallback.diff |  6 +++---
 debian/patches/make-fixes.diff      |  8 +++++---
 debian/patches/misc-fixes.diff      |  6 ++++--
 debian/patches/nxstack.diff         |  4 ++--
 debian/patches/shutup-daemon.diff   |  4 ++--
 debian/patches/sockpath.diff        |  7 +++----
 debian/patches/systemd.diff         |  4 ++--
 13 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35f0f6f..632bbc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~20161027+gitc524b06-2) UNRELEASED; urgency=medium
+
+  * Update patch headers.
+
+ -- Dominik George <nik at naturalnet.de>  Fri, 28 Oct 2016 17:19:33 +0200
+
 xrdp (0.9.0~20161027+gitc524b06-1) unstable; urgency=medium
 
   * New upstream version 0.9.0~20161027+gitc524b06.
diff --git a/debian/patches/chansrvlog.diff b/debian/patches/chansrvlog.diff
index 12c4827..09a485e 100644
--- a/debian/patches/chansrvlog.diff
+++ b/debian/patches/chansrvlog.diff
@@ -1,5 +1,6 @@
-# DP: move xrdp-chansrv.log into XDG_CACHE_HOME
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: move xrdp-chansrv.log into XDG_CACHE_HOME
+Forwarded: https://github.com/neutrinolabs/xrdp/pull/462
 --- a/docs/man/xrdp-chansrv.8
 +++ b/docs/man/xrdp-chansrv.8
 @@ -38,6 +38,7 @@ UNIX socket used by \fBxrdp\-chansrv\fP
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 7eab6fa..4199fc0 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -1,9 +1,12 @@
-# DP: config patches for Debian
-# DP: move -logfile /dev/null to last, for easy commenting out
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: config patches for Debian
+ Move -logfile /dev/null to last, for easy commenting out
+ Add -retro option
+ Use Debian font paths
+ Use xorgxrdp instead of x11rdp
 --- a/sesman/sesman.ini
 +++ b/sesman/sesman.ini
-@@ -84,12 +84,11 @@ param7=96
+@@ -84,12 +84,13 @@ param7=96
  param0=Xorg
  param1=-config
  param2=xrdp/xorg.conf
@@ -17,7 +20,9 @@
 +param4=-ac
 +param5=-nolisten
 +param6=tcp
-+param7=-retro
++param7=-logfile
++param8=/dev/null
++param9=-retro
  
  [Chansrv]
  # drive redirection, defaults to xrdp_client if not set
@@ -39,7 +44,7 @@
  Section "Module"
 --- a/xrdp/xrdp.ini
 +++ b/xrdp/xrdp.ini
-@@ -144,14 +144,14 @@ tcutils=true
+@@ -145,14 +145,14 @@ tcutils=true
  # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210
  
  [xrdp1]
diff --git a/debian/patches/fix_perms.diff b/debian/patches/fix_perms.diff
index e284018..ec43821 100644
--- a/debian/patches/fix_perms.diff
+++ b/debian/patches/fix_perms.diff
@@ -1,8 +1,11 @@
-# DP: attempt to fix connection problem between xrdp-sesman (running
-# DP: as root) and xrdp (running as xrdp) by creating the socket for
-# DP: the xorgxrdp server as 0660 in a sgid-xrdp directory, since we
-# DP: can’t easily chgrp here; also fix retval check for listen(2)
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: Fix permissions between xrdp and sesman.
+ Attempt to fix connection problem between xrdp-sesman (running
+ as root) and xrdp (running as xrdp) by creating the socket for
+ the xorgxrdp server as 0660 in a sgid-xrdp directory, since we
+ can’t easily chgrp here; also fix retval check for listen(2)
+Forwarded: https://github.com/neutrinolabs/xorgxrdp/pull/16
+ https://github.com/neutrinolabs/xrdp/pull/464
 --- a/common/os_calls.c
 +++ b/common/os_calls.c
 @@ -122,7 +122,7 @@ g_mk_temp_dir(const char *app_name)
diff --git a/debian/patches/fusepath.diff b/debian/patches/fusepath.diff
index b87a715..cfd1969 100644
--- a/debian/patches/fusepath.diff
+++ b/debian/patches/fusepath.diff
@@ -1,5 +1,6 @@
-# DP: make FUSE mount root hidden from normal ls
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: make FUSE mount root hidden from normal ls
+Forwarded: https://github.com/neutrinolabs/xrdp/pull/465
 --- a/sesman/chansrv/chansrv_fuse.c
 +++ b/sesman/chansrv/chansrv_fuse.c
 @@ -244,7 +244,7 @@ struct opendir_req
diff --git a/debian/patches/keymap-default.diff b/debian/patches/keymap-default.diff
index abfc785..dc3cc04 100644
--- a/debian/patches/keymap-default.diff
+++ b/debian/patches/keymap-default.diff
@@ -1,7 +1,7 @@
-# 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
-
+From: Patch by Dag-Erling Smørgrav and Petter Reinholdtsen
+Subject: Try a local default keymap before falling back to en-us keymap
+ if the selected keymap is not found.
+Forwarded: https://github.com/neutrinolabs/xrdp/pull/466
 --- a/xrdp/lang.c
 +++ b/xrdp/lang.c
 @@ -233,7 +233,11 @@ get_keymaps(int keylayout, struct xrdp_k
diff --git a/debian/patches/keymap-fallback.diff b/debian/patches/keymap-fallback.diff
index 493bc13..eec4a8c 100644
--- a/debian/patches/keymap-fallback.diff
+++ b/debian/patches/keymap-fallback.diff
@@ -1,6 +1,6 @@
-# DP: Fall back to en-us keymap if the chosen one could not be loaded.
-# DP: Patch by Vincent Bernat and Thorsten Glaser
-
+From: Vincent Bernat and Thorsten Glaser
+Subject: Fall back to en-us keymap if the chosen one could not be loaded.
+Forwarded: https://github.com/neutrinolabs/xrdp/pull/466
 --- a/xrdp/lang.c
 +++ b/xrdp/lang.c
 @@ -275,6 +275,12 @@ get_keymaps(int keylayout, struct xrdp_k
diff --git a/debian/patches/make-fixes.diff b/debian/patches/make-fixes.diff
index e5a403c..da97d30 100644
--- a/debian/patches/make-fixes.diff
+++ b/debian/patches/make-fixes.diff
@@ -1,6 +1,8 @@
-# DP: recurse into xorgxrdp/ as well (make into proper configure option?)
-# DP: also, actually install keymaps shipped (should be upstreamed)
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: Build system fixes
+ recurse into xorgxrdp/ as well (make into proper configure option?)
+ also, actually install keymaps shipped
+Forwarded: https://github.com/neutrinolabs/xrdp/pull/467
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -24,6 +24,7 @@ SUBDIRS = \
diff --git a/debian/patches/misc-fixes.diff b/debian/patches/misc-fixes.diff
index 613dd1b..08f1cc1 100644
--- a/debian/patches/misc-fixes.diff
+++ b/debian/patches/misc-fixes.diff
@@ -1,5 +1,7 @@
-# DP: misc. fixes, should go upstream
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: misc. fixes
+Forwarded: https://github.com/neutrinolabs/xorgxrdp/pull/17
+ https://github.com/neutrinolabs/xrdp/pull/467
 --- a/docs/man/xrdp-dis.1
 +++ b/docs/man/xrdp-dis.1
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/nxstack.diff b/debian/patches/nxstack.diff
index 89b8e7a..f46d9f6 100644
--- a/debian/patches/nxstack.diff
+++ b/debian/patches/nxstack.diff
@@ -1,5 +1,5 @@
-# DP: re-enable non-executable stack
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: re-enable non-executable stack
 --- a/librfxcodec/src/amd64/cpuid_amd64.asm
 +++ b/librfxcodec/src/amd64/cpuid_amd64.asm
 @@ -43,3 +43,4 @@ PROC _cpuid_amd64
diff --git a/debian/patches/shutup-daemon.diff b/debian/patches/shutup-daemon.diff
index 9d6c120..c53d9a2 100644
--- a/debian/patches/shutup-daemon.diff
+++ b/debian/patches/shutup-daemon.diff
@@ -1,5 +1,5 @@
-# DP: don’t spit on the console when starting
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: don’t spit on the console when starting
 --- a/common/log.c
 +++ b/common/log.c
 @@ -383,11 +383,6 @@ internal_config_read_logging(int file, s
diff --git a/debian/patches/sockpath.diff b/debian/patches/sockpath.diff
index bb66543..644db88 100644
--- a/debian/patches/sockpath.diff
+++ b/debian/patches/sockpath.diff
@@ -1,7 +1,6 @@
-# DP: change location of the socket path to something less racy;
-# DP: also, rely on the initscript to create it with correct
-# DP: permissions and ownership (root:xrdp 3777)
-
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject:: change location of the socket path to something less racy
+ also, rely on the initscript to create it with correct permissions and ownership
 --- a/common/file_loc.h
 +++ b/common/file_loc.h
 @@ -46,23 +46,23 @@
diff --git a/debian/patches/systemd.diff b/debian/patches/systemd.diff
index 3d613ce..00ad54c 100644
--- a/debian/patches/systemd.diff
+++ b/debian/patches/systemd.diff
@@ -1,5 +1,5 @@
-# DP: systemd service files for Debian
-
+From: Dominik George <nik at naturalnet.de
+Subject: systemd service files for Debian
 --- a/instfiles/xrdp-sesman.service
 +++ b/instfiles/xrdp-sesman.service
 @@ -1,12 +1,12 @@

-- 
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