[packages/xrdp] - removing unused patches and adding linker patch

[mrozowik]

commit 0c686198501837c35c60945a22c589e102457f15
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Tue Mar 22 06:36:36 2022 +0000

    - removing unused patches and adding linker patch

 linker.patch       |  9 +++++++++
 openssl3.patch     | 12 ------------
 xrdp-int_ptr.patch | 49 -------------------------------------------------
 3 files changed, 9 insertions(+), 61 deletions(-)
---
diff --git a/linker.patch b/linker.patch
new file mode 100644
index 0000000..5811c67
--- /dev/null
+++ b/linker.patch
@@ -0,0 +1,9 @@
+--- xrdp-0.9.19/xrdpapi/Makefile.am~	2020-06-26 11:13:58.000000000 +0000
++++ xrdp-0.9.19/xrdpapi/Makefile.am	2022-03-22 05:56:04.471233246 +0000
+@@ -13,3 +13,6 @@
+ libxrdpapi_la_SOURCES = \
+   xrdpapi.c \
+   xrdpapi.h
++
++libxrdpapi_la_LIBADD = \
++  $(top_builddir)/common/libcommon.la
diff --git a/openssl3.patch b/openssl3.patch
deleted file mode 100644
index 6df72d8..0000000
--- a/openssl3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xrdp-0.9.18.1/configure.ac~	2022-02-07 13:26:33.000000000 +0000
-+++ xrdp-0.9.18.1/configure.ac	2022-02-22 17:53:14.649764980 +0000
-@@ -182,9 +182,6 @@
- AX_CFLAGS_WARN_ALL
- AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
- 
--AM_COND_IF([LINUX],
--  [AX_APPEND_COMPILE_FLAGS([-Werror])]) # bsd has warnings that have not been fixed yet
--
- AM_COND_IF([DEVEL_DEBUG],
-   [AX_APPEND_COMPILE_FLAGS([-g -O0])],
-   [AX_APPEND_COMPILE_FLAGS([-O2])])
diff --git a/xrdp-int_ptr.patch b/xrdp-int_ptr.patch
deleted file mode 100644
index 8e9f0f1..0000000
--- a/xrdp-int_ptr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a7462404d5dbf3a1b8a041851aee3dfd00f8c83f Mon Sep 17 00:00:00 2001
-From: Alexandre Quesnel <131881+aquesnel at users.noreply.github.com>
-Date: Tue, 8 Sep 2020 21:04:02 +0000
-Subject: [PATCH] Adding casts for narrowing to pointer width for issue #1678
-
----
- sesman/chansrv/chansrv_fuse.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
-index 62ee050a7..2f043d7a8 100644
---- a/sesman/chansrv/chansrv_fuse.c
-+++ b/sesman/chansrv/chansrv_fuse.c
-@@ -1607,7 +1607,7 @@ static void xfuse_cb_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
-         log_error("inode %ld is not valid", ino);
-         fuse_reply_err(req, ENOENT);
-     }
--    else if ((dh = (struct xfs_dir_handle *) fi->fh) == NULL)
-+    else if ((dh = (struct xfs_dir_handle *) (tintptr) fi->fh) == NULL)
-     {
-         /* something seriously wrong somewhere! */
-         fuse_reply_buf(req, 0, 0);
-@@ -2095,7 +2095,7 @@ static void xfuse_cb_read(fuse_req_t req, fuse_ino_t ino, size_t size,
- 
-     log_debug("want_bytes %zd bytes at off %lld", size, (long long) off);
- 
--    if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
-+    if ((fh = (XFUSE_HANDLE *) (tintptr) fi->fh) == NULL)
-     {
-         fuse_reply_err(req, EINVAL);
-     }
-@@ -2168,7 +2168,7 @@ static void xfuse_cb_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
-     log_debug("write %zd bytes at off %lld to inode=%ld",
-               size, (long long) off, ino);
- 
--    if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
-+    if ((fh = (XFUSE_HANDLE *) (tintptr) fi->fh) == NULL)
-     {
-         log_error("file handle fi->fh is NULL");
-         fuse_reply_err(req, EINVAL);
-@@ -2436,7 +2436,7 @@ static void xfuse_cb_opendir(fuse_req_t req, fuse_ino_t ino,
- static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
-                                 struct fuse_file_info *fi)
- {
--    struct xfs_dir_handle *dh = (struct xfs_dir_handle *) fi->fh;
-+    struct xfs_dir_handle *dh = (struct xfs_dir_handle *) (tintptr) fi->fh;
-     xfs_closedir(g_xfs, dh);
-     fuse_reply_err(req, 0);
- }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xrdp.git/commitdiff/0c686198501837c35c60945a22c589e102457f15