On Fri, Apr 27, 2018 at 03:13:26PM +0200, Giovanni Bechis wrote:
> On Fri, Apr 27, 2018 at 02:53:54PM +0200, Landry Breuil wrote:
> > On Fri, Apr 27, 2018 at 12:48:32PM +0200, Giovanni Bechis wrote:
> > > On 04/27/18 12:24, Landry Breuil wrote:
> > > > Hi,
> > > > 
> > > > so here's another attempt at upgrading freerdp, based on semarie@'s work
> > > > in https://marc.info/?l=openbsd-ports&m=151591792008660&w=2.
> > > > 
> > > > Updated for freerdp 2.0.0rc2 and remmina 1.2.0rc29, patches to fix
> > > > vinagre coming from https://bugzilla.gnome.org/show_bug.cgi?id=765444
> > > > and https://bugzilla.gnome.org/show_bug.cgi?id=774473 being used by
> > > > various linux distros. remotebox and krdc are just spawning xfreerdp and
> > > > have support for freerdp 1.1+-style arguments so should just be fine
> > > > too.
> > > > 
> > > > Runtime tests welcome, as from the hackroom i have no access to vnc or
> > > > rdp stuff.
> > > > 
> > > > Landry
> > > >
> > > rdp fails while 2.0.0rc1 worked, 
> > > ---------------------------------------------------------------------------------------------------------
> > > [12:45:59:596] [42437:d5083240] [ERROR][com.winpr.synch.timer] - 
> > > InitializeWaitableTimer: os specific implementation is missing
> > > ---------------------------------------------------------------------------------------------------------
> > > winpr/libwinpr/synch/timer.c needs some love.
> > 
> > I looked at the code, and besides
> > https://github.com/FreeRDP/FreeRDP/commit/9bd13c25c96610b847c43333513cae5e2476f447
> > i dont see how its that much different/more required than with rc1, are
> > you sure this message wasnt printed with rc1 ?
> > 
> I double checked and, unfortunately on rc1 it works.

Okay, so maybe we'll only update to rc1 then, until someone figures out
what this timer_create() stuff from posix is supposed to do and how we
can implement something equivalent with the apis we have.

Here's the diff for rc1 which should be more or less equivalent to what
semarie@ sent in january.

Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile    20 Jan 2018 14:03:39 -0000      1.30
+++ Makefile    27 Apr 2018 16:08:24 -0000
@@ -4,27 +4,25 @@
 BROKEN-hppa =          undefined reference to __sync_val_compare_and_swap_4
 
 COMMENT =              open source client for Windows Terminal Server
-DISTNAME =             freerdp-1.2.0beta1
+DISTNAME =             freerdp-2.0.0rc1
 CATEGORIES =           x11 net
-REVISION =             2
 
 GH_ACCOUNT =           FreeRDP
 GH_PROJECT =           FreeRDP
-GH_COMMIT =            f5ff6e1bd819a347aa532c1ef1a9cf0c67387507
+GH_TAGNAME =           2.0.0-rc1
 
-SHARED_LIBS +=  freerdp-client            0.0 # 1.2
-SHARED_LIBS +=  freerdp                   0.0 # 1.2
-SHARED_LIBS +=  winpr                     0.0 # 1.1
-SHARED_LIBS +=  xfreerdp-client           0.0 # 1.2
+SHARED_LIBS +=  freerdp-client2           0.0 # 2.0
+SHARED_LIBS +=  freerdp2                  0.0 # 2.0
+SHARED_LIBS +=  winpr-tools2              0.0 # 2.0
+SHARED_LIBS +=  winpr2                    0.0 # 2.0
 
 HOMEPAGE =             http://www.freerdp.com/
 
 # Apache 2.0
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec
+WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv Xrandr avcodec
 WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile
-WANTLIB += z
 
 MODULES =              devel/cmake
 
@@ -37,20 +35,14 @@
                        print/cups,-libs \
                        graphics/ffmpeg
 
-CONFIGURE_ARGS +=      -DWITH_ALSA=OFF \
-                       -DWITH_CUPS=ON \
+CONFIGURE_ARGS +=      -DWITH_CUPS=ON \
                        -DWITH_DIRECTFB=OFF \
                        -DWITH_GSTREAMER_0_10=OFF \
                        -DWITH_GSTREAMER_1_0=OFF \
                        -DWITH_OPENSLES=OFF \
                        -DWITH_PCSC=ON \
-                       -DWITH_PULSE=OFF
-
-# XXX does not build
-CONFIGURE_ARGS +=      -DCHANNEL_DRIVE=OFF
-
-# -msse3 requires a newer gcc
-CONFIGURE_ARGS +=      -DWITH_SSE2=OFF
+                       -DWITH_LIBSYSTEMD=OFF \
+                       -DWITH_OSS=OFF
 
 NO_TEST =              Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    6 May 2017 15:10:18 -0000       1.7
