diff --git a/.gitignore b/.gitignore index aabd6ef..3631b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,26 @@ /.project /*.src.rpm /bouncycastle-*.tar.gz +/r1rv*.tar.gz /r1v*.tar.gz +/bcjmail-jdk15on-*.pom /bcmail-jdk15on-*.pom /bcpg-jdk15on-*.pom /bcpkix-jdk15on-*.pom /bcprov-jdk15on-*.pom /bctls-jdk15on-*.pom -/r1rv61.tar.gz -/r1rv63.tar.gz +/bcutil-jdk15on-*.pom +/bcjmail-jdk18on-1.77.pom +/bcmail-jdk18on-1.77.pom +/bcpg-jdk18on-1.77.pom +/bcpkix-jdk18on-1.77.pom +/bcprov-jdk18on-1.77.pom +/bctls-jdk18on-1.77.pom +/bcutil-jdk18on-1.77.pom +/bcjmail-jdk18on-1.83.pom +/bcmail-jdk18on-1.83.pom +/bcpg-jdk18on-1.83.pom +/bcpkix-jdk18on-1.83.pom +/bcprov-jdk18on-1.83.pom +/bctls-jdk18on-1.83.pom +/bcutil-jdk18on-1.83.pom diff --git a/bouncycastle.spec b/bouncycastle.spec index c8ca3fa..d1b7776 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -1,32 +1,45 @@ -%global gittag r1rv63 +%global gittag r1rv83 %global classname org.bouncycastle.jce.provider.BouncyCastleProvider +%global profilen 1.8 +%global profile %(echo %{profilen} | sed "s/\\.//g" ) +%global jdkon jdk%{profile}on Summary: Bouncy Castle Cryptography APIs for Java Name: bouncycastle -Version: 1.63 -Release: 1%{?dist} +Version: 1.83 +Release: 5%{?dist} License: MIT URL: http://www.bouncycastle.org Source0: https://github.com/bcgit/bc-java/archive/%{gittag}.tar.gz # POMs from Maven Central -Source1: http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{version}/bcprov-jdk15on-%{version}.pom -Source2: http://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/%{version}/bcpkix-jdk15on-%{version}.pom -Source3: http://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/%{version}/bcpg-jdk15on-%{version}.pom -Source4: http://repo1.maven.org/maven2/org/bouncycastle/bcmail-jdk15on/%{version}/bcmail-jdk15on-%{version}.pom -Source5: http://repo1.maven.org/maven2/org/bouncycastle/bctls-jdk15on/%{version}/bctls-jdk15on-%{version}.pom +Source1: https://repo1.maven.org/maven2/org/bouncycastle/bcprov-%{jdkon}/%{version}/bcprov-%{jdkon}-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-%{jdkon}/%{version}/bcpkix-%{jdkon}-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/bouncycastle/bcpg-%{jdkon}/%{version}/bcpg-%{jdkon}-%{version}.pom +Source4: https://repo1.maven.org/maven2/org/bouncycastle/bcmail-%{jdkon}/%{version}/bcmail-%{jdkon}-%{version}.pom +Source5: https://repo1.maven.org/maven2/org/bouncycastle/bctls-%{jdkon}/%{version}/bctls-%{jdkon}-%{version}.pom +Source6: https://repo1.maven.org/maven2/org/bouncycastle/bcutil-%{jdkon}/%{version}/bcutil-%{jdkon}-%{version}.pom +Source7: https://repo1.maven.org/maven2/org/bouncycastle/bcjmail-%{jdkon}/%{version}/bcjmail-%{jdkon}-%{version}.pom # Script to fetch POMs from Maven Central -Source6: get-poms.sh +Source8: get-poms.sh + +Patch0: jmail.packages.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: aqute-bnd -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: ant-junit -BuildRequires: javamail -BuildRequires: javapackages-local +# For bcmail +BuildRequires: jakarta-activation1 +BuildRequires: jakarta-mail1 +# For bcjmail +BuildRequires: jakarta-activation +BuildRequires: jakarta-mail +BuildRequires: javapackages-local-openjdk25 Requires(post): javapackages-tools Requires(postun): javapackages-tools @@ -51,20 +64,27 @@ provided with the Bouncy Castle Cryptography APIs. Summary: Bouncy Castle OpenPGP API %description pg -The Bouncy Castle Java API for handling the OpenPGP protocol. This jar -contains the OpenPGP API for JDK 1.5 to JDK 1.8. The APIs can be used in -conjunction with a JCE/JCA provider such as the one provided with the +The Bouncy Castle Java API for handling the OpenPGP protocol. The APIs can be +used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. %package mail Summary: Bouncy Castle S/MIME API %description mail -The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar -contains S/MIME APIs for JDK 1.5 to JDK 1.8. The APIs can be used in -conjunction with a JCE/JCA provider such as the one provided with the Bouncy -Castle Cryptography APIs. The JavaMail API and the Java activation framework -will also be needed. +The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. The APIs can +be used in conjunction with a JCE/JCA provider such as the one provided with +the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation +framework will also be needed. + +%package jmail +Summary: Bouncy Castle Jakarta S/MIME API + +%description jmail +The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. The APIs can +be used in conjunction with a JCE/JCA provider such as the one provided with +the Bouncy Castle Cryptography APIs. The Jakarta Mail API and the Jakarta +activation framework will also be needed. %package tls Summary: Bouncy Castle JSSE provider and TLS/DTLS API @@ -73,14 +93,15 @@ Summary: Bouncy Castle JSSE provider and TLS/DTLS API The Bouncy Castle Java APIs for TLS and DTLS, including a provider for the JSSE. +%package util +Summary: Bouncy Castle ASN.1 Extension and Utility APIs + +%description util +The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to +support bcpkix and bctls. + %package javadoc Summary: Javadoc for %{name} -Provides: %{name}-pkix-javadoc = %{version}-%{release} -Obsoletes: %{name}-pkix-javadoc < %{version}-%{release} -Provides: %{name}-pg-javadoc = %{version}-%{release} -Obsoletes: %{name}-pg-javadoc < %{version}-%{release} -Provides: %{name}-mail-javadoc = %{version}-%{release} -Obsoletes: %{name}-mail-javadoc < %{version}-%{release} %description javadoc API documentation for the Bouncy Castle Cryptography APIs. @@ -88,52 +109,68 @@ API documentation for the Bouncy Castle Cryptography APIs. %prep %setup -q -n bc-java-%{gittag} -# Remove provided binaries +%patch -P0 -p1 + +#?!?!!?!??!?!!? +for x in `find | grep -e x_pkcs7_signature.java -e PKCS7ContentHandler.java -e multipart_signed.java` ; do + sed "s/getTransferData.ActivationDataFlavor/getTransferData(DataFlavor/g" -i $x + sed "s/ ActivationDataFlavor df,/ DataFlavor df,/g" -i $x +done + +# Remove bundled binary libs find . -type f -name "*.class" -exec rm -f {} \; find . -type f -name "*.jar" -exec rm -f {} \; -# Relax javadoc linting and set expected source encoding -sed -i -e '/ bnd.bnd < - 1.77-5 +- Rebuilt for java-25-openjdk as preffered jdk + +* Wed Jul 23 2025 Fedora Release Engineering - 1.77-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 1.77-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 1.77-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.77-1 +- Rebuilt for java-21-openjdk as system jdk +- bumped to 1.77 +- used macros on the crucial, depndent parts where needed + +* Tue Jan 23 2024 Fedora Release Engineering - 1.70-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.70-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 29 2023 Mattias Ellert - 1.70-10 +- Build bcjmail (dependencies now available in Fedora) + +* Wed Jul 19 2023 Fedora Release Engineering - 1.70-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jan 24 2023 Mattias Ellert - 1.70-8 +- Adapt to changes in the jakarta-activation package + +* Wed Jan 18 2023 Fedora Release Engineering - 1.70-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.70-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.70-5 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 1.70-4 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.70-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 12 2022 Mattias Ellert - 1.70-2 +- Backport fix for regression in bouncycastle 1.70, fixes rhbz#2039724 + +* Fri Dec 17 2021 Mat Booth - 1.70-1 +- Update to latest upstream release + +* Wed Jul 21 2021 Fedora Release Engineering - 1.68-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue May 25 2021 Mat Booth - 1.68-1 +- Update to latest upstream release + +* Tue Jan 26 2021 Fedora Release Engineering - 1.67-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Nov 01 2020 Mat Booth - 1.67-1 +- Update to latest upstream release + +* Mon Jul 27 2020 Fedora Release Engineering - 1.65-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.65-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sat Jun 20 2020 Mat Booth - 1.65-2 +- Fix build on Java 11 + +* Fri Jun 19 2020 Mat Booth - 1.65-1 +- Update to latest upstream release +- Remove old obsoletes +- Avoid using deprecated source/target values + +* Tue Jan 28 2020 Fedora Release Engineering - 1.63-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Sep 12 2019 Mat Booth - 1.63-1 - Update to latest upstream release diff --git a/get-poms.sh b/get-poms.sh index 3308d9c..bf80d31 100755 --- a/get-poms.sh +++ b/get-poms.sh @@ -1,7 +1,8 @@ #!/bin/sh -version=1.63 +version=$(grep '^Version:' bouncycastle.spec | sed -e 's/^Version:\W*//') -for bc in bcprov bcpkix bcpg bcmail bctls ; do - wget http://repo1.maven.org/maven2/org/bouncycastle/$bc-jdk15on/$version/$bc-jdk15on-$version.pom +for bc in bcprov bcpkix bcpg bcmail bcjmail bctls bcutil ; do + rm -f $bc-*.pom + wget https://repo1.maven.org/maven2/org/bouncycastle/$bc-jdk18on/$version/$bc-jdk18on-$version.pom done diff --git a/jmail.packages.patch b/jmail.packages.patch new file mode 100644 index 0000000..69a0d14 --- /dev/null +++ b/jmail.packages.patch @@ -0,0 +1,19 @@ +--- bc-java-r1rv77/ant/bc+-build.xml ++++ bc-java-r1rv77/ant/bc+-build.xml +@@ -652,13 +652,13 @@ + + + +- ++ + + + + + +- ++ + + + + diff --git a/sources b/sources index 0e14950..5e21e78 100644 --- a/sources +++ b/sources @@ -1,6 +1,8 @@ -SHA512 (r1rv63.tar.gz) = e0de512833cab514d80eb06fa90fdab914a4514e69a101adaa03a4ad9aefe7546c3b70919a6d7f4d708086292d8558b0c3578dd4ec77e7086322bf3959f70934 -SHA512 (bcmail-jdk15on-1.63.pom) = 743c0ccbf95e4b1dbe84c43d9df05e6e40df4b9b5b6bec0e49f344dfe3a4ec74f469cb0a19f32810a05117856ecdab6fccecf88731dc47cc0834b309b4bf66f4 -SHA512 (bcpg-jdk15on-1.63.pom) = ac0d50b46a160a1262f79fce22ee37799aa12d2349b8e4d79be1b6f0bce9adee7f1eb3d9cddffd9321915e09459b80c32efbd2fe676c35e6978c3d4e90f36f9d -SHA512 (bcpkix-jdk15on-1.63.pom) = b448d9e4898f105bec986ac44b29012e4a1bea3eaefa1dc6b37f785aa2b58c04bca5013937aadbfbf87d5f919c0e5a603c3abc4804c90beb6c63004be9207839 -SHA512 (bcprov-jdk15on-1.63.pom) = d708a423f367a4939e7aa143923ce2ab1a66c4fff3bf937a98470fd1c6680c7dc89fc18cadcdcdad72861d4aaafa7135c0f33eafe4438165d25bd2da3b058030 -SHA512 (bctls-jdk15on-1.63.pom) = bd44d1f5f0699519376aed7ab2df8c3d2ce659dfdbbd5c8b77ff90383b08a5474eb9457ad172fb7af3c4e679730d0c7216176fe98ceb3c48f7cd34ab728f6594 +SHA512 (r1rv83.tar.gz) = f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 +SHA512 (bcjmail-jdk18on-1.83.pom) = eec44d2ba0cf5c7e0978344f703537fe711005a18c3d94b022545edfad49e560cfca1ac592330b1b9c78205e53ee1f9ba887b068c672b64f7491d724e59305bc +SHA512 (bcmail-jdk18on-1.83.pom) = 0ce8549ca81e5057c65893afc77566762edcae50b1de6a003123f3d506989525f3b0a2b7f61dab3890e0a4aa19c88546e76ed81318f79700bc0bcfbb6f57ff79 +SHA512 (bcpg-jdk18on-1.83.pom) = bd570199f658f7ef39c93fba788b3383a1eb70c6dc1dfc926ef34418def8fbf1781f708872b02e27be3aa4b5095a58dc0a2c33555c0f52c71ebf795d78163e0a +SHA512 (bcpkix-jdk18on-1.83.pom) = ccebe3be4dd1e92dd95167027a92c7a097ae9eaaa5a2091ce3fc7ecfaf1c5fae8f92a23c96ffb5e1a242ea31f2115718f408c625221b1f0469c9db837115616b +SHA512 (bcprov-jdk18on-1.83.pom) = 112cb1626f1d120cee705e0e47c60b1f0cdcf8f7dc6ba53993eccd3302923aa09fcdaa6f278000710d350b048324db97a5d94d8ddc3b880e22c584b8bd75f99f +SHA512 (bctls-jdk18on-1.83.pom) = 22de5a20924269fe1f53b76c4459014cc89b8b4201cfa70d8af0aacb066ca6194b160f5d3a991e354d3b2fb6993e1d7086e49f087b0ba8c6e5538a11fd69cff1 +SHA512 (bcutil-jdk18on-1.83.pom) = 284fab53740db33b7e2a0d05e6009a881949ecd18636e7952ddc6df65c07e3f003effb246d05f21e47a6a6c4a84e6ca69a254da5085c0f8e5c79d9943f333228