From patchwork Mon Apr 19 19:45:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1468065 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) 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=desiato.20200630 header.b=dGu8ceH8; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hauke-m.de header.i=@hauke-m.de header.a=rsa-sha256 header.s=MBO0001 header.b=Aayo1WZi; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 4FPHRc1Xnhz9vFD for ; Tue, 20 Apr 2021 05:48:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc: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=xCCgWnOs7TNVZae6NwQ9RdhZ5xWFxspOnT+rHZxNsfQ=; b=dGu8ceH87BtQkRGtYoBZSqhI/9 kd39eFLjPKwDg+Vp1aa+RfqKunCy9xmKc9i8KeZl+emBXNPGE5+48UmuqHE4Fnu8QFusLnyE/Qupe Cd+Xuua2SkQM2ff6UrLWIn5+ecfjspeVDnG1AldFALAiC81XEpspX3885ZSrxyZ66EcnBob0OWsal m0GqZwrIz2cFbEMgxcHdEloWRDOCo7k2l6dn0OpdwSwaXTEOoVK7TPkiG6N+UY5e1Qt3FLfT+mlD/ P9RkN1FxjNbWPJtr4Wu3nAhkBySpV4LmEDj0EApRPCIat+AHlxRRwwLd0N873wMvA8gIgBMmuropt ODMH26zA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYZq9-00AWNL-Bq; Mon, 19 Apr 2021 19:45:49 +0000 Received: from mout-p-202.mailbox.org ([2001:67c:2050::465:202]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYZq3-00AWN0-Ea for openwrt-devel@lists.openwrt.org; Mon, 19 Apr 2021 19:45:46 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4FPHNk31cszQk2X; Mon, 19 Apr 2021 21:45:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1618861540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0XDn8xpv5sen8zWcsMMXM53sEasPZlyXzCiVa39cs7A=; b=Aayo1WZiKrwwdoMnRH+4YRUpubzC5/DxqpnzXkh2P4B6Fy5mFtIelBWTGl9Xe2pyO/bq2x t2jaWpO+7ZPT/Mc5AUj/BxDRC731rumhme003e5HN/bS4QzgFmoCN5w3MaO3SbdtqnlQE6 H6Dxqc00knC0LdSPLZp1CGIW7Yjwh1ys2sIgGd3xT9kIWGvezmpXVhIgnQ5N/Z/29VNpuv HjtQt/lwzzYxg/nTnbAY+8tldWSTFMkDBt3EYytmyrfa26RGenAe02Gyvb788pr8HQSPtw SnWOFlItiwrL/Trc2yLX6//l4bQ8JJTmZwnJht6KWZgV1pvDT+1b21rewIncHw== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id t_svp16dC7BN; Mon, 19 Apr 2021 21:45:34 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Cc: Hauke Mehrtens Subject: [PATCH] maketag.sh/makebranch.sh: handle https download URLs Date: Mon, 19 Apr 2021 21:45:25 +0200 Message-Id: <20210419194525.252829-1-hauke@hauke-m.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -6.55 / 15.00 / 15.00 X-Rspamd-Queue-Id: 407AF17E5 X-Rspamd-UID: f6d940 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210419_204544_408583_2D1F795B X-CRM114-Status: UNSURE ( 8.03 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Since OpenWrt 21.02 we use https for our download server, detect these URLs too. Signed-off-by: Hauke Mehrtens --- To use the https URLs I have to provide the URL manually now: ./maketag.sh -k F1B767859CB2EBC7 -v 21.02.0-rc1 -u https://downloads.openwrt.org/releases Content analysis details: (-0.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [2001:67c:2050:0:0:0:465:202 listed in] [list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Since OpenWrt 21.02 we use https for our download server, detect these URLs too. Signed-off-by: Hauke Mehrtens --- To use the https URLs I have to provide the URL manually now: ./maketag.sh -k F1B767859CB2EBC7 -v 21.02.0-rc1 -u https://downloads.openwrt.org/releases makebranch.sh | 2 +- maketag.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/makebranch.sh b/makebranch.sh index e8472d7..4b3ab77 100755 --- a/makebranch.sh +++ b/makebranch.sh @@ -133,7 +133,7 @@ sed -e 's!^RELEASE:=.*!RELEASE:='"$codename"'!g' \ include/version.mk > include/version.branch && \ mv include/version.branch include/version.mk -sed -e 's!http://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version-SNAPSHOT"'!g' \ +sed -e 's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version-SNAPSHOT"'!g' \ package/base-files/image-config.in > package/base-files/image-config.branch && \ mv package/base-files/image-config.branch package/base-files/image-config.in diff --git a/maketag.sh b/maketag.sh index 72767b8..5152411 100755 --- a/maketag.sh +++ b/maketag.sh @@ -138,7 +138,7 @@ sed -e 's!\(VERSION_NUMBER:=\$(if .*\),[^,]*)!\1,'"$version"')!g' \ include/version.mk > include/version.tagged && \ mv include/version.tagged include/version.mk -sed -e 's!http://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version"'!g' \ +sed -e 's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version"'!g' \ -e '/config VERSION_CODE_FILENAMES/ { :next; n; s!default y!default n!; t end; b next }; :end' \ package/base-files/image-config.in > package/base-files/image-config.tagged && \ mv package/base-files/image-config.tagged package/base-files/image-config.in