[gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2015-09-14  9:52 Bernard Cafarelli
  0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2015-09-14  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e2580ebfc62c357aa1d82cedd08607bc628eb638
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 09:49:46 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 09:50:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2580ebf

net-misc/rdesktop: fix libXrandr automagic dep, bug #542952

Drop unneeded patch
Fix openssl slot

Package-Manager: portage-2.2.20.1

 .../files/rdesktop-1.8.3-xrandr_configure.patch    | 17 +++++
 net-misc/rdesktop/metadata.xml                     |  1 +
 net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild         | 75 ++++++++++++++++++++++
 3 files changed, 93 insertions(+)

diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
new file mode 100644
index 0000000..f57a86b
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig	2015-09-14 11:27:54.974472081 +0200
++++ configure.ac	2015-09-14 11:34:37.729155044 +0200
+@@ -151,9 +151,12 @@
+ AC_SUBST(CREDSSPOBJ)
+ 
+ # xrandr
+-if test -n "$PKG_CONFIG"; then
+-    PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
++AC_ARG_WITH([xrandr], AS_HELP_STRING([--without-xrandr], [Build without Xrandr library (default: true)]))
++AS_IF([test "x$with_xrandr" != "xno"], [
++    if test -n "$PKG_CONFIG"; then
++        PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
+ fi
++])
+ if test x"$HAVE_XRANDR" = "x1"; then
+     CFLAGS="$CFLAGS $XRANDR_CFLAGS"
+     LIBS="$LIBS $XRANDR_LIBS"

diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index cbeac87..5c63e86 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -11,6 +11,7 @@ An open source client for Windows NT Terminal Server and Windows 2000/2003 Termi
   <use>
     <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
     <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
+	<flag name='xrandr'>Enable XRandR window extension support</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">rdesktop</remote-id>

diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
new file mode 100644
index 0000000..397dc20
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND=">=dev-libs/openssl-0.9.6b:=
+	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? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependencies
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	epatch "${FILESDIR}"/${P}-xrandr_configure.patch
+
+	epatch_user
+
+	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}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2015-11-10 13:01 Bernard Cafarelli
  0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2015-11-10 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ac7e61d3fd40ede3f4f4416965ab7c8d91eee219
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 11:11:17 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 13:00:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7e61d3

net-misc/rdesktop: drop old versions

Package-Manager: portage-2.2.24

 net-misc/rdesktop/Manifest                         |   3 -
 .../files/rdesktop-1.6.0-smartcard_configure.patch |  22 ----
 net-misc/rdesktop/files/rdesktop-keymap-additional |  64 -----------
 net-misc/rdesktop/files/rdesktop-keymap-cs         | 122 --------------------
 net-misc/rdesktop/files/rdesktop-keymap-sk         | 124 ---------------------
 net-misc/rdesktop/rdesktop-1.7.1.ebuild            |  82 --------------
 net-misc/rdesktop/rdesktop-1.8.1.ebuild            |  84 --------------
 net-misc/rdesktop/rdesktop-1.8.2.ebuild            |  84 --------------
 8 files changed, 585 deletions(-)

diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 0b465ef..b6ab01d 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,4 +1 @@
-DIST rdesktop-1.7.1.tar.gz 298808 SHA256 d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479 SHA512 aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc WHIRLPOOL a186bbf3200af87ef6e111210e3dbf9d71f2a495c44dca583673466ccc9f67606a9a9c2bf3c801addd7c3b1af26a0a03e4e63b15bb72a52d7cfb4e4f381596ae
-DIST rdesktop-1.8.1.tar.gz 314198 SHA256 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 SHA512 31f13bf644ef16939a8c6c12709b89f59b0de276cc113c5e43ba505c5a352f515fdd1302c32f3095caca66796c9a15d574374391b4a67745fa505512499ed071 WHIRLPOOL f4df2b07c3e157c0fdd38a6477008bd0f4aa256f423a6a4d8bb53538028ff484776b74b171343d19ea4f508ae84e1dc758b26a5810052f94978d0fca9b4e3190
-DIST rdesktop-1.8.2.tar.gz 318270 SHA256 fbbf23d49d34c215c5a59b2d91c008b61ead4c9fbe1ccb7223973aed24061a78 SHA512 45b3e3220bcb2584cdfa3139c5b38775d55ab3c6c4cb6e46e4032965f5dc546682a733b5764760f20b7b6f40bb412ef0f67509f1344e69b342bbf9e9aca45bcf WHIRLPOOL 284b0746aaf9334992f1b485e4db25daeacfe5c5ade3403d94f1bf8b939ae45d22166a8a58014c51f4ebcc3e6211da44b6bacda4d89f0e9879e43c1a81ca3794
 DIST rdesktop-1.8.3.tar.gz 320212 SHA256 88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4 SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d WHIRLPOOL 24d12882ab04fe535fea6e59b78df2e8c23634703ab13bb385446a6e8c49703ca7344053cf1f6bbc4fecc04ce21354a9e5d3a0261b3d3c015289c2ec3b8af8c3

diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch
deleted file mode 100644
index a237966..0000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig	2009-07-05 16:13:23.000000000 +0200
-+++ configure.ac	2009-07-05 16:19:39.000000000 +0200
-@@ -108,7 +108,10 @@
- AC_ARG_ENABLE(smartcard, 
-              [  --enable-smartcard	  Enables smart-card support.
- 	     ],
--             [ 
-+             [
-+			  if test "$enableval" = no; then
-+				  WITH_SCARD=0
-+			  else
- 	     	case "$OSTYPE" in
- 			darwin*)
- 				AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0])
-@@ -143,6 +146,7 @@
- 			[AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])],
- 			[AC_MSG_RESULT(no)]
- 		)
-+		fi
-              ])
- 
- AC_SUBST(SCARDOBJ)

diff --git a/net-misc/rdesktop/files/rdesktop-keymap-additional b/net-misc/rdesktop/files/rdesktop-keymap-additional
deleted file mode 100644
index 04a03a5..0000000
--- a/net-misc/rdesktop/files/rdesktop-keymap-additional
+++ /dev/null
@@ -1,64 +0,0 @@
-#Additional sequences
-#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
-
-sequence ecaron dead_caron e
-sequence Ecaron dead_caron E
-sequence eogonek dead_ogonek e
-sequence Eogonek dead_ogonek E
-
-sequence rcaron dead_caron r
-sequence Rcaron dead_caron R
-sequence racute dead_acute r
-sequence Racute dead_acute R
-
-sequence tcaron dead_caron t
-sequence Tcaron dead_caron T
-sequence tcedilla dead_cedilla t
-sequence Tcedilla dead_cedilla T
-
-sequence zcaron dead_caron z
-sequence Zcaron dead_caron Z
-sequence zacute dead_acute z
-sequence Zacute dead_acute Z
-sequence zabovedot dead_abovedot z
-sequence Zabovedot dead_abovedot Z
-
-sequence uring dead_abovering u
-sequence Uring dead_abovering U
-sequence udoubleacute dead_doubleacute u
-sequence Udoubleacute dead_doubleacute U
-
-sequence odoubleacute dead_doubleacute o
-sequence Odoubleacute dead_doubleacute O
-
-sequence aogonek dead_ogonek a
-sequence Aogonek dead_ogonek A
-sequence abreve dead_breve a
-sequence Abreve dead_breve A
-
-sequence scaron dead_caron s
-sequence Scaron dead_caron S
-sequence sacute dead_acute s
-sequence Sacute dead_acute S
-sequence scedilla dead_cedilla s
-sequence Scedilla dead_cedilla S
-
-sequence dcaron dead_caron d
-sequence Dcaron dead_caron D
-
-sequence gbreve dead_breve g
-sequence Gbreve dead_breve G
-
-sequence lcaron dead_caron l
-sequence Lcaron dead_caron L
-sequence lacute dead_acute l
-sequence Lacute dead_acute L
-
-sequence ccaron dead_caron c
-sequence Ccaron dead_caron C
-
-sequence ncaron dead_caron n
-sequence Ncaron dead_caron N
-sequence nacute dead_acute n
-sequence Nacute dead_acute N
-