+++ distinfo    27 Apr 2018 16:08:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = 
/LC7jfaSVy4Bmye9sljZvhOW/pOAerJ3Ld4vC7JqxVY=
-SIZE (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = 6036392
+SHA256 (freerdp-2.0.0rc1.tar.gz) = osHIMHJInVbaeLvnbClykCL1w1o+w6HOJs6ogj3gQ8I=
+SIZE (freerdp-2.0.0rc1.tar.gz) = 6530403
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt        7 Nov 2015 05:55:08 -0000       1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2015/11/07 05:55:08 ajacoutot Exp $
---- CMakeLists.txt.orig        Fri Sep 12 00:46:32 2014
-+++ CMakeLists.txt     Fri Nov  6 19:29:28 2015
-@@ -170,20 +170,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
-       if(CMAKE_BUILD_TYPE STREQUAL "Release")
-               set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
-               set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
--              set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
--              set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-+              set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-+              set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- 
--              CHECK_C_COMPILER_FLAG (-Wno-builtin-macro-redefined 
Wno-builtin-macro-redefined)
--              if(Wno-builtin-macro-redefined)
--                      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} 
-Wno-builtin-macro-redefined")
--                      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} 
-D__FILE__='\"$(subst ${CMAKE_BINARY_DIR}/,,$(subst 
${CMAKE_SOURCE_DIR}/,,$(abspath $<)))\"'")
--              endif()
--
--              CHECK_CXX_COMPILER_FLAG (-Wno-builtin-macro-redefined 
Wno-builtin-macro-redefinedCXX)
--              if(Wno-builtin-macro-redefinedCXX)
--                      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} 
-Wno-builtin-macro-redefined")
--                      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} 
-D__FILE__='\"$(subst ${CMAKE_BINARY_DIR}/,,$(subst 
${CMAKE_SOURCE_DIR}/,,$(abspath $<)))\"'")
--              endif()
-       else()
-               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-@@ -315,6 +304,14 @@ if(APPLE)
-       endif()
- endif(APPLE)
- 
-+# BSD
-+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-+      set(BSD TRUE)
-+      if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+              set(OPENBSD TRUE)
-+      endif()
-+endif()
-+
- # Android
- if(ANDROID)
-   set(WITH_LIBRARY_VERSIONING "OFF")
-@@ -554,6 +551,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDI
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-+if(BSD)
-+      if(IS_DIRECTORY /usr/local/include)
-+              include_directories(/usr/local/include)
-+              link_directories(/usr/local/lib)
-+      endif()
-+endif()
- 
- # Configure files
- add_definitions("-DHAVE_CONFIG_H")
Index: patches/patch-channels_CMakeLists_txt
===================================================================
RCS file: patches/patch-channels_CMakeLists_txt
diff -N patches/patch-channels_CMakeLists_txt
--- patches/patch-channels_CMakeLists_txt       21 Nov 2015 10:04:31 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-channels_CMakeLists_txt,v 1.1 2015/11/21 10:04:31 ajacoutot 
Exp $
-
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <[email protected]>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
---- channels/CMakeLists.txt.orig       Fri Sep 12 00:46:32 2014
-+++ channels/CMakeLists.txt    Sat Nov 21 10:50:04 2015
-@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR 
${FILEPATH})
-+      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR 
${FILEPATH})
-               set(CHANNEL_OPTION)
-               include(${FILEPATH})
-               if(${CHANNEL_OPTION})
Index: patches/patch-channels_client_CMakeLists_txt
===================================================================
RCS file: patches/patch-channels_client_CMakeLists_txt
diff -N patches/patch-channels_client_CMakeLists_txt
--- patches/patch-channels_client_CMakeLists_txt        21 Nov 2015 10:04:31 
-0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-channels_client_CMakeLists_txt,v 1.2 2015/11/21 10:04:31 
ajacoutot Exp $
-
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <[email protected]>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
---- channels/client/CMakeLists.txt.orig        Thu Oct 29 07:42:20 2015
-+++ channels/client/CMakeLists.txt     Thu Oct 29 07:42:34 2015
-@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
-       ${CMAKE_CURRENT_SOURCE_DIR}/addin.c
-       ${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
- 
-+if(CHANNEL_STATIC_CLIENT_ENTRIES)
- list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
-+endif()
- 
- foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
-       foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
Index: patches/patch-client_CMakeLists_txt
===================================================================
RCS file: patches/patch-client_CMakeLists_txt
diff -N patches/patch-client_CMakeLists_txt
--- patches/patch-client_CMakeLists_txt 21 Nov 2015 10:04:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-client_CMakeLists_txt,v 1.1 2015/11/21 10:04:31 ajacoutot Exp $
-
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <[email protected]>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
---- client/CMakeLists.txt.orig Fri Sep 12 00:46:32 2014
-+++ client/CMakeLists.txt      Sat Nov 21 10:50:15 2015
-@@ -59,8 +59,8 @@ set(FILENAME "ModuleOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" 
FREERDP_CLIENT ${FILEPATH})
-+      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" 
FREERDP_CLIENT ${FILEPATH})
-               set(FREERDP_CLIENT_ENABLED 0)
-               include(${FILEPATH})
-               if(FREERDP_CLIENT_ENABLED)
Index: patches/patch-client_X11_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/freerdp/patches/patch-client_X11_CMakeLists_txt,v
retrieving revision 1.2
diff -u -r1.2 patch-client_X11_CMakeLists_txt
--- patches/patch-client_X11_CMakeLists_txt     7 Nov 2015 05:55:08 -0000       
1.2
+++ patches/patch-client_X11_CMakeLists_txt     27 Apr 2018 16:08:24 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-client_X11_CMakeLists_txt,v 1.2 2015/11/07 05:55:08 ajacoutot 
Exp $
---- client/X11/CMakeLists.txt.orig     Thu Oct 29 07:05:08 2015
-+++ client/X11/CMakeLists.txt  Thu Oct 29 07:05:18 2015
-@@ -108,7 +108,7 @@ if(WITH_MANPAGES)
-               add_custom_target(xfreerdp.manpage ALL
-                       DEPENDS xfreerdp.1)
+$OpenBSD$
+
+Index: client/X11/CMakeLists.txt
+--- client/X11/CMakeLists.txt.orig
++++ client/X11/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ include_directories(${CMAKE_SOURCE_DIR}/resources)
  
