fix CAN-2005-0605, bug #83656

(Portage version: 2.0.51-r15)

7 files changed, 240 insertions, 15 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index da63dca8e086..a65b19dc0bb2 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.46 2005/02/21 17:36:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.47 2005/03/02 16:58:10 lanius Exp $
+
+*lesstif-0.94.0-r2 (02 Mar 2005)
+
+  02 Mar 2005; Heinrich Wendel <lanius@gentoo.org> +files/CAN-2005-0605.patch,
+  +lesstif-0.94.0-r2.ebuild, +lesstif-0.94.0-r3.ebuild:
+  fix CAN-2005-0605, bug #83656
 
 *lesstif-0.94.0-r1 (20 Feb 2005)
 
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 083f342757dd..a6d7d049f7ed 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,20 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3ef578e5b60af3d34225bbd8876e1312 ChangeLog 6057
-MD5 fa5d70bc071b28f95c686985ce837400 lesstif-0.93.94.ebuild 2183
 MD5 217fc493f31fef3b4ebe2e11a1dd99eb lesstif-0.93.97.ebuild 2031
 MD5 a8bfd1fe6e2fb87e9426ef13d3b00a8d lesstif-0.94.0-r1.ebuild 1937
-MD5 ca6ecc032ac0934b8c737650d6550162 lesstif-0.94.0.ebuild 2039
+MD5 fa5d70bc071b28f95c686985ce837400 lesstif-0.93.94.ebuild 2183
+MD5 d823d09a91b13febae9428d6e65e5509 lesstif-0.94.0-r3.ebuild 2017
+MD5 09cbb06a0efe4a0b6e07e383bdf45230 lesstif-0.94.0-r2.ebuild 2126
+MD5 3ef578e5b60af3d34225bbd8876e1312 ChangeLog 6057
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 ca6ecc032ac0934b8c737650d6550162 lesstif-0.94.0.ebuild 2039
+MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0 68
+MD5 10373c1e87b0208cd26888011a4d92de files/CAN-2005-0605.patch 1194
 MD5 b7dab7983555719dd200f3a69e61653d files/digest-lesstif-0.93.94 69
 MD5 3ee965f1f5603a167f6335a66b03b292 files/digest-lesstif-0.93.97 69
-MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0 68
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (Darwin)
-
-iD8DBQFCHzoXVWNWqTUmv+0RAnlaAJ96cMpAD8ClEe09AxKECUJ9pdT3GgCfXMK1
-UDXj8ig7g8LAm2w8rzDH/bg=
-=DMVZ
------END PGP SIGNATURE-----
+MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r2 68
+MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r3 68
diff --git a/x11-libs/lesstif/files/CAN-2005-0605.patch b/x11-libs/lesstif/files/CAN-2005-0605.patch
new file mode 100644
index 000000000000..0b38beaaa4c8
--- /dev/null
+++ b/x11-libs/lesstif/files/CAN-2005-0605.patch
@@ -0,0 +1,38 @@
+--- lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c.orig	2005-03-02 17:00:16.415070960 +0100
++++ lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c	2005-03-02 17:01:38.949709879 +0100
+@@ -672,8 +672,8 @@
+     char *dst;
+     unsigned int *iptr;
+     char *data;
+-    unsigned int x, y, i;
+-    int bits, depth, ibu, ibpp, offset;
++    unsigned int x, y;
++    int bits, depth, ibu, ibpp, offset, i;
+     unsigned long lbt;
+     Pixel pixel, px;
+ 
+@@ -684,6 +684,9 @@
+     ibpp = image->bits_per_pixel;
+     offset = image->xoffset;
+ 
++    if (image->bitmap_unit < 0)
++	    return (XpmNoMemory);
++
+     if ((image->bits_per_pixel | image->depth) == 1) {
+ 	ibu = image->bitmap_unit;
+ 	for (y = 0; y < height; y++)
+--- lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c.orig	2005-03-02 17:02:00.626412844 +0100
++++ lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c	2005-03-02 17:02:35.183562480 +0100
+@@ -1265,10 +1265,10 @@
+     register char *src;
+     register char *dst;
+     register unsigned int *iptr;
+-    register unsigned int x, y, i;
++    register unsigned int x, y;
+     register char *data;
+     Pixel pixel, px;
+-    int nbytes, depth, ibu, ibpp;
++    int nbytes, depth, ibu, ibpp, i;
+ 
+     data = image->data;
+     iptr = pixelindex;
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r2 b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r2
new file mode 100644
index 000000000000..86a358232318
--- /dev/null
+++ b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r2
@@ -0,0 +1 @@
+MD5 20f38a06c863e0c51ca0c862ef039601 lesstif-0.94.0.tar.bz2 2425210
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r3 b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r3
new file mode 100644
index 000000000000..86a358232318
--- /dev/null
+++ b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r3
@@ -0,0 +1 @@
+MD5 20f38a06c863e0c51ca0c862ef039601 lesstif-0.94.0.tar.bz2 2425210
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild
new file mode 100644
index 000000000000..b31e44502c19
--- /dev/null
+++ b/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild,v 1.1 2005/03/02 16:58:10 lanius Exp $
+
+inherit libtool flag-o-matic
+
+DESCRIPTION="An OSF/Motif(R) clone"
+HOMEPAGE="http://www.lesstif.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc x86 ~ia64"
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/CAN-2005-0605.patch
+}
+
+src_compile() {
+	use ppc-macos || elibtoolize
+
+	if use ppc-macos || macos ; then
+		append-ldflags -L/usr/X11R6/lib -lX11 -lXt
+	fi
+
+	econf \
+	  --enable-production \
+	  --enable-verbose=no \
+	  --with-x || die "./configure failed"
+
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install"
+
+
+	einfo "Fixing binaries"
+	dodir /usr/X11R6/bin/lesstif
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/X11R6/bin/lesstif/${file}
+	done
+	rm -f ${D}/usr/X11R6/bin/lesstif/mxmkmf
+	rm -fR ${D}/usr/bin
+
+
+	einfo "Fixing docs"
+	dodir /usr/share/doc/
+	mv ${D}/usr/LessTif ${D}/usr/share/doc/${P}
+	rm -fR ${D}/usr/lib/LessTif
+
+
+	einfo "Fixing libraries"
+	dodir /usr/X11R6/lib/lesstif
+	mv ${D}/usr/lib/lib* ${D}/usr/X11R6/lib/lesstif
+
+
+	einfo "Fixing includes"
+	dodir /usr/X11R6/include/lesstif/
+	mv ${D}/usr/include/* ${D}/usr/X11R6/include/lesstif
+	rm -fR ${D}/usr/include
+
+
+	einfo "Fixing man pages"
+	dodir /usr/X11R6/share/man/{man1,man3,man5}
+	for file in `ls ${D}/usr/share/man/man1`
+	do
+		file=${file/.1/}
+		mv ${D}/usr/share/man/man1/${file}.1 ${D}/usr/X11R6/share/man/man1/${file}-lesstif.1
+	done
+	for file in `ls ${D}/usr/share/man/man3`
+	do
+		file=${file/.3/}
+		mv ${D}/usr/share/man/man3/${file}.3 ${D}/usr/X11R6/share/man/man3/${file}-lesstif.3
+	done
+	for file in `ls ${D}/usr/share/man/man6`
+	do
+		file=${file/.5/}
+		mv ${D}/usr/share/man/man5/${file}.5 ${D}/usr/X11R6/share/man/man5/${file}-lesstif.5
+	done
+	rm -fR ${D}/usr/share/man
+
+	rm -fR ${D}/usr/share/aclocal
+}
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r3.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r3.ebuild
new file mode 100644
index 000000000000..499c8ba0e5d0
--- /dev/null
+++ b/x11-libs/lesstif/lesstif-0.94.0-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r3.ebuild,v 1.1 2005/03/02 16:58:10 lanius Exp $
+
+inherit libtool flag-o-matic multilib
+
+DESCRIPTION="An OSF/Motif(R) clone"
+HOMEPAGE="http://www.lesstif.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc ~x86 ~ia64"
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/x11
+	x11-libs/motif-config"
+
+PROVIDE="virtual/motif"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/CAN-2005-0605.patch
+}
+
+src_compile() {
+	use ppc-macos || elibtoolize
+
+	if use ppc-macos; then
+		append-ldflags -L/usr/X11R6/lib -lX11 -lXt
+	fi
+
+	econf \
+	  --enable-production \
+	  --enable-verbose=no \
+	  --with-x || die "./configure failed"
+
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install"
+
+
+	einfo "Fixing binaries"
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-lesstif
+	done
+
+	einfo "Fixing libraries"
+	dodir /usr/$(get_libdir)/lesstif
+	mv ${D}/usr/lib/* ${D}/usr/$(get_libdir)/lesstif/
+
+	einfo "Fixing includes"
+	dodir /usr/include/lesstif/
+	mv ${D}/usr/include/* ${D}/usr/include/lesstif
+
+	einfo "Fixing man pages"
+	mans="1 3 5"
+	for man in $mans; do
+		dodir /usr/share/man/man${man}
+		for file in `ls ${D}/usr/share/man/man${man}`
+		do
+			file=${file/.${man}/}
+			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-lesstif.${man}
+		done
+	done
+
+
+	einfo "Fixing docs"
+	dodir /usr/share/doc/
+	mv ${D}/usr/LessTif ${D}/usr/share/doc/${P}
+	rm -fR ${D}/usr/$(get_libdir)/LessTif
+
+	# cleanup
+	rm -f ${D}/usr/bin/mxmkmf-lesstif
+	rm -fR ${D}/usr/share/aclocal/
+	rm -fR ${D}/usr/$(get_libdir)/lesstif/LessTif/
+	rm -fR ${D}/usr/$(get_libdir)/X11/
+
+}
+
+# Profile stuff
+pkg_postinst() {
+	motif-config --install lesstif
+}
+
+pkg_prerm() {
+	motif-config --uninstall lesstif
+}