August 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

[pacman-dev] Time for a 4.1.1 release?
by Allan McRae 31 Oct '13

31 Oct '13

It looks like the bug reports for 4.1 have stopped, so I guess we should make a maintenance release. There are a couple of new strings to be translated and a couple of issues reported with translations, so I will need to get those on transifex. See: here for a list of bugs reported/fixed: https://bugs.archlinux.org/index.php?do=index&tasks=&project=3&due=111&stat… The PKGBUILD proto files could have the prepare() function added just to be more complete and fix the remaining bug is someone wants to volunteer to do that... Anything I have missed? A bug not assigned to 4.1.1 that should be fixed? Allan

4 7

[pacman-dev] [PATCH] deps.c: check for indirect deps when ordering
by Andrew Gregory 18 Oct '13

18 Oct '13

On upgrades, indirect dependencies were not being detected if there was a dependency in between them that was not part of the transaction. For example, with the dependency chain: pkg1 -> pkg2 -> pkg3, if pkg1 and pkg3 are being upgraded but not pkg2 pacman would not order pkg1 and pkg3 properly. This was particularly problematic when replacements were involved because the replaced package(s) would be removed at the start of the transaction. If an install script required the replacer and lacked a direct dependency, it could fail. Fixes FS#32764. Partially fixes FS#23011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- The need to keep state in order to avoid getting stuck in cyclic dependencies makes this a little ugly (hence the wrapper function). If anybody has a better idea for avoiding those loops, I'd love to clean it up. lib/libalpm/deps.c | 101 +++++++++++++++++++++++++++++++++------- test/pacman/tests/replace100.py | 2 - test/pacman/tests/upgrade100.py | 44 +++++++++++++++++ 3 files changed, 127 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/upgrade100.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 96c49a9..adcdd3a 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -65,8 +65,8 @@ void _alpm_depmiss_free(alpm_depmissing_t *miss) FREE(miss); } -/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */ -static int _alpm_dep_edge(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) +/** Check if pkg2 satisfies a dependency of pkg1 */ +static int _alpm_pkg_depends_on(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_list_t *i; for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) { @@ -77,6 +77,84 @@ static int _alpm_dep_edge(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) return 0; } +static alpm_pkg_t *find_dep_satisfier(alpm_list_t *pkgs, alpm_depend_t *dep) +{ + alpm_list_t *i; + + for(i = pkgs; i; i = i->next) { + alpm_pkg_t *pkg = i->data; + if(_alpm_depcmp(pkg, dep)) { + return pkg; + } + } + return NULL; +} + +/** Check if pkg2 is anywhere in pkg1's dependency tree. + * @param pkg1 + * @param pkg2 + * @param targets if a package in this list is an intermediate dependency + * between pkg1 and pkg2, the pkg1 -> pkg2 dependency will not be + * reported + * @param ignore packages which should not be recursively checked for + * intermediate dependencies. Used internally for state to avoid + * getting stuck on cyclic dependencies. + * @return 1 if pkg2 is found in pkg1's dependency tree + */ +static int _alpm_pkg_in_dep_tree(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, + alpm_list_t *targets, alpm_list_t **ignore) +{ + alpm_list_t *i, *pkgs = alpm_db_get_pkgcache(pkg1->handle->db_local); + + if(_alpm_pkg_depends_on(pkg1, pkg2)) { + return 1; + } + + *ignore = alpm_list_add(*ignore, pkg1); + + /* pkg1 does not directly depend on pkg2, but if this is an upgrade + * operation there may be an indirect dependency through an installed + * dependency not part of the current transaction */ + for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) { + alpm_depend_t *dep = i->data; + alpm_pkg_t *lpkg = find_dep_satisfier(pkgs, dep); + + if(!lpkg) { + continue; + } else if(alpm_list_find(targets, lpkg, _alpm_pkg_cmp)) { + /* lpkg's upgrade is part of the transaction, any dependency will be + * detected separately as pkg1 -> lpkg and lpkg -> pkg2 */ + continue; + } else if(alpm_list_find(*ignore, lpkg, _alpm_pkg_cmp)) { + /* we've already checked lpkg, move on */ + continue; + } else if(_alpm_pkg_in_dep_tree(lpkg, pkg2, targets, ignore)) { + /* we have an indirect dependency: pkg1 -> lpkg -> ... -> pkg2 */ + return 1; + } + } + + return 0; +} + +/** Check if pkg2 is anywhere in pkg1's dependency tree. + * Wrapper for _alpm_pkg_in_dep_tree to handle creating and destroying state. + * @param pkg1 + * @param pkg2 + * @param targets if a package in this list is an intermediate dependency + * between pkg1 and pkg2, the pkg1 -> pkg2 dependency will not be + * reported + * @return 1 if pkg2 is found in pkg1's dependency tree + */ +static int _alpm_dep_edge(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, + alpm_list_t *targets) +{ + alpm_list_t *ignore = NULL; + int ret = _alpm_pkg_in_dep_tree(pkg1, pkg2, targets, &ignore); + alpm_list_free(ignore); + return ret; +} + /* Convert a list of alpm_pkg_t * to a graph structure, * with a edge for each dependency. * Returns a list of vertices (one vertex = one package) @@ -101,7 +179,7 @@ static alpm_list_t *dep_graph_init(alpm_list_t *targets) for(j = vertices; j; j = j->next) { alpm_graph_t *vertex_j = j->data; alpm_pkg_t *p_j = vertex_j->data; - if(_alpm_dep_edge(p_i, p_j)) { + if(_alpm_dep_edge(p_i, p_j, targets)) { vertex_i->children = alpm_list_add(vertex_i->children, vertex_j); } @@ -229,19 +307,6 @@ static void release_filtered_depend(alpm_depend_t *dep, int nodepversion) } } -static alpm_pkg_t *find_dep_satisfier(alpm_list_t *pkgs, alpm_depend_t *dep) -{ - alpm_list_t *i; - - for(i = pkgs; i; i = i->next) { - alpm_pkg_t *pkg = i->data; - if(_alpm_depcmp(pkg, dep)) { - return pkg; - } - } - return NULL; -} - /** Find a package satisfying a specified dependency. * The dependency can include versions with depmod operators. * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfier will be searched @@ -517,7 +582,7 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, /* see if other packages need it */ for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { alpm_pkg_t *lpkg = i->data; - if(_alpm_dep_edge(lpkg, pkg) && !alpm_pkg_find(targets, lpkg->name)) { + if(_alpm_pkg_depends_on(lpkg, pkg) && !alpm_pkg_find(targets, lpkg->name)) { return 0; } } @@ -549,7 +614,7 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) alpm_pkg_t *pkg = i->data; for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { alpm_pkg_t *deppkg = j->data; - if(_alpm_dep_edge(pkg, deppkg) + if(_alpm_pkg_depends_on(pkg, deppkg) && can_remove_package(db, deppkg, targs, include_explicit)) { alpm_pkg_t *copy; _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n", diff --git a/test/pacman/tests/replace100.py b/test/pacman/tests/replace100.py index f94ca0f..dcb7111 100644 --- a/test/pacman/tests/replace100.py +++ b/test/pacman/tests/replace100.py @@ -41,5 +41,3 @@ self.addrule("PKG_VERSION=kernel26|2.6.37.1-1") self.addrule("FILE_EXIST=sbin/blkid") self.addrule("FILE_EXIST=foundit") - -self.expectfailure = True diff --git a/test/pacman/tests/upgrade100.py b/test/pacman/tests/upgrade100.py new file mode 100644 index 0000000..3f7a021 --- /dev/null +++ b/test/pacman/tests/upgrade100.py @@ -0,0 +1,44 @@ +self.description = "Indirect dependency ordering (FS#32764)" + +lp1 = pmpkg("fcitx-gtk2", "1.0-1"); +lp1.depends = ["gtk2"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("gtk2", "1.0-1"); +lp2.depends = ["pango"] +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pango", "1.0-1"); +lp3.depends = ["harfbuzz"] +self.addpkg2db("local", lp3) + +lp4 = pmpkg("harfbuzz", "1.0-1"); +lp4.depends = ["icu"] +self.addpkg2db("local", lp4) + +lp5 = pmpkg("icu", "1.0-1"); +self.addpkg2db("local", lp5) + +sp1 = pmpkg("fcitx-gtk2", "1.0-2"); +sp1.depends = ["gtk2"] +sp1.install['post_upgrade'] = "[ -f bin/harfbuzz ] && echo > found_harfbuzz" +self.addpkg2db("sync", sp1) + +sp4 = pmpkg("harfbuzz", "1.0-2"); +sp4.depends = ["icu"] +sp4.files = ["bin/harfbuzz"] +sp4.install['post_upgrade'] = "[ -f bin/icu ] && echo > found_icu" +self.addpkg2db("sync", sp4) + +sp5 = pmpkg("icu", "1.0-2"); +sp5.files = ["bin/icu"] +self.addpkg2db("sync", sp5) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=fcitx-gtk2|1.0-2") +self.addrule("PKG_VERSION=harfbuzz|1.0-2") +self.addrule("PKG_VERSION=icu|1.0-2") +self.addrule("FILE_EXIST=found_harfbuzz") +self.addrule("FILE_EXIST=found_icu") -- 1.8.2.3