diff --git a/net-misc/rdesktop/files/rdesktop-keymap-cs b/net-misc/rdesktop/files/rdesktop-keymap-cs
deleted file mode 100644
index 0467628..0000000
--- a/net-misc/rdesktop/files/rdesktop-keymap-cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#Czech keymap
-#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
-include common
-include additional
-map 0x405
-
-semicolon 0x29
-dead_abovering 0x29 shift
-
-plus 0x02
-1 0x02 shift
-dead_tilde 0x02 altgr
-asciitilde 0x02 altgr
-
-ecaron 0x03
-2 0x03 shift
-dead_caron 0x03 altgr
-
-scaron 0x04
-3 0x04 shift
-dead_circumflex 0x04 altgr
-
-ccaron 0x05
-4 0x05 shift
-dead_breve 0x05 altgr
-
-rcaron 0x06
-5 0x06 shift
-dead_abovering 0x06 altgr
-
-zcaron 0x07
-6 0x07 shift
-dead_ogonek 0x07 altgr
-
-yacute 0x08
-7 0x08 shift
-dead_grave 0x08 altgr
-
-aacute 0x09
-8 0x09 shift
-dead_abovedot 0x08 altgr
-
-iacute 0x0a
-9 0x0a shift
-dead_acute 0x08 altgr
-
-eacute 0x0b
-0 0x0b shift
-dead_doubleacute 0x0b altgr
-
-equal 0x0c
-percent 0x0c shift
-dead_macron 0x0c altgr
-
-dead_acute 0x0d
-dead_caron 0x0d shift
-dead_cedilla 0x0d altgr
-
-backslash 0x10 altgr
-
-bar 0x11 altgr
-
-EuroSign 0x12 altgr
-
-z 0x15 addupper
-
-uacute 0x1a
-slash 0x1a shift
-division 0x1a altgr
-
-parenright 0x1b
-parenleft 0x1b shift
-multiply 0x1b altgr
-
-dead_diaeresis 0x2b
-apostrophe 0x2b shift
-currency 0x2b altgr
-
-dstroke 0x1f altgr
-
-Dstroke 0x20 altgr
-
-bracketleft 0x21 altgr
-
-bracketright 0x22 altgr
-
-lstroke 0x25 altgr
-
-Lstroke 0x26 altgr
-
-uring 0x27
-quotedbl 0x27 shift
-dollar 0x27 altgr
-
-section 0x28
-exclam 0x28 shift
-ssharp 0x28 altgr
-
-y 0x2c addupper
-
-numbersign 0x2d altgr
-
-ampersand 0x2e altgr
-
-at 0x2f altgr
-
-braceleft 0x30 altgr
-
-braceright 0x31 altgr
-
-comma 0x33
-question 0x33 shift
-less 0x33 altgr
-
-period 0x34
-colon 0x34 shift
-greater 0x34 altgr
-
-minus 0x35
-underscore 0x35 shift
-asterisk 0x35 altgr
-

diff --git a/net-misc/rdesktop/files/rdesktop-keymap-sk b/net-misc/rdesktop/files/rdesktop-keymap-sk
deleted file mode 100644
index afa1a3b..0000000
--- a/net-misc/rdesktop/files/rdesktop-keymap-sk
+++ /dev/null
@@ -1,124 +0,0 @@
-#Slovak keymap
-#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
-include common
-include additional
-map 0x41B
-
-semicolon 0x29
-dead_abovering 0x29 shift
-
-plus 0x02
-1 0x02 shift
-dead_tilde 0x02 altgr
-asciitilde 0x02 altgr
-
-lcaron 0x03
-2 0x03 shift
-dead_caron 0x03 altgr
-
-scaron 0x04
-3 0x04 shift
-dead_circumflex 0x04 altgr
-
-ccaron 0x05
-4 0x05 shift
-dead_breve 0x05 altgr
-
-tcaron 0x06
-5 0x06 shift
-dead_abovering 0x06 altgr
-
-zcaron 0x07
-6 0x07 shift
-dead_ogonek 0x07 altgr
-
-yacute 0x08
-7 0x08 shift
-dead_grave 0x08 altgr
-
-aacute 0x09
-8 0x09 shift
-dead_abovedot 0x08 altgr
-
-iacute 0x0a
-9 0x0a shift
-dead_acute 0x08 altgr
-
-eacute 0x0b
-0 0x0b shift
-dead_doubleacute 0x0b altgr
-
-equal 0x0c
-percent 0x0c shift
-dead_diaeresis 0x0c altgr
-
-dead_acute 0x0d
-dead_caron 0x0d shift
-dead_cedilla 0x0d altgr
-
-backslash 0x10 altgr
-
-bar 0x11 altgr
-
-EuroSign 0x12 altgr
-
-z 0x15 addupper
-
-apostrophe 0x19 altgr
-
-uacute 0x1a
-slash 0x1a shift
-division 0x1a altgr
-
-adiaeresis 0x1b
-parenleft 0x1b shift
-multiply 0x1b altgr
-
-ncaron 0x2b
-parenright 0x2b shift
-currency 0x2b altgr
-
-dstroke 0x1f altgr
-
-Dstroke 0x20 altgr
-
-bracketleft 0x21 altgr
-
-bracketright 0x22 altgr
-
-lstroke 0x25 altgr
-
-Lstroke 0x26 altgr
-
-ocircumflex 0x27
-quotedbl 0x27 shift
-dollar 0x27 altgr
-
-section 0x28
-exclam 0x28 shift
-ssharp 0x28 altgr
-
-y 0x2c addupper
-
-numbersign 0x2d altgr
-
-ampersand 0x2e altgr
-
-at 0x2f altgr
-
-braceleft 0x30 altgr
-
-braceright 0x31 altgr
-
-comma 0x33
-question 0x33 shift
-less 0x33 altgr
-
-period 0x34
-colon 0x34 shift
-greater 0x34 altgr
-
-minus 0x35
-underscore 0x35 shift
-asterisk 0x35 altgr
-

