From e9fc6026a7f14e45e7a77441e9ffa7f37841e4fa Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Dec 2011 18:31:22 -0500 Subject: [PATCH] patch: import from upstream Gentoo Grab the latest stable version from upstream. Current stable likes to reject certain patches, so just update and be done with it. BUG=chromium-os:24046 TEST=`emerge patch` works TEST=`cbuildbot x86-generic-full` works TEST=build_packages+build_image for alex boots Change-Id: I3011e78e7ebb273e7641a3023fe5d8ffb26e04bf Reviewed-on: https://gerrit.chromium.org/gerrit/12786 Reviewed-by: David James Reviewed-by: Matt Tennant Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../sys-devel/patch/files/gnulib_strnlen.c | 31 ++++++++++++++ .../sys-devel/patch/patch-2.6.1.ebuild | 40 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/patch/files/gnulib_strnlen.c create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.6.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/files/gnulib_strnlen.c b/sdk_container/src/third_party/portage-stable/sys-devel/patch/files/gnulib_strnlen.c new file mode 100644 index 0000000000..112df49ab4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/files/gnulib_strnlen.c @@ -0,0 +1,31 @@ +/* Find the length of STRING, but scan at most MAXLEN characters. + Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Written by Simon Josefsson. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#include + +#include + +/* Find the length of STRING, but scan at most MAXLEN characters. + If no '\0' terminator is found in that many characters, return MAXLEN. */ + +size_t +strnlen (const char *string, size_t maxlen) +{ + const char *end = memchr (string, '\0', maxlen); + return end ? (size_t) (end - string) : maxlen; +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.6.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.6.1.ebuild new file mode 100644 index 0000000000..eecb902708 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.6.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.6.1.ebuild,v 1.7 2011/12/03 10:47:41 maekke Exp $ + +inherit flag-o-matic + +DESCRIPTION="Utility to apply diffs to files" +HOMEPAGE="http://www.gnu.org/software/patch/patch.html" +SRC_URI="mirror://gnu/patch/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="static test" + +RDEPEND="" +DEPEND="${RDEPEND} + test? ( sys-apps/ed )" + +src_unpack() { + unpack ${A} + cd "${S}" + # this file is missing from the tarball bug #300845 + cp "${FILESDIR}"/gnulib_strnlen.c gl/lib/strnlen.c || die +} + +src_compile() { + use static && append-ldflags -static + + local myconf="" + [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" + econf ${myconf} || die + + emake || die "emake failed" +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc AUTHORS ChangeLog NEWS README +}