--              install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 
DESTINATION share/man/man1)
-+              install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 
DESTINATION man/man1)
-       else()
-               message(WARNING "WITH_MANPAGES was set, but xsltproc was not 
found. man-pages will not be installed")
-       endif()
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client freerdp m)
+-if (NOT APPLE)
++if ((NOT APPLE) AND (NOT OPENBSD))
+       list(APPEND ${MODULE_PREFIX}_LIBS rt)
+ endif()
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} 
${${MODULE_PREFIX}_LIBS})
Index: patches/patch-client_common_CMakeLists_txt
===================================================================
RCS file: patches/patch-client_common_CMakeLists_txt
diff -N patches/patch-client_common_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-client_common_CMakeLists_txt  27 Apr 2018 16:08:24 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+Doesn't use ossaudio for OpenBSD
+Index: client/common/CMakeLists.txt
+--- client/common/CMakeLists.txt.orig
++++ client/common/CMakeLists.txt
+@@ -66,11 +66,7 @@ endif()
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
+ 
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} 
${FREERDP_CHANNELS_CLIENT_LIBS})
+-if(OPENBSD)
+-      target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} 
${${MODULE_PREFIX}_LIBS} ossaudio)
+-else()
+-      target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} 
${${MODULE_PREFIX}_LIBS})
+-endif()
++target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} 
${${MODULE_PREFIX}_LIBS})
+ 
+ 
+ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT 
libraries EXPORT FreeRDP-ClientTargets)
Index: patches/patch-libfreerdp_crypto_tls_c
===================================================================
RCS file: patches/patch-libfreerdp_crypto_tls_c
diff -N patches/patch-libfreerdp_crypto_tls_c
--- patches/patch-libfreerdp_crypto_tls_c       1 Feb 2017 11:43:23 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-libfreerdp_crypto_tls_c,v 1.1 2017/02/01 11:43:23 sthen Exp $
-
-"For x11/freerdp we need to switch from handshake_func tests to other
-existing ways of doing this, which is what they've already done upstream.
-Note that this diff also switches from TLSv1_client_method() to
-SSLv23_client_method() so that TLSv1.1 and TLSv1.2 will work if the
-server supports them."
-
---- libfreerdp/crypto/tls.c.orig       Wed Feb  1 11:38:11 2017
-+++ libfreerdp/crypto/tls.c    Wed Feb  1 11:38:48 2017
-@@ -218,9 +218,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n
-               case BIO_CTRL_RESET:
-                       SSL_shutdown(tls->ssl);
- 
--                      if (tls->ssl->handshake_func == 
tls->ssl->method->ssl_connect)
-+                      if (SSL_in_connect_init(tls->ssl))
-                               SSL_set_connect_state(tls->ssl);
--                      else if (tls->ssl->handshake_func == 
tls->ssl->method->ssl_accept)
-+                      else if (SSL_in_accept_init(tls->ssl))
-                               SSL_set_accept_state(tls->ssl);
- 
-                       SSL_clear(tls->ssl);
-@@ -749,7 +749,7 @@ int tls_connect(rdpTls* tls, BIO *underlying)
-        */
-       options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
- 
--      if (!tls_prepare(tls, underlying, TLSv1_client_method(), options, TRUE))
-+      if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, 
TRUE))
-               return FALSE;
- 
-       return tls_do_handshake(tls, TRUE);
Index: patches/patch-server_CMakeLists_txt
===================================================================
RCS file: patches/patch-server_CMakeLists_txt
diff -N patches/patch-server_CMakeLists_txt
--- patches/patch-server_CMakeLists_txt 21 Nov 2015 10:04:32 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-server_CMakeLists_txt,v 1.1 2015/11/21 10:04:32 ajacoutot Exp $
-
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <[email protected]>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
---- server/CMakeLists.txt.orig Fri Sep 12 00:46:32 2014
-+++ server/CMakeLists.txt      Sat Nov 21 10:50:15 2015
-@@ -44,8 +44,8 @@ set(FILENAME "ModuleOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" 
FREERDP_SERVER ${FILEPATH})
-+      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" 
FREERDP_SERVER ${FILEPATH})
-               set(FREERDP_SERVER_ENABLED 0)
-               include(${FILEPATH})
-               if(FREERDP_SERVER_ENABLED)
Index: patches/patch-third-party_CMakeLists_txt
===================================================================
RCS file: patches/patch-third-party_CMakeLists_txt
diff -N patches/patch-third-party_CMakeLists_txt
--- patches/patch-third-party_CMakeLists_txt    21 Nov 2015 10:04:32 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-third-party_CMakeLists_txt,v 1.1 2015/11/21 10:04:32 ajacoutot 
Exp $
-
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <[email protected]>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
---- third-party/CMakeLists.txt.orig    Fri Sep 12 00:46:32 2014
-+++ third-party/CMakeLists.txt Sat Nov 21 10:50:15 2015
-@@ -22,11 +22,11 @@
- file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
"*/CMakeLists.txt")
- 
- foreach(dir ${all_valid_subdirs})
--      if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
--              string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" 
dir_trimmed ${dir})
-+      if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
-+              string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" 
dir_trimmed ${dir})
-               message(STATUS "Adding third-party component ${dir_trimmed}")
-               add_subdirectory(${dir_trimmed})
-       endif()
- endforeach(dir)
- 
--set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
-\ No newline at end of file
-+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
Index: patches/patch-winpr_include_winpr_crt_h
===================================================================
RCS file: /cvs/ports/x11/freerdp/patches/patch-winpr_include_winpr_crt_h,v
retrieving revision 1.1
diff -u -r1.1 patch-winpr_include_winpr_crt_h
--- patches/patch-winpr_include_winpr_crt_h     7 Nov 2015 05:55:08 -0000       
1.1
+++ patches/patch-winpr_include_winpr_crt_h     27 Apr 2018 16:08:24 -0000
@@ -2,14 +2,15 @@
 
 __builtin_bswap32
 
---- winpr/include/winpr/crt.h.orig     Fri Nov  6 19:36:54 2015
-+++ winpr/include/winpr/crt.h  Fri Nov  6 19:37:12 2015
-@@ -56,7 +56,7 @@ static INLINE UINT64 _rotr64(UINT64 value, int shift) 
+Index: winpr/include/winpr/crt.h
+--- winpr/include/winpr/crt.h.orig
++++ winpr/include/winpr/crt.h
+@@ -68,7 +68,7 @@ static INLINE UINT64 _rotr64(UINT64 value, int shift)
  }
  #endif
  
 -#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
 +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
  
- #define _byteswap_ushort(_val)        __builtin_bswap16(_val)
  #define _byteswap_ulong(_val) __builtin_bswap32(_val)
