pxcloud/freerdp2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian/patches: Drop 1001__Typo-Fixes.patch, 1002_macro-fix-in-man-pages.patch, 1003_fix-FTBFS-on-kFreeBSD.patch and 1004_FreeBSD-is-not-kFreeBSD.patch. All issues resolved upstream.

Browse Source
This commit is contained in:
Mike Gabriel 2018-05-09 22:01:12 +02:00
parent b3e2df24dd
commit 2e22ca3c7f
5 changed files with 0 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
debian/patches/1001_Typo-Fixes.patch vendored
View File

@ -1,58 +0,0 @@
Description: Fix some error msg typos
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/ChangeLog
+++ b/ChangeLog
@@ -11638,7 +11638,7 @@
2015-03-16 10:25:31 +0100 Armin Novak (b39940e0a)
- * Added ignore unkown keyword flag to detection.
+ * Added ignore unknown keyword flag to detection.
2015-03-16 10:15:37 +0100 Armin Novak (c380fb352)
--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@@ -1684,7 +1684,7 @@
if (!gfx->log)
{
free(gfx);
- WLog_ERR(TAG, "Failed to aquire reference to WLog %s", TAG);
+ WLog_ERR(TAG, "Failed to acquire reference to WLog %s", TAG);
return ERROR_INTERNAL_ERROR;
}
--- a/winpr/libwinpr/comm/comm_serial_sys.c
+++ b/winpr/libwinpr/comm/comm_serial_sys.c
@@ -1209,7 +1209,7 @@
if (ioctl(pComm->fd, TIOCGICOUNT, &currentCounters) < 0)
{
CommLog_Print(WLOG_WARN, "TIOCGICOUNT ioctl failed, errno=[%d] %s.", errno, strerror(errno));
- CommLog_Print(WLOG_WARN, " coult not read counters.");
+ CommLog_Print(WLOG_WARN, " could not read counters.");
if (pComm->permissive)
{
--- a/winpr/tools/hash-cli/hash.c
+++ b/winpr/tools/hash-cli/hash.c
@@ -116,7 +116,7 @@
if ((version != 1) && (version != 2))
{
- printf("unkown version %d \n\n", version);
+ printf("unknown version %d \n\n", version);
usage_and_exit();
}
}
--- a/winpr/tools/makecert-cli/winpr-makecert.1.in
+++ b/winpr/tools/makecert-cli/winpr-makecert.1.in
@@ -15,7 +15,7 @@
[\fB-n\fP common_name]
[\fB-y\fP years]
[\fB-m\fP months]
-[\fB-len\fP lenth]
+[\fB-len\fP length]
[\fB-#\fP serial]
[\fB-a\fP { \fImd5\fP | \fIsha1\fP | \fIsha256\fP | \fIs384\fP | \fIsha512\fP }]
[\fB-path\fP outputpath]

59
debian/patches/1002_macro-fix-in-man-pages.patch vendored
View File

@ -1,59 +0,0 @@
Description: Fix "warning: can't find macro file `www.tmac))'"
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/server/shadow/freerdp-shadow-cli.1.in
+++ b/server/shadow/freerdp-shadow-cli.1.in
@@ -1,7 +1,7 @@
.de URL
\\$2 \(laURL: \\$1 \(ra\\$3
..
-.if \n[.g] .mso www.tmac))
+.if \n[.g] .mso www.tmac
.TH freerdp\-shadow\-cli 1 2017-01-12 "@FREERDP_VERSION_FULL@" "FreeRDP"
.SH NAME
freerdp\-shadow\-cli \- A utility for sharing a X display via RDP.
@@ -49,14 +49,14 @@
Clients may interact without prompt.
.IP /sec:<rdp|tls|nla|ext>
Force a specific protocol security
-.IP -sec-rdp (default:on)
-Disable RDP security
-.IP -sec-tls (default:on)
-Disable TLS protocol security
-.IP -sec-nla (default:on)
-Disable NLA protocol security
-.IP +sec-ext (default:off)
-Use NLA extended protocol security
+.IP -sec-rdp
+Disable RDP security (default:on)
+.IP -sec-tls
+Disable TLS protocol security (default:on)
+.IP -sec-nla
+Disable NLA protocol security (default:on)
+.IP +sec-ext
+Use NLA extended protocol security (default:off)
.IP /sam-file:<file>
NTLM SAM file for NLA authentication
.IP /version
--- a/winpr/tools/makecert-cli/winpr-makecert.1.in
+++ b/winpr/tools/makecert-cli/winpr-makecert.1.in
@@ -1,7 +1,7 @@
.de URL
\\$2 \(laURL: \\$1 \(ra\\$3
..
-.if \n[.g] .mso www.tmac))
+.if \n[.g] .mso www.tmac
.TH winpr\-makecert 1 2017-01-11 "@FREERDP_VERSION_FULL@" "FreeRDP"
.SH NAME
winpr\-makecert \- A tool to create X.509 certificates.
--- a/client/Wayland/wlfreerdp.1.in
+++ b/client/Wayland/wlfreerdp.1.in
@@ -1,7 +1,7 @@
.de URL
\\$2 \(laURL: \\$1 \(ra\\$3
..
-.if \n[.g] .mso www.tmac))
+.if \n[.g] .mso www.tmac
.TH wlfreerdp 1 2017-01-12 "@FREERDP_VERSION_FULL@" "FreeRDP"
.SH NAME
wlfreerdp \- FreeRDP wayland client

81
debian/patches/1003_fix-FTBFS-on-kFreeBSD.patch vendored
View File

@ -1,81 +0,0 @@
Description: Handle GNU/kFreeBSD the same way as other BSD variants
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/file/file.c
===================================================================
--- freerdp2-2.0.0~git20170725.1.1648deb+dfsg1.orig/winpr/libwinpr/file/file.c
+++ freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/file/file.c
@@ -23,6 +23,10 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
+#define _GNU_SOURCE
+#endif
+
#include <winpr/crt.h>
#include <winpr/file.h>
@@ -384,7 +388,7 @@ static BOOL FileSetFileTime(HANDLE hFile
const FILETIME* lpLastAccessTime, const FILETIME* lpLastWriteTime)
{
int rc;
-#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
struct stat buf;
/* OpenBSD, NetBSD and DragonflyBSD support POSIX futimens */
struct timeval timevals[2];
@@ -396,7 +400,7 @@ static BOOL FileSetFileTime(HANDLE hFile
if (!hFile)
return FALSE;
-#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
rc = fstat(fileno(pFile->fp), &buf);
if (rc < 0)
@@ -406,7 +410,7 @@ static BOOL FileSetFileTime(HANDLE hFile
if (!lpLastAccessTime)
{
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[0].tv_sec = buf.st_atime;
#ifdef _POSIX_SOURCE
TIMESPEC_TO_TIMEVAL(&timevals[0], &buf.st_atim);
@@ -424,7 +428,7 @@ static BOOL FileSetFileTime(HANDLE hFile
else
{
UINT64 tmp = FileTimeToUS(lpLastAccessTime);
-#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[0].tv_sec = tmp / 1000000ULL;
timevals[0].tv_usec = tmp % 1000000ULL;
#else
@@ -435,7 +439,7 @@ static BOOL FileSetFileTime(HANDLE hFile
if (!lpLastWriteTime)
{
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[1].tv_sec = buf.st_mtime;
#ifdef _POSIX_SOURCE
TIMESPEC_TO_TIMEVAL(&timevals[1], &buf.st_mtim);
@@ -453,7 +457,7 @@ static BOOL FileSetFileTime(HANDLE hFile
else
{
UINT64 tmp = FileTimeToUS(lpLastWriteTime);
-#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[1].tv_sec = tmp / 1000000ULL;
timevals[1].tv_usec = tmp % 1000000ULL;
#else
@@ -463,7 +467,7 @@ static BOOL FileSetFileTime(HANDLE hFile
}
// TODO: Creation time can not be handled!
-#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
rc = utimes(pFile->lpFileName, timevals);
#else
rc = futimens(fileno(pFile->fp), times);

30
debian/patches/1004_FreeBSD-is-not-kFreeBSD.patch vendored
View File

@ -1,30 +0,0 @@
Description: GNU/kFreeBSD != FreeBSD
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/CMakeLists.txt
===================================================================
--- freerdp2-2.0.0~git20170725.1.1648deb+dfsg1.orig/CMakeLists.txt
+++ freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/CMakeLists.txt
@@ -158,6 +158,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set(FREEBSD TRUE)
endif()
+ if(${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
+ set(KFREEBSD TRUE)
+ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
set(OPENBSD TRUE)
endif()
Index: freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/utils/CMakeLists.txt
===================================================================
--- freerdp2-2.0.0~git20170725.1.1648deb+dfsg1.orig/winpr/libwinpr/utils/CMakeLists.txt
+++ freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/utils/CMakeLists.txt
@@ -141,7 +141,7 @@ if(UNIX)
winpr_library_add(m)
endif()
-if(FREEBSD)
+if((FREEBSD) AND (NOT KFREEBSD))
winpr_library_add(execinfo)
endif()

6
debian/patches/series vendored
View File

@ -1,6 +0,0 @@
0001-Fix-gstreamer-1.0-detection.patch
0002-fix-nla-don-t-use-server-version.patch
1001_Typo-Fixes.patch
1002_macro-fix-in-man-pages.patch
1003_fix-FTBFS-on-kFreeBSD.patch
1004_FreeBSD-is-not-kFreeBSD.patch