gentoo auto-resync : 01:10:2022 - 07:10:12

5 files changed, 69 insertions, 4 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ab3f10b9548a..d3ecb1e28572 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index cb4f382ecf17..6d8aef707714 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,3 +1,9 @@
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-2.0.ebuild 601 BLAKE2B 8136f606f96547c0a0065ba4d3bf7f3e9d191f768bd0069738b5a5dd52a6b39668bbfbb1acd330cf9dcfcff10103e99c3577e66d324c94a2a54ae9414b130946 SHA512 5431e4d15ade5a789cdc42698911cf3715171dc67d7af046549b4b3619b0a9b5a4c3d8b829fc7f26156d6e71d2ef69c69af1026e74ea96e090723a3421fc418e
-MISC metadata.xml 250 BLAKE2B ea4ec0b34929b5f8fddedef23fbaf1f6dfc2631a649df885ee34a5812d7206ad97921dcae8b4f595399d712a9f2963a28d392cb744dc433b7e388dec62c75689 SHA512 ec5f078202a9044b99b2f8c6653e9f4c2b67dba5f59de32d60502edb179ba4be6b30d4953dc8cf144ff7f8cc0c4395eee8fb7dfc13eb6fa10fe0566a31118f44
+DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
+DIST osslsigncode-test-unsigned.cat 394 BLAKE2B 77a9ebd80feb7ec4f26c0899a760b6463f88ed2301fd3c65c4d72417f7d7d61f0e51c0ca87870500bec51f900aafe05216f4cec888db6c76b292760862da7d00 SHA512 3f4212a4a0822079ba46a90aa80f725d0068bc30e8be057019b2c500633d502f6d879c4ba332c54e1194c148a1fd4d7551a2ba7cb143f2fe53cef5fe94d9364c
+DIST osslsigncode-test-unsigned.ex_ 120 BLAKE2B 7036b07cfa8f7d1bcdfc1293671aaa01780bffee0339aa5b63b8db77dd2d77a75ffa51363385c2d40d62d057adf4627afa47f099f8e1206c4eeda67af01bd8fc SHA512 373592e6bffe1da907cfa464fa70d1b64c177beb7fd76325553afb0d721263d35b40508e3ede0a64bd016abb2ce97e104417fa472cd2bb0d92f5d14d5001349c
+DIST osslsigncode-test-unsigned.exe 96150 BLAKE2B fd0da9e64473fed792572606f38de8c71e285a557883ac29201b113abc533a32c80ed17330860dd30b9913302ea44433c41d21ba236789ed6d25083f5909960b SHA512 afed867e6a680d7bdfe27e537ccf6496572d79b8b8a90e1886a83d9b8a67c815a54b7bd929819a0cab7b3243c276dd676e51b267a918ace448689d4b424d948b
+DIST osslsigncode-test-unsigned.msi 9728 BLAKE2B eb253cce75c5419d1815682c10f1b10357af90317b1dfa71d3b888e5b158017b8f2b3154ae2073bed1fd5f9fd515c2006a0cb0692a70d1876221f3fe5b048f33 SHA512 3c3afa76d5a76dd7eff35b5d8e8b5a5bbcccd23f213591d3a8d0b4e5e97a8dbabb97345b7a93bb459fded5269f5ce1d7afa66baf623c8b8573f95b68fb4a93c1
+EBUILD osslsigncode-2.0.ebuild 603 BLAKE2B a220a6abfb3e99119e00523d7de4793bff91d7d87eaf8bd8841d73b3403045e6acbc1899e999913bdea5ce03f1bedbfcdfa0d831dbf1032c8427c37a8fd1d0a6 SHA512 3719b291d6364621604238ae957fa0a27124a044cd94bd49c250bb1b81759d9c780d6ddfb54ba4808aa85f8bce95dce0f689652e0218bf0527acd4f9ceb3998f
+EBUILD osslsigncode-2.5.ebuild 1292 BLAKE2B c7c35d8e889274bcda6840f172a6ad239988a3bb1b463c33febc495c02d4fae4e9c9e370831b91c51d2ec05cc47b995b144f05ff903a67ca6c2a3bb4c97d0d44 SHA512 60ff3797595987f6c6aad5f6b2e37aa3aaa7cb8dc9717c9a6ddbf177f1fc2d937255c5c11ff22a02a4e03b8a9ab238d9197e1c7344a7f3c16b68dedbf5124bde
+MISC metadata.xml 311 BLAKE2B 2125050abed07efbfea727f3e45728531290dc032a0a54beb102d5b8a74c07df7d291c22293107286da9563d4de5d08edb8f61cd6fd8a11abd0bd465cf31d854 SHA512 93b6f00f2ac04656afecdb12a85b1736559247eeb9855835e90b0b79437e93c10e0bb6a2324f067ba37be9293e3b41406d7901ffa32f22e462b01eef3ffa1953
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 8a5edfb125c9..7c529bd10048 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">osslsigncode</remote-id>
+		<remote-id type="github">mtrojnar/osslsigncode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
index 5f3e86ad8cc5..a00e248085ce 100644
--- a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
 HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
new file mode 100644
index 000000000000..3b1e4827338d
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
+SRC_URI="https://github.com/mtrojnar/osslsigncode/releases/download/${PV}/${P}.tar.gz"
+
+for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
+	SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
+done
+unset test_file
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	curl? ( net-misc/curl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test ; then
+		local test_file
+		for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
+			cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
+		done
+		unset test_file
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package curl CURL)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test -j1
+}