From patchwork Sat Mar 12 22:52:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2048 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.28) for (single-drop); Sat, 12 Mar 2022 22:53:52 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id CIDwMX8kLWLT6AIAK+/4rw (envelope-from ) for ; Sat, 12 Mar 2022 22:53:51 +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 01A50DE390E; Sat, 12 Mar 2022 22:53:51 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id DA6A2DD96C1; Sat, 12 Mar 2022 22:53:50 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lists.archlinux.org (Postfix) with ESMTPS id 3D4D5DD96BA for ; Sat, 12 Mar 2022 22:53:49 +0000 (UTC) Received: by mail-pj1-x1029.google.com with SMTP id b8so11221998pjb.4 for ; Sat, 12 Mar 2022 14:53:49 -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=2OxS1bNkXNNb/zIF3swKauUrCqic1vEZIfEaUqxjEuo=; b=awtwangYo7sMUd8FGO17zRe1v6mZFj3a66fzj+FApwQHLTccbYDnir5E12B3hnWlLG 7trSD7RWK9fnntECO7KVnBxGUl3r648rl/iDjoN2ueakLauEj31/6r2rRGfcDWs0N72a TBhi+co6LioD0mw67Q/NLAuktb733g1VJ+bzmPM/H2DZQgUsz4SLBxEJnY0XEKfhGB+H 7odSpVdIYJ5R1oXAtW9Z82rjLYwFHrgfP+LcS9T+3mgGdbeRIDN54vfUAC+qoIeUOEi4 dURYTdyROBGFVAKWzjCrvxwQiTHLT+13usg6G05gvwbEyLcInkNP1mx65La6g1Z7zLui 60ZQ== 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=2OxS1bNkXNNb/zIF3swKauUrCqic1vEZIfEaUqxjEuo=; b=JswXyX8XliSLHmfdoUfCQufgA9RtlWYjSl8Ynkc/AtwzTVnfduqvo9OKTVWTcdB2wm 2PZcGyoUIfDhlsrF0pLsCLcFUWnHDkDGYjy0Fqym0Kjq8e3Tcfd8YUYoLrXqBJeDHu29 vNwNn8DvlqZrU2ZsToodbygXwUxiNSyHUKn4Kq0vUSGJMCta9TCAnPqe1TdDSO3JmKCJ f3GUmhdXIHvEN3Hi/zAq4dibAttlGuzBJX46BJ7G4QmSfTYvmimU4AJXhjDh+IAE2aj4 WVhAt0rlRwt+2x7P9qBurIIcKj+P0GBaDVUruJWv0dfYRw6+zgZRLieZod1BnIbEz43P dohw== X-Gm-Message-State: AOAM53239302eTQm0dyxCNAJFytDo9ppwYhrwYwtBSmIcz7R/+htQGda KYU0N6KQa71W1TKvmMH0SyUB1UStVkg= X-Google-Smtp-Source: ABdhPJwFlqd+hBl0S1vAM6h28BTsN6unuXhfSZIXRSnCehZvXSUO42muxBHunDBMQmlL2f8or+o9oA== X-Received: by 2002:a17:902:8c81:b0:153:e42:670b with SMTP id t1-20020a1709028c8100b001530e42670bmr16961172plo.148.1647125626811; Sat, 12 Mar 2022 14:53:46 -0800 (PST) Received: from localhost.localdomain ([98.47.65.14]) by smtp.gmail.com with ESMTPSA id k11-20020a056a00134b00b004f7bc05c676sm694417pfu.197.2022.03.12.14.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 14:53:46 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH v2 1/3] add extended data field for arbitrary package data Date: Sat, 12 Mar 2022 14:52:51 -0800 Message-Id: <20220312225253.205609-2-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220312225253.205609-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> <20220312225253.205609-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" X-Spamd-Result: default: False [-1.41 / 15.00]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; R_MISSING_CHARSET(0.50)[]; MAILLIST(-0.20)[mailman]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; TAGGED_RCPT(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; 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::1029:received]; 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)[] Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=awtwangY; 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: 01A50DE390E X-Rspamd-Server: mail.archlinux.org This adds a mechanism for package builders to add arbitrary data to packages that is not necessarily relevant enough 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. Extended data is stored in "name=value" format in the xdata field (%XDATA% in desc files): xdata = pkgtype=debug or %XDATA% pkgtype=debug Signed-off-by: Andrew Gregory --- lib/libalpm/alpm.h | 7 +++++++ lib/libalpm/be_local.c | 28 ++++++++++++++++++++++++++++ lib/libalpm/be_package.c | 6 ++++++ lib/libalpm/be_sync.c | 12 ++++++++++++ lib/libalpm/package.c | 35 +++++++++++++++++++++++++++++++++++ lib/libalpm/package.h | 7 +++++++ 6 files changed, 95 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index cdf71fdc9..3304ae77a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2291,6 +2291,13 @@ typedef enum _alpm_pkgvalidation_t { ALPM_PKG_VALIDATION_SIGNATURE = (1 << 3) } alpm_pkgvalidation_t; +typedef struct _alpm_pkg_xdata_t { + char *name; + char *value; +} alpm_pkg_xdata_t; + +alpm_list_t *alpm_pkg_get_xdata(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 87fecbe52..e117b69df 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -195,6 +195,12 @@ static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg) return pkg->backup; } +static alpm_list_t *_cache_get_xdata(alpm_pkg_t *pkg) +{ + LAZY_LOAD(INFRQ_DESC); + return pkg->xdata; +} + /** * Open a package changelog for reading. Similar to fopen in functionality, * except that the returned 'file stream' is from the database. @@ -349,6 +355,7 @@ static const struct pkg_operations local_pkg_ops = { .get_replaces = _cache_get_replaces, .get_files = _cache_get_files, .get_backup = _cache_get_backup, + .get_xdata = _cache_get_xdata, .changelog_open = _cache_changelog_open, .changelog_read = _cache_changelog_read, @@ -804,6 +811,18 @@ 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, "%XDATA%") == 0) { + alpm_list_t *i, *lines = NULL; + READ_AND_STORE_ALL(lines); + for(i = lines; i; i = i->next) { + alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(i->data); + if(pd == NULL || !alpm_list_append(&info->xdata, pd)) { + _alpm_pkg_xdata_free(pd); + FREELIST(lines); + goto error; + } + } + FREELIST(lines); } } fclose(fp); @@ -1040,6 +1059,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("%XDATA%\n", fp); + for(lp = info->xdata; lp; lp = lp->next) { + alpm_pkg_xdata_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 203c98c13..b4f3f1c26 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(strcmp(key, "xdata") == 0) { + alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(ptr); + if(pd == NULL || !alpm_list_append(&newpkg->xdata, pd)) { + _alpm_pkg_xdata_free(pd); + return -1; + } } 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 8c8e01a0c..81676be96 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -666,6 +666,18 @@ 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) { + alpm_list_t *i, *lines = NULL; + READ_AND_STORE_ALL(lines); + for(i = lines; i; i = i->next) { + alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(i->data); + if(pd == NULL || !alpm_list_append(&pkg->xdata, pd)) { + _alpm_pkg_xdata_free(pd); + FREELIST(lines); + goto error; + } + } + FREELIST(lines); } } if(ret != ARCHIVE_EOF) { diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4d89dcd8a..8c95dab3e 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_xdata(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_xdata = _pkg_get_xdata, .changelog_open = _pkg_changelog_open, .changelog_read = _pkg_changelog_read, @@ -485,6 +487,13 @@ int SYMEXPORT alpm_pkg_has_scriptlet(alpm_pkg_t *pkg) return pkg->ops->has_scriptlet(pkg); } +alpm_list_t SYMEXPORT *alpm_pkg_get_xdata(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_xdata(pkg); +} + static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs, int optional) { @@ -677,6 +686,30 @@ static void free_deplist(alpm_list_t *deps) alpm_list_free(deps); } +alpm_pkg_xdata_t *_alpm_pkg_parse_xdata(const char *string) +{ + alpm_pkg_xdata_t *pd; + const char *sep; + if(string == NULL || (sep = strchr(string, '=')) == NULL) { + return NULL; + } + + CALLOC(pd, 1, sizeof(alpm_pkg_xdata_t), return NULL); + STRNDUP(pd->name, string, sep - string, FREE(pd); return NULL); + STRDUP(pd->value, sep + 1, FREE(pd->name); FREE(pd); return NULL); + + return pd; +} + +void _alpm_pkg_xdata_free(alpm_pkg_xdata_t *pd) +{ + if(pd) { + free(pd->name); + free(pd->value); + free(pd); + } +} + void _alpm_pkg_free(alpm_pkg_t *pkg) { if(pkg == NULL) { @@ -707,6 +740,8 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) } alpm_list_free_inner(pkg->backup, (alpm_list_fn_free)_alpm_backup_free); alpm_list_free(pkg->backup); + alpm_list_free_inner(pkg->xdata, (alpm_list_fn_free)_alpm_pkg_xdata_free); + alpm_list_free(pkg->xdata); free_deplist(pkg->depends); free_deplist(pkg->optdepends); free_deplist(pkg->checkdepends); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 935225300..5ebe6bd12 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_xdata) (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,7 @@ 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); +alpm_pkg_xdata_t *_alpm_pkg_parse_xdata(const char *string); +void _alpm_pkg_xdata_free(alpm_pkg_xdata_t *pd); + #endif /* ALPM_PACKAGE_H */