- Pacman-dev - lists.archlinux.org

[pacman-dev] Version bounds for IgnorePkg
by Daniel Schoepe 08 Jul '15

08 Jul '15

Hi, A common situation for me is to ignore a specific known-to-be-buggy version of a package with a fix being available in the next upcoming version. I think it would be a good idea to allow ignoring a specific package version. The following patch implements this functionality. Since this is my first contribution to pacman / alpm, I'm not sure if I followed the coding style. A few notes on the implementation: - As discussed when I brought this up a while back, only equality constraints are supported, since the other types of bounds would have unclear semantics. - This is checked for by pacman and libalpm assumes that only such IgnorePkg entries are added. I'm not sure if this check should rather be handled by libalpm instead. - alpm_handle_t.ignorepkg is now a list of alpm_depend_t structures, not strings. This required some more widespread changes to avoid duplicating the code that handles assumeinstalled entries. Comments and suggestions are of course appreciated. Best regards, Daniel

3 9

[pacman-dev] [PATCH] libalpm: Force update when database is marked as corrupted.
by Sebastian Lackner 05 Jul '15

05 Jul '15

We are using a CDN to distribute our packages, and it happens from time to time that the *.db and *.db.sig files are out-of-sync. When the signature is updated before the database file, everything is fine. However, when the database is updated first, then libalpm will update the timestamp of the database, but leave it in a broken state (wrong PGP signature). A force-update is required to resolve this, which can be confusing for our users - this patch changes alpm_db_update to trigger an update automatically when the database is invalid. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- lib/libalpm/be_sync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ea979e6..68c5b43 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -196,6 +196,10 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) return -1; } + if(db->status & DB_STATUS_INVALID) { + force = 1; + } + /* make sure we have a sane umask */ oldmask = umask(0022); -- 2.4.5

2 2

[pacman-dev] [PATCH] Do not warn about packages optionally require a removal when ignoring deps
by Allan McRae 05 Jul '15

05 Jul '15

