April 2017 - Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] adding a --sysroot option
by Andrew Gregory 16 Apr '17

16 Apr '17

pacman's --root option is regularly (mis)used to use pacman to manage a mounted guest system, typically one whose pacman installation is currently broken. We have a few configuration defaults in place to make this sort of work, but support is incomplete. Those defaults only actually take effect if the settings haven't been set in a configuration file, several options still default to the host system resources, and using the guest's pacman configuration requires updating all configured paths to the new mounted location. Adding a --sysroot/--chroot option would allow pacman to properly operate in a mounted guest system. At the moment, there are two ways we could accomplish this: prefix all paths with the sysroot or just call chroot(2). Obviously, the problem with chroot(2) is that it requires special privileges. Unfortunately, I think my symbolic user/group patch (https://patchwork.archlinux.org/patch/3694/) will require chroot to work properly as I can't find any other way to look up users/groups in a mounted guest. So, we may have to implement both approaches so that regular users can perform queries but privileged users can perform transactions with proper symbolic name support. apg

2 5

[pacman-dev] [PATCH] use sockets for scriptlet/hook communication
by Andrew Gregory 16 Apr '17

16 Apr '17

If a scriptlet/hook dies at the wrong moment it can trigger SIGPIPE, terminating the process. For pipes, there is no way to prevent SIGPIPE other than ignoring it process-wide. This can have unintended consequences in a multi-threaded process. Using send(2) with sockets, however, allows ignoring SIGPIPE on a per-call basis, leaving other threads able to make use of SIGPIPE. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 58efa5c7..5a7f2c87 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -30,6 +30,7 @@ #include <errno.h> #include <limits.h> #include <sys/wait.h> +#include <sys/socket.h> #include <fnmatch.h> #include <poll.h> @@ -463,7 +464,6 @@ static int _alpm_chroot_write_to_child(alpm_handle_t *handle, int fd, _alpm_cb_io out_cb, void *cb_ctx) { ssize_t nwrite; - struct sigaction newaction, oldaction; if(*buf_size == 0) { /* empty buffer, ask the callback for more */ @@ -473,16 +473,7 @@ static int _alpm_chroot_write_to_child(alpm_handle_t *handle, int fd, } } - /* ignore SIGPIPE in case the pipe has been closed */ - newaction.sa_handler = SIG_IGN; - sigemptyset(&newaction.sa_mask); - newaction.sa_flags = 0; - sigaction(SIGPIPE, &newaction, &oldaction); - - nwrite = write(fd, buf, *buf_size); - - /* restore previous SIGPIPE handler */ - sigaction(SIGPIPE, &oldaction, NULL); + nwrite = send(fd, buf, *buf_size, MSG_NOSIGNAL); if(nwrite != -1) { /* write was successful, remove the written data from the buffer */ @@ -592,13 +583,13 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); - if(pipe(child2parent_pipefd) == -1) { + if(socketpair(AF_UNIX, SOCK_STREAM, 0, child2parent_pipefd) == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); retval = 1; goto cleanup; } - if(pipe(parent2child_pipefd) == -1) { + if(socketpair(AF_UNIX, SOCK_STREAM, 0, parent2child_pipefd) == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); retval = 1; goto cleanup; -- 2.12.2

1 0

[pacman-dev] [PATCH] conflict: include owner for filesystem conflicts
by Andrew Gregory 16 Apr '17

