- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-116-gf34e48a
by allan＠archlinux.org 15 Mar '15

15 Mar '15

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 f34e48a9886150147da4864230b6804d6f6ccc58 (commit) via f9cb4f3b9cc693a3723bd840682d399bcd1f3c87 (commit) via 22a5128985dae3d480cbc41f54eb0782b1c1bec1 (commit) via 0aded7487f96685b762810df7e34d3b8ba84c7be (commit) from 156d41a18628d6e63cc49cfcb27e9c96826f9e74 (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 f34e48a9886150147da4864230b6804d6f6ccc58 Author: Charles Pigott <charlespigott(a)googlemail.com> Date: Sun Mar 8 12:11:09 2015 +1000 Actually return the error value of check_db_local Signed-off-by: Charles Pigott <charlespigott(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9cb4f3b9cc693a3723bd840682d399bcd1f3c87 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 8 12:02:50 2015 +1000 libmakepkg: move helper functions into tidy/strip Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 22a5128985dae3d480cbc41f54eb0782b1c1bec1 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Mar 4 18:19:32 2015 +0100 PKGBUILD.5.txt: Clarify note about variables available Reported-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0aded7487f96685b762810df7e34d3b8ba84c7be Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Mar 4 18:19:31 2015 +0100 PKGBUILD.5.txt: Add note about functions starting in $srcdir Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 6 +++-- scripts/libmakepkg/tidy/strip.sh.in | 50 +++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 48 ----------------------------------- src/pacman/database.c | 2 +- 4 files changed, 55 insertions(+), 51 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix minor bug in database.c
by Charles Pigott 08 Mar '15

08 Mar '15

I was idly browsing the pacman source code, when i noticed this. Told you it was minor! (Hopefully git/gmail haven't screwed up tabs/spaces too badly) Charles Pigott (1): Actually return the error value of check_db_local src/pacman/database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.3.1 >From e4423cc941f02ebefd450d1b75465686c3f03c10 Mon Sep 17 00:00:00 2001 From: Charles Pigott <charlespigott(a)googlemail.com> Date: Thu, 5 Mar 2015 12:15:51 +0000 Subject: [PATCH] Actually return the error value of check_db_local Signed-off-by: Charles Pigott <charlespigott(a)googlemail.com> --- src/pacman/database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/database.c b/src/pacman/database.c index abc3fd2..2b694ae 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -253,7 +253,7 @@ static int check_db_local(void) { ret += check_db_local_package_conflicts(pkglist); ret += check_db_local_filelist_conflicts(pkglist); - return 0; + return ret; } /** -- 2.3.1

2 1

[pacman-dev] [PATCH] libmakepkg: move helper functions into tidy/strip
by Allan McRae 08 Mar '15

08 Mar '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 50 +++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 48 ----------------------------------- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 15d92be..12a7eee 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -30,6 +30,56 @@ source "$LIBRARY/util/option.sh" packaging_options+=('strip' 'debug') tidy_modify+=('tidy_strip') + +build_id() { + LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }' +} + +strip_file() { + local binary=$1; shift + + if check_option "debug" "y"; then + local bid=$(build_id "$binary") + + # has this file already been stripped + if [[ -n "$bid" ]]; then + if [[ -f "$dbgdir/.build-id/${bid:0:2}/${bid:2}.debug" ]]; then + return + fi + elif [[ -f "$dbgdir/$binary.debug" ]]; then + return + fi + + mkdir -p "$dbgdir/${binary%/*}" + objcopy --only-keep-debug "$binary" "$dbgdir/$binary.debug" + objcopy --add-gnu-debuglink="$dbgdir/${binary#/}.debug" "$binary" + + # create any needed hardlinks + while read -rd '' file ; do + if [[ "${binary}" -ef "${file}" && ! -f "$dbgdir/${file}.debug" ]]; then + mkdir -p "$dbgdir/${file%/*}" + ln "$dbgdir/${binary}.debug" "$dbgdir/${file}.debug" + fi + done < <(find . -type f -perm -u+w -print0 2>/dev/null) + + if [[ -n "$bid" ]]; then + local target + mkdir -p "$dbgdir/.build-id/${bid:0:2}" + + target="../../../../../${binary#./}" + target="${target/..\/..\/usr\/lib\/}" + target="${target/..\/usr\/}" + ln -s "$target" "$dbgdir/.build-id/${bid:0:2}/${bid:2}" + + target="../../${binary#./}.debug" + ln -s "$target" "$dbgdir/.build-id/${bid:0:2}/${bid:2}.debug" + fi + fi + + strip $@ "$binary" +} + + tidy_strip() { if check_option "strip" "y"; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a9c2ebb..168f334 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1615,54 +1615,6 @@ run_package() { run_function_safe "$pkgfunc" } -build_id() { - LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }' -} - -strip_file() { - local binary=$1; shift - - if check_option "debug" "y"; then - local bid=$(build_id "$binary") - - # has this file already been stripped - if [[ -n "$bid" ]]; then - if [[ -f "$dbgdir/.build-id/${bid:0:2}/${bid:2}.debug" ]]; then - return - fi - elif [[ -f "$dbgdir/$binary.debug" ]]; then - return - fi - - mkdir -p "$dbgdir/${binary%/*}" - objcopy --only-keep-debug "$binary" "$dbgdir/$binary.debug" - objcopy --add-gnu-debuglink="$dbgdir/${binary#/}.debug" "$binary" - - # create any needed hardlinks - while read -rd '' file ; do - if [[ "${binary}" -ef "${file}" && ! -f "$dbgdir/${file}.debug" ]]; then - mkdir -p "$dbgdir/${file%/*}" - ln "$dbgdir/${binary}.debug" "$dbgdir/${file}.debug" - fi - done < <(find . -type f -perm -u+w -print0 2>/dev/null) - - if [[ -n "$bid" ]]; then - local target - mkdir -p "$dbgdir/.build-id/${bid:0:2}" - - target="../../../../../${binary#./}" - target="${target/..\/..\/usr\/lib\/}" - target="${target/..\/usr\/}" - ln -s "$target" "$dbgdir/.build-id/${bid:0:2}/${bid:2}" - - target="../../${binary#./}.debug" - ln -s "$target" "$dbgdir/.build-id/${bid:0:2}/${bid:2}.debug" - fi - fi - - strip $@ "$binary" -} - find_libdepends() { local d sodepends; -- 2.3.1

1 0

[pacman-dev] [PATCH v3 1/2] PKGBUILD.5.txt: Add note about functions starting in $srcdir
by Johannes Löthberg 04 Mar '15

04 Mar '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- doc/PKGBUILD.5.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 10980ab..b02a06e 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -374,6 +374,8 @@ variables for use during the build and install process: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the packaging functions defined above are run starting inside `$srcdir` *pkgdir*:: This contains the directory where makepkg bundles the installed package. -- 2.3.1

1 1

[pacman-dev] QNX patches, v2
by Will Miles 04 Mar '15

04 Mar '15

This patch set is a cleaned up version of the the first attempt to add QNX support. Changes from the first version include: * Using Markus Kuhn's implementation of wcwidth and wcswidth * Breaking the mkdtemp replacement into its own patch, with a proper configure test instead of #ifdef __QNX__ * Cleaning up code style everywhere. Sorry! Thanks again for taking the time to review my first attempt.

2 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-112-g156d41a
by allan＠archlinux.org 03 Mar '15

03 Mar '15

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 156d41a18628d6e63cc49cfcb27e9c96826f9e74 (commit) via ba532bda6b558e5bbf429bfa8f806ac8122c8d56 (commit) via ff8de12151047ccf9b0640480bfc624892a5ab7a (commit) via 965539adbf15449533bc5fcb353774f7a4b62277 (commit) via bb94729c098f21ae850044a9201c1d5b92baea1f (commit) via 8f92fe47a7c4d999271bc28ffbbeeea50d686813 (commit) via 578ceb29faa2673b7b0e4f4cc311ba77d6acb4b4 (commit) via 9f1c5f0251c202ad504f03464da23a5050914157 (commit) via d9b5cb238d7e1f7ec998ffd002e15cf9c1a48425 (commit) via fc5be14dac50798024a6dee1d6c3a1acb0154314 (commit) via 2108d9552600bbfd7d7586dfebaa9750dec728ac (commit) via 008bd33e38d666a2c034b8cde10fbabb801e4fc4 (commit) via 92b8c09000ac34e4740deb1e02eaf0cd852cdb0a (commit) from 7879a5b3e5c66d31b9375242f026a40464a6b34f (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 156d41a18628d6e63cc49cfcb27e9c96826f9e74 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 29 18:02:57 2014 -0500 remove: use strcmp for files in skip_remove Paths from noupgrade, the transaction skip_remove, and package backup lists were combined into a single list matched using fnmatch causing paths with glob characters to match unrelated files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ba532bda6b558e5bbf429bfa8f806ac8122c8d56 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 24 09:59:45 2014 -0400 sync_prepare: exclude removals from resolvedeps Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ff8de12151047ccf9b0640480bfc624892a5ab7a Author: David Macek <david.macek.0(a)gmail.com> Date: Sun Mar 1 21:43:40 2015 +0100 Allow UPX compression for DOS/Win executables Hi. This change allows makepkg to UPX-compress executables on Windows, but will probably affect some Linux packages as well (I'm guessing gdbserver, wine, mingw-w64). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 965539adbf15449533bc5fcb353774f7a4b62277 Author: Will Miles <wmiles(a)sgl.com> Date: Fri Feb 27 14:43:24 2015 -0500 common: Avoid errors on systems that define strnlen but not strndup Add a configure test for a system library supplied strnlen, and disable the embedded version in common if one is found. Signed-off-by: Will Miles <wmiles(a)sgl.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bb94729c098f21ae850044a9201c1d5b92baea1f Author: Will Miles <wmiles(a)sgl.com> Date: Fri Feb 27 14:43:23 2015 -0500 util: Use util-common for strndup in pacsort and pactree This small refactor reduces the number of replications of the local imeplementation of strndup. Signed-off-by: Will Miles <wmiles(a)sgl.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8f92fe47a7c4d999271bc28ffbbeeea50d686813 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Feb 25 01:10:35 2015 +1000 calculate_removed_size: ensure llstat succeeds Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 578ceb29faa2673b7b0e4f4cc311ba77d6acb4b4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Feb 25 01:05:20 2015 +1000 sync_cleandb: ensure stat call succeeds Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9f1c5f0251c202ad504f03464da23a5050914157 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Feb 25 01:01:49 2015 +1000 pacsort: test string is not NULL before strlen Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d9b5cb238d7e1f7ec998ffd002e15cf9c1a48425 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Feb 25 00:47:17 2015 +1000 Abort of failure to add version file to empty local database Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc5be14dac50798024a6dee1d6c3a1acb0154314 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 24 20:55:49 2015 +1000 parse_descfile: fix memory leak in error case Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2108d9552600bbfd7d7586dfebaa9750dec728ac Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 24 20:25:48 2015 +1000 Fix memory leaks in dump_pkg_full Leaks when using -Sii with package signatures Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 008bd33e38d666a2c034b8cde10fbabb801e4fc4 Merge: 7879a5b 92b8c09 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 3 14:47:50 2015 +1000 Merge branch 'maint' commit 92b8c09000ac34e4740deb1e02eaf0cd852cdb0a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 2 01:36:33 2015 +1000 Update release history Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +- doc/index.txt | 2 + lib/libalpm/be_local.c | 14 +++- lib/libalpm/be_package.c | 2 +- lib/libalpm/diskspace.c | 7 +- lib/libalpm/remove.c | 82 ++++++++++-------------- lib/libalpm/sync.c | 2 +- scripts/libmakepkg/tidy/upx.sh.in | 8 ++- src/common/util-common.c | 4 +- src/pacman/package.c | 5 ++ src/pacman/sync.c | 5 +- src/util/Makefile.am | 4 +- src/util/pacsort.c | 29 ++------- src/util/pactree.c | 24 +------ src/{pacman => util}/util-common.c | 0 src/{pacman => util}/util-common.h | 0 test/pacman/tests/TESTS | 1 + test/pacman/tests/skip-remove-with-glob-chars.py | 19 ++++++ 18 files changed, 104 insertions(+), 108 deletions(-) copy src/{pacman => util}/util-common.c (100%) copy src/{pacman => util}/util-common.h (100%) create mode 100644 test/pacman/tests/skip-remove-with-glob-chars.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] remove: use strcmp for files in skip_remove
by Andrew Gregory 03 Mar '15

03 Mar '15

Paths from noupgrade, the transaction skip_remove, and package backup lists were combined into a single list matched using fnmatch causing paths with glob characters to match unrelated files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 82 ++++++++++-------------- test/pacman/tests/skip-remove-with-glob-chars.py | 19 ++++++ 2 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 test/pacman/tests/skip-remove-with-glob-chars.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index f9b24ef..42978ae 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -317,20 +317,13 @@ static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, * * @param handle the context handle * @param file file to be removed - * @param skip_remove list of files that will not be removed * * @return 1 if the file can be deleted, 0 if it cannot be deleted */ -static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, - alpm_list_t *skip_remove) +static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file) { char filepath[PATH_MAX]; - if(_alpm_fnmatch_patterns(skip_remove, file->name) == 0) { - /* return success because we will never actually remove this file */ - return 1; - } - snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); if(file->name[strlen(file->name) - 1] == '/' && @@ -433,30 +426,19 @@ cleanup: * @param oldpkg the package being removed * @param newpkg the package replacing \a oldpkg * @param fileobj file to remove - * @param skip_remove list of files that shouldn't be removed * @param nosave whether files should be backed up * * @return 0 on success, -1 if there was an error unlinking the file, 1 if the * file was skipped or did not exist */ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, - alpm_pkg_t *newpkg, const alpm_file_t *fileobj, alpm_list_t *skip_remove, - int nosave) + alpm_pkg_t *newpkg, const alpm_file_t *fileobj, int nosave) { struct stat buf; char file[PATH_MAX]; snprintf(file, PATH_MAX, "%s%s", handle->root, fileobj->name); - /* check the remove skip list before removing the file. - * see the big comment block in db_find_fileconflicts() for an - * explanation. */ - if(_alpm_fnmatch_patterns(skip_remove, fileobj->name) == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "%s is in skip_remove, skipping removal\n", file); - return 1; - } - if(llstat(file, &buf)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file); return 1; @@ -564,6 +546,24 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, } /** + * @brief Check if a package file should be removed. + * + * @param handle the context handle + * @param newpkg the package replacing the current owner of \a path + * @param path file to be removed + * + * @return 1 if the file should be skipped, 0 if it should be removed + */ +static int _should_skip_file(alpm_handle_t *handle, + alpm_pkg_t *newpkg, const char *path) +{ + return _alpm_fnmatch_patterns(handle->noupgrade, path) == 0 + || alpm_list_find_str(handle->trans->skip_remove, path) + || (newpkg && _alpm_needbackup(path, newpkg) + && alpm_filelist_contains(alpm_pkg_get_files(newpkg), path)); +} + +/** * @brief Remove a package's files, optionally skipping its replacement's * files. * @@ -580,44 +580,19 @@ static int remove_package_files(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) { - alpm_list_t *skip_remove; alpm_filelist_t *filelist; size_t i; int err = 0; int nosave = handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE; - if(newpkg) { - alpm_filelist_t *newfiles; - alpm_list_t *b; - skip_remove = alpm_list_join( - alpm_list_strdup(handle->trans->skip_remove), - alpm_list_strdup(handle->noupgrade)); - /* Add files in the NEW backup array to the skip_remove array - * so this removal operation doesn't kill them */ - /* old package backup list */ - newfiles = alpm_pkg_get_files(newpkg); - for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - const alpm_backup_t *backup = b->data; - /* safety check (fix the upgrade026 pactest) */ - if(!alpm_filelist_contains(newfiles, backup->name)) { - continue; - } - _alpm_log(handle, ALPM_LOG_DEBUG, "adding %s to the skip_remove array\n", - backup->name); - skip_remove = alpm_list_add(skip_remove, strdup(backup->name)); - } - } else { - skip_remove = alpm_list_strdup(handle->trans->skip_remove); - } - filelist = alpm_pkg_get_files(oldpkg); for(i = 0; i < filelist->count; i++) { alpm_file_t *file = filelist->files + i; - if(!can_remove_file(handle, file, skip_remove)) { + if(!_should_skip_file(handle, newpkg, file->name) + && !can_remove_file(handle, file)) { _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", oldpkg->name); - FREELIST(skip_remove); RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); } } @@ -633,7 +608,17 @@ static int remove_package_files(alpm_handle_t *handle, /* iterate through the list backwards, unlinking files */ for(i = filelist->count; i > 0; i--) { alpm_file_t *file = filelist->files + i - 1; - if(unlink_file(handle, oldpkg, newpkg, file, skip_remove, nosave) < 0) { + + /* check the remove skip list before removing the file. + * see the big comment block in db_find_fileconflicts() for an + * explanation. */ + if(_should_skip_file(handle, newpkg, file->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s is in skip_remove, skipping removal\n", file->name); + continue; + } + + if(unlink_file(handle, oldpkg, newpkg, file, nosave) < 0) { err++; } @@ -644,7 +629,6 @@ static int remove_package_files(alpm_handle_t *handle, percent, pkg_count, targ_count); } } - FREELIST(skip_remove); if(!newpkg) { /* set progress to 100% after we finish unlinking files */ diff --git a/test/pacman/tests/skip-remove-with-glob-chars.py b/test/pacman/tests/skip-remove-with-glob-chars.py new file mode 100644 index 0000000..039e150 --- /dev/null +++ b/test/pacman/tests/skip-remove-with-glob-chars.py @@ -0,0 +1,19 @@ +self.description = "transferred file with glob characters that match a removed file" + +lp = pmpkg("foo") +lp.files = ["foo/b*r", "foo/bar"] +self.addpkg2db("local", lp) + +sp1 = pmpkg("foo", "1.0-2") +self.addpkg(sp1) + +sp2 = pmpkg("bar", "1.0-2") +sp2.files = ["foo/b*r"] +self.addpkg(sp2) + +self.args = "-U %s %s" % (sp1.filename(), sp2.filename()) + +self.addrule("PKG_VERSION=foo|1.0-2") +self.addrule("PKG_VERSION=bar|1.0-2") +self.addrule("FILE_EXIST=foo/b*r") +self.addrule("!FILE_EXIST=foo/bar") -- 2.1.3

2 3

[pacman-dev] [PATCH] trans_release: do not error on STATE_IDLE
by Andrew Gregory 03 Mar '15

03 Mar '15

If a transaction were actually in STATE_IDLE, which it should never be, the handle would be stuck with a useless transaction and lock file that it can't remove. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/trans.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e5328c5..0c84bb0 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -222,7 +222,6 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) trans = handle->trans; ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); - ASSERT(trans->state != STATE_IDLE, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); int nolock_flag = trans->flags & ALPM_TRANS_FLAG_NOLOCK; -- 1.9.1

2 1

[pacman-dev] [PATCH] sync_prepare: exclude removals from resolvedeps
by Andrew Gregory 03 Mar '15

03 Mar '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 44a0ba8..cf7f0a8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -402,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { alpm_list_t *resolved = NULL; - alpm_list_t *remove = NULL; + alpm_list_t *remove = alpm_list_copy(trans->remove); alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ -- 1.9.0

2 1

[pacman-dev] [PATCH 1/2] PKGBUILD.5.txt: Add note about functions starting in $srcdir
by Johannes Löthberg 03 Mar '15

03 Mar '15

From: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- doc/PKGBUILD.5.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 10980ab..2dba100 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -374,6 +374,9 @@ variables for use during the build and install process: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the above defined packaging functions in PKGBUILDs are run from inside +the `$srcdir` *pkgdir*:: This contains the directory where makepkg bundles the installed package. -- 2.3.0

3 6