+ #define _byteswap_uint64(_val)        __builtin_bswap64(_val)
Index: patches/patch-winpr_libwinpr_CMakeLists_txt
===================================================================
RCS file: patches/patch-winpr_libwinpr_CMakeLists_txt
diff -N patches/patch-winpr_libwinpr_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-winpr_libwinpr_CMakeLists_txt 27 Apr 2018 16:08:24 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: winpr/libwinpr/CMakeLists.txt
+--- winpr/libwinpr/CMakeLists.txt.orig
++++ winpr/libwinpr/CMakeLists.txt
+@@ -21,6 +21,10 @@ if (APPLE)
+       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} 
-Wl,-flat_namespace,-undefined,warning")
+ endif()
+ 
++if (OPENBSD)
++      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} 
-L/usr/local/lib")
++endif()
++
+ set(WINPR_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(WINPR_SRCS "")
+ set(WINPR_LIBS "")
Index: patches/patch-winpr_libwinpr_crt_alignment_c
===================================================================
RCS file: patches/patch-winpr_libwinpr_crt_alignment_c
diff -N patches/patch-winpr_libwinpr_crt_alignment_c
--- patches/patch-winpr_libwinpr_crt_alignment_c        13 Jan 2016 22:25:48 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-winpr_libwinpr_crt_alignment_c,v 1.1 2016/01/13 22:25:48 
jasper Exp $
-
-Use stdlib.h for malloc()
-
---- winpr/libwinpr/crt/alignment.c.orig        Fri Sep 12 00:46:32 2014
-+++ winpr/libwinpr/crt/alignment.c     Wed Jan 13 23:24:42 2016
-@@ -36,7 +36,7 @@
- 
- #ifdef __APPLE__
- #include <malloc/malloc.h>
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <stdlib.h>
- #else
- #include <malloc.h>
Index: patches/patch-winpr_libwinpr_synch_CMakeLists_txt
===================================================================
RCS file: patches/patch-winpr_libwinpr_synch_CMakeLists_txt
diff -N patches/patch-winpr_libwinpr_synch_CMakeLists_txt
--- patches/patch-winpr_libwinpr_synch_CMakeLists_txt   7 Nov 2015 05:55:08 
-0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-winpr_libwinpr_synch_CMakeLists_txt,v 1.1 2015/11/07 05:55:08 
ajacoutot Exp $
---- winpr/libwinpr/synch/CMakeLists.txt.orig   Thu Oct 29 08:00:39 2015
-+++ winpr/libwinpr/synch/CMakeLists.txt        Thu Oct 29 08:00:54 2015
-@@ -30,7 +30,7 @@ winpr_module_add(
-       timer.c
-       wait.c)
- 
--if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID))
-+if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID) AND (NOT OPENBSD))
-       winpr_library_add(rt)
- endif()
- 
Index: patches/patch-winpr_libwinpr_synch_wait_c
===================================================================
RCS file: patches/patch-winpr_libwinpr_synch_wait_c
diff -N patches/patch-winpr_libwinpr_synch_wait_c
--- patches/patch-winpr_libwinpr_synch_wait_c   7 Nov 2015 05:55:08 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-winpr_libwinpr_synch_wait_c,v 1.1 2015/11/07 05:55:08 
ajacoutot Exp $
---- winpr/libwinpr/synch/wait.c.orig   Fri Sep 12 00:46:32 2014
-+++ winpr/libwinpr/synch/wait.c        Fri Nov  6 19:23:22 2015
-@@ -134,7 +134,7 @@ static int pthread_timedjoin_np(pthread_t td, void** r
-       return ETIMEDOUT;
- }
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
- /*the only way to get it work is to remove the static*/
- int pthread_mutex_timedlock(pthread_mutex_t* mutex, const struct timespec* 
timeout)
- #else
Index: patches/patch-winpr_libwinpr_sysinfo_CMakeLists_txt
===================================================================
RCS file: patches/patch-winpr_libwinpr_sysinfo_CMakeLists_txt
diff -N patches/patch-winpr_libwinpr_sysinfo_CMakeLists_txt
--- patches/patch-winpr_libwinpr_sysinfo_CMakeLists_txt 7 Nov 2015 05:55:08 
-0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-winpr_libwinpr_sysinfo_CMakeLists_txt,v 1.1 2015/11/07 
05:55:08 ajacoutot Exp $
---- winpr/libwinpr/sysinfo/CMakeLists.txt.orig Thu Oct 29 08:01:02 2015
-+++ winpr/libwinpr/sysinfo/CMakeLists.txt      Thu Oct 29 08:01:12 2015
-@@ -17,7 +17,7 @@
- 
- winpr_module_add(sysinfo.c)
- 
--if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID))
-+if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID) AND NOT(OPENBSD))
-       winpr_library_add(rt)
- endif()
- 
Index: patches/patch-winpr_libwinpr_sysinfo_sysinfo_c
===================================================================
RCS file: patches/patch-winpr_libwinpr_sysinfo_sysinfo_c
diff -N patches/patch-winpr_libwinpr_sysinfo_sysinfo_c
--- patches/patch-winpr_libwinpr_sysinfo_sysinfo_c      7 Nov 2015 05:55:08 
-0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-winpr_libwinpr_sysinfo_sysinfo_c,v 1.1 2015/11/07 05:55:08 
ajacoutot Exp $
---- winpr/libwinpr/sysinfo/sysinfo.c.orig      Wed Nov 12 18:56:03 2014
-+++ winpr/libwinpr/sysinfo/sysinfo.c   Thu Oct 29 09:34:59 2015
-@@ -105,7 +105,7 @@ static DWORD GetNumberOfProcessors()
-               int mib[4];
-               size_t length = sizeof(numCPUs);
-               mib[0] = CTL_HW;
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-               mib[1] = HW_NCPU;
- #else
-               mib[1] = HW_AVAILCPU;
Index: patches/patch-winpr_libwinpr_utils_CMakeLists_txt
===================================================================
RCS file: 
/cvs/ports/x11/freerdp/patches/patch-winpr_libwinpr_utils_CMakeLists_txt,v
retrieving revision 1.1
diff -u -r1.1 patch-winpr_libwinpr_utils_CMakeLists_txt
--- patches/patch-winpr_libwinpr_utils_CMakeLists_txt   7 Nov 2015 05:55:08 
-0000       1.1
+++ patches/patch-winpr_libwinpr_utils_CMakeLists_txt   27 Apr 2018 16:08:24 
-0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-winpr_libwinpr_utils_CMakeLists_txt,v 1.1 2015/11/07 05:55:08 
ajacoutot Exp $
---- winpr/libwinpr/utils/CMakeLists.txt.orig   Fri Sep 12 00:46:32 2014
-+++ winpr/libwinpr/utils/CMakeLists.txt        Fri Nov  6 19:23:22 2015
-@@ -105,6 +105,10 @@ if(UNIX)
-       winpr_library_add(m)
+Index: winpr/libwinpr/utils/CMakeLists.txt
+--- winpr/libwinpr/utils/CMakeLists.txt.orig
++++ winpr/libwinpr/utils/CMakeLists.txt
+@@ -149,6 +149,10 @@ if(WIN32)
+       winpr_library_add(Dbghelp)
  endif()
  
 +if(BSD)
