Merge pull request #299 from flatcar-linux/krnowak/pkg-updates-2015

Update packages and eclasses from 2015

app-crypt/shash/Manifest

@@ -1,8 +1 @@
-AUX 0.2.6-manpage-fixes.patch 1451 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317 SHA512 10dbcfa52a7df57ef68dc58f21e1b2931adf0479697e13f99c56ccfbbd1c79188751d1ce7e2b160261170a678a4130a71a6b531820aa59e4ddbd131d5d9cb551 WHIRLPOOL 11b4d1aaf6feae4dd00d7abfbe704fcb8ba665d0de46de724098fa57b60960060c6df7661c9e3735c9ccd5865ab6c66cad3527395fec4279822e114dc59ab92d
-AUX shash-0.2.6-binary-files.patch 898 SHA256 e06660afe1afb338bf4f209d39ac33c412ecc6fb22feec684c0a7b5fd80f46a6 SHA512 47f299097b8a9907ccfe2f877c42ab8f76f02546211643573796b378d67dd7941518341f8fd07e646c1aa11a665ddbca6ae113a4d58f6995007d9b5aec171d8b WHIRLPOOL 0bbe198601dd7b1ce55719936d8670975505b9b31baa68f0663d25c9988026587b8bc1dcfb18d188b598298715f57716c334b875ac6ff5075ff3a79dc121e7f9
-AUX shash.bash-completion 863 SHA256 7ceb200e7da4fcfbc029d85074ac44ffacf96b1dc8173635d7d3649b7898e0d7 SHA512 19fabe9fd102c12e37f46ef126d5e173e3190c1541a0c92007d3398af349bf18b74bd92d2880dc79f5773d2c00ac292b2a62acf1097f8bc92183d0b1a648a264 WHIRLPOOL 111745a70b056873e1d7d4ce507ee8c83115b61d1f6f53453cb37cde1a73e1792a22282a6a6f6c147fa34734b2a468111ec80e5e6a1c55f4e609d96bad0f8332
-DIST shash-0.2.6.tar.gz 105641 SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b WHIRLPOOL 8b809f5fddc98def54907fee8af424937c747f341dd0eaa6fd0c1057858c4dce7d117dfbc729cdd951c53e68a363d3339e9db4e2de1677620bbb9a94a810e8a5
-EBUILD shash-0.2.6-r2.ebuild 943 SHA256 3a04e2485ed06bc41c6bad9e5c1b52e30632d7a33a9be49bc8e57dee4ee4ca8a SHA512 c436bff73c013bc7647c7efb592535ac3686daa9698ad3583b520597b91ebedd600d3e08914db5017376f0f36a747d84c610d039093b51a9c7ee326500da2c10 WHIRLPOOL 1686d95d757c499716d087086b28805100e3cc97b6b802a336071c03b5bd2903c9031fb881235951b44bd8e96403e3a9e3b479518dc04d2087da272f98af4622
-MISC ChangeLog 2282 SHA256 602e76d19c7626bbe13c1147f05a8b7c8cc3d462ea96654c7fe0dfe285989a82 SHA512 f651e0b28c110b55554b1788a31885a141b74639d6d20fd35aa8448b17bd22973b6196fbec41e6080250a31663f66833b6f97c83849744ef24c175a154fcf47b WHIRLPOOL 10472f4f96b4e8091fc7a1834dda31e69f36b111e71505bb93d97233a4ce07b14650f4b1deec956492c59f630f815e324282b6c1e9591c7f3de0b91032a6f728
-MISC ChangeLog-2015 4546 SHA256 56731500ee859978dcb7c11ebbb9b7104beeefdbe3875ad60310bc73542ede1e SHA512 29806eca1add20c6d4fe6e8592c8256c73e08602e8c00a0515a1b2c692b49bc357c827ed439b62494730d6d584445cf60ff35c90aa19986f320cfc9afc3eb70e WHIRLPOOL 4f0e4853585d9ba5c915d9b75bae7b0647cfc75ce01c714956fe1947496c5aae436b6c0860b6f0fe09116cbed7c4aa216a47890ea7fdb55e1fb8c70d7209bc0c
-MISC metadata.xml 437 SHA256 7c03f43673bb700e0bc1063720dc80df195304f74a397d8175192ec6e705bb88 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d WHIRLPOOL e086a413a8a5bc1d1fba9a2a4717d83af4137a40f17ff969a5536a26fbd342c8a58b3418933fc42770ffae3c60812ab2bd044951de17a52566441a9210b26282
+DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b

app-crypt/shash/files/shash-0.2.6-format-security.patch

@@ -0,0 +1,28 @@
+--- shash-0.2.6/src/errors.c
++++ shash-0.2.6/src/errors.c
+@@ -4,7 +4,7 @@
+
+ void err_quit(char *errmsg)
+ {
+-	fprintf(stderr, errmsg);
++	fputs(errmsg, stderr);
+ 	exit(-1);
+ }
+
+@@ -12,7 +12,7 @@
+ {
+
+ 	if (quiet < 1) {
+-		fprintf(stderr, errmsg);
++		fputs(errmsg, stderr);
+ 	}
+
+ }
+@@ -20,6 +20,6 @@
+ void err_crit(char *errmsg)
+ {
+ 	if (quiet <= 2) {
+-		fprintf(stderr, errmsg);
++		fputs(errmsg, stderr);
+ 	}
+ }

app-crypt/shash/files/shash.bash-completion

@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 #
 # shash(1) completion.
 

app-crypt/shash/metadata.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>[email protected]</email>
 		<name>Sven Wegener</name>
-		<description>primary maintainer</description>
 	</maintainer>
 	<longdescription>shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files.</longdescription>
 </pkgmetadata>

app-crypt/shash/shash-0.2.6-r2.ebuild → app-crypt/shash/shash-0.2.6-r3.ebuild

@@ -1,27 +1,28 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1
 
 DESCRIPTION="Generate or check digests or MACs of files"
 HOMEPAGE="http://mcrypt.hellug.gr/shash/"
 SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
-DEPEND=">=app-crypt/mhash-0.8.18-r1"
+DEPEND=">=app-crypt/mhash-0.8.18-r1
+	static? ( app-crypt/mhash[static-libs(+)] )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-manpage-fixes.patch
-	epatch "${FILESDIR}"/${P}-binary-files.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-manpage-fixes.patch
+	"${FILESDIR}"/${P}-binary-files.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_configure() {
 	econf $(use_enable static static-link)