Add patch from upstream to fix typo in error msg #96009.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 36 insertions, 8 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index e9d2fd522797..88732a3b75a4 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,5 @@
-MD5 7a4bd08fb270dc2ea939b1569df29fd0 ChangeLog 7419
-MD5 7d2139026274bb11570c626d0aad75e6 grep-2.5.1-r8.ebuild 2054
+MD5 d47506bd9cd31bcc89b7678093d0979c ChangeLog 7585
+MD5 2dade921909c94fd35da240177946d83 grep-2.5.1-r8.ebuild 2102
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 97b1eaf5feac1593d7085913ce9b5deb grep-2.5.1-r6.ebuild 2240
 MD5 5c1510e20a43c023fa1329fb8ef59efc grep-2.5.1-r7.ebuild 1990
@@ -16,3 +16,4 @@ MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
 MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
 MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r8 62
+MD5 af3a45582aa7c857f0500c63c823bd52 files/grep-2.5.1-libintl.patch 2662
diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index 5195d839f931..2bd90c34935f 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sed
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.63 2005/06/12 17:58:25 j4rg0n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.64 2005/06/13 23:16:41 vapier Exp $
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/sed-4.1.4-fix-invalid-ref-error.patch, sed-4.1.4.ebuild:
+  Add patch from upstream to fix typo in error msg #96009.
 
   12 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> sed-4.1.4.ebuild:
   Removed renaming of doc files on ppc-macos and fbsd. Stable ppc-macos to
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 5c94a8a2894a..ec87d443b121 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,9 +1,10 @@
-MD5 3a2bb3cd8ddce6dc1fba0131e10e870a ChangeLog 8563
+MD5 d5ef467e40c9c6f3d75727ee8c7a54c0 ChangeLog 8739
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 5eff12a84b0a08e13914fb31aad5cc90 sed-4.1.4.ebuild 1930
 MD5 ceac4c4a3a356201f7540e95ab08408e sed-4.0.9.ebuild 1788
-MD5 4749e776aca0c214aff703bd909e745e sed-4.1.4.ebuild 1875
-MD5 a244109e1adcbd40a02446fb23df33c1 files/digest-sed-4.0.9 61
 MD5 ef7b5747c59d83996a62825c915805cb files/digest-sed-4.1.4 61
 MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
 MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
+MD5 a244109e1adcbd40a02446fb23df33c1 files/digest-sed-4.0.9 61
 MD5 3ea67fdbcfe6288bb7e03a47b5801a04 files/sed-4.1.4-makeinfo-c-locale.patch 617
+MD5 c78a7215447859226a24305ab7eebb24 files/sed-4.1.4-fix-invalid-ref-error.patch 574
diff --git a/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch b/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch
new file mode 100644
index 000000000000..3605e0bb0ded
--- /dev/null
+++ b/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch
@@ -0,0 +1,21 @@
+Grab fix from upstream for incorrect error msg display.
+
+http://bugs.gentoo.org/96009
+
+Index: regexp.c
+===================================================================
+RCS file: /cvsroot/sed/sed/sed/regexp.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- sed/regexp.c	27 Jan 2005 08:04:30 -0000	1.3
++++ sed/regexp.c	10 Feb 2005 09:54:50 -0000	1.4
+@@ -113,7 +113,7 @@
+     {
+       char buf[200];
+       sprintf(buf, _("invalid reference \\%d on `s' command's RHS"),
+-	      needed_sub);
++	      needed_sub - 1);
+       bad_prog(buf);
+     }
+ }
diff --git a/sys-apps/sed/sed-4.1.4.ebuild b/sys-apps/sed/sed-4.1.4.ebuild
index 38fd3ff5cb18..a69fab8c0f2b 100644
--- a/sys-apps/sed/sed-4.1.4.ebuild
+++ b/sys-apps/sed/sed-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.4.ebuild,v 1.7 2005/06/12 17:58:25 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.4.ebuild,v 1.8 2005/06/13 23:16:41 vapier Exp $
 
 inherit flag-o-matic
 
@@ -39,6 +39,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-makeinfo-c-locale.patch
+	epatch "${FILESDIR}"/${P}-fix-invalid-ref-error.patch
 }
 
 src_compile() {