gentoo resync : 18.05.2019

3 files changed, 130 insertions, 0 deletions

diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 65bdcf0936d5..032ba578f1d9 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -3,7 +3,10 @@ AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab36
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8b1cab12ace786848515b6455f189121c8e87a393255ac25b116d5027d0756a35b1de60007f37426e82f32c9cdc2f5e SHA512 dfc8b4af9d22d587846f5d18d3063c4932b3add419b60a01ff391e3ac5f7b1d6b40614e54cdff61c66b2690a879550d7ffad38c71188d62e598a8f63d347dd98
 AUX rdesktop-1.8.4-use_standard_gssapi.patch 2696 BLAKE2B 01f5542dc294d51f6d2fccf7141fc02ed199042cc25000bbc90d3387d6cd0b93ebce1a3ebbcaa1a8817bdd660dedd09d115f979fabb561b3ccc9e56e126bbd60 SHA512 ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150
+AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
+DIST rdesktop-1.8.5.tar.gz 322452 BLAKE2B 186f4379a61d8e71dec3f3541deefef2c350b968fcb0e882e1d52e74c7fa47e110d5d5bf2968ee4ce2dbfab0e2a564a0e54e2d550f6dcc230fbb70c97dfcf351 SHA512 e905a0805854c16cd305635087e2fe206f4b0aee1825e3b52c6d3fea3b0b0cfc1463b74c7b07a6a2ff961717741a5b85079a5734d86f0ed2dd645ae69e6129a9
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
 EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
+EBUILD rdesktop-1.8.5-r1.ebuild 1790 BLAKE2B 97dcb8f4c2c1694b8929a0382fa4c94c53e4b43d1f64c410966a2d13c70a4a7ee9c1c26e21f71b2678b9f14816d01a325871ce679690e0c5740b3c356f9be8d9 SHA512 ca4e07def77481d504c94a53e74fcd8097aefa9b099379e627c8840fc79f5fb6e5b61b5d983f77c19fa8194df3ae23759534fa31b1eb591c1e68076d51024ced
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
new file mode 100644
index 000000000000..a5e14c3aff0c
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
@@ -0,0 +1,56 @@
+diff -Naur rdesktop-1.8.5.orig/configure.ac rdesktop-1.8.5/configure.ac
+--- rdesktop-1.8.5.orig/configure.ac	2019-05-08 11:24:50.000000000 +0200
++++ rdesktop-1.8.5/configure.ac	2019-05-14 18:33:49.479354354 +0200
+@@ -122,27 +122,20 @@
+ 
+ dnl CredSSP feature
+ AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
+-AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), 
+-	      [static_gssglue=yes], [static_gssglue=no])
+ AS_IF([test "x$enable_credssp" != "xno"], [
+ 	  if test -n "$PKG_CONFIG"; then
+-	    PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++	    PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
+ 	  fi
+ 
+ 	  if test x"$WITH_CREDSSP" = "x1"; then
+ 	      CREDSSPOBJ="cssp.o"
+-	      CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
+-
+-	      AS_IF([test "x$static_gssglue" != "xno"], [
+-	          LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
+-	      ], [
+-	          LIBS="$LIBS -lgssglue"
+-	      ])
++	      CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
++	      LIBS="$LIBS $GSSAPI_LIBS"
+ 
+ 	      AC_DEFINE(WITH_CREDSSP)
+ 	  else
+ 		echo
+-		echo "CredSSP support requires libgssglue, install the dependency"
++		echo "CredSSP support requires GSSAPI, install the dependency"
+ 		echo "or disable the feature using --disable-credssp."
+ 		echo
+ 		exit 1
+diff -Naur rdesktop-1.8.5.orig/cssp.c rdesktop-1.8.5/cssp.c
+--- rdesktop-1.8.5.orig/cssp.c	2019-05-08 11:22:39.000000000 +0200
++++ rdesktop-1.8.5/cssp.c	2019-05-14 18:34:49.559368755 +0200
+@@ -140,7 +140,7 @@
+ }
+ 
+ static STREAM
+-cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in)
++cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in)
+ {
+ 	int conf_state;
+ 	OM_uint32 major_status;
+@@ -181,7 +181,7 @@
+ }
+ 
+ static STREAM
+-cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in)
++cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in)
+ {
+ 	OM_uint32 major_status;
+ 	OM_uint32 minor_status;
diff --git a/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..8a54a1e507b3
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( virtual/krb5 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
+	"${FILESDIR}"/${P}-use_standard_gssapi.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}