16 Apr '17

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 25 +++++++++++++++++----- src/pacman/sync.c | 9 ++++++-- test/pacman/tests/TESTS | 1 + .../tests/file-conflict-with-installed-pkg.py | 17 +++++++++++++++ 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 test/pacman/tests/file-conflict-with-installed-pkg.py diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0e37419f..d52f8942 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -278,12 +278,15 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); - if(pkg2) { - conflict->type = ALPM_FILECONFLICT_TARGET; - STRDUP(conflict->ctarget, pkg2->name, goto error); - } else { + if(!pkg2) { conflict->type = ALPM_FILECONFLICT_FILESYSTEM; STRDUP(conflict->ctarget, "", goto error); + } else if(pkg2->origin == ALPM_PKG_FROM_LOCALDB) { + conflict->type = ALPM_FILECONFLICT_FILESYSTEM; + STRDUP(conflict->ctarget, pkg2->name, goto error); + } else { + conflict->type = ALPM_FILECONFLICT_TARGET; + STRDUP(conflict->ctarget, pkg2->name, goto error); } conflicts = alpm_list_add(conflicts, conflict); @@ -385,6 +388,17 @@ static alpm_list_t *alpm_db_find_file_owners(alpm_db_t* db, const char *path) return owners; } +static alpm_pkg_t *_alpm_find_file_owner(alpm_handle_t *handle, const char *path) +{ + alpm_list_t *i; + for(i = alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { + if(alpm_filelist_contains(alpm_pkg_get_files(i->data), path)) { + return i->data; + } + } + return NULL; +} + static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path) { return handle->trans->flags & ALPM_TRANS_FLAG_FORCE @@ -668,7 +682,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } if(!resolved_conflict) { - conflicts = add_fileconflict(handle, conflicts, path, p1, NULL); + conflicts = add_fileconflict(handle, conflicts, path, p1, + _alpm_find_file_owner(handle, relative_path)); if(handle->pm_errno == ALPM_ERR_MEMORY) { alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e37b91c7..680d7b3e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -823,8 +823,13 @@ int sync_prepare_execute(void) conflict->file, conflict->target, conflict->ctarget); break; case ALPM_FILECONFLICT_FILESYSTEM: - printf(_("%s: %s exists in filesystem\n"), - conflict->target, conflict->file); + if(conflict->ctarget[0]) { + printf(_("%s: %s exists in filesystem (owned by %s)\n"), + conflict->target, conflict->file, conflict->ctarget); + } else { + printf(_("%s: %s exists in filesystem\n"), + conflict->target, conflict->file); + } break; } alpm_fileconflict_free(conflict); diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index eadb63b4..9dbeb767 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -28,6 +28,7 @@ TESTS += test/pacman/tests/epoch005.py TESTS += test/pacman/tests/epoch010.py TESTS += test/pacman/tests/epoch011.py TESTS += test/pacman/tests/epoch012.py +TESTS += test/pacman/tests/file-conflict-with-installed-pkg.py TESTS += test/pacman/tests/fileconflict001.py TESTS += test/pacman/tests/fileconflict002.py TESTS += test/pacman/tests/fileconflict003.py diff --git a/test/pacman/tests/file-conflict-with-installed-pkg.py b/test/pacman/tests/file-conflict-with-installed-pkg.py new file mode 100644 index 00000000..cf88e8a9 --- /dev/null +++ b/test/pacman/tests/file-conflict-with-installed-pkg.py @@ -0,0 +1,17 @@ +self.description = "File conflict with an installed package" + +lp = pmpkg("foobar") +lp.files = ["conflicting-file"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1") +p1.files = ["conflicting-file"] +self.addpkg(p1) + +self.args = "-U %s" % (p1.filename()) + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=foobar") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("FILE_EXIST=conflicting-file") +self.addrule("PACMAN_OUTPUT=foobar") -- 2.12.2

1 0

[pacman-dev] [PATCH] makepkg: clean up pkgver and prepare log files
by Michael Straube 12 Apr '17

12 Apr '17

Delete log files for the pkgver and prepare functions if -c,--clean is passed. Fixes FS#51039 and FS#51075 Includes patch submitted by Christian Braun. Signed-off-by: Michael Straube <straubem(a)gmx.de> --- scripts/makepkg.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29408929..0218e13b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -137,6 +137,12 @@ clean_up() { if [[ -n $pkgbase ]]; then local fullver=$(get_full_version) # Can't do this unless the BUILDSCRIPT has been sourced. + if (( PKGVERFUNC )); then + rm -f "${pkgbase}-${fullver}-${CARCH}-pkgver.log"* + fi + if (( PREPAREFUNC )); then + rm -f "${pkgbase}-${fullver}-${CARCH}-prepare.log"* + fi if (( BUILDFUNC )); then rm -f "${pkgbase}-${fullver}-${CARCH}-build.log"* fi -- 2.12.2

1 0

[pacman-dev] [PATCH] unlink_file: strip trailing slashes
by Andrew Gregory 12 Apr '17

12 Apr '17

