Fix the arith patch for incorrect octal handling

Package-Manager: portage-2.1.3.12

5 files changed, 99 insertions, 10 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 36686fe5682f..9ee0ca69287e 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2007/10/08 10:25:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.47 2007/10/08 20:53:28 uberlord Exp $
+
+*dash-0.5.4.1-r2 (08 Oct 2007)
+
+  08 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  files/dash-0.5.4-posix-arith.patch, +dash-0.5.4.1-r2.ebuild:
+  Fix the arith patch for incorrect octal handling
 
 *dash-0.5.4.1-r1 (08 Oct 2007)
 
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index f2ba90bf5a5c..ec6b5f42ecfc 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -10,10 +10,10 @@ AUX dash-0.5.3.3-non-matching-charclass.patch 319 RMD160 69b2be07621d1afd6d1f4a4
 MD5 cd2d7a116c5f98acc393655313913271 files/dash-0.5.3.3-non-matching-charclass.patch 319
 RMD160 69b2be07621d1afd6d1f4a4aa3afa59dff6c3961 files/dash-0.5.3.3-non-matching-charclass.patch 319
 SHA256 93e8d1bed9edfc6d990ff2883ff1099dcbe6fc5b18931f9a80035733709469df files/dash-0.5.3.3-non-matching-charclass.patch 319
-AUX dash-0.5.4-posix-arith.patch 9130 RMD160 b45ca258971656c5a26e8b78a17075cb58ac902a SHA1 d9a0ad0346c6c3c0fcbb4df1241562e873d2a991 SHA256 cb79b8ab370772bc1b30de6f93a87dfea9435a65cf0df2720e82f6a98153ef88
-MD5 c8ec162e591b7af310f82adbb95556cc files/dash-0.5.4-posix-arith.patch 9130
-RMD160 b45ca258971656c5a26e8b78a17075cb58ac902a files/dash-0.5.4-posix-arith.patch 9130
-SHA256 cb79b8ab370772bc1b30de6f93a87dfea9435a65cf0df2720e82f6a98153ef88 files/dash-0.5.4-posix-arith.patch 9130
+AUX dash-0.5.4-posix-arith.patch 9128 RMD160 c777493f200936b0eaa7b72925404f33fa25e637 SHA1 8677bd83b09c532250bb3f22946cbb68fabd142a SHA256 d053b1c7f4d016f902d530c01f17abb347ff3335a2ce4310cff4afbcf52e040c
+MD5 e2da9c4c1831543c799a42282697fde1 files/dash-0.5.4-posix-arith.patch 9128
+RMD160 c777493f200936b0eaa7b72925404f33fa25e637 files/dash-0.5.4-posix-arith.patch 9128
+SHA256 d053b1c7f4d016f902d530c01f17abb347ff3335a2ce4310cff4afbcf52e040c files/dash-0.5.4-posix-arith.patch 9128
 DIST dash-0.5.3.tar.gz 207201 RMD160 fd445535708868fe206852320eece58c3c2bbbaf SHA1 4707b147d5d727712a87e754d1010e7ee25c514d SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53
 DIST dash-0.5.4.tar.gz 212145 RMD160 322fc2fffc5fddf4223d39c57eaeb9b4222303fa SHA1 f6dc33364e42e73e39fb1193845c02e031b817bb SHA256 a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623
 DIST dash_0.5.2-7.diff.gz 21640 RMD160 442496fe93010412812e5a55ffd09b7a4f06f0ef SHA1 beba7b2f2f94f570a1863c5e9ffca22c8f723d25 SHA256 2c1e29379c9c123ce18bd64132e78ec276cac4869b6030d101298e71605a7209
@@ -60,14 +60,18 @@ EBUILD dash-0.5.4.1-r1.ebuild 1911 RMD160 26bed26fcf4e17717fcb568a937c37976bfa73
 MD5 064eaf97997216a3f6e3b9bf20360925 dash-0.5.4.1-r1.ebuild 1911
 RMD160 26bed26fcf4e17717fcb568a937c37976bfa730a dash-0.5.4.1-r1.ebuild 1911
 SHA256 4e04d686b425d2003bc047df0bc5457d300a8ccebfe5c203ac6f848323b4c5cd dash-0.5.4.1-r1.ebuild 1911
+EBUILD dash-0.5.4.1-r2.ebuild 1911 RMD160 7ef1dc6c7b9025e50bfe48fab1851b51c2b6832f SHA1 a08426c041c0ad34046208703151b5d4e6293a8b SHA256 a3d7db3a12ea577f9a76b490cc66bf1eaf5fddb1f810682be97bddfe29df8446
+MD5 cd09a66efafeb1fab6fcbc4ef9311ed2 dash-0.5.4.1-r2.ebuild 1911
+RMD160 7ef1dc6c7b9025e50bfe48fab1851b51c2b6832f dash-0.5.4.1-r2.ebuild 1911
+SHA256 a3d7db3a12ea577f9a76b490cc66bf1eaf5fddb1f810682be97bddfe29df8446 dash-0.5.4.1-r2.ebuild 1911
 EBUILD dash-0.5.4.1.ebuild 1817 RMD160 09c3736ac5980601346f56ed64cf3fc23ea4c206 SHA1 17d1d1d1f29c8bbe6afe18c002d067a9563a945c SHA256 5450d513441973af0185809020148fa54d10f39ab011d9c424d47ff2d50ba3ac
 MD5 110c486aa314518e3ca82788d48ad65f dash-0.5.4.1.ebuild 1817
 RMD160 09c3736ac5980601346f56ed64cf3fc23ea4c206 dash-0.5.4.1.ebuild 1817
 SHA256 5450d513441973af0185809020148fa54d10f39ab011d9c424d47ff2d50ba3ac dash-0.5.4.1.ebuild 1817
