<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d0297d20470c330b8ce887f3b2aeccbae22eedc">https://github.com/macports/macports-ports/commit/6d0297d20470c330b8ce887f3b2aeccbae22eedc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6d0297d2047 openssl11: Update to 1.1.1m
</span>6d0297d2047 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d0297d20470c330b8ce887f3b2aeccbae22eedc
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Thu Feb 17 03:22:51 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> openssl11: Update to 1.1.1m
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CVE only affects MIPS, so no macOS platform.
</span><span style='display:block; white-space:pre;color:#404040;'> Otherwise mostly a bugfix release.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CVE: CVE-2021-4160
</span>---
devel/openssl11/Portfile | 15 ++++-------
devel/openssl11/files/patch-pre-Sierra.diff | 39 -----------------------------
2 files changed, 5 insertions(+), 49 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl11/Portfile b/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6927a37943d..079e6e99091 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ name openssl[string map {. {}} $short_v]
</span>
# The revision of the openssl shim port should be bumped whenever
# the version or revision is changed here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${short_v}.1l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${short_v}.1m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
# Please revbump these ports when updating OpenSSL.
# - freeradius (#43461)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +44,9 @@ master_sites ${homepage}/source \
</span> ftp://ftp.linux.hr/pub/openssl/source/ \
ftp://guest.kuria.katowice.pl/pub/openssl/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 aa470eea95b127e7ea389c39610a7568579d6b86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9834044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ed6e8fe6c0f3e3912853c888a2af50d37d28f5c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9847315
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
# Having the stdlib set to libc++ on 10.6 causes a dependency on a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +54,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> configure.cxx_stdlib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/openssl/openssl/commit/96ac8f13f4d0ee96baf5724d9f96c44c34b8606c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/openssl/openssl/commit/2f3b120401533db82e99ed28de5fc8aab1b76b33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patches updated to fix 10.4 build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-pre-Sierra.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set my_name openssl-${short_v}
set my_prefix ${prefix}/libexec/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl11/files/patch-pre-Sierra.diff b/devel/openssl11/files/patch-pre-Sierra.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fed3e47f351..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl11/files/patch-pre-Sierra.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./crypto/rand/rand_unix.c.orig 2021-08-24 06:38:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./crypto/rand/rand_unix.c 2021-09-04 19:21:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,9 +34,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__OpenBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <CommonCrypto/CommonRandom.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (errno != ENOSYS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (ssize_t)buflen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/crypto/rand.h.orig 2021-08-24 06:38:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/crypto/rand.h 2021-09-04 19:21:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openssl/rand.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OPENSSL_APPLE_CRYPTO_RANDOM 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <CommonCrypto/CommonCryptoError.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <CommonCrypto/CommonRandom.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* forward declaration */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct rand_pool_st RAND_POOL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>