From patchwork Mon Mar 29 09:02:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 1889 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.17) for (single-drop); Mon, 29 Mar 2021 09:28:45 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id 4BZLCcydYWAIHgEAK+/4rw (envelope-from ) for ; Mon, 29 Mar 2021 09:28:44 +0000 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 76B1D4B8C2A; Mon, 29 Mar 2021 09:28:43 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2F6982C749; Mon, 29 Mar 2021 09:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1617010123; bh=suPtfJ0MBLiBzPcg232SUBeV+0Xvc1XuFUtEj3FUe8U=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=lx0fqV88vbnKO5kHz7st6u9cEPNawAR9WTY3nrxEfioQT+/KFdMz30+C4ptOh2E2y lRMNbJRvtbsSnzy1U+oSkrvWg6ZZeOWNpmSaluiFiS2YR9ehz/dCzGA8Vicp4rJyM0 2w06wrbIMab6E0SB8Fh29JuplKRz+iifO3TLBzB2vzRI3Pr6v2RsxSNm6m40/JKXPW 2QWyfTTByRwAqEsKq7ovEOrehT0HVId97yjVIYQZyLMr6byykFFM9dJJeKpNG+Ri8A BtjME1P9F60RyeL/svQCkHAtFDlqXgP4+0JdHqAGJsPvp3bl4uoe5xdL/r6g+UdTkK e3SbpNQGrlsN7WHCsLnEFwLKHEBVfvJhbyq2cborIRfO1u8jGqfphLEppzfQiaLkwF zkZIvWMigMqziaRsQTNsEUDcv2b8z7WXOh9JpZOEjS+y3eRVEAbZD5hTkgwnZoOFHL 5nrxYfdIaVrLY4WFpL7RNMmiCkoNbL7YenY6ZTXKxZkPJQ5WcRWeNU+4+9saNHDCIH 9G2u1vPhvBIZ7EpCw6VBXWtk/6Duc1crMLrfNGb9wzEWDhhVnQrZtBpvNuLTQ71jay HFdAsBaQZbpJEpdZeGTp0NHsfSGbQmGhQecrz2PlUjygbSKyhoiJNvxhmM2Og1jQ3N S/aWcqFzqLixKe933BZmwf1o= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 4D77C2C61B for ; Mon, 29 Mar 2021 09:03:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01,T_DMARC_SIMPLE_DKIM=0.01 autolearn=no autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.5.0] Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 29 Mar 2021 09:03:06 +0000 (UTC) Received: by mail-pl1-x62f.google.com with SMTP id w11so4090271ply.6 for ; Mon, 29 Mar 2021 02:03:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G2ZairL1Hxo2eDHoKyD5RaMxIjnYxEvPOO38qBXjL4I=; b=bAUHiwIbjqVF3Aqf+KCKCFa9phBwIlTRK202wfj2QRUGOTYOQ+4qsUFAze1OKz2XyY cAlFnmCrNSTZDuKSpsYDMa8SX0liss7FcPkx5Fyt0a9T8pT2egWrMQi/9/trd5b4Xqy8 1EorWu2jY3ipBoVtzvGFg0RuhCs+Q8lBNtHSXY4VDHhaV+TtVGVXZLm67mnmZxTcaYUV CJcAa0NKwF5emfX+Z3DvVG5as/HIiQvcrEfa92HknxFBJM7ls140QYGUNNYJqqebsqGD VsOtnY3yo4Huf0lwD5Iu5FYZ/Xe/O9qTR7Qn6gLomEW9qBB4h9alWd+Y9Do3Va9fAyFZ wDmA== X-Gm-Message-State: AOAM532kJJsS6hFECbsbOPmHIIONZU68zXuSCoBdb2Fpxw1V+8PBNUEs NjnfLRHwPCkmfshOBYcoqnbeoMT39gw= X-Google-Smtp-Source: ABdhPJwh0JED7YiuctLtc7Tmyj6eKpackxnu3umKnSAtiL34FZ/Fq70TsFuJvi/9ntW+fJgoTU2nlQ== X-Received: by 2002:a17:902:d2c7:b029:e6:dd9e:d652 with SMTP id n7-20020a170902d2c7b02900e6dd9ed652mr28309710plc.1.1617008584016; Mon, 29 Mar 2021 02:03:04 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h68sm16122545pfe.111.2021.03.29.02.03.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 02:03:03 -0700 (PDT) To: pacman-contrib@lists.archlinux.org Subject: [PATCH 1/4] .mailmap: Map Daniel Parks Date: Mon, 29 Mar 2021 02:02:40 -0700 Message-Id: X-Mailer: git-send-email 2.31.0.208.g409f899ff0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Denton Liu via pacman-contrib From: Denton Liu Reply-To: Discussion list for pacman-contrib development Cc: Denton Liu Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=lx0fqV88; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 5.9.250.164 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 76B1D4B8C2A X-Spamd-Result: default: False [2.79 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; R_SPF_ALLOW(-0.20)[+ip4:5.9.250.164]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:5.9.0.0/16, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; RCVD_COUNT_FIVE(0.00)[6]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the patch was erroneously applied with incorrect authorship information. Fix this with a new .mailmap entry. Signed-off-by: Denton Liu --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index c8185d5..325cbf9 100644 --- a/.mailmap +++ b/.mailmap @@ -1,2 +1,3 @@ +Daniel Parks Daniel Parks via pacman-contrib From patchwork Mon Mar 29 09:02:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 1891 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.17) for (single-drop); Mon, 29 Mar 2021 09:28:46 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id CpM0Cc2dYWAgHgEAK+/4rw (envelope-from ) for ; Mon, 29 Mar 2021 09:28:45 +0000 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 03DA34B8C2E; Mon, 29 Mar 2021 09:28:45 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 730522C7B1; Mon, 29 Mar 2021 09:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1617010123; bh=z957UHVZOSGAkxcf6qvBYfhA+H+8hdE0VDFvHnVwcPA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=ayiKeZrcV4y3+ge8gjlZ3SAlPc+rWbVjThjd1uFgTpj4nU+y2b4fkJ6XxkC2GeEu6 pVzLykHAHeZzEu9OjhlTww4kRLE+iBv7UwUVAgr6/qzaBCbhIReFh3oL27NXJ7Bjce c6foQUMOCaLk5HbAqBXzxgOAMGZ8qFBZW8uj7pr2gx2BaBDl/4GNM1x7vp9mEWLSjd /8JbzXNWe5jA1vFH2MaQRFKlLeorZg5Bq/l0XXBtvFAKe8hi7Y/NaMQYMHy6G/4/Eq Uml3BIirvnIfIYiWizfAFoiaLWu3/ATHt7YldLaDeQeE+6ujifWSP4UiZ+ur7d3sCw 2vMlGN7PA0dSRWgfpbP9b/Jv/j2oDZe111Bbq8Rc/nbGeH12B9IGq+U/o1SFaudFAJ C0cyyylzz9svAcaC04EqxeRDa5mQUB//x1adxuo5YyY6xuZ8KBgMjsJBUTOPJSOiEl vSH/66f0HKyMcpgZE0LV4FnuDIMBhgEbrzCY/cUKCoOrUa1QLzJfwWc3RyngTtWAyb D9fwqlutqv0Kz19WH2Pu51nCK9GLmfwRJJfPLcpGPtNzwlZpyz7DAhhoeiAD57WIi2 umpsNf7GWWhQyp21vudKpEbSqWgsJGJtsZcW9U6yI0XSYqNeWyjb5WQ1p0fKR+0Fd2 pDsU1x5atn2whmuavKH0/shU= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 065F82C61D for ; Mon, 29 Mar 2021 09:03:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01,T_DMARC_SIMPLE_DKIM=0.01 autolearn=no autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.5.0] Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 29 Mar 2021 09:03:07 +0000 (UTC) Received: by mail-pl1-x636.google.com with SMTP id f17so4081585plr.0 for ; Mon, 29 Mar 2021 02:03:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sZqQKENTHSP+j1oboAfZ1MRLI0Dl3Zed3AntQxXuQFg=; b=C5IRhgXKXrgsqTvSk1TMGkCnpumQrHC+Sd3UzWe56CxbPz8vjee0fGsVc9temPBJhv TSROzyi1ZNeTDf9fHH9P9R91MfQH6yNcdlZFHaSGgzIsick5ai6lRHchIGUoAWEEwiNH EL2/XotRbX14vxyclMGcWLgxSeIKSLjFokuZOp57y7I5uCJm5l8PBF+pEe2HiftpJ9hN FbN33BUkQm6AZdKvnSChcVHFHVzrVxFxSvLu3R49FA4UNK9rLHqHWX66GV+D1h43KUnY LC38Or7QFc89ZWgi05H53kLtYuj3UcZBUznsEaxb1e7S3dANDPpOhMeWr6Kv9jLzaWia cz+Q== X-Gm-Message-State: AOAM532SOsyodYwr+vUcrXBx+WYpYOGWFey37fYG8KWz+0VGdHmAvwHD JGwdfcpjnnErLWYvPJ7y263tROkX0KU= X-Google-Smtp-Source: ABdhPJw3g0FqlCygDaKMaoLJadVMWICzYhndX14fB+ddvWRRnFsa2KGUYrlK/wOn36w+zdLOiDEw4A== X-Received: by 2002:a17:90a:3ec3:: with SMTP id k61mr24993867pjc.125.1617008585015; Mon, 29 Mar 2021 02:03:05 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h68sm16122545pfe.111.2021.03.29.02.03.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 02:03:04 -0700 (PDT) To: pacman-contrib@lists.archlinux.org Subject: [PATCH 2/4] .mailmap: Map Denton Liu Date: Mon, 29 Mar 2021 02:02:41 -0700 Message-Id: <9287d4e2ce7e496dcbf8f1d05c6d855edc74ccbb.1617008556.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Denton Liu via pacman-contrib From: Denton Liu Reply-To: Discussion list for pacman-contrib development Cc: Denton Liu Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=ayiKeZrc; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 2a01:4f8:160:3033::2 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 03DA34B8C2E X-Spamd-Result: default: False [2.79 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:160:3033::2:c]; R_MISSING_CHARSET(2.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org In 94b2a19 (pacdiff: Learn the (M)erge mode, 2021-03-04), 348a296 (pacdiff: Reduce repetition in input loop, 2021-03-04), and b675c92 (pacdiff: Implement die(), 2021-03-04), the patches were erroneously applied with incorrect authorship information. Fix this with a new .mailmap entry. Signed-off-by: Denton Liu --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 325cbf9..60ed742 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,4 @@ Daniel Parks Daniel Parks via pacman-contrib +Denton Liu Denton Liu via pacman-contrib From patchwork Mon Mar 29 09:02:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 1890 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.17) for (single-drop); Mon, 29 Mar 2021 09:28:45 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id uLfzLcydYWAYHgEAK+/4rw (envelope-from ) for ; Mon, 29 Mar 2021 09:28:44 +0000 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 344D04B8C2D; Mon, 29 Mar 2021 09:28:44 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5D5392C7A1; Mon, 29 Mar 2021 09:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1617010123; bh=mLDoC6XEQhAGBFBj2oeoYG+Zwfj1IGaDhUVPQvSujAw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=t4KKwXFa7jTsTTnwu8StyUwG+DjoGV6Eh7Rysqscc+LhDS2MUqNSfzaLr6NaCndr3 6bRYNIllLZrT+jTIW4qu/ZIGOsH0UGBO2ig93uogUgKG9+J5EP8xaxsGbvzrXtelWw F7yN98RapR6pKT/Z4dCAFxYlps5Ri9Cvp/X16KVZfIeKb1EIvAbo1QHhSli9+3YJpQ 6wVQf95MpCfAl69bXLjFqousIjMLLkSUd14t0qLOZZOqIf/hBl9yZEHxZX8fgsq7cL WZFCOsMcmloJB8GfTXPDKdxR/f/RHp3e8pNBSiSjoz/nwNXYJ4e9Ms+MWUDnTyr9Pl lh90/ipQ+MZCF13+XN9M0kUtbjA38dMB8+FjS/lXIZQrdDPIV5ZHeA97rmGMjMD27c 5cbo2RyIAGUI2jWWbkvkDoWhO94XXLXLL98Cu+pr64U99WkgTvZf7zWYZcKVUJjdE1 saisl1CWhobr5U3j+UaStb+TFR57nC5c+TChqX7QiTGbBuEvSitWlMSueOx85Ckoj2 v5P2mZNjug1XYn+F6COeL5OdEDvQ3o0sgPGdKK77gjL391ZxudfE8voRmrT1fL2mm5 XVStqoHbGz7A9QSKyGFKtylBNww55wpjMqxoKGx44HsjM5ZoOQgSey3EqMcl3CDwna 7+EnS/Xft8uBQ4fdI3uP1SfM= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id BEA382C61E for ; Mon, 29 Mar 2021 09:03:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01,T_DMARC_SIMPLE_DKIM=0.01 autolearn=no autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.5.0] Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 29 Mar 2021 09:03:07 +0000 (UTC) Received: by mail-pl1-x636.google.com with SMTP id h20so4087256plr.4 for ; Mon, 29 Mar 2021 02:03:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MjLIhS6/P2bmXE9bUITiqTOirWGrIbxPWTj91JXjZlQ=; b=QkeQ2NVOW2K8mY91QlMcfryR2p84p7+r/JOIsWEfI7obwXZZ3RkMc557CsrovLEySM cxftzCIpT7vPkgWUHJc93Ec3q8cJTxeDRqToZeKobibKBxs2ZweDtnXCzIdOxhv4Ns+H V86pH1bEgTtguQstu+hMG5oWyDQlI3xq8puLZXXOqPKK2rhSWpf8amE40jQsvLDsn7hf FGwKlj6io01j8bgTRKfvurQiEyWMa8bV/8NKFd4wZbM4ENEBbuD3Pryvrfa0vT4uURgf liSKzK9o3FwfuFf1ju+E10827/6uWMCN2fKIJZO7QRuQZRGHYITclQhgfDzjEhlJMEbb mKMw== X-Gm-Message-State: AOAM5302MY42yQNk1TX+QqDlnkQzUrVBuhds/KBupOPiNGoEy3Mj+CmD JgfkIAM2xceRCTb0a7rrwkonvJmuohI= X-Google-Smtp-Source: ABdhPJwqLC6eDB5FCEEAx/kc6PW6u0KHBviYWRCye/QMS3tBBiDPY7oToiYxDEVCg1TicCb7eGoH3Q== X-Received: by 2002:a17:90a:9281:: with SMTP id n1mr25543209pjo.146.1617008585903; Mon, 29 Mar 2021 02:03:05 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h68sm16122545pfe.111.2021.03.29.02.03.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 02:03:05 -0700 (PDT) To: pacman-contrib@lists.archlinux.org Subject: [PATCH 3/4] pacdiff: update --sudo usages Date: Mon, 29 Mar 2021 02:02:42 -0700 Message-Id: <636e0fb2a256bc0fd97953aa39b7e3c06238965a.1617008556.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Denton Liu via pacman-contrib From: Denton Liu Reply-To: Discussion list for pacman-contrib development Cc: Denton Liu Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=t4KKwXFa; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 2a01:4f8:160:3033::2 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 344D04B8C2D X-Spamd-Result: default: False [2.79 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:160:3033::2:c]; R_MISSING_CHARSET(2.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the --sudo option was introduced. However, a corresponding entry was not included in the man page. Document it. Also, align the usage text in the program with its friends above. Signed-off-by: Denton Liu --- doc/pacdiff.8.txt | 3 +++ src/pacdiff.sh.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/pacdiff.8.txt b/doc/pacdiff.8.txt index 592da72..12f786b 100644 --- a/doc/pacdiff.8.txt +++ b/doc/pacdiff.8.txt @@ -53,6 +53,9 @@ Options *-c, \--cachedir *:: Scan 'dir' instead as the pacman cache for 3-way merge base candidates. +*-s, \--sudo*:: + Use sudo to merge/remove files. + See Also -------- linkman:pacman[8], linkman:pacman.conf[5] diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index 674892b..fe66a6e 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -60,7 +60,7 @@ General Options: --nocolor remove colors from output -c/--cachedir scan "dir" for 3-way merge base candidates. (default: read from @sysconfdir@/pacman.conf) - -s/--sudo use sudo to merge/remove files + -s/--sudo use sudo to merge/remove files Environment Variables: DIFFPROG override the merge program: (default: 'vim -d') From patchwork Mon Mar 29 09:02:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 1892 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.17) for (single-drop); Mon, 29 Mar 2021 09:28:47 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id SF3lC86dYWAgHgEAK+/4rw (envelope-from ) for ; Mon, 29 Mar 2021 09:28:46 +0000 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id EBF484B8C31; Mon, 29 Mar 2021 09:28:45 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 88E4C2C7B5; Mon, 29 Mar 2021 09:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1617010123; bh=r5MRa5folgXi1sBuhwb6xAvu3buS6PRqBGrwPezuWT8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=LL50XJExWgfhZLe/Qc6NxNRWue8Iecfi5aa8aKgLzVnMBpRWKb/ItR3MGl8JN8Egr Gff+999/3nb1z1Gufc3MN4sDTZycHg/XwRBHHZVrX6yf1w+aZYlQmxG3rCLJju0UBG bbkZtHmHGn+aAxQFg6nqZn/IxRyisbbE3eHoGB3xHFeHJWJaSv6LbZ1o/QWkJ7C4Mf MSEeCtMs17j2dv8TVHaLMR6ED8y/za56FAhD3qqcpPdjdtKtH7qf52dzBHOE2F9D73 20s94h2Zr98Rji9BcIN8Zk6QlaNBEOkn3y+J8JSpmpZScCXl5I9jKQkamd387pxGgH 3HQeD1th58WNWYnUFeLs7dbdzEO1EPj19S+wmMDtf7ucLpCUFZ+zI0Fw/02hZzFCbu nAB8GprchC/3sbFexpuXZzEKVFvENODpJjzN6/7BP3o0spdRAk/uDREK6BiUwoYwKw 2wAPFLK5tgiiqdhR08sXFz9YKsmzfzpzZA2Jnmjs3wgKF24HiyBcwhVNTzUSUmlxA9 /s/D4XuhWuLdGDDLVomNSROen89fsPuFp34N69dNNf5oQCB+/G8ofuY/Ey5gSC8GYA xFQI6mvnqe4HQ7yvo/RM2VffLs2mWyc4TE1BPo++wRwVU8ulOE9v6HwYnWjK37KCl2 5ZGZIIlNV5+2rl+7rICgr+pc= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CF4572C61B for ; Mon, 29 Mar 2021 09:03:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01,T_DMARC_SIMPLE_DKIM=0.01 autolearn=no autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.5.0] Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 29 Mar 2021 09:03:08 +0000 (UTC) Received: by mail-pl1-x633.google.com with SMTP id t20so4083001plr.13 for ; Mon, 29 Mar 2021 02:03:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ykJ20mV45avKOI6cBtutBcJtmsM8oH1SKKsug6Or0AM=; b=QXcO5QnnAgn2+G1CG0QwyMPVSv1kGK2l8S3/8tu3EvSHkHlSnn6zyfpGnqg1LYClzJ yA4Beu707uksZA6NzJM7iJvzxHB145ZD8hKClcnMsvzc+yNNjUPUak4KAwVHPEyP2Nn3 gadHWhs5UMcCncjyGK9BT9WdoA4fm1+lWi2HMOfCm8UFwMXWKvBx+jfxxQGrzcUx0n2f w3nqXrfNIrk5O8G9qZ0377x4SljzYbXEVxCdrkSWcI3Ri4As7FLAjnUyZwbXwP3GXnPQ FdcggO9SDVBGi+7XnQJqp4yEzKfDqBn3ucj7Bss3YJ/IwVwJfPfyNG17yFwXrWjslRo3 e2ow== X-Gm-Message-State: AOAM530uu+ePNKSbOK2f20GjtzXukh8pa2EtacfQUGhJ33LUGiOHs5fu kxCwPCew9bdQdfD/+JYbx1CIiic135k= X-Google-Smtp-Source: ABdhPJxplikpK1JwnCePNwWmOnJjXney8oiYD9qgIE6SLS/7CW2GMsfoPXwX0VpZxkCg7/TiNr/gGA== X-Received: by 2002:a17:90b:4c0a:: with SMTP id na10mr26731247pjb.227.1617008586773; Mon, 29 Mar 2021 02:03:06 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h68sm16122545pfe.111.2021.03.29.02.03.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 02:03:06 -0700 (PDT) To: pacman-contrib@lists.archlinux.org Subject: [PATCH 4/4] pacdiff: Don't use $SUDO on temporary files Date: Mon, 29 Mar 2021 02:02:43 -0700 Message-Id: <32bb4a1978c52eb0bbc1a984f8ea9f9e9eccd1a4.1617008556.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Denton Liu via pacman-contrib From: Denton Liu Reply-To: Discussion list for pacman-contrib development Cc: Denton Liu Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=LL50XJEx; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 5.9.250.164 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: EBF484B8C31 X-Spamd-Result: default: False [3.79 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:5.9.250.164:c]; R_MISSING_CHARSET(2.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; SUBJECT_HAS_CURRENCY(1.00)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:5.9.0.0/16, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org From: Denton Liu via pacman-contrib In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), pacdiff was taught to accept -s to run various commands with $SUDO. This introduced many instances of $SUDO in merge_file() where most of them are unnecessary. In particular, it is not necessary to $SUDO to write the temporary files as /tmp should be writable by all. Also, remove the usage of sudoedit when comparing the original file with the merge result. This is because the merged file is placed in a writable directory. Attempting to run sudoedit on this file results in the following error: sudoedit: : editing files in a writable directory is not permitted but root permissions are not really required since users should not write to the original file anyway. The merged file will be used to overwrite the original file at the end of the function anyway. Remove these unnecessary usages of $SUDO. Signed-off-by: Denton Liu --- src/pacdiff.sh.in | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index fe66a6e..3c34fdb 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -117,20 +117,16 @@ merge_file() { fi basename="$(basename "$file")" - tempdir="$($SUDO mktemp -d --tmpdir "pacdiff-merge-$basename.XXX")" - base="$($SUDO mktemp "$tempdir"/"$basename.base.XXX")" - merged="$($SUDO mktemp "$tempdir"/"$basename.merged.XXX")" + tempdir="$(mktemp -d --tmpdir "pacdiff-merge-$basename.XXX")" + base="$(mktemp "$tempdir"/"$basename.base.XXX")" + merged="$(mktemp "$tempdir"/"$basename.merged.XXX")" - tar -xOf "$base_tar" "${file#/}" | $SUDO tee "$base" > /dev/null - if $SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null; then + tar -xOf "$base_tar" "${file#/}" >"$base" + if $mergeprog "$file" "$base" "$pacfile" >"$merged"; then msg2 "Merged without conflicts." fi - if [[ -n "$SUDO" ]]; then - SUDO_EDITOR="$diffprog" sudoedit "$file" "$merged" - else - $diffprog "$file" "$merged" - fi + $diffprog "$file" "$merged" while :; do ask "Would you like to use the results of the merge? [y/n] "