If the user replaces a directory with a symlink, libalpm would get confused because the trailing slash causes system calls to resolve the symlink. This leads to errors and a misleading message during upgrades. Even though libalpm does not support this, it should not be giving misleading errors. Also adds an overflow check. Fixes FS#51377 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- See https://bbs.archlinux.org/viewtopic.php?id=224843 for another example. Subtle problems like this could be avoided by removing the trailing slashes from libalpm's internal file lists. Is there any reason not to remove them and use a field in the file_t struct to indicate type? It already has a mode field that we could use. lib/libalpm/remove.c | 13 ++++++++++++- test/pacman/tests/TESTS | 1 + .../tests/remove-directory-replaced-with-symlink.py | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/remove-directory-replaced-with-symlink.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8ce10f84..ffe92518 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -440,8 +440,19 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, { struct stat buf; char file[PATH_MAX]; + int file_len; - snprintf(file, PATH_MAX, "%s%s", handle->root, fileobj->name); + file_len = snprintf(file, PATH_MAX, "%s%s", handle->root, fileobj->name); + if(file_len <= 0 || file_len >= PATH_MAX) { + /* 0 is a valid value from snprintf, but should be impossible here */ + _alpm_log(handle, ALPM_LOG_DEBUG, "path too long to unlink %s%s\n", + handle->root, fileobj->name); + return -1; + } else if(file[file_len-1] == '/') { + /* trailing slashes cause errors and confusing messages if the user has + * replaced a directory with a symlink */ + file[--file_len] = '\0'; + } if(llstat(file, &buf)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file); diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 11d1c38c..f926e162 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -110,6 +110,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-directory-replaced-with-symlink.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 diff --git a/test/pacman/tests/remove-directory-replaced-with-symlink.py b/test/pacman/tests/remove-directory-replaced-with-symlink.py new file mode 100644 index 00000000..37be7579 --- /dev/null +++ b/test/pacman/tests/remove-directory-replaced-with-symlink.py @@ -0,0 +1,16 @@ +self.description = "remove a package with a directory that has been replaced with a symlink" + +self.filesystem = [ "var/", "srv -> var/" ] + +lpkg = pmpkg("pkg1") +lpkg.files = ["srv/"] +self.addpkg2db("local", lpkg) + +self.args = "-R %s" % (lpkg.name) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("DIR_EXIST=var/") +self.addrule("!LINK_EXIST=srv") +self.addrule("!FILE_EXIST=srv") +self.addrule("!DIR_EXIST=srv") +self.addrule("!PACMAN_OUTPUT=cannot remove") -- 2.12.1

2 3

[pacman-dev] [PATCH] Add --with-sudo configure option
by Drew DeVault 12 Apr '17

12 Apr '17

