From baa5e9e54c8c8c8f18be301c4ca909ff04ef6e45 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 14 May 2019 18:38:35 +0200 Subject: net-misc/rdesktop: restore patch to use standard GSSAPI Closes: https://bugs.gentoo.org/685942 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Bernard Cafarelli --- .../files/rdesktop-1.8.5-use_standard_gssapi.patch | 56 +++++++++++++++++ net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild | 71 ++++++++++++++++++++++ net-misc/rdesktop/rdesktop-1.8.5.ebuild | 70 --------------------- 3 files changed, 127 insertions(+), 70 deletions(-) create mode 100644 net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch create mode 100644 net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild delete mode 100644 net-misc/rdesktop/rdesktop-1.8.5.ebuild (limited to 'net-misc/rdesktop') diff --git a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch new file mode 100644 index 000000000000..a5e14c3aff0c --- /dev/null +++ b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch @@ -0,0 +1,56 @@ +diff -Naur rdesktop-1.8.5.orig/configure.ac rdesktop-1.8.5/configure.ac +--- rdesktop-1.8.5.orig/configure.ac 2019-05-08 11:24:50.000000000 +0200 ++++ rdesktop-1.8.5/configure.ac 2019-05-14 18:33:49.479354354 +0200 +@@ -122,27 +122,20 @@ + + 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 -Naur rdesktop-1.8.5.orig/cssp.c rdesktop-1.8.5/cssp.c +--- rdesktop-1.8.5.orig/cssp.c 2019-05-08 11:22:39.000000000 +0200 ++++ rdesktop-1.8.5/cssp.c 2019-05-14 18:34:49.559368755 +0200 +@@ -140,7 +140,7 @@ + } + + static STREAM +-cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in) ++cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in) + { + int conf_state; + OM_uint32 major_status; +@@ -181,7 +181,7 @@ + } + + static STREAM +-cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in) ++cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in) + { + OM_uint32 major_status; + OM_uint32 minor_status; diff --git a/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild new file mode 100644 index 000000000000..8a54a1e507b3 --- /dev/null +++ b/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools eutils + +MY_PV=${PV/_/-} + +DESCRIPTION="A Remote Desktop Protocol Client" +HOMEPAGE="http://www.rdesktop.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr" + +S=${WORKDIR}/${PN}-${MY_PV} + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXau + x11-libs/libXdmcp + alsa? ( media-libs/alsa-lib ) + ao? ( >=media-libs/libao-0.8.6 ) + kerberos? ( virtual/krb5 ) + libsamplerate? ( media-libs/libsamplerate ) + pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) + xrandr? ( x11-libs/libXrandr )" +DEPEND="${RDEPEND} + x11-libs/libXt" +BDEPEND=virtual/pkgconfig + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch + "${FILESDIR}"/${PN}-1.8.3-no_strip.patch + "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch + "${FILESDIR}"/${PN}-1.8.4-libressl.patch + "${FILESDIR}"/${P}-use_standard_gssapi.patch +) + +DOCS=( doc/HACKING doc/TODO doc/keymapping.txt ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + if use ao; then + sound_conf=$(use_with ao sound libao) + else if use alsa; then + sound_conf=$(use_with alsa sound alsa) + else + sound_conf=$(use_with oss sound oss) + fi + fi + + econf \ + --with-openssl="${EPREFIX}"/usr \ + $(use_with debug) \ + $(use_with ipv6) \ + $(use_with libsamplerate) \ + $(use_with xrandr) \ + $(use_enable kerberos credssp) \ + $(use_enable pcsc-lite smartcard) \ + ${sound_conf} +} diff --git a/net-misc/rdesktop/rdesktop-1.8.5.ebuild b/net-misc/rdesktop/rdesktop-1.8.5.ebuild deleted file mode 100644 index 263856080895..000000000000 --- a/net-misc/rdesktop/rdesktop-1.8.5.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils - -MY_PV=${PV/_/-} - -DESCRIPTION="A Remote Desktop Protocol Client" -HOMEPAGE="http://www.rdesktop.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr" - -S=${WORKDIR}/${PN}-${MY_PV} - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - alsa? ( media-libs/alsa-lib ) - ao? ( >=media-libs/libao-0.8.6 ) - kerberos? ( virtual/krb5 ) - libsamplerate? ( media-libs/libsamplerate ) - pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - x11-libs/libXt" -BDEPEND=virtual/pkgconfig - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch - "${FILESDIR}"/${PN}-1.8.3-no_strip.patch - "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch - "${FILESDIR}"/${PN}-1.8.4-libressl.patch -) - -DOCS=( doc/HACKING doc/TODO doc/keymapping.txt ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use ao; then - sound_conf=$(use_with ao sound libao) - else if use alsa; then - sound_conf=$(use_with alsa sound alsa) - else - sound_conf=$(use_with oss sound oss) - fi - fi - - econf \ - --with-openssl="${EPREFIX}"/usr \ - $(use_with debug) \ - $(use_with ipv6) \ - $(use_with libsamplerate) \ - $(use_with xrandr) \ - $(use_enable kerberos credssp) \ - $(use_enable pcsc-lite smartcard) \ - ${sound_conf} -} -- cgit v1.2.3-65-gdbad