From 96b02326b503a6cd6421e13d5fa67b36834a3b73 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 22 Dec 2011 01:07:08 -0800 Subject: [PATCH] debianutils: import newer upstream version 3.2.2 -> 3.4.4; support for dpkg format version 3.9.1, XZ compression, BUG=chromium-os:24205 TEST=`emerge debianutils` # host only package Change-Id: If83ac3ee08559a1874ecf903ec35ea101cd8c843 Reviewed-on: https://gerrit.chromium.org/gerrit/13408 Tested-by: Brian Harring Reviewed-by: Mike Frysinger --- .../sys-apps/debianutils/Manifest | 1 + .../debianutils/debianutils-3.4.4.ebuild | 45 +++++++++++++++++++ .../debianutils-3.4.2-no-bs-namespace.patch | 30 +++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/debianutils/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-3.4.4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/Manifest new file mode 100644 index 0000000000..12c25114d2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/Manifest @@ -0,0 +1 @@ +DIST debianutils_3.4.4.tar.gz 155523 RMD160 b519a7fbba102f4bd5f4a2b25279851ed49ea34e SHA1 b2c64f4969d584061eeb500d4bc9a6e9e39345c1 SHA256 f5d6f6116bb2b474399c07f519c3a30bcda5c85994b43195fdf09508031c72fe diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-3.4.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-3.4.4.ebuild new file mode 100644 index 0000000000..43702bbadf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-3.4.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-3.4.4.ebuild,v 1.6 2011/05/01 12:20:13 xarthisius Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="A selection of tools from Debian" +HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="BSD GPL-2 SMAIL" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="kernel_linux static" + +PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch +} + +src_compile() { + use static && append-ldflags -static + econf || die + emake || die +} + +src_install() { + into / + dobin tempfile run-parts || die + if use kernel_linux ; then + dosbin installkernel || die "installkernel failed" + fi + + into /usr + dosbin savelog || die "savelog failed" + + doman tempfile.1 run-parts.8 savelog.8 + use kernel_linux && doman installkernel.8 + cd debian + dodoc changelog control + keepdir /etc/kernel/postinst.d +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch new file mode 100644 index 0000000000..94a84b8fb9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch @@ -0,0 +1,30 @@ +Allow dots in the names, bug #95173. Patch by Kerin Millar. +Re-sourced for 3.4.2 + +--- a/run-parts.8 ++++ b/run-parts.8 +@@ -25,9 +25,10 @@ + .IR directory . + Other files and directories are silently ignored. + +-If neither the \-\-lsbsysinit option nor the \-\-regex option is given +-then the names must consist entirely of ASCII upper- and lower-case +-letters, ASCII digits, ASCII underscores, and ASCII minus-hyphens. ++If neither the \-\-lsbsysinit option nor the \-\-regex option is given then the ++names must consist entirely of ASCII upper- and lower-case letters, ASCII ++digits, ASCII underscores, and ASCII minus-hyphens. However, the name must not ++begin with a period. + + If the \-\-lsbsysinit option is given, then the names must not end + in .dpkg\-old or .dpkg\-dist or .dpkg\-new or .dpkg\-tmp, and must +--- a/run-parts.c ++++ b/run-parts.c +@@ -501,7 +501,7 @@ + != 0) + pt_regex = &tradre; + +- } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-]+$", ++ } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-][a-zA-Z0-9._-]+$", + REG_EXTENDED | REG_NOSUB)) != 0) + pt_regex = &classicalre; +