3 5

[pacman-dev] A makepkg test suite
by Ashley Whetter 09 Oct '13

09 Oct '13

I've recently come across issue FS#15645 ([makepkg] needs a test suite) and I'd like to have a bash at implementing it. It seems like a good idea to get peoples ideas and thoughts first so what do you think? My first reaction is to do something similar to the pacman tests and just write a custom framework in python. Also have the output the same as the pacman tests. I think keeping the idea an environment (like in the pacman tests) seems a bit heavy handed because the only configuration done is in makepkg.conf and we can probably fake a pacman environment using a stub pacman. Or maybe we could utilise the pacman test environments! Unit testing should be easy enough because we can just call specific functions in makepkg and check the output. For functional testing I'm not really sure. As for acceptance testing we can just put different flag combinations in different test environments, and check the return code. Check the .PKGINFO. Maybe that files were put where they should be in pkg and src, as well as in the package itself. Have some PKGBUILDs that fail for various reasons like syntax, a dependency package doesn't exist. Make sure missing {,make,check}dependencies are installed. Any suggestions or ideas? Ashley

8 39

[pacman-dev] [PATCH] Make 'SRCDEST', 'PKGDEST' and 'PKGSRCDEST' respect the 'BUILDDIR'
by Techlive Zheng 03 Oct '13

