From patchwork Sun Feb 6 18:30:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2020 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.26) for (single-drop); Sun, 06 Feb 2022 18:31:24 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id mYKPJ/sTAGL5VwQAK+/4rw (envelope-from ) for ; Sun, 06 Feb 2022 18:31:23 +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 B38AECD670E; Sun, 6 Feb 2022 18:31:22 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 2D0D3C9E0BE; Sun, 6 Feb 2022 18:31:20 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lists.archlinux.org (Postfix) with ESMTPS id 64FE2C9E08C for ; Sun, 6 Feb 2022 18:31:16 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id k17so9588514plk.0 for ; Sun, 06 Feb 2022 10:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8DJx7SjCcjUkfLz1ooYncjdxl8hWY5jC9g/uELgOlII=; b=oR0IYbnoCh0ogX80p0B1/Fn3qqK+85WifcuBCR9btG7fMitFmZmi+7gLMqY0LajfM5 Rh5w7Y9ggUhoP+rOnNNdbn+T7caoSCeSwnUPGStIWTOtEkQfRSeFwow6jllTLKpyDk7v U3aP8gfVIXs4ZZkAduep8k9LJZubjwM487CQykPRDJl4xlKQVZ0Qy9rdUXbjplpUp9B/ q2ANn2rHKNSUVNmVAHXU0WPgf7O2VnALRldt56Rs/GwhFzC4V9Qqu2195gQ9qLszucBt KWxkOGIbNnL45bXCslNaG5Q1seD8yNgKKqI1mMLRXlUABLq3etS+nnhYlxk0fjZMuMOQ Opww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8DJx7SjCcjUkfLz1ooYncjdxl8hWY5jC9g/uELgOlII=; b=NbTqRvgxTK/V01h/a0N1G0lxlHWDjyBq/fU1Hx083rjnl+Z8MTCVOVQgBpnVFw/GK9 JcgY4EM1yZLm3LP23gqqeZJu0EmDzf9WaW/4/vLUpIjfOGnV+wjrdpx93/dl16TW8o4N NY7HNNYF9MvIL13SXkrPZrvsQl5K1IW0nS0O+99u9NeJ0b2SM2ABPi/qBz5YPOsS7msY kyEI5bjltMLDEqq9+FwFGqqO/kore6XlBdQSi3+MzhlVGOd/GL/yXdHu9e1aI2u9KAW8 eSzyz6oFwbYdfEEQQd690pgC5EHeEp8e73s4NUJwBcSop9X7FLPSX3ic2Vl1rdQE8f/v R0mg== X-Gm-Message-State: AOAM533Bvy17yCzB7j/9q26/hEUg7LCITEuloQLazzHfwXsNNrznBTmf tpSky5OMVPrNx3IqfW2Y4efquBxFX+U= X-Google-Smtp-Source: ABdhPJw6a6lsCM9jBnRao6yRxM9W2izid0lcekXIvRjVAuuFMVdJtLJSyOB2xa4qx9XyPdu1eGMImw== X-Received: by 2002:a17:90b:3511:: with SMTP id ls17mr14389622pjb.241.1644172274296; Sun, 06 Feb 2022 10:31:14 -0800 (PST) Received: from localhost.localdomain ([98.47.179.215]) by smtp.gmail.com with ESMTPSA id 14sm4189163pgk.85.2022.02.06.10.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:31:13 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH 1/5] query: only strip leading local/ for db packages Date: Sun, 6 Feb 2022 10:30:37 -0800 Message-Id: <20220206183041.104788-2-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220206183041.104788-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=oR0IYbno; dmarc=pass (policy=none) header.from=gmail.com; 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: B38AECD670E X-Spamd-Result: default: False [-1.41 / 15.00]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; TAGGED_RCPT(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; BLOCKLISTDE_FAIL(0.00)[98.47.179.215:server fail,2607:f8b0:4864:20::62a:server fail]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::62a:received]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gmail.com]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Signed-off-by: Andrew Gregory --- src/pacman/query.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0208d5b6..afcbbd4f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -468,11 +468,6 @@ int pacman_query(alpm_list_t *targets) for(i = targets; i; i = alpm_list_next(i)) { const char *strname = i->data; - /* strip leading part of "local/pkgname" */ - if(strncmp(strname, LOCAL_PREFIX, strlen(LOCAL_PREFIX)) == 0) { - strname += strlen(LOCAL_PREFIX); - } - if(config->op_q_isfile) { alpm_pkg_load(config->handle, strname, 1, 0, &pkg); @@ -482,6 +477,11 @@ int pacman_query(alpm_list_t *targets) alpm_strerror(alpm_errno(config->handle))); } } else { + /* strip leading part of "local/pkgname" */ + if(strncmp(strname, LOCAL_PREFIX, strlen(LOCAL_PREFIX)) == 0) { + strname += strlen(LOCAL_PREFIX); + } + pkg = alpm_db_get_pkg(db_local, strname); if(pkg == NULL) { pkg = alpm_find_satisfier(alpm_db_get_pkgcache(db_local), strname); From patchwork Sun Feb 6 18:30:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2021 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.26) for (single-drop); Sun, 06 Feb 2022 18:31:29 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id sKjCGwAUAGK/VwQAK+/4rw (envelope-from ) for ; Sun, 06 Feb 2022 18:31:28 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::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 mail.archlinux.org (Postfix) with ESMTPS id 1F893CD672D; Sun, 6 Feb 2022 18:31:27 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 78F0FC9E0CB; Sun, 6 Feb 2022 18:31:21 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lists.archlinux.org (Postfix) with ESMTPS id E2CE1C9E08D for ; Sun, 6 Feb 2022 18:31:17 +0000 (UTC) Received: by mail-pl1-x633.google.com with SMTP id x4so1955320plb.4 for ; Sun, 06 Feb 2022 10:31:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AreHmD+DrtwveFErdLTSvYb1S3ZvCk6QAIA8oA5IeWQ=; b=oYLN++4isUSk40y+4ZFnMvEIhAGjCnZBMkxePAjSyqWGkXtdFhCGgNizmmT3tqPSh6 J+sQwcP3IXKN16jLGWkrCMldhTC8Pl85m5XOWDnrnXeKQvTKNH5VJvV6J9gprPkCqecz uiDuR/E/xf8WckzS6r19HR98LIx0nBft4DQP1meiLX6r08C4k19sdiIxXZVy8xzxxVy5 liZnsYJhqvyzhUiY+D0NADWUV2hkoF/i8pHqQqBPCUX6LNUMrLbO7fisUyk9Hx81h0xS evlS4kbVa0BROiZxBa8dzpGKzmc3ozjsQ4eeIbx6TfN4t6FbqPUG0nU/qrmP53p0XJfV 6M2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AreHmD+DrtwveFErdLTSvYb1S3ZvCk6QAIA8oA5IeWQ=; b=eqHaEe8CSAwxY6YpkOdPwfH+Y43EJcylakZF+4TT5EyV94HQFZX3u5HiiD8AA1QaP7 azhoxz61Q4Kr8SZvIUDwQa5oRtdOqvyWLysQPEf+0eo6SAvCdaZxcryrPA+dOkuK9Bvn suEun5MO+2c+aSSnBsaPVCZn9reWTwWz8+dJ8DbwlI6QLydalqSDJSNHpyVhP2eT5wrB I/UblPbNm2iKNmGEzs3FUV+uO9MYVoSOTaVLy/V0PasKghzaUyjSssQcPX4rD72zTXOG 6DqVnhBuE3Q8am5OJaqt/bsvRRWYIXdl1TISXzkrsOmNHBg7kOGbzxl4OXgESjlmi3Dh 53vg== X-Gm-Message-State: AOAM5315L5D58GOvngajyYYJMKhZwg0cEQt27fdE8lkEB9KvwcbAN1Dg MbmnyybAJR1trp5073VqjHl3qVtDxZ4= X-Google-Smtp-Source: ABdhPJzUB33F8yc2anRkG1ZtDYd0wOaqTEJX2Y7CHBy5pLbUvvIDe+gfztKKMhyFp5LPt6eqe3mOag== X-Received: by 2002:a17:903:1cd:: with SMTP id e13mr12856871plh.158.1644172275805; Sun, 06 Feb 2022 10:31:15 -0800 (PST) Received: from localhost.localdomain ([98.47.179.215]) by smtp.gmail.com with ESMTPSA id 14sm4189163pgk.85.2022.02.06.10.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:31:15 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH 2/5] query: allow querying extra info for package files Date: Sun, 6 Feb 2022 10:30:38 -0800 Message-Id: <20220206183041.104788-3-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220206183041.104788-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=oYLN++4i; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 1F893CD672D X-Spamd-Result: default: False [-1.41 / 15.00]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; RCVD_IN_DNSWL_MED(-0.20)[2a01:4f9:c010:9eb4::1:from]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; TAGGED_RCPT(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; BLOCKLISTDE_FAIL(0.00)[98.47.179.215:server fail,2607:f8b0:4864:20::633:server fail,2a01:4f9:c010:9eb4::1:server fail]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::633:received]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gmail.com]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Signed-off-by: Andrew Gregory --- src/pacman/query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index afcbbd4f..d75c4c80 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -306,11 +306,7 @@ static int display(alpm_pkg_t *pkg) int ret = 0; if(config->op_q_info) { - if(config->op_q_isfile) { - dump_pkg_full(pkg, 0); - } else { - dump_pkg_full(pkg, config->op_q_info > 1); - } + dump_pkg_full(pkg, config->op_q_info > 1); } if(config->op_q_list) { dump_pkg_files(pkg, config->quiet); From patchwork Sun Feb 6 18:30:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2022 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.26) for (single-drop); Sun, 06 Feb 2022 18:31:33 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id MC3WCAUUAGL5VwQAK+/4rw (envelope-from ) for ; Sun, 06 Feb 2022 18:31:33 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::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 mail.archlinux.org (Postfix) with ESMTPS id 6925ACD675D; Sun, 6 Feb 2022 18:31:32 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id C60D2C9E0D2; Sun, 6 Feb 2022 18:31:21 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lists.archlinux.org (Postfix) with ESMTPS id 55980C9E09A for ; Sun, 6 Feb 2022 18:31:19 +0000 (UTC) Received: by mail-pf1-x434.google.com with SMTP id b1so1063638pfi.9 for ; Sun, 06 Feb 2022 10:31:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjeAfKDCo/x/Ulkq9kKXECMlWbhYGsmAPPHLsqy+qCk=; b=jFNb5wKZ3lf+yPzpi00eyabE+W0z/Tp3H35AE2ilf1nJBECFH9BhcEm/+BdwI3Vz0A eRVZ8LZ5ZnhZiypc12MnaVTK+ZaCnoCyTv4v+U0dQxj4eK8aMhKi3Il1dQITz5vEvpji 91n9dMvuPFxdp21lz2RkXtjHMrwXSmZAFXkXRn763wXJn88pOHt3nSj5xN2+YuC0RQsK LtZgzNtY+OR3Qrz2lMwMHToyq4QmhxbVDMcGbmVOLvYQrWl/FoJlzNgysUlFKgKyNArX /U4D+yFfB/a2qRG5rXq9YBqmuhtDWHR/+tf+kLs33GZu6MHyPug1pjF6OJ3DTR2HKYYJ bz/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gjeAfKDCo/x/Ulkq9kKXECMlWbhYGsmAPPHLsqy+qCk=; b=Zx+HK/2R5hQLiNor3hM2fYq7vGwkWoWlG/282cxyvs4FAbL0+AvVuEnWZ5oU2KYy8V uFXQxrrg9m2TtR6vq7RfyFsd+cbQjtHEMyB/hOFPCXuoegrKURptpHDQnDxj2JgOVUOU WjrN4K1QJxdxicgKu150Ss94DTGLvZBui/pvF7gTj6U6+0bPyJpvnwRQ0tIezA/RCalY 0qPiWDE8/1/WAHGboaqXweJ7QXtgrh+tbk/Ldz8liDcQXoNa0paglxa39iWSUg0+HWvG hz95FijeWeHSDOkOClq7bt3aJbTtThmwqvnNug9kEnPVIBaLvEauiiUf73mxoLZUQRok n1GQ== X-Gm-Message-State: AOAM533310JQ1vM98Df/Nt1NTVBSRoXKVrQsWt/0R1YQUf2+BWTdlO7O O/7JmdAvKkzI80FujnOhtvj4OP7KZ5U= X-Google-Smtp-Source: ABdhPJxhL+nMvVv7IPH0AgFSdvjoJR3VkfIMxUHCFm0UBKKooXaia4jMUoDTggL4Ta/aAsaVpLbU7Q== X-Received: by 2002:a05:6a00:228e:: with SMTP id f14mr12645045pfe.33.1644172276966; Sun, 06 Feb 2022 10:31:16 -0800 (PST) Received: from localhost.localdomain ([98.47.179.215]) by smtp.gmail.com with ESMTPSA id 14sm4189163pgk.85.2022.02.06.10.31.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:31:16 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH 3/5] add data field for arbitrary package data Date: Sun, 6 Feb 2022 10:30:39 -0800 Message-Id: <20220206183041.104788-4-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220206183041.104788-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=jFNb5wKZ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 6925ACD675D X-Spamd-Result: default: False [-1.41 / 15.00]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; RCVD_IN_DNSWL_MED(-0.20)[2a01:4f9:c010:9eb4::1:from]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; TAGGED_RCPT(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; BLOCKLISTDE_FAIL(0.00)[2a01:4f9:c010:9eb4::1:server fail,98.47.179.215:server fail,2607:f8b0:4864:20::434:server fail]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::434:received]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gmail.com]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org This adds a mechanism for package builders to add arbitrary data to packages that is not necessarily relevant to the package installation process to gain first-class support in alpm. Currently these fields have to be added to parsers with a "not actually used" comment and can't be retrieved through the API. In ini format these are represented by prefixing the field name with "data-" similar to HTML5 data attributes. In db format they are put into a "%DATA%" section in the format " ". Signed-off-by: Andrew Gregory --- lib/libalpm/alpm.h | 7 +++++++ lib/libalpm/be_local.c | 25 +++++++++++++++++++++++++ lib/libalpm/be_package.c | 6 ++++++ lib/libalpm/be_sync.c | 16 ++++++++++++++++ lib/libalpm/package.c | 17 +++++++++++++++++ lib/libalpm/package.h | 6 ++++++ 6 files changed, 77 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 50b5e3d2..b1c6262e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2285,6 +2285,13 @@ typedef enum _alpm_pkgvalidation_t { ALPM_PKG_VALIDATION_SIGNATURE = (1 << 3) } alpm_pkgvalidation_t; +typedef struct _alpm_pkg_data_t { + char *name; + char *value; +} alpm_pkg_data_t; + +alpm_list_t *alpm_pkg_get_data(alpm_pkg_t *pkg); + /** Create a package from a file. * If full is false, the archive is read only until all necessary * metadata is found. If it is true, the entire archive is read, which diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 87fecbe5..74745a98 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -804,6 +804,22 @@ static int local_db_read(alpm_pkg_t *info, int inforeq) READ_AND_SPLITDEP(info->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { READ_AND_SPLITDEP(info->provides); + } else if(strcmp(line, "%DATA%") == 0) { + while(1) { + alpm_pkg_data_t *pd; + char *sep; + READ_NEXT(); + if(line[0] == '\0') { + break; + } + if((sep = strchr(line, ' ')) == NULL) { + goto error; + } + CALLOC(pd, 1, sizeof(alpm_pkg_data_t), goto error); + STRNDUP(pd->name, line, sep - line, _alpm_pkg_data_free(pd); goto error); + STRDUP(pd->value, sep, _alpm_pkg_data_free(pd); goto error); + info->xdata = alpm_list_add(info->xdata, pd); + } } } fclose(fp); @@ -1040,6 +1056,15 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, int inforeq) write_deps(fp, "%CONFLICTS%", info->conflicts); write_deps(fp, "%PROVIDES%", info->provides); + if(info->xdata) { + fputs("%DATA%\n", fp); + for(lp = info->xdata; lp; lp = lp->next) { + alpm_pkg_data_t *pd = lp->data; + fprintf(fp, "%s %s\n", pd->name, pd->value); + } + fputc('\n', fp); + } + fclose(fp); fp = NULL; } diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index e837ffb8..1fef308d 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -246,6 +246,12 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * newpkg->backup = alpm_list_add(newpkg->backup, backup); } else if(strcmp(key, "pkgtype") == 0) { /* not used atm */ + } else if(strncmp(key, "data-", 5) == 0 && key[5] != '\0') { + alpm_pkg_data_t *pd; + CALLOC(pd, 1, sizeof(alpm_pkg_data_t), return -1); + STRDUP(pd->name, key + 5, _alpm_pkg_data_free(pd); return -1); + STRDUP(pd->value, ptr, _alpm_pkg_data_free(pd); return -1); + newpkg->xdata = alpm_list_add(newpkg->xdata, pd); } else { _alpm_log(handle, ALPM_LOG_DEBUG, "%s: unknown key '%s' in description file line %d\n", newpkg->name ? newpkg->name : "error", key, linenum); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 8c8e01a0..9566294a 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -666,6 +666,22 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, pkg->files.count = files_count; pkg->files.files = files; _alpm_filelist_sort(&pkg->files); + } else if(strcmp(line, "%DATA%") == 0) { + while(1) { + alpm_pkg_data_t *pd; + char *sep; + READ_NEXT(); + if(line[0] == '\0') { + break; + } + if((sep = strchr(line, ' ')) == NULL) { + goto error; + } + CALLOC(pd, 1, sizeof(alpm_pkg_data_t), goto error); + STRNDUP(pd->name, line, sep - line, FREE(pd); goto error); + STRDUP(pd->value, sep, FREE(pd->name); FREE(pd); goto error); + pkg->xdata = alpm_list_add(pkg->xdata, pd); + } } } if(ret != ARCHIVE_EOF) { diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index e79d7d65..c7b7f745 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -98,6 +98,7 @@ static alpm_list_t *_pkg_get_provides(alpm_pkg_t *pkg) { return pkg->provides; static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg) { return pkg->replaces; } static alpm_filelist_t *_pkg_get_files(alpm_pkg_t *pkg) { return &(pkg->files); } static alpm_list_t *_pkg_get_backup(alpm_pkg_t *pkg) { return pkg->backup; } +static alpm_list_t *_pkg_get_data(alpm_pkg_t *pkg) { return pkg->xdata; } static void *_pkg_changelog_open(alpm_pkg_t UNUSED *pkg) { @@ -162,6 +163,7 @@ const struct pkg_operations default_pkg_ops = { .get_replaces = _pkg_get_replaces, .get_files = _pkg_get_files, .get_backup = _pkg_get_backup, + .get_data = _pkg_get_data, .changelog_open = _pkg_changelog_open, .changelog_read = _pkg_changelog_read, @@ -479,6 +481,13 @@ int SYMEXPORT alpm_pkg_has_scriptlet(alpm_pkg_t *pkg) return pkg->ops->has_scriptlet(pkg); } +alpm_list_t SYMEXPORT *alpm_pkg_get_data(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_data(pkg); +} + static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs, int optional) { @@ -671,6 +680,14 @@ static void free_deplist(alpm_list_t *deps) alpm_list_free(deps); } +void _alpm_pkg_data_free(alpm_pkg_data_t *pd) { + if(pd) { + free(pd->name); + free(pd->value); + free(pd); + } +} + void _alpm_pkg_free(alpm_pkg_t *pkg) { if(pkg == NULL) { diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 93522530..05775077 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -67,6 +67,8 @@ struct pkg_operations { alpm_filelist_t *(*get_files) (alpm_pkg_t *); alpm_list_t *(*get_backup) (alpm_pkg_t *); + alpm_list_t *(*get_data) (alpm_pkg_t *); + void *(*changelog_open) (alpm_pkg_t *); size_t (*changelog_read) (void *, size_t, const alpm_pkg_t *, void *); int (*changelog_close) (const alpm_pkg_t *, void *); @@ -136,6 +138,8 @@ struct _alpm_pkg_t { alpm_pkgreason_t reason; int scriptlet; + alpm_list_t *xdata; + /* Bitfield from alpm_dbinfrq_t */ int infolevel; /* Bitfield from alpm_pkgvalidation_t */ @@ -158,4 +162,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); +void _alpm_pkg_data_free(alpm_pkg_data_t *pd); + #endif /* ALPM_PACKAGE_H */ From patchwork Sun Feb 6 18:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2023 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.26) for (single-drop); Sun, 06 Feb 2022 18:31:38 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id mNkSAwoUAGLEVwQAK+/4rw (envelope-from ) for ; Sun, 06 Feb 2022 18:31:38 +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 5E710CD6778; Sun, 6 Feb 2022 18:31:37 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 22B0DC9E108; Sun, 6 Feb 2022 18:31:25 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lists.archlinux.org (Postfix) with ESMTPS id 5CE69C9E0C1 for ; Sun, 6 Feb 2022 18:31:20 +0000 (UTC) Received: by mail-pj1-x102f.google.com with SMTP id v13-20020a17090ac90d00b001b87bc106bdso4269152pjt.4 for ; Sun, 06 Feb 2022 10:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+cTSuEW00KpLsd2ntc8HsfmfzOhPxL7dTp08mT5i7rw=; b=OWRsNwB8Zh8Fs684Tzdvv6zTNICzqZDkVsOWyCZyT6ql7vwYr5AjgsTCWd39PQKsP8 hwnQMtFWdITLmPNQQIZeuIwYWrmZ+Bl2DSAPdOZ9jY0a9sVMCmKJq2uS5YRK9vKI+ylr TbCHkN9hev0jyJ02w0qI2bybza6jMh4iLSBkmJK2HtH1gmTv1Lk3rhbyPYsUpH24izOW k4Z4HbSk0eG6BSYRWSOAWfUlRqxXAP9i4+noPKI+YxvHECpTb5ZFJu2+f9ma6s6UBgXy D4njRwP3S9kLZ8W41A/XJCQ6w58DtJXujji14yCJsDIXs13oCkpzUeYU50NAYpOv1qfe eJLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+cTSuEW00KpLsd2ntc8HsfmfzOhPxL7dTp08mT5i7rw=; b=bG2ADR2D324isAgTsF9ii9UtU3BZWPbOXx/154sGGKGp+C9F5nCeM7tcdHxNO/PUCD Ke96KRgpSw7APBlSnqwylfzZRY7Iag8EQxhaiXxR7pQxiH22jsvEXJ49N8FeJabT6P6l NhC/hlVp+ZjUkTYhA+oCTtBxiXXM0GY4yTwPHggjWJkI+aXJAmnTKFjtmU6AV6BhfBam WGK0SHjzB+7ND83OOAMqBxyC9awkj+JUXrAo4194m28m6y1BzOX52h/1UIDsFK1B0c4i sbaPje7UtOvzL2b98I1ahVYbrwFJ99FvG9ETb992oI7h8i4OAwZjl69gNtHeJX2dRaeU S6gQ== X-Gm-Message-State: AOAM531ONtcJDpt4Zsoeme/hJA98blX4R2Bk8Mprtid/sRsVChlWwGuM 3N4MzFB8En2bqN0VHJhG0N/1EuGRzB0= X-Google-Smtp-Source: ABdhPJxbVQhDNws4OyNT1IQm92nc8P3Gnlv6k4WV6VRlj6lYtzVaqVOorHoqK0u3D6gflSsNcke7ag== X-Received: by 2002:a17:903:230e:: with SMTP id d14mr13088328plh.4.1644172278283; Sun, 06 Feb 2022 10:31:18 -0800 (PST) Received: from localhost.localdomain ([98.47.179.215]) by smtp.gmail.com with ESMTPSA id 14sm4189163pgk.85.2022.02.06.10.31.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:31:17 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH 4/5] query: print extended data when extra info is requested Date: Sun, 6 Feb 2022 10:30:40 -0800 Message-Id: <20220206183041.104788-5-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220206183041.104788-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=OWRsNwB8; dmarc=pass (policy=none) header.from=gmail.com; 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: 5E710CD6778 X-Spamd-Result: default: False [-1.41 / 15.00]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; TAGGED_RCPT(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; BLOCKLISTDE_FAIL(0.00)[98.47.179.215:server fail,2607:f8b0:4864:20::102f:server fail]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102f:received]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gmail.com]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Signed-off-by: Andrew Gregory --- src/pacman/package.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pacman/package.c b/src/pacman/package.c index 61664f7d..886b7cac 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -351,6 +351,19 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) dump_pkg_backups(pkg, cols); } + if(extra) { + alpm_list_t *text = NULL, *pdata = alpm_pkg_get_data(pkg); + while(pdata) { + alpm_pkg_data_t *pd = pdata->data; + char *formatted = NULL; + pm_asprintf(&formatted, "%s: %s", pd->name, pd->value); + text = alpm_list_add(text, formatted); + pdata = pdata->next; + } + list_display_linebreak("Data :", text, cols); + FREELIST(text); + } + /* final newline to separate packages */ printf("\n"); From patchwork Sun Feb 6 18:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2024 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.26) for (single-drop); Sun, 06 Feb 2022 18:31:43 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id 8FzSAw8UAGLKVwQAK+/4rw (envelope-from ) for ; Sun, 06 Feb 2022 18:31:43 +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 A152ACD6793; Sun, 6 Feb 2022 18:31:41 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 6B312C9E10C; Sun, 6 Feb 2022 18:31:25 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lists.archlinux.org (Postfix) with ESMTPS id B63BDC9E0D0 for ; Sun, 6 Feb 2022 18:31:21 +0000 (UTC) Received: by mail-pf1-x42c.google.com with SMTP id 192so9786872pfz.3 for ; Sun, 06 Feb 2022 10:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T9lnqAeDV07SlvgyZ9wANFHntOEPNG6yG9D3fOLERIw=; b=ACGLPfykJeuzT5LHkeZEiQHP03yEJ87YznH2D5HN7EHWC5HrFo9iA3VrmUkeAtltio +YW9KLoK4Bj0MSFe7mYde03fSifOm/yIzo2ri4VamzRbZqRPFxMJVmhXhHwGz/Dzn+sy JFjq0mV8FGmwBTDab4cJGQC1aIlPzWUIVAevuC9HJ+M/nbD7XLeZ8ceCSRzek+MjcP74 EvLNr+AEJn8s1TWJBwNRFJIbGHf1qLJEuIW8e8Sh26lZha9wkZmIyyntcG19KmBE54k/ XNfBjEgPqN6afKkkVs2TmFB87kI8z293YhdtQXUfiHUvC5tmrLmPFjsKfxmKI+PUE/yX 8TeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T9lnqAeDV07SlvgyZ9wANFHntOEPNG6yG9D3fOLERIw=; b=2CSSWdK/cMY3uVdVvIxOvT6xuxuR9NifYJrfLlkuV6YtWktVzdU5K4ubx/ZrAbdEca BQbcuX/v/DWjwYOH4mLSf+iEPrv5QK8a7pP7APUZnYGVO6kA4vMjv9W0/anSbi+CjAoD LekpVO8UkNRVmhobWk7njrZt0UgIhpvxcKqy9O5UJmLCREFQ0D7EI3ROFgArdVIBUZWJ RFA3amuml7HrzJR6oAmaB3+TYgCJmi6ruyEOpNqt0fRS333xHDoN+hdQZoEo4ytdU6i8 8xaSxqzz/smrllazdwJaS+HYLRo98AvlMVELmDGNPVawRMzc9BsKjRAanWr3Mlt2+d6k ocbQ== X-Gm-Message-State: AOAM530+8TAnza+24mZJrOaRKT5okjo5Pk3cds8TKUQEkOlYwiJt7yxb 9xGEQAmJy3X4VG+jQQAetLIBvb359LM= X-Google-Smtp-Source: ABdhPJwMNPN9NqO+fB319keIMnVg3VepTPpCrDSbj8xpFBiM3i9/4qCHu3ehT22HzFi4zOpTxYZcZA== X-Received: by 2002:a62:1cc9:: with SMTP id c192mr12221566pfc.70.1644172279630; Sun, 06 Feb 2022 10:31:19 -0800 (PST) Received: from localhost.localdomain ([98.47.179.215]) by smtp.gmail.com with ESMTPSA id 14sm4189163pgk.85.2022.02.06.10.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:31:19 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH 5/5] makepkg: store package type in extended data Date: Sun, 6 Feb 2022 10:30:41 -0800 Message-Id: <20220206183041.104788-6-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220206183041.104788-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=ACGLPfyk; dmarc=pass (policy=none) header.from=gmail.com; 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: A152ACD6793 X-Spamd-Result: default: False [-1.41 / 15.00]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; TAGGED_RCPT(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; BLOCKLISTDE_FAIL(0.00)[98.47.179.215:server fail]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42c:received]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gmail.com]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Signed-off-by: Andrew Gregory --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5aaabf63..e2396237 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -487,7 +487,7 @@ write_pkginfo() { write_kv_pair "pkgname" "$pkgname" write_kv_pair "pkgbase" "$pkgbase" - write_kv_pair "pkgtype" "$pkgtype" + write_kv_pair "data-pkgtype" "$pkgtype" local fullver=$(get_full_version) write_kv_pair "pkgver" "$fullver"