[debian-edu-commits] debian-edu/pkg-team/ 82/159: fix lots of warnings
Dominik George
natureshadow-guest at moszumanska.debian.org
Tue Feb 23 10:04:27 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 70c3b18e0e52fab0aa352b6905b8e2b8806a8e00
Author: mirabilos <tg at mirbsd.org>
Date: Wed Aug 26 21:04:21 2015 +0200
fix lots of warnings
---
changelog | 3 +-
patches/misc-fixes.diff | 122 +++++++++++++++++++++++++++++++++++++++++
patches/nxstack.diff | 142 ++++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
patches/systemd.diff | 6 +-
rules | 2 +
6 files changed, 273 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 0ebc79f..9352ce9 100644
--- a/changelog
+++ b/changelog
@@ -11,8 +11,9 @@ xrdp (0.9.0~git20150826-1~alpha1) teckids; urgency=medium
* Update package description for the xorgxrdp feature
* Use dpkg-buildflags; enable hardening and -Wl,--as-needed
* Update the README files
+ * Lots of lintian and other warning fixes (C, rpath, manpage, NX stack, …)
- -- Thorsten Glaser <thorsten.glaser at teckids.org> Wed, 26 Aug 2015 19:46:08 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org> Wed, 26 Aug 2015 21:03:03 +0200
xrdp (0.9.0~git20150803-1~alpha3) teckids; urgency=medium
diff --git a/patches/misc-fixes.diff b/patches/misc-fixes.diff
index a50c402..fa34743 100644
--- a/patches/misc-fixes.diff
+++ b/patches/misc-fixes.diff
@@ -1,5 +1,33 @@
# DP: misc. fixes, should go upstream
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,7 +98,7 @@ AC_ARG_ENABLE(opus, AS_HELP_STRING([--en
+ [], [enable_opus=no])
+ AM_CONDITIONAL(XRDP_OPUS, [test x$enable_opus = xyes])
+
+-AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"])
++AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE" && test "x${prefix}" != "x/usr"])
+
+ # checking for openssl
+ AC_CHECK_HEADER([openssl/rc4.h], [],
+--- a/docs/man/xrdp-dis.1
++++ b/docs/man/xrdp-dis.1
+@@ -1,4 +1,4 @@
+-.TH "xrdp-dis" "8" "0.7.0" "xrdp team"
++.TH "xrdp-dis" "1" "0.7.0" "xrdp team"
+ .SH NAME
+ xrdp\-dis \- xrdp disconnect utility
+
+@@ -7,7 +7,7 @@ xrdp\-dis \- xrdp disconnect utility
+
+ .SH DESCRIPTION
+ .PP
+-\fBxrdp\-dix\fP is run with no parameters to disconnect your xrdp session.
++\fBxrdp\-dis\fP is run with no parameters to disconnect your xrdp session.
+
+ .SH ENVIRONMENT
+ .TP
--- a/libxrdp/xrdp_mcs.c
+++ b/libxrdp/xrdp_mcs.c
@@ -183,7 +183,7 @@ xrdp_mcs_recv(struct xrdp_mcs *self, str
@@ -11,3 +39,97 @@
}
break;
+--- a/sesman/chansrv/chansrv_fuse.c
++++ b/sesman/chansrv/chansrv_fuse.c
+@@ -60,6 +60,8 @@ char g_fuse_clipboard_path[256] = ""; /*
+
+ #include "arch.h"
+ #include "chansrv_fuse.h"
++#include "devredir.h"
++#include "file.h"
+
+ /* dummy calls when XRDP_FUSE is not defined */
+ int xfuse_init() { return 0; }
+--- a/sesman/chansrv/clipboard.c
++++ b/sesman/chansrv/clipboard.c
+@@ -176,6 +176,7 @@ x-special/gnome-copied-files
+ #define LOG_ERROR 0
+ #define LOG_INFO 1
+ #define LOG_DEBUG 2
++#undef LOG_LEVEL
+ #define LOG_LEVEL LOG_ERROR
+
+ #define log_error(_params...) \
+--- a/sesman/chansrv/devredir.h
++++ b/sesman/chansrv/devredir.h
+@@ -101,6 +101,8 @@ int dev_redir_file_open(void *fusep, tui
+
+ int devredir_file_close(void *fusep, tui32 device_id, tui32 file_id);
+
++int APP_CC devredir_rmdir_or_file(void *fusep, tui32 device_id, char *path, int mode);
++
+ int devredir_file_read(void *fusep, tui32 device_id, tui32 FileId,
+ tui32 Length, tui64 Offset);
+
+--- a/sesman/chansrv/rail.c
++++ b/sesman/chansrv/rail.c
+@@ -1775,7 +1775,7 @@ rail_configure_window(XConfigureEvent *c
+
+ /*****************************************************************************/
+ static int
+-rail_desktop_resize(lxevent)
++rail_desktop_resize(XEvent *lxevent)
+ {
+ LOG(0, ("rail_desktop_resize:"));
+ return 0;
+--- a/xorgxrdp/xrdpdev/xrdpdev.c
++++ b/xorgxrdp/xrdpdev/xrdpdev.c
+@@ -138,7 +138,7 @@ rdpPreInit(ScrnInfoPtr pScrn, int flags)
+ rgb zeros1;
+ Gamma zeros2;
+ int got_res_match;
+- char **modename;
++ const char **modename;
+ DisplayModePtr mode;
+ rdpPtr dev;
+
+--- a/xorgxrdp/xrdpkeyb/rdpKeyboard.c
++++ b/xorgxrdp/xrdpkeyb/rdpKeyboard.c
+@@ -534,7 +534,7 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice,
+ if (pKeySyms->map == 0)
+ {
+ LLOGLN(0, ("rdpkeybDeviceInit: malloc failed"));
+- exit(1);
++ return 1;
+ }
+ else
+ {
+@@ -550,6 +550,8 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice,
+ {
+ pKeySyms->map[i] = g_kbdMap[i];
+ }
++
++ return 0;
+ }
+
+ /******************************************************************************/
+@@ -645,7 +647,8 @@ rdpkeybControl(DeviceIntPtr device, int
+ switch (what)
+ {
+ case DEVICE_INIT:
+- rdpkeybDeviceInit(device, &keySyms, modMap);
++ if (rdpkeybDeviceInit(device, &keySyms, modMap))
++ return BadAlloc;
+ memset(&set, 0, sizeof(set));
+ set.rules = "base";
+ set.model = "pc104";
+--- a/xrdpapi/xrdpapi.c
++++ b/xrdpapi/xrdpapi.c
+@@ -36,6 +36,7 @@
+ #include <sys/un.h>
+
+ #include "xrdpapi.h"
++#include "os_calls.h"
+
+ struct wts_obj
+ {
diff --git a/patches/nxstack.diff b/patches/nxstack.diff
new file mode 100644
index 0000000..4001bd0
--- /dev/null
+++ b/patches/nxstack.diff
@@ -0,0 +1,142 @@
+# DP: re-enable non-executable stack
+
+--- a/librfxcodec/src/amd64/cpuid_amd64.asm
++++ b/librfxcodec/src/amd64/cpuid_amd64.asm
+@@ -39,3 +39,4 @@ PROC cpuid_amd64
+ ret;
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/amd64/rfxdwt_amd64_sse2.asm
++++ b/librfxcodec/src/amd64/rfxdwt_amd64_sse2.asm
+@@ -20,3 +20,4 @@ PROC dwt_shift_amd64_sse2
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/amd64/rfxrlgr1_amd64.asm
++++ b/librfxcodec/src/amd64/rfxrlgr1_amd64.asm
+@@ -19,3 +19,4 @@ PROC diff_rlgr1_amd64
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/amd64/rfxrlgr3_amd64.asm
++++ b/librfxcodec/src/amd64/rfxrlgr3_amd64.asm
+@@ -19,3 +19,4 @@ PROC diff_rlgr3_amd64
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/x86/cpuid_x86.asm
++++ b/librfxcodec/src/x86/cpuid_x86.asm
+@@ -37,3 +37,4 @@ PROC cpuid_x86
+ ret;
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/x86/rfxdwt_x86_sse2.asm
++++ b/librfxcodec/src/x86/rfxdwt_x86_sse2.asm
+@@ -24,3 +24,4 @@ PROC dwt_shift_x86_sse2
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/x86/rfxrlgr1_x86.asm
++++ b/librfxcodec/src/x86/rfxrlgr1_x86.asm
+@@ -23,3 +23,4 @@ PROC diff_rlgr1_x86
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/librfxcodec/src/x86/rfxrlgr3_x86.asm
++++ b/librfxcodec/src/x86/rfxrlgr3_x86.asm
+@@ -23,3 +23,4 @@ PROC diff_rlgr3_x86
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/amd64/a8r8g8b8_to_a8b8g8r8_box_amd64_sse2.asm
++++ b/xorgxrdp/module/amd64/a8r8g8b8_to_a8b8g8r8_box_amd64_sse2.asm
+@@ -187,3 +187,4 @@ done_loop_x:
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/amd64/cpuid_amd64.asm
++++ b/xorgxrdp/module/amd64/cpuid_amd64.asm
+@@ -39,3 +39,4 @@ PROC cpuid_amd64
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/amd64/i420_to_rgb32_amd64_sse2.asm
++++ b/xorgxrdp/module/amd64/i420_to_rgb32_amd64_sse2.asm
+@@ -242,3 +242,4 @@ loop_x:
+ align 16
+
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/amd64/uyvy_to_rgb32_amd64_sse2.asm
++++ b/xorgxrdp/module/amd64/uyvy_to_rgb32_amd64_sse2.asm
+@@ -152,3 +152,4 @@ loop1:
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/amd64/yuy2_to_rgb32_amd64_sse2.asm
++++ b/xorgxrdp/module/amd64/yuy2_to_rgb32_amd64_sse2.asm
+@@ -152,3 +152,4 @@ loop1:
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/amd64/yv12_to_rgb32_amd64_sse2.asm
++++ b/xorgxrdp/module/amd64/yv12_to_rgb32_amd64_sse2.asm
+@@ -246,3 +246,4 @@ loop_x:
+ align 16
+
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm
++++ b/xorgxrdp/module/x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm
+@@ -172,3 +172,4 @@ done_loop_x:
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/x86/cpuid_x86.asm
++++ b/xorgxrdp/module/x86/cpuid_x86.asm
+@@ -37,3 +37,4 @@ PROC cpuid_x86
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/x86/i420_to_rgb32_x86_sse2.asm
++++ b/xorgxrdp/module/x86/i420_to_rgb32_x86_sse2.asm
+@@ -241,3 +241,4 @@ loop_x:
+ align 16
+
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/x86/uyvy_to_rgb32_x86_sse2.asm
++++ b/xorgxrdp/module/x86/uyvy_to_rgb32_x86_sse2.asm
+@@ -156,3 +156,4 @@ loop1:
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/x86/yuy2_to_rgb32_x86_sse2.asm
++++ b/xorgxrdp/module/x86/yuy2_to_rgb32_x86_sse2.asm
+@@ -156,3 +156,4 @@ loop1:
+ ret
+ align 16
+
++section .note.GNU-stack noalloc noexec nowrite progbits
+--- a/xorgxrdp/module/x86/yv12_to_rgb32_x86_sse2.asm
++++ b/xorgxrdp/module/x86/yv12_to_rgb32_x86_sse2.asm
+@@ -241,3 +241,4 @@ loop_x:
+ align 16
+
+
++section .note.GNU-stack noalloc noexec nowrite progbits
diff --git a/patches/series b/patches/series
index e29585c..472562d 100644
--- a/patches/series
+++ b/patches/series
@@ -5,3 +5,4 @@ keymap-default.diff
keymap-fallback.diff
misc-fixes.diff
systemd.diff
+nxstack.diff
diff --git a/patches/systemd.diff b/patches/systemd.diff
index 6dbed82..7120afe 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -5,8 +5,9 @@
@@ -1,13 +1,14 @@
[Unit]
-Description=xrdp session manager
+-After=syslog.target network.target
+Description=Remote Desktop Protocol (RDP) server - Session Manager
- After=syslog.target network.target
++After=network.target
StopWhenUnneeded=true
BindTo=xrdp.service
@@ -27,7 +28,8 @@
-Description=xrdp daemon
+Description=Remote Desktop Protocol (RDP) server
Requires=xrdp-sesman.service
- After=syslog.target network.target xrdp-sesman.service
+-After=syslog.target network.target xrdp-sesman.service
++After=network.target xrdp-sesman.service
[Service]
Type=forking
diff --git a/rules b/rules
index f113f2a..ec7f93c 100755
--- a/rules
+++ b/rules
@@ -46,3 +46,5 @@ override_dh_auto_install:
rm -f debian/xrdp/etc/xrdp/startwm.sh
# Policy
find debian/xrdp/ -name \*.la -print0 | xargs -0 rm -f --
+ find debian/xrdp/usr/lib/xorg/modules -name \*.a -print0 | \
+ xargs -0 strip --strip-debug --
--
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