- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Suppress valgrind error in fakechroot
by Rikard Falkeborn 04 Jan '17

04 Jan '17

This was spotted on Arch Linux, most likely it was introduced when fakechroot was updated to 2.19-1. Valgrind suggests to add the following suppression, which can be tweaked to fit an already existing one. { <insert_a_suppression_name_here> Memcheck:Leak match-leak-kinds: reachable fun:calloc obj:/usr/lib/libdl-2.24.so fun:dlsym obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so fun:bindtextdomain obj:/usr/lib/libgpg-error.so.0.20.0 fun:call_init.part.0 fun:_dl_init obj:/usr/lib/ld-2.24.so obj:* obj:* obj:* } Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- valgrind.supp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/valgrind.supp b/valgrind.supp index 0691e808..69265dff 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -160,8 +160,10 @@ fakechroot-call-init Memcheck:Leak match-leak-kinds: reachable - fun:malloc + fun:?alloc + ... obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so + ... fun:call_init.part.0 fun:_dl_init obj:/usr/lib/ld-*.so -- 2.11.0

2 1

[pacman-dev] [PATCH] Add alpm_pkg_get_makedepends and alpm_pkg_get_checkdepends
by Mark Weiman 03 Jan '17

03 Jan '17

makepkg adds makedepends and checkdepends to a package's .PKGINFO file. Add functions that allow use of these from libalpm. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- lib/libalpm/alpm.h | 12 ++++++++ lib/libalpm/be_package.c | 6 ++-- lib/libalpm/package.c | 80 +++++++++++++++++++++++++++++------------------- lib/libalpm/package.h | 4 +++ 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d2491d..3ef2426 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1261,6 +1261,18 @@ alpm_list_t *alpm_pkg_get_depends(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_get_optdepends(alpm_pkg_t *pkg); +/** Returns a list of package check dependencies + * @param pkg a pointer to package + * @return a reference to an internal list of alpm_depend_t structures. + */ +alpm_list_t *alpm_pkg_get_checkdepends(alpm_pkg_t *pkg); + +/** Returns a list of package make dependencies + * @param pkg a pointer to package + * @return a reference to an internal list of alpm_depend_t structures. + */ +alpm_list_t *alpm_pkg_get_makedepends(alpm_pkg_t *pkg); + /** Returns the list of packages conflicting with pkg. * @param pkg a pointer to package * @return a reference to an internal list of alpm_depend_t structures. diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index b7c54fa..93af969 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -223,9 +223,11 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * alpm_depend_t *optdep = alpm_dep_from_string(ptr); newpkg->optdepends = alpm_list_add(newpkg->optdepends, optdep); } else if(strcmp(key, "makedepend") == 0) { - /* not used atm */ + alpm_depend_t *makedep = alpm_dep_from_string(ptr); + newpkg->makedepends = alpm_list_add(newpkg->makedepends, makedep); } else if(strcmp(key, "checkdepend") == 0) { - /* not used atm */ + alpm_depend_t *checkdep = alpm_dep_from_string(ptr); + newpkg->checkdepends = alpm_list_add(newpkg->checkdepends, checkdep); } else if(strcmp(key, "conflict") == 0) { alpm_depend_t *conflict = alpm_dep_from_string(ptr); newpkg->conflicts = alpm_list_add(newpkg->conflicts, conflict); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 05becf0..6bc9936 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -99,6 +99,8 @@ static alpm_list_t *_pkg_get_licenses(alpm_pkg_t *pkg) { return pkg->licenses; static alpm_list_t *_pkg_get_groups(alpm_pkg_t *pkg) { return pkg->groups; } static alpm_list_t *_pkg_get_depends(alpm_pkg_t *pkg) { return pkg->depends; } static alpm_list_t *_pkg_get_optdepends(alpm_pkg_t *pkg) { return pkg->optdepends; } +static alpm_list_t *_pkg_get_checkdepends(alpm_pkg_t *pkg) { return pkg->checkdepends; } +static alpm_list_t *_pkg_get_makedepends(alpm_pkg_t *pkg) { return pkg->makedepends; } static alpm_list_t *_pkg_get_conflicts(alpm_pkg_t *pkg) { return pkg->conflicts; } 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; } @@ -145,37 +147,39 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } * struct itself with no abstraction layer or any type of lazy loading. */ struct pkg_operations default_pkg_ops = { - .get_base = _pkg_get_base, - .get_desc = _pkg_get_desc, - .get_url = _pkg_get_url, - .get_builddate = _pkg_get_builddate, - .get_installdate = _pkg_get_installdate, - .get_packager = _pkg_get_packager, - .get_arch = _pkg_get_arch, - .get_isize = _pkg_get_isize, - .get_reason = _pkg_get_reason, - .get_validation = _pkg_get_validation, - .has_scriptlet = _pkg_has_scriptlet, - - .get_licenses = _pkg_get_licenses, - .get_groups = _pkg_get_groups, - .get_depends = _pkg_get_depends, - .get_optdepends = _pkg_get_optdepends, - .get_conflicts = _pkg_get_conflicts, - .get_provides = _pkg_get_provides, - .get_replaces = _pkg_get_replaces, - .get_files = _pkg_get_files, - .get_backup = _pkg_get_backup, - - .changelog_open = _pkg_changelog_open, - .changelog_read = _pkg_changelog_read, - .changelog_close = _pkg_changelog_close, - - .mtree_open = _pkg_mtree_open, - .mtree_next = _pkg_mtree_next, - .mtree_close = _pkg_mtree_close, - - .force_load = _pkg_force_load, + .get_base = _pkg_get_base, + .get_desc = _pkg_get_desc, + .get_url = _pkg_get_url, + .get_builddate = _pkg_get_builddate, + .get_installdate = _pkg_get_installdate, + .get_packager = _pkg_get_packager, + .get_arch = _pkg_get_arch, + .get_isize = _pkg_get_isize, + .get_reason = _pkg_get_reason, + .get_validation = _pkg_get_validation, + .has_scriptlet = _pkg_has_scriptlet, + + .get_licenses = _pkg_get_licenses, + .get_groups = _pkg_get_groups, + .get_depends = _pkg_get_depends, + .get_optdepends = _pkg_get_optdepends, + .get_checkdepends = _pkg_get_checkdepends, + .get_makedepends = _pkg_get_makedepends, + .get_conflicts = _pkg_get_conflicts, + .get_provides = _pkg_get_provides, + .get_replaces = _pkg_get_replaces, + .get_files = _pkg_get_files, + .get_backup = _pkg_get_backup, + + .changelog_open = _pkg_changelog_open, + .changelog_read = _pkg_changelog_read, + .changelog_close = _pkg_changelog_close, + + .mtree_open = _pkg_mtree_open, + .mtree_next = _pkg_mtree_next, + .mtree_close = _pkg_mtree_close, + + .force_load = _pkg_force_load, }; /* Public functions for getting package information. These functions @@ -335,6 +339,20 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_optdepends(alpm_pkg_t *pkg) return pkg->ops->get_optdepends(pkg); } +alpm_list_t SYMEXPORT *alpm_pkg_get_checkdepends(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_checkdepends(pkg); +} + +alpm_list_t SYMEXPORT *alpm_pkg_get_makedepends(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_makedepends(pkg); +} + alpm_list_t SYMEXPORT *alpm_pkg_get_conflicts(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 0822a8d..1f029bd 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -59,6 +59,8 @@ struct pkg_operations { alpm_list_t *(*get_groups) (alpm_pkg_t *); alpm_list_t *(*get_depends) (alpm_pkg_t *); alpm_list_t *(*get_optdepends) (alpm_pkg_t *); + alpm_list_t *(*get_checkdepends) (alpm_pkg_t *); + alpm_list_t *(*get_makedepends) (alpm_pkg_t *); alpm_list_t *(*get_conflicts) (alpm_pkg_t *); alpm_list_t *(*get_provides) (alpm_pkg_t *); alpm_list_t *(*get_replaces) (alpm_pkg_t *); @@ -112,6 +114,8 @@ struct __alpm_pkg_t { alpm_list_t *backup; alpm_list_t *depends; alpm_list_t *optdepends; + alpm_list_t *checkdepends; + alpm_list_t *makedepends; alpm_list_t *conflicts; alpm_list_t *provides; alpm_list_t *deltas; -- 2.10.2