-MISC ChangeLog 6773 RMD160 460cfe2f22f3c6be1a1d00c4b455cf0ce07fc1ad SHA1 605bc0de27444c65079a3fb052f357d04ddf8e2f SHA256 36c1a8dc0335b86294b022e008b6d691187529bf5972c5223321691e8a92618e
-MD5 7d21942ab4e0f99603b76ccbc21585a9 ChangeLog 6773
-RMD160 460cfe2f22f3c6be1a1d00c4b455cf0ce07fc1ad ChangeLog 6773
-SHA256 36c1a8dc0335b86294b022e008b6d691187529bf5972c5223321691e8a92618e ChangeLog 6773
+MISC ChangeLog 6969 RMD160 ec8cd3c06d2c91e05246ab14dbad1275909c0ecf SHA1 5e3ffa87c3e60acf6668d533b3dd0a698e753ca1 SHA256 abbafd376e46e3a3ad18c7918308810acf63312a5de25b11ec5e79c978ddcfa2
+MD5 62caa36cee8773b194b2505e41920964 ChangeLog 6969
+RMD160 ec8cd3c06d2c91e05246ab14dbad1275909c0ecf ChangeLog 6969
+SHA256 abbafd376e46e3a3ad18c7918308810acf63312a5de25b11ec5e79c978ddcfa2 ChangeLog 6969
 MISC metadata.xml 258 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 SHA1 217134894bc43bed379c823c1abaa6d3f3d7adcc SHA256 ea9f5f0425c3cefc3f50cf2a2792634bf47b9a373948f04c524d0407f6e8d1d6
 MD5 50ddf6de7cdf5ef045d0189c47e4e452 metadata.xml 258
 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 metadata.xml 258
@@ -102,3 +106,6 @@ SHA256 bf509cd4bc36aadc510110dd0de43daa00365a6f287a178ea7db889ee5ce2130 files/di
 MD5 5c4d6e6415be734e6f9f0682f4d9de17 files/digest-dash-0.5.4.1-r1 470
 RMD160 b0ef32c8dff676e07df68e5325bb1baebcb6927e files/digest-dash-0.5.4.1-r1 470
 SHA256 bf509cd4bc36aadc510110dd0de43daa00365a6f287a178ea7db889ee5ce2130 files/digest-dash-0.5.4.1-r1 470
+MD5 5c4d6e6415be734e6f9f0682f4d9de17 files/digest-dash-0.5.4.1-r2 470
+RMD160 b0ef32c8dff676e07df68e5325bb1baebcb6927e files/digest-dash-0.5.4.1-r2 470
+SHA256 bf509cd4bc36aadc510110dd0de43daa00365a6f287a178ea7db889ee5ce2130 files/digest-dash-0.5.4.1-r2 470
diff --git a/app-shells/dash/dash-0.5.4.1-r2.ebuild b/app-shells/dash/dash-0.5.4.1-r2.ebuild
new file mode 100644
index 000000000000..f0fba792c862
--- /dev/null
+++ b/app-shells/dash/dash-0.5.4.1-r2.ebuild
@@ -0,0 +1,70 @@
+# 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.4.1-r2.ebuild,v 1.1 2007/10/08 20:53:28 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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}/${PN}"-0.5.3-read-length.patch
+
+	# Support posix arithmetic expansion
+	epatch "${FILESDIR}/${PN}"-0.5.4-posix-arith.patch
+
+	# Fix the invalid sort
+	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+	# 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.4-posix-arith.patch b/app-shells/dash/files/dash-0.5.4-posix-arith.patch
index 9665c4ac19d4..894008670ce1 100644
--- a/app-shells/dash/files/dash-0.5.4-posix-arith.patch
+++ b/app-shells/dash/files/dash-0.5.4-posix-arith.patch
@@ -205,7 +205,7 @@ diff -ur a/src/arith_yylex.c b/src/arith_yylex.c
 +			if (*++buf == 'x')
 +				yylval.l_value = strtoll(buf+1, (char **)&arith_buf, 16);
 +			else
-+				yylval.l_value = strtoll(buf+1, (char **)&arith_buf, 8);
++				yylval.l_value = strtoll(buf, (char **)&arith_buf, 8);
 +			if (isalnum(*arith_buf) || *arith_buf == '_')
 +				sh_error("arith: value does not fit base: \"%s\"", arith_buf);
 +			return ARITH_NUM;
diff --git a/app-shells/dash/files/digest-dash-0.5.4.1-r2 b/app-shells/dash/files/digest-dash-0.5.4.1-r2
new file mode 100644
index 000000000000..66aa426f23b4
--- /dev/null
+++ b/app-shells/dash/files/digest-dash-0.5.4.1-r2
@@ -0,0 +1,6 @@
+MD5 bc457e490a589d2f87f2333616b67931 dash-0.5.4.tar.gz 212145
+RMD160 322fc2fffc5fddf4223d39c57eaeb9b4222303fa dash-0.5.4.tar.gz 212145
+SHA256 a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623 dash-0.5.4.tar.gz 212145
+MD5 304e8c13d012585314d73589e50dea38 dash_0.5.4-1.diff.gz 24636
+RMD160 5013da584493f1147a3be8a321985cf464da22af dash_0.5.4-1.diff.gz 24636
+SHA256 0214f40865c2b904710cadf84ece22c932bbeac85b0fa9e6c5e9abd46d36e453 dash_0.5.4-1.diff.gz 24636