From 385c2280ef4053f836a860b4fd5cc2511fc18c8c Mon Sep 17 00:00:00 2001 From: Student Main Date: Thu, 13 Feb 2025 08:00:07 +0800 Subject: [PATCH] openssl-1.1: update to 1.1.1zb-p2 Switched to https://github.com/kzalewski/openssl-1.1.1 for security update backported from OpenSSL 3. OpenSSL no longer provide free security update to OpenSSL 1.1.1 after 1.1.1w. --- .../openssl-1.1/autobuild/build | 2 +- .../openssl-1.1/autobuild/patch | 3 --- .../0001-patch-Configure-for-loongson3.patch | 25 +++++++++++++++++++ runtime-cryptography/openssl-1.1/spec | 9 ++++--- 4 files changed, 31 insertions(+), 8 deletions(-) delete mode 100644 runtime-cryptography/openssl-1.1/autobuild/patch create mode 100644 runtime-cryptography/openssl-1.1/autobuild/patches/0001-patch-Configure-for-loongson3.patch diff --git a/runtime-cryptography/openssl-1.1/autobuild/build b/runtime-cryptography/openssl-1.1/autobuild/build index 21f90079726..cf68603051d 100644 --- a/runtime-cryptography/openssl-1.1/autobuild/build +++ b/runtime-cryptography/openssl-1.1/autobuild/build @@ -40,7 +40,7 @@ fi abinfo "Running Configure ..." "$SRCDIR"/Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib ${ARCH_OPTS}\ - "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS}" + "-Wa,--noexecstack -Wno-implicit-function-declaration ${CPPFLAGS} ${CFLAGS}" abinfo "Building binaries ..." make depend diff --git a/runtime-cryptography/openssl-1.1/autobuild/patch b/runtime-cryptography/openssl-1.1/autobuild/patch deleted file mode 100644 index f5eaf93824f..00000000000 --- a/runtime-cryptography/openssl-1.1/autobuild/patch +++ /dev/null @@ -1,3 +0,0 @@ -if [[ "${CROSS:-$ARCH}" = "loongson3" ]]; then - sed -i 's/-mips3/-mips64r2/g' Configure -fi diff --git a/runtime-cryptography/openssl-1.1/autobuild/patches/0001-patch-Configure-for-loongson3.patch b/runtime-cryptography/openssl-1.1/autobuild/patches/0001-patch-Configure-for-loongson3.patch new file mode 100644 index 00000000000..1f6bcbd6f3a --- /dev/null +++ b/runtime-cryptography/openssl-1.1/autobuild/patches/0001-patch-Configure-for-loongson3.patch @@ -0,0 +1,25 @@ +From 7bc94b7861c09c5307af4dfcfdb6a3439b4d37bc Mon Sep 17 00:00:00 2001 +From: Student Main +Date: Wed, 12 Feb 2025 13:27:40 +0800 +Subject: [PATCH] patch Configure for loongson3 + +--- + Configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Configure b/Configure +index 78cc15d..d6484d5 100755 +--- a/Configure ++++ b/Configure +@@ -1248,7 +1248,7 @@ if ($target =~ /linux.*-mips/ && !$disabled{asm} + # minimally required architecture flags for assembly modules + my $value; + $value = '-mips2' if ($target =~ /mips32/); +- $value = '-mips3' if ($target =~ /mips64/); ++ $value = '-mips64r2' if ($target =~ /mips64/); + unshift @{$config{cflags}}, $value; + unshift @{$config{cxxflags}}, $value if $config{CXX}; + } +-- +2.48.1 + diff --git a/runtime-cryptography/openssl-1.1/spec b/runtime-cryptography/openssl-1.1/spec index 6f4e1cce668..b139e3bf7a6 100644 --- a/runtime-cryptography/openssl-1.1/spec +++ b/runtime-cryptography/openssl-1.1/spec @@ -1,4 +1,5 @@ -VER=1.1.1w -SRCS="tbl::https://openssl.org/source/openssl-$VER.tar.gz" -CHKSUMS="sha256::cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8" -CHKUPDATE="anitya::id=2566" +UPSTREAM_VER=1.1.1zb_p2 +VER=${UPSTREAM_VER/_/-} +SRCS="git::commit=tags/$UPSTREAM_VER::https://github.com/kzalewski/openssl-1.1.1.git" +CHKSUMS="SKIP" +#TODO: add anitya