2 3

[pacman-dev] makepkg: verify git sources
by Jelle van der Waa 03 Jan '17

03 Jan '17

Hi, I would like to work on verifying git signed tags. So far I've actually managed to hack it into makepkg, but by missing a lot of edge cases and well writing an ugly implementation. [1] Some of this work has been borrowed from the systemd PKGBUILD. [2] Example with vte3-ng: ==> Validating source files with md5sums... vte-ng ... Skipped ==> Verifying source file signatures with gpg... vte-ng ... Passed Of course the hacks I've put in there are never going to be accepted even if I bribe Allan with a case of bourbon. I can think of the following issues, edge-cases which need to be handled: * git url, but no #tag= or #commit= specified, should verify HEAD on the #branch or no tag, commit, branch case. * Not parsing or tested invalid signed tags, not sure how git verify-tag displays errors so that needs more work. * I would like to move the git verification into source/git.sh.in and then re-use the code which extracts #branch, #commit etc. It would also reduce the clutter in verify_signature.sh.in. Another idea is to move the verification into integrity/verify_git.sh.in. * Changing the directory is cumbersome. git offers git -C $path verify-tag $tag to resolve that. * Multiple sources, .tar.gz{,asc} and a git one. (Rare but should be handled) Or multiple git sources. So tl;dr, I would love to see a pointer where I should call my own verification function for git sources or any other edge-cases I've missed :) [1] https://github.com/jelly/pacman/commit/5172a74ed9de422429d18034841acf8025fd… [2] https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packa… -- Jelle van der Waa

