From f6bb2911583aa201b344b8500c1124f4ecef783e Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 22 Mar 2017 12:55:12 -0700 Subject: [PATCH] bump(dev-util/patchutils): sync with upstream --- .../dev-util/patchutils/Manifest | 8 ++++++ .../patchutils-0.3.3-format-security.patch | 25 ++++++++++++++++++ .../dev-util/patchutils/metadata.xml | 8 ++++++ .../patchutils/patchutils-0.3.3.ebuild | 24 +++++++++++++++++ .../patchutils/patchutils-0.3.4.ebuild | 26 +++++++++++++++++++ .../md5-cache/dev-util/patchutils-0.3.3 | 12 +++++++++ .../md5-cache/dev-util/patchutils-0.3.4 | 11 ++++++++ 7 files changed, 114 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.3.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.3 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.4 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest new file mode 100644 index 0000000000..6482fcd418 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest @@ -0,0 +1,8 @@ +AUX patchutils-0.3.3-format-security.patch 715 SHA256 f4c17fda9bea2e48f0265855403a64d063f7cd50fcff37cc59cc5113926bd434 SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa WHIRLPOOL 4b1f7415f3a55ee96c3b4939bc67fb14faa445524cf696ea8aea436929a10b6373fce3481f7f5beda96c07ab777f44b5bc17e16011d96ccfdd7813acdfda7624 +DIST patchutils-0.3.3.tar.xz 156328 SHA256 91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268 WHIRLPOOL b4db67f2682e3bd4a37abacaa56477f7bfe79210469243c572ebd870e0e19cb54e51d6be79b737210e9de685d09470ce2d2db0452fe4b8f26f72f06a9cb6b3f8 +DIST patchutils-0.3.4.tar.xz 166400 SHA256 cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876 SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440 WHIRLPOOL 4f6b04ff139f9b8ae8c0d7e3ac7200071de087b70633ec17836937c473b54cc6d60d7572d91fe36735b12d1eaed57ebcaac9283d41f9a06f19f52683b4c0e372 +EBUILD patchutils-0.3.3.ebuild 754 SHA256 61e8ae1779fd8384f6477c1b354932afa3f687f7e0bc6b07141f99af3ec5027b SHA512 8f67afa723ad1162d17c816bb3b185019dd648da5c6e541ac74a974e9b76689ce93df139bbf7d87c6746a87425e0e65c76cff70ae9d06b731afbf06ce7d1ddef WHIRLPOOL 3f57da568271976457a9b9b35c5df918ed3b0073a5ec5de3d04114a7c9021ce0fd194673b3c2579fb49dee0680110db57460081c89f80a3ac779e786f804fca4 +EBUILD patchutils-0.3.4.ebuild 796 SHA256 4d8405c50038d1e6aac9adde4f511b53aff1d3d14e150208253184fc603c5a96 SHA512 ced9f7744439e3fe462d8a03ee862b05f91dba19f8a0c69005985ecd208ab4ef029214e5cb779102b6beff11e6c77097124c27114b38dee06aecc39781df2dad WHIRLPOOL 34e12c308669568c9e5b0d627eac06040a5d63ca2123d4fcc3ef2a068c63c823438da5a7f080a624afb5dff12026aa818c5ea105fee37f09324be28d1d580f15 +MISC ChangeLog 2714 SHA256 5510f9ab78ee2dc79939b1856fba7518cf15be0bd4a41566652cd97eec4d35c6 SHA512 d34ba801a34e2142c83f9f626a5e57f31acbefda775b7a926142515965e64f7fef5493059479dda7ab411243a65c22d16d7b2db4450d2f0989c2c9c2d97e64c5 WHIRLPOOL c5f909e132caea79bdf2ae0563ac4d2248e02c0dfa085f5ed4e66b052a52eaaede7bd2d856d00621ff5c256f6d533f9bd89b64f8c8d13b3549f674cb21ecf82a +MISC ChangeLog-2015 9899 SHA256 2fec93564625de38604da1f896d64e75a564d6b62cae69c0803c0bb7380e07b7 SHA512 f90b3d2d230251687edded087a3b808b6f8baaaf72ba172c3c31f022de4fc1a41baa14572b1d0485f16f9c2666ec35eb73dfaf8f6d1e681c6c347dff5d89d994 WHIRLPOOL 585bddff8c5b8f1ed7d0f441f015cebc495bc7278043a5a37ee2ecfc65594e582f2d282620560fde3edf2f7ee89ef3d16e5a8c66a131ca81535ebed2ae2faa9f +MISC metadata.xml 265 SHA256 5c4f9426c69dd2191012bf8aae1952f4f6298c1f6ff0ec1e45fe0e05327694e9 SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 WHIRLPOOL 2fa84a9f23f48e804ab20a6fabe2707f86227bded2a41d3af30958db5a69bc6276140a7f035a256caeca5a8b8ce1c240383c300a90fc4a83334c178769bc3519 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch new file mode 100644 index 0000000000..be190b65a7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch @@ -0,0 +1,25 @@ + src/filterdiff.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/filterdiff.c b/src/filterdiff.c +index eb08d49..0b2b301 100644 +--- a/src/filterdiff.c ++++ b/src/filterdiff.c +@@ -1263,7 +1263,7 @@ read_regex_file (const char *file) + char errstr[300]; + regerror (err, ®ex[num_regex - 1], errstr, + sizeof (errstr)); +- error (EXIT_FAILURE, 0, errstr); ++ error (EXIT_FAILURE, 0, "%s", errstr); + exit (1); + } + } +@@ -1509,7 +1509,7 @@ int main (int argc, char *argv[]) + char errstr[300]; + regerror (err, ®ex[num_regex - 1], errstr, + sizeof (errstr)); +- error (EXIT_FAILURE, 0, errstr); ++ error (EXIT_FAILURE, 0, "%s", errstr); + exit (1); + } + } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml new file mode 100644 index 0000000000..3cf14bf746 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml @@ -0,0 +1,8 @@ + + + + + shell-tools@gentoo.org + Gentoo Shell Tools Project + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.3.ebuild new file mode 100644 index 0000000000..7cccfbdbba --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.3.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils + +DESCRIPTION="A collection of tools that operate on patch files" +HOMEPAGE="http://cyberelk.net/tim/patchutils/" +SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="test" + +RDEPEND="" +# The testsuite makes use of gendiff(1) that comes from rpm, thus if +# the user wants to run tests, it should install that too. +DEPEND="test? ( app-arch/rpm )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-format-security.patch +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.4.ebuild new file mode 100644 index 0000000000..9fd8a63854 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.3.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="A collection of tools that operate on patch files" +HOMEPAGE="http://cyberelk.net/tim/patchutils/" +SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="test" + +# testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants +# to run tests, it should install that package as well. +DEPEND="test? ( app-arch/rpm )" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.3-format-security.patch" +) + +src_test() { + # See bug 605952. + make check || die +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.3 new file mode 100644 index 0000000000..bbb4905089 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=prepare +DEPEND=test? ( app-arch/rpm ) +DESCRIPTION=A collection of tools that operate on patch files +EAPI=5 +HOMEPAGE=http://cyberelk.net/tim/patchutils/ +IUSE=test +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz +_eclasses_=eutils ea170b525f6a38a006be05c9d9429f13 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=52c94a17b6e4971004394e425d2be64a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.4 new file mode 100644 index 0000000000..a0d565890c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchutils-0.3.4 @@ -0,0 +1,11 @@ +DEFINED_PHASES=test +DEPEND=test? ( app-arch/rpm ) +DESCRIPTION=A collection of tools that operate on patch files +EAPI=6 +HOMEPAGE=http://cyberelk.net/tim/patchutils/ +IUSE=test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.4.tar.xz +_md5_=fa23cee98cf669406ed9c69c5646860f