diff --git a/bcjmail-jdk18on-1.78.pom b/bcjmail-jdk18on-1.78.pom
new file mode 100644
index 0000000000000000000000000000000000000000..5efc8b45f5f5cbe593ace0e41c33b4db465a0554
--- /dev/null
+++ b/bcjmail-jdk18on-1.78.pom
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcjmail-jdk18on</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle Jakarta S/MIME API</name>
+  <version>1.78</version>
+  <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. 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.</description>
+  <url>https://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>https://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/bcgit/bc-java</url>
+  </scm>
+  <issueManagement>
+     <system>GitHub</system>
+     <url>https://github.com/bcgit/bc-java/issues</url>
+  </issueManagement>
+  <developers>
+    <developer>
+      <id>feedback-crypto</id>
+      <name>The Legion of the Bouncy Castle Inc.</name>
+      <email>feedback-crypto@bouncycastle.org</email>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.78</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk18on</artifactId>
+      <version>1.78</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>1.78</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/bcmail-jdk18on-1.73.pom b/bcmail-jdk18on-1.78.pom
similarity index 93%
rename from bcmail-jdk18on-1.73.pom
rename to bcmail-jdk18on-1.78.pom
index 86c3c07c2878b70bd32f419f698e8d2221353675..c18ad336d9c59a08eb79bea5c567a2fa62c784b3 100644
--- a/bcmail-jdk18on-1.73.pom
+++ b/bcmail-jdk18on-1.78.pom
@@ -5,7 +5,7 @@
   <artifactId>bcmail-jdk18on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle S/MIME API</name>
-  <version>1.73</version>
+  <version>1.78</version>
   <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. 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.</description>
   <url>https://www.bouncycastle.org/java.html</url>
   <licenses>
@@ -33,19 +33,19 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
   </dependencies>
diff --git a/bcpg-jdk18on-1.73.pom b/bcpg-jdk18on-1.78.pom
similarity index 96%
rename from bcpg-jdk18on-1.73.pom
rename to bcpg-jdk18on-1.78.pom
index 7a88cbb752d9965664651886e1336243465ea76f..c8e82313b7ed265fc269b5700b57fee9cd7f21a1 100644
--- a/bcpg-jdk18on-1.73.pom
+++ b/bcpg-jdk18on-1.78.pom
@@ -5,7 +5,7 @@
   <artifactId>bcpg-jdk18on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle OpenPGP API</name>
-  <version>1.73</version>
+  <version>1.78</version>
   <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
   <url>https://www.bouncycastle.org/java.html</url>
   <licenses>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
   </dependencies>
diff --git a/bcpkix-jdk18on-1.73.pom b/bcpkix-jdk18on-1.78.pom
similarity index 94%
rename from bcpkix-jdk18on-1.73.pom
rename to bcpkix-jdk18on-1.78.pom
index 1ce12fb7a2e9d66bb75b1d9fd6bf79d39865e9d4..1ebddf3a36b3c389ce0238673d00639fb181a0e3 100644
--- a/bcpkix-jdk18on-1.73.pom
+++ b/bcpkix-jdk18on-1.78.pom
@@ -5,7 +5,7 @@
   <artifactId>bcpkix-jdk18on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs</name>
-  <version>1.73</version>
+  <version>1.78</version>
   <description>The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
   <url>https://www.bouncycastle.org/java.html</url>
   <licenses>
@@ -33,13 +33,13 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
   </dependencies>
diff --git a/bcprov-jdk18on-1.73.pom b/bcprov-jdk18on-1.78.pom
similarity index 97%
rename from bcprov-jdk18on-1.73.pom
rename to bcprov-jdk18on-1.78.pom
index 4a39066b51b3887796a38643d064961136ba2569..66973034ed5e39a9631d0059be8baf52e252d565 100644
--- a/bcprov-jdk18on-1.73.pom
+++ b/bcprov-jdk18on-1.78.pom
@@ -5,7 +5,7 @@
   <artifactId>bcprov-jdk18on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle Provider</name>
-  <version>1.73</version>
+  <version>1.78</version>
   <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.8 and up.</description>
   <url>https://www.bouncycastle.org/java.html</url>
   <licenses>
diff --git a/bctls-jdk18on-1.73.pom b/bctls-jdk18on-1.78.pom
similarity index 93%
rename from bctls-jdk18on-1.73.pom
rename to bctls-jdk18on-1.78.pom
index e7116238b6905623aeea1eac35d139f4d26405ec..3ff0eae74c76576a0099603a0006711f58fdf60d 100644
--- a/bctls-jdk18on-1.73.pom
+++ b/bctls-jdk18on-1.78.pom
@@ -5,7 +5,7 @@
   <artifactId>bctls-jdk18on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle JSSE provider and TLS/DTLS API</name>
