Non-maintainer-commit: Version bump for security bug #220911, marking package as maintainer-needed.

(Portage version: 2.1.5_rc4)

3 files changed, 77 insertions, 7 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index ce6a7199db91..b2654163a282 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdesktop
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.101 2007/09/27 14:03:50 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.102 2008/05/14 16:42:57 rbu Exp $
+
+*rdesktop-1.6.0 (14 May 2008)
+
+  14 May 2008; Robert Buchholz <rbu@gentoo.org> metadata.xml,
+  +rdesktop-1.6.0.ebuild:
+  Non-maintainer-commit: Version bump for security bug #220911, marking
+  package as maintainer-needed.
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> rdesktop-1.5.0-r3.ebuild:
   sparc stable wrt #190927
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index 242202863007..7be3f0576fd7 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>mjolnir@gentoo.org</email>
-  <name>Martin Jackson</name>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
 <longdescription>
-an open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
+An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
 </longdescription>
 </pkgmetadata>
diff --git a/net-misc/rdesktop/rdesktop-1.6.0.ebuild b/net-misc/rdesktop/rdesktop-1.6.0.ebuild
new file mode 100644
index 000000000000..c47145385d7f
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0.ebuild,v 1.1 2008/05/14 16:42:57 rbu Exp $
+
+inherit 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-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ao debug ipv6 oss"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND=">=dev-libs/openssl-0.9.6b
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	ao? ( >=media-libs/libao-0.8.6 )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_compile() {
+	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	if use oss; then
+		extra_conf=`use_with oss sound`
+	else
+		extra_conf=`use_with ao sound libao`
+	fi
+
+	econf \
+		--with-openssl=/usr \
+		`use_with debug` \
+		`use_with ipv6` \
+		${extra_conf} \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	make 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
+}