4 18

[pacman-dev] [PATCH 1/5] makepkg: warn about dotfiles in package root
by Andrew Gregory 03 Jan '17

03 Jan '17

libalpm reserves paths starting with '.' for its own use and will not extract any other than those it recognizes. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_package/dotfiles.sh.in | 38 ++++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 3 files changed, 40 insertions(+) create mode 100644 scripts/libmakepkg/lint_package/dotfiles.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 41a9f5d..4bb08a2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -58,6 +58,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_package.sh \ libmakepkg/lint_package/build_references.sh \ + libmakepkg/lint_package/dotfiles.sh \ libmakepkg/lint_package/file_names.sh \ libmakepkg/lint_package/missing_backup.sh \ libmakepkg/lint_pkgbuild.sh \ diff --git a/scripts/libmakepkg/lint_package/dotfiles.sh.in b/scripts/libmakepkg/lint_package/dotfiles.sh.in new file mode 100644 index 0000000..bf7f41d --- /dev/null +++ b/scripts/libmakepkg/lint_package/dotfiles.sh.in @@ -0,0 +1,38 @@ +#!/bin/bash +# +# dotfiles.sh - check for dotfiles in the package root +# +# Copyright (c) 2016 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH" ]] && return +LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_package_functions+=('check_dotfiles') + +check_dotfiles() { + local ret=0 + for f in "$pkgdir"/.*; do + [[ ${f##*/} == . || ${f##*/} == .. ]] && continue + error "$(gettext "Dotfile found in package root '%s'")" "$f" + ret=1 + done + return $ret +} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 4f47fc3..7cc6a03 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -14,6 +14,7 @@ scripts/libmakepkg/integrity/verify_checksum.sh.in scripts/libmakepkg/integrity/verify_signature.sh.in scripts/libmakepkg/lint_package.sh.in scripts/libmakepkg/lint_package/build_references.sh.in +scripts/libmakepkg/lint_package/dotfiles.sh.in scripts/libmakepkg/lint_package/file_names.sh.in scripts/libmakepkg/lint_package/missing_backup.sh.in scripts/libmakepkg/lint_pkgbuild.sh.in -- 2.10.2

2 10

[pacman-dev] [PATCH] conflict: skip dir children when replacing a file
by Andrew Gregory 03 Jan '17

03 Jan '17

