From patchwork Thu Jan 9 21:21:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1220668 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=UQqKQ+bb; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47tzZC1349z9s29 for ; Fri, 10 Jan 2020 08:21:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BAB2986AAA; Thu, 9 Jan 2020 21:21:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8dWnBChEct4w; Thu, 9 Jan 2020 21:21:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 39CDB86A8D; Thu, 9 Jan 2020 21:21:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 243CE1BF868 for ; Thu, 9 Jan 2020 21:21:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 201A920C41 for ; Thu, 9 Jan 2020 21:21:17 +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 bRwEDlkozj1z for ; Thu, 9 Jan 2020 21:21:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by silver.osuosl.org (Postfix) with ESMTPS id B80F0204AC for ; Thu, 9 Jan 2020 21:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1578604871; bh=G9qth+jxHqzm4Wg6ai1AlRHD2IODuHHC2/02LJf9bv4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=UQqKQ+bbz84hpGLuXGNc1eGIegvawDCwjrvWG68MKMWiVr7DB7yGGxK49bN8Ba4d6 3u7ORGe33+UR3exPbpX3vqAiUMaEhr+RjJ8CCeGO9TkWJV4PR9DKj9V16YMRsHEs5F wt28/53GWxSVzL9K/d65kT+vp31cArpyU0z7kGMs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.202]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MORAa-1j3Sjh2Cwo-00Pt5R; Thu, 09 Jan 2020 22:21:11 +0100 From: Peter Seiderer To: buildroot@buildroot.org Date: Thu, 9 Jan 2020 22:21:10 +0100 Message-Id: <20200109212110.20227-1-ps.report@gmx.net> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:uvSq2yau1A4NqRBhssq4fne2WiDd2RNrSoIhhfDEQlQn2S2nagK KQV7GXvlrs4CZjC2ZBieUINvaXSKMJfdVWAPfK/WsNzMbPFcAysKQB/vAxd5EQzjOMurbrc zCbp8K6ZKfsx8mu7ogxuypDNI3ZyxqZnGWaqKABgVFXqOV2vpGkaYAF6D5PPnUXPEWelAEs ALd1Gezt1tARAU0x+loLg== X-UI-Out-Filterresults: notjunk:1; V03:K0:J+wL5cNjnYQ=:GwzdaONOrEgq3/0iy9x374 GS/XMsLwldzWF9VBxPI+Q5q2ClcGJbKD3/KGh59OLpZAyCV6zJFQKe0S7D6xfMfnflAMIOznR LxmupCkUuwjIJbmI1DCoxlA8jwUFH2zK0zcKYkG+qDHhMB9TR1RiF36175ThQUelyEc7zd2Kh CtKkIwMG6WaYlKXv2w+nWpg7+8//Aw4YjhzGJo4LGoY1Y+ywlECxw/Z2LWztrmiWPY37JzxQH EJN/ROmQJ9uyvoi+GAMy1+gZwkDK3c22uD/1+3hS0qTkpsOD4Lo3I2HXrKeoC9uHweCXGsnJx geUSmiJ9DBXFefsUsyEnx8h1UYj0xQUxgujMOlnbAy3edp9grKAoXSRApfZVYeAsoxV3PPT+R dwsE0ChAnmfteDzY/2noO79z+VDQYb3IZDdQErf9u7GXkrtE7ZIetydRvxulaxtf4WyxJLZ19 WPo7pjTnX4OS0JQ/g1v8F98HA+Tf1bDmpS6AHJOdfL66AEczxyIzHw8kwlG+ICqccb0/kbG+H FvteF7awESvccSHykX+UE8fjavKMt9YRJGkPdHyEVqPVxn4WavojnRuNLe3cqCr6ovHKuFksZ 30ChyS2tbpv0U36tapkv+QrvmcAUeWYFlzq5t02r2VS9a2CzNB/ac1Oz9KNf4KMUYNlBUXI19 rvlSD6KVr+6CJFwHwU4sFinLALCS/Uf3TFgdHOEvT35spZc2eb+xCGPSHEUPrpTrsfPsGWqYQ T1fbM0RonSiey71nBWE8glnAL1WVKzm4xNiccEfbbFPJD43ghMcv8RWplb8SGELU2h6RAZRJB 1Vm+SHlkgFsnIRXn2dehO3Veuwk+UFz+jINb+KewKr4Qo5xAsnilAM8m3JZFttpTG2qWGrPts dAS+YX/qQd9rP5336gge2jgHmAMBXtycheQI3v9qcFvqjFKC3LgWD3sKIns9G/UfaIbBJC0iu M+DNGIvPk2puxWaBWfeWVL4xx7Ghsm6wNRHZcojDYtDEjNfDU34vd/QucBlPJL9IkwUmix6c5 jXa3P6akuZIfm9e1gxpYyxGjGhs+jSFoVWp35iYmGudwxoCu+brv2SC5Jjv5+Cmhe/vLD9zXC 10W18Okff4kQyyyrTKV/2eKeEV7Vsfp49P0veylSTpH/+G8HrFLBEZ3Ve47Rx4NXX0ekd/s4A PYArPiU5UpALESx7VZaxVgc7IyKdz3PcEfgWGKzgiqiUPaRdSJe5ZuO+l1eaCjfnmw/1MC3/u dtxfi1iLpOml4Zh1NxGw1uVCwE42wzI0WpuOnOioavD/+bGA7ff4r83kLd3Q= Subject: [Buildroot] [PATCH v1] package/dillo: fix openssl support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Kimmitt Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add two patches to fix openssl support: - 0003-Fix-openssl-detection.patch (suggested by Jonathan Kimmitt) - 0004-Support-OpenSSL-1.1.0.patch (taken from upstream) Signed-off-by: Peter Seiderer --- .../dillo/0003-Fix-openssl-detection.patch | 29 ++++++++++++++++ .../dillo/0004-Support-OpenSSL-1.1.0.patch | 33 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 package/dillo/0003-Fix-openssl-detection.patch create mode 100644 package/dillo/0004-Support-OpenSSL-1.1.0.patch diff --git a/package/dillo/0003-Fix-openssl-detection.patch b/package/dillo/0003-Fix-openssl-detection.patch new file mode 100644 index 0000000000..0578718c2b --- /dev/null +++ b/package/dillo/0003-Fix-openssl-detection.patch @@ -0,0 +1,29 @@ +From 96dde9dedf806256cdc6cbf5cacbd5c8d74e6288 Mon Sep 17 00:00:00 2001 +From: Jonathan Kimmitt +Date: Thu, 9 Jan 2020 22:01:42 +0100 +Subject: [PATCH 3/4] Fix openssl detection + +SSL_library_init is now a define, use OPENSSL_init_ssl instead. + +Signed-off-by: Jonathan Kimmitt +Signed-off-by: Peter Seiderer +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 66b5e9f..206fd53 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -276,7 +276,7 @@ if test "x$enable_ssl" = "xyes"; then + + if test "x$ssl_ok" = "xyes"; then + old_libs="$LIBS" +- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto) ++ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, ssl_ok=yes, ssl_ok=no, -lcrypto) + LIBS="$old_libs" + fi + +-- +2.24.1 + diff --git a/package/dillo/0004-Support-OpenSSL-1.1.0.patch b/package/dillo/0004-Support-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..57518cf5c5 --- /dev/null +++ b/package/dillo/0004-Support-OpenSSL-1.1.0.patch @@ -0,0 +1,33 @@ +From ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001 +From: Johannes Hofmann +Date: Thu, 9 Jan 2020 22:07:15 +0100 +Subject: [PATCH 4/4] Support OpenSSL 1.1.0 + +taken-from: pkgsrc (Ryo ONODERA) +submitted-by: Jun Ebihara + +Upstream: https://hg.dillo.org/dillo/rev/b171b8610400 +Signed-off-by: Peter Seiderer +--- + dpi/https.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dpi/https.c b/dpi/https.c +index 766b3af..025cfc4 100644 +--- a/dpi/https.c ++++ b/dpi/https.c +@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection) + case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: + /*Either self signed and untrusted*/ + /*Extract CN from certificate name information*/ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { ++#else ++ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) { ++#endif + strcpy(buf, "(no CN given)"); + } else { + char *cn_end; +-- +2.24.1 +