- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add "Optional for" to package information output
by Allan McRae 12 Aug '12

12 Aug '12

Much like packages that require a give package are displayed in the "Required by" field of its information output, alos display packages that optionally require the package. Inspired-by: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Example output: > ./src/pacman/pacman -Qi tk Name : tk ... Required By : None Optional For : git python python2 r lib/libalpm/alpm.h | 8 ++++++++ lib/libalpm/package.c | 34 +++++++++++++++++++++++++++------- src/pacman/package.c | 4 +++- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index f8928b9..5b4eb6d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -721,6 +721,14 @@ int alpm_pkg_vercmp(const char *a, const char *b); */ alpm_list_t *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg); +/** Computes the list of packages optionally requiring a given package. + * The return value of this function is a newly allocated + * list of package names (char*), it should be freed by the caller. + * @param pkg a package + * @return the list of packages optionally requiring pkg + */ +alpm_list_t *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg); + /** @name Package Property Accessors * Any pointer returned by these functions points to internal structures * allocated by libalpm. They should not be freed nor modified in any diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4887e21..f3e0b7f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -389,7 +389,8 @@ int SYMEXPORT alpm_pkg_has_scriptlet(alpm_pkg_t *pkg) return pkg->ops->has_scriptlet(pkg); } -static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs) +static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs, + int optional) { const alpm_list_t *i; pkg->handle->pm_errno = 0; @@ -397,7 +398,14 @@ static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs) for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { alpm_pkg_t *cachepkg = i->data; alpm_list_t *j; - for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) { + + if(optional == 0) { + j = alpm_pkg_get_depends(cachepkg); + } else { + j = alpm_pkg_get_optdepends(cachepkg); + } + + for(; j; j = j->next) { if(_alpm_depcmp(pkg, j->data)) { const char *cachepkgname = cachepkg->name; if(alpm_list_find_str(*reqs, cachepkgname) == NULL) { @@ -408,8 +416,7 @@ static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs) } } -/** Compute the packages requiring a given package. */ -alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) +static alpm_list_t *compute_requiredby(alpm_pkg_t *pkg, int optional) { const alpm_list_t *i; alpm_list_t *reqs = NULL; @@ -420,17 +427,17 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) if(pkg->origin == ALPM_PKG_FROM_FILE) { /* The sane option; search locally for things that require this. */ - find_requiredby(pkg, pkg->handle->db_local, &reqs); + find_requiredby(pkg, pkg->handle->db_local, &reqs, optional); } else { /* We have a DB package. if it is a local package, then we should * only search the local DB; else search all known sync databases. */ db = pkg->origin_data.db; if(db->status & DB_STATUS_LOCAL) { - find_requiredby(pkg, db, &reqs); + find_requiredby(pkg, db, &reqs, optional); } else { for(i = pkg->handle->dbs_sync; i; i = i->next) { db = i->data; - find_requiredby(pkg, db, &reqs); + find_requiredby(pkg, db, &reqs, optional); } reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp); } @@ -438,6 +445,19 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) return reqs; } +/** Compute the packages requiring a given package. */ +alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) +{ + return compute_requiredby(pkg, 0); +} + +/** Compute the packages optionally requiring a given package. */ +alpm_list_t SYMEXPORT *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg) +{ + return compute_requiredby(pkg, 1); +} + + /** @} */ alpm_file_t *_alpm_file_copy(alpm_file_t *dest, diff --git a/src/pacman/package.c b/src/pacman/package.c index ce7de7f..a8f322c 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -89,7 +89,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) double size; char bdatestr[50] = "", idatestr[50] = ""; const char *label, *reason; - alpm_list_t *validation = NULL, *requiredby = NULL; + alpm_list_t *validation = NULL, *requiredby = NULL, *optionalfor = NULL; from = alpm_pkg_get_origin(pkg); @@ -137,6 +137,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) if(extra || from == ALPM_PKG_FROM_LOCALDB) { /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); + optionalfor = alpm_pkg_compute_optionalfor(pkg); } cols = getcols(fileno(stdout)); @@ -159,6 +160,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) if(extra || from == ALPM_PKG_FROM_LOCALDB) { list_display(_("Required By :"), requiredby, cols); + list_display(_("Optional For :"), optionalfor, cols); } deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols); deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), cols); -- 1.7.11.4

1 0

[pacman-dev] [PATCH 2/2] makepkg: check if $dir is a local clone of the right git repo
by Mohammad Alsaleh 12 Aug '12

12 Aug '12