03 Oct '13

--- A task has also been added to the bugtracker: https://bugs.archlinux.org/task/35498 scripts/makepkg.sh.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..c27c74d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2790,7 +2790,15 @@ if [[ $BUILDDIR = "$startdir" ]]; then else srcdir="$BUILDDIR/$pkgbase/src" pkgdirbase="$BUILDDIR/$pkgbase/pkg" - + if [[ $SRCDEST = "$startdir" ]]; then + SRCDEST="$BUILDDIR/$pkgbase" + fi + if [[ $PKGDEST = "$startdir" ]]; then + PKGDEST="$BUILDDIR/$pkgbase" + fi + if [[ $SRCPKGDEST = "$startdir" ]]; then + SRCPKGDEST="$BUILDDIR/$pkgbase" + fi fi # set pkgdir to something "sensible" for (not recommended) use during build() -- 1.8.2.3

3 8

[pacman-dev] [PATCH 1/3] Fix whitespace in pacsort.c and pactree.c
by Jason St. John 03 Sep '13

03 Sep '13

Replace spaces with tabs. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- src/util/pacsort.c | 20 ++++++++++---------- src/util/pactree.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 50b9c65..7c551c2 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -26,7 +26,7 @@ #include <alpm.h> -#define DELIM ' ' +#define DELIM ' ' struct buffer_t { char *mem; @@ -52,21 +52,21 @@ static struct options_t { /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif diff --git a/src/util/pactree.c b/src/util/pactree.c index 33cf66c..2cba1b0 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -125,21 +125,21 @@ const char *configfile = CONFFILE; /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif @@ -362,7 +362,7 @@ static void print_text(const char *pkg, const char *provision, /* print tip */ if(!pkg && provision) { - printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, + printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, provision, color->branch1, color->off); } else if(provision && strcmp(pkg, provision) != 0) { printf("%s%s%s%s%s %s%s%s\n", tip, color->leaf1, pkg, -- 1.8.3.3

3 10

[pacman-dev] [PATCH 0/3] Add "Usage" option for repos
by Dave Reisner 03 Sep '13

03 Sep '13

I've been using these patches for a while now (see the author date on the actual patches) and would like to present them again for feedback. I've found it tremendously useful (particularly as an Arch packager) to be able to keep an eye on other repos like [staging] without actually having them enabled. Dave Reisner (3): libalpm: introduce a usage level for repos pacman: add front end support for repo usage level pactree: set full usage on DBs when registering doc/pacman.conf.5.txt | 18 +++++++++++++++ lib/libalpm/alpm.h | 22 ++++++++++++++++++ lib/libalpm/be_local.c | 1 + lib/libalpm/be_sync.c | 4 ++++ lib/libalpm/db.c | 22 ++++++++++++++++++ lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 15 +++++++++++-- lib/libalpm/sync.c | 15 +++++++++++-- src/pacman/conf.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/sync.c | 11 +++++++++ src/util/pactree.c | 3 ++- test/pacman/tests/sync051.py | 17 ++++++++++++++ test/pacman/tests/sync052.py | 14 ++++++++++++ 13 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 test/pacman/tests/sync051.py create mode 100644 test/pacman/tests/sync052.py -- 1.8.3.4

