diff options
Diffstat (limited to 'net-misc/rdesktop')
-rw-r--r-- | net-misc/rdesktop/Manifest | 8 | ||||
-rw-r--r-- | net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch | 82 | ||||
-rw-r--r-- | net-misc/rdesktop/metadata.xml | 2 | ||||
-rw-r--r-- | net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild | 70 | ||||
-rw-r--r-- | net-misc/rdesktop/rdesktop-1.9.0.ebuild (renamed from net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild) | 45 |
5 files changed, 29 insertions, 178 deletions
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest index dd739a1714b7..3073c826e873 100644 --- a/net-misc/rdesktop/Manifest +++ b/net-misc/rdesktop/Manifest @@ -2,13 +2,11 @@ AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0eb AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03 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 AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3 -DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee -EBUILD rdesktop-1.8.4-r1.ebuild 1726 BLAKE2B 65ff5e4a01889704fdb899f540d27e5ba75b343f5d787e940f799204e2af8272c1e523567ad2166c24a8cd118bd418c636553d4b4df4399659dda3c00f26e1ec SHA512 89cdd9bda2dab478253134d1db0739f5051a8bc3d652a3ab73cdd9f287f56d47f49bfee8e29c3db680b2f03975c0bf5f681fc41461486bf004219931437a3094 -EBUILD rdesktop-1.8.4-r2.ebuild 1773 BLAKE2B 4c6f446911b8941b2133a0c75ede13028e8fdfbaa64aa9b36418639b3039f61efe88d8199578c5c82abdb46fdfceb3f8d6e108117b72f0c5157e64da7b917f3e SHA512 cf68883751ed8b113dd8d389dc32d59a9e43cedc89c29da29883cfcfbe7d5c9937ab83195bb83954641d03d8cb93517423711e9f472eb1105e7781048432b871 +DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5 EBUILD rdesktop-1.8.6-r1.ebuild 1825 BLAKE2B 719b968928addf924edddc9e4266b0130d820e69c63672fbc6e4b29c9deed82782ec3fbb7ad4965d732ba19b48a3d7a7089941189b99b19864145407a48fc0c0 SHA512 252c717a7d630ff951400b5fe9100c1ad277fdf957522d37fb4ebb9f89fd4e2df94349084275edd0e8360caca3a85ed9d2e8bd859bf0aa1d11650a0d36efaf09 EBUILD rdesktop-1.8.6.ebuild 1779 BLAKE2B 7babb9b744d549177311e42829179047b79f54a852418fb41d93131185278be0cdf0a59851a99eaeab1b280ed2ebe7194819c119e76808467212cc6f786add1e SHA512 bfcaf2817c1a1e452ae33d8b25b9f144e29b19204aa1f02da34d69882f441b46eb57e8b4442eafba6b45d9910fa00d8165ba5690c36c18e5424903631807552f -MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea +EBUILD rdesktop-1.9.0.ebuild 1684 BLAKE2B cc0132d1dd28d79e17408f2262abe8b69001c790084e8ab10db69bdf0a3f89ee8fac7e9066d9fbc392889ce4ef4d5efffe8470ed241e33daf0f415fd2c23a8b2 SHA512 0e4321e237ff0e64634a1da949da9b8670158de391679cf6643a18232b9e21665b3f1faa37bfde2ea44c37408451d3bb897f498316973d24036535c5c30e30c6 +MISC metadata.xml 883 BLAKE2B 9ad73132150a724eb69cf65c62aea7cb0530e45fb4ca0395bb916cc95f48452b2dbd34edc7116ef9b8184527ea2dee16213b419185eac7b5aba8346dc7978cbc SHA512 5a68b2d8f23e4039efd76a52ea19400b2d17dfb01d0cb16504914bd0e2fb6f0523a135e7e98a19d7a0f371c1b149cb9426fc308303a0fa09a0bd0ebd118c1ea2 diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch deleted file mode 100644 index 5befcf02e55b..000000000000 --- a/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 71f1cfb909c0a955632001cf9fad80a321a43372 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Mon, 10 Jul 2017 15:12:26 +0200 -Subject: [PATCH 1/2] Fix pointer types for gss_wrap()/gss_unrap() - -We were using the incorrect type for the context for these two calls. -No practical effects, but some noise from the compiler about the wrong -pointer type. ---- - cssp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cssp.c b/cssp.c -index 9f4c0829..6ac37746 100644 ---- a/cssp.c -+++ b/cssp.c -@@ -173,7 +173,7 @@ cssp_gss_get_service_name(char *server, gss_name_t * name) - } - - static RD_BOOL --cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) -+cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in, STREAM out) - { - int conf_state; - OM_uint32 major_status; -@@ -212,7 +212,7 @@ cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) - } - - static RD_BOOL --cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) -+cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in, STREAM out) - { - OM_uint32 major_status; - OM_uint32 minor_status; - -From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Mon, 10 Jul 2017 15:14:01 +0200 -Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue - -That project is abandoned and the distributions aren't including -it anymore. ---- - configure.ac | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e045c409..a969ad5d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -122,27 +122,20 @@ fi - - 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 --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml index 905d0e56c9b9..8e11088a21d4 100644 --- a/net-misc/rdesktop/metadata.xml +++ b/net-misc/rdesktop/metadata.xml @@ -9,7 +9,7 @@ An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required. </longdescription> <use> - <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag> + <flag name="kerberos">Enable CredSPP support + Kerberos authentication</flag> <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag> <flag name="xrandr">Enable XRandR window extension support</flag> </use> diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild deleted file mode 100644 index 29441af60524..000000000000 --- a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 ~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? ( net-libs/libgssglue ) - 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}"/${P}-libressl.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} -} diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0.ebuild index 1e02cb53258d..2a3e18a9ba61 100644 --- a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild +++ b/net-misc/rdesktop/rdesktop-1.9.0.ebuild @@ -13,36 +13,43 @@ 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 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr" +IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" S=${WORKDIR}/${PN}-${MY_PV} RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/nettle:0= + >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp - alsa? ( media-libs/alsa-lib ) - ao? ( >=media-libs/libao-0.8.6 ) + alsa? ( + media-libs/alsa-lib + media-libs/libsamplerate + ) + ao? ( + >=media-libs/libao-0.8.6 + media-libs/libsamplerate + ) kerberos? ( virtual/krb5 ) - libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) + oss? ( media-libs/libsamplerate ) + pulseaudio? ( + media-libs/libsamplerate + media-sound/pulseaudio + ) 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}"/${P}-libressl.patch - "${FILESDIR}"/${P}-use_standard_gssapi.patch ) -DOCS=( doc/HACKING doc/TODO doc/keymapping.txt ) +DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt ) src_prepare() { default @@ -50,20 +57,18 @@ src_prepare() { } 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 + if use pulseaudio; then + sound_conf="--with-sound=pulse" + elif use ao; then + sound_conf="--with-sound=libao" + elif use alsa; then + sound_conf="--with-sound=alsa" + else + sound_conf=$(use_with oss sound oss) 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) \ |