rdesktop: update to latest head, enable CredSSP support

OpenIndiana · Dec 25, 2018 · 89643db · 89643db
1 parent 44d9657
commit 89643db
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 15 deletions.
diff --git a/components/rdesktop/Makefile → components/desktop/rdesktop/Makefile b/components/rdesktop/Makefile → components/desktop/rdesktop/Makefile
@@ -9,51 +9,59 @@
 #
 
 #
-# Copyright 2015 Alexander Pyhalov
+# Copyright 2018 Alexander Pyhalov
 #
 
-include ../../make-rules/shared-macros.mk
+PREFERRED_BITS=64
+
+include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		rdesktop
 COMPONENT_VERSION=	1.8.3
+COMPONENT_REVISION=	1
 COMPONENT_PROJECT_URL=	http://www.rdesktop.org/
 COMPONENT_SUMMARY=	RDP, Microsoft Terminal Services client
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_COMMIT)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).zip
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
+    sha256:e8e4cab3a84ee8b73ed77ef11183d19403920ab7b6d8325b24dab8da7bbd123d
+COMPONENT_COMMIT=	1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105
+COMPONENT_ARCHIVE_URL=	https://github.com/rdesktop/rdesktop/archive/$(COMPONENT_COMMIT).zip
 COMPONENT_FMRI=		desktop/remote-desktop/rdesktop
 COMPONENT_CLASSIFICATION=	Applications/Internet
 COMPONENT_LICENSE_FILE=	COPYING
 COMPONENT_LICENSE=	GPLv3
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+PATH=$(PATH.gnu)
 
-PATH=/usr/gnu/bin:/usr/bin
+COMPONENT_PREP_ACTION = (cd $(@D) && autoreconf -if)
 
 # Missing files in build dir without this.
 COMPONENT_PRE_CONFIGURE_ACTION =	($(CLONEY) $(SOURCE_DIR) $(@D))
 
 CONFIGURE_OPTIONS+=	--sysconfdir=/etc
 CONFIGURE_OPTIONS+=	--with-ipv6
 CONFIGURE_OPTIONS+=	--with-openssl=/usr
-CONFIGURE_OPTIONS+=	--disable-credssp
+CONFIGURE_OPTIONS+=	--enable-credssp
 CONFIGURE_OPTIONS+=	--disable-smartcard
 CONFIGURE_OPTIONS+=	--with-sound=oss
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
 # Auto-generated dependencies
 REQUIRED_PACKAGES += library/libsamplerate
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcursor
 REQUIRED_PACKAGES += x11/library/libxrandr
diff --git a/...ts/rdesktop/manifests/sample-manifest.p5m → ...op/rdesktop/manifests/sample-manifest.p5m b/...ts/rdesktop/manifests/sample-manifest.p5m → ...op/rdesktop/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2018 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,6 +33,7 @@ file path=usr/share/rdesktop/keymaps/de-ch
 file path=usr/share/rdesktop/keymaps/en-dv
 file path=usr/share/rdesktop/keymaps/en-gb
 file path=usr/share/rdesktop/keymaps/en-us
+file path=usr/share/rdesktop/keymaps/en-us-intl
 file path=usr/share/rdesktop/keymaps/es
 file path=usr/share/rdesktop/keymaps/et
 file path=usr/share/rdesktop/keymaps/fi

diff --git a/...ents/rdesktop/patches/01-sun-keymap.patch → ...ktop/rdesktop/patches/01-sun-keymap.patch b/...ents/rdesktop/patches/01-sun-keymap.patch → ...ktop/rdesktop/patches/01-sun-keymap.patch
diff --git a/...rdesktop/patches/02-g11n-i18n-title.patch → ...rdesktop/patches/02-g11n-i18n-title.patch b/...rdesktop/patches/02-g11n-i18n-title.patch → ...rdesktop/patches/02-g11n-i18n-title.patch
diff --git a/components/desktop/rdesktop/patches/03-gssapi.patch b/components/desktop/rdesktop/patches/03-gssapi.patch
@@ -0,0 +1,14 @@
+--- rdesktop-1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105/configure.ac.1	2018-12-25 16:01:59.444008281 +0000
++++ rdesktop-1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105/configure.ac	2018-12-25 16:05:39.291557837 +0000
+@@ -139,6 +139,11 @@
+ 		GSSAPI_CFLAGS=""
+ 		GSSAPI_LIBS="-framework Kerberos"
+ 		;;
++             solaris*)
++		AC_CHECK_HEADER(gssapi/gssapi.h, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++		GSSAPI_CFLAGS="`krb5-config --cflags gssapi`"
++		GSSAPI_LIBS="`krb5-config --libs gssapi`"
++		;;
+ 	     *)
+ 		if test -n "$PKG_CONFIG"; then
+ 		  PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
diff --git a/components/rdesktop/rdesktop.p5m → components/desktop/rdesktop/rdesktop.p5m b/components/rdesktop/rdesktop.p5m → components/desktop/rdesktop/rdesktop.p5m
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2015 Alexander Pyhalov
+# Copyright 2018 Alexander Pyhalov
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,6 +33,7 @@ file path=usr/share/rdesktop/keymaps/de-ch
 file path=usr/share/rdesktop/keymaps/en-dv
 file path=usr/share/rdesktop/keymaps/en-gb
 file path=usr/share/rdesktop/keymaps/en-us
+file path=usr/share/rdesktop/keymaps/en-us-intl
 file path=usr/share/rdesktop/keymaps/es
 file path=usr/share/rdesktop/keymaps/et
 file path=usr/share/rdesktop/keymaps/fi