From patchwork Sun Sep 27 22:01:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eneas U de Queiroz X-Patchwork-Id: 1372179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=iNw/0Mdu; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QC7DjB5C; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C005v3W89z9sSJ for ; Mon, 28 Sep 2020 08:03:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=T9KQEAICZCDexdZ+87buWRvRFJ62C104TX9OtlGV41U=; b=iNw/0MduSQSkDG+eR9zTatVzE3 WSsvDSrONtm2r2vqkyITLOHJbjlrqCB4zI4AvMBuQi5Uy1bFE9ONHpRmYF96dX/mKZHFpUJcOz5o2 qGQk4GWXe9TtA8pEZFWPS4klGRhqsKFoiq45fvwvUDNjnFUWWVB4xP/l9BuLH1WxGsXCGDchXAXIs SOmFJo3RNE1k8UnPgkA3ugTxNO7u0vjrvhA6nVAMphOVrr5L7nsuFt+7wkR0PhVdTSgQnquHcovf3 8rj7PCvdzfOYkJg2UxKpjRe0tzoAweGs5v0q8MZmHmndI8lbDZMnU7FoqXv0LBSjw348eqMUexg5+ Bb6yrLhA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMejo-0004MI-Ok; Sun, 27 Sep 2020 22:01:44 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMejm-0004Lp-DY for openwrt-devel@lists.openwrt.org; Sun, 27 Sep 2020 22:01:43 +0000 Received: by mail-qt1-x842.google.com with SMTP id 19so6785594qtp.1 for ; Sun, 27 Sep 2020 15:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a3kdXWm3Hz/ntZw5Rx/wLvgfuNV/EESkhHwhVu/RuuE=; b=QC7DjB5CUdl4y0gmErKoK9wPSK3UTnkDl8MV+5T79OsJLgcaZfRJUvG/UxLI7EnaDj +6lvgw0wZlChJ11sdhDhldJkdO5Yj13cKU6i8xdD7oUyP4KvpTq+bAASWA5pWo5cLNi4 wayaGa5f526PdBLIE2PCi2zbvp6ldF1dC5NP/8ko16uZsGMMgREG15kQuY9nccv4Wlpk 7A2a72VuXPImvNQ6PSBsRRrhczpTTUOapTTmTREZlCv6tokmZ6yQkGIz3e7GopkExFpd v/VGGKikDY/p+sSPJdEarqzeetnFG29D9NVyJAPYbR37PeV0sWjkt1tvhL5Ig/6FBnfv 8Wnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a3kdXWm3Hz/ntZw5Rx/wLvgfuNV/EESkhHwhVu/RuuE=; b=WN7/50gzVyhfDmCsENL277diiP3KtK0iQAuQQujqIzYC3hrUhq+pIwiA0i8x1nNISK VOVZLf1HJJVCt0AVnCU/frK4FvMk98Tr6fREu8mJghzJFunUluqNx/cqhRw3RpwpFVa4 IYUMVwr9OBicbnsf8EcNLSAeMVu4V+yCyF1Tb/KYRe2EnhAd7/RJuwmOv18nwh57efjw BagD0EpKke8CGy4Lgi7BDMLQuRsEg4z1KciFIByhFX7pCeSnyUj8IDmSdqGS5sQuG/Vr 8+tHUyoAscFn/TIMDsbjXQG59366DmYxSEtrWYuAfRbI5KuIQsj4wBKahhWjlF5n3VA7 pKrA== X-Gm-Message-State: AOAM532dtNoWaLHBbdFQ7VMzsNpTMpdL+hezx9dhfgtNftSmglM7j1UT vC99gRrJ4TUPZ7bYzeaKCarwGae/RzM= X-Google-Smtp-Source: ABdhPJwdGLfMDod3NqiMuBUILTVSwIsyvUS2gq6YTC6GXrBcOSOH/EkS6KEjby4Y9a/tCpbyu23qeQ== X-Received: by 2002:ac8:fa4:: with SMTP id b33mr10264501qtk.13.1601244098529; Sun, 27 Sep 2020 15:01:38 -0700 (PDT) Received: from gateway.troianet.com.br (ipv6.troianet.com.br. [2804:688:21:4::2]) by smtp.gmail.com with ESMTPSA id o188sm7262089qke.83.2020.09.27.15.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2020 15:01:37 -0700 (PDT) From: Eneas U de Queiroz To: openwrt-devel@lists.openwrt.org Subject: [PATCH] openssl: bump to 1.1.1h Date: Sun, 27 Sep 2020 19:01:27 -0300 Message-Id: <20200927220127.16674-1-cotequeiroz@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200927_180142_474198_494D00FC X-CRM114-Status: UNSURE ( 8.45 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:842 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [cotequeiroz[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eneas U de Queiroz Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is a bug-fix release. Patches were refreshed. Signed-off-by: Eneas U de Queiroz --- Run-tested on mvebu/WRT3200ACM using nginx and uhttpd. diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 8fe00d970b..9696748106 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_BASE:=1.1.1 -PKG_BUGFIX:=g +PKG_BUGFIX:=h PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -24,7 +24,7 @@ PKG_SOURCE_URL:= \ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ http://www.openssl.org/source/ \ http://www.openssl.org/source/old/$(PKG_BASE)/ -PKG_HASH:=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 +PKG_HASH:=5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE diff --git a/package/libs/openssl/patches/100-Configure-afalg-support.patch b/package/libs/openssl/patches/100-Configure-afalg-support.patch index 0f91a9d5da..98944103b5 100644 --- a/package/libs/openssl/patches/100-Configure-afalg-support.patch +++ b/package/libs/openssl/patches/100-Configure-afalg-support.patch @@ -12,7 +12,7 @@ diff --git a/Configure b/Configure index 5a699836f3..74d057c219 100755 --- a/Configure +++ b/Configure -@@ -1532,7 +1532,9 @@ unless ($disabled{"crypto-mdebug-backtrace"}) +@@ -1545,7 +1545,9 @@ unless ($disabled{"crypto-mdebug-backtrace"}) unless ($disabled{afalgeng}) { $config{afalgeng}=""; diff --git a/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch b/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch index fa79cc6022..7f33cb9dae 100644 --- a/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch +++ b/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch @@ -11,7 +11,7 @@ diff --git a/Configure b/Configure index 74d057c219..5813e9f8fe 100755 --- a/Configure +++ b/Configure -@@ -296,7 +296,7 @@ my $auto_threads=1; # enable threads automatically? true by default +@@ -318,7 +318,7 @@ my $auto_threads=1; # enable threads automatically? true by default my $default_ranlib; # Top level directories to build @@ -20,7 +20,7 @@ index 74d057c219..5813e9f8fe 100755 # crypto/ subdirectories to build $config{sdirs} = [ "objects", -@@ -308,7 +308,7 @@ $config{sdirs} = [ +@@ -330,7 +330,7 @@ $config{sdirs} = [ "cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store" ]; # test/ subdirectories to build