From c17c20d88b674fc3eccdbf4fccd890cb631242b8 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 6 Jul 2019 07:21:58 +0700 Subject: [PATCH] libressl: bump to 2.9.2 --- core/libressl/build | 2 ++ core/libressl/checksums | 3 ++- core/libressl/patches/getprogname-musl.patch | 28 ++++++++++++++++++++ core/libressl/sources | 3 ++- core/libressl/version | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 core/libressl/patches/getprogname-musl.patch diff --git a/core/libressl/build b/core/libressl/build index fe0e7b34..723c0a96 100755 --- a/core/libressl/build +++ b/core/libressl/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p0 < getprogname-musl.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc diff --git a/core/libressl/checksums b/core/libressl/checksums index 9c40bed4..d5adc4cf 100644 --- a/core/libressl/checksums +++ b/core/libressl/checksums @@ -1 +1,2 @@ -39e4dd856694dc10d564201e4549c46d2431601a2b10f3422507e24ccc8f62f8 libressl-2.9.1.tar.gz +c4c78167fae325b47aebd8beb54b6041d6f6a56b3743f4bd5d79b15642f9d5d4 libressl-2.9.2.tar.gz +b532a1587c6ba73f905db5021a4c6032d821b2e8b94155f762df250f8a6de811 getprogname-musl.patch diff --git a/core/libressl/patches/getprogname-musl.patch b/core/libressl/patches/getprogname-musl.patch new file mode 100644 index 00000000..63fdf53f --- /dev/null +++ b/core/libressl/patches/getprogname-musl.patch @@ -0,0 +1,28 @@ +From a747aacc23607c993cc481378782b2c7dd5bc53b Mon Sep 17 00:00:00 2001 +From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com> +Date: Tue, 21 May 2019 22:41:05 +0900 +Subject: [PATCH 1/4] avoid glibc + +cause problems on musl systems +--- + crypto/compat/getprogname_linux.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c +index 2c89743..4e7e31f 100644 +--- crypto/compat/getprogname_linux.c ++++ crypto/compat/getprogname_linux.c +@@ -26,9 +26,7 @@ getprogname(void) + #if defined(__ANDROID_API__) && __ANDROID_API__ < 21 + extern const char *__progname; + return __progname; +-#elif defined(__GLIBC__) +- return program_invocation_short_name; + #else +-#error "Cannot emulate getprogname" ++ return program_invocation_short_name; + #endif + } +-- +2.21.0 + diff --git a/core/libressl/sources b/core/libressl/sources index 67a9573b..24adc84c 100644 --- a/core/libressl/sources +++ b/core/libressl/sources @@ -1 +1,2 @@ -https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.1.tar.gz +https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz +patches/getprogname-musl.patch diff --git a/core/libressl/version b/core/libressl/version index 1e63090b..cdb72eb9 100644 --- a/core/libressl/version +++ b/core/libressl/version @@ -1 +1 @@ -2.9.1 1 +2.9.2 1