- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] testdb: ignore ALPM_DB_VERSION
by Andrew Gregory 15 Oct '14

15 Oct '14

Replaces the test for hidden files which appears to be leftover from 2e431e1cc before sync db checking was moved to a separate function. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/testdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index e3b331a..cd8c4d8 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -69,7 +69,7 @@ static int check_localdb_files(void) while((ent = readdir(dir)) != NULL) { if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0 - || ent->d_name[0] == '.') { + || strcmp(ent->d_name, "ALPM_DB_VERSION") == 0) { continue; } /* check for known db files in local database */ -- 2.1.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-460-ga0cfed7
by allan＠archlinux.org 14 Oct '14

14 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via a0cfed7df2ffac12df2bc935c53d273230f8aaa4 (commit) via 627ede877920d82ae6d1c9cc2d41c04cbc62ff25 (commit) via c1d6cec2e277eea7affa43601086c523311b58c0 (commit) via 42c859e4cc38f91a1236cd93eae9e9f9a1bc1e62 (commit) via 01beca5df717252c7c9aa59bc705dc10a25ebdc8 (commit) via 7ddc967d7cf2b8de73095cb841ee2c5973a669e4 (commit) via 6dd593c293bdc808b5e7040d06657c4f89e1a8bd (commit) via 19c3179b7ebfa4c35dff45792c922602d9322417 (commit) via 62c11e450a6f7d753fc997c20027472661de04e0 (commit) via 3f0303dc92634043d561ac9bbefa6c6e57578a65 (commit) via 926d998a750413399ca7abbe422a65ccbf09306e (commit) via faf0246437b47fb67f6adc3f2d039f6d787be1a0 (commit) via 5002227296b4de3c530690b38abab47dce83564d (commit) via 1e3c088c2e14c7211e77ad73201458418fd34091 (commit) via ca8319aec904c1f59b51bf642d730d646e50b170 (commit) from 7ee01c86669327b2af63c8ed9390bcbf071cdac5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a0cfed7df2ffac12df2bc935c53d273230f8aaa4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 13 09:08:29 2014 -0400 makepkg: reorder args to pkgbuild_get_attribute for consistency In all other cases, this code gets the outvalue from the final parameter. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 627ede877920d82ae6d1c9cc2d41c04cbc62ff25 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 04:09:10 2014 -0400 add pacman-db-upgrade test Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1d6cec2e277eea7affa43601086c523311b58c0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 11 04:08:20 2014 -0400 sync.c: download packages before starting commit download_files sets the transaction state to STATE_DOWNLOADING. Modifying the state after it has already been set to STATE_COMMITTING created a brief window where SIGINT would fail to interrupt the process and caused interrupted downloads to result in a 'transaction started' message in the log with no matching transaction end. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 42c859e4cc38f91a1236cd93eae9e9f9a1bc1e62 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:01:40 2014 -0400 pmtest: allow tests to specify test binary Adds a cmd property to tests (defaults to pacman) which is resolved using directories specified with --bindir (defaults to PATH). The ability to manually specify a particular binary is preserved in order to allow running individual tests with differently named binaries such as lt-pacman. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 01beca5df717252c7c9aa59bc705dc10a25ebdc8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 16:45:10 2014 -0400 pacman: add --confirm option --confirm cancels the effect of a previous --noconfirm. This makes it easier for scripts to default to --noconfirm but allow users to override it. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7ddc967d7cf2b8de73095cb841ee2c5973a669e4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:01:08 2014 -0400 pmtest: allow tests to specify db version Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6dd593c293bdc808b5e7040d06657c4f89e1a8bd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:55:06 2014 -0400 pmrule: make backup file test more robust This prevents an exception in the event backup entries are not in the correct format and brings the test in line with alpm's backup parsing which splits on the last tab rather than the first. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19c3179b7ebfa4c35dff45792c922602d9322417 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:00:25 2014 -0400 pmdb: include directories in package file lists Needed for checking directories with PKG_FILES. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62c11e450a6f7d753fc997c20027472661de04e0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 11 16:33:32 2014 -0400 makepkg: simplify attr matching in extract_function_var Interesting attributes created with 'local' or 'declare' won't be surfaced in .PKGINFO, so we shouldn't try to look for them. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f0303dc92634043d561ac9bbefa6c6e57578a65 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 3 08:39:13 2014 -0400 makepkg: show full fingerprint on pgp failure Rather than implementing suffix matching, which might clash, let's just print the full fingerprint of the err'ing key so that the user can copy/paste it into validpgpkeys. Also, make it clear in the manpage that validpgpkeys needs full fingerprints, and nothing else. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 926d998a750413399ca7abbe422a65ccbf09306e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Oct 2 13:00:55 2014 -0400 Revert "makepkg: allow less than the full fingerprint in validpgpkeys" This reverts commit 50296576d006d433fbfd4a6c57d5f95a942f7833. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit faf0246437b47fb67f6adc3f2d039f6d787be1a0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Oct 10 10:02:05 2014 +1000 There are not hooks! Refer to install scripts as scripts and not hooks. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5002227296b4de3c530690b38abab47dce83564d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 04:16:36 2014 -0400 pacman-db-upgrade: do not mangle file lists grep'ing out blank lines and sorting output thoroughly breaks any file lists with %BACKUP% entries which must be separated from the file list by a blank line. Adds a custom function to ensure that all paths printed are non-empty and unique. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e3c088c2e14c7211e77ad73201458418fd34091 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Thu Jul 31 19:42:28 2014 +0200 alpm: Fix wrong xferred/total sizes when resuming downloads When a package is already partially downloaded in the cache, its download size will only be of what's left to be downloaded. Since pkg->download_size is what's used when calculating the total download size for the totaldl callback, same thing apply. However, the download progress callback was including this initial size, which would thus lead to invalid values (and percentage) used in frontends. That is, the progress bar could e.g. go further than 100% In the case of pacman, there is a sanity check for different historical reason (44a57c89), so before the possible "overflow" was noticed, the total download size/progress reported was wrong. Once caught, the TotalDownload option was ignored and it would use individual file download values as fallback instead. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ca8319aec904c1f59b51bf642d730d646e50b170 Author: Miguel de Val-Borro <miguel(a)archlinux.net> Date: Tue Sep 30 19:59:45 2014 -0400 doc/translation-help.txt: Remove link to tutorial on sarovar.org The website sarovar.org has been shut down and the tutorial is not relevant any more. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 +++- doc/PKGBUILD.5.txt | 5 ++--- doc/pacman.8.txt | 5 ++++- doc/translation-help.txt | 4 +--- lib/libalpm/dload.c | 4 +++- lib/libalpm/sync.c | 11 +++++++--- lib/libalpm/sync.h | 1 + lib/libalpm/trans.c | 10 +++++++++ scripts/makepkg.sh.in | 41 ++++++++++-------------------------- scripts/pacman-db-upgrade.sh.in | 29 +++++++++++++++++++------ src/pacman/conf.h | 1 + src/pacman/pacman.c | 5 +++++ test/pacman/pactest.py | 16 ++++++-------- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 3 ++- test/pacman/pmrule.py | 10 ++++----- test/pacman/pmtest.py | 32 ++++++++++++++++++++-------- test/pacman/util.py | 5 +++-- test/scripts/pacman-db-upgrade-v9.py | 21 ++++++++++++++++++ valgrind.supp | 18 ++++++++++++++++ 20 files changed, 149 insertions(+), 78 deletions(-) create mode 100644 test/scripts/pacman-db-upgrade-v9.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: reorder args to pkgbuild_get_attribute for consistency
by Dave Reisner 13 Oct '14

