From patchwork Thu Sep 11 01:40:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten ter Huurne X-Patchwork-Id: 388010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 1D33314011D for ; Thu, 11 Sep 2014 11:40:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7D86633307; Thu, 11 Sep 2014 01:40:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kWENEg6E3y4H; Thu, 11 Sep 2014 01:40:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C940932CD5; Thu, 11 Sep 2014 01:40:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 81D2A1C26F9 for ; Thu, 11 Sep 2014 01:40:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7D54E919C5 for ; Thu, 11 Sep 2014 01:40:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DPhwf24SpeU5 for ; Thu, 11 Sep 2014 01:40:27 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9D497919B9 for ; Thu, 11 Sep 2014 01:40:27 +0000 (UTC) Received: from mfilter2-d.gandi.net (mfilter2-d.gandi.net [217.70.178.140]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 86F9241C05D; Thu, 11 Sep 2014 03:40:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter2-d.gandi.net Received: from relay5-d.mail.gandi.net ([217.70.183.197]) by mfilter2-d.gandi.net (mfilter2-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 91uI0HdN5mpv; Thu, 11 Sep 2014 03:40:22 +0200 (CEST) X-Originating-IP: 88.159.34.112 Received: from starbug-2.treewalker.org (unknown [88.159.34.112]) (Authenticated sender: relay@treewalker.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 99F8B41C04F; Thu, 11 Sep 2014 03:40:22 +0200 (CEST) Received: from hyperion.trinair2002 (hyperion.trinair2002 [192.168.0.43]) by starbug-2.treewalker.org (Postfix) with ESMTP id E0A8F31876; Thu, 11 Sep 2014 03:40:21 +0200 (CEST) From: Maarten ter Huurne To: buildroot@busybox.net Date: Thu, 11 Sep 2014 03:40:03 +0200 Message-Id: <1410399603-548-1-git-send-email-maarten@treewalker.org> X-Mailer: git-send-email 1.8.4.5 Subject: [Buildroot] [PATCH] openssl: Add patch to fix compilation with musl libc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Maarten ter Huurne Tested-by: Bernd Kuhls --- package/openssl/openssl-004-musl-termios.patch | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/openssl/openssl-004-musl-termios.patch diff --git a/package/openssl/openssl-004-musl-termios.patch b/package/openssl/openssl-004-musl-termios.patch new file mode 100644 index 0000000..66631d1 --- /dev/null +++ b/package/openssl/openssl-004-musl-termios.patch @@ -0,0 +1,46 @@ +http://rt.openssl.org/Ticket/Display.html?id=3123 + +From: Kevin Bortis + +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 +