[Pkg-remote-team] [xrdp] 05/05: Update patches.
Dominik George
natureshadow-guest at moszumanska.debian.org
Sat Nov 26 11:37:00 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 6faf2422b1d1dea2b13af4fc08bef96e6a173ca2
Author: Dominik George <nik at naturalnet.de>
Date: Sat Nov 26 12:35:15 2016 +0100
Update patches.
---
debian/changelog | 3 +-
debian/patches/config.diff | 2 +-
debian/patches/misc-fixes.diff | 645 -----------------------------------------
debian/patches/series | 1 -
debian/patches/sockpath.diff | 2 +-
5 files changed, 4 insertions(+), 649 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 06d2cde..da74e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xrdp (0.9.1~20161126+git589b29f-1) UNRELEASED; urgency=medium
+ Bug fix for machines without IPv6. (Closes: #839266, #843981)
* Remove old four-nibble keymap conffiles. (Closes: #845701)
* Move git to pkg-remote.
+ * Update patches.
- -- Dominik George <nik at naturalnet.de> Sat, 26 Nov 2016 12:27:25 +0100
+ -- Dominik George <nik at naturalnet.de> Sat, 26 Nov 2016 12:35:26 +0100
xrdp (0.9.1~20161119+gite8308d5-1) unstable; urgency=medium
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 5001175..c0888c6 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -4,7 +4,7 @@ Subject: config patches for Debian
Use xorgxrdp instead of x11rdp
--- a/sesman/sesman.ini
+++ b/sesman/sesman.ini
-@@ -89,6 +89,7 @@ param=-nolisten
+@@ -86,6 +86,7 @@ param=-nolisten
param=tcp
param=-logfile
param=/dev/null
diff --git a/debian/patches/misc-fixes.diff b/debian/patches/misc-fixes.diff
deleted file mode 100644
index 1fb1bfe..0000000
--- a/debian/patches/misc-fixes.diff
+++ /dev/null
@@ -1,645 +0,0 @@
-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/libxrdp/xrdp_jpeg_compress.c
-+++ b/libxrdp/xrdp_jpeg_compress.c
-@@ -213,7 +213,7 @@ xrdp_jpeg_deinit(void *handle)
-
- struct mydata_comp
- {
-- char *cb;
-+ JOCTET *cb;
- int cb_bytes;
- int total_done;
- int overwrite;
-@@ -265,8 +265,8 @@ my_term_destination(j_compress_ptr cinfo
-
- /*****************************************************************************/
- static int APP_CC
--jp_do_compress(char *data, int width, int height, int bpp, int quality,
-- char *comp_data, int *comp_data_bytes)
-+jp_do_compress(JOCTET *data, int width, int height, int bpp, int quality,
-+ JOCTET *comp_data, int *comp_data_bytes)
- {
- struct jpeg_compress_struct cinfo;
- struct jpeg_error_mgr jerr;
-@@ -336,19 +336,18 @@ jpeg_compress(char *in_data, int width,
- struct stream *s, struct stream *temp_s, int bpp,
- int byte_limit, int e, int quality)
- {
-- char *data;
-+ tui8 *data;
- tui32 *src32;
-- tui16 *src16;
- tui8 *dst8;
- tui32 pixel;
-- int red;
-- int blue;
-- int green;
-+ int red = 0;
-+ int blue = 0;
-+ int green = 0;
- int j;
- int i;
- int cdata_bytes;
-
-- data = temp_s->data;
-+ data = (tui8 *)temp_s->data;
- dst8 = data;
-
- if (bpp == 24)
-@@ -380,7 +379,7 @@ jpeg_compress(char *in_data, int width,
- }
-
- cdata_bytes = byte_limit;
-- jp_do_compress(data, width + e, height, 24, quality, s->p, &cdata_bytes);
-+ jp_do_compress(data, width + e, height, 24, quality, (JOCTET *)s->p, &cdata_bytes);
- s->p += cdata_bytes;
- return cdata_bytes;
- }
---- a/sesman/chansrv/chansrv_fuse.c
-+++ b/sesman/chansrv/chansrv_fuse.c
-@@ -58,6 +58,9 @@ char g_fuse_clipboard_path[256] = ""; /*
-
- #include "arch.h"
- #include "chansrv_fuse.h"
-+#include "chansrv.h"
-+#include "devredir.h"
-+#include "file.h"
-
- /* dummy calls when XRDP_FUSE is not defined */
- int xfuse_init(void) { return 0; }
-@@ -104,6 +107,9 @@ void xfuse_devredir_cb_file_close(void *
- #include "chansrv_fuse.h"
- #include "list.h"
- #include "fifo.h"
-+#include "chansrv.h"
-+#include "devredir.h"
-+#include "file.h"
-
- #ifndef EREMOTEIO
- #define EREMOTEIO EIO
-@@ -122,6 +128,7 @@ void xfuse_devredir_cb_file_close(void *
- #define LOG_ERROR 0
- #define LOG_INFO 1
- #define LOG_DEBUG 2
-+#undef LOG_LEVEL
- #define LOG_LEVEL LOG_ERROR
-
- #define log_error(_params...) \
-@@ -265,7 +272,9 @@ static void xfuse_create_file(fuse_req_t
- #endif
-
- static void xfuse_dump_fs(void);
-+#if 0
- static void xfuse_dump_xrdp_inode(struct xrdp_inode *xino);
-+#endif
- static tui32 xfuse_get_device_id_for_inode(tui32 ino, char *full_path);
- static void fuse_reverse_pathname(char *full_path, char *reverse_path);
-
-@@ -277,13 +286,17 @@ static struct xrdp_inode * xfuse_create_
- int type);
-
- static int xfuse_does_file_exist(int parent, char *name);
-+#if 0
- static int xfuse_delete_file(int parent, char *name);
-+#endif
- static int xfuse_delete_file_with_xinode(XRDP_INODE *xinode);
- static int xfuse_delete_dir_with_xinode(XRDP_INODE *xinode);
- static int xfuse_recursive_delete_dir_with_xinode(XRDP_INODE *xinode);
- static void xfuse_update_xrdpfs_size(void);
-+#ifdef USE_SYNC_FLAG
- static void xfuse_enum_dir(fuse_req_t req, fuse_ino_t ino, size_t size,
- off_t off, struct fuse_file_info *fi);
-+#endif
-
- /* forward declarations for calls we make into devredir */
- int dev_redir_get_dir_listing(void *fusep, tui32 device_id, char *path);
-@@ -306,9 +319,11 @@ static void xfuse_cb_lookup(fuse_req_t r
- static void xfuse_cb_getattr(fuse_req_t req, fuse_ino_t ino,
- struct fuse_file_info *fi);
-
-+#if 0
- /* this is not a callback, but it's used by xfuse_cb_readdir() */
- static void xfuse_dirbuf_add(fuse_req_t req, struct dirbuf *b,
- const char *name, fuse_ino_t ino);
-+#endif
-
- static int xfuse_dirbuf_add1(fuse_req_t req, struct dirbuf1 *b,
- const char *name, fuse_ino_t ino);
-@@ -353,8 +368,10 @@ static void xfuse_cb_create(fuse_req_t r
- const char *name, mode_t mode,
- struct fuse_file_info *fi);
-
-+#if 0
- static void xfuse_cb_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
- struct fuse_file_info *fi);
-+#endif
-
- static void xfuse_cb_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
- int to_set, struct fuse_file_info *fi);
-@@ -1075,7 +1092,7 @@ static void xfuse_dump_fs()
- xinode->nentries, xinode->nopen, xinode->is_synced,
- xinode->name);
- }
-- log_debug("");
-+ log_debug("end of xfuse_dump_fs");
- }
-
- /**
-@@ -1084,20 +1101,22 @@ static void xfuse_dump_fs()
- * @param xino xinode structure to dump
- *****************************************************************************/
-
-+#if 0
- static void xfuse_dump_xrdp_inode(struct xrdp_inode *xino)
- {
- log_debug("--- dumping struct xinode ---");
- log_debug("name: %s", xino->name);
-- log_debug("parent_inode: %ld", xino->parent_inode);
-- log_debug("inode: %ld", xino->inode);
-+ log_debug("parent_inode: %ld", (long)xino->parent_inode);
-+ log_debug("inode: %ld", (long)xino->inode);
- log_debug("mode: %o", xino->mode);
- log_debug("nlink: %d", xino->nlink);
- log_debug("uid: %d", xino->uid);
- log_debug("gid: %d", xino->gid);
- log_debug("size: %ld", xino->size);
- log_debug("device_id: %d", xino->device_id);
-- log_debug("");
-+ log_debug("--- end of struct xinode ---");
- }
-+#endif
-
- /**
- * Return the device_id associated with specified inode and copy the
-@@ -1294,10 +1313,12 @@ static int xfuse_does_file_exist(int par
- return 0;
- }
-
-+#if 0
- static int xfuse_delete_file(int parent, char *name)
- {
- return -1;
- }
-+#endif
-
- static int xfuse_delete_file_with_xinode(XRDP_INODE *xinode)
- {
-@@ -1450,12 +1471,12 @@ int xfuse_devredir_cb_enum_dir(void *vp,
-
- if (!xfuse_is_inode_valid(fip->inode))
- {
-- log_error("inode %d is not valid", fip->inode);
-+ log_error("inode %ld is not valid", (long)fip->inode);
- g_free(xinode);
- return -1;
- }
-
-- log_debug("parent_inode=%d name=%s", fip->inode, xinode->name);
-+ log_debug("parent_inode=%ld name=%s", (long)fip->inode, xinode->name);
-
- /* if filename is . or .. don't add it */
- if ((strcmp(xinode->name, ".") == 0) || (strcmp(xinode->name, "..") == 0))
-@@ -1468,8 +1489,8 @@ int xfuse_devredir_cb_enum_dir(void *vp,
-
- if ((xip = xfuse_get_inode_from_pinode_name(fip->inode, xinode->name)) != NULL)
- {
-- log_debug("inode=%d name=%s already exists in xrdp_fs; not adding it",
-- fip->inode, xinode->name);
-+ log_debug("inode=%ld name=%s already exists in xrdp_fs; not adding it",
-+ (long)fip->inode, xinode->name);
- g_free(xinode);
- xip->stale = 0;
- return -1;
-@@ -1521,7 +1542,7 @@ void xfuse_devredir_cb_enum_dir_done(voi
- /* do we have a valid inode? */
- if (!xfuse_is_inode_valid(fip->inode))
- {
-- log_error("inode %d is not valid", fip->inode);
-+ log_error("inode %ld is not valid", (long)fip->inode);
- if (fip->invoke_fuse)
- fuse_reply_err(fip->req, EBADF);
- goto done;
-@@ -1615,8 +1636,8 @@ void xfuse_devredir_cb_open_file(void *v
- fh->FileId = FileId;
-
- fip->fi->fh = (uint64_t) ((long) fh);
-- log_debug("+++ XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%p",
-- fip, fip->fi, fip->fi->fh);
-+ log_debug("+++ XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%llX",
-+ fip, fip->fi, (unsigned long long)fip->fi->fh);
- }
-
- if (fip->invoke_fuse)
-@@ -1719,8 +1740,8 @@ void xfuse_devredir_cb_write_file(void *
- return;
- }
-
-- log_debug("+++ XFUSE_INFO=%p, XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%p",
-- fip, fip->fi, fip->fi->fh);
-+ log_debug("+++ XFUSE_INFO=%p, XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%llX",
-+ fip, fip->fi, (unsigned long long)fip->fi->fh);
-
- fuse_reply_write(fip->req, length);
-
-@@ -1728,7 +1749,7 @@ void xfuse_devredir_cb_write_file(void *
- if ((xinode = g_xrdp_fs.inode_table[fip->inode]) != NULL)
- xinode->size += length;
- else
-- log_error("inode at inode_table[%d] is NULL", fip->inode);
-+ log_error("inode at inode_table[%ld] is NULL", (long)fip->inode);
-
- free(fip);
- }
-@@ -1849,12 +1870,12 @@ void xfuse_devredir_cb_file_close(void *
- return;
- }
-
-- log_debug("+++ XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%p",
-- fip, fip->fi, fip->fi->fh);
-+ log_debug("+++ XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%llX",
-+ fip, fip->fi, (unsigned long long)fip->fi->fh);
-
- if ((xinode = g_xrdp_fs.inode_table[fip->inode]) == NULL)
- {
-- log_debug("inode_table[%d] is NULL", fip->inode);
-+ log_debug("inode_table[%ld] is NULL", (long)fip->inode);
- fuse_reply_err(fip->req, EBADF);
- return;
- }
-@@ -1900,7 +1921,7 @@ static void xfuse_cb_lookup(fuse_req_t r
-
- if (!xfuse_is_inode_valid(parent))
- {
-- log_error("inode %d is not valid", parent);
-+ log_error("inode %ld is not valid", (long)parent);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -1908,7 +1929,7 @@ static void xfuse_cb_lookup(fuse_req_t r
- xinode = xfuse_get_inode_from_pinode_name(parent, name);
- if (xinode == NULL)
- {
-- log_debug("did not find entry for parent=%d name=%s", parent, name);
-+ log_debug("did not find entry for parent=%ld name=%s", (long)parent, name);
- fuse_reply_err(req, ENOENT);
- return;
- }
-@@ -1929,8 +1950,8 @@ static void xfuse_cb_lookup(fuse_req_t r
- e.generation = 1;
-
- fuse_reply_entry(req, &e);
-- log_debug("found entry for parent=%d name=%s uid=%d gid=%d",
-- parent, name, xinode->uid, xinode->gid);
-+ log_debug("found entry for parent=%ld name=%s uid=%d gid=%d",
-+ (long)parent, name, xinode->uid, xinode->gid);
- return;
- }
-
-@@ -1951,7 +1972,7 @@ static void xfuse_cb_getattr(fuse_req_t
- /* if ino is not valid, just return */
- if (!xfuse_is_inode_valid(ino))
- {
-- log_error("inode %d is not valid", ino);
-+ log_error("inode %ld is not valid", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -1976,6 +1997,7 @@ static void xfuse_cb_getattr(fuse_req_t
- *
- *****************************************************************************/
-
-+#if 0
- static void xfuse_dirbuf_add(fuse_req_t req, struct dirbuf *b,
- const char *name, fuse_ino_t ino)
- {
-@@ -1992,6 +2014,7 @@ static void xfuse_dirbuf_add(fuse_req_t
- fuse_add_direntry(req, b->p + oldsize, b->size - oldsize, name, &stbuf,
- b->size);
- }
-+#endif
-
- static int xfuse_dirbuf_add1(fuse_req_t req, struct dirbuf1 *b,
- const char *name, fuse_ino_t ino)
-@@ -2035,12 +2058,12 @@ static void xfuse_cb_readdir(fuse_req_t
- int i;
- int first_time;
-
-- log_debug("req=%p inode=%d size=%d offset=%d", req, ino, size, off);
-+ log_debug("req=%p inode=%ld size=%zu offset=%lld", req, ino, size, (long long)off);
-
- /* do we have a valid inode? */
- if (!xfuse_is_inode_valid(ino))
- {
-- log_error("inode %d is not valid", ino);
-+ log_error("inode %ld is not valid", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2073,7 +2096,7 @@ static void xfuse_cb_readdir(fuse_req_t
- ti = g_xrdp_fs.inode_table[ino];
- if (!ti)
- {
-- log_debug("****** g_xrdp_fs.inode_table[%d] is NULL", ino);
-+ log_debug("****** g_xrdp_fs.inode_table[%ld] is NULL", (long)ino);
- fuse_reply_buf(req, NULL, 0);
- return;
- }
-@@ -2161,19 +2184,19 @@ static void xfuse_remove_dir_or_file(fus
- char full_path[4096];
- tui32 device_id;
-
-- log_debug("entered: parent=%d name=%s", parent, name);
-+ log_debug("entered: parent=%ld name=%s", (long)parent, name);
-
- /* is parent inode valid? */
- if (!xfuse_is_inode_valid(parent))
- {
-- log_error("inode %d is not valid", parent);
-+ log_error("inode %ld is not valid", (long)parent);
- fuse_reply_err(req, EBADF);
- return;
- }
-
- if ((xinode = xfuse_get_inode_from_pinode_name(parent, name)) == NULL)
- {
-- log_error("did not find file with pinode=%d name=%s", parent, name);
-+ log_error("did not find file with pinode=%ld name=%s", (long)parent, name);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2267,14 +2290,14 @@ static void xfuse_cb_rename(fuse_req_t r
-
- tui32 device_id;
-
-- log_debug("entered: old_parent=%d old_name=%s new_parent=%d new_name=%s",
-- old_parent, old_name, new_parent, new_name);
-+ log_debug("entered: old_parent=%ld old_name=%s new_parent=%ld new_name=%s",
-+ (long)old_parent, old_name, (long)new_parent, new_name);
- xfuse_dump_fs();
-
- /* is old_parent inode valid? */
- if (!xfuse_is_inode_valid(old_parent))
- {
-- log_error("inode %d is not valid", old_parent);
-+ log_error("inode %ld is not valid", (long)old_parent);
- fuse_reply_err(req, EINVAL);
- return;
- }
-@@ -2282,7 +2305,7 @@ static void xfuse_cb_rename(fuse_req_t r
- /* is new_parent inode valid? */
- if (!xfuse_is_inode_valid(new_parent))
- {
-- log_error("inode %d is not valid", new_parent);
-+ log_error("inode %ld is not valid", (long)new_parent);
- fuse_reply_err(req, EINVAL);
- return;
- }
-@@ -2302,8 +2325,8 @@ static void xfuse_cb_rename(fuse_req_t r
- old_xinode = xfuse_get_inode_from_pinode_name(old_parent, old_name);
- if (old_xinode == NULL)
- {
-- log_error("did not find file with pinode=%d name=%s",
-- old_parent, old_name);
-+ log_error("did not find file with pinode=%ld name=%s",
-+ (long)old_parent, old_name);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2425,7 +2448,7 @@ static void xfuse_create_dir_or_file(fus
- /* is parent inode valid? */
- if ((parent == 1) || (!xfuse_is_inode_valid(parent)))
- {
-- log_error("inode %d is not valid", parent);
-+ log_error("inode %ld is not valid", (long)parent);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2507,7 +2530,7 @@ static void xfuse_cb_open(fuse_req_t req
-
- if (!xfuse_is_inode_valid(ino))
- {
-- log_error("inode %d is not valid", ino);
-+ log_error("inode %ld is not valid", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2516,7 +2539,7 @@ static void xfuse_cb_open(fuse_req_t req
- xinode = g_xrdp_fs.inode_table[ino];
- if (!xinode)
- {
-- log_debug("****** g_xrdp_fs.inode_table[%d] is NULL", ino);
-+ log_debug("****** g_xrdp_fs.inode_table[%ld] is NULL", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2587,13 +2610,12 @@ static void xfuse_cb_release(fuse_req_t
- {
- XFUSE_INFO *fip = NULL;
- XFUSE_HANDLE *handle = (XFUSE_HANDLE *) (tintptr) (fi->fh);
-- tui32 FileId;
-
-- log_debug("entered: ino=%d fi=%p fi->fh=%p", (int) ino, fi, fi->fh);
-+ log_debug("entered: ino=%ld fi=%p fi->fh=%llX", (long)ino, fi, (unsigned long long)fi->fh);
-
- if (!xfuse_is_inode_valid(ino))
- {
-- log_error("inode %d is not valid", ino);
-+ log_error("inode %ld is not valid", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2601,7 +2623,7 @@ static void xfuse_cb_release(fuse_req_t
- XRDP_INODE *xinode = g_xrdp_fs.inode_table[ino];
- if (!xinode)
- {
-- log_debug("****** g_xrdp_fs.inode_table[%d] is NULL", ino);
-+ log_debug("****** g_xrdp_fs.inode_table[%ld] is NULL", (long)ino);
- fuse_reply_err(req, 0);
- return;
- }
-@@ -2637,10 +2659,9 @@ static void xfuse_cb_release(fuse_req_t
- fip->device_id = handle->DeviceId;
- fip->fi = fi;
-
-- log_debug(" +++ created XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%p",
-- fip, fip->fi, fip->fi->fh);
-+ log_debug(" +++ created XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%llX",
-+ fip, fip->fi, (unsigned long long)fip->fi->fh);
-
-- FileId = handle->FileId;
- fip->fi->fh = 0;
- xinode->close_in_progress = 1;
-
-@@ -2773,8 +2794,8 @@ static void xfuse_cb_write(fuse_req_t re
- fusep->device_id = fh->DeviceId;
- fusep->fi = fi;
-
-- log_debug("+++ created XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%p",
-- fusep, fusep->fi, fusep->fi->fh);
-+ log_debug("+++ created XFUSE_INFO=%p XFUSE_INFO->fi=%p XFUSE_INFO->fi->fh=%llX",
-+ fusep, fusep->fi, (unsigned long long)fusep->fi->fh);
-
- dev_redir_file_write(fusep, fh->DeviceId, fh->FileId, buf, size, off);
- log_debug("exiting");
-@@ -2796,6 +2817,7 @@ static void xfuse_cb_create(fuse_req_t r
- /**
- *****************************************************************************/
-
-+#if 0
- static void xfuse_cb_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
- struct fuse_file_info *fi)
- {
-@@ -2803,6 +2825,7 @@ static void xfuse_cb_fsync(fuse_req_t re
- log_debug("function not required");
- fuse_reply_err(req, EINVAL);
- }
-+#endif
-
- /**
- *****************************************************************************/
-@@ -2817,14 +2840,14 @@ static void xfuse_cb_setattr(fuse_req_t
-
- if (!xfuse_is_inode_valid(ino))
- {
-- log_error("inode %d is not valid", ino);
-+ log_error("inode %ld is not valid", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-
- if ((xinode = g_xrdp_fs.inode_table[ino]) == NULL)
- {
-- log_debug("g_xrdp_fs.inode_table[%d] is NULL", ino);
-+ log_debug("g_xrdp_fs.inode_table[%ld] is NULL", (long)ino);
- fuse_reply_err(req, EBADF);
- return;
- }
-@@ -2850,9 +2873,9 @@ static void xfuse_cb_setattr(fuse_req_t
-
- if (to_set & FUSE_SET_ATTR_SIZE)
- {
-- log_debug("previous file size: %d", attr->st_size);
-+ log_debug("previous file size: %lld", (long long)attr->st_size);
- xinode->size = attr->st_size;
-- log_debug("returning file size: %d", xinode->size);
-+ log_debug("returning file size: %zu", xinode->size);
- }
-
- if (to_set & FUSE_SET_ATTR_ATIME)
-@@ -2933,11 +2956,11 @@ static int xfuse_proc_opendir_req(fuse_r
- char full_path[4096];
- char *cptr;
-
-- log_debug("inode=%d", ino);
-+ log_debug("inode=%ld", (long)ino);
-
- if (!xfuse_is_inode_valid(ino))
- {
-- log_error("inode %d is not valid", ino);
-+ log_error("inode %ld is not valid", (long)ino);
- fuse_reply_err(req, EBADF);
- g_free(fifo_remove(&g_fifo_opendir));
- return -1;
-@@ -2948,7 +2971,7 @@ static int xfuse_proc_opendir_req(fuse_r
-
- if ((xinode = g_xrdp_fs.inode_table[ino]) == NULL)
- {
-- log_debug("g_xrdp_fs.inode_table[%d] is NULL", ino);
-+ log_debug("g_xrdp_fs.inode_table[%ld] is NULL", (long)ino);
- fuse_reply_err(req, EBADF);
- g_free(fifo_remove(&g_fifo_opendir));
- return -1;
-@@ -2970,16 +2993,17 @@ static int xfuse_proc_opendir_req(fuse_r
- {
- goto do_remote_lookup;
- }
--#endif
-
- do_remote_lookup:
-
-+#endif
-+
- xfuse_mark_as_stale((int) ino);
-
- log_debug("did not find entry; redirecting call to dev_redir");
- device_id = xfuse_get_device_id_for_inode((tui32) ino, full_path);
-
-- log_debug("dev_id=%d ino=%d full_path=%s", device_id, ino, full_path);
-+ log_debug("dev_id=%d ino=%ld full_path=%s", device_id, (long)ino, full_path);
-
- if ((fip = calloc(1, sizeof(XFUSE_INFO))) == NULL)
- {
---- 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/session.c
-+++ b/sesman/session.c
-@@ -617,7 +617,7 @@ session_start_fork(int width, int height
- else
- {
- log_message(LOG_LEVEL_ERROR, "another Xserver might "
-- "already be active on display %d - see log", display);
-+ "already be active on display %d - see log; possibly comment out the two param lines -logfile /dev/null in /etc/xrdp/sesman.ini to debug", display);
- }
-
- log_message(LOG_LEVEL_DEBUG, "aborting connection...");
---- a/xorgxrdp/xrdpkeyb/rdpKeyboard.c
-+++ b/xorgxrdp/xrdpkeyb/rdpKeyboard.c
-@@ -534,7 +534,7 @@ rdpInputKeyboard(rdpPtr dev, int msg, lo
- }
-
- /******************************************************************************/
--void
-+int
- rdpkeybDeviceInit(DeviceIntPtr pDevice, KeySymsPtr pKeySyms, CARD8 *pModMap)
- {
- int i;
-@@ -565,7 +565,7 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice,
- if (pKeySyms->map == 0)
- {
- LLOGLN(0, ("rdpkeybDeviceInit: out of memory"));
-- exit(1);
-+ return 1;
- }
- else
- {
-@@ -581,6 +581,8 @@ rdpkeybDeviceInit(DeviceIntPtr pDevice,
- {
- pKeySyms->map[i] = g_kbdMap[i];
- }
-+
-+ return 0;
- }
-
- /******************************************************************************/
-@@ -676,7 +678,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 = g_base_str;
- set.model = g_pc104_str;
---- 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/debian/patches/series b/debian/patches/series
index 2e874e8..abb8721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
make-fixes.diff
config.diff
-misc-fixes.diff
systemd.diff
nxstack.diff
fix_perms.diff
diff --git a/debian/patches/sockpath.diff b/debian/patches/sockpath.diff
index 4d7d45c..d3cf5b3 100644
--- a/debian/patches/sockpath.diff
+++ b/debian/patches/sockpath.diff
@@ -250,7 +250,7 @@ Subject:: change location of the socket path to something less racy
;
--- a/xrdpapi/xrdpapi.c
+++ b/xrdpapi/xrdpapi.c
-@@ -145,7 +145,7 @@ WTSVirtualChannelOpenEx(unsigned int Ses
+@@ -144,7 +144,7 @@ WTSVirtualChannelOpenEx(unsigned int Ses
memset(&s, 0, sizeof(struct sockaddr_un));
s.sun_family = AF_UNIX;
bytes = sizeof(s.sun_path);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/xrdp.git
More information about the Pkg-remote-team
mailing list