wok-current rev 24110

rdesktop: add debian patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 28 10:48:56 2021 +0000 (2021-09-28)
parents f9c2c6b32e72
children 6831608a1b2a
files rdesktop/receipt rdesktop/stuff/02_use_correct_modulus_and_exponent.patch xar/receipt xrdp/receipt
line diff
     1.1 --- a/rdesktop/receipt	Tue Sep 28 09:25:18 2021 +0000
     1.2 +++ b/rdesktop/receipt	Tue Sep 28 10:48:56 2021 +0000
     1.3 @@ -26,6 +26,7 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	patch -p1 < $stuff/02_use_correct_modulus_and_exponent.patch
     1.8  	./bootstrap &&
     1.9  	./configure			\
    1.10  		--prefix=/usr		\
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/rdesktop/stuff/02_use_correct_modulus_and_exponent.patch	Tue Sep 28 10:48:56 2021 +0000
     2.3 @@ -0,0 +1,26 @@
     2.4 +From 53ba87dc174175e98332e22355ad8662c02880d6 Mon Sep 17 00:00:00 2001
     2.5 +From: Markus Beth <markus.beth@zkrd.de>
     2.6 +Date: Mon, 2 Dec 2019 11:22:13 +0100
     2.7 +Subject: [PATCH] use correct modulus and exponent in rdssl_rkey_get_exp_mod
     2.8 +
     2.9 +---
    2.10 + ssl.c | 4 ++--
    2.11 + 1 file changed, 2 insertions(+), 2 deletions(-)
    2.12 +
    2.13 +diff --git a/ssl.c b/ssl.c
    2.14 +index 930c7f94..0681a890 100644
    2.15 +--- a/ssl.c
    2.16 ++++ b/ssl.c
    2.17 +@@ -307,10 +307,10 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
    2.18 + {
    2.19 + 	size_t outlen;
    2.20 + 
    2.21 +-	outlen = (mpz_sizeinbase(modulus, 2) + 7) / 8;
    2.22 ++	outlen = (mpz_sizeinbase(rkey->n, 2) + 7) / 8;
    2.23 + 	if (outlen > max_mod_len)
    2.24 + 		return 1;
    2.25 +-	outlen = (mpz_sizeinbase(exponent, 2) + 7) / 8;
    2.26 ++	outlen = (mpz_sizeinbase(rkey->e, 2) + 7) / 8;
    2.27 + 	if (outlen > max_exp_len)
    2.28 + 		return 1;
    2.29 + 
     3.1 --- a/xar/receipt	Tue Sep 28 09:25:18 2021 +0000
     3.2 +++ b/xar/receipt	Tue Sep 28 10:48:56 2021 +0000
     3.3 @@ -14,6 +14,12 @@
     3.4  DEPENDS="acl attr bzlib glibc-base libcrypto liblzma libxml2 zlib"
     3.5  BUILD_DEPENDS="bzip2-dev liblzma-dev openssl-dev zlib-dev"
     3.6  
     3.7 +current_version()
     3.8 +{
     3.9 +	wget -O - https://github.com/mackyle/xar/releases 2>/dev/null | \
    3.10 +	sed '/archive.*tar/!d;s|.*/xar-\(.*\).tar.*|\1|;q'
    3.11 +}
    3.12 +
    3.13  # Rules to configure and make the package.
    3.14  compile_rules()
    3.15  {
     4.1 --- a/xrdp/receipt	Tue Sep 28 09:25:18 2021 +0000
     4.2 +++ b/xrdp/receipt	Tue Sep 28 10:48:56 2021 +0000
     4.3 @@ -59,6 +59,7 @@
     4.4  	sed -i	-e 's|/usr/local|/usr|;s|xrdp\.sh|xrdp|' \
     4.5  		-e 's|--noheading -C||' \
     4.6  		-e 's,grep -q -i,grep /usr/sbin | &,' \
     4.7 +		-e 's|.*/lib/lsb/init-functions|# &|' \
     4.8  		$fs/etc/init.d/xrdp
     4.9  
    4.10  	SESSION="/usr/bin/lxde-session"