aboutsummaryrefslogtreecommitdiffstats
path: root/main/libressl/fix-getprogname.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/libressl/fix-getprogname.patch')
-rw-r--r--main/libressl/fix-getprogname.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/main/libressl/fix-getprogname.patch b/main/libressl/fix-getprogname.patch
new file mode 100644
index 0000000000..7e80e1eeb9
--- /dev/null
+++ b/main/libressl/fix-getprogname.patch
@@ -0,0 +1,50 @@
+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/2] avoid glibc
+
+cause problems on musl systems
+
+Patch-Source: https://github.com/libressl-portable/portable/issues/528
+---
+ 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 2c8974326..4e7e31f41 100644
+--- a/crypto/compat/getprogname_linux.c
++++ b/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
+ }
+
+From 65159f37d0b5cc4c191edf6fbfd14ce57ecc58b7 Mon Sep 17 00:00:00 2001
+From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com>
+Date: Wed, 22 May 2019 10:47:47 +0300
+Subject: [PATCH 2/2] Remove info about glibc
+
+---
+ crypto/compat/getprogname_linux.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
+index 4e7e31f41..6550eb863 100644
+--- a/crypto/compat/getprogname_linux.c
++++ b/crypto/compat/getprogname_linux.c
+@@ -12,8 +12,6 @@ getprogname(void)
+ * Since Android is using portions of OpenBSD libc, it should have
+ * a symbol called __progname [1].
+ *
+- * Regarding program_invocation_short_name, it is a GNU libc ext [2] and
+- * so make it conditional to __GLIBC__ [3].
+ *
+ * .. [0] https://github.com/aosp-mirror/platform_bionic/blob/1eb6d3/libc/include/stdlib.h#L160
+ *