gentoo auto-resync : 12:12:2024 - 02:01:23

4 files changed, 50 insertions, 6 deletions

diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 740e25d52330..ef90c8515b09 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -2,7 +2,9 @@ AUX cfssl-1.4.1-build-fix.patch 587 BLAKE2B 74651f5b21947cab2a004e25ca4b30cc6f33
 DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
 DIST cfssl-1.6.0.tar.gz 7428162 BLAKE2B 100313b756885e00a09003bfd326f8b0d69a14d148cd65b97a53667716c14a8841d862740b7dafbca74da30a8f1d6465ca3f3bad6ccd2ed39379bb1de80fd225 SHA512 a1470c50a6ffa506d2c1798a9e8af5a60206cd41d24cc3ca8a071e9ddfc3249a07fa79c03dabc3df0800985be7e930018045ae95ee83d31486cba93e516da111
 DIST cfssl-1.6.4.tar.gz 7890450 BLAKE2B d179f8768894b3686b377698120df6dd33f7dd82b4f8c74b626ca62168f59eff350129793f0954cc7db5e621d26d99f4e26ea579cf7eb5d5f89520cad060f5ee SHA512 6327d15dda24bf072958c74f4cd0bf1aa4023f935bb24da7f5655739992970fa777f6771603dd3a6edfee6cd2ed418a2fef335f7209ce88cf07674d592c3110f
-EBUILD cfssl-1.4.1.ebuild 723 BLAKE2B 8796b3a7fac888d22b3f772efbdb170fda602d81dee6dbb7596e4dad342253bcdee0960097360ace5990aa52b799c4019cbea0825ce19c47b3107461f8ed7802 SHA512 5d14c653d7e696e9e71e6c1a1916ada90df93bde6e879ca2b812fd6a258e2506dc72ac0881a18b3ae573d0cdf7d29a8f0681db120f88fe1d217027a6067b23f7
+DIST cfssl-1.6.5.tar.gz 8164981 BLAKE2B e82a80969f1b51142753bb9a8fcd4ec4854eb3a456bc1170159117ca8a29d6cb883c25e37981e7922f91480e161b1d0eea0c5265caaa550ccf31e01b092dac8b SHA512 b59863d534474ba73efe2dc38b55ba4eb1e0911346b6b9fff7778a3bdc77bf58290ab7173e3ce2cd69f38594dc471ce78632c2aa1cf9188eb6163ca272391185
+EBUILD cfssl-1.4.1-r1.ebuild 860 BLAKE2B cf553f611df5790abd13d3a9270d976b20727f9567eb6b62b7f3cf09e0eba546934dfbb57e13267ee04c9cfeecb07997710b9640b3642bacffcbdbbde765abfe SHA512 42651ec77a4b58c2690186a90ec1049be39d4669e3e161aa5a475f0ef3bdfb4bced7c4913be8563e1d413a7626295985471801e0e800b9efa56dace4ad44c621
 EBUILD cfssl-1.6.0.ebuild 738 BLAKE2B bac345d0dc6032d3add53cce501bd996495bbc8da5babc834a2ccb83dd0bd9cace7d7632bcbca80517324aca14dd997e3e3725da5d1b253b6d70df86a55b4dc6 SHA512 03878122f426c1ab6bfe45037ec6d03b1060a432f1c2507f35f8e87a2d9f444e690d5b2ed99e923a566cf7917e91f699cdfd369f0d14284a0317e2747ec5a854