Before this patch, makepkg does not check if $dir is a local clone of the right repo. For example, git fetch would be run even if $dir is not a local bare clone of a git repo in present in source(), but a subdir of a checked-out one. That means makepkg can potentially fetch from a completely unrelated remote and update completely unrelated dirs/files. This patch adds a check to make sure we are fetching from the right remote. Signed-off-by: Mohammad Alsaleh <msal(a)mail.i2p> --- scripts/makepkg.sh.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6c0e821..7ec523c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -404,8 +404,14 @@ download_git() { exit 1 fi elif (( ! HOLDVER )); then - msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" cd_safe "$dir" + # Make sure we are fetching the right repo + if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then + error "$(gettext "%s is not a clone of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git fetch --all -p; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" -- 1.7.11.4

1 0

[pacman-dev] [PATCH 1/2] makepkg: git clone instead of git fetch if $dir exists but empty
by Mohammad Alsaleh 12 Aug '12

12 Aug '12

Before this patch, makepkg would only check if $dir exists as an indication that a local clone exists. And if $dir does exist, makepkg will run git fetch inside it unconditionally. After applying this patch, makepkg will check if the existent $dir is empty. And if it is, it will be used to store a local clone. Signed-off-by: Mohammad Alsaleh <msal(a)mail.i2p> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 270f988..6c0e821 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -396,7 +396,7 @@ download_git() { url=${url##*git+} url=${url%%#*} - if [[ ! -d "$dir" ]]; then + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" if ! git clone --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Avoid interger overflow when calculating remaining line length
by Allan McRae 11 Aug '12

11 Aug '12

When the len and cidx were changed to size_t in a8a1b093, it was possible to have an integer overflow when a line ended right at the edge of the terminal width. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Replicate with linux-lts-3.0.39-1 in the Arch Linux [core] repo and a terminal with 80 width. src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 7f7f6a7..995308c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -296,7 +296,7 @@ void indentprint(const char *str, unsigned short indent, unsigned short cols) while(q < next) { len += wcwidth(*q++); } - if(len > (cols - cidx - 1)) { + if((len + 1) > (cols - cidx)) { /* wrap to a newline and reindent */ printf("\n%-*s", (int)indent, ""); cidx = indent; -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Add pactests for displaying optdep installation status
by Allan McRae 11 Aug '12

11 Aug '12

From: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Extracted from https://mailman.archlinux.org/pipermail/pacman-dev/2011-November/014778.html test/pacman/tests/query010.py | 12 ++++++++++++ test/pacman/tests/query011.py | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 test/pacman/tests/query010.py create mode 100644 test/pacman/tests/query011.py diff --git a/test/pacman/tests/query010.py b/test/pacman/tests/query010.py new file mode 100644 index 0000000..76f82d9 --- /dev/null +++ b/test/pacman/tests/query010.py @@ -0,0 +1,12 @@ +self.description = "Query info on a package (optdep install status [uninstalled])" + +optstr = "dep: for foobar" + +pkg = pmpkg("dummy", "1.0-2") +pkg.optdepends = [optstr] +self.addpkg2db("local", pkg) + +self.args = "-Qi %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Optional Deps.*%s$" % optstr) diff --git a/test/pacman/tests/query011.py b/test/pacman/tests/query011.py new file mode 100644 index 0000000..f487fb2 --- /dev/null +++ b/test/pacman/tests/query011.py @@ -0,0 +1,15 @@ +self.description = "Query info on a package (optdep install status [installed])" + +optstr = "dep: for foobar" + +pkg = pmpkg("dummy", "1.0-2") +pkg.optdepends = [optstr] +self.addpkg2db("local", pkg) + +dep = pmpkg("dep") +self.addpkg2db("local", dep) + +self.args = "-Qi %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Optional Deps.*%s \[installed\]$" % optstr) -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Display optdep install status in package query output
by Allan McRae 11 Aug '12

11 Aug '12

Indicate which optional dependencies are installed when viewing local package information (-Qi). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Example output: > ./src/pacman/pacman -Qi git Name : git ... Optional Deps : tk: gitk and git gui [installed] perl-libwww: git svn perl-term-readkey: git svn perl-mime-tools: git send-email perl-net-smtp-ssl: git send-email TLS support perl-authen-sasl: git send-email TLS support python2: various helper scripts [installed] subversion: git svn [installed] cvsps: git cvsimport src/pacman/package.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 77d58e1..3556a81 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -33,6 +33,7 @@ #include "package.h" #include "util.h" #include "conf.h" +#include "db.h" #define CLBUF_SIZE 4096 @@ -54,15 +55,22 @@ static void deplist_display(const char *title, /** Turn a optdepends list into a text list. * @param optdeps a list with items of type alpm_depend_t */ -static void optdeplist_display(const char *title, - alpm_list_t *optdeps, unsigned short cols) +static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) { alpm_list_t *i, *text = NULL; - for(i = optdeps; i; i = alpm_list_next(i)) { + for(i = alpm_pkg_get_optdepends(pkg); i; i = alpm_list_next(i)) { alpm_depend_t *optdep = i->data; - text = alpm_list_add(text, alpm_dep_compute_string(optdep)); + char *depstring = alpm_dep_compute_string(optdep); + if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) { + if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) { + const char *installed = _(" [installed]"); + depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1); + strcpy(depstring + strlen(depstring), installed); + } + } + text = alpm_list_add(text, depstring); } - list_display_linebreak(title, text, cols); + list_display_linebreak(_("Optional Deps :"), text, cols); FREELIST(text); } @@ -148,7 +156,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg), cols); deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg), cols); - optdeplist_display(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg), cols); + optdeplist_display(pkg, cols); + if(extra || from == ALPM_PKG_FROM_LOCALDB) { list_display(_("Required By :"), requiredby, cols); } -- 1.7.11.4

1 1

[pacman-dev] [PATCH] Fix typo in documentation
by Allan McRae 11 Aug '12

11 Aug '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index fc869b1..77d58e1 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -52,7 +52,7 @@ static void deplist_display(const char *title, } /** Turn a optdepends list into a text list. - * @param optdeps a list with items of type alpm_optdepend_t + * @param optdeps a list with items of type alpm_depend_t */ static void optdeplist_display(const char *title, alpm_list_t *optdeps, unsigned short cols) -- 1.7.11.4

1 0

[pacman-dev] [PATCH] makepkg: fix warnings with --noextract
by Allan McRae 11 Aug '12

11 Aug '12

Three warnings after someone deliberately typed --noextract is a tad excessive... Also, an empty $srcdir is perfectly valid when the source array is empty, although using --noextact then is wasteful. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 262bcf8..270f988 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2699,15 +2699,7 @@ chmod a-s "$srcdir" cd_safe "$srcdir" if (( NOEXTRACT )); then - warning "$(gettext "Skipping source retrieval -- using existing %s tree")" "src/" - warning "$(gettext "Skipping source integrity checks -- using existing %s tree")" "src/" - warning "$(gettext "Skipping source extraction -- using existing %s tree")" "src/" - - if (( NOEXTRACT )) && dir_is_empty "$srcdir"; then - error "$(gettext "The source directory is empty, there is nothing to build!")" - plain "$(gettext "Aborting...")" - exit 1 - fi + warning "$(gettext "Using existing %s tree")" "src/" elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ && { [[ ! -d $pkgdir ]] || dir_is_empty "$pkgdir"; }; then -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Notify of removed package required as optdepend
by Allan McRae 11 Aug '12

11 Aug '12

When a package is being removed, provide a notification (via a callback) if any local package requires it as an optdepend. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I am going through the optdepends patchset submitted by Benedikt Morbach back in November [1] and adjusting/rewriting/... the patches that only add some more informational messages. [1] (https://mailman.archlinux.org/pipermail/pacman-dev/2011-November/014772.html) Here is an example of the output this patch gives: allan@mugen /home/arch/code/pacman (optdep) > sudo ./src/pacman/pacman -R tk checking dependencies... :: git optionally requires tk: gitk and git gui :: python optionally requires tk: for tkinter :: python2 optionally requires tk: for IDLE :: r optionally requires tk: tcl/tk interface Packages (1): tk-8.5.12-1 Total Removed Size: 5.21 MiB Do you want to remove these packages? [Y/n] n allan@mugen /home/arch/code/pacman (optdep) > sudo ./src/pacman/pacman -R tk r git checking dependencies... :: python optionally requires tk: for tkinter :: python2 optionally requires tk: for IDLE Packages (3): git-1.7.11.4-1 r-2.15.1-2 tk-8.5.12-1 Total Removed Size: 73.41 MiB Do you want to remove these packages? [Y/n] n lib/libalpm/alpm.h | 5 ++++- lib/libalpm/remove.c | 29 +++++++++++++++++++++++++++++ src/pacman/callback.c | 4 ++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ac1145b..f8928b9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -351,7 +351,10 @@ typedef enum _alpm_event_t { /** Disk space usage will be computed for a package */ ALPM_EVENT_DISKSPACE_START, /** Disk space usage was computed for a package */ - ALPM_EVENT_DISKSPACE_DONE + ALPM_EVENT_DISKSPACE_DONE, + /** An optdepend for another package is being removed + * The requiring package and its dependency are passed to the callback */ + ALPM_EVENT_OPTDEP_REQUIRED } alpm_event_t; /** Event callback */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 4c54992..80c847e 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -158,6 +158,32 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) } /** + * @brief Send a callback for any optdepend being removed. + * + * @param handle the context handle + * @param lp list of packages to be removed + */ +static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t *lp) +{ + alpm_list_t *i; + + for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = alpm_list_next(i)) { + alpm_pkg_t *pkg = i->data; + alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg); + + if(optdeps && !_alpm_pkg_find(lp, pkg->name)) { + alpm_list_t *j; + for(j = optdeps; j; j = alpm_list_next(j)) { + alpm_depend_t *optdep = j->data; + if(_alpm_pkg_find(lp, optdep->name)) { + EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep); + } + } + } + } +} + +/** * @brief Transaction preparation for remove actions. * * This functions takes a pointer to a alpm_list_t which will be @@ -228,6 +254,9 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) } } + /* Note packages being removed that are optdepends for installed packages */ + remove_notify_needed_optdepends(handle, trans->remove); + if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { EVENT(handle, ALPM_EVENT_CHECKDEPS_DONE, NULL, NULL); } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..a51aa4b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -239,6 +239,10 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("checking available disk space...\n")); } break; + case ALPM_EVENT_OPTDEP_REQUIRED: + printf(_(":: %s optionally requires %s\n"), alpm_pkg_get_name(data1), + alpm_dep_compute_string(data2)); + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: -- 1.7.11.4

1 0

[pacman-dev] [PATCH] makepkg: implement dir_is_empty for dir content checks
by Dave Reisner 11 Aug '12

11 Aug '12

Rather than calling upon ls for this, use a proper shell function which uses globbing to determine the existance of files in a directory. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dd4066b..262bcf8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2212,6 +2212,14 @@ canonicalize_path() { fi } +dir_is_empty() { + ( + shopt -s dotglob nullglob + files=("$1"/*) + (( ${#files} == 0 )) + ) +} + m4_include(library/parseopts.sh) usage() { @@ -2695,14 +2703,14 @@ if (( NOEXTRACT )); then warning "$(gettext "Skipping source integrity checks -- using existing %s tree")" "src/" warning "$(gettext "Skipping source extraction -- using existing %s tree")" "src/" - if (( NOEXTRACT )) && [[ -z $(ls "$srcdir" 2>/dev/null) ]]; then + if (( NOEXTRACT )) && dir_is_empty "$srcdir"; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 fi elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ - && [[ ! -d $pkgdir || -z $(ls "$pkgdir" 2>/dev/null) ]]; then + && { [[ ! -d $pkgdir ]] || dir_is_empty "$pkgdir"; }; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" exit 1 -- 1.7.11.4

1 0

[pacman-dev] [PATCH] fixed erroneous memory access to newurl in alpm_db_remove_server
by Barbu Paul - Gheorghe 09 Aug '12

09 Aug '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/db.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf9c3f0..26b6250 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -198,16 +198,20 @@ int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url) if(!newurl) { return -1; } + db->servers = alpm_list_remove_str(db->servers, newurl, &vdata); - free(newurl); + + int ret = 1; + if(vdata) { _alpm_log(db->handle, ALPM_LOG_DEBUG, "removed server URL from database '%s': %s\n", db->treename, newurl); free(vdata); - return 0; + ret = 0; } - return 1; + free(newurl); + return ret; } /** Get the name of a package database. */ -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-373-g0fe5620
by dan＠archlinux.org 08 Aug '12

08 Aug '12

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 0fe562011c83229472a75dc43d34f780843e16de (commit) via 632912261a03474a14830402a1e43ae57a0557ff (commit) via c52bb7030c2f04a2e36657042ba54d5c94de1bbf (commit) via 527ae7092d98ff11c10ec92831e1297e33e946cf (commit) via a50d1bc9ab0dbe312d498de1f24760d172169413 (commit) via 024bc44a2545bc54db6e2242af799936c263dea1 (commit) via 0c95b294e9c7b947e19eda71aca3aaffc9cc3abd (commit) via 8853a6f2827739120057d4eda56a12bd3474e4c6 (commit) via c9b31ad6220e7706caf0bad55355957bfcd041cb (commit) via a818766c6e693fcc5781574d05ee02ac4b6a8dcd (commit) via 7e4aa9e52492450db1705f1057e82934b1187e0e (commit) via d51902c978144f230038e44a42ff75b587d85326 (commit) via 062204daa135feb5aad918e8842749b69de41c40 (commit) via c887ccf90553ffb00825353d98c47fea909ba611 (commit) via e0cd7b02932e5472f4c4fa30896ff73240dc9341 (commit) via 4b129d484394ce6090a9ed21782fe1df2227ad18 (commit) via b1e75d7dd663a72d90195e4907ee8fa145461fc2 (commit) via 6c8def6ae0f7b99c68da8a7a4bd943746d234754 (commit) via 7fd56118d0a751f0e488ada38101390e840bd311 (commit) via b3e82ec59e31e904b96a0d0c504af1549c8b2115 (commit) via 2042b79bcc7904afc195103dfa1fc6b3978d60f7 (commit) via 888020de9068218fafe820e631222bc85c47b453 (commit) via cca9849fc25012845b08ce877f9450e45c9d207d (commit) via aa6fe1160b39cd364a6595b7c9f56acb1cea3432 (commit) via 682c9af846718cd387da058c39967550b7eeb01f (commit) via 91d119af1c97c7f2d78bbd98c73c737bf6f7247d (commit) via 57e06394dd19191f36880aa8d1d4522a458922ca (commit) via 1a04e2e11a012162b7b3b91e4c7a8c82dd113a94 (commit) via a922d1805696b6614649a8d3588297d44f4e1192 (commit) via e8064144072e03ea1690c5aa97e863f14096a771 (commit) via d338b3981dcfd039a60fae616886707e4d69fceb (commit) from ec5e6d90294f3322b7015b422db948770ecb41b6 (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 0fe562011c83229472a75dc43d34f780843e16de Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 5 19:36:10 2012 +1000 Move important information up in -Si output Currently, the package description is printed at the end of the -Si output. This is probably one of the more important pieces of information so should be nearer the top. Also move the package architecture up. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 632912261a03474a14830402a1e43ae57a0557ff Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Aug 6 14:29:48 2012 -0400 PKGBUILD.vim: improve 'options' highlighting, add extra keywords This fixes the current syntax highlighting behavior in the 'options' array, which does *not* flag illegal options (e.g. typos, unsupported options). The shDoubleQuote and shSingleQuote options were the culprits. Now, if you enter `'!imptydurs'`, the typoed option will be flagged red. I also added syntax highlighting for the new options listed in `man 5 makepkg.conf`, which I believe were introduced around pacman 4.0.0. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c52bb7030c2f04a2e36657042ba54d5c94de1bbf Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Tue Jul 31 21:51:31 2012 +0300 removed the condition in alpm_db_set_servers since FREELIST is NULL safe Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 527ae7092d98ff11c10ec92831e1297e33e946cf Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Tue Jul 31 21:24:31 2012 +0300 added coding standard Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> commit a50d1bc9ab0dbe312d498de1f24760d172169413 Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Tue Jul 31 21:24:30 2012 +0300 fixed typo Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> commit 024bc44a2545bc54db6e2242af799936c263dea1 Merge: 0c95b29 a818766 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 7 20:55:11 2012 -0500 Merge remote-tracking branch 'allan/working-split/vcs' commit 0c95b294e9c7b947e19eda71aca3aaffc9cc3abd Merge: 8853a6f c9b31ad Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 7 20:54:59 2012 -0500 Merge branch 'maint' commit 8853a6f2827739120057d4eda56a12bd3474e4c6 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Aug 1 17:24:34 2012 +0200 coding style fixes Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a818766c6e693fcc5781574d05ee02ac4b6a8dcd Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 22:25:24 2012 +1000 makepkg: delay checking for build package with pkgver() If a pkgver() function is specified, delay checking the package is built until the pkgver is updated.. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e4aa9e52492450db1705f1057e82934b1187e0e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 20:01:35 2012 +1000 makepkg: add hg url support Supported fragments are branch, revision and tag. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d51902c978144f230038e44a42ff75b587d85326 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 17:00:35 2012 +1000 doc: Add --holdver information for makepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 062204daa135feb5aad918e8842749b69de41c40 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 16:51:53 2012 +1000 doc: Document using svn source url Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c887ccf90553ffb00825353d98c47fea909ba611 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 16:50:01 2012 +1000 doc: document automatically updating the pkgver variable Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e0cd7b02932e5472f4c4fa30896ff73240dc9341 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 16:37:08 2012 +1000 doc: Document using VCS sources in a PKGBUILD Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b129d484394ce6090a9ed21782fe1df2227ad18 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 21:56:32 2012 +1000 makepkg: check pkgver validity after updating If a PKGBUILD has a pkgver() function, skip checking the pkgver validity until it has been updated. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1e75d7dd663a72d90195e4907ee8fa145461fc2 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:24:34 2012 +1000 makepkg: only update pkgver when all sources are available Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6c8def6ae0f7b99c68da8a7a4bd943746d234754 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:16:25 2012 +1000 makepkg: add --holdver to control VCS source updating Do not update VCS sources if --holdver is used. If the VCS checkout is not present, it will still be downloaded. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7fd56118d0a751f0e488ada38101390e840bd311 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 15 23:57:25 2012 +1000 makepkg: do not download VCS sources unless needed VCS sources are not needed for --geninteg or --source operations. This also prevents VCS downloads outputting to stdout, which prevented piping -g output to the PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b3e82ec59e31e904b96a0d0c504af1549c8b2115 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 15 15:46:29 2012 +1000 makepkg: rename myver myver is a bit generic for an internal variable name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2042b79bcc7904afc195103dfa1fc6b3978d60f7 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 18:12:31 2012 +1000 makepkg: add support for SVN urls Allow SVN repo sources in the form: source=("<folder>::<repo>#<fragment>") where <repo> must start with svn (e.g svn+http://) and a <fragment> can specify a revision (e.g. revision=22). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 888020de9068218fafe820e631222bc85c47b453 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 5 13:30:08 2012 +1000 makepkg: provide mechanism for auto-updating pkgver Now that VCS repos are provided in the source array, it becomes too complicated to have automatic updating pkgver as was the case with the old VCS PKGBUILDs (there can be multiple repos of different types in the source array, the VCS repo may not be the package primary source, etc). Instead provide an optional way for a PKGBUILD to update the pkgver value through the specifing of a pkgver() function that returns the new version string. This is run after all source files are downloaded so can access the VCS repo if needed. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cca9849fc25012845b08ce877f9450e45c9d207d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 12:02:36 2012 +1000 makepkg: modify get_filepath to handle VCS sources With VCS sources, get_filepath should return the directory of the checkout. This allows backing up of the VCS checkout when using --allsource. Fixes FS#21098. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa6fe1160b39cd364a6595b7c9f56acb1cea3432 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 11:39:15 2012 +1000 makepkg: modify get_filename to handle VCS sources Modify get_filename to return the name of the folder with VCS sources. This fixes output issues in checksum checking. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 682c9af846718cd387da058c39967550b7eeb01f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 11:24:52 2012 +1000 makepkg: fix checksum generation with VCS sources VCS sources should have "SKIP" for their checksum value Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91d119af1c97c7f2d78bbd98c73c737bf6f7247d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 10:37:35 2012 +1000 makepkg: allow using GIT source URLs Allow specifing GIT sources using the following syntax source=('<folder>::<repo>#<fragment>') This will download the git repo <repo> into <folder> (into $SRCDIR if set, otherwise $startdir). <repo> must start with "git", but non-git protocols are handled using (e.g.) "git+http://...". The <fragment> can be used to specify a branch, tag, or commit to build from. e.g. branch=maint. Checksum entries for git sources should be "SKIP". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 57e06394dd19191f36880aa8d1d4522a458922ca Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 10:33:52 2012 +1000 makepkg: skip integrity checking early If "SKIP" is provided for an integrity check, abort checking as soon as possible. Also swap fork to tr for bash4 conversion. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1a04e2e11a012162b7b3b91e4c7a8c82dd113a94 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 3 22:57:35 2012 +1000 makepkg: generalize download_sources In order to treat all VCS sources as URLs, we need to be able to deal with more protocols. Rewrite download_sources to use a case statement so additional protocols are easily added. Also fix the use of scp to not pass the protocol in the URL (noticed by William J. Bowman <wjb(a)williamjbowman.com>) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a922d1805696b6614649a8d3588297d44f4e1192 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 09:02:03 2012 +1000 makepkg: add function to return download protocol Extract the download protocol from a source entry. Returns "local" for local source files. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8064144072e03ea1690c5aa97e863f14096a771 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 3 22:08:25 2012 +1000 makepkg: reorder source handling functions There is no actual code change here, but these related functions were all over the place which makes this code difficult to adjust. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d338b3981dcfd039a60fae616886707e4d69fceb Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 3 19:33:34 2012 +1000 makepkg: remove VCS package support The current VCS packaging support is really, really, really bad. It is best to strip it out completely before rewriting it. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 44 +++ contrib/PKGBUILD.vim | 4 +- doc/PKGBUILD.5.txt | 100 +++--- doc/makepkg.8.txt | 12 +- lib/libalpm/db.c | 4 +- lib/libalpm/sync.c | 3 +- lib/libalpm/util.c | 4 +- scripts/makepkg.sh.in | 888 ++++++++++++++++++++++++++++++------------------- src/pacman/package.c | 5 +- src/pacman/pacman.c | 2 +- test/pacman/README | 2 +- 11 files changed, 646 insertions(+), 422 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-26-gc9b31ad
by dan＠archlinux.org 08 Aug '12

08 Aug '12

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, maint has been updated via c9b31ad6220e7706caf0bad55355957bfcd041cb (commit) from b782388f1670d9ff819461cfa7e365f7e8178173 (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 c9b31ad6220e7706caf0bad55355957bfcd041cb Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 5 20:05:42 2012 +1000 Print repo being search for replaces in debug output Given the message is repeated for each repo, it is a good idea to print the repo name in the output. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Print repo being search for replaces in debug output
by Allan McRae 08 Aug '12

08 Aug '12

Given the message is repeated for each repo, it is a good idea to print the repo name in the output. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Or... we could remove that output altogether. I'm not sure it is really useful. lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 66f7ed1..c853d4d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -125,7 +125,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg, alpm_list_t *replacers = NULL; alpm_list_t *k; _alpm_log(handle, ALPM_LOG_DEBUG, - "searching for replacements for %s\n", lpkg->name); + "searching for replacements for %s in the [%s] repo\n", + lpkg->name, sdb->treename); for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { int found = 0; alpm_pkg_t *spkg = k->data; -- 1.7.11.4

2 1

[pacman-dev] [PATCH] PKGBUILD.vim: improve 'options' highlighting, add extra keywords
by jstjohn＠purdue.edu 08 Aug '12

08 Aug '12

From: "Jason St. John" <jstjohn(a)purdue.edu> This fixes the current syntax highlighting behavior in the 'options' array, which does *not* flag illegal options (e.g. typos, unsupported options). The shDoubleQuote and shSingleQuote options were the culprits. Now, if you enter `'!imptydurs'`, the typoed option will be flagged red. I also added syntax highlighting for the new options listed in `man 5 makepkg.conf`, which I believe were introduced around pacman 4.0.0. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- contrib/PKGBUILD.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 65fe489..9157063 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,10 +211,10 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|fakeroot\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained -syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote +syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption syn match pbIllegalOption /[^!"'()= ]/ contained contains=pbOptionsDeprec,pbOptions " noextract -- 1.7.11.4

2 1

[pacman-dev] [PATCH 0/5] Properly detect conflicts with directory symlinks
by Allan McRae 07 Aug '12

07 Aug '12

This series of patches make pacman perform conflict checking with all directory paths resovled. This means that inter-package conflicts such as /lib/foo and /usr/lib/foo when /lib -> usr/lib are detected. Similarly, if a package moves a file from /lib/foo to /usr/lib/foo when /lib -> usr/lib (i.e. the file is effectively the same), this is no longer detected as a conflict with the filesystem. A big thanks to Andrew for fixing my initial attempt at the resolving of the filelist and making my idea for efficiently storing paths that are unchanged by resolving a reality. Allan McRae (3): Add resolved_path to alpm_filelist_t Resolve file paths during inter-package conflict check Avoid upgrade conflict with unchanged effective path Andrew Gregory (2): Add _alpm_filelist_resolve _alpm_filelist_resolve: use original filenames where possible lib/libalpm/alpm.h | 1 + lib/libalpm/conflict.c | 6 ++ lib/libalpm/filelist.c | 174 ++++++++++++++++++++++++++++++++--- lib/libalpm/filelist.h | 2 + lib/libalpm/package.c | 22 ++++- test/pacman/tests/fileconflict001.py | 2 - test/pacman/tests/fileconflict013.py | 2 - test/pacman/tests/fileconflict016.py | 2 - test/pacman/tests/fileconflict017.py | 26 ++++++ 9 files changed, 217 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/fileconflict017.py -- 1.7.11.3

3 10

[pacman-dev] [PATCH] Mark already installed optional dependencies
by Arokux B. 05 Aug '12

05 Aug '12

This patch adds "[installed]" prefix to already installed optional dependency. Signed-off-by: Arokux arokux(a)gmail.com --- src/pacman/util.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index a5242ae..d0a049e 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1189,19 +1189,40 @@ static int depend_cmp(const void *d1, const void *d2) return ret; } +alpm_list_t *optdeps_to_strings(alpm_list_t *optdeps) +{ + alpm_list_t *i, *optstrings = NULL; + alpm_db_t *localdb = alpm_get_localdb(config->handle); + + /* turn optdepends list into a text list */ + for(i = optdeps; i; i = alpm_list_next(i)) { + alpm_depend_t *optdep = i->data; + char *optdepstring = alpm_dep_compute_string(optdep); + + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdepstring)) { + char *optdepstring_in; + pm_asprintf(&optdepstring_in, _("[installed] %s"), optdepstring); + free(optdepstring); + + optdepstring = optdepstring_in; + optdepstring_in = NULL; + } + + optstrings = alpm_list_add(optstrings, optdepstring); + } + + return optstrings; +} + void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) { - alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL; + alpm_list_t *old, *new, *optdeps, *optstrings = NULL; old = alpm_pkg_get_optdepends(oldpkg); new = alpm_pkg_get_optdepends(newpkg); optdeps = alpm_list_diff(new, old, depend_cmp); - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(optdeps); if(optstrings) { printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg)); @@ -1214,15 +1235,9 @@ void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) void display_optdepends(alpm_pkg_t *pkg) { - alpm_list_t *i, *optdeps, *optstrings = NULL; + alpm_list_t *optstrings = NULL; - optdeps = alpm_pkg_get_optdepends(pkg); - - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(alpm_pkg_get_optdepends(pkg)); if(optstrings) { printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));

2 5

[pacman-dev] [PATCH 00/11] [RFC] Pacman Color
by Daniel Wallace 05 Aug '12

05 Aug '12

I wanted to fix up the pacman-color patch from the aur, as suggested by Allan. And I decided to put all of the seperate color commands into color.c . Not being very experienced in C, please feel free to be as nitpicky as you want, I did this mostly for the learning experience, as well as to start cleaning up the patch. Thanks Daniel Wallace (11): load color into config Add color commands for stuff in util Load color configs add color to callback add color to package.c Add color to pacman.c add color to query.c Add color to remove.c Add color to sync.c Add empty config file Document color contrib/bash_completion.in | 2 +- contrib/zsh_completion.in | 1 + doc/pacman.8.txt | 3 + etc/Makefile.am | 5 +- etc/color.conf.in | 46 +++ etc/pacman.conf.in | 1 + src/pacman/Makefile.am | 3 + src/pacman/callback.c | 164 ++++++++-- src/pacman/color.c | 796 +++++++++++++++++++++++++++++++++++++++++++++ src/pacman/color.h | 77 +++++ src/pacman/conf.c | 5 + src/pacman/conf.h | 6 +- src/pacman/package.c | 190 ++++++++--- src/pacman/pacman.c | 85 +++-- src/pacman/query.c | 57 +++- src/pacman/remove.c | 7 +- src/pacman/sync.c | 151 +++++++-- src/pacman/util.c | 35 +- src/pacman/util.h | 6 + 19 files changed, 1467 insertions(+), 173 deletions(-) create mode 100644 etc/color.conf.in create mode 100644 src/pacman/color.c create mode 100644 src/pacman/color.h -- 1.7.11.4

2 12

[pacman-dev] [PATCH] Move important information up in -Si output
by Allan McRae 05 Aug '12

05 Aug '12

Currently, the package description is printed at the end of the -Si output. This is probably one of the more important pieces of information so should be nearer the top. Also move the package architecture up. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I suppose this is a bit subjective, but having the package description at the end of -Si has annoyed me long enough that I decided to fix it! src/pacman/package.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index fe04d40..fc869b1 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -141,6 +141,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); string_display(_("Version :"), alpm_pkg_get_version(pkg), cols); + string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); + string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); string_display(_("URL :"), alpm_pkg_get_url(pkg), cols); list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), cols); list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); @@ -164,7 +166,6 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) printf(_("Installed Size : %6.2f %s\n"), size, label); string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); - string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); string_display(_("Build Date :"), bdatestr, cols); if(from == ALPM_PKG_FROM_LOCALDB) { string_display(_("Install Date :"), idatestr, cols); @@ -198,8 +199,6 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) alpm_siglist_cleanup(&siglist); } - string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); - /* Print additional package info if info flag passed more than once */ if(from == ALPM_PKG_FROM_LOCALDB && extra) { dump_pkg_backups(pkg); -- 1.7.11.4

1 0

[pacman-dev] [PATCH v2] coding style fixes
by Florian Pritz 02 Aug '12

02 Aug '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This replaces "[PATCH] util.c: coding style fix" lib/libalpm/db.c | 2 +- lib/libalpm/util.c | 4 ++-- src/pacman/pacman.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf9c3f0..953f2af 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -281,7 +281,7 @@ alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db) } /** Searches a database. */ -alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t* needles) +alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) { ASSERT(db != NULL, return NULL); db->handle->pm_errno = 0; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0196f3b..033058a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -65,9 +65,9 @@ * @return pointer to the first token in str if str is not NULL, NULL if * str is NULL */ -char* strsep(char** str, const char* delims) +char *strsep(char **str, const char *delims) { - char* token; + char *token; if(*str==NULL) { /* No more tokens */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 73d5be9..478196e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -719,7 +719,7 @@ static int parseargs(int argc, char *argv[]) * @param argc * @param argv */ -static void cl_to_log(int argc, char* argv[]) +static void cl_to_log(int argc, char *argv[]) { size_t size = 0; int i; -- 1.7.11.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-342-gec5e6d9
by dan＠archlinux.org 02 Aug '12

02 Aug '12

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 ec5e6d90294f3322b7015b422db948770ecb41b6 (commit) via d46bb6b27b05579acf5665368c111b4cc41eedcb (commit) via 72d3713cc7865af5f4d91410ad56ed4287be6109 (commit) via 70d8c2150e33d1a0b9e09d72c5091d661383d641 (commit) via 41dae689520b0af0b5226117e77572a24954f075 (commit) via fa2eadcec75e8e54a4bb3cf1f38a07ec71784032 (commit) via eb871553912f5cf4ab3cb8aade73cf2a24dcb82c (commit) via 6f47dfc9203e45ef91afdc772c27eb7034bf6590 (commit) via e3772f765474b4678beec6d88e3a1c56fd591aa4 (commit) via 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 (commit) from 7193ce1ecd0089545d100fd11647cb346d15331b (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 ec5e6d90294f3322b7015b422db948770ecb41b6 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Mon Jun 18 16:46:25 2012 +0200 pacman-key: Use lsign_keys function in --populate This reduces code duplication and also makes --populate a non-interactive function. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit d46bb6b27b05579acf5665368c111b4cc41eedcb Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 18 12:09:24 2012 +1000 Split _alpm_filelist_operation function To improve conflict checking, we will need to make these functions diverge to an extent where having two separate functions will be preferable. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72d3713cc7865af5f4d91410ad56ed4287be6109 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 12 15:29:59 2012 -0500 Move filelist functions into separate source file We have a few of these and might as well gather them together. This also cleans up the code a bit by using an enum instead of integer values, as well as makes a "search for file in filelist" function public so frontends can do better than straight linear search of the filelists. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70d8c2150e33d1a0b9e09d72c5091d661383d641 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 18 09:46:53 2012 +1000 pactest: avoid upgrade conflict with unchanged effective path Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41dae689520b0af0b5226117e77572a24954f075 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 19:13:03 2012 +1000 pactest: Do not remove symlink to directory if a to be installed package uses it If a pacakge has a directory symlink (e.g. /lib -> usr/lib), do not allow it to be removed if any other package is trying to install a file into that path (e.g. /lib/foo). This is because the local database can become invalidated if the symlink is removed after the package with file /lib/foo is installed (sync702.py). If the symlink is removed before the file is installed (sync701.py), the upgrade is actually a success, but we can not guarantee the ordering so both cases should fail. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa2eadcec75e8e54a4bb3cf1f38a07ec71784032 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 13:22:08 2012 +1000 pactest: Do not remove symlink to directory if local package uses that path If we have a symlink to a directory (e.g. /lib -> usr/lib), then we can not remove it if a local package thinks it has files in the symlink directory (e.g. /lib/foo), because this will invalidate the local file database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb871553912f5cf4ab3cb8aade73cf2a24dcb82c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 01:26:54 2012 +1000 pactest: conflict between files having same effective path Note failure to detect a conflict between files having the same effective path across packages due to a directory symlink. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f47dfc9203e45ef91afdc772c27eb7034bf6590 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 01:15:53 2012 +1000 pactest: conflict between directory and a file Note failure to detect a conflict between a directory in one package and a file in the other when the directory is not currently on the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3772f765474b4678beec6d88e3a1c56fd591aa4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 11 11:36:36 2012 +1000 Add pactest for empty subdirectory conflict The wrong test file was inadvertantly committed in 44e9fdd0. Add the correct test and tidy up the test which was committed. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Sat Jun 16 01:12:22 2012 +0200 Allow cleaning only some cachedirs When cleaning the cache, ask for each cachedir separately. Allan: add some white space in output Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 16 ++- lib/libalpm/be_local.c | 1 + lib/libalpm/be_package.c | 1 + lib/libalpm/conflict.c | 105 +++------------ lib/libalpm/conflict.h | 3 - lib/libalpm/filelist.c | 137 ++++++++++++++++++++ lib/libalpm/{group.h => filelist.h} | 21 +-- lib/libalpm/package.c | 9 -- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 8 +- scripts/pacman-key.sh.in | 3 +- src/pacman/sync.c | 35 ++--- .../{fileconflict012.py => fileconflict011.py} | 6 +- test/pacman/tests/fileconflict012.py | 2 +- test/pacman/tests/fileconflict013.py | 22 ++++ test/pacman/tests/fileconflict015.py | 17 +++ test/pacman/tests/fileconflict016.py | 23 ++++ test/pacman/tests/sync700.py | 22 ++++ test/pacman/tests/sync701.py | 22 ++++ test/pacman/tests/sync702.py | 22 ++++ 21 files changed, 341 insertions(+), 136 deletions(-) create mode 100644 lib/libalpm/filelist.c copy lib/libalpm/{group.h => filelist.h} (63%) copy test/pacman/tests/{fileconflict012.py => fileconflict011.py} (74%) create mode 100644 test/pacman/tests/fileconflict013.py create mode 100644 test/pacman/tests/fileconflict015.py create mode 100644 test/pacman/tests/fileconflict016.py create mode 100644 test/pacman/tests/sync700.py create mode 100644 test/pacman/tests/sync701.py create mode 100644 test/pacman/tests/sync702.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] use the default visibility attribute when debugging is enabled, i.e. all symbols will be visible
by Barbu Paul - Gheorghe 01 Aug '12

01 Aug '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- m4/acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index f57a515..2829845 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -83,7 +83,8 @@ AC_DEFUN([GCC_VISIBILITY_CC],[ if test $visibility_cv_cc = yes; then AC_DEFINE([ENABLE_VISIBILITY_CC], 1, [Define if symbol visibility C support is enabled.]) fi - AM_CONDITIONAL([ENABLE_VISIBILITY_CC], test "x$visibility_cv_cc" = "xyes") + AM_CONDITIONAL([ENABLE_VISIBILITY_CC], + test "x$visibility_cv_cc" = "xyes" -a "x$debug" != "xyes") fi ]) -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

3 3

[pacman-dev] [PATCH] util.c: coding style fix
by Florian Pritz 01 Aug '12

01 Aug '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0196f3b..33cef71 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -65,9 +65,9 @@ * @return pointer to the first token in str if str is not NULL, NULL if * str is NULL */ -char* strsep(char** str, const char* delims) +char *strsep(char** str, const char* delims) { - char* token; + char *token; if(*str==NULL) { /* No more tokens */ -- 1.7.11.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-332-g7193ce1
by dan＠archlinux.org 01 Aug '12

01 Aug '12

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 7193ce1ecd0089545d100fd11647cb346d15331b (commit) via 647b9ea6d9e7ff084d3c59c1005aac2670bd469f (commit) via eb25a18571d97c20046784f7c8a9815dc40512c7 (commit) via 065b7f863a25dac3699c23258b986312f4caac1c (commit) via b782388f1670d9ff819461cfa7e365f7e8178173 (commit) via 52550a2a0a4e6858680828e3fcdf0b12b16c273b (commit) via d2669b47812aebfe3ada7df4c7d7525790ef9c33 (commit) via e94876089a934fde13984b59e735b35f92837d96 (commit) via f619bc61f562d0dd08c502787347b31601f89be8 (commit) via cc6fb2e8a78e6d0ca9bfc778298b1dc095af7db4 (commit) via 3fb934b59a2a29c69214ef2578844340cfcde9f9 (commit) via a6bd14285dfac06ffd88d2a3bc2461c084bd0a7b (commit) via 958b41fa5fcbb6ac806bd969d6333019ba3c6441 (commit) via ddbd36103df95b3fbd199466f3203242ab9ed8f2 (commit) via 35ac4e7ef31898b4d8a090c687aad63df1436083 (commit) via c5e7eeece75e2774d304116bc5003371cc8f1e8e (commit) via 8fe383860e4406d0becf34d2410155e8c93dd494 (commit) via 7520c0facb23887fe93057736834061c6dedfdec (commit) from e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (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 7193ce1ecd0089545d100fd11647cb346d15331b Merge: 647b9ea b782388 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 1 09:21:33 2012 -0500 Merge branch 'maint' commit 647b9ea6d9e7ff084d3c59c1005aac2670bd469f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:01:35 2012 +1000 contrib/updpkgsums: Fix error message Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb25a18571d97c20046784f7c8a9815dc40512c7 Author: Enjolras <0enjolras0(a)laposte.net> Date: Sat Jul 28 11:20:11 2012 +0200 Add documentation for the prepare() function Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 065b7f863a25dac3699c23258b986312f4caac1c Author: Enjolras <0enjolras0(a)laposte.net> Date: Sat Jul 28 11:20:10 2012 +0200 Add a function prepare() to PKGBUILD prepare is run after the source extraction, and is not run with --noextract option. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52550a2a0a4e6858680828e3fcdf0b12b16c273b Author: Daniel Wallace <daniel.wallace12(a)gmail.com> Date: Mon Jul 9 01:55:58 2012 -0400 asdeps flag passed from makepkg to pacman add the asdeps flag for makepkg so that it does pacman -U --asdeps [Allan: clean-up whitespace] Signed-off-by: Daniel Wallace <daniel.wallace12(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2669b47812aebfe3ada7df4c7d7525790ef9c33 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 14:24:29 2012 +1000 Do not enable _FORTIFY_SOURCE without optimization With glibc-2.16, using -D_FORTIFY_SOURCE requires that optimization (-O) be used or it will prodice a warning message. Enable -Werror in our test for _FORTIFY_SOURCE support to catch when a users specifies CFLAGS without optimization. The line to set CFLAGS="" when no CFLAGS are specified (either due to being unset or geniunely empty) is required as autoconf will use "-O2 -g" for its tests by defult when CFLAGS is unset, but will not add them to the CFLAGS used... Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e94876089a934fde13984b59e735b35f92837d96 Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Sat Jul 28 11:26:06 2012 +0300 Fix wrong parameter name in alpm_db_update's signature Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> commit f619bc61f562d0dd08c502787347b31601f89be8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 12 14:00:44 2012 -0500 Clean up exclusion list in sync cache cleanup Make an array out of our various glob skip patterns and loop through them looking for items to skip. Additionally, when doing a full clean, delete all objects rather than respect this skip list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc6fb2e8a78e6d0ca9bfc778298b1dc095af7db4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 10 23:14:40 2012 -0500 Skip deltas and partial downloads in package cleanup This affects -Sc only, not -Scc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3fb934b59a2a29c69214ef2578844340cfcde9f9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 2 22:51:08 2012 -0400 pactree: show tree vertical "limbs" Showing vertical limbs makes the tree easier to follow. Old: New: |--pkg |--pkg |--dep1 |--dep1 |--dep2 | |--dep2 |--dep3 |--dep3 |--dep4 |--dep4 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: fix shadow warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a6bd14285dfac06ffd88d2a3bc2461c084bd0a7b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 2 22:51:07 2012 -0400 pactree: consolidate both walk_deps functions Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: fix shadow warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ddbd36103df95b3fbd199466f3203242ab9ed8f2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 19 10:37:56 2012 -0400 util: fix line length calc in _alpm_archive_fgets 74274b5dc347ba70 which added the real_line_size to the buffer struct didn't properly account for what happens when archive_fgets has to loop more than once to find the end of a line. In most cases, this isn't a problem, but could potentially cause a longer line such as PGP signature to be improperly read. This patch fixes the oversight and focuses on only calculating the line length when we hit the end of line marker. The effective length is then calculated via pointer arithmetic as: (start_of_last_read + read_length) - start_of_line Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 35ac4e7ef31898b4d8a090c687aad63df1436083 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 10 22:51:41 2012 -0400 lib/conflict: use a binary search within filelists Take advantage of the fact that our filelists are arrays sorted by filename with a known length and use a binary search. This should speed up file conflict checking, particularly when larger packages are involved. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5e7eeece75e2774d304116bc5003371cc8f1e8e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 12 14:50:56 2012 -0400 lib/be_local: ensure local filelists are sorted This may very well be a no-op, but better safe than sorry. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8fe383860e4406d0becf34d2410155e8c93dd494 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 11 09:59:49 2012 -0400 lib/be_package: use qsort instead of our own msort On the assumption that these arrays are already mostly sorted, use the standard quicksort method to sort the files arrays. The files_msort function name is tweaked to give it a more general name to reflect this change. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 ++ contrib/bacman.sh.in | 8 +-- contrib/bash_completion.in | 6 +- contrib/updpkgsums.sh.in | 2 +- contrib/zsh_completion.in | 1 + doc/PKGBUILD.5.txt | 9 +++ doc/makepkg.8.txt | 20 +++--- lib/libalpm/alpm.h | 2 +- lib/libalpm/be_local.c | 2 + lib/libalpm/be_package.c | 52 +------------- lib/libalpm/conflict.c | 22 +++--- lib/libalpm/util.c | 6 +- m4/acinclude.m4 | 12 +++- scripts/makepkg.sh.in | 19 +++++- src/pacman/sync.c | 37 ++++++---- src/util/pactree.c | 163 +++++++++++++++++++++++--------------------- 16 files changed, 195 insertions(+), 171 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-25-gb782388
by dan＠archlinux.org 01 Aug '12

01 Aug '12

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, maint has been updated via b782388f1670d9ff819461cfa7e365f7e8178173 (commit) via 958b41fa5fcbb6ac806bd969d6333019ba3c6441 (commit) via 7520c0facb23887fe93057736834061c6dedfdec (commit) from 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (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 b782388f1670d9ff819461cfa7e365f7e8178173 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:28:00 2012 +1000 makepkg: remove unnecessary formatting This extra newline leaves a gap that looks strange in of itself, but is highlighted when piping -g output to a PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 958b41fa5fcbb6ac806bd969d6333019ba3c6441 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 11 11:10:56 2012 +1000 contrib/bacman: fix package architecture in filename Give the generated package the correct architecture in its filename rather than assuming the system architecture. Also add updated copyright notice. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7520c0facb23887fe93057736834061c6dedfdec Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 10 20:16:37 2012 -0500 Add more debug logging to dir_belongsto_pkg() function Now that we pass in the handle, we might as well add logging. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 8 ++++---- lib/libalpm/conflict.c | 9 ++++++++- scripts/makepkg.sh.in | 1 - 3 files changed, 12 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0