From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- net-misc/rdesktop/Manifest | 7 +- .../files/rdesktop-1.6.0-sound_configure.patch | 4 +- .../rdesktop/files/rdesktop-1.8.3-no_strip.patch | 12 ++ .../files/rdesktop-1.8.3-openssl-1.1.patch | 125 +++++++++++++++++++++ .../files/rdesktop-1.8.3-xrandr_configure.patch | 4 +- net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild | 70 ++++++++++++ 6 files changed, 216 insertions(+), 6 deletions(-) create mode 100644 net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch create mode 100644 net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch create mode 100644 net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild (limited to 'net-misc/rdesktop') diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest index e660a0e49519..130cec8bb6f0 100644 --- a/net-misc/rdesktop/Manifest +++ b/net-misc/rdesktop/Manifest @@ -1,8 +1,11 @@ -AUX rdesktop-1.6.0-sound_configure.patch 799 BLAKE2B 73afd08044230d613f137f43ec13561db630ea601cbd6cdb60fbd823bb77174978ea37e8f5a6eae0d86b53c76aca4ef2a926297c1753c70d37ad5aa356669b5c SHA512 d2f5cf974b042ca752fc5f114c7f3c87647cbf757c986bf163b183b19a1072942c413827331f74847f4cd5b3aa1d91a0a1f609fca8440ff0dd791a44ab74b888 +AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0ebd8a82f4bfa030594e919d920f9ac081dc82acb75a2e4a76f520516efbfeca24c14ef15fe853c13a62f7db7776e05a700a11cd SHA512 78012c0ad279b870e3a550cd13afd5dc02f8e3af7708090aa6bd3c9892c9a6914f343e51787d9546f1416b45a17c57d2f643dd04a5dda479e22889d55a800a96 AUX rdesktop-1.7.0-libao_crash.patch 494 BLAKE2B 57c5dcf40c15173942db524717819d3185d7d57c0205027dbf95e191a87d01d5d6ec05176494441f73d3b49e05fb8daa2a610b7902ab08ebbff0fd5507d6a4cd SHA512 65477259452d78cadfe73679b70a7fde2486d2ec3dcacc3248174dc5869a62f7de97b9823801ce8c98dd956c2f92032076691b2f8820b05cbcd52fca4605f8ce -AUX rdesktop-1.8.3-xrandr_configure.patch 647 BLAKE2B 2f5f950771f510352c6af83126addb0135a6d59e5d73999d1095ce4e2923bdd7fcc3e4d43aa71654f73478bae2fab5369c9b5640a1f345462be7fd173ce4c8d7 SHA512 a0ef25458c2468b472a606e12502c1867cb06cb69f10e077f774396cd17f80af51ee2748385b203b63fb11280f8849cd70cc9d87dcc0ed2165e10597eb92cfa3 +AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03 +AUX rdesktop-1.8.3-openssl-1.1.patch 3643 BLAKE2B 986f8af19dcd2613d1b45a66060096bed3913ea20aff61a2c0b2f3f2ccee5cad97f054b90128488a2dcf8a997b7b107eca0923714a5f769de040946d880144e5 SHA512 b525aeced7971d77120ad7da166b5fcb491436b8716e140d22df39e2a036ed837f7d2a3623958208d7f1c027ffca9cd7237746ef9e01c10edee24320022a3b41 +AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d EBUILD rdesktop-1.8.3-r1.ebuild 1854 BLAKE2B 6836ceeb60e7342292eba2c8d007841011e9c299902478240154e5bf608455008b92d14452c5227f2177e50ef8fb6f9235057a801690c2526459da58aec47b0f SHA512 4c70505726e22fba07d333ccea0bdf6a8364d04bded7df577839f1300d585f490f0774ac3810fad0cd39b3410d76d199439eb600700c48f4d5878a08036800c7 EBUILD rdesktop-1.8.3-r2.ebuild 1907 BLAKE2B 3636154af2f39d9c2c8cb34e05a5d6f8d7b9c86af15691d954e741f313409a41927ffb1d504e812fad576a8c9a0e3565998435ad107f7ae8a5e53a3ea0c52e99 SHA512 599d6900a1fd58c137abcba8e9c3651e8937b9414d63377bd29291367b9586ae7d71ec95c2261c35a4a78bc5d6895df78f9e63da9392f549f71c8d0d6b93fea2 +EBUILD rdesktop-1.8.3-r3.ebuild 1736 BLAKE2B f755cf95c78453d0836f1774673176edeb529f09726eb41c5142903993c1328b896e0b2ce0196f2020a5a0fcde31b6daccaca5e3c884448d217b84c4065362e7 SHA512 b041f5cf5cdfdbe4cc6eb678cf0d51d1ff0baa7fccd51034d347524a45364c26e387796fdd66be16092d4800c3cd4cd03c659871053a217ae298bbf29b6563e8 EBUILD rdesktop-1.8.3.ebuild 1814 BLAKE2B 650a04a637c6a34d9e1bd2e3986e2ebc1ca481171a15bfe9826bd7a37914946291460290c68458dfb108b3a5f95420fd189a3282cbdabe5e0f7bfae683be6e2f SHA512 fb0ae6e70dd092e8e27499e9dab31a3c0bb86085e1c7a2b0f6e8b225c02ce09570f7b87a603dd8a23f3b473ad04917c38f3213cba2c0a55afa439c80707534a9 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea 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 index 8e64ba8b48cb..b2f492b10716 100644 --- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch +++ b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2009-06-30 10:35:14.000000000 +0200 -+++ configure.ac 2009-06-30 11:35:10.000000000 +0200 +--- 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]) diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch new file mode 100644 index 000000000000..018ceeedacfa --- /dev/null +++ b/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch @@ -0,0 +1,12 @@ +diff -Naur rdesktop-1.8.3.orig/Makefile.in rdesktop-1.8.3/Makefile.in +--- rdesktop-1.8.3.orig/Makefile.in 2013-01-21 13:28:14.000000000 +0100 ++++ rdesktop-1.8.3/Makefile.in 2018-08-20 18:05:38.401218002 +0200 +@@ -60,7 +60,7 @@ + installbin: rdesktop + mkdir -p $(DESTDIR)$(bindir) + $(INSTALL) rdesktop $(DESTDIR)$(bindir) +- $(STRIP) $(DESTDIR)$(bindir)/rdesktop ++ + chmod 755 $(DESTDIR)$(bindir)/rdesktop + + .PHONY: installman diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch new file mode 100644 index 000000000000..c74bd48c5aa0 --- /dev/null +++ b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch @@ -0,0 +1,125 @@ +From bd6aa6acddf0ba640a49834807872f4cc0d0a773 Mon Sep 17 00:00:00 2001 +From: Jani Hakala +Date: Thu, 16 Jun 2016 14:28:15 +0300 +Subject: [PATCH] Fix OpenSSL 1.1 compability issues + +Some data types have been made opaque in OpenSSL version 1.1 so +stack allocation and accessing struct fields directly does not work. +--- + ssl.c | 65 ++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 40 insertions(+), 25 deletions(-) + +diff --git a/ssl.c b/ssl.c +index 48751255..032e9b9e 100644 +--- a/ssl.c ++++ b/ssl.c +@@ -88,7 +88,7 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * + uint8 * exponent) + { + BN_CTX *ctx; +- BIGNUM mod, exp, x, y; ++ BIGNUM *mod, *exp, *x, *y; + uint8 inr[SEC_MAX_MODULUS_SIZE]; + int outlen; + +@@ -98,24 +98,24 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * + reverse(inr, len); + + ctx = BN_CTX_new(); +- BN_init(&mod); +- BN_init(&exp); +- BN_init(&x); +- BN_init(&y); +- +- BN_bin2bn(modulus, modulus_size, &mod); +- BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); +- BN_bin2bn(inr, len, &x); +- BN_mod_exp(&y, &x, &exp, &mod, ctx); +- outlen = BN_bn2bin(&y, out); ++ mod = BN_new(); ++ exp = BN_new(); ++ x = BN_new(); ++ y = BN_new(); ++ ++ BN_bin2bn(modulus, modulus_size, mod); ++ BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp); ++ BN_bin2bn(inr, len, x); ++ BN_mod_exp(y, x, exp, mod, ctx); ++ outlen = BN_bn2bin(y, out); + reverse(out, outlen); + if (outlen < (int) modulus_size) + memset(out + outlen, 0, modulus_size - outlen); + +- BN_free(&y); +- BN_clear_free(&x); +- BN_free(&exp); +- BN_free(&mod); ++ BN_free(y); ++ BN_clear_free(x); ++ BN_free(exp); ++ BN_free(mod); + BN_CTX_free(ctx); + } + +@@ -146,12 +146,20 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len) + + Kudos to Richard Levitte for the following (. intiutive .) + lines of code that resets the OID and let's us extract the key. */ +- nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ++ ++ X509_PUBKEY *key = NULL; ++ X509_ALGOR *algor = NULL; ++ ++ key = X509_get_X509_PUBKEY(cert); ++ algor = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key); ++ ++ nid = OBJ_obj2nid(algor->algorithm); ++ + if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption)) + { + DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n")); +- ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm); +- cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption); ++ X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption), ++ 0, NULL, NULL, 0); + } + epk = X509_get_pubkey(cert); + if (NULL == epk) +@@ -201,14 +209,24 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, + { + int len; + +- if ((BN_num_bytes(rkey->e) > (int) max_exp_len) || +- (BN_num_bytes(rkey->n) > (int) max_mod_len)) ++ BIGNUM *e = NULL; ++ BIGNUM *n = NULL; ++ ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) ++ e = rkey->e; ++ n = rkey->n; ++#else ++ RSA_get0_key(rkey, &e, &n, NULL); ++#endif ++ ++ if ((BN_num_bytes(e) > (int) max_exp_len) || ++ (BN_num_bytes(n) > (int) max_mod_len)) + { + return 1; + } +- len = BN_bn2bin(rkey->e, exponent); ++ len = BN_bn2bin(e, exponent); + reverse(exponent, len); +- len = BN_bn2bin(rkey->n, modulus); ++ len = BN_bn2bin(n, modulus); + reverse(modulus, len); + return 0; + } +@@ -229,8 +247,5 @@ void + rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, + unsigned char *md) + { +- HMAC_CTX ctx; +- HMAC_CTX_init(&ctx); + HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL); +- HMAC_CTX_cleanup(&ctx); + } diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch index f57a86b4315b..fea0b975260f 100644 --- a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch +++ b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2015-09-14 11:27:54.974472081 +0200 -+++ configure.ac 2015-09-14 11:34:37.729155044 +0200 +--- rdesktop.orig/configure.ac 2015-09-14 11:27:54.974472081 +0200 ++++ rdesktop/configure.ac 2015-09-14 11:34:37.729155044 +0200 @@ -151,9 +151,12 @@ AC_SUBST(CREDSSPOBJ) diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild new file mode 100644 index 000000000000..d8c5ec13872b --- /dev/null +++ b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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://rdesktop.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-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}"/${P}-no_strip.patch + "${FILESDIR}"/${P}-xrandr_configure.patch + "${FILESDIR}"/${P}-openssl-1.1.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} +} -- cgit v1.2.3