September 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/4] pacman-key: ensure array iterations are quoted
by Dan McGee 21 Sep '11

21 Sep '11

When doing something like `pacman-key --edit-key 'Dan McGee'`, one would expect it to work, and not fail. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/pacman-key.sh.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 2a78803..b3f5259 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -203,7 +203,7 @@ verify_keyring_input() { # Verify signatures of keyring files and association revocation files if they exist msg "$(gettext "Verifying keyring file signatures...")" local keyring - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}.gpg.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" ret=1 @@ -239,7 +239,7 @@ populate_keyring() { fi else # verify listed keyrings exist - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do if [[ ! -f "$KEYRING_IMPORT_DIR/$keyring.gpg" ]]; then error "$(gettext "The keyring file %s does not exist.")" "$KEYRING_IMPORT_DIR/$keyring.gpg" ret=1 @@ -258,7 +258,7 @@ populate_keyring() { local key_id # Add keys from requested keyrings - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --with-colons --list-keys | grep ^pub | cut -d: -f5)" for key_id in ${add_keys}; do @@ -270,7 +270,7 @@ populate_keyring() { # to key ids is important, because key ids are the only guarantee of identification # for the keys. local -A removed_ids - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then while read key; do local key_values name @@ -313,7 +313,7 @@ populate_keyring() { edit_keys() { local errors=0; - for key in ${KEYIDS[@]}; do + for key in "${KEYIDS[@]}"; do # Verify if the key exists in pacman's keyring if ! "${GPG_PACMAN[@]}" --list-keys "$key" &>/dev/null; then error "$(gettext "The key identified by %s does not exist")" "$key" @@ -322,7 +322,7 @@ edit_keys() { done (( errors )) && exit 1; - for key in ${KEYIDS[@]}; do + for key in "${KEYIDS[@]}"; do "${GPG_PACMAN[@]}" --edit-key "$key" done } -- 1.7.6.3

1 3

[pacman-dev] [RFC] makepkg: output commands ran in build/check/package functions
by Florian Pritz 21 Sep '11

21 Sep '11

This might help to locate a failing command which causes makepkg to abort. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This is a request for comments and not a final patch. It's only been tested shortly. I just want to know if people like the idea. scripts/makepkg.sh.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6304a25..409c4cc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -851,6 +851,7 @@ extract_sources() { } error_function() { + set +x if [[ -p $logpipe ]]; then rm "$logpipe" fi @@ -912,7 +913,9 @@ run_function() { restoretrap=$(trap -p ERR) trap 'error_function $pkgfunc' ERR + set -x $pkgfunc &>"$logpipe" + set +x eval $restoretrap wait $teepid @@ -920,7 +923,9 @@ run_function() { else restoretrap=$(trap -p ERR) trap 'error_function $pkgfunc' ERR + set -x $pkgfunc 2>&1 + set +x eval $restoretrap fi # reset our shell options -- 1.7.6.1

6 5

[pacman-dev] [PATCH 1/4] validate_deltas: split verify/check errors loops
by Dan McGee 20 Sep '11

20 Sep '11

This allows us to do all delta verification up front, followed by whatever needs to be done with any found errors. In this case, we call prompt_to_delete() for each error. Add back the missing EVENT(ALPM_EVENT_DELTA_INTEGRITY_DONE) that accidentally got removed in commit 062c391919e93f1d6. Remove use of *data; we never even look at the stuff in this array for the error code we were returning and this would be much better handled by one callback per error anyway, or at least some strongly typed return values. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2092912..dda4b24 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -753,11 +753,9 @@ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, return doremove; } -static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas, - alpm_list_t **data) +static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) { - int errors = 0; - alpm_list_t *i; + alpm_list_t *i, *errors = NULL; if(!deltas) { return 0; @@ -765,19 +763,25 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas, /* Check integrity of deltas */ EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_START, NULL, NULL); - for(i = deltas; i; i = i->next) { alpm_delta_t *d = i->data; char *filepath = _alpm_filecache_find(handle, d->delta); if(_alpm_test_checksum(filepath, d->delta_md5, ALPM_CSUM_MD5)) { - prompt_to_delete(handle, filepath, ALPM_ERR_DLT_INVALID); - errors++; - *data = alpm_list_add(*data, strdup(d->delta)); + errors = alpm_list_add(errors, filepath); + } else { + FREE(filepath); } - FREE(filepath); } + EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_DONE, NULL, NULL); + if(errors) { + for(i = errors; i; i = i->next) { + char *filepath = i->data; + prompt_to_delete(handle, filepath, ALPM_ERR_DLT_INVALID); + FREE(filepath); + } + alpm_list_free(errors); handle->pm_errno = ALPM_ERR_DLT_INVALID; return -1; } @@ -1024,7 +1028,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; } - if(validate_deltas(handle, deltas, data)) { + if(validate_deltas(handle, deltas)) { alpm_list_free(deltas); return -1; } -- 1.7.6.3

1 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-218-g8375ad2
by dan＠archlinux.org 20 Sep '11

20 Sep '11

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 8375ad214a2a8d6e01430f432aa7957688d8ec52 (commit) via b7ebacc576ea63fd35861f374dd345f6aa8feb8c (commit) via ec790ced7cee00269234cb1ed476e29256433923 (commit) via 994cb4da4f6bc8efbb6a649cb7d99d95bce5c37a (commit) via a27f993600a518ef6a15bd7fb29575b218b58a0a (commit) via afdbfc05f771f2c684ee195b46d26b3d08a67085 (commit) via 7eb2f0cd151998d36746e2eb14cad2a3f8fb708b (commit) via 8e3b39a9e0c2fbc268919a57fb1e3cf7aa2aedf4 (commit) via 0f92fc59638e5d053966c8f39afd615a870141cc (commit) via 79cbce60ac4a40bf11d039e9bdcd09c852ce3292 (commit) via 70e2c34f0f5db329b8e92fe3fc3043e495272f14 (commit) via 37961648486ca44a92eefe454cd6f1f091c4fe6d (commit) via 95119d46d486168e7fddd5e8eece93be8e9ca719 (commit) via 288a81d8470b1fd2e8a8f0814abe4cbfed71497c (commit) via bfe36c2ddf869e2ebc44bec1e35c0319263ac386 (commit) via e1899cbc64c6b634107f09c3a3e8152c63078636 (commit) via a94ad2974031138dbb4d42a939dfc0cd15a75ce7 (commit) from 41d8deff88ed7bdaf1820882687fb99107f60d2a (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 8375ad214a2a8d6e01430f432aa7957688d8ec52 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 23:47:06 2011 -0500 _alpm_sync_commit: extract two static methods This adds two new static methods, check_validity() and load_packages(), to sync.c which are simply code fragments pulled out of our do-everything sync commit code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b7ebacc576ea63fd35861f374dd345f6aa8feb8c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 23:28:05 2011 -0500 Pass package signature data up one more level Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ec790ced7cee00269234cb1ed476e29256433923 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 22:53:15 2011 -0500 signing: add a process and retry loop for database signatures In reality, there is no retrying that happens as of now because we don't have any import or changing of the keyring going on, but the code is set up so we can drop this in our new _alpm_process_siglist() function. Wire up the basics to the sync database validation code, so we see something like the following: $ pacman -Ss unknowntrust error: core: signature from "Dan McGee <dpmcgee(a)gmail.com>" is unknown trust error: core: signature from "Dan McGee <dpmcgee(a)gmail.com>" is unknown trust error: database 'core' is not valid (invalid or corrupted database (PGP signature)) $ pacman -Ss missingsig error: core: missing required signature error: core: missing required signature error: database 'core' is not valid (invalid or corrupted database (PGP signature)) Yes, there is some double output, but this should be fixable in the future. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 994cb4da4f6bc8efbb6a649cb7d99d95bce5c37a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 21:51:30 2011 -0500 Allow our PGP helper method to pass back the signature results This will make its way up the call chain eventually to allow trusting and importing of keys as necessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a27f993600a518ef6a15bd7fb29575b218b58a0a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 21:01:26 2011 -0500 Split package validation and load loops This adds a some new callback event and progress codes for package loading, which was formerly bundled in with package validation before. The main sync.c loop where loading occurred is now two loops running sequentially. The behavior should not change with this patch outside of progress and event display; more changes will come in following patches. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afdbfc05f771f2c684ee195b46d26b3d08a67085 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 20:40:32 2011 -0500 Extract an _alpm_pkg_validate_internal() method _alpm_pkg_load_internal() was becoming a monster. Extract the top bit of the method that dealt with checksum and signature validation into a separate method that should be called before one loads a package to ensure it is valid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7eb2f0cd151998d36746e2eb14cad2a3f8fb708b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 19 22:09:15 2011 -0400 pacman/upgrade: print 'loading packages...' only once Do this outside the loop to prevent the message from being displayed (and pluralized!) for each individual package. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8e3b39a9e0c2fbc268919a57fb1e3cf7aa2aedf4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 19:57:29 2011 -0500 pacman: use dynamic string allocation where it makes sense None of these are hot-code paths, and at least the target reading has little need for an arbitrary length limitation (however crazy it might be to have longer arguments). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0f92fc59638e5d053966c8f39afd615a870141cc Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 19:15:16 2011 -0500 utils/cleanupdelta: remove unneeded syncdbpath This variable was totally unused. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79cbce60ac4a40bf11d039e9bdcd09c852ce3292 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:32:53 2011 -0500 Remove all usages of alpm_list_getdata() from the library No need for the indirection; just access ->data instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70e2c34f0f5db329b8e92fe3fc3043e495272f14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:28:18 2011 -0500 _alpm_runscriptlet(): remove clean_tmpdir variable This is always true at the end since we return early if we couldn't create the tmpdir, so it is totally unnecessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37961648486ca44a92eefe454cd6f1f091c4fe6d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:27:21 2011 -0500 Access db->pkgcache directly in db_free_pkgcache() We shouldn't be going through the accessor that does a bunch of unnecessary legwork, including potentially loading the pkgcache right before we free it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 95119d46d486168e7fddd5e8eece93be8e9ca719 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 19:55:16 2011 -0500 Flip getcwd()/chdir() for open()/fchdir() in the frontend Just like we did in libalpm in commit 288a81d8470b1. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 288a81d8470b1fd2e8a8f0814abe4cbfed71497c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:08:14 2011 -0500 Use more efficient way of restoring working directory Rather than using a string-based path, we can restore the working directory via a file descriptor and use of fchdir(). From the getcwd manpage: Opening the current directory (".") and calling fchdir(2) to return is usually a faster and more reliable alternative when sufficiently many file descriptors are available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bfe36c2ddf869e2ebc44bec1e35c0319263ac386 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 13:43:13 2011 -0500 Reduce path allocation on the stack in local database We did a lot of both malloc-ing and stack printing to form some paths in this code. Attempt to unify it all into the one get_pkgpath() method by adding an optional third "filename" parameter, and form the necessary path string all in one go. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e1899cbc64c6b634107f09c3a3e8152c63078636 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 13:18:42 2011 -0500 Be smarter about running ldconfig during removal transactions 1. Don't run it if something failed in package removal- this mirrors what we already do in sync transactions. 2. Don't run it if we are invoking it for the replaces removal bit of a sync transaction- it doesn't make sense to run ldconfig halfway through a sync install; we should only run it once at the end. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a94ad2974031138dbb4d42a939dfc0cd15a75ce7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 13:17:16 2011 -0500 Search for non-prefixed paths in skip_remove list We add them to this list with the root path not appended; we should be searching for them this way as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 19 ++++-- lib/libalpm/alpm.h | 5 ++ lib/libalpm/be_local.c | 67 ++++++++++--------- lib/libalpm/be_package.c | 93 +++++++++++++++++---------- lib/libalpm/be_sync.c | 18 +++++- lib/libalpm/db.c | 6 +- lib/libalpm/deps.c | 3 +- lib/libalpm/handle.c | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 8 ++- lib/libalpm/remove.c | 20 +++--- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 87 +++++++++++++++++++++++--- lib/libalpm/signing.h | 6 ++- lib/libalpm/sync.c | 158 +++++++++++++++++++++++++++++++--------------- lib/libalpm/trans.c | 13 ++--- lib/libalpm/util.c | 44 ++++++++----- src/pacman/callback.c | 9 +++ src/pacman/conf.c | 24 ++++--- src/pacman/pacman.c | 25 ++++++-- src/pacman/sync.c | 8 ++- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 10 +++- src/util/cleanupdelta.c | 15 ++--- 24 files changed, 437 insertions(+), 209 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] utils/cleanupdelta: remove unneeded syncdbpath
by Dan McGee 20 Sep '11

20 Sep '11

This variable was totally unused. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util/cleanupdelta.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index a45efdc..8ce74f9 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -22,7 +22,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> /* PATH_MAX */ #include <alpm.h> #include <alpm_list.h> @@ -68,19 +67,17 @@ static void checkpkgs(alpm_list_t *pkglist) } static void checkdbs(const char *dbpath, alpm_list_t *dbnames) { - char syncdbpath[PATH_MAX]; alpm_db_t *db = NULL; alpm_list_t *i; const alpm_siglevel_t level = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; for(i = dbnames; i; i = alpm_list_next(i)) { - char *dbname = alpm_list_getdata(i); - snprintf(syncdbpath, PATH_MAX, "%s/sync/%s", dbpath, dbname); + const char *dbname = alpm_list_getdata(i); db = alpm_db_register_sync(handle, dbname, level); if(db == NULL) { - fprintf(stderr, "error: could not register sync database (%s)\n", - alpm_strerror(alpm_errno(handle))); - return; + fprintf(stderr, "error: could not register sync database '%s' (%s)\n", + dbname, alpm_strerror(alpm_errno(handle))); + continue; } checkpkgs(alpm_db_get_pkgcache(db)); } -- 1.7.6.1

1 0

[pacman-dev] [PATCH 1/7] Search for non-prefixed paths in skip_remove list
by Dan McGee 19 Sep '11

19 Sep '11

We add them to this list with the root path not appended; we should be searching for them this way as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8021702..c6a3efc 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -216,12 +216,12 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, { char filepath[PATH_MAX]; - snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); - - if(alpm_list_find_str(skip_remove, filepath)) { + if(alpm_list_find_str(skip_remove, file->name)) { /* return success because we will never actually remove this file */ return 1; } + + snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ if(_alpm_access(handle, NULL, filepath, W_OK) == -1) { -- 1.7.6.1

1 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-201-g41d8def
by dan＠archlinux.org 18 Sep '11

18 Sep '11

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 41d8deff88ed7bdaf1820882687fb99107f60d2a (commit) via 86d9fcbfff6d806bcb6d0a19d73d09e1af4e1733 (commit) via 69a3558b75948e4b1592a060a58f6c1d58b7d459 (commit) via 49dff4c80b70f73f55cd8968e83d4ea3727c2ae3 (commit) via 83ee9708b1c0ed3c262e0148ea8cdc880f177d0d (commit) via 07e89c1e5db2769c1128f5d99fead151a4afc751 (commit) via 52c65fdfea7d174ad2f4d895c5783d936fdac7d7 (commit) via c12fa4ab192da0a1cd5c61b2f70e154205401e6b (commit) via b1a09b93ef626995a009ae3144fc130cc60a4078 (commit) from 223a92ca9da2efecefb200a828618747c0f5b03e (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 41d8deff88ed7bdaf1820882687fb99107f60d2a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:32:15 2011 -0500 be_local: cope with a desc file without trailing newline We checked the (fgets == NULL and !feof) case, but never actually bailed out of the loop if we were at the end of the file, causing infinite looping. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86d9fcbfff6d806bcb6d0a19d73d09e1af4e1733 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:07:05 2011 -0500 Remove const specifier from changelog_read() void parameter This shouldn't really be declared with const, and causes a compile error when -Wcast-qual is used. Remove the const specifier from the function specification and all implementations. Also fix one other trivial -Wcast-qual warning in _alpm_db_cmp(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69a3558b75948e4b1592a060a58f6c1d58b7d459 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:03:54 2011 -0500 Remove dead changelog_feof() code We never ended up using or really needing this; kill it for now knowing it is in git history if ever needed again. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49dff4c80b70f73f55cd8968e83d4ea3727c2ae3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:00:21 2011 -0500 Add a random pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83ee9708b1c0ed3c262e0148ea8cdc880f177d0d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 16:22:38 2011 -0400 src/util: provide strndup definitions where needed Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07e89c1e5db2769c1128f5d99fead151a4afc751 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 17:22:18 2011 -0400 dload: avoid using memrchr This function doesn't exist on OSX. Since there aren't any other candidates in alpm for which this function would make sense to use, simply replace the function call with a loop that does the equivalent. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 52c65fdfea7d174ad2f4d895c5783d936fdac7d7 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 16:55:23 2011 -0500 Ensure entire struct is zeroed in _alpm_parsedate() Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c12fa4ab192da0a1cd5c61b2f70e154205401e6b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 16:19:32 2011 -0400 pactree: include missing ctype.h header needed for isspace() -- avoids warnings on OSX. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b1a09b93ef626995a009ae3144fc130cc60a4078 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 16:35:00 2011 -0400 configure: Fix quoting in SEDINPLACE on Darwin single quotes expanded to nothing, leaving us with a command that assumed the sed expression was the backup suffix. Use a pair of escaped double quotes, which survives automake and ends up properly in makepkg. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- lib/libalpm/alpm.h | 4 +--- lib/libalpm/be_local.c | 10 +++++++--- lib/libalpm/be_package.c | 2 +- lib/libalpm/db.c | 4 ++-- lib/libalpm/dload.c | 12 +++++++++--- lib/libalpm/package.c | 11 ++--------- lib/libalpm/package.h | 2 +- lib/libalpm/util.c | 3 ++- src/util/pacsort.c | 22 ++++++++++++++++++++++ src/util/pactree.c | 23 +++++++++++++++++++++++ test/pacman/tests/replace104.py | 25 +++++++++++++++++++++++++ 12 files changed, 96 insertions(+), 24 deletions(-) create mode 100644 test/pacman/tests/replace104.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-192-g223a92c
by dan＠archlinux.org 18 Sep '11

18 Sep '11

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 223a92ca9da2efecefb200a828618747c0f5b03e (commit) via 7ad78c2c88ea3a7a1a33c4d09c2e6e4c772da25e (commit) via a7d779803239a1dca43a6879f3938c5e63811992 (commit) from f883efe2cb105a397edc0b892f5fa06c98f2208f (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 223a92ca9da2efecefb200a828618747c0f5b03e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 11 15:27:57 2011 -0400 dload: remove user:pass@ definition from hostname Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7ad78c2c88ea3a7a1a33c4d09c2e6e4c772da25e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 18:22:46 2011 -0400 paccache: remove unnecessary if check This is superfluous as the ensuing for loop will exit immediately on the same condition avoided by the if. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a7d779803239a1dca43a6879f3938c5e63811992 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 15:34:28 2011 -0500 Fix build without gpgme Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 6 ++---- lib/libalpm/dload.c | 10 +++++++++- lib/libalpm/signing.c | 4 +++- 3 files changed, 14 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Is there a release schedule for pacman-4?
by kachelaqa 17 Sep '11

17 Sep '11

i had a look at the pacman4-rc1 that was put out for testing last month, but judging from the activity on this list there still seems to be a quite lot of new features being added. my searches for a release schedule have drawn a blank, so am i right to assume pacman-4 is still quite a long way away from it's first release? by "long way away" i mean more than, say, two months?

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-189-gf883efe
by dan＠archlinux.org 14 Sep '11

14 Sep '11

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 f883efe2cb105a397edc0b892f5fa06c98f2208f (commit) via e01dbcc06848c135af5beba069ad99bc5dd8deaf (commit) via 68856755c4f18affb513d93ec94fa9307c31473a (commit) via a2356d5ae3cdc6ac28ed614e0e5e7e75174728e9 (commit) via 4a02350ded318bdc1da5421551784ab2a10dd96b (commit) via d1e04c1b677d733262a0436ed9b25b2e7eada15e (commit) via 0f69e2ec0b3958167a2ea7a5fcef40cb966d05d1 (commit) from 3905ada993bacba31a1a9005fe4a0023890296d9 (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 f883efe2cb105a397edc0b892f5fa06c98f2208f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 12 19:47:05 2011 -0400 pacman: add short opt '-p' for --print to -{S,R}h Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e01dbcc06848c135af5beba069ad99bc5dd8deaf Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 14 13:30:29 2011 -0400 include ldconfig.stub in EXTRA_DIST Since c51b9ca, ldconfig.stub is required by pactest so we need to include it as part of the dist tarball. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68856755c4f18affb513d93ec94fa9307c31473a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 07:47:11 2011 -0400 buildsys: remove existing symlinks before installing This fixes build errors when performing a manual install straight to a filesystem where the files already exist. Reported-by: Sergej Pupykin <ml(a)sergej.pp.ru> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2356d5ae3cdc6ac28ed614e0e5e7e75174728e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 12 09:55:47 2011 -0500 Don't duplicate header strings There is no need to print them into buffers; we can use the values returned by gettext() directly without issue. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a02350ded318bdc1da5421551784ab2a10dd96b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 23:02:36 2011 -0400 makepkg: fix recreation of hardlinks to .gz manpages 4ed12ae tightened up the logic to use only find, but ignored the fact that since the manpage hard link names were no longer captured. They were created as separate compressed manpages, rather than as hardlinks. This also introduces a minor efficiency of deleting all hardlinks at once and using proper iteration over an array rather than a string. Note to anyone else touching this code: e2fsprogs and libpcap are useful for testing this. If that changes in the future, you can use the below bash to locate others: IFS=$'\n' read -rd '' -a a < <(find /usr/share/man -type f \! -links 1) pacman -Qqo "${a[@]}" | sort -u I broke it! Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d1e04c1b677d733262a0436ed9b25b2e7eada15e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 16:19:46 2011 -0400 makepkg: add missing newline on passing gpg sourcecheck When a sourceball passes this check without any warnings, a newline is omitted. Similar to the if clause of this else block, print a single new line at the end of the clause instead of accounting for each output. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 0f69e2ec0b3958167a2ea7a5fcef40cb966d05d1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 12 08:27:13 2011 -0400 makepkg: check for var existance before file existance This prevents makepkg from aborting with 'file not found' when changelog= or install= are declared in a PKGBUILD, but empty. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 1 + scripts/Makefile.am | 2 ++ scripts/makepkg.sh.in | 20 +++++++++++--------- src/pacman/pacman.c | 2 +- src/pacman/util.c | 10 +++++----- test/pacman/Makefile.am | 1 + 6 files changed, 21 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0