13 Oct '14

In all other cases, this code gets the outvalue from the final parameter. --- Prereqs for .SRCINFO, naturally. scripts/makepkg.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4a3ae2e..8a67d94 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -908,7 +908,7 @@ get_pkg_arch() { fi else local arch_override - pkgbuild_get_attribute "$1" arch arch_override 0 + pkgbuild_get_attribute "$1" arch 0 arch_override (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") if [[ $arch_override = "any" ]]; then printf "%s\n" "any" @@ -2418,10 +2418,10 @@ extract_function_var() { pkgbuild_get_attribute() { # $1: package name # $2: attribute name - # $3: name of output var - # $4: multivalued + # $3: multivalued + # $4: name of output var - local pkgname=$1 attrname=$2 outputvar=$3 isarray=$4 + local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4 printf -v "$outputvar" %s '' @@ -2518,7 +2518,7 @@ lint_arch() { fi for name in "${pkgname[@]}"; do - pkgbuild_get_attribute "$name" 'arch' list 1 + pkgbuild_get_attribute "$name" 'arch' 1 list if [[ $list && $list != 'any' ]] && ! in_array $CARCH "${list[@]}"; then if (( ! IGNOREARCH )); then error "$(gettext "%s is not available for the '%s' architecture.")" "$name" "$CARCH" -- 2.1.2

1 0

[pacman-dev] [PATCH 1/3] Revert "makepkg: allow less than the full fingerprint in validpgpkeys"
by Dave Reisner 12 Oct '14

12 Oct '14

This reverts commit 50296576d006d433fbfd4a6c57d5f95a942f7833. --- doc/PKGBUILD.5.txt | 4 +--- scripts/makepkg.sh.in | 21 +-------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 8a43bae..74aea32 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -138,9 +138,7 @@ the integrity of the corresponding source file. trust values from the keyring. If the source file was signed with a subkey, makepkg will still use the primary key for comparison. + -Fingerprints must be uppercase and must not contain whitespace characters. They -must be either the full fingerprint or match at least 16 characters of the full -fingerprint, starting from the end of the fingerprint. +Fingerprints must be uppercase and must not contain whitespace characters. *noextract (array)*:: An array of file names corresponding to those from the source array. Files diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9d3ba2c..f949403 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1410,25 +1410,6 @@ parse_gpg_statusfile() { done < "$1" } -is_known_valid_pgp_key() { - local fprint subject=$1 validfprints=("${@:2}") - - for fprint in "${validfprints[@]}"; do - # we always honor full fingerprint matches - if [[ "$subject" = "$fprint" ]]; then - return 0 - fi - - # we'll also honor a suffix match, assuming that the fprint is long enough - # to be worthy. - if (( ${#fprint} >= 16 )) && [[ $subject = *"$fprint" ]]; then - return 0 - fi - done - - return 1 -} - check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 @@ -1515,7 +1496,7 @@ check_pgpsigs() { if (( ${#validpgpkeys[@]} == 0 && ! $trusted )); then printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$pubkey" >&2 errors=1 - elif ! is_known_valid_pgp_key "$fingerprint" "${validpgpkeys[@]}"; then + elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then printf "%s (%s $pubkey)" "$(gettext "FAILED")" "$(gettext "invalid public key")" errors=1 else -- 2.1.2

1 2

[pacman-dev] [PATCH] sync.c: download packages before starting commit
by Andrew Gregory 11 Oct '14

11 Oct '14

download_files sets the transaction state to STATE_DOWNLOADING. Modifying the state after it has already been set to STATE_COMMITTING created a brief window where SIGINT would fail to interrupt the process and caused interrupted downloads to result in a 'transaction started' message in the log with no matching transaction end. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 11 ++++++++--- lib/libalpm/sync.h | 1 + lib/libalpm/trans.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9fe4eff..c513b6b 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1263,13 +1263,12 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, return 0; } -int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) +int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data) { alpm_list_t *i, *deltas = NULL; size_t total = 0; uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans; - alpm_event_t event; if(download_files(handle, &deltas)) { alpm_list_free(deltas); @@ -1318,7 +1317,13 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; } - trans->state = STATE_COMMITING; + return 0; +} + +int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) +{ + alpm_trans_t *trans = handle->trans; + alpm_event_t event; /* fileconflict check */ if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index f25e450..c15d348 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -25,6 +25,7 @@ #include "alpm.h" int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data); +int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data); int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data); #endif /* _ALPM_SYNC_H */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index aebd8dd..7cdb096 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -175,6 +175,16 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) return 0; } + if(trans->add) { + if(_alpm_sync_load(handle, data) != 0) { + /* pm_errno is set by _alpm_sync_load() */ + return -1; + } + if(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) { + return 0; + } + } + trans->state = STATE_COMMITING; alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction started\n"); -- 2.1.2

1 0

[pacman-dev] [PATCH 1/1] dload: use better error message on exceeded file size
by Christian Hesse 10 Oct '14

10 Oct '14

From: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c5a56b5..16bb896 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -493,11 +493,9 @@ static int curl_download_internal(struct dload_payload *payload, if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; - /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, - _("failed retrieving file '%s' from %s : %s\n"), - payload->remote_name, hostname, - curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); + _("failed retrieving file '%s' from %s : expected download size exceeded\n"), + payload->remote_name, hostname); } goto cleanup; default: -- 2.1.2

1 0

[pacman-dev] [PATCH 1/1] dload: use better error message on exceeded file size
by Christian Hesse 10 Oct '14

10 Oct '14

From: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c5a56b5..42a71d9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -493,11 +493,10 @@ static int curl_download_internal(struct dload_payload *payload, if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; - /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, - curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); + _("expected download size exceeded")); } goto cleanup; default: -- 2.1.2

1 0

[pacman-dev] [PATCH 1/1] dload: use 'partial file' instead of 'filesize exceeded' message
by Christian Hesse 10 Oct '14

10 Oct '14

From: Christian Hesse <mail(a)eworm.de> If the server has a package file that is too big (does not match the recorded file size in repository db file) pacman fails with a 'filesize exceeded' message. This is misleading as it looks like pacman is suffering a local problem, for example ulimit on filesize or the like. This changes the message to 'partial file', which describes the problem a lot better IMHO. --- lib/libalpm/dload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 01fe57e..c819d73 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -491,14 +491,14 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_ABORTED_BY_CALLBACK: /* handle the interrupt accordingly */ if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { - payload->curlerr = CURLE_FILESIZE_EXCEEDED; + payload->curlerr = CURLE_PARTIAL_FILE; payload->unlink_on_fail = 1; handle->pm_errno = ALPM_ERR_LIBCURL; - /* use the 'size exceeded' message from libcurl */ + /* use the 'partial file' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, - curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); + curl_easy_strerror(CURLE_PARTIAL_FILE)); } goto cleanup; default: -- 2.1.2

2 2

[pacman-dev] [PATCH] There are not hooks!
by Allan McRae 10 Oct '14

10 Oct '14

Refer to install scripts as scripts and not hooks. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 45741b4..eacf1b3 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -18,7 +18,7 @@ Description ----------- Pacman is a package management utility that tracks installed packages on a Linux system. It features dependency support, package groups, install and uninstall -hooks, and the ability to sync your local machine with a remote repository to +scripts, and the ability to sync your local machine with a remote repository to automatically upgrade packages. Pacman packages are a zipped tar format. Since version 3.0.0, pacman has been the front-end to linkman:libalpm[3], the -- 2.1.2

1 0

[pacman-dev] Help with naming new option for paccache
by Maxim Andersson 09 Oct '14

09 Oct '14

Hi, Been looking into adding a new option for paccache that would remove all uninstalled packages (and at the same time keep the default number of the others). So, paccache -r --removeuninstalled would be the same as running paccache -r && paccache -ruk0 But before sending in my patch/option-proposal, I would like to hear what you think a good option name would be? I think "removeuninstalled" is pretty descriptive, but it's a bit long.. and I wasn't able come up with any good shorter names. Regards, Maxim

3 3