3 7

[pacman-dev] [PATCH] makepkg.8: fix typo in usage
by Dave Reisner 21 Aug '13

21 Aug '13

Looks like I fat fingered something when I refactored the original submissions. Woops. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 0b548bc..fcafb08 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -11,7 +11,7 @@ makepkg - package build utility Synopsis -------- -'makepkg' [options] [ENVVAR=value[ENVVAR+=value] ... +'makepkg' [options] [ENVVAR=value] [ENVVAR+=value] ... Description -- 1.8.3.4

1 0

[pacman-dev] [PATCH] alpm: log errors for scriptlets terminated by a signal
by Dave Reisner 21 Aug '13

21 Aug '13

Fixes FS#36618. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- We *could* print the signal name here as well, but signal value-to-name can actually vary by architecture so it's not clear that it's something we necessarily want to get into.... lib/libalpm/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f1f760a..4b708ff 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -599,6 +599,10 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) _alpm_log(handle, ALPM_LOG_ERROR, _("command failed to execute correctly\n")); retval = 1; } + } else if(WIFSIGNALED(status) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, _("command terminated by signal %d\n"), + WTERMSIG(status)); + retval = 1; } } -- 1.8.3.4

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-108-gce7456b
by allan＠archlinux.org 21 Aug '13

21 Aug '13

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 ce7456b4ccbe3ca7b06c9b50fe59ce7367172c4f (commit) via d8c2ab0e6f52d9a790b608c254761ab4888bd547 (commit) via 15b667ef36c1720e12160f2ca983f9783ddaf3e4 (commit) via 3d3c7ebb0dfef248c53f7cfc3730ed3fd89756a9 (commit) via 9085aa43224474bc2c943f4d268d8dd4b735a665 (commit) via 247b9af02bd0d40109cc0ca40116a960c9f530e7 (commit) from c02b16c4cc00f7b33aad79207c15fb651903e9ba (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 ce7456b4ccbe3ca7b06c9b50fe59ce7367172c4f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 12 21:09:01 2013 +1000 Store fgetc output as an int. Bug exposed on ARM when char is unsigned resulting in the comparison to EOF always failing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8c2ab0e6f52d9a790b608c254761ab4888bd547 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 9 09:15:40 2013 -0400 conflict.c: fix directory ownership check * append "/" to directories before searching package file lists * use lstat over stat so symlinks aren't resolved * fix the inverted check for stat's return value Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15b667ef36c1720e12160f2ca983f9783ddaf3e4 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Wed Aug 7 19:04:52 2013 +0200 doc/repo-add: Add note on when signatures are added to the db Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d3c7ebb0dfef248c53f7cfc3730ed3fd89756a9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 5 18:04:37 2013 -0400 makepkg: allow make-style environment var overrides This allows for VAR=value and VAR+=value variable declarations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9085aa43224474bc2c943f4d268d8dd4b735a665 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Aug 4 17:18:08 2013 -0400 check.c: break backup file search loop after match Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 247b9af02bd0d40109cc0ca40116a960c9f530e7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 15 14:14:46 2013 +1000 Do not refer to FlySpray numbers These references to bug numbers assume we will forever be using that bug tracker. It is better to properly comment the code instead (which was done in almost all cases anyway). Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 2 +- doc/repo-add.8.txt | 3 +++ lib/libalpm/add.c | 2 +- lib/libalpm/conflict.c | 16 ++++++++++++---- lib/libalpm/dload.c | 2 +- scripts/makepkg.sh.in | 17 ++++++++++++++++- src/pacman/check.c | 2 +- src/pacman/pacman.c | 4 +++- src/pacman/sync.c | 2 +- src/pacman/util.c | 4 ++-- .../tests/{fileconflict030.py => fileconflict031.py} | 11 +++++------ .../tests/{fileconflict030.py => fileconflict032.py} | 14 +++++++------- 12 files changed, 53 insertions(+), 26 deletions(-) copy test/pacman/tests/{fileconflict030.py => fileconflict031.py} (61%) copy test/pacman/tests/{fileconflict030.py => fileconflict032.py} (54%) hooks/post-receive -- The official pacman repository

1 0