Use new debian patchset.

  Add patch from Harald van Dijk to fix reading certain line lengths.
Package-Manager: portage-2.1.3_rc5

5 files changed, 107 insertions, 5 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 8afe7136fd3f..f75afc9eba6e 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.42 2007/05/19 09:31:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.43 2007/06/26 16:52:05 uberlord Exp $
+
+*dash-0.5.3.8 (26 Jun 2007)
+
+  26 Jun 2007; Roy Marples <uberlord@gentoo.org>
+  +files/dash-0.5.3-read-length.patch, +dash-0.5.3.8.ebuild:
+  Use new debian patchset.
+  Add patch from Harald van Dijk to fix reading certain line lengths.
 
 *dash-0.5.3.7-r1 (19 May 2007)
 
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 1f83c2722508..403c8b2b781b 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,3 +1,7 @@
+AUX dash-0.5.3-read-length.patch 353 RMD160 365a130afc8e0333111125efbd605768b2043eae SHA1 716078af245e75fffa0a6152ff7074686c666585 SHA256 533fc30522a58245d3bc9d6ac798af63da77dc56628d7c0b8b1c2d8eb1759a65
+MD5 d927aba802a01383fb2f3b29c04758d9 files/dash-0.5.3-read-length.patch 353
+RMD160 365a130afc8e0333111125efbd605768b2043eae files/dash-0.5.3-read-length.patch 353
+SHA256 533fc30522a58245d3bc9d6ac798af63da77dc56628d7c0b8b1c2d8eb1759a65 files/dash-0.5.3-read-length.patch 353
 AUX dash-0.5.3-sort-locale.patch 373 RMD160 dae12b02478c2757c1750534d386814d1ae600e5 SHA1 3f82e31d3e4ebfdf9366a7e27d5006a4f7d49f24 SHA256 e9c0a059934d9a7c11faebdb8ad69829616ddf2416b07b5e55d68ab1b997f9a4
 MD5 5061b06c660b45c0ae443c18e9ef4cda files/dash-0.5.3-sort-locale.patch 373
 RMD160 dae12b02478c2757c1750534d386814d1ae600e5 files/dash-0.5.3-sort-locale.patch 373
@@ -12,6 +16,7 @@ DIST dash_0.5.2-8.diff.gz 22023 RMD160 e34617aaa7fe484a8910966f77a7f043a71bee86
 DIST dash_0.5.2.orig.tar.gz 207048 RMD160 5d3e9e88ad963d80b2d1a18881ee4969a4064570 SHA1 a46e75c99c4e9de67259a503e59d03da8ac5362f SHA256 c13f16cf7d8bfd1a24211131530981c4884af0d6ad89fd707de5ab2f270b350a
 DIST dash_0.5.3-3.diff.gz 26636 RMD160 35609c510d0b4bcf0a4c9101ad97d1100711b10d SHA1 d73ea0256d0897fe4051510caa373349b003d3a3 SHA256 8f70dfec8f1f1c72da38cec2f94b2ad6f9af825cd6ff3d945369a98fbd89eb07
 DIST dash_0.5.3-7.diff.gz 33290 RMD160 b2d8263d16aa8500bab2b6d0c24598ebe6c4956d SHA1 7a6118ab4944af9876c8112d6fdf24ee2c3bfc45 SHA256 b0abe3a4ea9afc3136bad62b4b7f68fc6de961db46b7dc77a0c272cbe6c61477
+DIST dash_0.5.3-8.diff.gz 65454 RMD160 30cf2615e88ab885c4e0c1a8644b87b07fdda52d SHA1 3255691fa6f41195a3693484af64c396a68ed845 SHA256 f9a785c7bb72deaa24eb81a918e3c85d3062121ad06874b501ba330e5c53d80a
 DIST dash_0.5.3.orig.tar.gz 207201 RMD160 fd445535708868fe206852320eece58c3c2bbbaf SHA1 4707b147d5d727712a87e754d1010e7ee25c514d SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53
 EBUILD dash-0.5.2.7.ebuild 1087 RMD160 c5ccb030e78c24f8fe3612466e6544a098fe24f9 SHA1 049941452edb6dec56c7d3433ee2f4226618fc34 SHA256 df03f3ec836ea4f045b7958d3ea28c565931ea6b5ff32de5b79604c48df30edc
 MD5 5c4dbd7df696a393315c155453517026 dash-0.5.2.7.ebuild 1087
