From: Emanuele Giaquinta Date: Mon, 9 Oct 2006 15:18:10 +0000 (+0000) Subject: Fix pattern matching with a non-matching character class by X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b32c1538292cdaa9aed506f673f51d9ca7d42f8;p=gentoo.git Fix pattern matching with a non-matching character class by askwar@digitalprojects.com, bug #150030. Package-Manager: portage-2.1.2_pre2-r7 --- diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog index 8f0a8c154457..8aa31e9d2f2b 100644 --- a/app-shells/dash/ChangeLog +++ b/app-shells/dash/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-shells/dash # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.33 2006/07/06 22:57:35 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.34 2006/10/09 15:18:10 exg Exp $ + +*dash-0.5.3.3-r1 (09 Oct 2006) + + 09 Oct 2006; Emanuele Giaquinta + +files/dash-0.5.3.3-non-matching-charclass.patch, +dash-0.5.3.3-r1.ebuild: + Fix pattern matching with a non-matching character class by + askwar@digitalprojects.com, bug #150030. 06 Jul 2006; Jon Hood dash-0.5.3.3.ebuild: Mark ~amd64 wrt bug #139441. diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index a25815999f43..dc3ebdbfcfce 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,3 +1,7 @@ +AUX dash-0.5.3.3-non-matching-charclass.patch 319 RMD160 69b2be07621d1afd6d1f4a4aa3afa59dff6c3961 SHA1 3ebb40b4453909c717c00ee5362896dc8f038c1f SHA256 93e8d1bed9edfc6d990ff2883ff1099dcbe6fc5b18931f9a80035733709469df +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 DIST dash_0.5.2-7.diff.gz 21640 DIST dash_0.5.2-8.diff.gz 22023 DIST dash_0.5.2.orig.tar.gz 207048 @@ -11,18 +15,22 @@ EBUILD dash-0.5.2.8.ebuild 1090 RMD160 ca848d97a7584f978b36b0e6339eb9733c8b68a0 MD5 5513b11ce48d7cf25b0ad7bccca51e8b dash-0.5.2.8.ebuild 1090 RMD160 ca848d97a7584f978b36b0e6339eb9733c8b68a0 dash-0.5.2.8.ebuild 1090 SHA256 461bae335ac747ac2205185d5ea90d8634e0a80fb7286d6ac0fa0ee7ea327173 dash-0.5.2.8.ebuild 1090 +EBUILD dash-0.5.3.3-r1.ebuild 1132 RMD160 4821de6c84588d7558accb97ae97d80124bb7bde SHA1 7f48b4da62c0d5b981831ad7f5d3ddda2e3d0a1e SHA256 9ba4e57864b6e341554570cb2657e7d3f0bd03ce8cc41078d75f8dcad48b0da6 +MD5 7e620d63644ecca38d1c7f0d46ac243d dash-0.5.3.3-r1.ebuild 1132 +RMD160 4821de6c84588d7558accb97ae97d80124bb7bde dash-0.5.3.3-r1.ebuild 1132 +SHA256 9ba4e57864b6e341554570cb2657e7d3f0bd03ce8cc41078d75f8dcad48b0da6 dash-0.5.3.3-r1.ebuild 1132 EBUILD dash-0.5.3.3.ebuild 1099 RMD160 8bb384391ceeb2d7fbaa80b2dc8e7c855d669d7e SHA1 993d21dfd1498ab4603d97e182931e9906878f49 SHA256 127bc18ab2e3cd02dac31013f7dd82efc79bb0f85b63d35387d6b88356f9a93a MD5 a65294aad870440d0f30eb87b11f27e7 dash-0.5.3.3.ebuild 1099 RMD160 8bb384391ceeb2d7fbaa80b2dc8e7c855d669d7e dash-0.5.3.3.ebuild 1099 SHA256 127bc18ab2e3cd02dac31013f7dd82efc79bb0f85b63d35387d6b88356f9a93a dash-0.5.3.3.ebuild 1099 -MISC ChangeLog 4620 RMD160 8dc1fde1aed8890f92a1d908d20d86c968603153 SHA1 fa3adc315f4bc41b6d0c644058e40e31740a9f23 SHA256 852633901cef4e277cfa66a52e9cb75fc2d941a6df7a65f48b3a0d671896c7d6 -MD5 2d0e1b76a0db283c15daeaff3a372154 ChangeLog 4620 -RMD160 8dc1fde1aed8890f92a1d908d20d86c968603153 ChangeLog 4620 -SHA256 852633901cef4e277cfa66a52e9cb75fc2d941a6df7a65f48b3a0d671896c7d6 ChangeLog 4620 -MISC metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d SHA1 2d72cad2ed2c3fce67f5ae575a00c3a3ee4e1604 SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f -MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254 -RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254 -SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f metadata.xml 254 +MISC ChangeLog 4880 RMD160 35cebc3ce90f69386b005ce56f9f83df7e145038 SHA1 8bf8bdae4b422575504d18e96666f38bd296769e SHA256 752b2075f71374b5cbda67459c4b14184d695a7d08bc3afe0aa603caaca0adc3 +MD5 58817bb0fb5944536d5af01e012ab174 ChangeLog 4880 +RMD160 35cebc3ce90f69386b005ce56f9f83df7e145038 ChangeLog 4880 +SHA256 752b2075f71374b5cbda67459c4b14184d695a7d08bc3afe0aa603caaca0adc3 ChangeLog 4880 +MISC metadata.xml 349 RMD160 3b887434c64c0c016fc55398182fd5a37b46b926 SHA1 81d5e7827098a7383d493f9c5c768cbfbd3d63ec SHA256 15f4f4163d6ba0988748dc165fc6a92779940f12f8c8491355e7778daa12f8a0 +MD5 951238ca1b4bd05f26ffbe6cbec17fcc metadata.xml 349 +RMD160 3b887434c64c0c016fc55398182fd5a37b46b926 metadata.xml 349 +SHA256 15f4f4163d6ba0988748dc165fc6a92779940f12f8c8491355e7778daa12f8a0 metadata.xml 349 MD5 376a788df401b4b221e4aba6cf233790 files/digest-dash-0.5.2.7 131 RMD160 57a61ee76c363dae2f418b5e5deb64cc7542813f files/digest-dash-0.5.2.7 131 SHA256 605988c5e45ac163843c46082249272bd7b28e913a7ae6091e020e4790147b20 files/digest-dash-0.5.2.7 131 @@ -32,3 +40,6 @@ SHA256 578b2319c6c3a39ad46704838a3a304f598867a915d13d9b295e3bb6c7f34709 files/di MD5 da97a6aca7956dfb13c791e6d1ecbf29 files/digest-dash-0.5.3.3 485 RMD160 88c3a796b1a5ccbbae45c3588c50a209e7d21329 files/digest-dash-0.5.3.3 485 SHA256 5fec3792109f640e50c379a0cc344a2fd7aa5fae3fc5c6fdf10ba1aea2705108 files/digest-dash-0.5.3.3 485 +MD5 da97a6aca7956dfb13c791e6d1ecbf29 files/digest-dash-0.5.3.3-r1 485 +RMD160 88c3a796b1a5ccbbae45c3588c50a209e7d21329 files/digest-dash-0.5.3.3-r1 485 +SHA256 5fec3792109f640e50c379a0cc344a2fd7aa5fae3fc5c6fdf10ba1aea2705108 files/digest-dash-0.5.3.3-r1 485 diff --git a/app-shells/dash/dash-0.5.3.3-r1.ebuild b/app-shells/dash/dash-0.5.3.3-r1.ebuild new file mode 100644 index 000000000000..e9178529b104 --- /dev/null +++ b/app-shells/dash/dash-0.5.3.3-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2006 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.3-r1.ebuild,v 1.1 2006/10/09 15:18:10 exg Exp $ + +inherit eutils versionator flag-o-matic toolchain-funcs + +DEB_P="${PN}_$(replace_version_separator 3 '-')" +MY_P2="${DEB_P%-*}" +MY_P="${MY_P2/_/-}" + +DESCRIPTION="Debian-version of NetBSD's lightweight bourne shell" +HOMEPAGE="http://ftp.debian.org/debian/pool/main/d/dash/" +SRC_URI="mirror://debian/pool/main/d/dash/${MY_P2}.orig.tar.gz \ + mirror://debian/pool/main/d/dash/${DEB_P}.diff.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="static" + +RDEPEND="" +DEPEND="sys-devel/bison" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/${DEB_P}.diff + epatch "${FILESDIR}"/${P}-non-matching-charclass.patch +} + +src_compile() { + use static && append-ldflags -static + + export CC="$(tc-getCC)" + econf || 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.3-non-matching-charclass.patch b/app-shells/dash/files/dash-0.5.3.3-non-matching-charclass.patch new file mode 100644 index 000000000000..3af461aeb68f --- /dev/null +++ b/app-shells/dash/files/dash-0.5.3.3-non-matching-charclass.patch @@ -0,0 +1,11 @@ +--- dash-0.5.3.orig/src/expand.c 2005-11-26 04:17:55.000000000 +0100 ++++ dash-0.5.3/src/expand.c 2006-10-04 10:02:08.186753039 +0200 +@@ -1581,7 +1581,7 @@ + if (c == '[') { + const char *r; + +- found |= ccmatch(p, chr, &r); ++ found |= !!ccmatch(p, chr, &r); + if (r) { + p = r; + continue; diff --git a/app-shells/dash/files/digest-dash-0.5.3.3-r1 b/app-shells/dash/files/digest-dash-0.5.3.3-r1 new file mode 100644 index 000000000000..3a812e7045c6 --- /dev/null +++ b/app-shells/dash/files/digest-dash-0.5.3.3-r1 @@ -0,0 +1,6 @@ +MD5 d90f816432ab5055f37abf0441018bf6 dash_0.5.3-3.diff.gz 26636 +RMD160 35609c510d0b4bcf0a4c9101ad97d1100711b10d dash_0.5.3-3.diff.gz 26636 +SHA256 8f70dfec8f1f1c72da38cec2f94b2ad6f9af825cd6ff3d945369a98fbd89eb07 dash_0.5.3-3.diff.gz 26636 +MD5 1a3cd6669459be4344ec55ec9d4914f8 dash_0.5.3.orig.tar.gz 207201 +RMD160 fd445535708868fe206852320eece58c3c2bbbaf dash_0.5.3.orig.tar.gz 207201 +SHA256 82aab2ff63e5fac4bff35c91222f735ec67551db86b5c3b3455ecc10e8889e53 dash_0.5.3.orig.tar.gz 207201 diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index d31152aca840..8881475f99a8 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -6,4 +6,8 @@ ka0ttic@gentoo.org Aaron Walker + + exg@gentoo.org + Emanuele Giaquinta +