gentoo resync : 15.12.2019

3 files changed, 49 insertions, 0 deletions

diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index a48cce0844db..cd97c39100c2 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,7 +1,10 @@
+AUX cfssl-1.4.1-build-fix.patch 587 BLAKE2B 74651f5b21947cab2a004e25ca4b30cc6f33a7a5a7089c7d25929d0792f497139268c51ab3f1054dfdba0db073b2f57c0e1807f50b3278527611d17c4942951f SHA512 606d410d70f9b457fe83f2933bb0f335256ddbb1898911984a220da2ed635b732f5a04ad4902de42913aa987793165974117855a6b19857853478d9e7394fa9b
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
 DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
 DIST cfssl-1.3.4.tar.gz 7092440 BLAKE2B 85a7a73ae5b18ae0e4ac02b1a4d5f633d73f2c0f81cb49ef85c39b6a241ac538220a8cebb448af795140a6308f46f6e53003f25a31edad452cb6db39ff95a9b2 SHA512 796f24f9a7cd9966b3586b5b08deb410570cc31ec747b0c834215c105df1b4fea4907bfa223d196ad71fb296724dc690b6ffd298c8ef81db1333ed3e69f1ecd4
+DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
 EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
 EBUILD cfssl-1.3.3.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
 EBUILD cfssl-1.3.4.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
+EBUILD cfssl-1.4.1.ebuild 648 BLAKE2B 3cea9d53516b674e0d0b6e45ed7f346acc6a83398ed80ae5293c0daf86ffadba4c5b86e63ec7b72011fe7b544cc446e15aa14d8bf5625f59a3cd4af351486166 SHA512 e7a35497b87ef52025fb325cab03d6851d11e28d94287f482f4642d441cf902802c3db65ae2635d706c3e6cc97169d70330bbedd6bf6af0485e8071a6708ffe6
 MISC metadata.xml 329 BLAKE2B 5188aa700150b22b0d2972d57ee0db2d1a2239017edbf9547961126b7158060c74aaafd1ffedfa25f76402766a4403d41f3875a8bd2c43d84150177879e35186 SHA512 b56f2d72ad1a5ef0c2531cc1d3524bf13f7089d099bbd774d1774aca5dfb7f8c074b945203ccb80672c154f98d8728cf9d8671e7df9b328c01c2e79cb9ba8be5
diff --git a/app-crypt/cfssl/cfssl-1.4.1.ebuild b/app-crypt/cfssl/cfssl-1.4.1.ebuild
new file mode 100644
index 000000000000..6cec5015d3dc
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+SRC_URI="https://github.com/cloudflare/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-1 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+PATCHES=(
+	"${FILESDIR}/${P}-build-fix.patch"
+)
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" emake VERSION="${PV}"
+}
+
+src_install() {
+	dobin bin/*
+	dodoc CHANGELOG README.md
+}
diff --git a/app-crypt/cfssl/files/cfssl-1.4.1-build-fix.patch b/app-crypt/cfssl/files/cfssl-1.4.1-build-fix.patch
new file mode 100644
index 000000000000..0435a3c88509
--- /dev/null
+++ b/app-crypt/cfssl/files/cfssl-1.4.1-build-fix.patch
@@ -0,0 +1,16 @@
+This patch cannot be upstreamed in this form. However, the following
+issue has been opened to discuss integrating a better solution upstream.
+
+https://github.com/cloudflare/cfssl/issues/1062
+
+diff --git a/Makefile b/Makefile
+index 10a52fc..7fc019b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,4 @@
+-VERSION := $(shell git describe --tags --abbrev=0 | tr -d '[:alpha:]')
+-LDFLAGS := "-s -w -X github.com/cloudflare/cfssl/cli/version.version=$(VERSION)"
++LDFLAGS := "-X github.com/cloudflare/cfssl/cli/version.version=$(VERSION)"
+ 
+ export GOFLAGS := -mod=vendor
+ export GOPROXY := off