@@ -37,10 +42,14 @@ EBUILD dash-0.5.3.7.ebuild 1230 RMD160 d9d973b11b38ddbeb29cdb463c82c33a0e8f6534
 MD5 b9f21e4963bafc797dc3bd18f3845fc7 dash-0.5.3.7.ebuild 1230
 RMD160 d9d973b11b38ddbeb29cdb463c82c33a0e8f6534 dash-0.5.3.7.ebuild 1230
 SHA256 a5ae13b2005b90bfd0ab6271ec1142b1073c7b21b434b4732df06a99005145e0 dash-0.5.3.7.ebuild 1230
-MISC ChangeLog 6011 RMD160 2ca078e60cc71bf5dc5af0296d737fcf4f84c7a9 SHA1 79d2b6568316f2b1f2a41016535092f0f34614e0 SHA256 11187fab689c7414ee0940aa5458b8c84e1cdd94b398084150423dba219e2176
-MD5 8cb940651d720fbd438a5d3e52863252 ChangeLog 6011
-RMD160 2ca078e60cc71bf5dc5af0296d737fcf4f84c7a9 ChangeLog 6011
-SHA256 11187fab689c7414ee0940aa5458b8c84e1cdd94b398084150423dba219e2176 ChangeLog 6011
+EBUILD dash-0.5.3.8.ebuild 1693 RMD160 838900954029fb8d9d21eb2896dd2054faa805e4 SHA1 4437b02ec08bfae1477cbc825dfc56a0860d4e02 SHA256 2520901e3e4a12f0283847a42030393a4dbc731ca6bc555779eb03ce552cd7d3
+MD5 80765ee1d0fd9044baa51008804dd0b3 dash-0.5.3.8.ebuild 1693
+RMD160 838900954029fb8d9d21eb2896dd2054faa805e4 dash-0.5.3.8.ebuild 1693
+SHA256 2520901e3e4a12f0283847a42030393a4dbc731ca6bc555779eb03ce552cd7d3 dash-0.5.3.8.ebuild 1693
+MISC ChangeLog 6248 RMD160 9d65baad41ff384f7a94db4c5ed9b7d6887c902e SHA1 b7889acc2515e995d61d66d23efc1c5d395c249d SHA256 7b721f621ca1cbba96f4fc0e654a4c8cc2ba808d833a33cc4af29dc1b0f91753
+MD5 c3f35cd435aad3b9769aac51f09be328 ChangeLog 6248
+RMD160 9d65baad41ff384f7a94db4c5ed9b7d6887c902e ChangeLog 6248
+SHA256 7b721f621ca1cbba96f4fc0e654a4c8cc2ba808d833a33cc4af29dc1b0f91753 ChangeLog 6248
 MISC metadata.xml 258 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 SHA1 217134894bc43bed379c823c1abaa6d3f3d7adcc SHA256 ea9f5f0425c3cefc3f50cf2a2792634bf47b9a373948f04c524d0407f6e8d1d6
 MD5 50ddf6de7cdf5ef045d0189c47e4e452 metadata.xml 258
 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 metadata.xml 258
@@ -63,3 +72,6 @@ SHA256 35ebcc6ba04a11f1247c32524bedfb5e8478789fcd17b7f9bf114ef1f32f0b4f files/di
 MD5 e46e936c9b212c288828dce08472f4eb files/digest-dash-0.5.3.7-r1 470
 RMD160 1e31cbf0110a308829aaa4387a6a1f6fc1ccdb2b files/digest-dash-0.5.3.7-r1 470
 SHA256 35ebcc6ba04a11f1247c32524bedfb5e8478789fcd17b7f9bf114ef1f32f0b4f files/digest-dash-0.5.3.7-r1 470
