Index: head/net/freerdp/Makefile =================================================================== --- head/net/freerdp/Makefile (revision 465176) +++ head/net/freerdp/Makefile (revision 465177) @@ -1,113 +1,113 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= freerdp DISTVERSION= 2.0.0-rc1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net comms ipv6 MAINTAINER= kevans@FreeBSD.org COMMENT= Free implementation of Remote Desktop Protocol LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl USE_LDCONFIG= yes CPE_VENDOR= freerdp_project USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= ${GH_ACCOUNT} CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}} CMAKE_ARGS_aarch64= -DWITH_NEON=ON CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \ PULSEAUDIO WAYLAND X11 OPTIONS_DEFAULT= CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11 OPTIONS_SUB= yes OPTIONS_DEFINE_armv6= NEON OPTIONS_DEFINE_armv7= NEON OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_amd64= SSE ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= WITH_CUPS FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG 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 ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_CMAKE_BOOL= WITH_ICU 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 WAYLAND_DESC= Build FreeRDP Wayland client WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_CMAKE_BOOL= WITH_WAYLAND X11_DESC= Build FreeRDP X11 client 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 .if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6" .if ${OSVERSION} < 1100500 || \ (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \ (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008) BROKEN= Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \ Please update to a later (fixed) version. .endif .endif post-patch: @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ ${WRKSRC}/CMakeLists.txt @${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 @${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 Index: head/net/freerdp/files/patch-libfreerdp_core_nla.c =================================================================== --- head/net/freerdp/files/patch-libfreerdp_core_nla.c (nonexistent) +++ head/net/freerdp/files/patch-libfreerdp_core_nla.c (revision 465177) @@ -0,0 +1,44 @@ +--- 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) +--- 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: head/net/freerdp/files/patch-libfreerdp_core_nla.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/net/remmina-plugin-rdp/Makefile =================================================================== --- head/net/remmina-plugin-rdp/Makefile (revision 465176) +++ head/net/remmina-plugin-rdp/Makefile (revision 465177) @@ -1,16 +1,16 @@ # Created by: Alexander Logvinov # $FreeBSD$ PKGNAMESUFFIX= -rdp -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Remmina plugin for RDP protocol LIB_DEPENDS= libfreerdp2.so:net/freerdp USE_GNOME+= cairo USE_XORG+= ice sm x11 xext MASTERDIR= ${.CURDIR}/../remmina-plugins .include "${MASTERDIR}/Makefile" Index: head/net/vinagre/Makefile =================================================================== --- head/net/vinagre/Makefile (revision 465176) +++ head/net/vinagre/Makefile (revision 465177) @@ -1,63 +1,63 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= vinagre PORTVERSION= 3.18.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= appstream-glib>=0:devel/appstream-glib \ itstool:textproc/itstool \ gnome-autogen.sh:devel/gnome-common \ yelp-tools>=0:textproc/yelp-tools LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \ libgdbm.so:databases/gdbm \ libsecret-1.so:security/libsecret RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme PORTSCOUT= limitw:1,even USES= autoreconf desktop-file-utils gettext gmake gnome pathfix \ pkgconfig shared-mime-info tar:xz USE_GNOME= gtk30 intlhack libxml2 vte3 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-ssh CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= AVAHI SPICE TELEPATHY RDP DOCS OPTIONS_DEFAULT=AVAHI SPICE TELEPATHY RDP AVAHI_CONFIGURE_WITH= avahi AVAHI_LIB_DEPENDS= libavahi-ui-gtk3.so:net/avahi-gtk3 SPICE_DESC= SPICE protocol support SPICE_CONFIGURE_ENABLE= spice SPICE_BUILD_DEPENDS= spice-gtk>=0.30_1:deskutils/spice-gtk SPICE_LIB_DEPENDS= libspice-client-gtk-3.0.so:deskutils/spice-gtk TELEPATHY_DESC= Telepathy integration TELEPATHY_CONFIGURE_WITH= telepathy TELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib \ libdbus-glib-1.so:devel/dbus-glib RDP_DESC= MS Windows remote desktop support RDP_CONFIGURE_ENABLE= rdp RDP_BUILD_DEPENDS= xfreerdp:net/freerdp RDP_RUN_DEPENDS= xfreerdp:net/freerdp post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS COPYING ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include