Added patch to fix unsecure default DISPLAY, patch created by Gautam Iyer. See bug #219750. Dropped stable mips keyword.

Package-Manager: portage-2.1.5_rc6

6 files changed, 217 insertions, 11 deletions

diff --git a/x11-terms/mrxvt/ChangeLog b/x11-terms/mrxvt/ChangeLog
index 96eae5a71917..e562209fc473 100644
--- a/x11-terms/mrxvt/ChangeLog
+++ b/x11-terms/mrxvt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/mrxvt
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.60 2007/12/25 17:16:14 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.61 2008/04/30 07:02:27 nelchael Exp $
+
+*mrxvt-0.5.3-r2 (30 Apr 2008)
+
+  30 Apr 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mrxvt-0.5.3-display-security.patch, mrxvt-0.5.1.ebuild,
+  mrxvt-0.5.3-r1.ebuild, +mrxvt-0.5.3-r2.ebuild:
+  Added patch to fix unsecure default DISPLAY, patch created by Gautam Iyer.
+  See bug #219750. Dropped stable mips keyword.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931.
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 83f008a6c06b..bc7518f24744 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mrxvt-0.5.2-no_debug_x.patch 275 RMD160 869479674beda85d8511549a369d3fc8f56ac9d2 SHA1 8115c2c1f968c8adb15d3df3568846b0b739386b SHA256 a41c3eb4cf94fe7b059468983a2f533e0669d0204088fa5ece365b1663b560c7
+AUX mrxvt-0.5.3-display-security.patch 1955 RMD160 00a026429da646cc0c594a96d261f29a276fbf3b SHA1 af49d324e36b9a719fd6065a5bbf9279aa8fa272 SHA256 4d12ee8672170ee55fdc5fb1ccb624c976d3fcd3a0601e61dae4a38431a54559
 AUX mrxvt-0.5.3-no-scroll-with-buffer.patch 2182 RMD160 0b05e382fe8736617961d8790786ba0341945caf SHA1 303de6d33aa76892f24c6fac7b93ac21a945fda5 SHA256 5c7b6e0e4f07b35d8ed14ef2c87e8c57bfc4806dcd01f6ee14ef0b233c5b6932
 DIST mrxvt-0.5.1.tar.gz 711657 RMD160 fc133e9ae6835c5e0881909e77c6298128a9779c SHA1 f6d442341e1071c5eae42c08ecd50b97234a5392 SHA256 f33bbef378a59d4a209650d57822fdc4b4147a51200f0b30484509749c119d71
 DIST mrxvt-0.5.2.tar.gz 559242 RMD160 85ccf709be85dc91374b1c6c893059155ab5c26f SHA1 a8fba2500b1edfabdd794e899b74666b2d909692 SHA256 558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
 DIST mrxvt-0.5.3.tar.gz 592897 RMD160 76fbbd5ba20215dd7785eafa07dae909029194ec SHA1 442006f1d797ea5464c5c49d26d0cdecf79160f4 SHA256 e2327b7fdf1db3f2152d7cbda564f638ec11a4bed17f69e6de985c888ab5d411
-EBUILD mrxvt-0.5.1.ebuild 2755 RMD160 de1d98350d8934f755d39ed92944cd7aee73b988 SHA1 542aad4921e2089b43d2f37dfdc70cb513e17604 SHA256 5ba8ffea55496ddbfeaa036562497b57357da60a8f353406aa91b50a119602bc
+EBUILD mrxvt-0.5.1.ebuild 2757 RMD160 a177066ff13e2ab7d66225f3a5b63c5a94b3468a SHA1 49265545cfa9f36fcb43b907efde227c8b552130 SHA256 091c06363e5abe998b2e5c83c0d275f73a30755f70cac049d51d19946e61e8fc
 EBUILD mrxvt-0.5.2-r1.ebuild 3157 RMD160 ae99cedf295c8cdbe32b400f6241ea5098c432f4 SHA1 07eb40be1ba7c379f559d4fff87cb9962fc1fa0b SHA256 31f7b7cc3034ad471d047c7da78d1ba53b0453727f2374c86a9d2697657d1140
