gentoo resync : 14.07.2018

5 files changed, 89 insertions, 0 deletions

diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
new file mode 100644
index 000000000000..575e662d7175
--- /dev/null
+++ b/dev-util/patchutils/Manifest
@@ -0,0 +1,6 @@
+AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
+DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
+DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
+EBUILD patchutils-0.3.3.ebuild 754 BLAKE2B 2fd891fb4f4f8e98ebc3c76d08f3ab2652838ad8760f09516b10761297cb93dbdcc29ec03421eb41bbd47a84eba9f445224a3071620c20c329ae60e06c73425b SHA512 8f67afa723ad1162d17c816bb3b185019dd648da5c6e541ac74a974e9b76689ce93df139bbf7d87c6746a87425e0e65c76cff70ae9d06b731afbf06ce7d1ddef
+EBUILD patchutils-0.3.4.ebuild 786 BLAKE2B 28d234a96c05e400f7827b543983ca77833ad58a176c48949c80f7adc6d2efedeab2506aec4f096100c64225c36470488714fc2818c9f4c3adc3b3adbe23c92c SHA512 e3903c17b9397e3597ffcaa0850101e3d25e1b20cc81db908691404fa0e9c7279cf96564a7804a10dfc458a12988898130895426af49b820b6c13ead44fb1977
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
new file mode 100644
index 000000000000..be190b65a734
--- /dev/null
+++ b/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, &regex[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, &regex[num_regex - 1], errstr,
+ 				  sizeof (errstr));
+-			error (EXIT_FAILURE, 0, errstr);
++			error (EXIT_FAILURE, 0, "%s", errstr);
+ 			exit (1);
+ 		}
+ 	}
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/dev-util/patchutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
new file mode 100644
index 000000000000..7cccfbdbbac7
--- /dev/null
+++ b/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/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
new file mode 100644
index 000000000000..cc9698ac817a
--- /dev/null
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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
+}