summaryrefslogtreecommitdiff
path: root/net-misc/rdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/rdesktop')
-rw-r--r--net-misc/rdesktop/Manifest8
-rw-r--r--net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch15
-rw-r--r--net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch56
-rw-r--r--net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch59
-rw-r--r--net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch12
-rw-r--r--net-misc/rdesktop/rdesktop-1.8.6.ebuild69
-rw-r--r--net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild (renamed from net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild)47
7 files changed, 42 insertions, 224 deletions
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index a53bc97bbdcd..2ed590651da3 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,13 +1,9 @@
-AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0ebd8a82f4bfa030594e919d920f9ac081dc82acb75a2e4a76f520516efbfeca24c14ef15fe853c13a62f7db7776e05a700a11cd SHA512 78012c0ad279b870e3a550cd13afd5dc02f8e3af7708090aa6bd3c9892c9a6914f343e51787d9546f1416b45a17c57d2f643dd04a5dda479e22889d55a800a96
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.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
-AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3
+AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f9bf867d1890a16a027015390c8402f9da98513ec5fa5fdc2fee754d4e6c436cfd20d61cf830e3f9a8d7111bac37cbeed06 SHA512 85308d3230fa71a2381f35c20c02e3316a8b1b98bbe3f507d9f14fc8f7e703ffd7a6a45907e0799d3f7a243da52571e3c07b7adb1f68a4123133d8ea3eb31451
AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485
-DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
-EBUILD rdesktop-1.8.6-r1.ebuild 1719 BLAKE2B 423890da3163c6ceebb26bf0dfdff5fa5fe04723fcb32329b5270cbf0afd7cdac6632b79e95ed48bcafaa8e38c8e59e2732e56cb01ee2566d4fd5d64bd5927ae SHA512 5ed08665faf130deb7a6b8a2060eaec82166ab3a1ab799239c3e4c497a18175e57d1708fa7a53c9747d9b25b5f8de2afa39111023073fba62ae052462a3f99b3
-EBUILD rdesktop-1.8.6.ebuild 1675 BLAKE2B 2d3b80868b1ac41c121780d4a17e89074e20525f1fe12cbe7a97f4d721c3bbd10012dfc56adf765d83d53a803529203fe17cf58189c397839283bf473e303323 SHA512 ae47270d110ba76b8b2c54eb6f9fb3b23f3b0767a9d651ed31d47fb30cf6e32da8d9856207a9eee5edf760d2b00b79652868029cf4e9c33b5db1c134f763600e
EBUILD rdesktop-1.9.0-r1.ebuild 1749 BLAKE2B 23e0faddcc839ce9ef8bbade80f66a642d2804cbdc12eca2b70cd41700ce6248b5e5d6490b1616e92b0fd1d0a2d895117b8136abc5f3bf8fbe7c7fc73db6bf1e SHA512 39fb5a3187dfa26161da186b26821c2c6d33fb9b242056a706cfa920b41a01307f799043d14478e6e723f6ecae350201e7adf2ab2bee088de6dea89b576c1b01
+EBUILD rdesktop-1.9.0-r2.ebuild 1788 BLAKE2B ec12da46b590b92ba54db4c475e8b7c0e46d9d714aea353636de859ec6f868cee495d9875b493b2eabeec7f4e34802d82701a4925e490e3e58572f66ecdd3fcb SHA512 87d3b47cdc4378b7dda51a17d9c750c89cb6699570c3d5c503c3c0722f3f06e2d400fbfcbbc2423d985e58a0aed89dd4e96c5aeb60d67e87b034ec8d0ded5e8d
EBUILD rdesktop-1.9.0.ebuild 1694 BLAKE2B 643d0eb4f1aa7d86ebed2fea56d07c7d17f6610c4b6adaa2b3c502c0bc1821e2bb95b4b07f27f09e2b4592beadd29f6ffcf9d788a5a64b4deaec0888748dbe29 SHA512 7922b7ffc4cf08ba3c96faa43dfba382e573abfec39ab61d0bccbd63fed6b130fd536eec0bbe18996c519cf6a13935c8ced073632d62275c1829444aa4b2a84c
MISC metadata.xml 883 BLAKE2B 9ad73132150a724eb69cf65c62aea7cb0530e45fb4ca0395bb916cc95f48452b2dbd34edc7116ef9b8184527ea2dee16213b419185eac7b5aba8346dc7978cbc SHA512 5a68b2d8f23e4039efd76a52ea19400b2d17dfb01d0cb16504914bd0e2fb6f0523a135e7e98a19d7a0f371c1b149cb9426fc308303a0fa09a0bd0ebd118c1ea2
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
deleted file mode 100644
index b2f492b10716..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rdesktop.orig/configure.ac 2009-06-30 10:35:14.000000000 +0200
-+++ rdesktop/configure.ac 2009-06-30 11:35:10.000000000 +0200
-@@ -228,7 +228,11 @@
- if test -n "$PKG_CONFIG"; then
- PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
- PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
-- PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+ AC_ARG_WITH(libsamplerate,
-+ [ --without-libsamplerate disable libsamplerate support])
-+ if test "x$with_libsamplerate" != "xno"; then
-+ PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+ fi
- if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
- AC_DEFINE(HAVE_LIBSAMPLERATE)
- if test x"$static_libsamplerate" = "xyes"; then
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
deleted file mode 100644
index a5e14c3aff0c..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
deleted file mode 100644
index dbb0d0e9baf7..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
-From: Markus Beth <markus.beth@web.de>
-Date: Tue, 11 Jun 2019 22:57:31 +0200
-Subject: [PATCH] sec_decrypt() the correct amount of data
-
-Save the correct amount of data to sec_decrypt() because after
-inout_uint8p() the macro s_remaining(s) will find nothing left.
----
- secure.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/secure.c b/secure.c
-index 8f65b3aa..9b301e1f 100644
---- a/secure.c
-+++ b/secure.c
-@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
- STREAM s;
- struct stream packet;
- size_t data_offset;
-+ size_t remaining;
- unsigned char *data;
-
- while ((s = mcs_recv(&channel, rdpver)) != NULL)
-@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
-
- data_offset = s_tell(s);
-
-- inout_uint8p(s, data, s_remaining(s));
-- sec_decrypt(data, s_remaining(s));
-+ remaining = s_remaining(s);
-+ inout_uint8p(s, data, remaining);
-+ sec_decrypt(data, remaining);
-
- s_seek(s, data_offset);
- }
-@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
-
- data_offset = s_tell(s);
-
-- inout_uint8p(s, data, s_remaining(s));
-- sec_decrypt(data, s_remaining(s));
-+ remaining = s_remaining(s);
-+ inout_uint8p(s, data, remaining);
-+ sec_decrypt(data, remaining);
- }
-
- if (sec_flags & SEC_LICENCE_NEG)
-@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
-
- data_offset = s_tell(s);
-
-- inout_uint8p(s, data, s_remaining(s));
-- sec_decrypt(data, s_remaining(s));
-+ remaining = s_remaining(s);
-+ inout_uint8p(s, data, remaining);
-+ sec_decrypt(data, remaining);
-
- /* Check for a redirect packet, starts with 00 04 */
- if (data[0] == 0 && data[1] == 4)
diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
new file mode 100644
index 000000000000..71ada7703996
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
@@ -0,0 +1,12 @@
+--- rdesktop-1.9.0/configure.ac.orig 2021-05-22 14:38:14.854099405 +0300
++++ rdesktop-1.9.0/configure.ac 2021-05-22 14:43:41.476323564 +0300
+@@ -84,6 +84,9 @@
+ fi
+ ;;
+ *)
++ if test -n "$PKG_CONFIG"; then
++ PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++ fi
+ ;;
+ esac
+ else
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
deleted file mode 100644
index b81e1b576142..000000000000
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-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 libsamplerate oss pcsc-lite xrandr"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="
- dev-libs/openssl: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 )
- 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.5-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}
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
index aa98e0277708..1f5e5559a2bc 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
@@ -13,35 +13,46 @@ 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 libsamplerate oss pcsc-lite xrandr"
+IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
S=${WORKDIR}/${PN}-${MY_PV}
RDEPEND="
- dev-libs/openssl:0=
+ dev-libs/nettle:0=
+ >=net-libs/gnutls-3.2.0:0=
x11-libs/libX11
+ x11-libs/libXcursor
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}"/${PN}-1.8.5-use_standard_gssapi.patch
- "${FILESDIR}"/${P}-sec_decrypt.patch
+ "${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch
+ "${FILESDIR}"/${P}-gssapi-check.patch
)
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )
src_prepare() {
default
@@ -49,20 +60,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) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:53:36 +0000