From 5ed40dfd0cac28fa23e0b5f812a7d629c8b4df41 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 12 Jan 2020 07:16:41 +0000
Subject: user/rdesktop: Bump to 1.9.0

---
 user/rdesktop/APKBUILD         | 18 ++++++----------
 user/rdesktop/gssapi.patch     | 47 ------------------------------------------
 user/rdesktop/signed-int.patch | 11 ----------
 3 files changed, 6 insertions(+), 70 deletions(-)
 delete mode 100644 user/rdesktop/gssapi.patch
 delete mode 100644 user/rdesktop/signed-int.patch

(limited to 'user/rdesktop')

diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD
index 51e79ab84..4a67f7c6f 100644
--- a/user/rdesktop/APKBUILD
+++ b/user/rdesktop/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=rdesktop
-pkgver=1.8.6
+pkgver=1.9.0
 pkgrel=0
 pkgdesc="Remote Desktop Protocol client"
 url="https://www.rdesktop.org/"
@@ -9,22 +9,18 @@ arch="all"
 options="!check"  # No test suite.
 license="GPL-3.0-only"
 depends=""
-makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libx11-dev
-	libxrandr-dev openssl-dev"
+makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libtasn1-dev
+	libx11-dev libxcursor-dev libxrandr-dev nettle-dev gnutls-dev bash"
 subpackages="$pkgname-doc"
-source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz
-	gssapi.patch
-	signed-int.patch
-	"
+source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
 	update_config_sub
-	./bootstrap
 }
 
 build() {
-	./configure \
+	bash ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -43,6 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="18b918883746c490852b97086e7727d546a0b1902a87515d6ff7b9568f30404a24934ea3ac55c9213d4db7bf5be3b47985490fa0533b15d9d6749d31c77260a6  rdesktop-1.8.6.tar.gz
-d55709968b21b64fe33bc1fe90156515e88fe715cbaad6f9c7a15ce4b26e09397821708139748c744ba8bb12f1e751602189317c583ff2017941f39360b4b8cd  gssapi.patch
-e8b4af70a54944d83b7c899aa680042f559e75af3e9a3deb2c7395f8b4a56e50d1c2f26bd10b2377ff577115d635c2aa0fdbddf995588f1d492badfc3e72456e  signed-int.patch"
+sha512sums="e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5  rdesktop-1.9.0.tar.gz"
diff --git a/user/rdesktop/gssapi.patch b/user/rdesktop/gssapi.patch
deleted file mode 100644
index a24d2b718..000000000
--- a/user/rdesktop/gssapi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Mon, 10 Jul 2017 15:14:01 +0200
-Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue
-
-That project is abandoned and the distributions aren't including
-it anymore.
----
- configure.ac | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e045c409..a969ad5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,27 +122,20 @@ fi
- 
- 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 --git a/user/rdesktop/signed-int.patch b/user/rdesktop/signed-int.patch
deleted file mode 100644
index 405a4dd3e..000000000
--- a/user/rdesktop/signed-int.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rdesktop-1.8.4/orders.c.old	2019-01-02 14:03:25.000000000 +0000
-+++ rdesktop-1.8.4/orders.c	2019-01-09 17:13:26.170000000 +0000
-@@ -1266,7 +1266,7 @@
- 	in_uint16_le(s, flags);	/* used by bmpcache2 */
- 	in_uint8(s, type);
- 
--	if (!s_check_rem(s, length + 7))
-+	if (!s_check_rem(s, (sint16) length + 7))
- 	{
- 		rdp_protocol_error("process_secondary_order(), next order pointer would overrun stream", &packet);
- 	}
-- 
cgit v1.2.3-70-g09d2