diff --git a/net-misc/rdesktop/rdesktop-1.7.1.ebuild b/net-misc/rdesktop/rdesktop-1.7.1.ebuild
deleted file mode 100644
index b6f492a..0000000
--- a/net-misc/rdesktop/rdesktop-1.7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# Fix --enable-smartcard logic
-	epatch "${FILESDIR}"/${PN}-1.6.0-smartcard_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	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_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/HACKING doc/TODO doc/keymapping.txt
-
-	# For #180313 - applies to versions >= 1.5.0
-	# Fixes sf.net bug
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}

diff --git a/net-misc/rdesktop/rdesktop-1.8.1.ebuild b/net-misc/rdesktop/rdesktop-1.8.1.ebuild
deleted file mode 100644
index 97628de..0000000
--- a/net-misc/rdesktop/rdesktop-1.8.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	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? ( net-libs/libgssglue )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	epatch_user
-
-	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_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/HACKING doc/TODO doc/keymapping.txt
-
-	# For #180313 - applies to versions >= 1.5.0
-	# Fixes sf.net bug
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}

diff --git a/net-misc/rdesktop/rdesktop-1.8.2.ebuild b/net-misc/rdesktop/rdesktop-1.8.2.ebuild
deleted file mode 100644
index 97628de..0000000
--- a/net-misc/rdesktop/rdesktop-1.8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	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? ( net-libs/libgssglue )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	epatch_user
-
-	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_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/HACKING doc/TODO doc/keymapping.txt
-
-	# For #180313 - applies to versions >= 1.5.0
-	# Fixes sf.net bug
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2020-01-17 14:42 Bernard Cafarelli
  0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2020-01-17 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     6f47443f187582756e6817bf73647c524823c4c2
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 14:42:06 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 14:42:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f47443f

net-misc/rdesktop: backport an upstream segfault fix

This usually happens after "Retrying with plain RDP" message

Closes: https://bugs.gentoo.org/705550
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch    | 26 ++++++++
 net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild         | 78 ++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch
new file mode 100644
index 00000000000..7ac0067da61
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch
@@ -0,0 +1,26 @@
+From 53ba87dc174175e98332e22355ad8662c02880d6 Mon Sep 17 00:00:00 2001
+From: Markus Beth <markus.beth@zkrd.de>
+Date: Mon, 2 Dec 2019 11:22:13 +0100
+Subject: [PATCH] use correct modulus and exponent in rdssl_rkey_get_exp_mod
+
+---
+ ssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ssl.c b/ssl.c
+index 930c7f94..0681a890 100644
+--- a/ssl.c
++++ b/ssl.c
+@@ -307,10 +307,10 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
+ {
+ 	size_t outlen;
+ 
+-	outlen = (mpz_sizeinbase(modulus, 2) + 7) / 8;
++	outlen = (mpz_sizeinbase(rkey->n, 2) + 7) / 8;
+ 	if (outlen > max_mod_len)
+ 		return 1;
+-	outlen = (mpz_sizeinbase(exponent, 2) + 7) / 8;
++	outlen = (mpz_sizeinbase(rkey->e, 2) + 7) / 8;
+ 	if (outlen > max_exp_len)
+ 		return 1;
+ 

diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild
new file mode 100644
index 00000000000..1f8cd581a11
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 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 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.2.0:0=
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsamplerate
+	)
+	ao? (
+		>=media-libs/libao-0.8.6
+		media-libs/libsamplerate
+	)
+	kerberos? ( virtual/krb5 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	oss? ( media-libs/libsamplerate )
+	pulseaudio? (
+		media-libs/libsamplerate
+		media-sound/pulseaudio
+	)
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch
+)
+
+DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use pulseaudio; then
+		sound_conf="--with-sound=pulse"
+	elif use ao; then
+		sound_conf="--with-sound=libao"
+	elif use alsa; then
+		sound_conf="--with-sound=alsa"
+	else
+		sound_conf=$(use_with oss sound oss)
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2021-05-01 18:07 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-05-01 18:07 UTC (permalink / raw
  To: gentoo-commits

commit:     05a6a738e36a6ca89865fd8371b58b2cc0cfa3cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 17:36:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:06:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a6a738

net-misc/rdesktop: cleanup obsolete LibreSSL patches

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch | 16 ----------------
 net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild            |  1 -
 net-misc/rdesktop/rdesktop-1.8.6.ebuild               |  1 -
 3 files changed, 18 deletions(-)

diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
deleted file mode 100644
index b56cbfc3053..00000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/ssl.c b/ssl.c
-index 07d7aa5..45df34f 100644
---- a/ssl.c
-+++ b/ssl.c
-@@ -225,7 +225,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
- 	BIGNUM *e = NULL;
- 	BIGNUM *n = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L  || defined(LIBRESSL_VERSION_NUMBER))
- 	e = rkey->e;
- 	n = rkey->n;
- #else
--- 
-2.20.1
-

diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
index 846fe239b10..aa98e027770 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
@@ -37,7 +37,6 @@ 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}"/${PN}-1.8.5-use_standard_gssapi.patch
 	"${FILESDIR}"/${P}-sec_decrypt.patch
 )

diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
index 1c7e7ed745b..b81e1b57614 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -37,7 +37,6 @@ 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}"/${PN}-1.8.5-use_standard_gssapi.patch
 )
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2021-06-14 10:39 Bernard Cafarelli
  0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2021-06-14 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     306bdb55155f591c4f6c0b75403d692a3edbc121
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 10:36:48 2021 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 10:39:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306bdb55

net-misc/rdesktop: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 net-misc/rdesktop/Manifest                         |  1 -
 .../files/rdesktop-1.6.0-sound_configure.patch     | 15 -----
 .../files/rdesktop-1.8.5-use_standard_gssapi.patch | 56 -----------------
 .../files/rdesktop-1.8.6-sec_decrypt.patch         | 59 ------------------
 net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild         | 70 ----------------------
 net-misc/rdesktop/rdesktop-1.8.6.ebuild            | 69 ---------------------
 6 files changed, 270 deletions(-)

diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index fd6f2357f09..353ae1d26fd 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,2 +1 @@
-DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5

diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
deleted file mode 100644
index b2f492b1071..00000000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rdesktop.orig/configure.ac	2009-06-30 10:35:14.000000000 +0200
-+++ rdesktop/configure.ac		2009-06-30 11:35:10.000000000 +0200
-@@ -228,7 +228,11 @@
- if test -n "$PKG_CONFIG"; then
-     PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
-     PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
--    PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+    AC_ARG_WITH(libsamplerate,
-+        [  --without-libsamplerate disable libsamplerate support])
-+    if test "x$with_libsamplerate" != "xno"; then
-+        PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+    fi
-     if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
-         AC_DEFINE(HAVE_LIBSAMPLERATE)
-         if test x"$static_libsamplerate" = "xyes"; then

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
deleted file mode 100644
index a5e14c3aff0..00000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
deleted file mode 100644
index dbb0d0e9baf..00000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
-From: Markus Beth <markus.beth@web.de>
-Date: Tue, 11 Jun 2019 22:57:31 +0200
-Subject: [PATCH] sec_decrypt() the correct amount of data
-
-Save the correct amount of data to sec_decrypt() because after
-inout_uint8p() the macro s_remaining(s) will find nothing left.
----
- secure.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/secure.c b/secure.c
-index 8f65b3aa..9b301e1f 100644
---- a/secure.c
-+++ b/secure.c
-@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
- 	STREAM s;
- 	struct stream packet;
- 	size_t data_offset;
-+	size_t remaining;
- 	unsigned char *data;
- 
- 	while ((s = mcs_recv(&channel, rdpver)) != NULL)
-@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 
- 					s_seek(s, data_offset);
- 				}
-@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 				}
- 
- 				if (sec_flags & SEC_LICENCE_NEG)
-@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 
- 					/* Check for a redirect packet, starts with 00 04 */
- 					if (data[0] == 0 && data[1] == 4)

diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
deleted file mode 100644
index aa98e027770..00000000000
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-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 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="
-	dev-libs/openssl:0=
-	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.5-use_standard_gssapi.patch
-	"${FILESDIR}"/${P}-sec_decrypt.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.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
deleted file mode 100644
index b81e1b57614..00000000000
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-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 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="
-	dev-libs/openssl:0=
-	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.5-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}
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2021-06-14 10:39 Bernard Cafarelli
  0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2021-06-14 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     22a231dabf0ace29c93d901f084227f98fa2fb30
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 10:39:18 2021 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 10:39:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a231da

net-misc/rdesktop: fix gss-api check, thanks bircoph

Closes: https://bugs.gentoo.org/791460
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../files/rdesktop-1.9.0-gssapi-check.patch        | 12 ++++
 net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild         | 79 ++++++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
new file mode 100644
index 00000000000..71ada770399
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
@@ -0,0 +1,12 @@
+--- rdesktop-1.9.0/configure.ac.orig	2021-05-22 14:38:14.854099405 +0300
++++ rdesktop-1.9.0/configure.ac	2021-05-22 14:43:41.476323564 +0300
+@@ -84,6 +84,9 @@
+ 				fi
+ 				;;
+ 			*)
++				if test -n "$PKG_CONFIG"; then
++					PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++				fi
+ 				;;
+ 			esac
+ 		else

diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
new file mode 100644
index 00000000000..1f5e5559a2b
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+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 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.2.0:0=
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsamplerate
+	)
+	ao? (
+		>=media-libs/libao-0.8.6
+		media-libs/libsamplerate
+	)
+	kerberos? ( virtual/krb5 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	oss? ( media-libs/libsamplerate )
+	pulseaudio? (
+		media-libs/libsamplerate
+		media-sound/pulseaudio
+	)
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch
+	"${FILESDIR}"/${P}-gssapi-check.patch
+)
+
+DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use pulseaudio; then
+		sound_conf="--with-sound=pulse"
+	elif use ao; then
+		sound_conf="--with-sound=libao"
+	elif use alsa; then
+		sound_conf="--with-sound=alsa"
+	else
+		sound_conf=$(use_with oss sound oss)
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/
@ 2023-04-22 16:54 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-04-22 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8c4b2ca299d38a6389a34ec33d16ab0602d33ef0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 16:50:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 16:50:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4b2ca2

net-misc/rdesktop: fix configure w/ clang 16

Closes: https://bugs.gentoo.org/900310
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/rdesktop-1.9.0-configure-clang16.patch   | 28 ++++++++++++++++++++++
 ...op-1.9.0-r2.ebuild => rdesktop-1.9.0-r3.ebuild} |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch
new file mode 100644
index 000000000000..7222fdbb1e46
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/900310
+https://github.com/rdesktop/rdesktop/pull/407
+
+From 0a38f855c2f6bb197539fbb9ec0ce5a97775a178 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 18 Apr 2023 09:55:39 +0200
+Subject: [PATCH] configure.ac: Fix statvfs64 check for C99 compatibility
+
+C99 does not support implicit ints and implicit function declarations
+(such as exit here).  Avoid them, so that the configure check does
+not fail unconditionally with such compilers.
+--- a/configure.ac
++++ b/configure.ac
+@@ -668,12 +668,13 @@ if test $space = no; then
+   # SVR4
+   AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64,
+   [AC_TRY_RUN([
++#include <stdlib.h>
+ #if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #endif
+ #include <sys/types.h>
+ #include <sys/statvfs.h>
+-  main ()
++  int main (void)
+   {
+     struct statvfs64 fsd;
+     exit (statvfs64 (".", &fsd));

diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild
similarity index 95%
rename from net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
rename to net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild
index 4d21768aeb01..c62a294dd291 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
 	"${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch
 	"${FILESDIR}"/${P}-gssapi-check.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-04-22 16:54 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-22 16:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-06-14 10:39 Bernard Cafarelli
2021-06-14 10:39 Bernard Cafarelli
2021-05-01 18:07 Sam James
2020-01-17 14:42 Bernard Cafarelli
2015-11-10 13:01 Bernard Cafarelli
2015-09-14  9:52 Bernard Cafarelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox