September 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] (no subject)
by ivy.foster＠gmail.com 09 Sep '16

09 Sep '16

For now, I'm just sending in the malloc patch (which, of course, now only frees variables that exist in the original source, not ones invented for the previous patches). To quickly recap an irc conversation with agregory, it looks like implementing checks before overwriting the db is more complicated if doing it properly (that is, downloading the newdb to a tempfile, rather than moving the olddb out of the way and then moving it back if need be). The downloader curl_download_internal (via _alpm_download) seems to expect a directory argument, rather than a filename (it appends the remote filename to the local path). I'll definitely try the checks patch again, though probably not in the next couple of days. Ivy

1 1

[pacman-dev] Do not clobber db if new db is invalid, close a couple "TODO" leaks
by ivy.foster＠gmail.com 08 Sep '16

08 Sep '16

Patch 1 is an attempt to close #46107 [1]. In lib/libalpm/be_sync.c, pacman 1) backs up the old db, 2) procedes as normal, 3) if new db is valid, deletes backup; if not, restores backup. While working on patch 1, I noticed a bunch of TODOs that mentioned the syncpath not being freed or umask reset if pacman ran out of memory for a MALLOC. Patch 2 fixes them. [1]: https://bugs.archlinux.org/task/46107?project=3 As always, comments welcome. Enjoy! (-: Ivy

3 6

[pacman-dev] [PATCH] Option to pass packages' versions to hook. Linearize code in _alpm_hook_trigger_match_pkg.
by Sergey Petrenko 05 Sep '16

05 Sep '16

