diff options
| -rw-r--r-- | user/rdesktop/APKBUILD | 12 | ||||
| -rw-r--r-- | user/rdesktop/gssapi.patch | 35 |
2 files changed, 4 insertions, 43 deletions
diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD index 2bdffb3c5..51e79ab84 100644 --- a/user/rdesktop/APKBUILD +++ b/user/rdesktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rdesktop -pkgver=1.8.4 -pkgrel=1 +pkgver=1.8.6 +pkgrel=0 pkgdesc="Remote Desktop Protocol client" url="https://www.rdesktop.org/" arch="all" @@ -18,14 +18,12 @@ source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop " prepare() { - cd "$builddir" default_prepare update_config_sub ./bootstrap } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,15 +36,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae rdesktop-1.8.4.tar.gz -ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150 gssapi.patch +sha512sums="18b918883746c490852b97086e7727d546a0b1902a87515d6ff7b9568f30404a24934ea3ac55c9213d4db7bf5be3b47985490fa0533b15d9d6749d31c77260a6 rdesktop-1.8.6.tar.gz +d55709968b21b64fe33bc1fe90156515e88fe715cbaad6f9c7a15ce4b26e09397821708139748c744ba8bb12f1e751602189317c583ff2017941f39360b4b8cd gssapi.patch e8b4af70a54944d83b7c899aa680042f559e75af3e9a3deb2c7395f8b4a56e50d1c2f26bd10b2377ff577115d635c2aa0fdbddf995588f1d492badfc3e72456e signed-int.patch" diff --git a/user/rdesktop/gssapi.patch b/user/rdesktop/gssapi.patch index 5befcf02e..a24d2b718 100644 --- a/user/rdesktop/gssapi.patch +++ b/user/rdesktop/gssapi.patch @@ -1,38 +1,3 @@ -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 |