-  <version>1.73</version>
+  <version>1.78</version>
   <description>The Bouncy Castle Java APIs for TLS and DTLS, including a provider for the JSSE.</description>
   <url>https://www.bouncycastle.org/java.html</url>
   <licenses>
@@ -33,13 +33,13 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
   </dependencies>
diff --git a/bcutil-jdk18on-1.73.pom b/bcutil-jdk18on-1.78.pom
similarity index 95%
rename from bcutil-jdk18on-1.73.pom
rename to bcutil-jdk18on-1.78.pom
index 11158259a2aec3f52f2b7431640d8609a07dc115..0afe6570d8f2c75cbb4e16e73735749dd365b48a 100644
--- a/bcutil-jdk18on-1.73.pom
+++ b/bcutil-jdk18on-1.78.pom
@@ -5,7 +5,7 @@
   <artifactId>bcutil-jdk18on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle ASN.1 Extension and Utility APIs</name>
-  <version>1.73</version>
+  <version>1.78</version>
   <description>The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls. This jar contains APIs for JDK 1.8 and up.</description>
   <url>https://www.bouncycastle.org/java.html</url>
   <licenses>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.73</version>
+      <version>1.78</version>
       <type>jar</type>
     </dependency>
   </dependencies>
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 5aa8aae44743c14de15d5e66ee591d17378ec62b..589f6536157c9acc625e08e6d8a0dda8c62aa851 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,11 +1,15 @@
 %define anolis_release 1
 
-%global gittag r1rv73
+%global gittag r1rv78
 %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.73
+Version:          1.78
 Release:          %{anolis_release}%{?dist}
 License:          MIT
 URL:              http://www.bouncycastle.org
@@ -19,12 +23,13 @@ Source3:          https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk18on/%
 Source4:          https://repo1.maven.org/maven2/org/bouncycastle/bcmail-jdk18on/%{version}/bcmail-jdk18on-%{version}.pom
 Source5:          https://repo1.maven.org/maven2/org/bouncycastle/bctls-jdk18on/%{version}/bctls-jdk18on-%{version}.pom
 Source6:          https://repo1.maven.org/maven2/org/bouncycastle/bcutil-jdk18on/%{version}/bcutil-jdk18on-%{version}.pom
+Source7:	  https://repo1.maven.org/maven2/org/bouncycastle/bcjmail-%{jdkon}/%{version}/bcjmail-%{jdkon}-%{version}.pom
 
 # Script to fetch POMs from Maven Central
-Source7:          get-poms.sh
+Source8:          get-poms.sh
 
 # Backport fix for regression in bouncycastle 1.70
-#Patch0:           0001-added-back-support-for-subject-key-identifier-check-.patch
+Patch0:           jmail.packages.patch
 
 BuildArch:        noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -94,22 +99,22 @@ API documentation for the Bouncy Castle Cryptography APIs.
 
 %prep
 %setup -q -n bc-java-%{gittag}
-#%%patch0 -p1
+
+%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 '/<javadoc/aadditionalparam="-Xdoclint:none" encoding="UTF-8" source="1.8"' \
-       -e '/<javac/aencoding="UTF-8"' ant/bc+-build.xml
-
-# Mail and Activation do not yet provide jakarta packages, so don't build jmail module
-sed -i -e '/target="build-jmail"/d' ant/jdk18+.xml
-
 # Not shipping lw/lcrypto (lightweight crypto) jar
-sed -i -e '/target="build-lw"/d' ant/jdk18+.xml
-sed -i -e '/target="javadoc-lw"/d' ant/jdk18+.xml
+sed -i -e '/target="build-lw"/d' ant/jdk%{profile}+.xml
+sed -i -e '/target="javadoc-lw"/d' ant/jdk%{profile}+.xml
 
 cp -p %{SOURCE1} bcprov.pom
 cp -p %{SOURCE2} bcpkix.pom
@@ -117,28 +122,32 @@ cp -p %{SOURCE3} bcpg.pom
 cp -p %{SOURCE4} bcmail.pom
 cp -p %{SOURCE5} bctls.pom
 cp -p %{SOURCE6} bcutil.pom
