gentoo auto-resync : 02:09:2024 - 12:28:17

5 files changed, 88 insertions, 66 deletions

diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 438796e18716..a627d795f343 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,9 +1,6 @@
-DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
+AUX osslsigncode-2.9-missing-import.patch 995 BLAKE2B 390dc5ab00db721d3237dc5382abb21201a1c0290a4e3c14411fc18dc3cb1d7759d3fec9b2bf3b67c1d1a5ef3634f320998c1f1bae5ceab95be454aea35ad156 SHA512 6bc44fa87fbafefca70d96f1152e02f93ff417eb8ed8e46cb290f8e70699f325ac88deac7e3854e10a886e343cb94760fa25c470c9a37b3a2a698235fc369d41
 DIST osslsigncode-2.8.tar.gz 747274 BLAKE2B 62472d0830b53b2d182b37585a225f0699600bcc2bad5915a64a52b5b7c3fab6f7e936ba82e41907e41c9b0cc1f8ff5f47aa79feb8c5742b16d1fe101baf3db0 SHA512 dd7349e3a64c1d6f63379a14450c8e643c006d2824dc41ce9ecde64ba276466772c440e577aca4a805a49c7ba88aa0dcf5ea73c323abcc4945491407b20e8e96
-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.5.ebuild 1292 BLAKE2B 80b51c94a60a75928f91de4fdd69c220fa8b8be8dc2716036453c5379c030e9713be79cd5fe61814c410b27e833a469068d3adcc155c08526233a51ac774a320 SHA512 bb781e77a817f1002eb89663797b0c28b31dc68844935c4e116d4eae5ff0b3d92c5afb9237f2c599b317c13e204fa464eb30571c5ed8a0d6ec1b57cfea5ed3bb
+DIST osslsigncode-2.9.tar.gz 1033420 BLAKE2B 63897907102f7e3ee241d4a0436ac2c217351cbdf330c302344ad648cc5d7962ea9936b1c1ccfe6072c3188f6e49f892b323eecc0c87476071effb6d02f9e0e0 SHA512 c88d3050b0f4af5cf4ec899ac1935cd04833ed8c7690298ab1bf0c00c4e53bf5a4f9ee31940d63e29350a6babf43f212e56aa480a67745b6d715a30a8093e3a6
 EBUILD osslsigncode-2.8.ebuild 1438 BLAKE2B cda3e11d0be1f239f0d3526aad9a06035e4270eb6aa5147a0eb45d735847c9272b6d5c6a3b5df36349214fa5aa3fc1f1cdae483f5cd0bdd633fa73183b551bbd SHA512 9f7344dcd025531943f4b8f885a3fa771b69bbebd4038f64542892dcb0bfb9abb1af43f1cbb705eee53dca0b8b8476d9c88a0eaffa77a899abafd2ae202bef7b
-MISC metadata.xml 311 BLAKE2B 2125050abed07efbfea727f3e45728531290dc032a0a54beb102d5b8a74c07df7d291c22293107286da9563d4de5d08edb8f61cd6fd8a11abd0bd465cf31d854 SHA512 93b6f00f2ac04656afecdb12a85b1736559247eeb9855835e90b0b79437e93c10e0bb6a2324f067ba37be9293e3b41406d7901ffa32f22e462b01eef3ffa1953
+EBUILD osslsigncode-2.9.ebuild 1039 BLAKE2B c5e0e79202f5dc663f1d9f398919f0cd5e4cde6c2300aef9d9621ad6db609dc6005860a6e1cbd91ed2fb3dc3f028035366e6cb612f593819a98fabc2dfd968a2 SHA512 ce2521f8fa9ada04a108c3e455875e180a48f2fe6a203ac4a87b593f314fd3355925aaa0466f1165416210114f6d77187b3b4cac5cd71acbc73c8864d3342c2a
+MISC metadata.xml 254 BLAKE2B d3f965a8685847a6c6207933c7b08a3fef2c01798fc4eeef77fe22bc83f52bba5762160fab942b7be6bd26f32d0f0cb96344edafb9d35bb326927e74ce9119f9 SHA512 4b6710c5c854b4a7c4c36de77cea55074b2a9fb023ebed212af1289458a2397974458608556e0fcd547a0a11a5b3fed75323323e707dfb46589340c25a2df95e
diff --git a/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
new file mode 100644
index 000000000000..4385aba12b46
--- /dev/null
+++ b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
@@ -0,0 +1,27 @@
+From a8c1bf9838610bbb8362b1d425cdd3e2ecfecc8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Sun, 1 Sep 2024 14:59:49 +0200
+Subject: [PATCH] tests: add import for python-cryptography >= 43.0.0
+
+write_pkcs12_container method raises following error message with
+python-cryptography-43.0.0:
+
+  Error: module 'cryptography.hazmat.primitives.serialization' has no attribute 'pkcs12'
+
+Explicit import of the pkcs12 module resolves the issue.
+
+Upstream-PR: https://github.com/mtrojnar/osslsigncode/pull/407
+
+diff --git a/tests/make_certificates.py b/tests/make_certificates.py
+index 6fb03ac2..ea14a7ed 100644
+--- a/tests/make_certificates.py
++++ b/tests/make_certificates.py
+@@ -10,6 +10,8 @@
+ from cryptography.hazmat.primitives import serialization
+ from cryptography.hazmat.primitives.asymmetric import rsa
+ 
++import cryptography.hazmat.primitives.serialization.pkcs12
++
+ RESULT_PATH = os.getcwd()
+ CERTS_PATH = os.path.join(RESULT_PATH, "./Testing/certs/")
+ 
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 7c529bd10048..efa2c3eb8359 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- 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.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
deleted file mode 100644
index c0d1773bcf38..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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
-}
diff --git a/app-crypt/osslsigncode/osslsigncode-2.9.ebuild b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
new file mode 100644
index 000000000000..7974b492fea1
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 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/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/openssl-3:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-import.patch"
+)
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_test() {
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	mv "${D}$(get_bashcompdir)/${PN}"{.bash,} || die #927196
+}