+MD5 ffb52d12629c4676b199ed555b47b169 files/digest-dash-0.5.3.8 470
+RMD160 d932c45e59cd47118b2e5a83db92a12b9c02f9a7 files/digest-dash-0.5.3.8 470
+SHA256 58a60dc19570313f9aa1af7bda80b177b0caf97ecf4a8fe3d3053d1413e3dce3 files/digest-dash-0.5.3.8 470
diff --git a/app-shells/dash/dash-0.5.3.8.ebuild b/app-shells/dash/dash-0.5.3.8.ebuild
new file mode 100644
index 000000000000..370b0941fd31
--- /dev/null
+++ b/app-shells/dash/dash-0.5.3.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.3.8.ebuild,v 1.1 2007/06/26 16:52:05 uberlord Exp $
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DEB_PV=${PV%.*}
+DEB_PATCH=${PV##*.}
+DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
+MY_P="${PN}-${DEB_PV}"
+
+DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the
+Almquist SHell) and is POSIX compliant"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
+		mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libedit static"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${WORKDIR}/${DEB_PF}".diff
+
+	cd "${S}"
+	epatch debian/diff/*
+
+	# Fix reading of long lines
+	epatch "${FILESDIR}/${MY_P}"-read-length.patch
+
+	# Always statically link libedit in to ensure we always boot if it changes
+	# which it has done in the past.
+	local s="s/-ledit/-Wl,-Bstatic -ledit -Wl,-Bdynamic -lcurses/g"
+	use static && s="s/-ledit/-ledit -lcurses/g"
+	sed -i -e "${s}" configure.ac || die "Failed to sed configure.ac"
+
+	# May as well, as the debian patches force this anyway
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=
+
+	use static && append-ldflags -static
+	use libedit && myconf="${myconf} --with-libedit"
+	export CC="$(tc-getCC)"
+
+	econf ${myconf} || die "econf failed"
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	exeinto /bin
+	newexe src/dash dash
+	newman src/dash.1 dash.1
+	dodoc COPYING ChangeLog
+}
diff --git a/app-shells/dash/files/dash-0.5.3-read-length.patch b/app-shells/dash/files/dash-0.5.3-read-length.patch
new file mode 100644
index 000000000000..07bf834d37d2
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.3-read-length.patch
@@ -0,0 +1,13 @@
+--- src/expand.c
++++ src/expand.c
+@@ -1643,7 +1643,10 @@
+ 		size_t fulllen = len + strlen(p) + 1;
+ 
+ 		if (flag & RMESCAPE_GROW) {
++			int strloc = str - (char *)stackblock();
+ 			r = makestrspace(fulllen, expdest);
++			str = (char *)stackblock() + strloc;
++			p = str + len;
+ 		} else if (flag & RMESCAPE_HEAP) {
+ 			r = ckmalloc(fulllen);
+ 		} else {
diff --git a/app-shells/dash/files/digest-dash-0.5.3.8 b/app-shells/dash/files/digest-dash-0.5.3.8
new file mode 100644
index 000000000000..1850f55b5deb
--- /dev/null
+++ b/app-shells/dash/files/digest-dash-0.5.3.8
@@ -0,0 +1,6 @@
+MD5 1a3cd6669459be4344ec55ec9d4914f8 dash-0.5.3.tar.gz 207201
+RMD160 fd445535708868fe206852320eece58c3c2bbbaf dash-0.5.3.tar.gz 207201
+SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53 dash-0.5.3.tar.gz 207201
+MD5 3337f54d71d5a1d8b46f3d2e5ca5e5b1 dash_0.5.3-8.diff.gz 65454
+RMD160 30cf2615e88ab885c4e0c1a8644b87b07fdda52d dash_0.5.3-8.diff.gz 65454
+SHA256 f9a785c7bb72deaa24eb81a918e3c85d3062121ad06874b501ba330e5c53d80a dash_0.5.3-8.diff.gz 65454