+cp -p %{SOURCE7} bcjmail.pom
+
+# this test needs additional dependeces
+rm prov/src/test/java/org/bouncycastle/jce/provider/test/X509LDAPCertStoreTest.java
 
 %build
-ant -f ant/jdk18+.xml \
+ant -f ant/jdk%{profile}+.xml \
   -Djunit.jar.home=$(build-classpath junit) \
-  -Dmail.jar.home=$(build-classpath jakarta-mail/jakarta.mail) \
-  -Dactivation.jar.home=$(build-classpath jakarta-activation/jakarta.activation) \
+  -Djmail.jar.home=$(build-classpath jakarta-mail/jakarta.mail) \
+  -Djactivation.jar.home=$(build-classpath jakarta-activation) \
   -Drelease.debug=true -Dbc.javac.source=1.8 -Dbc.javac.target=1.8 \
-  clean build-provider build
+  clean build-provider build #test
 
 cat > bnd.bnd <<EOF
--classpath=bcprov.jar,bcutil.jar,bcpkix.jar,bcpg.jar,bcmail.jar,bctls.jar
+-classpath=bcprov.jar,bcutil.jar,bcpkix.jar,bcpg.jar,bcmail.jar,bcjmail.jar,bctls.jar
 Export-Package: *;version=%{version}
 EOF
 
-for bc in bcprov bcutil bcpkix bcpg bcmail bctls ; do
+for bc in bcprov bcutil bcpkix bcpg bcmail bcjmail bctls ; do
   # Make into OSGi bundle
-  bnd wrap -b $bc -v %{version} -p bnd.bnd -o $bc.jar build/artifacts/jdk1.8/jars/$bc-jdk18on-*.jar
+  bnd wrap -b $bc -v %{version} -p bnd.bnd -o $bc.jar build/artifacts/jdk%{profilen}/jars/$bc-%{jdkon}-*.jar
 
   # Request Maven installation
-  %mvn_file ":$bc-jdk18on" $bc
-  %mvn_package ":$bc-jdk18on" $bc
-  %mvn_alias ":$bc-jdk18on" "org.bouncycastle:$bc-jdk16" "org.bouncycastle:$bc-jdk15"
+  %mvn_file ":$bc-%{jdkon}" $bc
+  %mvn_package ":$bc-%{jdkon}" $bc
+  %mvn_alias ":$bc-%{jdkon}" "org.bouncycastle:$bc-jdk16" "org.bouncycastle:$bc-jdk15"
   %mvn_artifact $bc.pom $bc.jar
 done
 
@@ -146,7 +155,7 @@ done
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-%{classname}
 
-%mvn_install -J build/artifacts/jdk1.8/javadoc
+%mvn_install -J build/artifacts/jdk%{profilen}/javadoc
 
 %post
 {
@@ -220,6 +229,10 @@ fi
 %license LICENSE.html
 
 %changelog
+* Thu Aug 01 2024 Kaiqiang Wang <wangkaiqiang@inspur.com> - 1.78-1
+- update to 1.78
+- fix CVE-2024-2955
+
 * Fri Jun 14 2024 mgb01105731 <mgb01105731@alibaba-inc.com> - 1.73-1
 - update to 1.73
 
diff --git a/jmail.packages.patch b/jmail.packages.patch
new file mode 100644
index 0000000000000000000000000000000000000000..69a0d14155cb54fb6b1972f59dc30b923ecc8886
--- /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 @@
+              </fileset>
+         </copy>
+ 
+-        <replaceregexp match="javax.activation." replace="jakarta.activation." flags="g" byline="true">
++        <replaceregexp match="jakarta.activation." replace="javax.activation." flags="g" byline="true">
+             <fileset dir="${jmail.target.src.dir}">
+                 <include name="**/*.java"/>
+             </fileset>
+         </replaceregexp>
+ 
+-        <replaceregexp match="javax.mail." replace="jakarta.mail." flags="g" byline="true">
++        <replaceregexp match="jakarta.mail." replace="javax.mail." flags="g" byline="true">
+             <fileset dir="${jmail.target.src.dir}">
+                 <include name="**/*.java"/>
+             </fileset>
+
diff --git a/r1rv73.tar.gz b/r1rv78.tar.gz
similarity index 40%
rename from r1rv73.tar.gz
rename to r1rv78.tar.gz
index e01fa92efc0640d2dca7f97410ea0996639fe642..90e6f1794f3a986ee797b685f5a1b6e3f2714ac2 100644
Binary files a/r1rv73.tar.gz and b/r1rv78.tar.gz differ