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 */