Skip to content

Commit 048f002

Browse files
committed
openssl: update to 3.2.2
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f3922c9 commit 048f002

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

openssl/0002-Support-MSYS2.patch

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
2-
index e8084ab..6af9f99 100644
2+
index b1719be..f68dc4e 100644
33
--- a/Configurations/10-main.conf
44
+++ b/Configurations/10-main.conf
5-
@@ -1690,6 +1690,53 @@ my %targets = (
5+
@@ -1774,6 +1774,53 @@ my %targets = (
66
inherit_from => [ "Cygwin-x86" ]
77
},
88

@@ -86,10 +86,10 @@ index 0000000..33c845d
8686
+1;
8787
+
8888
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
89-
index edd16f4..531067b 100644
89+
index caf6f90..7fc7da2 100644
9090
--- a/Configurations/shared-info.pl
9191
+++ b/Configurations/shared-info.pl
92-
@@ -49,6 +49,10 @@ my %shared_info;
92+
@@ -55,6 +55,10 @@ my %shared_info;
9393
shared_ldflag => '-shared -Wl,--enable-auto-image-base',
9494
shared_impflag => '-Wl,--out-implib=',
9595
},
@@ -101,7 +101,7 @@ index edd16f4..531067b 100644
101101
return {
102102
%{$shared_info{'cygwin-shared'}},
103103
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
104-
index 17e194f..bc242f2 100644
104+
index dcd41a9..cd417de 100644
105105
--- a/Configurations/unix-Makefile.tmpl
106106
+++ b/Configurations/unix-Makefile.tmpl
107107
@@ -8,7 +8,7 @@
@@ -127,10 +127,10 @@ index 020d129..0069a55 100644
127127
SOURCE[openssl]=openssl.rc
128128
ENDIF
129129
diff --git a/build.info b/build.info
130-
index 5a84216..3ce486e 100644
130+
index d9e3c90..1b1293c 100644
131131
--- a/build.info
132132
+++ b/build.info
133-
@@ -82,7 +82,7 @@ IF[{- defined $target{shared_defflag} -}]
133+
@@ -91,7 +91,7 @@ IF[{- defined $target{shared_defflag} -}]
134134
DEPEND[libcrypto.ld libssl.ld]=configdata.pm util/perl/OpenSSL/Ordinals.pm
135135
ENDIF
136136

@@ -140,7 +140,7 @@ index 5a84216..3ce486e 100644
140140
GENERATE[libssl.rc]=util/mkrc.pl libssl
141141
DEPEND[libcrypto.rc libssl.rc]=configdata.pm
142142
diff --git a/crypto/build.info b/crypto/build.info
143-
index b67658c..3ab9a89 100644
143+
index 2d5b22f..11f08ab 100644
144144
--- a/crypto/build.info
145145
+++ b/crypto/build.info
146146
@@ -140,6 +140,6 @@ GENERATE[riscv64cpuid.s]=riscv64cpuid.pl
@@ -186,10 +186,10 @@ index 4dd1b44..8fe3d80 100644
186186

187187
## Parse flags.
188188
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
189-
index 6350e1e..3718ebc 100755
189+
index 047902c..b6f56d2 100755
190190
--- a/util/perl/OpenSSL/config.pm
191191
+++ b/util/perl/OpenSSL/config.pm
192-
@@ -163,6 +163,7 @@ my $guess_patterns = [
192+
@@ -164,6 +164,7 @@ my $guess_patterns = [
193193
[ 'MINGW64.*?:.*?:.*?:x86_64', '${MACHINE}-whatever-mingw64' ],
194194
[ 'MINGW.*', '${MACHINE}-whatever-mingw' ],
195195
[ 'CYGWIN.*', '${MACHINE}-pc-cygwin' ],
@@ -198,23 +198,23 @@ index 6350e1e..3718ebc 100755
198198

199199
# The MACHINE part of the array POSIX::uname() returns on VMS isn't
200200
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
201-
index e8084ab..6af9f99 100644
201+
index 69f3b48..7df025f 100644
202202
--- a/crypto/bio/bss_dgram.c
203203
+++ b/crypto/bio/bss_dgram.c
204-
@@ -1169,7 +1169,7 @@
204+
@@ -1192,7 +1192,7 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
205205
cmsg->cmsg_type = IP_PKTINFO;
206206

207207
info = (struct in_pktinfo *)BIO_CMSG_DATA(cmsg);
208-
-# if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN)
209-
+# if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(OPENSSL_SYS_MSYS)
208+
-# if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(__FreeBSD__)
209+
+# if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(__FreeBSD__) && !defined(OPENSSL_SYS_MSYS)
210210
info->ipi_spec_dst = local->s_in.sin_addr;
211211
# endif
212212
info->ipi_addr.s_addr = 0;
213213
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
214-
index e8084ab..6af9f99 100644
214+
index f1e1795..412cfff 100644
215215
--- a/include/openssl/e_os2.h
216216
+++ b/include/openssl/e_os2.h
217-
@@ -1169,7 +1169,7 @@
217+
@@ -54,7 +54,7 @@ extern "C" {
218218
# undef OPENSSL_SYS_UNIX
219219
# define OPENSSL_SYS_WIN32_UWIN
220220
# else

openssl/0004-Override-engines-directory.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
2-
index bc242f2..8e3a7b7 100644
2+
index cd417de..a9adb3e 100644
33
--- a/Configurations/unix-Makefile.tmpl
44
+++ b/Configurations/unix-Makefile.tmpl
5-
@@ -304,8 +304,8 @@ LIBDIR={- our $libdir = $config{libdir};
5+
@@ -305,8 +305,8 @@ LIBDIR={- our $libdir = $config{libdir};
66
# $(libdir) is chosen to be compatible with the GNU coding standards
77
libdir={- file_name_is_absolute($libdir)
88
? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}

openssl/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: Alexey Pavlov <[email protected]>
22

33
pkgname=('openssl' 'libopenssl' 'openssl-devel' 'openssl-docs')
4-
pkgver=3.2.1
4+
pkgver=3.2.2
55
pkgrel=1
66
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
77
arch=('i686' 'x86_64')
@@ -14,11 +14,11 @@ source=("https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
1414
'0002-Support-MSYS2.patch'
1515
'0004-Override-engines-directory.patch'
1616
'0005-skip-dllmain-detach.patch')
17-
sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
17+
sha256sums=('197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7'
1818
'SKIP'
1919
'7ff3213d8d085238695f076d254f16d15b16a9baca1f9393c1bed0057006da2c'
20-
'c80251212063d45204b1f77ad9e5c4c63e5c057f562acf90afee8f999b37f184'
21-
'856e5e78e821e920afe2f2eed88ab8d9a6bcc06ecd64d78d4445276e73377812'
20+
'3d298e18ad5206167508df151cf16c8dd6d3b6e2516044e289578b4eaa083e7e'
21+
'9a734c830b9d94011d2cdfef36298fb39b0213bc377188fb41ee9fd9b5e75594'
2222
'79b56c97da803493eb9bbc04dc67ddf3662a8486efb9ec7b15e668b8c0fa4e0f')
2323
# https://www.openssl.org/community/otc.html
2424
validpgpkeys=(

0 commit comments

Comments
 (0)