0400322f2d
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
http://rt.openssl.org/Ticket/Display.html?id=3123
|
|
|
|
From: Kevin Bortis <pkgs@bortis.ch>
|
|
|
|
The attached patch fixes issues with musl libc on linux. musl does
|
|
implement the POSIX 2008 standard termios.h on linux and does not
|
|
include the non standard interface termio.h.
|
|
|
|
The problem with dlinfo does no longer exists, since musl has
|
|
implemented the required interface.
|
|
|
|
This closes #2823 for me.
|
|
|
|
Tested version:
|
|
musl libc: 0.9.13
|
|
openssl git: 1769dfab06dcf93a1c310ca7ea9531afcc448d0a
|
|
|
|
Comparison of termios.h implementation on linux:
|
|
|
|
glibc 2.17: does implement termios.h, passes make test
|
|
musl 0.9.13: does implement termios.h, passes make test
|
|
uClibc 0.9.33.2: does implement termios.h, not tested
|
|
dietlibc 0.33: does implement termios.h, not tested
|
|
|
|
I don't know the reason why termio.h is prefered on linux, since
|
|
termios.h is generally prefered and implemented by all major libc
|
|
implementations.
|
|
|
|
Regards
|
|
Kevin
|
|
|
|
--- a/crypto/ui/ui_openssl.c 2013-09-08 11:00:10.130572803 +0200
|
|
+++ b/crypto/ui/ui_openssl.c 2013-09-08 11:29:35.806580447 +0200
|
|
@@ -190,9 +190,9 @@
|
|
# undef SGTTY
|
|
#endif
|
|
|
|
-#if defined(linux) && !defined(TERMIO)
|
|
-# undef TERMIOS
|
|
-# define TERMIO
|
|
+#if defined(linux)
|
|
+# define TERMIOS
|
|
+# undef TERMIO
|
|
# undef SGTTY
|
|
#endif
|
|
|