From patchwork Wed Sep 15 13:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evangelos Foutras X-Patchwork-Id: 1966 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [2a01:4f9:c010:3052::1] by patchwork.archlinux.org with IMAP (fetchmail-6.4.21) for (single-drop); Wed, 15 Sep 2021 13:34:22 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id SE+kMl32QWFe7wIAK+/4rw (envelope-from ) for ; Wed, 15 Sep 2021 13:34:21 +0000 Received: from lists.archlinux.org (lists.archlinux.org [95.217.236.249]) (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 mail.archlinux.org (Postfix) with ESMTPS id 424C990C4ED; Wed, 15 Sep 2021 13:34:20 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 0FA04814988; Wed, 15 Sep 2021 13:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.archlinux.org; s=dkim-rsa; t=1631712860; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SHU2BqxZp+HQk4OqijaQlHgPhzHYFF8GitNAaSfLq5c=; b=ict87BDwYiPxlX++OrcPXQ7918ZddP8Pzg2PXFeWlxraCQSCX377aI/h659cnkiMgFQ06l U9uqHzcfAVRlrWdzpTNpwrcDuL6n+DU/2YB9rz+bIb8C2ClZ4F1OB5eAyJ3pbvHhg3tUNi dRPOaTu37zkd/XFkq1aAp8UBH/1q1sE7GD5R+aKo6dlQLxhdOutqDF9J5IyjKHJ0V1i1kQ Sp5LPILeGqep2j4ygd4ShZs0trrhalcxnqIfNwgp2NK9gQFcOtOxolnVKwb9TQJtKpU90H lpXefZ6ZRXYR9jOuHZfVN8zNuc/+3rY9RDoEj/t7gYl/gozCGiGhxnmhRKm7FGbfd63D5F I+/Pb+9PEowzZlkzxzMkDjNyNdmS4UOmQdT3FbSEbbZSf+hHmvg3/Qp8YFSgcQjAzDHOZo osb6VQ3TCiOwuRqcGHHiDTP7cHTKrNWySwL8w4k8bGZaTDy0TL4EElPnUUxCo4r+7AIP+R 9LEk8QpfdG3AO+vtVp82u1XbrolwbQEE8Ttuw6bgh4JwV1gL9dgJMskaKD7ILBRULxT3kQ tvaRuItXRSi+Ol24RHu5fk6yGBbv444A+cxzoTX7wc2GAbQ6sL2xjG4vUEetNEQgG6BmbR 3Q5jo6IooI7J89HmxOwx2XBcPPiHDIXfkPQCOLi4kh8LDDVMfBO64= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lists.archlinux.org; s=dkim-ed25519; t=1631712860; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SHU2BqxZp+HQk4OqijaQlHgPhzHYFF8GitNAaSfLq5c=; b=pE2ZOrLH+Z3UXPKrtnaiE7LLN5Kph8Yi1+xNQST9BCGUg+mZpGUgIbt1F48JcXoOaCxK7p zqZsT9T/x/IWf3Aw== X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lists.archlinux.org (Postfix) with ESMTPS id B3E29814973 for ; Wed, 15 Sep 2021 13:34:16 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id t18so4020776wrb.0 for ; Wed, 15 Sep 2021 06:34:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=SHU2BqxZp+HQk4OqijaQlHgPhzHYFF8GitNAaSfLq5c=; b=04OzHob+P7o4y6T8JrQ57+tcEaiapK1939Jch2EZLnzonphscsE1nMosTOf7UwHDBX dX+bE0nFcLDGoe4Xp46u9EbXyz6DXyh2jg0l+cOIOuW06Qo+F0rVdsOLcF721VU6fLjy xHrz41Cia5VKpb7wwTKZMKUHiVCAN4C+LB0J+vdrLBeHkbc8q6JNiyNw5c6UQVHeJ6Gl TB/bL6gizR6+o0O/bj1rJiA5CUHYlbTXBBN4XWW9WYc6boUEY3pCZEsJVlAKHwUrwLgP kvQia/u7/fna4BYdC5E/n9t2/IpnXYf/lVcVKjNAiBTbtirdxZEVgYz55gU3loGPKATa U6bw== X-Gm-Message-State: AOAM533RPHWiTGggggD4KgjaDJbiQaPFp/7L0SakljEcU5E2sgwfWLmE dCnwNROFS3c4Va4FE6BcBtVIRyzAJ0Jh+9tT X-Google-Smtp-Source: ABdhPJyR+jGmre/Yn/xGFm06v0uDwgSy8OVyuYUZQxQ7rZTZUWMa3crE05fUAsGQecC0jjkDvE9b8A== X-Received: by 2002:adf:cd92:: with SMTP id q18mr5123793wrj.211.1631712856164; Wed, 15 Sep 2021 06:34:16 -0700 (PDT) Received: from localhost (adsl-174.37.6.238.tellas.gr. [37.6.238.174]) by smtp.gmail.com with ESMTPSA id u8sm4532949wmq.45.2021.09.15.06.34.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 06:34:15 -0700 (PDT) To: pacman-dev@lists.archlinux.org Date: Wed, 15 Sep 2021 16:34:14 +0300 Message-Id: <20210915133414.87222-1-evangelos@foutrelis.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [pacman-dev] [PATCH] makepkg.conf: Pass -q as the first option to curl X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Evangelos Foutras via pacman-dev From: Evangelos Foutras Reply-To: Discussion list for pacman development Cc: Evangelos Foutras Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=dkim-rsa header.b=ict87BDw; dkim=pass header.d=lists.archlinux.org header.s=dkim-ed25519 header.b=pE2ZOrLH; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 95.217.236.249 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 424C990C4ED X-Spamd-Result: default: False [-3.41 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; R_MISSING_CHARSET(0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=dkim-rsa,lists.archlinux.org:s=dkim-ed25519]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[pacman-dev@lists.archlinux.org]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::430:received]; FROM_NEQ_ENVFROM(0.00)[pacman-dev@lists.archlinux.org,pacman-dev-bounces@lists.archlinux.org]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; RCPT_COUNT_TWO(0.00)[2]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; NEURAL_HAM(-0.00)[-0.987]; RECEIVED_SPAMHAUS_PBL(0.00)[37.6.238.174:received]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org As per curl(1), the -q (--disable) option must be first on the command line to disable reading the curlrc config file. Without being first it does not appear to have any effect. Signed-off-by: Evangelos Foutras --- A team member noticed this when curl 7.79.0 complained about: curl: --continue-at and --remote-header-name cannot be combined Turns out they had specified --remote-header-name in ~/.curlrc. etc/makepkg.conf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index fff5b8eb..5ad3d490 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -9,10 +9,10 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' - 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' + 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o')