[Midnightbsd-cvs] mports [23472] trunk/net/freerdp: update to 2.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 10 15:44:20 EDT 2018
Revision: 23472
http://svnweb.midnightbsd.org/mports/?rev=23472
Author: laffer1
Date: 2018-05-10 15:44:19 -0400 (Thu, 10 May 2018)
Log Message:
-----------
update to 2.0
Modified Paths:
--------------
trunk/net/freerdp/Makefile
trunk/net/freerdp/distinfo
trunk/net/freerdp/pkg-descr
trunk/net/freerdp/pkg-plist
Added Paths:
-----------
trunk/net/freerdp/files/patch-CMakeLists.txt
trunk/net/freerdp/files/patch-client_Wayland_CMakeLists.txt
trunk/net/freerdp/files/patch-client_X11_CMakeLists.txt
trunk/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake
trunk/net/freerdp/files/patch-ffmpeg29
trunk/net/freerdp/files/patch-libfreerdp_core_nla.c
trunk/net/freerdp/files/patch-libfreerdp_crypto_tls.c
trunk/net/freerdp/files/patch-libfreerdp_freerdp.pc.in
trunk/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt
trunk/net/freerdp/files/patch-uwac_libuwac_uwac-os.c
trunk/net/freerdp/files/patch-winpr_CMakeLists.txt
trunk/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c
trunk/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c
trunk/net/freerdp/files/patch-winpr_tools_hash-cli_CMakeLists.txt
trunk/net/freerdp/files/patch-winpr_tools_makecert-cli_CMakeLists.txt
trunk/net/freerdp/files/patch-winpr_tools_makecert_makecert.c
trunk/net/freerdp/files/patch-winpr_winpr.pc.in
Removed Paths:
-------------
trunk/net/freerdp/files/patch-cmake-FindOpenSSL.cmake
trunk/net/freerdp/files/patch-freerdp.pc.in
trunk/net/freerdp/files/patch-git_1b663cef
trunk/net/freerdp/files/patch-git_434436b7
trunk/net/freerdp/files/patch-libfreerdp-locale-timezone.c
trunk/net/freerdp/files/patch-winpr.pc.in
trunk/net/freerdp/files/patch-z001-CMakeLists.txt
Modified: trunk/net/freerdp/Makefile
===================================================================
--- trunk/net/freerdp/Makefile 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/Makefile 2018-05-10 19:44:19 UTC (rev 23472)
@@ -3,8 +3,8 @@
# $MidnightBSD$
PORTNAME= freerdp
-PORTVERSION= 1.2.0
-PORTREVISION= 1
+DISTVERSION= 2.0.0-rc1
+PORTREVISION= 3
CATEGORIES= net comms ipv6
MAINTAINER= ports at MidnightBSD.org
@@ -14,72 +14,85 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_OPENSSL= yes
+USES= alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig
USE_LDCONFIG= yes
-USES= alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib
+CPE_VENDOR= freerdp_project
+
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
GH_PROJECT= ${GH_ACCOUNT}
-GH_TAGNAME= f5ff6e1
-WRKSRC= ${WRKDIR}/FreeRDP-f5ff6e1
+CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
-CPE_VENDOR= freerdp_project
+CMAKE_ARGS_aarch64= -DWITH_NEON=ON
+CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang
-LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
-
-OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
-OPTIONS_DEFAULT= CUPS GSTREAMER X11
+OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
+ PULSEAUDIO X11
+OPTIONS_DEFAULT= CUPS GSTREAMER ICU KERBEROS MANPAGES X11
OPTIONS_SUB= yes
-ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_CMAKE_ON= -DWITH_ALSA=ON
-ALSA_CMAKE_OFF= -DWITH_ALSA=OFF
+OPTIONS_DEFINE_armv6= NEON
+OPTIONS_DEFINE_armv7= NEON
+OPTIONS_DEFINE_amd64= SSE
+OPTIONS_DEFINE_i386= SSE
+OPTIONS_DEFAULT_amd64= SSE
-CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups
-CUPS_CMAKE_ON= -DWITH_CUPS=ON
-CUPS_CMAKE_OFF= -DWITH_CUPS=OFF
+ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
+ALSA_CMAKE_BOOL= WITH_ALSA
-# outdated and unmaintained upstream
-DIRECTFB_DESC= Build FreeRDP DirectFB client (outdated)
-DIRECTFB_LIB_DEPENDS= libdirectfb.so:${PORTSDIR}/devel/directfb
-DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON
-DIRECTFB_CMAKE_OFF= -DWITH_DIRECTFB=OFF
-# currently DirectFB option fails with clang
-DIRECTFB_USE= gcc=yes
+CUPS_LIB_DEPENDS= libcups.so:print/cups
+CUPS_CMAKE_BOOL= WITH_CUPS
-FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
- libavutil.so:${PORTSDIR}/multimedia/ffmpeg
-FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON
-FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF
+FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
+ libavutil.so:multimedia/ffmpeg
+FFMPEG_CMAKE_BOOL= WITH_FFMPEG
-GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
-GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
-GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr
+GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0
+GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xextproto,xrandr
+GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
-PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON
-PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF
+ICU_LIB_DEPENDS= libicuuc.so:devel/icu
+ICU_CMAKE_BOOL= WITH_ICU
-SSE_CMAKE_ON= -DWITH_SSE2=ON
-SSE_CMAKE_OFF= -DWITH_SSE2=OFF
+KERBEROS_CMAKE_BOOL= WITH_GSSAPI_HEIMDAL
+MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto
+MANPAGES_CMAKE_BOOL= WITH_MANPAGES
+MANPAGES_CMAKE_OFF= -DWITH_MANPAGES=OFF
+
+NEON_DESC= Enable Media Processing Engine instructions
+NEON_CMAKE_BOOL= WITH_NEON
+.if ! ${CFLAGS:M-march*}
+NEON_CFLAGS= -march=armv7-a
+.endif
+
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL= WITH_PULSE
+
+SSE_CMAKE_BOOL= WITH_SSE2
+
X11_DESC= Build FreeRDP X11 client
-X11_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto
-X11_CMAKE_ON= -DWITH_X11=ON
-X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF
-X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes
+X11_CMAKE_BOOL= WITH_X11
+X11_CMAKE_OFF= -DWITH_XKBFILE=OFF
+X11_USE= xorg=x11,xcursor,xext,xextproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
-.include <bsd.mport.options.mk>
+.include <bsd.port.pre.mk>
-post-extract:
- ${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
- -e '/CMAKE_INSTALL_RPATH /d' \
+post-patch:
+ @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
${WRKSRC}/CMakeLists.txt
- ${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
- ${WRKSRC}/client/X11/CMakeLists.txt
- ${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__MidnightBSD__)/' \
+ @${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \
+ ${WRKSRC}/winpr/CMakeLists.txt
+ @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
- ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
- ${WRKSRC}/channels/drive/client/statvfs.c
-.include <bsd.port.mk>
+ @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
+ @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \
+ ${WRKSRC}/client/CMakeLists.txt \
+ ${WRKSRC}/winpr/CMakeLists.txt \
+ ${WRKSRC}/uwac/CMakeLists.txt \
+ ${WRKSRC}/server/CMakeLists.txt \
+ ${WRKSRC}/server/shadow/CMakeLists.txt \
+ ${WRKSRC}/libfreerdp/CMakeLists.txt
+
+.include <bsd.port.post.mk>
Modified: trunk/net/freerdp/distinfo
===================================================================
--- trunk/net/freerdp/distinfo 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/distinfo 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,2 +1,3 @@
-SHA256 (freerdp-1.2.0_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32
-SIZE (freerdp-1.2.0_GH0.tar.gz) = 6033856
+TIMESTAMP = 1525981134
+SHA256 (freerdp-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2
+SIZE (freerdp-2.0.0-rc1_GH0.tar.gz) = 6530403
Added: trunk/net/freerdp/files/patch-CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig 2016-11-24 13:19:47 UTC
++++ CMakeLists.txt
+@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+ endif()
+ endif()
+
++if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
++ set(BSD TRUE)
++ set(FREEBSD TRUE)
++endif()
++
+ # Configure MSVC Runtime
+ if(MSVC)
+ include(MSVCRuntime)
Property changes on: trunk/net/freerdp/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-client_Wayland_CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-client_Wayland_CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-client_Wayland_CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,16 @@
+--- client/Wayland/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
++++ client/Wayland/CMakeLists.txt
+@@ -39,5 +39,12 @@ target_link_libraries(${MODULE_NAME} ${$
+ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
+
+ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
++
++if(WITH_MANPAGES)
+ configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1)
+-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
++ if(BSD)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 DESTINATION man/man1)
++ else()
++ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
++ endif()
++endif(WITH_MANPAGES)
Property changes on: trunk/net/freerdp/files/patch-client_Wayland_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-client_X11_CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-client_X11_CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-client_X11_CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,15 @@
+--- client/X11/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
++++ client/X11/CMakeLists.txt
+@@ -111,7 +111,11 @@ if(WITH_MANPAGES)
+ add_custom_target(xfreerdp.manpage ALL
+ DEPENDS xfreerdp.1)
+
+- install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
++ if(BSD)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION man/man1)
++ else()
++ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
++ endif()
+ else()
+ message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed")
+ endif()
Property changes on: trunk/net/freerdp/files/patch-client_X11_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net/freerdp/files/patch-cmake-FindOpenSSL.cmake
===================================================================
--- trunk/net/freerdp/files/patch-cmake-FindOpenSSL.cmake 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-cmake-FindOpenSSL.cmake 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,11 +0,0 @@
---- cmake/FindOpenSSL.cmake.orig 2013-07-10 04:00:21.000000000 -0400
-+++ cmake/FindOpenSSL.cmake 2015-03-25 19:26:35.154024000 -0400
-@@ -270,7 +270,7 @@
- set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
- elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
- file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
- # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
- # The status gives if this is a developer or prerelease and is ignored here.
Added: trunk/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake
===================================================================
--- trunk/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (rev 0)
+++ trunk/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,16 @@
+Don't use custom code to find the include dirs for gstreamer 1.0 (core).
+Since 1.6.0 there are multiple include paths. So use pkg-config to find
+which. IMO the rest of this file should use pkg-config....
+
+--- cmake/FindGStreamer_1_0.cmake.orig 2016-10-21 07:29:51 UTC
++++ cmake/FindGStreamer_1_0.cmake
+@@ -78,7 +78,8 @@ endmacro()
+ # 1.1. Find headers and libraries
+ set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
+ find_package(Glib REQUIRED)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
++#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
++pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
+ FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
+
+ # 1.2. Check Gstreamer version
Property changes on: trunk/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-ffmpeg29
===================================================================
--- trunk/net/freerdp/files/patch-ffmpeg29 (rev 0)
+++ trunk/net/freerdp/files/patch-ffmpeg29 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,38 @@
+--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-10-21 07:29:51 UTC
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
+ av_picture_copy((AVPicture*) frame, (AVPicture*) mdecoder->frame,
+ mdecoder->codec_context->pix_fmt,
+ mdecoder->codec_context->width, mdecoder->codec_context->height);
+- av_free(frame);
++ av_frame_free(&frame);
+ }
+
+ return ret;
+@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
+ decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);
+ memcpy(dst, decoded_frame->data[0], frame_size);
+ }
+- av_free(decoded_frame);
++ av_frame_free(&decoded_frame);
+ }
+ #endif
+ if (len <= 0 || frame_size <= 0)
+@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
+ {
+ TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+ if (mdecoder->frame)
+- av_free(mdecoder->frame);
++ av_frame_free(&mdecoder->frame);
+
+ free(mdecoder->decoded_data);
+
+@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
+ avcodec_close(mdecoder->codec_context);
+
+ free(mdecoder->codec_context->extradata);
+- av_free(mdecoder->codec_context);
++ av_frame_free(&mdecoder->codec_context);
+ }
+ free(decoder);
+ }
Property changes on: trunk/net/freerdp/files/patch-ffmpeg29
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net/freerdp/files/patch-freerdp.pc.in
===================================================================
--- trunk/net/freerdp/files/patch-freerdp.pc.in 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-freerdp.pc.in 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,13 +0,0 @@
-Index: freerdp.pc.in
-diff -u freerdp.pc.in.orig freerdp.pc.in
---- freerdp.pc.in.orig 2014-09-12 07:46:32.000000000 +0900
-+++ freerdp.pc.in 2015-05-26 02:05:37.874925433 +0900
-@@ -9,7 +9,7 @@
- URL: http://www.freerdp.com/
- Version: @FREERDP_VERSION_FULL@
- Requires:
--Requires.private: winpr zlib libssl
-+Requires.private: winpr
- Libs: -L${libdir} ${libs}
- Libs.private: -ldl -lpthread
- Cflags: -I${includedir}
Deleted: trunk/net/freerdp/files/patch-git_1b663cef
===================================================================
--- trunk/net/freerdp/files/patch-git_1b663cef 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-git_1b663cef 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,57 +0,0 @@
-The patch below comes from upstream and has been slightly adjusted to apply
-on the tarball we build.
-
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz at shacknet.at>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
-* fix problem with REMOVE_DUPLICATES on undefined lists
-* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
- previously - necessary adoptions for regex and matches done. Should
- work with all cmake versions.
-
-Tested with 3.1.0-rc3
---- channels/CMakeLists.txt
-+++ channels/CMakeLists.txt
-@@ -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})
---- channels/client/CMakeLists.txt
-+++ channels/client/CMakeLists.txt
-@@ -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})
---- third-party/CMakeLists.txt
-+++ third-party/CMakeLists.txt
-@@ -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)
Deleted: trunk/net/freerdp/files/patch-git_434436b7
===================================================================
--- trunk/net/freerdp/files/patch-git_434436b7 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-git_434436b7 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,74 +0,0 @@
-From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001
-From: ivan-83 <rozhuk.im at gmail.com>
-Date: Tue, 10 Mar 2015 01:21:28 +0300
-Subject: [PATCH] * BSD/FreeBSD build fix
-
----
- CMakeLists.txt | 14 ++++++++++++++
- winpr/libwinpr/synch/wait.c | 2 +-
- winpr/libwinpr/sysinfo/sysinfo.c | 1 +
- winpr/libwinpr/utils/CMakeLists.txt | 4 ++++
- 4 files changed, 20 insertions(+), 1 deletion(-)
-
-diff CMakeLists.txt CMakeLists.txt
-index 0a9144a..386ae67 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -358,6 +358,14 @@ if(APPLE)
- endif()
- endif(APPLE)
-
-+# BSD
-+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-+ set(BSD TRUE)
-+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ set(FREEBSD TRUE)
-+ endif()
-+endif()
-+
- # Android
- if(ANDROID)
- set(WITH_LIBRARY_VERSIONING "OFF")
-@@ -618,6 +626,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions")
- 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")
-diff winpr/libwinpr/sysinfo/sysinfo.c winpr/libwinpr/sysinfo/sysinfo.c
-index 1529d54..457ab9d 100644
---- winpr/libwinpr/sysinfo/sysinfo.c
-+++ winpr/libwinpr/sysinfo/sysinfo.c
-@@ -54,6 +54,7 @@
- #ifndef _WIN32
-
- #include <time.h>
-+#include <sys/time.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff winpr/libwinpr/utils/CMakeLists.txt winpr/libwinpr/utils/CMakeLists.txt
-index e524bf9..501f605 100644
---- winpr/libwinpr/utils/CMakeLists.txt
-+++ winpr/libwinpr/utils/CMakeLists.txt
-@@ -113,6 +113,10 @@ if(UNIX)
- winpr_library_add(m)
- endif()
-
-+if(BSD)
-+ winpr_library_add(execinfo)
-+endif()
-+
- if(BUILD_TESTING)
- add_subdirectory(test)
- endif()
---
-2.4.1
-
Deleted: trunk/net/freerdp/files/patch-libfreerdp-locale-timezone.c
===================================================================
--- trunk/net/freerdp/files/patch-libfreerdp-locale-timezone.c 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-libfreerdp-locale-timezone.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,42 +0,0 @@
-From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001
-From: ivan-83 <rozhuk.im at gmail.com>
-Date: Tue, 10 Mar 2015 04:40:47 +0300
-Subject: [PATCH] * FreeBSD timezone detection patch
-
----
- libfreerdp/locale/timezone.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff libfreerdp/locale/timezone.c libfreerdp/locale/timezone.c
-index 92b74e8..0375f9c 100644
---- libfreerdp/locale/timezone.c
-+++ libfreerdp/locale/timezone.c
-@@ -1521,8 +1523,11 @@ char* freerdp_get_unix_timezone_identifier()
- return tzid;
- }
-
-+#ifdef __FreeBSD__
-+ fp = fopen("/var/db/zoneinfo", "r");
-+#else
- fp = fopen("/etc/timezone", "r");
--
-+#endif
- if (fp != NULL)
- {
- fseek(fp, 0, SEEK_END);
-@@ -1678,8 +1683,10 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone)
-
- #ifdef HAVE_TM_GMTOFF
- #if defined(__FreeBSD__)
-- /*not the best solution, but could not get the right tyepcast*/
-- clientTimeZone->bias = 0;
-+ if (local_time->tm_gmtoff >= 0)
-+ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
-+ else
-+ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
- #else
- clientTimeZone->bias = timezone / 60;
- #endif
---
-2.4.1
-
Added: trunk/net/freerdp/files/patch-libfreerdp_core_nla.c
===================================================================
--- trunk/net/freerdp/files/patch-libfreerdp_core_nla.c (rev 0)
+++ trunk/net/freerdp/files/patch-libfreerdp_core_nla.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,22 @@
+--- libfreerdp/core/nla.c.orig 2018-03-21 03:26:15 UTC
++++ libfreerdp/core/nla.c
+@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla)
+ static int nla_decode_ts_request(rdpNla* nla, wStream* s)
+ {
+ int length;
++ UINT32 version = 0;
+
+ /* TSRequest */
+ if (!ber_read_sequence_tag(s, &length) ||
+ !ber_read_contextual_tag(s, 0, &length, TRUE) ||
+- !ber_read_integer(s, &nla->version))
++ !ber_read_integer(s, &version))
+ {
+ return -1;
+ }
++
++ if (version < nla->version)
++ nla->version = version;
+
+ /* [1] negoTokens (NegoData) */
+ if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
Property changes on: trunk/net/freerdp/files/patch-libfreerdp_core_nla.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-libfreerdp_crypto_tls.c
===================================================================
--- trunk/net/freerdp/files/patch-libfreerdp_crypto_tls.c (rev 0)
+++ trunk/net/freerdp/files/patch-libfreerdp_crypto_tls.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,27 @@
+--- libfreerdp/crypto/tls.c.orig 2017-07-24 08:46:54 UTC
++++ libfreerdp/crypto/tls.c
+@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying)
+ if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE))
+ return FALSE;
+
+-#ifndef OPENSSL_NO_TLSEXT
++#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_set_tlsext_host_name(tls->ssl, tls->hostname);
+ #endif
+ return tls_do_handshake(tls, TRUE);
+ }
+
+-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
++#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
+ static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,
+ int type, unsigned char* data, int len, void* arg)
+ {
+@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti
+ return FALSE;
+ }
+
+-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
++#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_set_tlsext_debug_callback(tls->ssl, tls_openssl_tlsext_debug_callback);
+ #endif
+ return tls_do_handshake(tls, FALSE) > 0;
Property changes on: trunk/net/freerdp/files/patch-libfreerdp_crypto_tls.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-libfreerdp_freerdp.pc.in
===================================================================
--- trunk/net/freerdp/files/patch-libfreerdp_freerdp.pc.in (rev 0)
+++ trunk/net/freerdp/files/patch-libfreerdp_freerdp.pc.in 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,11 @@
+--- libfreerdp/freerdp.pc.in.orig 2016-10-21 07:29:51 UTC
++++ libfreerdp/freerdp.pc.in
+@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P
+ URL: http://www.freerdp.com/
+ Version: @FREERDP_VERSION@
+ Requires:
+-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ libssl
++Requires.private: @WINPR_PKG_CONFIG_FILENAME@
+ Libs: -L${libdir} ${libs}
+ Libs.private: -ldl -lpthread
+ Cflags: -I${includedir}
Property changes on: trunk/net/freerdp/files/patch-libfreerdp_freerdp.pc.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,21 @@
+--- uwac/libuwac/CMakeLists.txt.orig 2017-11-27 16:59:34 UTC
++++ uwac/libuwac/CMakeLists.txt
+@@ -40,6 +40,9 @@ generate_protocol_file(xdg-shell)
+ generate_protocol_file(ivi-application)
+ generate_protocol_file(fullscreen-shell)
+
++find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h sys/timerfd.h HINTS /usr/local/include/libepoll-shim)
++find_library(EPOLLSHIM_LIBS NAMES epoll-shim libepoll-shim HINTS /usr/local/lib)
++include_directories(${EPOLLSHIM_INCLUDE_DIR})
+ include_directories(${WAYLAND_INCLUDE_DIR})
+ include_directories(${XKBCOMMON_INCLUDE_DIR})
+ include_directories("${CMAKE_SOURCE_DIR}/uwac/include")
+@@ -69,7 +72,7 @@ if (WITH_LIBRARY_VERSIONING)
+ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
+ endif()
+
+-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp)
++target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} ${EPOLLSHIM_LIBS} freerdp)
+
+ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
+
Property changes on: trunk/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-uwac_libuwac_uwac-os.c
===================================================================
--- trunk/net/freerdp/files/patch-uwac_libuwac_uwac-os.c (rev 0)
+++ trunk/net/freerdp/files/patch-uwac_libuwac_uwac-os.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,29 @@
+--- uwac/libuwac/uwac-os.c.orig 2017-11-27 16:54:50 UTC
++++ uwac/libuwac/uwac-os.c
+@@ -31,6 +31,7 @@
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/mman.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+@@ -153,17 +154,7 @@ static int create_tmpfile_cloexec(char *tmpname)
+ {
+ int fd;
+
+-#ifdef HAVE_MKOSTEMP
+- fd = mkostemp(tmpname, O_CLOEXEC);
+- if (fd >= 0)
+- unlink(tmpname);
+-#else
+- fd = mkstemp(tmpname);
+- if (fd >= 0) {
+- fd = set_cloexec_or_close(fd);
+- unlink(tmpname);
+- }
+-#endif
++ fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
+
+ return fd;
+ }
Property changes on: trunk/net/freerdp/files/patch-uwac_libuwac_uwac-os.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net/freerdp/files/patch-winpr.pc.in
===================================================================
--- trunk/net/freerdp/files/patch-winpr.pc.in 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-winpr.pc.in 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,12 +0,0 @@
-Index: winpr.pc.in
-diff -u winpr.pc.in.orig winpr.pc.in
---- winpr.pc.in.orig 2014-09-12 07:46:32.000000000 +0900
-+++ winpr.pc.in 2015-05-26 02:05:59.353925013 +0900
-@@ -9,7 +9,6 @@
- URL: http://www.freerdp.com/
- Version: @WINPR_VERSION_FULL@
- Requires:
--Requires.private: zlib libssl
- Libs: -L${libdir} ${libs}
- Libs.private: -ldl -lrt -lm -lpthread
- Cflags: -I${includedir}
Added: trunk/net/freerdp/files/patch-winpr_CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-winpr_CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,18 @@
+--- winpr/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
++++ winpr/CMakeLists.txt
+@@ -180,7 +180,14 @@ if(BUILD_TESTING)
+ add_subdirectory(test)
+ endif()
+
+-install_freerdp_man(wlog.7 7)
++if(WITH_MANPAGES)
++ if(BSD)
++ install(FILES wlog.7 DESTINATION man/man7)
++ else()
++ install_freerdp_man(wlog.7 7)
++ endif()
++endif(WITH_MANPAGES)
++
+ # Exporting
+
+ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
Property changes on: trunk/net/freerdp/files/patch-winpr_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c
===================================================================
--- trunk/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,29 @@
+--- winpr/libwinpr/crypto/hash.c.orig 2017-11-28 14:26:30 UTC
++++ winpr/libwinpr/crypto/hash.c
+@@ -179,7 +179,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx
+ if (!evp || !hmac)
+ return FALSE;
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+ HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
+ return TRUE;
+ #else
+@@ -215,7 +215,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* c
+ {
+ #if defined(WITH_OPENSSL)
+ HMAC_CTX* hmac = (HMAC_CTX*) ctx;
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+ HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
+ return TRUE;
+ #else
+@@ -247,7 +247,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ct
+
+ #if defined(WITH_OPENSSL)
+ hmac = (HMAC_CTX*) ctx;
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+ HMAC_Final(hmac, output, NULL); /* no return value on OpenSSL 0.9.x */
+ return TRUE;
+ #else
Property changes on: trunk/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c
===================================================================
--- trunk/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,47 @@
+--- winpr/libwinpr/utils/ssl.c.orig 2017-11-28 14:26:30 UTC
++++ winpr/libwinpr/utils/ssl.c
+@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
+ };
+
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+ static unsigned long _winpr_openssl_id(void)
+ {
+ return (unsigned long)GetCurrentThreadId();
+@@ -174,7 +174,7 @@ static BOOL _winpr_openssl_initialize_lo
+ }
+
+ /* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+
+ if (CRYPTO_get_id_callback())
+ {
+@@ -224,7 +224,7 @@ static BOOL _winpr_openssl_cleanup_locki
+ CRYPTO_set_dynlock_destroy_callback(NULL);
+ }
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+
+ if (CRYPTO_get_id_callback() == _winpr_openssl_id)
+ {
+@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_init
+
+ 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);
Property changes on: trunk/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-winpr_tools_hash-cli_CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-winpr_tools_hash-cli_CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_tools_hash-cli_CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,15 @@
+--- winpr/tools/hash-cli/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
++++ winpr/tools/hash-cli/CMakeLists.txt
+@@ -50,5 +50,11 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
+ endif()
+
+ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
++if(WITH_MANPAGES)
+ configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1)
+-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
++ if(BSD)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 DESTINATION man/man1)
++ else()
++ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
++ endif()
++endif(WITH_MANPAGES)
Property changes on: trunk/net/freerdp/files/patch-winpr_tools_hash-cli_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-winpr_tools_makecert-cli_CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-winpr_tools_makecert-cli_CMakeLists.txt (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_tools_makecert-cli_CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,15 @@
+--- winpr/tools/makecert-cli/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
++++ winpr/tools/makecert-cli/CMakeLists.txt
+@@ -51,5 +51,11 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
+ install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+ endif()
+
++if(WITH_MANPAGES)
+ configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1)
+-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
++ if(BSD)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 DESTINATION man/man1)
++ else()
++ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
++ endif()
++endif(WITH_MANPAGES)
Property changes on: trunk/net/freerdp/files/patch-winpr_tools_makecert-cli_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-winpr_tools_makecert_makecert.c
===================================================================
--- trunk/net/freerdp/files/patch-winpr_tools_makecert_makecert.c (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_tools_makecert_makecert.c 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,11 @@
+--- winpr/tools/makecert/makecert.c.orig 2017-11-28 14:26:30 UTC
++++ winpr/tools/makecert/makecert.c
+@@ -1275,7 +1275,7 @@ void makecert_context_free(MAKECERT_CONT
+ #ifdef WITH_OPENSSL
+ X509_free(context->x509);
+ EVP_PKEY_free(context->pkey);
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ CRYPTO_cleanup_all_ex_data();
+ #endif
+ #endif
Property changes on: trunk/net/freerdp/files/patch-winpr_tools_makecert_makecert.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/freerdp/files/patch-winpr_winpr.pc.in
===================================================================
--- trunk/net/freerdp/files/patch-winpr_winpr.pc.in (rev 0)
+++ trunk/net/freerdp/files/patch-winpr_winpr.pc.in 2018-05-10 19:44:19 UTC (rev 23472)
@@ -0,0 +1,10 @@
+--- winpr/winpr.pc.in.orig 2016-10-21 07:29:51 UTC
++++ winpr/winpr.pc.in
+@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run
+ URL: http://www.freerdp.com/
+ Version: @WINPR_VERSION@
+ Requires:
+-Requires.private: libssl
+ Libs: -L${libdir} ${libs}
+ Libs.private: -ldl -lrt -lm -lpthread
+ Cflags: -I${includedir}
Property changes on: trunk/net/freerdp/files/patch-winpr_winpr.pc.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net/freerdp/files/patch-z001-CMakeLists.txt
===================================================================
--- trunk/net/freerdp/files/patch-z001-CMakeLists.txt 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/files/patch-z001-CMakeLists.txt 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,13 +0,0 @@
---- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC
-+++ CMakeLists.txt
-@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
- set(FREEBSD TRUE)
- endif()
- endif()
-+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
-+ set(BSD TRUE)
-+ set(FREEBSD TRUE)
-+endif()
-
- # Android
- if(ANDROID)
Modified: trunk/net/freerdp/pkg-descr
===================================================================
--- trunk/net/freerdp/pkg-descr 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/pkg-descr 2018-05-10 19:44:19 UTC (rev 23472)
@@ -3,4 +3,4 @@
software wherever you want, the way you want it, in a world where
interoperability can finally liberate your computing experience.
-WWW: http://www.freerdp.com/
+WWW: http://www.freerdp.com
Modified: trunk/net/freerdp/pkg-plist
===================================================================
--- trunk/net/freerdp/pkg-plist 2018-05-10 18:47:16 UTC (rev 23471)
+++ trunk/net/freerdp/pkg-plist 2018-05-10 19:44:19 UTC (rev 23472)
@@ -1,248 +1,237 @@
-%%DIRECTFB%%bin/dfreerdp
+bin/winpr-hash
+bin/winpr-makecert
+%%WAYLAND%%bin/wlfreerdp
%%X11%%bin/xfreerdp
-include/freerdp/addin.h
-include/freerdp/altsec.h
-include/freerdp/api.h
-include/freerdp/assistance.h
-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/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.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/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/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/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/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.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/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/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/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/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/FreeRDP/FreeRDPConfig.cmake
-lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake
-lib/cmake/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/FreeRDP/FreeRDPTargets.cmake
-lib/cmake/WinPR/WinPRConfig.cmake
-lib/cmake/WinPR/WinPRConfigVersion.cmake
-lib/cmake/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/WinPR/WinPRTargets.cmake
-%%ALSA%%lib/freerdp/audin-client-alsa.a
-%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a
-lib/freerdp/audin-client.a
-lib/freerdp/cliprdr-client.a
-lib/freerdp/disp-client.a
-lib/freerdp/drdynvc-client.a
-lib/freerdp/drive-client.a
-lib/freerdp/echo-client.a
-lib/freerdp/encomsp-client.a
-lib/freerdp/parallel-client.a
-%%CUPS%%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
-%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a
-%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a
-lib/freerdp/rdpsnd-client.a
-lib/freerdp/remdesk-client.a
-lib/freerdp/serial-client.a
-lib/freerdp/smartcard-client.a
-%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a
-%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a
-%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a
-%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a
-lib/freerdp/tsmf-client.a
-lib/libfreerdp.so
-lib/libfreerdp.so.1.2
-lib/libfreerdp.so.1.2.0
-lib/libfreerdp-client.so
-lib/libfreerdp-client.so.1.2
-lib/libfreerdp-client.so.1.2.0
-lib/libwinpr.so
-lib/libwinpr.so.1.1
-lib/libwinpr.so.1.1.0
-lib/libwinpr-makecert-tool.a
-%%X11%%lib/libxfreerdp-client.so
-%%X11%%lib/libxfreerdp-client.so.1.2
-%%X11%%lib/libxfreerdp-client.so.1.2.0
-libdata/pkgconfig/freerdp.pc
-libdata/pkgconfig/winpr.pc
-%%X11%%man/man1/xfreerdp.1.gz
+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/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/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.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/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/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/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/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/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/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
+%%WAYLAND%%include/uwac0/uwac/uwac-tools.h
+%%WAYLAND%%include/uwac0/uwac/uwac.h
+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/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/libfreerdp-client2.so
+lib/libfreerdp-client2.so.2
+lib/libfreerdp-client2.so.2.0.0
+lib/libfreerdp2.so
+lib/libfreerdp2.so.2
+lib/libfreerdp2.so.2.0.0
+%%WAYLAND%%lib/libuwac0.so
+%%WAYLAND%%lib/libuwac0.so.0
+%%WAYLAND%%lib/libuwac0.so.0.0.1
+lib/libwinpr-tools2.so
+lib/libwinpr-tools2.so.2
+lib/libwinpr-tools2.so.2.0.0
+lib/libwinpr2.so
+lib/libwinpr2.so.2
+lib/libwinpr2.so.2.0.0
+libdata/pkgconfig/freerdp-client2.pc
+libdata/pkgconfig/freerdp2.pc
+%%WAYLAND%%libdata/pkgconfig/uwac0.pc
+libdata/pkgconfig/winpr-tools2.pc
+libdata/pkgconfig/winpr2.pc
+share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
+share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
+share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets.cmake
+share/cmake/Modules/FreeRDP2/FreeRDPConfig.cmake
+share/cmake/Modules/FreeRDP2/FreeRDPConfigVersion.cmake
+share/cmake/Modules/FreeRDP2/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/Modules/FreeRDP2/FreeRDPTargets.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwac-%%CMAKE_BUILD_TYPE%%.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwac.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfig.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfigVersion.cmake
+share/cmake/Modules/WinPR2/WinPRConfig.cmake
+share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
+share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/Modules/WinPR2/WinPRTargets.cmake
+%%MANPAGES%%man/man1/winpr-hash.1.gz
+%%MANPAGES%%man/man1/winpr-makecert.1.gz
+%%WAYLAND%%%%MANPAGES%%man/man1/wlfreerdp.1.gz
+%%X11%%%%MANPAGES%%man/man1/xfreerdp.1.gz
+%%MANPAGES%%man/man7/wlog.7.gz
More information about the Midnightbsd-cvs
mailing list