Committing directly to stable because of severe bug (double free or corruption detected by glibc). Closing #86987.

(Portage version: 2.0.51.19)

7 files changed, 109 insertions, 3 deletions

diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog
index 0ae20120777e..8b9d06825ceb 100644
--- a/dev-libs/newt/ChangeLog
+++ b/dev-libs/newt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/newt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.17 2005/02/06 17:58:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.18 2005/04/01 13:43:46 xmerlin Exp $
+
+*newt-0.51.6 (01 Apr 2005)
+
+  01 Apr 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch,
+  +files/newt-gpm-fix.diff, +newt-0.51.6.ebuild:
+  Committing directly to stable because of severe bug (double free or corruption 
+  detected by glibc). Closing #86987.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> newt-0.50.35-r4.ebuild:
   Stable on ppc64
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index b5e3e2d69974..b813bab32a4b 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,7 +1,12 @@
-MD5 b97539671929f874b83071b2e3d2cfff ChangeLog 2114
-MD5 85adf51bae0096b4d4b9f13c146a7d5c newt-0.50.35-r2.ebuild 859
 MD5 9dd901e4c2a68f204f1b2dce5cff066b newt-0.50.35-r3.ebuild 898
+MD5 85adf51bae0096b4d4b9f13c146a7d5c newt-0.50.35-r2.ebuild 859
 MD5 05595a994adbcbd5b9c59ce563ced758 newt-0.50.35-r4.ebuild 1564
+MD5 b97539671929f874b83071b2e3d2cfff ChangeLog 2114
+MD5 917caa8876e58604c0e0f84dcb598380 metadata.xml 296
+MD5 ecdd7bcf2f16e5ec23ace6703d7a844a newt-0.51.6.ebuild 1819
 MD5 6d5a67f6fae3839c22aa176ffbd96790 files/digest-newt-0.50.35-r2 64
 MD5 6d5a67f6fae3839c22aa176ffbd96790 files/digest-newt-0.50.35-r3 64
 MD5 6d5a67f6fae3839c22aa176ffbd96790 files/digest-newt-0.50.35-r4 64
+MD5 27e2ae6e4d99b4a772f4520a89ce73f9 files/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch 266
+MD5 9910bf0c9ea69bf046e7801c2c6958ea files/newt-gpm-fix.diff 177
+MD5 f6412dbeaf1b1f3d11fc8c0fc08c1ee2 files/digest-newt-0.51.6 63
diff --git a/dev-libs/newt/files/digest-newt-0.51.6 b/dev-libs/newt/files/digest-newt-0.51.6
new file mode 100644
index 000000000000..898bb73bd7b9
--- /dev/null
+++ b/dev-libs/newt/files/digest-newt-0.51.6
@@ -0,0 +1 @@
+MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739
diff --git a/dev-libs/newt/files/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch b/dev-libs/newt/files/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch
new file mode 100644
index 000000000000..63a26154feea
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch
@@ -0,0 +1,11 @@
+--- newt-0.51.4/newt.c.pix	2003-08-30 03:09:25.000000000 +0200
++++ newt-0.51.4/newt.c	2003-08-30 03:09:44.000000000 +0200
+@@ -164,7 +164,7 @@
+ 			y = wcwidth(tmp);
+ 			if (y>0)
+ 			  nchars+=y;
+-		} else break;
++		} else return nchars + len;
+ 	}
+ 	return nchars;
+ }
diff --git a/dev-libs/newt/files/newt-gpm-fix.diff b/dev-libs/newt/files/newt-gpm-fix.diff
new file mode 100644
index 000000000000..7c43c69dbe96
--- /dev/null
+++ b/dev-libs/newt/files/newt-gpm-fix.diff
@@ -0,0 +1,10 @@
+--- form.c.orig	Sat Mar  6 00:27:57 1999
++++ form.c	Tue Dec 14 12:18:16 1999
+@@ -304,6 +304,7 @@
+     sock_name = 0;
+   } /*if*/
+   gpm_flag=0;
++  gpm_fd=-1;
+   return -1;
+ }
+ 
diff --git a/dev-libs/newt/metadata.xml b/dev-libs/newt/metadata.xml
new file mode 100644
index 000000000000..08a03aac9caf
--- /dev/null
+++ b/dev-libs/newt/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>xmerlin@gentoo.org</email>
+		<name>Christian Zoffoli</name>
+	</maintainer>
+	<longdescription></longdescription>
+</pkgmetadata>
diff --git a/dev-libs/newt/newt-0.51.6.ebuild b/dev-libs/newt/newt-0.51.6.ebuild
new file mode 100644
index 000000000000..9e81fadd1180
--- /dev/null
+++ b/dev-libs/newt/newt-0.51.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6.ebuild,v 1.1 2005/04/01 13:43:46 xmerlin Exp $
+
+inherit python toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://dev.gentoo.org/~xmerlin/misc/${P}.tar.gz"
+HOMEPAGE="http://www.redhat.com"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ppc64"
+IUSE="uclibc gpm"
+DEPEND=">=sys-libs/slang-1.4
+	>=dev-libs/popt-1.6
+	dev-lang/python
+	uclibc? ( sys-libs/ncurses )
+	gpm? ( sys-libs/gpm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/newt-gpm-fix.diff || die
+	epatch ${FILESDIR}/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
+
+	# bug 73850 
+	if use uclibc; then
+		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
+	fi
+
+	# use the correct compiler...
+	sed -i -e 's:gcc:$(CC):g' ${S}/Makefile.in
+
+	# avoid make cleaning up some intermediate files
+	# as it would rebuild them during install :-(
+	echo >>${S}/Makefile.in
+	echo '$(LIBNEWT): $(LIBOBJS)' >>${S}/Makefile.in
+}
+
+src_compile() {
+	python_version
+
+	econf \
+		$(use_with gpm gpm-support) \
+		|| die
+
+	# not parallel safe
+	emake -j1 PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failure"
+}
+
+src_install () {
+	python_version
+	# the RPM_OPT_FLAGS="ERROR" is there to catch a build error
+	# if it fails, that means something in src_compile() didn't build properly
+	# not parallel safe
+	emake -j1 prefix="${D}/usr" PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="ERROR" install || die "make install failed"
+	dodoc CHANGES COPYING peanuts.py popcorn.py tutorial.sgml
+	dosym libnewt.so.${PV} /usr/lib/libnewt.so.0.50
+}