-EBUILD mrxvt-0.5.3-r1.ebuild 3269 RMD160 338d7ceb7be1f1cbd7f00d7f70dee95b172c28a6 SHA1 169947ce78eb7962959cf67cb0c3eb8026974f62 SHA256 95d50f653bcfe3826129cba0dd567506f5545a45288d7f3cccee0709cd57fa52
-MISC ChangeLog 8478 RMD160 407c151727800a4338bc5f34c02c5bc5b7320ead SHA1 a9b889e8fef8374a5eb416cd0eb81b96a69643ec SHA256 61a0ae249f24cca6bedf052141ea211870ea90bc3c3b79ddbf785d602ee7737e
+EBUILD mrxvt-0.5.3-r1.ebuild 3273 RMD160 2ec46091fdf9922f5a30c69ba546c860e8181095 SHA1 1609d27dca83ba664a9b234d439aa3e002171ad3 SHA256 c9b9bcfeda7dbb73ad1c8a2e3b9585ba7cacdeefeed7f8c4ffad9f5762a23708
+EBUILD mrxvt-0.5.3-r2.ebuild 3327 RMD160 9892a26456089abf9ce4a1d6b753119f995a7078 SHA1 0e9824f242952ca19ea2e56839266d51cc72f18b SHA256 d69c0234d51bf1ef46463ba35ddadcd485fb73c101bd8687be8e549882d25e36
+MISC ChangeLog 8804 RMD160 9fddf0bfabd2761876b7e0f1336731850734c18f SHA1 af7cb1f3a555b75f4ae4ae5588e050d89420379b SHA256 a1b38ba1da0ec2b7c2acfda9c113a4f0f9aa41abd1687598c038474786a978f1
 MISC metadata.xml 227 RMD160 4603991d222df002795ac3709a24e98165edd8d1 SHA1 ac9b347ba7ed1d5f92472126580ef32d63fb9bfa SHA256 ef0905299b05e713fbb019ae7ca5e3e6ebfbf32d47fdd4d803e96a3bda500f71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgYGYkACgkQgo/w9rxVVVGnBgCfa9rAUIxFmKNTJ2L+mCq7wFns
+a7YAoIorJRzQoIDLfHcrD1Aecc8UJE6l
+=jdMU
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.3-display-security.patch b/x11-terms/mrxvt/files/mrxvt-0.5.3-display-security.patch
new file mode 100644
index 000000000000..69f24d88eda4
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.3-display-security.patch
@@ -0,0 +1,64 @@
+Index: src/init.c
+===================================================================
+--- src/init.c	(revision 265)
++++ src/init.c	(working copy)
+@@ -1030,38 +1030,38 @@
+     /*
+      * Open display, get options/resources and create the window
+      */
+-    if (IS_NULL(rs[Rs_display_name] = getenv("DISPLAY")))
+-	rs[Rs_display_name] = ":0";
+-
+     rxvt_get_options( r, r_argc, r_argv );
+     rxvt_free( r_argv ); /* XXX memory leak? */
+ 
+ #ifdef LOCAL_X_IS_UNIX
+-    if( rs[Rs_display_name][0] == ':' )
++    /*
++     * 2008-04-29 gi1242: Force UNIX sockets for security (Gentoo Bug #219750)
++     */
++    if( IS_NULL( rs[Rs_display_name] ) )
++	rs[Rs_display_name] = getenv( "DISPLAY" );
++
++    if( rs[Rs_display_name] && rs[Rs_display_name][0] == ':' )
+     {
+-	int	l = 5 + STRLEN(rs[Rs_display_name]);
++	char *val;
++	int l = 5 + STRLEN(rs[Rs_display_name]);
+ 	if (l <= 0 || l > 1024) /* possible integer overflow */
+ 	    l = 1024;
++
+ 	val = rxvt_malloc(l);
+-	STRCPY(val, "unix");
+-	STRNCAT(val, rs[Rs_display_name], l-5);
+-	val[l-1] = (char) 0;
+-	rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n", val);
+-	r->Xdisplay = XOpenDisplay(val);
+-	rxvt_free(val);
++	STRCPY( val, "unix");
++	STRNCAT( val, rs[Rs_display_name], l-5);
++
++	rs[Rs_display_name] = val;
+     }
+-#endif
++#endif /* LOCAL_X_IS_UNIX */
+ 
+-    if (IS_NULL(r->Xdisplay))
++    rxvt_msg( DBG_INFO, DBG_INIT, "Open X display %s\n", rs[Rs_display_name] );
++    r->Xdisplay = XOpenDisplay( rs[Rs_display_name] );
++    if( IS_NULL(r->Xdisplay) )
+     {
+-	rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n",
+-		    rs[Rs_display_name] ? rs[Rs_display_name] : "nil");
+-	r->Xdisplay = XOpenDisplay( rs[Rs_display_name] );
+-	if (IS_NULL(r->Xdisplay))
+-	{
+-	    rxvt_msg (DBG_ERROR, DBG_INIT,  "can't open display %s", rs[Rs_display_name] );
+-	    exit( EXIT_FAILURE );
+-	}
++	rxvt_msg( DBG_ERROR, DBG_INIT, "Error opening display %s\n",
++		rs[Rs_display_name] );
++	exit( EXIT_FAILURE );
+     }
+ 
+ 
diff --git a/x11-terms/mrxvt/mrxvt-0.5.1.ebuild b/x11-terms/mrxvt/mrxvt-0.5.1.ebuild
index 7a90ec3609cd..b84266c8f14d 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.1.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.1.ebuild,v 1.8 2007/11/11 11:01:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.1.ebuild,v 1.9 2008/04/30 07:02:27 nelchael Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 mips ppc x86"
+KEYWORDS="alpha amd64 ~mips ppc x86"
 
 RDEPEND="png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