Index: patches/patch-winpr_libwinpr_utils_ssl_c
===================================================================
RCS file: patches/patch-winpr_libwinpr_utils_ssl_c
diff -N patches/patch-winpr_libwinpr_utils_ssl_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-winpr_libwinpr_utils_ssl_c    27 Apr 2018 16:08:24 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+https://github.com/FreeRDP/FreeRDP/commit/bfe3af4c72b45e33321962644d864843e1c9ce3d
+
+Index: winpr/libwinpr/utils/ssl.c
+--- winpr/libwinpr/utils/ssl.c.orig
++++ winpr/libwinpr/utils/ssl.c
+@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O
+ 
+       if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
+       {
+-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+               WLog_ERR(TAG, "Openssl fips mode ENable not available on 
openssl versions less than 1.0.1!");
+ #else
+               WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
+@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ 
+ BOOL winpr_FIPSMode(void)
+ {
+-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+       return FALSE;
+ #else
+       return (FIPS_mode() == 1);
Index: patches/patch-winpr_pc_in
===================================================================
RCS file: patches/patch-winpr_pc_in
diff -N patches/patch-winpr_pc_in
--- patches/patch-winpr_pc_in   7 Nov 2015 05:55:08 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-$OpenBSD: patch-winpr_pc_in,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
---- winpr.pc.in.orig   Fri Sep 12 00:46:32 2014
-+++ winpr.pc.in        Thu Oct 29 07:55:29 2015
-@@ -11,5 +11,5 @@ Version: @WINPR_VERSION_FULL@
- Requires: 
- Requires.private: zlib libssl
- Libs: -L${libdir} ${libs}
--Libs.private: -ldl -lrt -lm -lpthread
-+Libs.private: -lm -lpthread
- Cflags: -I${includedir}
Index: patches/patch-winpr_winpr_pc_in
===================================================================
RCS file: patches/patch-winpr_winpr_pc_in
diff -N patches/patch-winpr_winpr_pc_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-winpr_winpr_pc_in     27 Apr 2018 16:08:24 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: winpr/winpr.pc.in
+--- winpr/winpr.pc.in.orig
++++ winpr/winpr.pc.in
+@@ -11,5 +11,5 @@ Version: @WINPR_VERSION@
+ Requires:
+ Requires.private: libssl
+ Libs: -L${libdir} ${libs}
+-Libs.private: -ldl -lrt -lm -lpthread
++Libs.private: -lm -lpthread
+ Cflags: -I${includedir}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/freerdp/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST   21 Nov 2015 10:04:32 -0000      1.7
+++ pkg/PLIST   27 Apr 2018 16:08:24 -0000
@@ -1,250 +1,236 @@
 @comment $OpenBSD: PLIST,v 1.7 2015/11/21 10:04:32 ajacoutot Exp $
 @pkgpath x11/freerdp,no_cups
+@bin bin/winpr-hash
+@bin bin/winpr-makecert
 @bin bin/xfreerdp
-include/freerdp/
-include/freerdp/addin.h
-include/freerdp/altsec.h
-include/freerdp/api.h
-include/freerdp/assistance.h
-include/freerdp/cache/
-include/freerdp/cache/bitmap.h
-include/freerdp/cache/brush.h
-include/freerdp/cache/cache.h
-include/freerdp/cache/glyph.h
-include/freerdp/cache/nine_grid.h
-include/freerdp/cache/offscreen.h
-include/freerdp/cache/palette.h
-include/freerdp/cache/pointer.h
-include/freerdp/channels/
-include/freerdp/channels/audin.h
-include/freerdp/channels/channels.h
-include/freerdp/channels/cliprdr.h
-include/freerdp/channels/encomsp.h
-include/freerdp/channels/log.h
-include/freerdp/channels/rail.h
-include/freerdp/channels/rdpdr.h
-include/freerdp/channels/rdpgfx.h
-include/freerdp/channels/rdpsnd.h
-include/freerdp/channels/remdesk.h
-include/freerdp/channels/tsmf.h
-include/freerdp/channels/wtsvc.h
-include/freerdp/client/
-include/freerdp/client.h
-include/freerdp/client/audin.h
-include/freerdp/client/channels.h
-include/freerdp/client/cliprdr.h
-include/freerdp/client/cmdline.h
-include/freerdp/client/disp.h
-include/freerdp/client/drdynvc.h
-include/freerdp/client/encomsp.h
-include/freerdp/client/file.h
-include/freerdp/client/rail.h
-include/freerdp/client/rdpei.h
-include/freerdp/client/rdpgfx.h
-include/freerdp/client/rdpsnd.h
-include/freerdp/client/remdesk.h
-include/freerdp/client/tsmf.h
-include/freerdp/codec/
-include/freerdp/codec/audio.h
-include/freerdp/codec/bitmap.h
-include/freerdp/codec/bulk.h
-include/freerdp/codec/clear.h
-include/freerdp/codec/color.h
-include/freerdp/codec/dsp.h
-include/freerdp/codec/h264.h
-include/freerdp/codec/interleaved.h
-include/freerdp/codec/jpeg.h
-include/freerdp/codec/mppc.h
-include/freerdp/codec/ncrush.h
-include/freerdp/codec/nsc.h
-include/freerdp/codec/planar.h
-include/freerdp/codec/progressive.h
-include/freerdp/codec/region.h
-include/freerdp/codec/rfx.h
-include/freerdp/codec/xcrush.h
-include/freerdp/codec/zgfx.h
-include/freerdp/codecs.h
-include/freerdp/constants.h
-include/freerdp/crypto/
-include/freerdp/crypto/ber.h
-include/freerdp/crypto/certificate.h
-include/freerdp/crypto/crypto.h
-include/freerdp/crypto/der.h
-include/freerdp/crypto/er.h
-include/freerdp/crypto/per.h
-include/freerdp/crypto/tls.h
-include/freerdp/dvc.h
-include/freerdp/error.h
-include/freerdp/event.h
-include/freerdp/extension.h
-include/freerdp/freerdp.h
-include/freerdp/gdi/
-include/freerdp/gdi/16bpp.h
-include/freerdp/gdi/32bpp.h
-include/freerdp/gdi/8bpp.h
-include/freerdp/gdi/bitmap.h
-include/freerdp/gdi/brush.h
-include/freerdp/gdi/clipping.h
-include/freerdp/gdi/dc.h
-include/freerdp/gdi/drawing.h
-include/freerdp/gdi/gdi.h
-include/freerdp/gdi/line.h
-include/freerdp/gdi/palette.h
-include/freerdp/gdi/pen.h
-include/freerdp/gdi/region.h
-include/freerdp/gdi/shape.h
-include/freerdp/graphics.h
-include/freerdp/input.h
-include/freerdp/listener.h
-include/freerdp/locale/
-include/freerdp/locale/keyboard.h
-include/freerdp/locale/locale.h
-include/freerdp/locale/timezone.h
-include/freerdp/log.h
-include/freerdp/message.h
-include/freerdp/metrics.h
-include/freerdp/peer.h
-include/freerdp/pointer.h
-include/freerdp/primary.h
-include/freerdp/primitives.h
-include/freerdp/rail/
-include/freerdp/rail.h
-include/freerdp/rail/icon.h
-include/freerdp/rail/rail.h
-include/freerdp/rail/window.h
-include/freerdp/rail/window_list.h
-include/freerdp/scancode.h
-include/freerdp/secondary.h
-include/freerdp/server/
-include/freerdp/server/audin.h
-include/freerdp/server/channels.h
-include/freerdp/server/cliprdr.h
-include/freerdp/server/drdynvc.h
-include/freerdp/server/echo.h
-include/freerdp/server/encomsp.h
-include/freerdp/server/rdpdr.h
-include/freerdp/server/rdpsnd.h
-include/freerdp/server/remdesk.h
-include/freerdp/server/shadow.h
-include/freerdp/settings.h
-include/freerdp/svc.h
-include/freerdp/types.h
-include/freerdp/update.h
-include/freerdp/utils/
-include/freerdp/utils/debug.h
-include/freerdp/utils/event.h
-include/freerdp/utils/msusb.h
-include/freerdp/utils/passphrase.h
-include/freerdp/utils/pcap.h
-include/freerdp/utils/profiler.h
-include/freerdp/utils/rail.h
-include/freerdp/utils/ringbuffer.h
-include/freerdp/utils/signal.h
-include/freerdp/utils/stopwatch.h
-include/freerdp/utils/svc_plugin.h
-include/freerdp/utils/tcp.h
-include/freerdp/utils/time.h
-include/freerdp/utils/uds.h
-include/freerdp/version.h
-include/freerdp/window.h
-include/winpr/
-include/winpr/asn1.h
-include/winpr/bcrypt.h
-include/winpr/bitstream.h
-include/winpr/cmdline.h
-include/winpr/collections.h
-include/winpr/comm.h
-include/winpr/credentials.h
-include/winpr/credui.h
-include/winpr/crt.h
-include/winpr/crypto.h
-include/winpr/debug.h
-include/winpr/dsparse.h
-include/winpr/endian.h
-include/winpr/environment.h
-include/winpr/error.h
-include/winpr/file.h
-include/winpr/handle.h
-include/winpr/heap.h
-include/winpr/image.h
-include/winpr/ini.h
-include/winpr/input.h
-include/winpr/interlocked.h
-include/winpr/io.h
-include/winpr/library.h
-include/winpr/locale.h
-include/winpr/memory.h
-include/winpr/midl.h
-include/winpr/ndr.h
-include/winpr/nt.h
-include/winpr/ntlm.h
-include/winpr/path.h
-include/winpr/pipe.h
-include/winpr/platform.h
-include/winpr/pool.h
-include/winpr/print.h
-include/winpr/registry.h
-include/winpr/rpc.h
-include/winpr/sam.h
-include/winpr/schannel.h
-include/winpr/security.h
-include/winpr/smartcard.h
-include/winpr/spec.h
-include/winpr/ssl.h
-include/winpr/sspi.h
-include/winpr/sspicli.h
-include/winpr/stream.h
-include/winpr/string.h
-include/winpr/synch.h
-include/winpr/sysinfo.h
-include/winpr/tchar.h
-include/winpr/thread.h
-include/winpr/timezone.h
-include/winpr/tools/
-include/winpr/tools/makecert.h
-include/winpr/windows.h
-include/winpr/winhttp.h
-include/winpr/winpr.h
-include/winpr/winsock.h
-include/winpr/wlog.h
-include/winpr/wnd.h
-include/winpr/wtsapi.h
-include/winpr/wtypes.h
-lib/cmake/
-lib/cmake/FreeRDP/
-lib/cmake/FreeRDP/FreeRDPConfig.cmake
-lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake
-lib/cmake/FreeRDP/FreeRDPTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/FreeRDP/FreeRDPTargets.cmake
-lib/cmake/WinPR/
-lib/cmake/WinPR/WinPRConfig.cmake
-lib/cmake/WinPR/WinPRConfigVersion.cmake
-lib/cmake/WinPR/WinPRTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/WinPR/WinPRTargets.cmake
-lib/freerdp/
-lib/freerdp/audin-client.a
-lib/freerdp/cliprdr-client.a
-lib/freerdp/disp-client.a
-lib/freerdp/drdynvc-client.a
-lib/freerdp/echo-client.a
-lib/freerdp/encomsp-client.a
-lib/freerdp/parallel-client.a
-lib/freerdp/printer-client.a
-lib/freerdp/rail-client.a
-lib/freerdp/rdpdr-client.a
-lib/freerdp/rdpei-client.a
-lib/freerdp/rdpgfx-client.a
-lib/freerdp/rdpsnd-client.a
-lib/freerdp/remdesk-client.a
-lib/freerdp/serial-client.a
-lib/freerdp/smartcard-client.a
-lib/freerdp/tsmf-client-ffmpeg-decoder.a
-lib/freerdp/tsmf-client.a
-@lib lib/libfreerdp-client.so.${LIBfreerdp-client_VERSION}
-@lib lib/libfreerdp.so.${LIBfreerdp_VERSION}
-lib/libwinpr-makecert-tool.a
-@lib lib/libwinpr.so.${LIBwinpr_VERSION}
-@lib lib/libxfreerdp-client.so.${LIBxfreerdp-client_VERSION}
-lib/pkgconfig/freerdp.pc
-lib/pkgconfig/winpr.pc
+include/freerdp2/
+include/freerdp2/freerdp/
+include/freerdp2/freerdp/addin.h
+include/freerdp2/freerdp/altsec.h
+include/freerdp2/freerdp/api.h
+include/freerdp2/freerdp/assistance.h
+include/freerdp2/freerdp/autodetect.h
+include/freerdp2/freerdp/build-config.h
+include/freerdp2/freerdp/cache/
+include/freerdp2/freerdp/cache/bitmap.h
+include/freerdp2/freerdp/cache/brush.h
+include/freerdp2/freerdp/cache/cache.h
+include/freerdp2/freerdp/cache/glyph.h
+include/freerdp2/freerdp/cache/nine_grid.h
+include/freerdp2/freerdp/cache/offscreen.h
+include/freerdp2/freerdp/cache/palette.h
+include/freerdp2/freerdp/cache/pointer.h
+include/freerdp2/freerdp/channels/
+include/freerdp2/freerdp/channels/audin.h
+include/freerdp2/freerdp/channels/channels.h
+include/freerdp2/freerdp/channels/cliprdr.h
+include/freerdp2/freerdp/channels/encomsp.h
+include/freerdp2/freerdp/channels/log.h
+include/freerdp2/freerdp/channels/rail.h
+include/freerdp2/freerdp/channels/rdpdr.h
+include/freerdp2/freerdp/channels/rdpei.h
+include/freerdp2/freerdp/channels/rdpgfx.h
+include/freerdp2/freerdp/channels/rdpsnd.h
+include/freerdp2/freerdp/channels/remdesk.h
+include/freerdp2/freerdp/channels/tsmf.h
+include/freerdp2/freerdp/channels/wtsvc.h
+include/freerdp2/freerdp/client/
+include/freerdp2/freerdp/client.h
+include/freerdp2/freerdp/client/audin.h
+include/freerdp2/freerdp/client/channels.h
+include/freerdp2/freerdp/client/cliprdr.h
+include/freerdp2/freerdp/client/cmdline.h
+include/freerdp2/freerdp/client/disp.h
+include/freerdp2/freerdp/client/drdynvc.h
+include/freerdp2/freerdp/client/encomsp.h
+include/freerdp2/freerdp/client/file.h
+include/freerdp2/freerdp/client/rail.h
+include/freerdp2/freerdp/client/rdpei.h
+include/freerdp2/freerdp/client/rdpgfx.h
+include/freerdp2/freerdp/client/rdpsnd.h
+include/freerdp2/freerdp/client/remdesk.h
+include/freerdp2/freerdp/client/sshagent.h
+include/freerdp2/freerdp/client/tsmf.h
+include/freerdp2/freerdp/codec/
+include/freerdp2/freerdp/codec/audio.h
+include/freerdp2/freerdp/codec/bitmap.h
+include/freerdp2/freerdp/codec/bulk.h
+include/freerdp2/freerdp/codec/clear.h
+include/freerdp2/freerdp/codec/color.h
+include/freerdp2/freerdp/codec/dsp.h
+include/freerdp2/freerdp/codec/h264.h
+include/freerdp2/freerdp/codec/interleaved.h
+include/freerdp2/freerdp/codec/jpeg.h
+include/freerdp2/freerdp/codec/mppc.h
+include/freerdp2/freerdp/codec/ncrush.h
+include/freerdp2/freerdp/codec/nsc.h
+include/freerdp2/freerdp/codec/planar.h
+include/freerdp2/freerdp/codec/progressive.h
+include/freerdp2/freerdp/codec/region.h
+include/freerdp2/freerdp/codec/rfx.h
+include/freerdp2/freerdp/codec/xcrush.h
+include/freerdp2/freerdp/codec/zgfx.h
+include/freerdp2/freerdp/codecs.h
+include/freerdp2/freerdp/constants.h
+include/freerdp2/freerdp/crypto/
+include/freerdp2/freerdp/crypto/ber.h
+include/freerdp2/freerdp/crypto/certificate.h
+include/freerdp2/freerdp/crypto/crypto.h
+include/freerdp2/freerdp/crypto/der.h
+include/freerdp2/freerdp/crypto/er.h
+include/freerdp2/freerdp/crypto/per.h
+include/freerdp2/freerdp/crypto/tls.h
+include/freerdp2/freerdp/dvc.h
+include/freerdp2/freerdp/error.h
+include/freerdp2/freerdp/event.h
+include/freerdp2/freerdp/extension.h
+include/freerdp2/freerdp/freerdp.h
+include/freerdp2/freerdp/gdi/
+include/freerdp2/freerdp/gdi/bitmap.h
+include/freerdp2/freerdp/gdi/dc.h
+include/freerdp2/freerdp/gdi/gdi.h
+include/freerdp2/freerdp/gdi/gfx.h
+include/freerdp2/freerdp/gdi/pen.h
+include/freerdp2/freerdp/gdi/region.h
+include/freerdp2/freerdp/gdi/shape.h
+include/freerdp2/freerdp/graphics.h
+include/freerdp2/freerdp/input.h
+include/freerdp2/freerdp/listener.h
+include/freerdp2/freerdp/locale/
+include/freerdp2/freerdp/locale/keyboard.h
+include/freerdp2/freerdp/locale/locale.h
+include/freerdp2/freerdp/log.h
+include/freerdp2/freerdp/message.h
+include/freerdp2/freerdp/metrics.h
+include/freerdp2/freerdp/peer.h
+include/freerdp2/freerdp/pointer.h
+include/freerdp2/freerdp/primary.h
+include/freerdp2/freerdp/primitives.h
+include/freerdp2/freerdp/rail.h
+include/freerdp2/freerdp/scancode.h
+include/freerdp2/freerdp/secondary.h
+include/freerdp2/freerdp/server/
+include/freerdp2/freerdp/server/audin.h
+include/freerdp2/freerdp/server/channels.h
+include/freerdp2/freerdp/server/cliprdr.h
+include/freerdp2/freerdp/server/drdynvc.h
+include/freerdp2/freerdp/server/echo.h
+include/freerdp2/freerdp/server/encomsp.h
+include/freerdp2/freerdp/server/rdpdr.h
+include/freerdp2/freerdp/server/rdpei.h
+include/freerdp2/freerdp/server/rdpgfx.h
+include/freerdp2/freerdp/server/rdpsnd.h
+include/freerdp2/freerdp/server/remdesk.h
+include/freerdp2/freerdp/server/shadow.h
+include/freerdp2/freerdp/session.h
+include/freerdp2/freerdp/settings.h
+include/freerdp2/freerdp/svc.h
+include/freerdp2/freerdp/types.h
+include/freerdp2/freerdp/update.h
+include/freerdp2/freerdp/utils/
+include/freerdp2/freerdp/utils/msusb.h
+include/freerdp2/freerdp/utils/passphrase.h
+include/freerdp2/freerdp/utils/pcap.h
+include/freerdp2/freerdp/utils/profiler.h
+include/freerdp2/freerdp/utils/ringbuffer.h
+include/freerdp2/freerdp/utils/signal.h
+include/freerdp2/freerdp/utils/stopwatch.h
+include/freerdp2/freerdp/version.h
+include/freerdp2/freerdp/window.h
+include/winpr2/
+include/winpr2/winpr/
+include/winpr2/winpr/asn1.h
+include/winpr2/winpr/bcrypt.h
+include/winpr2/winpr/bitstream.h
+include/winpr2/winpr/clipboard.h
+include/winpr2/winpr/cmdline.h
+include/winpr2/winpr/collections.h
+include/winpr2/winpr/comm.h
+include/winpr2/winpr/credentials.h
+include/winpr2/winpr/credui.h
+include/winpr2/winpr/crt.h
+include/winpr2/winpr/crypto.h
+include/winpr2/winpr/debug.h
+include/winpr2/winpr/dsparse.h
+include/winpr2/winpr/endian.h
+include/winpr2/winpr/environment.h
+include/winpr2/winpr/error.h
+include/winpr2/winpr/file.h
+include/winpr2/winpr/handle.h
+include/winpr2/winpr/heap.h
+include/winpr2/winpr/image.h
+include/winpr2/winpr/ini.h
+include/winpr2/winpr/input.h
+include/winpr2/winpr/interlocked.h
+include/winpr2/winpr/intrin.h
+include/winpr2/winpr/io.h
+include/winpr2/winpr/library.h
+include/winpr2/winpr/locale.h
+include/winpr2/winpr/memory.h
+include/winpr2/winpr/midl.h
+include/winpr2/winpr/ndr.h
+include/winpr2/winpr/nt.h
+include/winpr2/winpr/ntlm.h
+include/winpr2/winpr/pack.h
+include/winpr2/winpr/path.h
+include/winpr2/winpr/pipe.h
+include/winpr2/winpr/platform.h
+include/winpr2/winpr/pool.h
+include/winpr2/winpr/print.h
+include/winpr2/winpr/registry.h
+include/winpr2/winpr/rpc.h
+include/winpr2/winpr/sam.h
+include/winpr2/winpr/schannel.h
+include/winpr2/winpr/security.h
+include/winpr2/winpr/shell.h
+include/winpr2/winpr/smartcard.h
+include/winpr2/winpr/spec.h
+include/winpr2/winpr/ssl.h
+include/winpr2/winpr/sspi.h
+include/winpr2/winpr/sspicli.h
+include/winpr2/winpr/stream.h
+include/winpr2/winpr/string.h
+include/winpr2/winpr/synch.h
+include/winpr2/winpr/sysinfo.h
+include/winpr2/winpr/tchar.h
+include/winpr2/winpr/thread.h
+include/winpr2/winpr/timezone.h
+include/winpr2/winpr/tools/
+include/winpr2/winpr/tools/makecert.h
+include/winpr2/winpr/user.h
+include/winpr2/winpr/version.h
+include/winpr2/winpr/windows.h
+include/winpr2/winpr/winhttp.h
+include/winpr2/winpr/winpr.h
+include/winpr2/winpr/winsock.h
+include/winpr2/winpr/wlog.h
+include/winpr2/winpr/wnd.h
+include/winpr2/winpr/wtsapi.h
+include/winpr2/winpr/wtypes.h
+lib/cmake/FreeRDP-Client2/
+lib/cmake/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
+lib/cmake/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
+lib/cmake/FreeRDP-Client2/FreeRDP-ClientTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/FreeRDP-Client2/FreeRDP-ClientTargets.cmake
+lib/cmake/FreeRDP2/
+lib/cmake/FreeRDP2/FreeRDPConfig.cmake
+lib/cmake/FreeRDP2/FreeRDPConfigVersion.cmake
+lib/cmake/FreeRDP2/FreeRDPTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/FreeRDP2/FreeRDPTargets.cmake
+lib/cmake/WinPR2/
+lib/cmake/WinPR2/WinPRConfig.cmake
+lib/cmake/WinPR2/WinPRConfigVersion.cmake
+lib/cmake/WinPR2/WinPRTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/WinPR2/WinPRTargets.cmake
+@lib lib/libfreerdp-client2.so.${LIBfreerdp-client2_VERSION}
+@lib lib/libfreerdp2.so.${LIBfreerdp2_VERSION}
+@lib lib/libwinpr-tools2.so.${LIBwinpr-tools2_VERSION}
+@lib lib/libwinpr2.so.${LIBwinpr2_VERSION}
+lib/pkgconfig/freerdp-client2.pc
+lib/pkgconfig/freerdp2.pc
+lib/pkgconfig/winpr-tools2.pc
+lib/pkgconfig/winpr2.pc
+@man man/man1/winpr-hash.1
+@man man/man1/winpr-makecert.1
 @man man/man1/xfreerdp.1
+@man man/man7/wlog.7

Attachment: signature.asc
Description: PGP signature

Reply via email to