From 4ff3bdccfff799150c860f6ea042503817f7e8c2 Mon Sep 17 00:00:00 2001
From: 217heidai <217heidai@gmail.com>
Date: Wed, 5 Jun 2024 09:00:25 +0800
Subject: [PATCH] OpenSSL 3.3.1

---
 .github/workflows/build_arm64-v8a.yml   | 10 ++++++++--
 .github/workflows/build_armeabi-v7a.yml |  8 +++++++-
 .github/workflows/build_x86.yml         |  8 +++++++-
 .github/workflows/build_x86_64.yml      |  8 +++++++-
 README.md                               |  3 ++-
 openssl_build.sh                        |  5 +++--
 6 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_arm64-v8a.yml b/.github/workflows/build_arm64-v8a.yml
index a276950..6c197fb 100755
--- a/.github/workflows/build_arm64-v8a.yml
+++ b/.github/workflows/build_arm64-v8a.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   ANDROID_ABI: arm64-v8a
-  OPENSSL_VERSION: 3.3.0
+  OPENSSL_VERSION: 3.3.1
   ANDROID_NDK_VERSION: r20b
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
@@ -68,4 +68,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
-          files: ${{env.WORK_PATH}}/OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz
\ No newline at end of file
+          files: ${{env.WORK_PATH}}/OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz
+
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@main
+        with:
+          retain_days: 0
+          keep_minimum_runs: 4
\ No newline at end of file
diff --git a/.github/workflows/build_armeabi-v7a.yml b/.github/workflows/build_armeabi-v7a.yml
index 9616ee3..a787e14 100755
--- a/.github/workflows/build_armeabi-v7a.yml
+++ b/.github/workflows/build_armeabi-v7a.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   ANDROID_ABI: armeabi-v7a
-  OPENSSL_VERSION: 3.3.0
+  OPENSSL_VERSION: 3.3.1
   ANDROID_NDK_VERSION: r20b
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
@@ -69,3 +69,9 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz
+
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@main
+        with:
+          retain_days: 0
+          keep_minimum_runs: 4
diff --git a/.github/workflows/build_x86.yml b/.github/workflows/build_x86.yml
index 499de15..9d361cd 100755
--- a/.github/workflows/build_x86.yml
+++ b/.github/workflows/build_x86.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   ANDROID_ABI: x86
-  OPENSSL_VERSION: 3.3.0
+  OPENSSL_VERSION: 3.3.1
   ANDROID_NDK_VERSION: r20b
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
@@ -69,3 +69,9 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz
+
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@main
+        with:
+          retain_days: 0
+          keep_minimum_runs: 4
diff --git a/.github/workflows/build_x86_64.yml b/.github/workflows/build_x86_64.yml
index 18cb3ff..73f3286 100755
--- a/.github/workflows/build_x86_64.yml
+++ b/.github/workflows/build_x86_64.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   ANDROID_ABI: x86_64
-  OPENSSL_VERSION: 3.3.0
+  OPENSSL_VERSION: 3.3.1
   ANDROID_NDK_VERSION: r20b
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
@@ -69,3 +69,9 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz
+
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@main
+        with:
+          retain_days: 0
+          keep_minimum_runs: 4
diff --git a/README.md b/README.md
index 8b915fa..25de74b 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # OpenSSL for Android
-Automatically compile static OpenSSL(3.2.*) library for Android by Github Actions.
+Automatically compile static OpenSSL library for Android by Github Actions.
 
 ## Android
 `armeabi`、`mips`、`mips64` targets are no longer supported with NDK R17+.
@@ -14,6 +14,7 @@ Automatically compile static OpenSSL(3.2.*) library for Android by Github Action
 ## ChangeLog
 | Date      | Content                                                              |
 |-----------|----------------------------------------------------------------------|
+| 2024.06.05 | OpenSSL 3.3.1 |
 | 2024.04.10 | OpenSSL 3.3.0 |
 | 2024.02.01 | OpenSSL 3.2.1 |
 | 2023.11.24 | OpenSSL 3.2.0 |
diff --git a/openssl_build.sh b/openssl_build.sh
index 0f10c93..24456cc 100755
--- a/openssl_build.sh
+++ b/openssl_build.sh
@@ -2,10 +2,10 @@
 
 WORK_PATH=$(cd "$(dirname "$0")";pwd)
 ANDROID_NDK_PATH=${WORK_PATH}/android-ndk-r20b
-OPENSSL_SOURCES_PATH=${WORK_PATH}/openssl-3.3.0
+OPENSSL_SOURCES_PATH=${WORK_PATH}/openssl-3.3.1
 ANDROID_TARGET_API=$1
 ANDROID_TARGET_ABI=$2
-OUTPUT_PATH=${WORK_PATH}/openssl_3.3.0_${ANDROID_TARGET_ABI}
+OUTPUT_PATH=${WORK_PATH}/openssl_3.3.1_${ANDROID_TARGET_ABI}
 
 OPENSSL_TMP_FOLDER=/tmp/openssl_${ANDROID_TARGET_ABI}
 mkdir -p ${OPENSSL_TMP_FOLDER}
@@ -18,6 +18,7 @@ function build_library {
     rm -rf ${OUTPUT_PATH}/bin
     rm -rf ${OUTPUT_PATH}/share
     rm -rf ${OUTPUT_PATH}/ssl
+    rm -rf ${OUTPUT_PATH}/lib/cmake
     rm -rf ${OUTPUT_PATH}/lib/engines*
     rm -rf ${OUTPUT_PATH}/lib/pkgconfig
     rm -rf ${OUTPUT_PATH}/lib/ossl-modules