Allows you to specify an alternate command for running things as root, such as OpenBSD's doas. Signed-off-by: Drew DeVault <sir(a)cmpwn.com> --- configure.ac | 9 +++++++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 10e4415c..825b29b9 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,12 @@ AC_ARG_WITH(scriptlet-shell, [set the full path to the shell used to run install scriptlets]), [SCRIPTLET_SHELL=$withval], [SCRIPTLET_SHELL=/bin/sh]) +# Help line for changing sudo command +AC_ARG_WITH(sudo, + AS_HELP_STRING([--with-sudo=sudo], + [set the command used to run pacman as root]), + [SUDOCMD=$withval], [SUDOCMD=sudo]) + # Help line for ldconfig path AC_ARG_WITH(ldconfig, AS_HELP_STRING([--with-ldconfig=path], @@ -509,6 +515,9 @@ AC_DEFINE_UNQUOTED([TEMPLATE_DIR], "$TEMPLATE_DIR", [The template directory used # Set makepkg split debugging symbol package suffix AC_SUBST(DEBUGSUFFIX) AC_DEFINE_UNQUOTED([DEBUGSUFFIX], "$DEBUGSUFFIX", [The suffix for debugging symbol packages used by makepkg]) +# Set sudo command +AC_SUBST(SUDOCMD) +AC_DEFINE_UNQUOTED([SUDOCMD], "$SUDOCMD", [The command used to run pacman as root]) # Set shell used by install scriptlets AC_SUBST(SCRIPTLET_SHELL) AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The full path of the shell used to run install scriptlets]) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4bb08a24..ccfe7384 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -148,6 +148,7 @@ edit = sed \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ + -e 's|@SUDOCMD[@]|$(SUDOCMD)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e "s|@OWNERCMD[@]|$(OWNERCMD)|g" \ -e "s|@MODECMD[@]|$(MODECMD)|g" \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29408929..5128216a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -212,8 +212,8 @@ run_pacman() { cmd=("$PACMAN_PATH" "$@") fi if [[ $1 != -@(T|Qq|Q) ]]; then - if type -p sudo >/dev/null; then - cmd=(sudo "${cmd[@]}") + if type -p @SUDOCMD@ >/dev/null; then + cmd=(@SUDOCMD@ "${cmd[@]}") else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi @@ -1015,8 +1015,8 @@ check_software() { # check for sudo if we will need it during makepkg execution if (( DEP_BIN || RMDEPS || INSTALL )); then - if ! type -p sudo >/dev/null; then - warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" + if ! type -p @SUDOCMD@ >/dev/null; then + warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "@SUDOCMD@" "su" fi fi -- 2.12.0

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-150-g13ec13c8
by allan＠archlinux.org 12 Apr '17

12 Apr '17

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 13ec13c85e4ea39e51d58b0842d8bef50e2ae369 (commit) via 04d211effa8d65020887112ee30c7b3b0fc28ad3 (commit) via 86f5c74694cb0403eaf11fa4734f307a0df345cb (commit) via 1af766987f66c63b029578374d679a353960d46d (commit) via d9908fc1f272a2859b525c3bd92d9f3e8a2a6293 (commit) via a138db3c07553cfd252495a3c406e11457075e79 (commit) via a202959a1973564474d39e2dbd76ca4ad1302eed (commit) via 5678298f7dc8e0d4394e477a1a64d734e65a3ef0 (commit) via c635f185ba86967cd8de9c31890b57e558f65e9b (commit) via 64bd242863504b6ffe138dc8af2b7c6d7a353f76 (commit) via 008fe7b24fded17e4a1a235885057263a3dc413a (commit) from 9ad7cda9d8847b6e664f603d6f6c10a7c4fc45a8 (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 13ec13c85e4ea39e51d58b0842d8bef50e2ae369 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 9 20:42:02 2017 -0400 deprecate --force in favor of --overwrite --force is widely misunderstood and the same effect can now be achieved with --overwrite, which is better named and can be used more safely. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 04d211effa8d65020887112ee30c7b3b0fc28ad3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 9 20:42:01 2017 -0400 add --overwrite option to ignore file conflicts Allows for safer, more fine-grained control for overwriting files than --force's all-or-nothing approach. Implements FS#31549. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 86f5c74694cb0403eaf11fa4734f307a0df345cb Author: Armin K <krejzi(a)email.com> Date: Mon Mar 6 21:15:20 2017 +0100 libalpm: Use archive_read_extract2 archive_read_extract() forces resolution of uid/gid to names when extracting the tarball. This can lead to wrong file ownership when using pacman with -r option and when uid/gid differ in the host and in the chroot. archive_read_extract2() uses uid's and gid's only. See also: https://lists.archlinux.org/pipermail/pacman-dev/2017-March/021912.html Signed-off-by: Armin K <krejzi(a)email.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1af766987f66c63b029578374d679a353960d46d Author: Drew DeVault <sir(a)cmpwn.com> Date: Sun Mar 19 22:55:00 2017 -0400 Replace @SIZECMD@ with POSIX-compatible command Now uses wc -c $file | cut -d' ' -f1, which works using only POSIX commands and removes the need for any platform-specific usages. Signed-off-by: Drew DeVault <sir(a)cmpwn.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d9908fc1f272a2859b525c3bd92d9f3e8a2a6293 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 18 17:09:50 2017 -0500 parse stdin as newline-separated Newline-separated input is more reliable because most of the arguments we accept over stdin can validly contain spaces but not newlines. Resolves FS#52992 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a138db3c07553cfd252495a3c406e11457075e79 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 18 17:09:49 2017 -0500 add alpm_list_append_strdup Makes error detection and handling easier for a common operation. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a202959a1973564474d39e2dbd76ca4ad1302eed Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 27 08:33:30 2017 -0400 pactest: add --review option Opens the test file(s), test output, and any log files in the test environment in an editor after the tests run for review. Simplifies debugging tests by avoiding the need to use --keep-root and manually opening the relevant files. The editor used can be set with --editor or $EDITOR, falling back to vim. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5678298f7dc8e0d4394e477a1a64d734e65a3ef0 Author: Michael Straube <straubem(a)gmx.de> Date: Sat Mar 25 21:36:50 2017 +0100 Ignore comments in INSTALL files (FS#51916) If a comment in an INSTALL file contains the name of a valid INSTALL file function but the function itself is not present, pacman tries to execute that function. That leads to an error. Ignore comments in the grep function in libalpm/trans.c to avoid such errors. Signed-off-by: Michael Straube <straubem(a)gmx.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c635f185ba86967cd8de9c31890b57e558f65e9b Author: Christian Hesse <mail(a)eworm.de> Date: Fri Dec 2 11:53:53 2016 +0100 Introduce a 'disable-download-timeout' option Add command line option ('--disable-download-timeout') and config file option ('DisableDownloadTimeout') to disable defaults for low speed limit and timeout on downloads. Use this if you have issues downloading files with proxy and/or security gateway. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 64bd242863504b6ffe138dc8af2b7c6d7a353f76 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 4 15:32:14 2017 +1000 alpm_fetch_pkgurl: fix memory leak Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 008fe7b24fded17e4a1a235885057263a3dc413a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 4 15:24:23 2017 +1000 Fix memory leak in alpm_pkg_checkmd5sum Also remove redundant additional return path. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 -- doc/pacman.8.txt | 24 +++++--- doc/pacman.conf.5.txt | 4 ++ lib/libalpm/add.c | 16 ++++- lib/libalpm/alpm.h | 7 +++ lib/libalpm/alpm_list.c | 20 +++++++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/conflict.c | 14 +++-- lib/libalpm/dload.c | 8 ++- lib/libalpm/handle.c | 31 ++++++++++ lib/libalpm/handle.h | 2 + lib/libalpm/package.c | 6 +- lib/libalpm/trans.c | 4 ++ scripts/pkgdelta.sh.in | 4 +- scripts/repo-add.sh.in | 6 +- src/pacman/conf.c | 6 ++ src/pacman/conf.h | 6 +- src/pacman/pacman.c | 70 ++++++++++++---------- test/pacman/pactest.py | 41 ++++++++++++- test/pacman/tests/TESTS | 3 + test/pacman/tests/overwrite-files-match-negated.py | 13 ++++ test/pacman/tests/overwrite-files-match.py | 13 ++++ test/pacman/tests/overwrite-files-nonmatch.py | 13 ++++ 23 files changed, 253 insertions(+), 64 deletions(-) create mode 100644 test/pacman/tests/overwrite-files-match-negated.py create mode 100644 test/pacman/tests/overwrite-files-match.py create mode 100644 test/pacman/tests/overwrite-files-nonmatch.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] add --overwrite option to ignore file conflicts
by Andrew Gregory 10 Apr '17

10 Apr '17

Allows for safer, more fine-grained control for overwriting files than --force's all-or-nothing approach. Implements FS#31549. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/pacman.8.txt | 12 ++++++++++++ lib/libalpm/alpm.h | 5 +++++ lib/libalpm/conflict.c | 14 ++++++++++---- lib/libalpm/handle.c | 21 +++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 2 ++ src/pacman/conf.h | 2 ++ src/pacman/pacman.c | 6 ++++++ test/pacman/tests/TESTS | 3 +++ test/pacman/tests/overwrite-files-match-negated.py | 13 +++++++++++++ test/pacman/tests/overwrite-files-match.py | 13 +++++++++++++ test/pacman/tests/overwrite-files-nonmatch.py | 13 +++++++++++++ 12 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/overwrite-files-match-negated.py create mode 100644 test/pacman/tests/overwrite-files-match.py create mode 100644 test/pacman/tests/overwrite-files-nonmatch.py diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index f940d05c..19b959b1 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -266,6 +266,18 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] *\--needed*:: Do not reinstall the targets that are already up-to-date. +*\--overwrite* <glob>:: + Bypass file conflict checks and overwrite conflicting files. If the + package that is about to be installed contains files that are already + installed and match 'glob', this option will cause all those files to be + overwritten. Using '\--overwrite' will not allow overwriting a directory + with a file or installing packages with conflicting files and directories. + Multiple patterns can be specified by separating them with a comma. May be + specified multiple times. Patterns can be negated, such that files + matching them will not be overwritten, by prefixing them with an + exclamation mark. Subsequent matches will override previous ones. A leading + literal exclamation mark or backslash needs to be escaped. + Query Options (apply to '-Q')[[QO]] ----------------------------------- diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 49cf200a..de0adc1e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -830,6 +830,11 @@ int alpm_option_add_hookdir(alpm_handle_t *handle, const char *hookdir); int alpm_option_remove_hookdir(alpm_handle_t *handle, const char *hookdir); /** @} */ +alpm_list_t *alpm_option_get_overwrite_files(alpm_handle_t *handle); +int alpm_option_set_overwrite_files(alpm_handle_t *handle, alpm_list_t *globs); +int alpm_option_add_overwrite_file(alpm_handle_t *handle, const char *glob); +int alpm_option_remove_overwrite_file(alpm_handle_t *handle, const char *glob); + /** Returns the logfile name. */ const char *alpm_option_get_logfile(alpm_handle_t *handle); /** Sets the logfile name. */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b1666dfe..0e37419f 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -385,6 +385,12 @@ static alpm_list_t *alpm_db_find_file_owners(alpm_db_t* db, const char *path) return owners; } +static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path) +{ + return handle->trans->flags & ALPM_TRANS_FLAG_FORCE + || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0; +} + /** * @brief Find file conflicts that may occur during the transaction. * @@ -448,8 +454,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* can skip file-file conflicts when forced * * checking presence in p2_files detects dir-file or file-dir * conflicts as the path from p1 is returned */ - if((handle->trans->flags & ALPM_TRANS_FLAG_FORCE) && - alpm_filelist_contains(p2_files, filename)) { + if(_alpm_can_overwrite_file(handle, filename) + && alpm_filelist_contains(p2_files, filename)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s exists in both '%s' and '%s'\n", filename, p1->name, p2->name); @@ -654,8 +660,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } /* skip file-file conflicts when being forced */ - if((handle->trans->flags & ALPM_TRANS_FLAG_FORCE) && - !S_ISDIR(lsbuf.st_mode)) { + if(!S_ISDIR(lsbuf.st_mode) + && _alpm_can_overwrite_file(handle, filestr)) { _alpm_log(handle, ALPM_LOG_DEBUG, "conflict with file on filesystem being forced\n"); resolved_conflict = 1; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5a5cd448..9f1b179a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -283,6 +283,12 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignoregroups(alpm_handle_t *handle) return handle->ignoregroup; } +alpm_list_t SYMEXPORT *alpm_option_get_overwrite_files(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->overwrite_files; +} + alpm_list_t SYMEXPORT *alpm_option_get_assumeinstalled(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -657,6 +663,21 @@ int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char * return _alpm_option_strlist_rem(handle, &(handle->ignoregroup), grp); } +int SYMEXPORT alpm_option_add_overwrite_file(alpm_handle_t *handle, const char *glob) +{ + return _alpm_option_strlist_add(handle, &(handle->overwrite_files), glob); +} + +int SYMEXPORT alpm_option_set_overwrite_files(alpm_handle_t *handle, alpm_list_t *globs) +{ + return _alpm_option_strlist_set(handle, &(handle->overwrite_files), globs); +} + +int SYMEXPORT alpm_option_remove_overwrite_file(alpm_handle_t *handle, const char *glob) +{ + return _alpm_option_strlist_rem(handle, &(handle->overwrite_files), glob); +} + int SYMEXPORT alpm_option_add_assumeinstalled(alpm_handle_t *handle, const alpm_depend_t *dep) { alpm_depend_t *depcpy; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index e096bfb3..4c9a0759 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -83,6 +83,7 @@ struct __alpm_handle_t { char *gpgdir; /* Directory where GnuPG files are stored */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ alpm_list_t *hookdirs; /* Paths to hook directories */ + alpm_list_t *overwrite_files; /* Paths that may be overwritten */ /* package lists */ alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 52151c56..cd68aff8 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -781,6 +781,8 @@ static int setup_libalpm(void) alpm_option_set_cachedirs(handle, config->cachedirs); } + alpm_option_set_overwrite_files(handle, config->overwrite_files); + alpm_option_set_default_siglevel(handle, config->siglevel); config->localfilesiglevel = merge_siglevel(config->siglevel, diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 636fec61..e6ab8379 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -122,6 +122,7 @@ typedef struct __config_t { alpm_list_t *assumeinstalled; alpm_list_t *noupgrade; alpm_list_t *noextract; + alpm_list_t *overwrite_files; char *xfercommand; /* our connection to libalpm */ @@ -171,6 +172,7 @@ enum { OP_GPGDIR, OP_DBONLY, OP_FORCE, + OP_OVERWRITE_FILES, OP_COLOR, OP_DBPATH, OP_CASCADE, diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index a459cf00..2e31fcfc 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -190,6 +190,8 @@ static void usage(int op, const char * const myname) case PM_OP_SYNC: case PM_OP_UPGRADE: addlist(_(" --force force install, overwrite conflicting files\n")); + addlist(_(" --overwrite <path>\n" + " overwrite conflicting files (can be used more than once)\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -703,6 +705,9 @@ static int parsearg_upgrade(int opt) case OP_FORCE: config->flags |= ALPM_TRANS_FLAG_FORCE; break; + case OP_OVERWRITE_FILES: + parsearg_util_addlist(&(config->overwrite_files)); + break; case OP_ASDEPS: config->flags |= ALPM_TRANS_FLAG_ALLDEPS; break; @@ -924,6 +929,7 @@ static int parseargs(int argc, char *argv[]) {"assume-installed", required_argument, 0, OP_ASSUMEINSTALLED}, {"debug", optional_argument, 0, OP_DEBUG}, {"force", no_argument, 0, OP_FORCE}, + {"overwrite", required_argument, 0, OP_OVERWRITE_FILES}, {"noprogressbar", no_argument, 0, OP_NOPROGRESSBAR}, {"noscriptlet", no_argument, 0, OP_NOSCRIPTLET}, {"ask", required_argument, 0, OP_ASK}, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 11d1c38c..eadb63b4 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -80,6 +80,9 @@ TESTS += test/pacman/tests/mode001.py TESTS += test/pacman/tests/mode002.py TESTS += test/pacman/tests/mode003.py TESTS += test/pacman/tests/noupgrade-inverted.py +TESTS += test/pacman/tests/overwrite-files-match-negated.py +TESTS += test/pacman/tests/overwrite-files-match.py +TESTS += test/pacman/tests/overwrite-files-nonmatch.py TESTS += test/pacman/tests/pacman001.py TESTS += test/pacman/tests/pacman002.py TESTS += test/pacman/tests/pacman003.py diff --git a/test/pacman/tests/overwrite-files-match-negated.py b/test/pacman/tests/overwrite-files-match-negated.py new file mode 100644 index 00000000..42b1be2d --- /dev/null +++ b/test/pacman/tests/overwrite-files-match-negated.py @@ -0,0 +1,13 @@ +self.description = "Install a package with an existing file matching a negated --overwrite pattern" + +p = pmpkg("dummy") +p.files = ["foobar"] +self.addpkg(p) + +self.filesystem = ["foobar*"] + +self.args = "-U --overwrite=foobar --overwrite=!foo* %s" % p.filename() + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_MODIFIED=foobar") diff --git a/test/pacman/tests/overwrite-files-match.py b/test/pacman/tests/overwrite-files-match.py new file mode 100644 index 00000000..004155c3 --- /dev/null +++ b/test/pacman/tests/overwrite-files-match.py @@ -0,0 +1,13 @@ +self.description = "Install a package with an existing file matching an --overwrite pattern" + +p = pmpkg("dummy") +p.files = ["foobar"] +self.addpkg(p) + +self.filesystem = ["foobar*"] + +self.args = "-U --overwrite=foobar %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("FILE_MODIFIED=foobar") diff --git a/test/pacman/tests/overwrite-files-nonmatch.py b/test/pacman/tests/overwrite-files-nonmatch.py new file mode 100644 index 00000000..38932d5f --- /dev/null +++ b/test/pacman/tests/overwrite-files-nonmatch.py @@ -0,0 +1,13 @@ +self.description = "Install a package with an existing file not matching --overwrite patterns" + +p = pmpkg("dummy") +p.files = ["foobar"] +self.addpkg(p) + +self.filesystem = ["foobar*"] + +self.args = "-U --overwrite=foo %s" % p.filename() + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_MODIFIED=foobar") -- 2.12.1

1 1

[pacman-dev] [PATCH] libalpm: Use archive_read_extract2
by Armin K 10 Apr '17

10 Apr '17

archive_read_extract() forces resolution of uid/gid to names when extracting the tarball. This can lead to wrong file ownership when using pacman with -r option and when uid/gid differ in the host and in the chroot. archive_read_extract2() uses uid's and gid's only. See also: https://lists.archlinux.org/pipermail/pacman-dev/2017-March/021912.html Signed-off-by: Armin K <krejzi(a)email.com> --- lib/libalpm/add.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c5bed817..0beed01c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -110,6 +110,7 @@ static int perform_extraction(alpm_handle_t *handle, struct archive *archive, struct archive_entry *entry, const char *filename) { int ret; + struct archive *archive_writer; const int archive_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME | @@ -118,7 +119,20 @@ static int perform_extraction(alpm_handle_t *handle, struct archive *archive, archive_entry_set_pathname(entry, filename); - ret = archive_read_extract(archive, entry, archive_flags); + archive_writer = archive_write_disk_new(); + if (archive_writer == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("cannot allocate disk archive object")); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "error: cannot allocate disk archive object"); + return 1; + } + + archive_write_disk_set_options(archive_writer, archive_flags); + + ret = archive_read_extract2(archive, entry, archive_writer); + + archive_write_free(archive_writer); + if(ret == ARCHIVE_WARN && archive_errno(archive) != ENOSPC) { /* operation succeeded but a "non-critical" error was encountered */ _alpm_log(handle, ALPM_LOG_WARNING, _("warning given when extracting %s (%s)\n"), -- 2.12.0

3 2

[pacman-dev] [PATCH] makepkg: add flag 'recvkeys' to retrieve PGP keys from 'validpgpkeys' in PKGBUILDs
by alzeih＠gmail.com 04 Apr '17

04 Apr '17

This makes automating PGP keys for verifying source file signatures possible. This may make it easier for package users and maintainers to obtain PGP keys used in PKGBUILDs. Signed-off-by: Alli <alzeih(a)gmail.com> --- doc/makepkg.8.txt | 4 ++++ scripts/libmakepkg/integrity.sh.in | 2 ++ .../libmakepkg/integrity/verify_signature.sh.in | 22 ++++++++++++++++++++++ scripts/makepkg.sh.in | 15 +++++++++++++-- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 2dff1b19..88b709f4 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -171,6 +171,10 @@ Options *\--noprepare*:: Do not run the prepare() function in the PKGBUILD. +*\--recvkeys*:: + Retrieve PGP signing keys used in the PKGBUILD for verifying source + integrity into the gpg keyring. + *\--sign*:: Sign the resulting package with gpg, overriding the setting in linkman:makepkg.conf[5]. diff --git a/scripts/libmakepkg/integrity.sh.in b/scripts/libmakepkg/integrity.sh.in index 3a77ef16..3d3d071b 100644 --- a/scripts/libmakepkg/integrity.sh.in +++ b/scripts/libmakepkg/integrity.sh.in @@ -34,11 +34,13 @@ check_source_integrity() { warning "$(gettext "Skipping all source file integrity checks.")" elif (( SKIPCHECKSUMS )); then warning "$(gettext "Skipping verification of source file checksums.")" + get_pgpsigs "$@" check_pgpsigs "$@" elif (( SKIPPGPCHECK )); then warning "$(gettext "Skipping verification of source file PGP signatures.")" check_checksums "$@" else + get_pgpsigs "$@" check_checksums "$@" check_pgpsigs "$@" fi diff --git a/scripts/libmakepkg/integrity/verify_signature.sh.in b/scripts/libmakepkg/integrity/verify_signature.sh.in index b5577523..e8890932 100644 --- a/scripts/libmakepkg/integrity/verify_signature.sh.in +++ b/scripts/libmakepkg/integrity/verify_signature.sh.in @@ -26,6 +26,28 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" +get_pgpsigs() { + ! source_has_signatures && return 0 + (( ! RECVKEYS )) && return 0 + + msg "$(gettext "Receiving PGP keys for verifying source file signatures with %s...")" "gpg" + + local key + local errors=0 + + for key in "${validpgpkeys[@]}"; do + gpg --recv-keys "$key" + if [ $? != 0 ]; then + errors=1 + fi + done + + if (( errors )); then + error "$(gettext "One or more PGP keys could not be retrieved!")" + exit 1 + fi +} + check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29408929..1a6ca831 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -78,6 +78,7 @@ NOEXTRACT=0 PKGFUNC=0 PKGVERFUNC=0 PREPAREFUNC=0 +RECVKEYS=0 REPKG=0 RMDEPS=0 SKIPCHECKSUMS=0 @@ -1044,6 +1045,14 @@ check_software() { fi fi + # gpg - receive source verification keys + if (( RECVKEYS )) && source_has_signatures; then + if ! type -p gpg >/dev/null; then + error "$(gettext "Cannot find the %s binary required for receiving keys for verifying source files.")" "gpg" + ret=1 + fi + fi + # checksum operations if (( GENINTEG || ! SKIPCHECKSUMS )); then local integlist @@ -1218,6 +1227,7 @@ usage() { printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" + printf -- "$(gettext " --recvkeys Receive PGP Keys used for verifying source integrity")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -1263,8 +1273,8 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' - 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') + 'printsrcinfo' 'recvkeys' 'repackage' 'rmdeps' 'sign' 'skipchecksums' + 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -1309,6 +1319,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; --printsrcinfo) PRINTSRCINFO=1 IGNOREARCH=1;; + --recvkeys) RECVKEYS=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; -- 2.12.1

4 8