diff --git a/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild b/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild
index 168526316e2e..d921863ff064 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild,v 1.8 2007/11/20 05:30:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild,v 1.9 2008/04/30 07:02:27 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 mips ppc x86"
+KEYWORDS="alpha amd64 ~mips ppc x86"
 
 LINGUAS_IUSE="linguas_el linguas_ja linguas_ko linguas_th linguas_zh_CN linguas_zh_TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${LINGUAS_IUSE}"
diff --git a/x11-terms/mrxvt/mrxvt-0.5.3-r2.ebuild b/x11-terms/mrxvt/mrxvt-0.5.3-r2.ebuild
new file mode 100644
index 000000000000..345df6a4bb5d
--- /dev/null
+++ b/x11-terms/mrxvt/mrxvt-0.5.3-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.3-r2.ebuild,v 1.1 2008/04/30 07:02:27 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
+HOMEPAGE="http://materm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~x86"
+
+LINGUAS_IUSE="linguas_el linguas_ja linguas_ko linguas_th linguas_zh_CN linguas_zh_TW"
+IUSE="debug png jpeg session truetype menubar utempter xpm ${LINGUAS_IUSE}"
+
+RDEPEND="png? ( media-libs/libpng )
+	utempter? ( sys-libs/libutempter )
+	jpeg? ( media-libs/jpeg )
+	truetype? ( virtual/xft
+		media-libs/fontconfig
+		media-libs/freetype )
+	x11-libs/libX11
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )
+	x11-libs/libXrender"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-no-scroll-with-buffer.patch"
+	epatch "${FILESDIR}/${P}-display-security.patch"
+
+}
+
+src_compile() {
+
+	local myconf
+
+	# if you want to pass any other flags, use EXTRA_ECONF.
+	if use linguas_el ; then
+		myconf="${myconf} --enable-greek"
+	fi
+	if use linguas_ja ; then
+		# --with-encoding=sjis
+		myconf="${myconf} --enable-kanji --with-encoding=eucj"
+	fi
+	if use linguas_ko ; then
+		myconf="${myconf} --enable-kr --with-encoding=kr"
+	fi
+	if use linguas_th ; then
+		myconf="${myconf} --enable-thai"
+	fi
+	if use linguas_zh_CN ; then
+		# --with-encoding=gbk
+		myconf="${myconf} --enable-gb --with-encoding=gb"
+	fi
+	if use linguas_zh_TW ; then
+		myconf="${myconf} --enable-big5 --with-encoding=big5"
+	fi
+
+	# 2006-03-13 gi1242: mrxvt works best with TERM=rxvt AND correctly set
+	# termcap / terminfo entries. If the rxvt termcap / terminfo entries are
+	# messed up then then it's better to set TERM=xterm.
+	#
+	# Provide support for this by setting the or RXVT_TERM environment variables
+	# before emerging, as done in the rxvt ebuild.
+
+	if [[ -n ${RXVT_TERM} ]]; then
+		myconf="${myconf} --with-term=${RXVT_TERM}"
+	fi
+
+	econf \
+		--enable-everything \
+		--with-atab-extra=25 \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable xpm) \
+		$(use_enable session sessionmgr) \
+		$(use_enable truetype xft) \
+		$(use_enable utempter) \
+		$(use_enable menubar) \
+		${myconf} || die
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die
+	# Give mrxvt perms to update utmp
+	fowners root:utmp /usr/bin/mrxvt
+	fperms g+s /usr/bin/mrxvt
+	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	if [[ -z $RXVT_TERM ]]; then
+		einfo
+		einfo "If you experience problems with curses programs, then this is"
+		einfo "most likely because of incorrectly set termcap / terminfo"
+		einfo "entries. To fix this you can dry and run (as user)"
+		einfo "	tic /usr/share/doc/${P}/etc/mrxvt.terminfo"
+		einfo "Alternately, run the offending programs with TERM=xterm."
+		einfo
+		einfo "To emerge mrxvt with TERM=xterm by default, set the RXVT_TERM"
+		einfo "environment variable to 'xterm', or your desired default"
+		einfo "terminal name. Alternately you can put 'Mrxvt.termName: xterm'"
+		einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc."
+		einfo
+	fi
+
+}