When replacing a file with a directory, any files under that directory do not need to be checked for conflicts. This prevents possible false-positive conflicts where the file being replaced is a symlink. We were already skipping the directory children when the file was owned by the previous version of a package being upgraded. This extends that to other packages being removed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 16 +++++++++++++++- test/pacman/tests/TESTS | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b9e30870..48bc88b6 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -503,6 +503,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, struct stat lsbuf; char path[PATH_MAX]; size_t pathlen; + int pfile_isdir; pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); relative_path = path + rootlen; @@ -514,7 +515,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path); - if(path[pathlen - 1] == '/') { + pfile_isdir = path[pathlen - 1] == '/'; + if(pfile_isdir) { if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n"); continue; @@ -551,6 +553,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "local file will be removed, not a conflict\n"); resolved_conflict = 1; + if(pfile_isdir) { + /* go ahead and skip any files inside filestr as they will + * necessarily be resolved by replacing the file with a dir + * NOTE: afterward, j will point to the last file inside filestr */ + size_t fslen = strlen(filestr); + for( ; j->next; j = j->next) { + const char *filestr2 = j->next->data; + if(strncmp(filestr, filestr2, fslen) != 0) { + break; + } + } + } } } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 2d877962..44007f63 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -149,6 +149,7 @@ TESTS += test/pacman/tests/smoke001.py TESTS += test/pacman/tests/smoke002.py TESTS += test/pacman/tests/smoke003.py TESTS += test/pacman/tests/smoke004.py +TESTS += test/pacman/tests/symlink-replace-with-dir.py TESTS += test/pacman/tests/symlink001.py TESTS += test/pacman/tests/symlink002.py TESTS += test/pacman/tests/symlink010.py -- 2.11.0

2 3

[pacman-dev] Potential bug in alpm-hooks; fix provided
by Stefan Klinger 03 Jan '17

03 Jan '17

Hi, I'm providing a fix [1] for the following issue. I've noticed that exactly one `Exec` directive is allowed in alpm-hooks(5). This is not explicitly stated in the manual (the word "required" does not usually imply "non-repeatable", as seems to be intended by the manual), nor does it rise an error. Instead, multiple occurrences are silently ignored. Use case: # When installed as a pacman hook [1], this will call the # `my-update-pacman-mirrorlist` script every time the file # `/etc/pacman.d/mirrorlist` should be updated. [Trigger] Operation = Upgrade Operation = Install Type = File Target = etc/pacman.d/mirrorlist [Action] When = PostTransaction Exec = /usr/bin/my-update-pacman-mirrorlist Exec = /usr/bin/rm -f /etc/pacman.d/mirrorlist.pacnew Only the last `Exec` is used. I think it is semantically correct since the syntax looks like an assignment that overwrites the previous one. But it is inconsistent with the use of `Operation` in the `Trigger` section. I would expect the commands to be evaluated in order, or to see an error due to reusing `Exec`. I think raising an error would be best, otherwise pacman would have to provide means to decide how to handle individually failing commands, a situation that is more flexibly handled by an external script, which should be called instead of using multiple `Exec`s. I have implemented this in [1] and added a test. If you like that, I would update the documentation, and also look for other values that are silently overwritten when parsing a hook. Also, I'd like to make `Operation` accept things like Operation = Upgrade Install and in future versions deprecate the current use of multiple assignments which I consider rather unfortunate. Cheers, Stefan ____________________ [1] https://github.com/s5k6/pacman/tree/fix-hook-exec -- http://stefan-klinger.de o/X Send plain text messages only, not exceeding 32kB. /\/ \

5 7

[pacman-dev] [PATCH] ini: only recognize comments at beginning of line
by Andrew Gregory 03 Jan '17

03 Jan '17

Allows the hash sign to be used in values in config files and hooks. Fixes #48702 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/common/ini.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 1ac24b5..fc834e2 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -61,19 +61,14 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) } while(safe_fgets(line, PATH_MAX, fp)) { - char *key, *value, *ptr; + char *key, *value; size_t line_len; linenum++; - /* ignore whole line and end of line comments */ - if((ptr = strchr(line, '#'))) { - *ptr = '\0'; - } - line_len = strtrim(line); - if(line_len == 0) { + if(line_len == 0 || line[0] == '#') { continue; } -- 2.10.2

2 1

[pacman-dev] [PATCH 1/2] configure.ac: Use POSIX compatible equality checks
by Dave Reisner 03 Jan '17

03 Jan '17

--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 63f87d1..10e4415 100644 --- a/configure.ac +++ b/configure.ac @@ -222,13 +222,13 @@ PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , # Check for OpenSSL have_openssl=no have_nettle=no -if test "x$with_crypto" == "xnettle"; then +if test "x$with_crypto" = "xnettle"; then PKG_CHECK_MODULES(NETTLE, [nettle], [AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no) if test "x$have_nettle" = xno -a "x$with_crypto" = xnettle; then AC_MSG_ERROR([*** nettle support requested but libraries not found]) fi -else if test "x$with_crypto" == "xopenssl"; then +else if test "x$with_crypto" = "xopenssl"; then PKG_CHECK_MODULES(LIBSSL, [libcrypto], [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no) if test "x$have_openssl" = xno; then -- 2.10.2

2 3

[pacman-dev] [PATCH] Update copyright years
by Allan McRae 01 Jan '17

01 Jan '17

1 0

[pacman-dev] Could makepkg verify .dsc file?
by Bruno Pagani 22 Dec '16

22 Dec '16

Hi there, This is probably some sort of feature request or maybe more general asking. I have a case where sha*sums are provided in a .dsc signed file (bs1770gain, for which *sane* upstream is Debian: https://packages.debian.org/source/sid/bs1770gain) Apparently, makepkg only supports verifying file with detached signature. Is there a specific reason for that (like this use case is really tiny — I have no actual idea about this) or is it just because it was never implemented? Thanks, Bruno

4 19