diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-18 13:07:37 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-18 20:45:32 +0000 |
| commit | 670699bfff98eef09c000e516a7e8467bb305182 (patch) | |
| tree | b781a72592917477630ec6c045565c6f2dad9156 /main | |
| parent | e82c273dbdd40fbe2a134373e38f9d63eb5dbccb (diff) | |
| download | aports-670699bfff98eef09c000e516a7e8467bb305182.tar.bz2 aports-670699bfff98eef09c000e516a7e8467bb305182.tar.xz | |
main/freerdp: rebuild against libressl 2.5
Diffstat (limited to 'main')
| -rw-r--r-- | main/freerdp/APKBUILD | 16 | ||||
| -rw-r--r-- | main/freerdp/libressl-2.5.patch | 16 |
2 files changed, 20 insertions, 12 deletions
diff --git a/main/freerdp/APKBUILD b/main/freerdp/APKBUILD index 5872d29e44..7d9847d317 100644 --- a/main/freerdp/APKBUILD +++ b/main/freerdp/APKBUILD @@ -2,7 +2,7 @@ pkgname=freerdp pkgver=1.2.0 _hash=24a752a70840f3e4b027ba7c020af71f2bcfd94a -pkgrel=2 +pkgrel=3 pkgdesc="Free RDP client" url="http://freerdp.sourceforge.net" arch="all" @@ -18,6 +18,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$_ha freerdp-fixes-since-24a752a.patch freerdp-args.patch musl-fix.patch + libressl-2.5.patch " _builddir="$srcdir"/FreeRDP-$_hash @@ -85,18 +86,9 @@ plugins() { mv "$pkgdir"/usr/lib/freerdp "$subpkgdir"/usr/lib/ } -md5sums="2b498c41d265d5cb2fcc25420d0a050e freerdp-1.2.0.tar.gz -4ad5ef949a4dcd650638c6eb098ae3c3 freerdp-cmake-list.patch -43457444595927bd330c87b95d8c64b9 freerdp-fixes-since-24a752a.patch -5b11a229bd7d8e0056358f6c43d4c19c freerdp-args.patch -c0d0e0eb84cdcc3e2a40c75b3cdc92b4 musl-fix.patch" -sha256sums="48def80bfc02c90a350e238de7fba331b914c7a73a7308e0b2fc861f61e25ccf freerdp-1.2.0.tar.gz -77843028ac29f9fc935f9b9880d9e94c1fd9b13c4ec0d8a16f0d9423f90e67f4 freerdp-cmake-list.patch -c9644fbc15b41a5e82d7a7bc517c8b7425956f375ee1369c68b0f275133f962c freerdp-fixes-since-24a752a.patch -54b5dd89ef60d36a6123ca95855586e11c4f404dfb9dbc751bf8d539d1d99041 freerdp-args.patch -996d645ac75620833ba5fdb371853674063805b98cc7da18f17632f7e803e794 musl-fix.patch" sha512sums="f85c111befd4717f93cac2472630c1b96a82aa392d4e5082d5f50cf0b7960a2902d5147cb7b26de52282f25a50968d314f404acb7fd78fe425050013037af4c5 freerdp-1.2.0.tar.gz c98a19630213c7cce1fc4256987586ff38102560cff0ee4df0c937b2030f6c066e0da8337379b14d41c821652b1a85f5d296efee426e28dc0a1603b9d5ade0f7 freerdp-cmake-list.patch 76aaa3b3b631728ecf8567a09c44f5b84af494d42b4437ec5198a1fe9d0a7312fcfa5acbf45b2d2b1cda60a530c36e108d7a50581c6f63b2058fcd785499842a freerdp-fixes-since-24a752a.patch a845b77b6106d9a3e9d69bc0a6df3f80a6f37bed2847ace387739def695a3b07acc5e859893a9af11b7c74d96b4eeea99d9a79d5c4e4b504bacd51d612882b01 freerdp-args.patch -2a3edc5df8f2374c023b604b3f523bbc9e510a35707bef2100ac64677109dc7615a11567558aeda3b032576308ef026ed9b80ef2c479d1004f840f18d6cf0890 musl-fix.patch" +2a3edc5df8f2374c023b604b3f523bbc9e510a35707bef2100ac64677109dc7615a11567558aeda3b032576308ef026ed9b80ef2c479d1004f840f18d6cf0890 musl-fix.patch +2efa371fed576c08daa5450dcb48147db5740965c9b3334a842d945bd316e42f50299cbc6f137c9a0242038bf294db284bec0f214002fc313b0d795f172f0d46 libressl-2.5.patch" diff --git a/main/freerdp/libressl-2.5.patch b/main/freerdp/libressl-2.5.patch new file mode 100644 index 0000000000..347b0d1add --- /dev/null +++ b/main/freerdp/libressl-2.5.patch @@ -0,0 +1,16 @@ +diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c +index 1b9d165..e76c78c 100644 +--- a/libfreerdp/crypto/tls.c ++++ b/libfreerdp/crypto/tls.c +@@ -220,9 +220,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) + case BIO_CTRL_RESET: + SSL_shutdown(tls->ssl); + +- if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect) ++ if (SSL_in_connect_init(tls->ssl)) + SSL_set_connect_state(tls->ssl); +- else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept) ++ else if (SSL_in_accept_init(tls->ssl)) + SSL_set_accept_state(tls->ssl); + + SSL_clear(tls->ssl); |