diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2019-10-16 23:13:52 +0200 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2019-10-16 23:39:37 +0200 |
commit | dc9895ac02962c11f813ec096411d6910ef672cf (patch) | |
tree | 4d1c67229fa5d8a925fdca29785c18f49efbbddb /net-misc/rdesktop | |
parent | net-p2p/deluge: Cleanup old version (diff) | |
download | gentoo-dc9895ac02962c11f813ec096411d6910ef672cf.tar.gz gentoo-dc9895ac02962c11f813ec096411d6910ef672cf.tar.bz2 gentoo-dc9895ac02962c11f813ec096411d6910ef672cf.zip |
net-misc/rdesktop: drop old
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'net-misc/rdesktop')
-rw-r--r-- | net-misc/rdesktop/Manifest | 1 | ||||
-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.8.4-r2.ebuild | 71 |
5 files changed, 1 insertions, 225 deletions
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest index f7712845f43c..e521b8ca528f 100644 --- a/net-misc/rdesktop/Manifest +++ b/net-misc/rdesktop/Manifest @@ -1,2 +1 @@ -DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee 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.8.4-r2.ebuild deleted file mode 100644 index 1e02cb53258d..000000000000 --- a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild +++ /dev/null @@ -1,71 +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? ( 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}"/${P}-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} -} |