If a transaction is removing a package while ignoring all dependencies, there should not be any warning about other packages optionally requiring it. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a5840dc..bc5713a 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -261,7 +261,9 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) } /* Note packages being removed that are optdepends for installed packages */ - remove_notify_needed_optdepends(handle, trans->remove); + if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { + remove_notify_needed_optdepends(handle, trans->remove); + } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { event.type = ALPM_EVENT_CHECKDEPS_DONE; -- 2.4.5

1 0

[pacman-dev] [PATCH] Do not warn about downgrades when only downloading package
by Allan McRae 05 Jul '15

05 Jul '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index e608107..2684e94 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -90,7 +90,7 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), localpkgname, localpkgver); } - } else if(cmp < 0) { + } else if(cmp < 0 && !(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { /* local version is newer */ _alpm_log(handle, ALPM_LOG_WARNING, _("downgrading package %s (%s => %s)\n"), localpkgname, localpkgver, pkgver); -- 2.4.5

1 0

[pacman-dev] [PATCH] Return 17 if a package/group has been built.
by fbt 24 Jun '15

24 Jun '15

A specific exit code to distinguish failed builds and refusal to build because the package/group has already been built. Useful in autobuild scripts. Signed-off-by: Jack L. Frost <fbt(a)fleshless.org> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c74e84a..72cf714 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1613,7 +1613,7 @@ check_build_status() { exit 0 else error "$(gettext "A package has already been built. (use %s to overwrite)")" "-f" - exit 1 + exit 17 fi fi else @@ -1636,12 +1636,12 @@ check_build_status() { exit 0 else error "$(gettext "The package group has already been built. (use %s to overwrite)")" "-f" - exit 1 + exit 17 fi fi if (( somepkgbuilt && ! PKGVERFUNC )); then error "$(gettext "Part of the package group has already been built. (use %s to overwrite)")" "-f" - exit 1 + exit 17 fi fi unset allpkgbuilt somepkgbuilt -- 2.4.1

6 12

[pacman-dev] [PATCH 00/13] Files database operations
by Allan McRae 24 Jun '15

24 Jun '15

This patchset adds support for reading the .files database and performing the following: - downloading/updating the .files database - checking which package contains a file - searching for a file (including regex support) - listing all files from a package Allan McRae (13): Simplify sync_cleandb Fix formatting in parsearg_upgrade Add files option to handle libalpm: handle both .db and .files extensions Read file lists from files database Add pacman support for .files databases pacman: move database syncing to util.c Prototype pacman files database operations Implement locating file owner in sync files database Implement listing files from sync packages Implement searching for a file in the sync databases Add regex search option to sync database file searching Handle repo/pkg style arguments to sync repo file listing lib/libalpm/alpm.h | 3 + lib/libalpm/be_sync.c | 61 +++++++++-- lib/libalpm/db.c | 10 +- lib/libalpm/handle.c | 13 +++ lib/libalpm/handle.h | 1 + src/pacman/Makefile.am | 1 + src/pacman/callback.c | 2 +- src/pacman/conf.c | 4 + src/pacman/conf.h | 6 +- src/pacman/files.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/pacman.c | 88 +++++++++++++++- src/pacman/pacman.h | 2 + src/pacman/sync.c | 84 ++++----------- src/pacman/util.c | 33 ++++++ src/pacman/util.h | 1 + 15 files changed, 498 insertions(+), 82 deletions(-) create mode 100644 src/pacman/files.c -- 2.4.4

3 24

[pacman-dev] [PATCH 03/13] Add files option to handle
by Allan McRae 23 Jun '15

23 Jun '15

This option will be used to determine if the .files database should be used for reading sync information. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/handle.c | 13 +++++++++++++ lib/libalpm/handle.h | 1 + 3 files changed, 23 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 06e080b..a6cabc9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -155,6 +155,12 @@ typedef enum _alpm_pkgfrom_t { ALPM_PKG_FROM_SYNCDB } alpm_pkgfrom_t; +/** Database extension options */ +typedef enum _alpm_dbtype_t { + ALPM_DBTYPE_DB, + ALPM_DBTYPE_FILES +} alpm_dbtype_t; + /** Method used to validate a package. */ typedef enum _alpm_pkgvalidation_t { ALPM_PKG_VALIDATION_UNKNOWN = 0, @@ -859,6 +865,9 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +alpm_dbtype_t alpm_option_get_dbtype(alpm_handle_t *handle); +int alpm_option_set_dbtype(alpm_handle_t *handle, alpm_dbtype_t dbtype); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 4915d0b..df81f0d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -284,6 +284,12 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; } +alpm_dbtype_t SYMEXPORT alpm_option_get_dbtype(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->dbtype; +} + int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) { CHECK_HANDLE(handle, return -1); @@ -664,6 +670,13 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_dbtype(alpm_handle_t *handle, alpm_dbtype_t dbtype) +{ + CHECK_HANDLE(handle, return -1); + handle->dbtype = dbtype; + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5893139..7fd470e 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -95,6 +95,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + alpm_dbtype_t dbtype; /* Set the database type (extension) */ alpm_siglevel_t siglevel; /* Default signature verification level */ alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file upgrade operations */ -- 2.4.4

1 1

[pacman-dev] Warning message jargon inconsistent with man page
by m.scott.stewart＠gmail.com 22 Jun '15

22 Jun '15

When attempting to install a package via pacman, I received a few warnings like: warning: database file for 'community' does not exist After looking through the man page, it wasn’t apparent what this meant. After googling, it appears this means I need to run: pacman -Syy. The man page says that -y updates the “master package list” from the server, so I’m guessing “database file” is a synonym for “package list”. Could the wording be brought in sync, such that one can understand the error in terms of the man file? As in, either change the warning to say something like “warning: package list for ‘community’ has not been downloaded”, or update the man file to use the “database file” terminology. Matt

2 1

[pacman-dev] libalpm fails on a filesystem with a large blocksize
by Astro Xe 13 Jun '15

13 Jun '15

Hello, ''pacman --debug --root dir -S util-linux'' fails on a 2 GB NFS (1,9 GB free): "Partition /root/dir too full: 12385 blocks needed, 3802 blocks free" statvfs() reports f_bsize = 524288, f_bfree = 3855, so the "blocks free" estimate is correct, taking the cushion into account. A little debugging shows that the "blocks needed" overestimate comes from calculate_installed_size @ lib/libalpm/diskspace.c which, basically, rounds every file's size up to a multiple of the block size. In my case, having a huge block size, it is indeed summing 1 block per file. Is it possible to work around this problem, and how? Thanks

3 3

[pacman-dev] [PATCH 1/2] repo-add: Generate unarmored DB signature
by Johannes Löthberg 13 Jun '15

13 Jun '15

Pacman cannot handle armored signatures, so use gpg's --no-armor flag to force an unarmored signature. --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3ece8d5..7e242ce 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -264,7 +264,7 @@ create_signature() { if [[ -n $GPGKEY ]]; then SIGNWITHKEY="-u ${GPGKEY}" fi - gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? + gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then msg2 "$(gettext "Created signature file '%s'")" "${dbfile##*/.tmp.}.sig" -- 2.4.1

2 6