--- lib/libalpm/hook.c | 102 ++++++++++++++++++++---------- test/pacman/tests/TESTS | 1 + test/pacman/tests/hook-target-versions.py | 47 ++++++++++++++ 3 files changed, 118 insertions(+), 32 deletions(-) create mode 100644 test/pacman/tests/hook-target-versions.py diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index ccde225..cc6c8bd 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -55,7 +55,7 @@ struct _alpm_hook_t { char **cmd; alpm_list_t *matches; alpm_hook_when_t when; - int abort_on_fail, needs_targets; + int abort_on_fail, needs_targets, needs_versions; }; struct _alpm_hook_cb_ctx { @@ -90,7 +90,7 @@ static void _alpm_hook_free(struct _alpm_hook_t *hook) _alpm_wordsplit_free(hook->cmd); alpm_list_free_inner(hook->triggers, (alpm_list_fn_free) _alpm_trigger_free); alpm_list_free(hook->triggers); - alpm_list_free(hook->matches); + alpm_list_free_inner(hook->matches, free); FREELIST(hook->depends); free(hook); } @@ -329,8 +329,11 @@ static int _alpm_hook_parse_cb(const char *file, int line, hook->abort_on_fail = 1; } else if(strcmp(key, "NeedsTargets") == 0) { hook->needs_targets = 1; + } else if(strcmp(key, "NeedsVersions") == 0) { + hook->needs_versions = 1; } else if(strcmp(key, "Exec") == 0) { - if((hook->cmd = _alpm_wordsplit(value)) == NULL) { + if((hook-> + cmd = _alpm_wordsplit(value)) == NULL) { if(errno == EINVAL) { error(_("hook %s line %d: invalid value %s\n"), file, line, value); } else { @@ -456,31 +459,53 @@ static int _alpm_hook_trigger_match_file(alpm_handle_t *handle, static int _alpm_hook_trigger_match_pkg(alpm_handle_t *handle, struct _alpm_hook_t *hook, struct _alpm_trigger_t *t) { - alpm_list_t *install = NULL, *upgrade = NULL, *remove = NULL; + alpm_list_t *add = NULL, *remove = NULL; if(t->op & ALPM_HOOK_OP_INSTALL || t->op & ALPM_HOOK_OP_UPGRADE) { alpm_list_t *i; for(i = handle->trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { - if(pkg->oldpkg) { - if(t->op & ALPM_HOOK_OP_UPGRADE) { - if(hook->needs_targets) { - upgrade = alpm_list_add(upgrade, pkg->name); - } else { - return 1; - } - } - } else { - if(t->op & ALPM_HOOK_OP_INSTALL) { - if(hook->needs_targets) { - install = alpm_list_add(install, pkg->name); - } else { - return 1; - } - } + + if(_alpm_fnmatch_patterns(t->targets, pkg->name) != 0) { + continue; + } + + int upgrade_match = 0, install_match = 0; + if (pkg->oldpkg) { + upgrade_match = (t->op & ALPM_HOOK_OP_UPGRADE); + } else { + install_match = (t->op & ALPM_HOOK_OP_INSTALL); + } + + if (!upgrade_match && !install_match) { + continue; + } + + if (!hook->needs_targets) { + return 1; + } + + char* output = NULL; + size_t len = strlen(pkg->name) + 1; + if (hook->needs_versions) { + if (upgrade_match) { + len += strlen(pkg->oldpkg->version) + 1; } + len += strlen(pkg->version) + 1; } + CALLOC(output, len, sizeof(char), continue); + + strcat(output, pkg->name); + if (hook->needs_versions) { + if (upgrade_match) { + strcat(output, " "); + strcat(output, pkg->oldpkg->version); + } + strcat(output, " "); + strcat(output, pkg->version); + } + + add = alpm_list_add(add, output); } } @@ -488,25 +513,38 @@ static int _alpm_hook_trigger_match_pkg(alpm_handle_t *handle, alpm_list_t *i; for(i = handle->trans->remove; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(pkg && _alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { - if(!alpm_list_find(handle->trans->add, pkg, _alpm_pkg_cmp)) { - if(hook->needs_targets) { - remove = alpm_list_add(remove, pkg->name); - } else { - return 1; - } - } + + if(_alpm_fnmatch_patterns(t->targets, pkg->name) != 0) { + continue; } + + if (!hook->needs_targets) { + return 1; + } + + char* output = NULL; + size_t len = strlen(pkg->name) + 1; + if (hook->needs_versions) { + len += strlen(pkg->version) + 1; + } + CALLOC(output, len, sizeof(char), continue); + + strcat(output, pkg->name); + if (hook->needs_versions) { + strcat(output, " "); + strcat(output, pkg->version); + } + + remove = alpm_list_add(remove, output); } } /* if we reached this point we either need the target lists or we didn't * match anything and the following calls will all be no-ops */ - hook->matches = alpm_list_join(hook->matches, install); - hook->matches = alpm_list_join(hook->matches, upgrade); + hook->matches = alpm_list_join(hook->matches, add); hook->matches = alpm_list_join(hook->matches, remove); - return install || upgrade || remove; + return add || remove; } static int _alpm_hook_trigger_match(alpm_handle_t *handle, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index bd5a0b6..9443e90 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -63,6 +63,7 @@ TESTS += test/pacman/tests/hook-pkg-postinstall-trigger-match.py TESTS += test/pacman/tests/hook-pkg-remove-trigger-match.py TESTS += test/pacman/tests/hook-pkg-upgrade-trigger-match.py TESTS += test/pacman/tests/hook-target-list.py +TESTS += test/pacman/tests/hook-target-versions.py TESTS += test/pacman/tests/hook-upgrade-trigger-no-match.py TESTS += test/pacman/tests/ignore001.py TESTS += test/pacman/tests/ignore002.py diff --git a/test/pacman/tests/hook-target-versions.py b/test/pacman/tests/hook-target-versions.py new file mode 100644 index 0000000..fd6d207 --- /dev/null +++ b/test/pacman/tests/hook-target-versions.py @@ -0,0 +1,47 @@ +self.description = "Hook with NeedsTargets" + +self.add_hook("hook", + """ + [Trigger] + Type = Package + Operation = Upgrade + Target = foo + + # duplicate trigger to check that duplicate targets are removed + [Trigger] + Type = Package + Operation = Install + Target = bar + + [Trigger] + Type = File + Operation = Install + # matches files in 'file/' but not 'file/' itself + Target = somewhere/?* + + [Action] + When = PreTransaction + Exec = bin/sh -c 'while read -r tgt; do printf "%s\\n" "$tgt"; done > var/log/hook-output' + NeedsTargets + NeedsVersions + """); + +lp1 = pmpkg("foo") +lp1.files = ["file/foo"] +self.addpkg2db("local", lp1) + +p1 = pmpkg("foo", "2.0-1") +p1.files = ["file/foo"] +self.addpkg(p1) + +p2 = pmpkg("bar") +p2.files = ["file/bar"] +self.addpkg(p2) + +self.args = "-U %s %s" % (p1.filename(), p2.filename()) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=foo") +self.addrule("""FILE_CONTENTS=var/log/hook-output|bar 1.0-1 +foo 1.0-1 2.0-1 +""") -- 2.9.3

4 7

[pacman-dev] [PATCH] bash-completion: fix leaking "files" array into shell environment
by Eli Schwartz 03 Sep '16

03 Sep '16

Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> --- This time with a signoff... contrib/bash_completion.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 6f99681..06963c4 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -97,7 +97,7 @@ _pacman_pkg() { } _pacman() { - local common core cur database prev query remove sync upgrade o + local common core cur database files prev query remove sync upgrade o COMPREPLY=() _get_comp_words_by_ref cur prev database=('asdeps asexplicit') -- 2.9.3

2 1

[pacman-dev] [PATCH] Fix memory leak in remove_notify_needed_optdepends
by Allan McRae 03 Sep '16

03 Sep '16

Also add pactest which captures this leak when run under valgrind. Reported-by: Sergey Petrenko Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 1 + test/pacman/tests/TESTS | 1 + .../pacman/tests/remove-optdepend-of-installed-package.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 test/pacman/tests/remove-optdepend-of-installed-package.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 45f7c2f..173dbc6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -189,6 +189,7 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * }; EVENT(handle, &event); } + free(optstring); } } } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index bd5a0b6..2d87796 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -109,6 +109,7 @@ TESTS += test/pacman/tests/querycheck002.py TESTS += test/pacman/tests/querycheck_fast_file_type.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove-assumeinstalled.py +TESTS += test/pacman/tests/remove-optdepend-of-installed-package.py TESTS += test/pacman/tests/remove-recursive-cycle.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/remove-optdepend-of-installed-package.py b/test/pacman/tests/remove-optdepend-of-installed-package.py new file mode 100644 index 0000000..4973df5 --- /dev/null +++ b/test/pacman/tests/remove-optdepend-of-installed-package.py @@ -0,0 +1,15 @@ +self.description = "Remove packages which is an optdepend of another package" + +p1 = pmpkg("dep") +self.addpkg2db("local", p1) + +p2 = pmpkg("pkg") +p2.optdepends = ["dep: for foobar"] +self.addpkg2db("local", p2) + +self.args = "-R %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=%s" % p1.name) +self.addrule("PKG_EXIST=%s" % p2.name) +self.addrule("PACMAN_OUTPUT=%s optionally requires %s" % (p2.name, p1.name)) -- 2.9.3

1 0

[pacman-dev] Memleak
by Sergey Petrenko 03 Sep '16

03 Sep '16

libalpm/remove.c: in remove_notify_needed_optdepends(): char *optstring = alpm_dep_compute_string(optdep); isn't freed after being used. Ought to thank Valgrind for this one. -- With wish of constant improvement and unstoppable creativity. Sergey Petrenko

2 1

[pacman-dev] [PATCH] bash-completion: fix leaking "files" array into shell environment
by Eli Schwartz 02 Sep '16

02 Sep '16

--- contrib/bash_completion.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 6f99681..06963c4 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -97,7 +97,7 @@ _pacman_pkg() { } _pacman() { - local common core cur database prev query remove sync upgrade o + local common core cur database files prev query remove sync upgrade o COMPREPLY=() _get_comp_words_by_ref cur prev database=('asdeps asexplicit') -- 2.9.3

1 0

[pacman-dev] [PATCH] [RFC] Provide source files for useful debug packages
by Allan McRae 01 Sep '16

01 Sep '16

Debug packages are fairly useless currently because the soucre files needed for stepping through code etc are not packaged with them. This patch adds the needed source files to the debug package and adjusts the debug info to look at the /usr/src/debug/ directory for them rather than the build location. This requires using the "debugedit" program which is provided as part of the RPM sources. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a first pass at making debug packages useful... Some things I want comments on: 1) It feels dirty depending on an RPM tool for adjusting the paths inside ELF binaries, but I don't see any other choice. Suggestions welcome 2) Getting the list of src files from the binary involves an awk that works... but I don't know how! Can someone better at awk than me take a look and confirm I have not done something wrong 3) split packages... I need to figure out how to support these as source files will overlap. My current idea is to order the packaging by dependency chain so that e.g gcc-libs comes before gcc which comes before gcc-fortran. Then gcc-debug will not include files from gcc-libs-debug, and gcc-fortran-debug will not include files in either of those. I hope that would remove most file conflicts across packages. scripts/libmakepkg/tidy/strip.sh.in | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 1c7aacf..bd5c79a 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -35,6 +35,11 @@ build_id() { LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }' } +source_files() { + LANG=C readelf $1 --debug-dump | \ + awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{print $8 "/" name}' +} + strip_file() { local binary=$1; shift @@ -50,6 +55,18 @@ strip_file() { return fi + # copy source files to debug directory + local f t + for f in $(source_files "$binary"); do + t=${f/$srcdir/$dbgsrc} + mkdir -p "${t%/*}" + cp "$f" "$t" + done + + # adjust debug symbols to point at sources + debugedit -b "${srcdir}" -d /usr/src/debug/ -i "$binary" &> /dev/null + + # copy debug symbols to debug directory mkdir -p "$dbgdir/${binary%/*}" objcopy --only-keep-debug "$binary" "$dbgdir/$binary.debug" objcopy --add-gnu-debuglink="$dbgdir/${binary#/}.debug" "$binary" @@ -89,7 +106,8 @@ tidy_strip() { if check_option "debug" "y"; then dbgdir="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug" - mkdir -p "$dbgdir" + dbgsrc="$pkgdir-@DEBUGSUFFIX@/usr/src/debug" + mkdir -p "$dbgdir" "$dbgsrc" fi local binary strip_flags -- 2.9.3

1 0

[pacman-dev] [PATCH] Fix typo in pacman-db-upgrade usage message
by Allan McRae 01 Sep '16

01 Sep '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-db-upgrade.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 94085ba..79e1c59 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -40,7 +40,7 @@ usage() { printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo printf -- "$(gettext "options:")\n" - printf -- "$(gettext " -b, --dbpath <path> set an alternate database location")\n" + printf -- "$(gettext " -d, --dbpath <path> set an alternate database location")\n" printf -- "$(gettext " -h, --help show this help message and exit")\n" printf -- "$(gettext " -r, --root <path> set an alternate installation root")\n" printf -- "$(gettext " -V, --version show version information and exit")\n" -- 2.9.3

1 0