-r2 to solve sec problem

(Portage version: 2.0.51-r15)

6 files changed, 87 insertions, 8 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index 2cc9bd2f9252..2aad37321392 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xview
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.10 2005/01/16 15:16:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.11 2005/02/17 11:22:16 humpback Exp $
+
+*xview-3.2-r2 (17 Feb 2005)
+
+  17 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +xview-3.2-r2.ebuild:
+  Adding -r2 with debian patch to solve security problem reported in bug #78118.
 
   16 Jan 2005; Guy Martin <gmsoft@gentoo.org> xview-3.2-r1.ebuild:
   Stable on hppa.
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index db75b3bbbcd3..a34f86948acb 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,6 +1,8 @@
-MD5 076155ab88c1bf88b05e62fdda0ac186 ChangeLog 1237
+MD5 02f2ec1c6f480110a95055eb6499732a ChangeLog 1427
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 2956482c064b0374985ad6db5ef13733 xview-3.2-r1.ebuild 2598
-MD5 04c02bf97fbaebbfe9b15f508cea880a xview-3.2.ebuild 2283
+MD5 0fbac810c77a873bf42d89e7d7e41911 xview-3.2-r1.ebuild 2598
+MD5 5df59d2f1c14918faf54f49fe92920e1 xview-3.2-r2.ebuild 2606
+MD5 5f07e3668029ca00564ba32a0aa0f732 xview-3.2.ebuild 2283
 MD5 6de3c812dee458777db24502d252984f files/digest-xview-3.2 138
 MD5 48636f5ace70cc3f5033a87188e4e7bf files/digest-xview-3.2-r1 138
+MD5 cd3869ae1beab1d2ac84fe48cc35d358 files/digest-xview-3.2-r2 144
diff --git a/x11-libs/xview/files/digest-xview-3.2-r2 b/x11-libs/xview/files/digest-xview-3.2-r2
new file mode 100644
index 000000000000..a3d92627b655
--- /dev/null
+++ b/x11-libs/xview/files/digest-xview-3.2-r2
@@ -0,0 +1,2 @@
+MD5 b9ff26d6ad378af320bac45154ceaeba xview-3.2p1.4.src.tar.gz 3227552
+MD5 526f16dcd2164713e792e19b9c9a42c2 xview_3.2p1.4-16woody2.diff.gz 65663
diff --git a/x11-libs/xview/xview-3.2-r1.ebuild b/x11-libs/xview/xview-3.2-r1.ebuild
index a23cd8d3bcbe..15343b113e7d 100644
--- a/x11-libs/xview/xview-3.2-r1.ebuild
+++ b/x11-libs/xview/xview-3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r1.ebuild,v 1.4 2005/01/16 15:16:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r1.ebuild,v 1.5 2005/02/17 11:22:16 humpback Exp $
 
 inherit eutils
 
diff --git a/x11-libs/xview/xview-3.2-r2.ebuild b/x11-libs/xview/xview-3.2-r2.ebuild
new file mode 100644
index 000000000000..460fa40dee27
--- /dev/null
+++ b/x11-libs/xview/xview-3.2-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r2.ebuild,v 1.1 2005/02/17 11:22:16 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/libs/X/xview/"
+
+MY_PN="${P}p1.4"
+
+# This is our compound patch derived from debian. We use it because:
+#  * xview is a contribution made to Sun Microsystems (?) to the X community, but
+#    fixes for it don't appear to be around other than in the other free distributions.
+#  * It does little harm, only some defaults are changed which we can redefine anyway
+SRC_PATCH="${MY_PN/-/_}-16woody2.diff"
+
+# We use the xview tarball available from the X organization, but xfree86 appears
+# to be up and available more often so we use that (it's their primary mirror).
+SRC_URI="http://www.ibiblio.org/pub/Linux/libs/X/xview/${MY_PN}.src.tar.gz
+		 mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz"
+S=${WORKDIR}/${MY_PN}
+LICENSE="sun-openlook"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack $A
+	cd $S
+	epatch ../${SRC_PATCH}
+}
+
+src_compile() {
+	# Create the makefile
+	imake -DUseInstalled -I${S}/config -I/usr/X11R6/lib/X11/config \
+		|| die "imake failed"
+
+	# This is crazy and I know it, but wait till you read the code in 
+	# Build-LinuxXView.bash.
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash libs \
+		|| die "building libs failed"
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash clients \
+		|| die "building clients failed"
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash contrib \
+		|| die "building contrib failed"
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash olvwm \
+		|| die "building olvwm failed"
+}
+
+src_install() {
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instlibs \
+		|| die "installing libs failed"
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instclients \
+		|| die "installing clients failed"
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instcontrib \
+		|| die "installing contrib failed"
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instolvwm \
+		|| die "installing olvwm failed"
+	cd ${D}/usr
+	ln -s X11R6 openwin
+
+	# The rest of the docs is already installed 
+	cd ${S}/doc
+	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt \
+		dnd_api.txt whats_new.ps bugform config/usenixws/paper.ps
+	rm -rf ${D}/usr/X11R6/share/doc/xview && rm -rf ${D}/usr/X11R6/share/doc
+}
diff --git a/x11-libs/xview/xview-3.2.ebuild b/x11-libs/xview/xview-3.2.ebuild
index 59244fcb299f..6001096b13a8 100644
--- a/x11-libs/xview/xview-3.2.ebuild
+++ b/x11-libs/xview/xview-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2.ebuild,v 1.8 2004/06/24 22:10:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2.ebuild,v 1.9 2005/02/17 11:22:16 humpback Exp $
 
 inherit eutils