gentoo auto-resync : 05:11:2024 - 03:03:37

3 files changed, 32 insertions, 7 deletions

diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index d6404eaf527a..2218bc7e2084 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,7 +1,8 @@
-DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
+AUX bcprov-1.79-PKCS12StoreTest.patch 1066 BLAKE2B 7eb5d1ef9a1852260e7653c64aa7c14df62a6bdb0d72c2954cb365d7f52f8734596f06041969f905780e4227983b44a120aeecd8a4c9d31e068796a80f68bb41 SHA512 7d5d7bd8512ecc564214c3325fc56ac26a05f442d6f8ac19ded52145976bf3f7cba82cf1bce27cd50e7eba4aa4c4537c257805aa4a8aed0192bec9cee2931a88
 DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
-DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e
+DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
 DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed
-EBUILD bcprov-1.77.ebuild 2616 BLAKE2B 69bafad791b11a2dc02322e8893727cffd391e390e317cb99991a4f8af174aae0db01d854368e3e4e183d50cf0f5eba4d95ce866321cabbbebfc7b013d300665 SHA512 8850b476a7c818491303df4bbc6f136d8cf49e577550260a1fc68c09197461215c662fd6cdeb309d9c57409e94d5fd117068011da120e47193c32c4b92fd8df3
+DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413
 EBUILD bcprov-1.78.1.ebuild 2693 BLAKE2B 30d2040947d5a496618052f979db667f47350f3ffa581ad257ef902de305c54a006aed2c1aa81a2a089bf9dfadfb20d8685e3a66d1246a68b3efe19a38c7ab41 SHA512 7e7fdfe72b80204973702c4d0ce05e62bd6cda8f4e1a43f5feaa47dbf8638d6227a92901864545311eab3dfeefb05bc4e5eb8e546ef3d78b47dcdd118af910a5
+EBUILD bcprov-1.79.ebuild 2774 BLAKE2B 7766a679318f82134068f981301396780f0c1af8b25ea33f97070afeb9b5a68df790794d45c28c7fa2de8e48cf6adb275c2fb16e9be30fbf3006a3ed2ca7db27 SHA512 7b22df59e8a16cb979dd886883a8e342b03d0427d1e98d1ad35f51a7db4912cc12972fc24d3a69774bbeda84ee889c0b2d0d20ff61e5abebc878b60a330ac76c
 MISC metadata.xml 554 BLAKE2B 585fb4da68796af220ac254cdd97d2ac988824c58b1eadde6cf59a50ca197fe8729418c948dd550e544eeb50702d0c96b8ff6f580368dc21a28a66f5d898bf4c SHA512 f78848b4c65b3d1373931bb00971c60688ea86b5bb7555f4a9889c4d560bfb505bffa3671dceb7dfb66f40ea21723d88e7c36191c91a203abf47c500fc0866df
diff --git a/dev-java/bcprov/bcprov-1.77.ebuild b/dev-java/bcprov/bcprov-1.79.ebuild
index 8e3dc1486d63..f203619a0823 100644
--- a/dev-java/bcprov/bcprov-1.77.ebuild
+++ b/dev-java/bcprov/bcprov-1.79.ebuild
@@ -11,22 +11,23 @@ inherit java-pkg-2 java-pkg-simple check-reqs
 
 DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r${PV/./rv}"
+MY_PV="r$(ver_rs 1 'rv' 2 'v')"
 SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
 	test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
 S="${WORKDIR}/bc-java-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
 
 DOCS=( {README,SECURITY}.md )
 HTML_DOCS=( {CONTRIBUTORS,index}.html )
 
+PATCHES=( "${FILESDIR}/bcprov-1.79-PKCS12StoreTest.patch" )
+
 check_env() {
 	if use test; then
 		# this is needed only for tests
@@ -50,6 +51,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	default #780585
 	java-pkg-2_src_prepare
 	# TBD: unboundid-ldapsdk should be packaged from source.
 	java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar"
@@ -71,7 +73,8 @@ src_compile() {
 src_test() {
 	mv ../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data"
 
-	JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data"
+	JAVA_TEST_EXTRA_ARGS="-Dtest.java.version.prefix=$(java-config -g PROVIDES_VERSION)"
+	JAVA_TEST_EXTRA_ARGS+=" -Dbc.test.data.home=${S}/core/src/test/data"
 	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
 	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 
diff --git a/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch b/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch
new file mode 100644
index 000000000000..b644fa927034
--- /dev/null
+++ b/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch
@@ -0,0 +1,21 @@
+There was 1 failure:
+1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest)
+junit.framework.AssertionFailedError: index 30 PKCS12Store: Exception: java.io.FileNotFoundException: /tmp/PKCS12-AES256-AES128.p12 (Permission denied)
+	at junit.framework.Assert.fail(Assert.java:57)
+	at junit.framework.TestCase.fail(TestCase.java:223)
+	at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:33)
+
+FAILURES!!!
+Tests run: 1,  Failures: 1
+
+--- a/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
++++ b/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
+@@ -2153,7 +2153,7 @@ public class PKCS12StoreTest
+ 
+         inStore.load(new ByteArrayInputStream(bOut.toByteArray()), passwd);
+ 
+-        FileOutputStream fOut = new FileOutputStream("/tmp/" + storeType + ".p12");
++        FileOutputStream fOut = new FileOutputStream(System.getProperty("java.io.tmpdir") + storeType + ".p12");
+         fOut.write(bOut.toByteArray());
+         fOut.close();
+         Key k = inStore.getKey("key", null);