-EBUILD cfssl-1.6.4.ebuild 738 BLAKE2B bac345d0dc6032d3add53cce501bd996495bbc8da5babc834a2ccb83dd0bd9cace7d7632bcbca80517324aca14dd997e3e3725da5d1b253b6d70df86a55b4dc6 SHA512 03878122f426c1ab6bfe45037ec6d03b1060a432f1c2507f35f8e87a2d9f444e690d5b2ed99e923a566cf7917e91f699cdfd369f0d14284a0317e2747ec5a854
+EBUILD cfssl-1.6.4-r1.ebuild 875 BLAKE2B 3e00dd52283341acec95cbe250155424ba1c3f142b7a5e6eeb2ea0d836294e0978fd7baa2ca077d5d5bd04bdda36880ffa377fce4d5f5b9b2735046563e0ec53 SHA512 215c716bb683c97df35b973b7ebbed5c5568c7e27f10300000f9e23b46872254a933f447c94192fe040a325085ac4c4cd0b3d58d109bf42da30eff913452cfcc
+EBUILD cfssl-1.6.5.ebuild 799 BLAKE2B bde5014559c12c9ae212ed19a6fadae4a4eb82dae94e5361e5752ad5dd2ff918564cdf9f3aaffce53ede96cae2f5c301e6503ae36249adec3cf99f52a5d48642 SHA512 961aed162f61ad3e64c8c2bad4c8fbe12676767de9324951b712ebf2de735c97e36ddbf0411176a5fadecd85c22982aa3cda70311adc792565108d57130b4c4c
 MISC metadata.xml 330 BLAKE2B bbb2f2d9abd1ba1fbde9fff4d2d359cf7c3b73d5ddc0eaf0b5a8dc9bce9fcadef9ee807a2f68145d5b02979aec8d509b592a36bfb64cd9780fa7a18420814253 SHA512 c8c8a7ae44906be864148824b20790319e86c4fe2424cfc5d5560610e7bbfcf04103af2f8a365c88dfd801154a5c3f4a35b4fc0f8bead4eb3ef0af77473a59a9
diff --git a/app-crypt/cfssl/cfssl-1.4.1.ebuild b/app-crypt/cfssl/cfssl-1.4.1-r1.ebuild
index 7541ce49e832..d9a5facf5a3f 100644
--- a/app-crypt/cfssl/cfssl-1.4.1.ebuild
+++ b/app-crypt/cfssl/cfssl-1.4.1-r1.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="hardened"
 
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
 PATCHES=(
 	"${FILESDIR}/${P}-build-fix.patch"
 )
@@ -30,4 +28,10 @@ src_compile() {
 src_install() {
 	dobin bin/*
 	dodoc CHANGELOG README.md
+	mv -iv "${ED}"/usr/bin/mkbundle{,.cfssl} || die
+}
+
+pkg_postinst() {
+	ewarn "Please note that mkbundle is renamed to mkbundle.cfssl, to avoid"
+	ewarn "collision with mkbundle in dev-lang/mono"
 }
diff --git a/app-crypt/cfssl/cfssl-1.6.4.ebuild b/app-crypt/cfssl/cfssl-1.6.4-r1.ebuild
index 3d244721ab37..83786737696b 100644
--- a/app-crypt/cfssl/cfssl-1.6.4.ebuild
+++ b/app-crypt/cfssl/cfssl-1.6.4-r1.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
 PATCHES=(
 	"${FILESDIR}/${PN}-1.4.1-build-fix.patch"
 )
@@ -30,4 +28,10 @@ src_compile() {
 src_install() {
 	dobin bin/*
 	dodoc CHANGELOG README.md
+	mv -iv "${ED}"/usr/bin/mkbundle{,.cfssl} || die
+}
+
+pkg_postinst() {
+	ewarn "Please note that mkbundle is renamed to mkbundle.cfssl, to avoid"
+	ewarn "collision with mkbundle in dev-lang/mono"
 }
diff --git a/app-crypt/cfssl/cfssl-1.6.5.ebuild b/app-crypt/cfssl/cfssl-1.6.5.ebuild
new file mode 100644
index 000000000000..bddb9317c463
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.6.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~arm64"
+IUSE="hardened"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.1-build-fix.patch"
+)
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" emake VERSION="${PV}"
+}
+
+src_install() {
+	dobin bin/*
+	dodoc CHANGELOG README.md
+	mv -iv "${ED}"/usr/bin/mkbundle{,.cfssl} || die
+}
+
+pkg_postinst() {
+	ewarn "Please note that mkbundle is renamed to mkbundle.cfssl, to avoid"
+	ewarn "collision with mkbundle in dev-lang/mono"
+}