diff options
| -rw-r--r-- | sys-apps/sed/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch | 45 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.2.1-r1.ebuild | 68 |
3 files changed, 0 insertions, 114 deletions
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index a437d090716a..fb25dcc55c51 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -1,3 +1,2 @@ -DIST sed-4.2.1.tar.bz2 899091 SHA256 2ac3b36ca37bfeb43c4ef4025778cd66d89c77abb843d90552a515a7c9d2948f SHA512 273d4d0b3dd41a3966260fbe261a20110a2a4c0749e11a080f4fc8694e47b605cb977f2535b20b92d57b1b74129df092ba47f4184951dbc3f0f14fd9b91b7bfd WHIRLPOOL 426b244431cb00a8c8f7320f22cf0a5de3165a43d9d6fb8343163e1d4054d61b2737a697ebe54311cf5d2d2f696d2f07877a41b8710ad80d96a7d5138fff07e1 DIST sed-4.2.2.tar.bz2 1059414 SHA256 f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 WHIRLPOOL d816657c51a2718c2b309455facaff50c9da08b79d20985ab1d61faa5b42bffa0b33ea7d3368a8cdaa6079891cfc27cdab38788563c8323081580b4478c7e2b5 DIST sed-4.3.tar.xz 1167168 SHA256 47c20d8841ce9e7b6ef8037768aac44bc2937fff1c265b291c824004d56bd0aa SHA512 4d76a099cf7115763b79b45be5c96338750baa47e34c36075f714e022614397aa9240099d6d009e69aa4d06b6cfc14dcc0f8313442a1465f448b36fb6874a26d WHIRLPOOL dc8ea635d7cd30fa73b163078ed7e48d3f85aaf37041b432f3c1579d556a41cb0afa2c8468f67a4474d7274578850b698b60933f6b4b3d041ee4f77ace344035 diff --git a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch b/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch deleted file mode 100644 index dfd9206d3bf4..000000000000 --- a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://bugs.gentoo.org/284403 - -From 20f68fb1abe862a98bc0378e5bb54d94bb98b8fe Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini <bonzini@gnu.org> -Date: Thu, 15 Oct 2009 19:56:12 +0200 -Subject: [PATCH] handle incomplete sequences as if they were invalid - -2009-10-15 Paolo Bonzini <bonzini@gnu.org> - WANG Yunfeng <uhuruh@gmail.com> - - * sed/execute.c (str_append, str_append_modified): Handle incomplete - sequences as if they were invalid. ---- - ChangeLog | 6 ++++++ - NEWS | 4 +++- - sed/execute.c | 6 +++--- - 3 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/sed/execute.c b/sed/execute.c -index 66cb809..d5903be 100644 ---- a/sed/execute.c -+++ b/sed/execute.c -@@ -254,8 +254,8 @@ str_append(to, string, length) - { - size_t n = MBRLEN (string, length, &to->mbstate); - -- /* An invalid sequence is treated like a singlebyte character. */ -- if (n == (size_t) -1) -+ /* An invalid or imcomplete sequence is treated like a singlebyte character. */ -+ if (n == (size_t) -1 || n == (size_t) -2) - { - memset (&to->mbstate, 0, sizeof (to->mbstate)); - n = 1; -@@ -341,7 +341,7 @@ str_append_modified(to, string, length, type) - /* Copy the new wide character to the end of the string. */ - n = WCRTOMB (to->active + to->length, wc, &to->mbstate); - to->length += n; -- if (n == -1) -+ if (n == -1 || n == -2) - { - fprintf (stderr, "Case conversion produced an invalid character!"); - abort (); --- -1.7.3.1 - diff --git a/sys-apps/sed/sed-4.2.1-r1.ebuild b/sys-apps/sed/sed-4.2.1-r1.ebuild deleted file mode 100644 index 6c002dca6bf7..000000000000 --- a/sys-apps/sed/sed-4.2.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Super-useful stream editor" -HOMEPAGE="http://sed.sourceforge.net/" -SRC_URI="mirror://gnu/sed/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="acl nls selinux static" - -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_bootstrap_sed() { - # make sure system-sed works #40786 - export NO_SYS_SED="" - if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch - epatch "${FILESDIR}"/${P}-handle-incomplete-sequences-as-if-they-were-invalid.patch #284403 - # don't use sed here if we have to recover a broken host sed -} - -src_compile() { - src_bootstrap_sed - # this has to be after the bootstrap portion - sed -i \ - -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \ - doc/Makefile.in || die "sed html doc" - - local myconf= bindir=/bin - if ! use userland_GNU ; then - myconf="--program-prefix=g" - bindir=/usr/bin - fi - - export ac_cv_search_setfilecon=$(usex selinux -lselinux) - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) - use static && append-ldflags -static - econf \ - --bindir=${bindir} \ - $(use_enable acl) \ - $(use_enable nls) \ - ${myconf} - emake || die "build failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog -} |