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 4f2fea240d3039294f6614003206a3dd1f67cfc5 (commit) via 3c013f68ac06d791830fd722b17bc771df47d436 (commit) via fae33a1faf3f94ea46049664ef483b2a3e0d3f01 (commit) via 6a4c6a02de9b45abe4c0f78c4f5d14d92d3359d6 (commit) via 6d1dcf7937ba3739d17eda614591d1f59ac0bf3a (commit) via 16b91f798faf6413f9b043543c5c0c3467b6fdbf (commit) via f9de3b22ad9e532af14c8d5b0b90a3f0f747e331 (commit) via a8670304c9393cbff350fcff7234d8f166dbcf60 (commit) via 098e114f586df383e5c3863fadbf4958b5b244e6 (commit) via 1550938ce1a081c4edc058b55ee34b320b849299 (commit) via 9c763a0d1ba8aa56b1ff54cd8d137c6b73e19f11 (commit) from 13ec13c85e4ea39e51d58b0842d8bef50e2ae369 (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 4f2fea240d3039294f6614003206a3dd1f67cfc5 Author: Michael Straube Date: Wed Apr 12 16:53:53 2017 +0200 makepkg: clean up pkgver and prepare log files 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 Signed-off-by: Allan McRae commit 3c013f68ac06d791830fd722b17bc771df47d436 Author: Andrew Gregory Date: Sun Apr 16 08:36:32 2017 -0400 run_chroot: label pipe endpoints for readability Signed-off-by: Andrew Gregory commit fae33a1faf3f94ea46049664ef483b2a3e0d3f01 Author: Andrew Gregory Date: Sun Apr 16 00:31:57 2017 -0400 add --sysroot option --root is not sufficient to properly operate on a mounted guest system. Using --root still uses the host system's configuration and there is no way to correctly use the guest configuration without manually modifying any Include directives. --sysroot provides an easier way to operate on a guest system by chrooting immediately after option parsing before configuration parsing or performing any operations. It is currently limited to the root user, but that's enough for restoring a guest system to a working state, which is the primary intended use case. Signed-off-by: Andrew Gregory commit 6a4c6a02de9b45abe4c0f78c4f5d14d92d3359d6 Author: Andrew Gregory Date: Sat Apr 15 18:22:51 2017 -0400 use sockets for scriptlet/hook communication 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 commit 6d1dcf7937ba3739d17eda614591d1f59ac0bf3a Author: Andrew Gregory Date: Sat Apr 15 18:12:56 2017 -0400 conflict: include owner for filesystem conflicts Signed-off-by: Andrew Gregory commit 16b91f798faf6413f9b043543c5c0c3467b6fdbf Author: Andrew Gregory Date: Sun Apr 9 19:49:17 2017 -0400 unlink_file: strip trailing slashes 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 commit f9de3b22ad9e532af14c8d5b0b90a3f0f747e331 Author: Andrew Gregory Date: Sat Apr 15 17:29:07 2017 -0400 sortbydeps: rename vptr -> i vptr is a simple list iterator, which are typically named i. Signed-off-by: Andrew Gregory commit a8670304c9393cbff350fcff7234d8f166dbcf60 Author: Andrew Gregory Date: Sat Apr 15 17:28:37 2017 -0400 sortbydeps: rename found -> switched_to_child Signed-off-by: Andrew Gregory commit 098e114f586df383e5c3863fadbf4958b5b244e6 Author: Andrew Gregory Date: Sat Apr 15 17:26:35 2017 -0400 sortbydeps: factor out dep cycle warning Signed-off-by: Andrew Gregory commit 1550938ce1a081c4edc058b55ee34b320b849299 Author: Andrew Gregory Date: Sat Apr 15 14:33:50 2017 -0400 graph.h: rename childptr -> iterator Signed-off-by: Andrew Gregory commit 9c763a0d1ba8aa56b1ff54cd8d137c6b73e19f11 Author: Andrew Gregory Date: Sat Apr 15 14:11:43 2017 -0400 graph.h: replace hardcoded values with an enum Signed-off-by: Andrew Gregory ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 11 ++- lib/libalpm/conflict.c | 25 ++++- lib/libalpm/delta.c | 14 +-- lib/libalpm/deps.c | 104 +++++++++++---------- lib/libalpm/graph.h | 10 +- lib/libalpm/remove.c | 13 ++- lib/libalpm/util.c | 46 +++++---- scripts/makepkg.sh.in | 6 ++ src/pacman/conf.h | 2 + src/pacman/pacman.c | 24 +++-- src/pacman/sync.c | 9 +- src/pacman/util.c | 3 + test/pacman/tests/TESTS | 2 + .../tests/file-conflict-with-installed-pkg.py | 17 ++++ .../remove-directory-replaced-with-symlink.py | 16 ++++ 15 files changed, 202 insertions(+), 100 deletions(-) create mode 100644 test/pacman/tests/file-conflict-with-installed-pkg.py create mode 100644 test/pacman/tests/remove-directory-replaced-with-symlink.py hooks/post-receive -- The official pacman repository