- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v1] paccache: parse_filename bug fix
by Maxim Andersson 29 Sep '14

29 Sep '14

Filenames got parsed wrongly, causing whitelist- and blacklist-checks to always return false. Bug appeared when full path names to pkgs were introduced. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index eba315c..ce64d93 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -56,9 +56,11 @@ pkgfilter() { # script after the block of awk. awk -v keep="$1" -v scanarch="$2" ' - function parse_filename(filename, parts, count, i, pkgname, arch) { + function parse_filename(filename, basename, parts, count, i, pkgname, arch) { - count = split(filename, parts, "-") + basename = filename + sub(".*/", "", basename) + count = split(basename, parts, "-") i = 1 pkgname = parts[i++] -- 2.1.1

2 1

[pacman-dev] [PATCH 0/5] Resend of arch-specific source/checksum support
by Dave Reisner 29 Sep '14

29 Sep '14

Hi, this addresses previous feedback from agregory and also fixes a bug I found in my own testing. I've had success creating packages such as: https://aur-dev.archlinux.org/packages/ch/chromium-plugins/PKGBUILD https://aur-dev.archlinux.org/packages/go/google-chrome/PKGBUILD https://aur-dev.archlinux.org/packages/wi/wine/PKGBUILD Which are, imo, far more beautiful than the boundless "if $CARCH" checks. Feedback welcome -- I'm very interested in getting these in good enough shape to be merged for 4.2. Branch: http://code.falconindy.com/cgit/pacman.git/log/?h=arch-specific Dave Reisner (5): makepkg: break out check_checksums to reasonably sized functions makepkg: break out checksum generation to its own function PKGBUILD: add support for arch-specific sources updpkgsums: update to recognize arch-specific sources makepkg: move negation in inequality comparisons contrib/updpkgsums.sh.in | 2 +- doc/PKGBUILD.5.txt | 4 + scripts/makepkg.sh.in | 298 ++++++++++++++++++++++++++++++++--------------- 3 files changed, 208 insertions(+), 96 deletions(-) -- 2.0.4

3 14

[pacman-dev] [PATCH] Revert "Remove log_cb, add ALPM_EVENT_LOG instead"
by Andrew Gregory 29 Sep '14

29 Sep '14

Moving logging to the event callback caused warnings under clang due to non-literal format strings and silenced all log messages when --print was used. This reverts commit cd793c5ab7689cc8cbc18277375b368060e5acfe. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Conflicts: lib/libalpm/alpm.h src/pacman/callback.c --- Making sure this doesn't fall through the cracks prior to 4.2. Previous discussion here: https://lists.archlinux.org/pipermail/pacman-dev/2014-June/019136.html lib/libalpm/alpm.h | 36 +++++++++++++++--------------------- lib/libalpm/handle.c | 13 +++++++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/log.c | 14 +++++--------- src/pacman/callback.c | 36 ++++++++++++++++++------------------ src/pacman/callback.h | 4 ++++ src/pacman/conf.c | 1 + src/util/cleanupdelta.c | 14 ++++++-------- src/util/testdb.c | 14 ++++++-------- src/util/testpkg.c | 14 ++++++-------- 10 files changed, 75 insertions(+), 72 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 751fa63..1cfd4f5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -343,6 +343,16 @@ typedef struct _alpm_siglist_t { * Logging facilities */ +/** Logging Levels */ +typedef enum _alpm_loglevel_t { + ALPM_LOG_ERROR = 1, + ALPM_LOG_WARNING = (1 << 1), + ALPM_LOG_DEBUG = (1 << 2), + ALPM_LOG_FUNCTION = (1 << 3) +} alpm_loglevel_t; + +typedef void (*alpm_cb_log)(alpm_loglevel_t, const char *, va_list); + int alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, ...) __attribute__((format(printf, 3, 4))); @@ -431,8 +441,6 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_KEY_DOWNLOAD_START, /** Key downloading is finished. */ ALPM_EVENT_KEY_DOWNLOAD_DONE, - /** A log message was emitted; See alpm_event_log_t for arguments. */ - ALPM_EVENT_LOG, /** A .pacnew file was created; See alpm_event_pacnew_created_t for arguments. */ ALPM_EVENT_PACNEW_CREATED, /** A .pacsave file was created; See alpm_event_pacsave_created_t for @@ -502,24 +510,6 @@ typedef struct _alpm_event_database_missing_t { const char *dbname; } alpm_event_database_missing_t; -/** Log levels. */ -typedef enum _alpm_loglevel_t { - ALPM_LOG_ERROR = 1, - ALPM_LOG_WARNING = (1 << 1), - ALPM_LOG_DEBUG = (1 << 2), - ALPM_LOG_FUNCTION = (1 << 3) -} alpm_loglevel_t; - -typedef struct _alpm_event_log_t { - /** Type of event. */ - alpm_event_type_t type; - /** Log level. */ - alpm_loglevel_t level; - /** Message. */ - const char *fmt; - va_list args; -} alpm_event_log_t; - typedef struct _alpm_event_pkgdownload_t { /** Type of event. */ alpm_event_type_t type; @@ -571,7 +561,6 @@ typedef union _alpm_event_t { alpm_event_delta_patch_t delta_patch; alpm_event_scriptlet_info_t scriptlet_info; alpm_event_database_missing_t database_missing; - alpm_event_log_t log; alpm_event_pkgdownload_t pkgdownload; alpm_event_pacnew_created_t pacnew_created; alpm_event_pacsave_created_t pacsave_created; @@ -749,6 +738,11 @@ char *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url); * @{ */ +/** Returns the callback used for logging. */ +alpm_cb_log alpm_option_get_logcb(alpm_handle_t *handle); +/** Sets the callback used for logging. */ +int alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb); + /** Returns the callback used to report download progress. */ alpm_cb_download alpm_option_get_dlcb(alpm_handle_t *handle); /** Sets the callback used to report download progress. */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7652d1f..0d8ea34 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -143,6 +143,12 @@ int _alpm_handle_unlock(alpm_handle_t *handle) } +alpm_cb_log SYMEXPORT alpm_option_get_logcb(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->logcb; +} + alpm_cb_download SYMEXPORT alpm_option_get_dlcb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -263,6 +269,13 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; } +int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) +{ + CHECK_HANDLE(handle, return -1); + handle->logcb = cb; + return 0; +} + int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb) { CHECK_HANDLE(handle, return -1); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 85c64f6..9cd3a21 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -63,6 +63,7 @@ struct __alpm_handle_t { #endif /* callback functions */ + alpm_cb_log logcb; /* Log callback function */ alpm_cb_download dlcb; /* Download callback function */ alpm_cb_totaldl totaldlcb; /* Total download callback function */ alpm_cb_fetch fetchcb; /* Download file callback function */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index aac55e7..d232bcc 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -81,19 +81,15 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...) { - alpm_event_log_t event = { - .type = ALPM_EVENT_LOG, - .level = flag, - .fmt = fmt - }; + va_list args; - if(handle == NULL || handle->eventcb == NULL) { + if(handle == NULL || handle->logcb == NULL) { return; } - va_start(event.args, fmt); - EVENT(handle, &event); - va_end(event.args); + va_start(args, fmt); + handle->logcb(flag, fmt, args); + va_end(args); } /* vim: set noet: */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 1d68db4..4993382 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -281,24 +281,6 @@ void cb_event(alpm_event_t *event) event->database_missing.dbname); } break; - case ALPM_EVENT_LOG: - { - alpm_event_log_t *e = &event->log; - if(!e->fmt || strlen(e->fmt) == 0) { - break; - } - - if(on_progress) { - char *string = NULL; - pm_vasprintf(&string, e->level, e->fmt, e->args); - if(string != NULL) { - output = alpm_list_add(output, string); - } - } else { - pm_vfprintf(stderr, e->level, e->fmt, e->args); - } - } - break; case ALPM_EVENT_PACNEW_CREATED: { alpm_event_pacnew_created_t *e = &event->pacnew_created; @@ -862,4 +844,22 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) return; } +/* Callback to handle notifications from the library */ +void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) +{ + if(!fmt || strlen(fmt) == 0) { + return; + } + + if(on_progress) { + char *string = NULL; + pm_vasprintf(&string, level, fmt, args); + if(string != NULL) { + output = alpm_list_add(output, string); + } + } else { + pm_vfprintf(stderr, level, fmt, args); + } +} + /* vim: set noet: */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index e4941fc..5480c73 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -39,6 +39,10 @@ void cb_dl_total(off_t total); /* callback to handle display of download progress */ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total); +/* callback to handle messages/notifications from pacman library */ +__attribute__((format(printf, 2, 0))) +void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); + #endif /* _PM_CALLBACK_H */ /* vim: set noet: */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 0e483f7..8b298cc 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -684,6 +684,7 @@ static int setup_libalpm(void) } config->handle = handle; + alpm_option_set_logcb(handle, cb_log); alpm_option_set_dlcb(handle, cb_dl_progress); alpm_option_set_eventcb(handle, cb_event); alpm_option_set_questioncb(handle, cb_question); diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 190e2c7..4a67fc3 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -35,19 +35,17 @@ static void cleanup(int signum) exit(signum); } -static void output_cb(alpm_event_log_t *event) +__attribute__((format(printf, 2, 0))) +static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { - if(event->type != ALPM_EVENT_LOG) { - return; - } - if(strlen(event->fmt)) { - switch(event->level) { + if(strlen(fmt)) { + switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; /* case ALPM_LOG_DEBUG: printf("debug: "); break; */ default: return; } - vprintf(event->fmt, event->args); + vprintf(fmt, args); } } @@ -128,7 +126,7 @@ int main(int argc, char *argv[]) } /* let us get log messages from libalpm */ - alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb); + alpm_option_set_logcb(handle, output_cb); checkdbs(dbnames); alpm_list_free(dbnames); diff --git a/src/util/testdb.c b/src/util/testdb.c index 4d1fd4c..e3b331a 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -39,18 +39,16 @@ static void cleanup(int signum) exit(signum); } -static void output_cb(alpm_event_log_t *event) +__attribute__((format(printf, 2, 0))) +static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { - if(event->type != ALPM_EVENT_LOG) { - return; - } - if(strlen(event->fmt)) { - switch(event->level) { + if(strlen(fmt)) { + switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; default: return; } - vprintf(event->fmt, event->args); + vprintf(fmt, args); } } @@ -284,7 +282,7 @@ int main(int argc, char *argv[]) } /* let us get log messages from libalpm */ - alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb); + alpm_option_set_logcb(handle, output_cb); if(!dbnames) { errors = check_localdb(); diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 39807fe..cc7d9c2 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -23,20 +23,18 @@ #include <alpm.h> -static void output_cb(alpm_event_log_t *event) +__attribute__((format(printf, 2, 0))) +static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { - if(event->type != ALPM_EVENT_LOG) { + if(fmt[0] == '\0') { return; } - if(event->fmt[0] == '\0') { - return; - } - switch(event->level) { + switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; default: return; /* skip other messages */ } - vprintf(event->fmt, event->args); + vprintf(fmt, args); } int main(int argc, char *argv[]) @@ -61,7 +59,7 @@ int main(int argc, char *argv[]) } /* let us get log messages from libalpm */ - alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb); + alpm_option_set_logcb(handle, output_cb); /* set gpgdir to default */ alpm_option_set_gpgdir(handle, GPGDIR); -- 2.1.1

2 1

[pacman-dev] [PATCH] getcols: return 0 when not attached to a tty
by Andrew Gregory 28 Sep '14

28 Sep '14

Scripts that parse pacman's output (like pacsearch) generally do not want wrapped lines. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 6a095fd..de103b6 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -46,7 +46,7 @@ #include "conf.h" #include "callback.h" -static int cached_columns = 0; +static int cached_columns = -1; struct table_cell_t { char *label; @@ -158,7 +158,7 @@ static int flush_term_input(int fd) void columns_cache_reset(void) { - cached_columns = 0; + cached_columns = -1; } static int getcols_fd(int fd) @@ -189,10 +189,15 @@ unsigned short getcols(void) const char *e; int c = 0; - if(cached_columns > 0) { + if(cached_columns >= 0) { return cached_columns; } + if(!isatty(STDOUT_FILENO)) { + cached_columns = 0; + return 0; + } + e = getenv("COLUMNS"); if(e) { c = strtol(e, NULL, 10); -- 2.0.1

2 3

[pacman-dev] [PATCH] makepkg: allow less than the full fingerprint in validpgpkeys
by Dave Reisner 25 Sep '14

25 Sep '14

I found this feature confusing, and the documentation wasn't any help. It was pointed out to me on IRC that validpgpkeys expects full fingerprints, and won't accept shorter forms. This makes the documentation insufficient, and the variable name itself misleading. This patch bolsters the documentation to explain more about what the contents should be, and implements suffix matching to allow matching on shorters fingerprint suffices. Now, when makepkg tells you that a key ID isn't valid, it's sufficient to manually check the key ID against the known good ID, and add it as is to validpgpkeys. --- doc/PKGBUILD.5.txt | 4 +++- scripts/makepkg.sh.in | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c653aac..eda3570 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -134,7 +134,9 @@ the integrity of the corresponding source file. trust values from the keyring. If the source file was signed with a subkey, makepkg will still use the primary key for comparison. + -Fingerprints must be uppercase and must not contain whitespace characters. +Fingerprints must be uppercase and must not contain whitespace characters. They +must be either the full fingerprint or match at least 16 characters of the full +fingerprint, starting from the end of the fingerprint. *noextract (array)*:: An array of file names corresponding to those from the source array. Files diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 49f5e59..25c0977 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1289,6 +1289,25 @@ parse_gpg_statusfile() { done < "$1" } +is_known_valid_pgp_key() { + local fprint subject=$1 validfprints=("${@:2}") + + for fprint in "${validfprints[@]}"; do + # we always honor full fingerprint matches + if [[ "$subject" = "$fprint" ]]; then + return 0 + fi + + # we'll also honor a suffix match, assuming that the fprint is long enough + # to be worthy. + if (( ${#fprint} >= 16 )) && [[ $subject = *"$fprint" ]]; then + return 0 + fi + done + + return 1 +} + check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 @@ -1366,7 +1385,7 @@ check_pgpsigs() { if (( ${#validpgpkeys[@]} == 0 && ! $trusted )); then printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$pubkey" >&2 errors=1 - elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then + elif ! is_known_valid_pgp_key "$fingerprint" "${validpgpkeys[@]}"; then printf "%s (%s $pubkey)" "$(gettext "FAILED")" "$(gettext "invalid public key")" errors=1 else -- 2.1.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-428-g31b9862
by allan＠archlinux.org 25 Sep '14

25 Sep '14

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 31b98626003fec9e33483152552906a601c072d4 (commit) via 24e0bd215c3afc5b0a80f6e292561b237acb19e0 (commit) via c792262b137a5f2daddac22f82e7d8d98d0d7d31 (commit) via 9c066dff439ba453f4c362e1875b794cf3f362ed (commit) via 85c055da73022838c13acae0554e6efa75dacf83 (commit) via e1f6fe652d8796ed259d248b9aa82d0ed8ec9637 (commit) via eab8cf6241119b2c1c44d5ec68ea53c7e4224a3b (commit) via f0c351b3fa9ca56ae180b2b10fc2f0f41cde0ac7 (commit) via d02efd2f204cfdd99d6e161b1ce9d4478b08b8e2 (commit) via 1660ed3cf9069f84d96670b5443a9f1542b7865d (commit) via 7e9ad22ac21329adcf470bb00f2d0a386376fddf (commit) via d3f5ab0e706071b8724575eb356b865d55da8df6 (commit) via 793b9c3b42c1af9b18a3cc8d08dd058f9cb96d93 (commit) via e4773b1b82a737a74434d778c1043367a480205a (commit) via 8bf2c753f57bfb6f8cd0271613000af64ce58020 (commit) from d9cf14ff1d69ac8834b84015c7971f55ce77645b (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 31b98626003fec9e33483152552906a601c072d4 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Thu Aug 14 04:21:42 2014 +0200 pacman.c: Add -gg, -ii, and -yy to help summary The sync help summaries was missing the information about: * -gg: View all groups and members * -ii: View extended information * -yy: Force refresh even if DBs are up to date Fixes FS#41388. Original-work-by: Earnestly <zibeon(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24e0bd215c3afc5b0a80f6e292561b237acb19e0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 6 16:53:16 2014 -0400 pacman: set SA_RESTART for signal handler Calling a signal handler interrupts some functions, most notably read() and therefore fgets(). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit c792262b137a5f2daddac22f82e7d8d98d0d7d31 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 6 16:36:00 2014 -0400 wrap fgets to retry on EINTR The read() underlying fgets() can be interrupted by a signal handler causing fgets() to return NULL. Before we started handling SIGWINCH, the odds of interrupting a read were low and typically resulted in termination anyway. Replace all fgets calls with a wrapper that retries in EINTR. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 9c066dff439ba453f4c362e1875b794cf3f362ed Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 9 18:08:13 2014 -0400 makepkg: disallow values of 'arch' which might be problematic We rely on values in the arch array to be valid as part of variable names, so extend the arch lint check to catch this. This also cleans up lint_arch to restrict the use of "lint" only to the package-specific architecture checks. It previously had an odd declaration with a conditional expansion that would never be true. commit 85c055da73022838c13acae0554e6efa75dacf83 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 9 17:26:24 2014 -0400 makepkg: let --source imply --ignorearch Since source package creation is architecture independent, we should ignore architecture-dependent behaviors such as the lint check which will halt execution when the host machine is not a supported arch. https://github.com/falconindy/pkgbuild-introspection/issues/15 commit e1f6fe652d8796ed259d248b9aa82d0ed8ec9637 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 7 14:56:52 2014 -0400 makepkg: use correct terminology unix has no "folders". commit eab8cf6241119b2c1c44d5ec68ea53c7e4224a3b Author: Wolfgang Bumiller <wry.git(a)bumiller.com> Date: Sun Aug 10 19:39:12 2014 +1000 replace --reference on chmod/chown commands Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f0c351b3fa9ca56ae180b2b10fc2f0f41cde0ac7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Sep 18 02:19:45 2014 -0400 alpm.h: remove outdated pkg_get_backup doxygen alpm_pkg_get_backup hasn't returned strings since 54ef162a1a9e27e362732d873f0739bc0a2cf1bf in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d02efd2f204cfdd99d6e161b1ce9d4478b08b8e2 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 16 21:51:16 2013 +1000 Check the version of the local database during validation When we check the database version directly, there is no longer a need to scan for depends files. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1660ed3cf9069f84d96670b5443a9f1542b7865d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 16 21:48:38 2013 +1000 Add version file to empty local database If a user manually creates the local database directory, or has an empty local database for some other reason, we silently add a version file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e9ad22ac21329adcf470bb00f2d0a386376fddf Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 16 21:34:54 2013 +1000 Add version file when creating local database directory The version of the local pacman database is stored in its root in the file ALPM_DB_VERSION. The version is starting at 9, corresponding to the next libalpm library version. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d3f5ab0e706071b8724575eb356b865d55da8df6 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 22 21:12:04 2014 +1000 Create local database directory if it is missing This means that a missing local database becomes an error (as it should be immediately created). Note this only creates the "local" directory and not its parent, which is checked for during locking. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 793b9c3b42c1af9b18a3cc8d08dd058f9cb96d93 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 20 20:46:08 2014 +0000 Extend database upgrade script to handle alpm db version 9 Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e4773b1b82a737a74434d778c1043367a480205a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 20 20:46:07 2014 +0000 pacman-db-upgrade: use pacman-style options * convert dbpath from argument to option * add --config and --root options * read dbpath and root from config file * if root is set but not dbpath, dbpath is set relative to root Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8bf2c753f57bfb6f8cd0271613000af64ce58020 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 20 21:09:52 2014 +0000 fix improper FREELIST calls * conflicts need to be freed with alpm_conflict_free * sync dbs need to be unregistered and are handled by alpm_release Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 10 +++ lib/libalpm/alpm.h | 3 - lib/libalpm/be_local.c | 135 +++++++++++++++++++++----------- lib/libalpm/conflict.c | 8 +- lib/libalpm/handle.c | 1 - lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 3 +- scripts/Makefile.am | 3 + scripts/makepkg.sh.in | 30 +++++-- scripts/pacman-db-upgrade.sh.in | 169 ++++++++++++++++++++++++++++++++-------- scripts/pacman-optimize.sh.in | 4 +- src/common/util-common.c | 25 ++++++ src/common/util-common.h | 3 + src/pacman/ini.c | 2 +- src/pacman/pacman.c | 12 +-- src/pacman/util.c | 8 +- test/pacman/pmdb.py | 2 + test/pacman/pmtest.py | 3 + 18 files changed, 318 insertions(+), 105 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: do not strip bzr+ from bzr+ssh urls
by Andrew Gregory 23 Sep '14

23 Sep '14

bzr does not recognize bare ssh:// urls. Fixes FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 913c901..f58afda 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -446,7 +446,9 @@ download_bzr() { local netfile=$1 local url=$(get_url "$netfile") - url=${url##*bzr+} + if [[ $url != bzr+ssh* ]]; then + url=${url##*bzr+} + fi url=${url%%#*} local repo=$(get_filename "$netfile") -- 2.1.0

1 1

[pacman-dev] [PATCH v2 0/4] Handle .alpm_db_version file
by Allan McRae 23 Sep '14

23 Sep '14

This is v2 of a patchset submitted long ago. It has been rebased and had its memory leaks fixed. With this patchset, pacman will create a local database directory if it is missing (but not the root of the database - i.e. /var/lib/pacman/ still needs to be present). When creating the database or finding an empty local database it will add the .alpm_db_version file and add the version. For existing pacman databases this file is created by the pacman-db-upgrade script. Finally the version of the local database is checked during db validation. Allan McRae (4): Create local database directory if it is missing Add version file when creating local database directory Add version file to empty local database Check the version of the local database during validation lib/libalpm/be_local.c | 119 +++++++++++++++++++++++++++++++++---------------- test/pacman/pmdb.py | 2 + test/pacman/pmtest.py | 3 ++ 3 files changed, 85 insertions(+), 39 deletions(-) -- 2.1.0

3 9

[pacman-dev] [PATCH] table_display: only check width when non-zero
by Andrew Gregory 18 Sep '14

18 Sep '14

A width of 0 indicates that either pacman is not attached to a tty or the user does not want line wrapping. Either way pacman should not fall back to the basic display. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- 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 e91d654..e1880ec 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -640,7 +640,7 @@ static int table_display(const alpm_list_t *header, totalwidth = table_calc_widths(first, rows, padding, totalcols, &widths, &has_data); /* return -1 if terminal is not wide enough */ - if(totalwidth > cols) { + if(cols && totalwidth > cols) { pm_printf(ALPM_LOG_WARNING, _("insufficient columns available for table display\n")); ret = -1; -- 2.1.0

1 0

[pacman-dev] [PATCH] alpm.h: remove outdated pkg_get_backup doxygen
by Andrew Gregory 18 Sep '14

18 Sep '14

alpm_pkg_get_backup hasn't returned strings since 54ef162a1a9e27e362732d873f0739bc0a2cf1bf in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 29a2dda..751fa63 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1240,9 +1240,6 @@ alpm_list_t *alpm_pkg_get_replaces(alpm_pkg_t *pkg); alpm_filelist_t *alpm_pkg_get_files(alpm_pkg_t *pkg); /** Returns the list of files backed up when installing pkg. - * The elements of the returned list have the form - * "<filename>\t<md5sum>", where the given md5sum is that of - * the file as provided by the package. * @param pkg a pointer to package * @return a reference to a list of alpm_backup_t objects */ -- 2.1.0

1 0