- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add format attributes to all required functions
by Allan McRae 10 Feb '13

10 Feb '13

Fixes all clang warnings with -Wformat-literal. Also, fix genuine formating issue discovered once adding these attributes and add a cast to prevent a gcc warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/log.c | 4 ++-- lib/libalpm/trans.c | 4 ++-- lib/libalpm/util.h | 5 ++++- src/pacman/callback.h | 1 + src/pacman/util.c | 3 ++- src/pacman/util.h | 6 +++--- src/util/cleanupdelta.c | 1 + src/util/testdb.c | 1 + src/util/testpkg.c | 1 + 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 729a4c8..14443bb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -271,8 +271,9 @@ typedef enum _alpm_loglevel_t { } 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, ...); + const char *fmt, ...) __attribute__((format(printf, 3, 4))); /** * Events. diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index a8639b4..271bd00 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -39,8 +39,8 @@ * @param fmt output format * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, const - char *fmt, ...) +int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, + const char *fmt, ...) { int ret; va_list args; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index b0488eb..8d4e0e7 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -218,8 +218,8 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), handle->lockfile); - alpm_logaction(handle, "warning: could not remove lock file %s\n", - handle->lockfile); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: could not remove lock file %s\n", handle->lockfile); } } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 93b6573..56031f3 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -120,7 +120,10 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, int full_count); -int _alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, va_list args); + +int _alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, va_list args) + __attribute__((format(printf, 3, 0))); + int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]); int _alpm_ldconfig(alpm_handle_t *handle); int _alpm_str_cmp(const void *s1, const void *s2); diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 4717360..a291fc7 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -41,6 +41,7 @@ void cb_dl_total(off_t total); 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 */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 03063fb..6afd701 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -992,7 +992,7 @@ static char *pkg_get_location(alpm_pkg_t *pkg) case PM_OP_SYNC: servers = alpm_db_get_servers(alpm_pkg_get_db(pkg)); if(servers) { - pm_asprintf(&string, "%s/%s", servers->data, + pm_asprintf(&string, "%s/%s", (char *)(servers->data), alpm_pkg_get_filename(pkg)); return string; } @@ -1443,6 +1443,7 @@ int select_question(int count) /* presents a prompt and gets a Y/N answer */ +__attribute__((format(printf, 2, 0))) static int question(short preset, char *fmt, va_list args) { char response[32]; diff --git a/src/pacman/util.h b/src/pacman/util.h index c38291a..2d1e698 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -72,11 +72,11 @@ void print_packages(const alpm_list_t *packages); void select_display(const alpm_list_t *pkglist); int select_question(int count); int multiselect_question(char *array, int count); -int yesno(char *fmt, ...); -int noyes(char *fmt, ...); +int yesno(char *fmt, ...) __attribute__((format(printf, 1, 2))); +int noyes(char *fmt, ...) __attribute__((format(printf, 1, 2))); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -int pm_asprintf(char **string, const char *format, ...); +int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 144e038..4f34435 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -37,6 +37,7 @@ static void cleanup(int signum) exit(signum); } +__attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { diff --git a/src/util/testdb.c b/src/util/testdb.c index 2017b60..7b08cb0 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -40,6 +40,7 @@ static void cleanup(int signum) exit(signum); } +__attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 96400a7..10b2f2c 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -24,6 +24,7 @@ #define BASENAME "testpkg" +__attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(fmt[0] == '\0') { -- 1.8.1.3

2 2

[pacman-dev] [PATCH] Fix --enable-warningflags
by Allan McRae 10 Feb '13

10 Feb '13

We need to to set -Werror to ensure the compiler bail when a warning flag is unavailable. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- m4/acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e601f0e..0f7ee8f 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -114,7 +114,7 @@ AC_DEFUN([CFLAGS_ADD], [AS_VAR_PUSHDEF([my_cflags], [cflags_cv_warn_$1])dnl AC_CACHE_CHECK([whether compiler handles $1], [my_cflags], [ save_CFLAGS="$CFLAGS" - CFLAGS="${CFLAGS} $1" + CFLAGS="${CFLAGS} -Werror $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AS_VAR_SET([my_cflags], [yes])], [AS_VAR_SET([my_cflags], [no])]) -- 1.8.1.3

1 1

[pacman-dev] [PATCH] fix clang -Wformat-nonliteral warnings
by Andrew Gregory 10 Feb '13

10 Feb '13

GCC is smart enough not to issue a warning when calling a printf function using a va_list; clang is not. Selectively disable the warning using pragmas to allow building with warnings using clang. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Adding a bunch of pragmas doesn't strike me as an ideal solution, but clang's warning flag documentation is non-existent and I can't find another solution other than removing -Wformat-nonliteral altogether. lib/libalpm/util.c | 3 +++ src/pacman/callback.c | 3 +++ src/pacman/util.c | 12 ++++++++++++ src/util/cleanupdelta.c | 3 +++ src/util/testdb.c | 3 +++ src/util/testpkg.c | 4 ++++ 6 files changed, 28 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f4c33a0..a2f279c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -463,6 +463,8 @@ int _alpm_logaction(alpm_handle_t *handle, const char *prefix, prefix = "UNKNOWN"; } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(handle->usesyslog) { /* we can't use a va_list more than once, so we need to copy it * so we can use the original when calling vfprintf below. */ @@ -486,6 +488,7 @@ int _alpm_logaction(alpm_handle_t *handle, const char *prefix, ret = vfprintf(handle->logstream, fmt, args); fflush(handle->logstream); } +#pragma clang diagnostic pop return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index edd5b39..16a04f3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -772,6 +772,8 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) return; } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(on_progress) { char *string = NULL; pm_vasprintf(&string, level, fmt, args); @@ -781,6 +783,7 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) } else { pm_vfprintf(stderr, level, fmt, args); } +#pragma clang diagnostic pop } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 03063fb..da3170a 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1460,7 +1460,10 @@ static int question(short preset, char *fmt, va_list args) fflush(stdout); fflush(stderr); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" vfprintf(stream, fmt, args); +#pragma clang diagnostic pop if(preset) { fprintf(stream, " %s ", _("[Y/n]")); @@ -1526,10 +1529,13 @@ int pm_printf(alpm_loglevel_t level, const char *format, ...) int ret; va_list args; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" /* print the message using va_arg list */ va_start(args, format); ret = pm_vfprintf(stderr, level, format, args); va_end(args); +#pragma clang diagnostic pop return ret; } @@ -1539,6 +1545,8 @@ int pm_asprintf(char **string, const char *format, ...) int ret = 0; va_list args; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" /* print the message using va_arg list */ va_start(args, format); if(vasprintf(string, format, args) == -1) { @@ -1546,6 +1554,7 @@ int pm_asprintf(char **string, const char *format, ...) ret = -1; } va_end(args); +#pragma clang diagnostic pop return ret; } @@ -1561,7 +1570,10 @@ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_li } /* print the message using va_arg list */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" ret = vasprintf(&msg, format, args); +#pragma clang diagnostic pop /* print a prefix to the message */ switch(level) { diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 144e038..ff17427 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -39,6 +39,8 @@ static void cleanup(int signum) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(strlen(fmt)) { switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; @@ -48,6 +50,7 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) } vprintf(fmt, args); } +#pragma clang diagnostic pop } diff --git a/src/util/testdb.c b/src/util/testdb.c index 2017b60..776d73e 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -42,6 +42,8 @@ static void cleanup(int signum) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(strlen(fmt)) { switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; @@ -50,6 +52,7 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) } vprintf(fmt, args); } +#pragma clang diagnostic pop } static int check_localdb_files(void) diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 96400a7..d310628 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -34,7 +34,11 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) case ALPM_LOG_WARNING: printf("warning: "); break; default: return; /* skip other messages */ } + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" vprintf(fmt, args); +#pragma clang diagnostic pop } int main(int argc, char *argv[]) -- 1.8.1.3

2 1

[pacman-dev] Pacman build is currently broken
by Dan McGee 10 Feb '13

10 Feb '13

Using the superior warnings of clang: dmcgee@galway ~/projects/pacman $ make make --no-print-directory all-recursive Making all in lib/libalpm Making all in po CC libalpm_la-signing.lo signing.c:195:5: error: variable 'ctx' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if(init_gpgme(handle)) { ^~~~~~~~~~~~~~~~~~ signing.c:219:16: note: uninitialized use occurs here gpgme_release(ctx); ^~~ signing.c:195:2: note: remove the 'if' if its condition is always false if(init_gpgme(handle)) { ^~~~~~~~~~~~~~~~~~~~~~~~ signing.c:191:17: note: initialize the variable 'ctx' to silence this warning gpgme_ctx_t ctx; ^ = NULL 1 error generated. make[3]: *** [libalpm_la-signing.lo] Error 1 make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 dmcgee@galway ~/projects/pacman $ git show-ref HEAD 390b08f18b4ef550230f9f4749fb52254ccba6e5 refs/remotes/origin/HEAD

2 1

[pacman-dev] [PATCH] Fix compilation error on clang
by Allan McRae 10 Feb '13

10 Feb '13

This also lead me to notice that in _alpm_gpgme_checksig many things were not being cleaned up. Fix this by having CHECK_ERR goto gpg_error and make the required adjustments. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index a57c946..5711f82 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -37,7 +37,7 @@ #if HAVE_LIBGPGME #define CHECK_ERR(void) do { \ - if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto error; } \ + if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \ } while(0) /** @@ -174,7 +174,7 @@ static int init_gpgme(alpm_handle_t *handle) init = 1; return 0; -error: +gpg_error: _alpm_log(handle, ALPM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); RET_ERR(handle, ALPM_ERR_GPGME, -1); } @@ -188,7 +188,7 @@ error: int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) { gpgme_error_t err; - gpgme_ctx_t ctx; + gpgme_ctx_t ctx = NULL; gpgme_key_t key; int ret = -1; @@ -215,8 +215,10 @@ int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) } gpgme_key_unref(key); -error: +gpg_error: gpgme_release(ctx); + +error: return ret; } @@ -279,9 +281,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, } } - if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { - goto error; - } + CHECK_ERR(); /* should only get here if key actually exists */ pgpkey->data = key; @@ -319,7 +319,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, ret = 1; -error: +gpg_error: if(ret != 1) { _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); } @@ -371,7 +371,7 @@ static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key) ret = 0; } -error: +gpg_error: gpgme_release(ctx); return ret; } -- 1.8.1.3

1 1

[pacman-dev] [PATCH] [makepkg] fix -r and --needed conflict
by William Giokas 09 Feb '13

09 Feb '13

In makepkg, passing -sr --needed causes there to be a conflict when pacman goes to remove the dependencies, as the --needed flag is not an option for pacman -R. This patch sanitizes the PACMAN_OPTS in the remove_deps() function so that it can still run even with the --needed option passed to makepkg. (Useful when doing `makepkg -sir --needed` to get rid of unneeded {make,check}depends automatically). At the end of the remove_deps() function, PACMAN_OPTS is restored to its original value. Signed-off-by: William Giokas <1007380(a)gmail.com> --- Noticed this today when building a series of git packges on my system. Sorry for not catching this earlier. scripts/makepkg.sh.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c464ec7..fc1976a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -984,10 +984,23 @@ remove_deps() { msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully + + opts_backup="${PACMAN_OPTS[@]}" + for i in ${PACMAN_OPTS[@]}; do + if [[ $i == "--needed" ]]; then + opts2=("${rm_opts[@]}") + else + opts2=("${rm_opts[@]}" "$i") + fi + done + PACMAN_OPTS="${rm_opts[@]}" + if ! run_pacman -Rn ${deplist[@]}; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi + + PACMAN_OPTS="${opts_backup[@]}" } get_integlist() { -- 1.8.1.3.535.ga923c31

3 4

[pacman-dev] [PATCH] makepkg: add lrzip compression support
by Allan McRae 09 Feb '13

09 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This will be available with libarchive-3.1. Although, we pipe the tarball to stdin for compression, so lrzip will not perform as well as some may hope... doc/makepkg.conf.5.txt | 8 +++++--- scripts/makepkg.sh.in | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 052b342..34748de 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -240,14 +240,16 @@ Options This value is used when querying a package to see who was the builder. It is recommended you change this to your name and email address. -**COMPRESSGZ=**"(gzip -c -f -n)", **COMPRESSBZ2=**"(bzip2 -c -f)", **COMPRESSXZ=**"(xz -c -z -)", **COMPRESSZ=**"(compress -c -f)":: +**COMPRESSGZ=**"(gzip -c -f -n)", **COMPRESSBZ2=**"(bzip2 -c -f)", +**COMPRESSXZ=**"(xz -c -z -)", **COMPRESSLRZ=**"(lrzip -q)", +**COMPRESSZ=**"(compress -c -f)":: Sets the command and options used when compressing compiled or source packages in the named format. **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The - current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and - `.tar.Z`. + current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, + `.tar.lrz` and `.tar.Z`. Do not touch these unless you know what you are doing. See Also diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c464ec7..e79a468 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1826,6 +1826,7 @@ create_package() { *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; *tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ @@ -1938,10 +1939,11 @@ create_srcpackage() { local TAR_OPT case "$SRCEXT" in - *tar.gz) TAR_OPT="z" ;; - *tar.bz2) TAR_OPT="j" ;; - *tar.xz) TAR_OPT="J" ;; - *tar.Z) TAR_OPT="Z" ;; + *tar.gz) TAR_OPT="-z" ;; + *tar.bz2) TAR_OPT="-j" ;; + *tar.xz) TAR_OPT="-J" ;; + *tar.lrz) TAR_OPT="--lrzip" ;; + *tar.Z) TAR_OPT="-Z" ;; *tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; @@ -1953,7 +1955,7 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd_safe "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + if ! bsdtar -cL ${TAR_OPT} -f "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 1.8.1.3

1 0

[pacman-dev] Do we need the force option?
by Allan McRae 09 Feb '13

09 Feb '13

So... I was looking through the bug tracker and I noticed this: https://bugs.archlinux.org/task/30179#comment105772 Essentially, directory on filesystem being replaced by a file. pacman ignores the conflict and then sees it is trying to replace a directory with a file and aborts. The choices are: 1) we modify force to delete the directory before installing the file - this can screw over the local db if the directory is owned. 2) we look at the conflicts and stop the transaction in non-file-to-file conflicts even with --force I think #2 is the better option here. OR... 3) get rid of --force altogether! I have good feelings about #3. When do we actually NEED --force? In most cases a simple rm will fix the conflict and it forces (pun!) the user to think about what is being done. There is only one case I can think of where that is not appropriate - when a user is trying to recover from deleting their local pacman database. But then they can use --dbonly to get the initial fix done, and will need to -Qk and rm etc as necessary... Would anyone object to removing the option completely? Allan

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-562-g390b08f
by allan＠archlinux.org 09 Feb '13

09 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 390b08f18b4ef550230f9f4749fb52254ccba6e5 (commit) via 9aead554bca6c95fe0ef6ec86c408e3300485024 (commit) via d2ce93bc5477ede279bcf20d0a5f8d876f27ddb7 (commit) via 17d4ec5ed8d9b71df3dbd50cbc5f633bfd1b0404 (commit) via 711b6d39111347489e40c1a637c15b3d22f01d3d (commit) via 3068b52f9a670dfa2534999b5fe9cf247442be4e (commit) via 829aeb2c2c4e5fdc28d02498d2b2ef59956dcfdf (commit) via 5f5469c7746ee1699433060030bbd2e6ee43ced7 (commit) via 0d89c10f4b12cb574223a23776c26144c6bceccd (commit) via 4ccf16dff589ce9f369d377bb5d3f490bd27c624 (commit) via 31b9b264c1df2fc9a4f5c846d5d1735b5fbd7050 (commit) via 198154962beca8707b19f5efb773f1a3ad10e154 (commit) via 05745089ac7009e5de84d676dd0823acd8c4d1fc (commit) via 4ec6848f91ed85ab113185bb74b83a5faf21160f (commit) via 45b6d36cf7f228190dc3d20952d1e001c91bd12d (commit) from c0835ff08e3228c748c57784869401d50421930c (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 390b08f18b4ef550230f9f4749fb52254ccba6e5 Author: Martin Panter <vadmium à gmail·com> Date: Tue Oct 23 13:32:56 2012 +0000 Exit with failure status if download or installation is not confirmed Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9aead554bca6c95fe0ef6ec86c408e3300485024 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 14:51:45 2012 +1000 pacman: print version information in debug output Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d2ce93bc5477ede279bcf20d0a5f8d876f27ddb7 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 8 16:51:02 2012 +1000 Quieten the build process some more Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 17d4ec5ed8d9b71df3dbd50cbc5f633bfd1b0404 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 18:07:52 2012 +1000 Skip reading sync db deltas files if UseDelta is unset Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 711b6d39111347489e40c1a637c15b3d22f01d3d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 14 14:32:11 2012 +1000 Update NEWS for pacman-4.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3068b52f9a670dfa2534999b5fe9cf247442be4e Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 14 13:10:31 2012 +1000 README: update with 4.0 -> 4.1 API changes Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 829aeb2c2c4e5fdc28d02498d2b2ef59956dcfdf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 18 19:34:06 2013 -0500 README: update alpm options Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5f5469c7746ee1699433060030bbd2e6ee43ced7 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 01:16:32 2012 +1000 Import key if needed when installing package from file When installing a package with "pacman -U" that has a detached signature, check if the needed key is in the keyring and download if necessary. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d89c10f4b12cb574223a23776c26144c6bceccd Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 00:34:54 2012 +1000 Prompt to delete packages with signature fails Offer to remove the bad package when a signature fails to validate as is done for checksum failures. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ccf16dff589ce9f369d377bb5d3f490bd27c624 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 00:29:11 2012 +1000 Remove retry path from signature validation Now that the keyring is checked for all needed keys before the validation, we can not reach a point of a missing key when doing validity checks for sync operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31b9b264c1df2fc9a4f5c846d5d1735b5fbd7050 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 00:21:48 2012 +1000 Check keys are in keyring before package validation Keys used to create signatures are checked for presence in the keyring before package validation is performed. Signed-off-by: Allan McRae <allan(a)archlinux.org> Conflicts: lib/libalpm/alpm.h Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 198154962beca8707b19f5efb773f1a3ad10e154 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 2 23:44:11 2012 +1000 Make decode_signature available to the library Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05745089ac7009e5de84d676dd0823acd8c4d1fc Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 2 23:06:45 2012 +1000 Add function to extract key id from signatures This does not support all possibilities of RFC4880, but it does cover every key currently used in Arch Linux. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ec6848f91ed85ab113185bb74b83a5faf21160f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 29 22:24:55 2012 +1000 Move key importing into separate function This will be useful for checking the availablity of all keys before perfoming validation in sync operations and for downloading a needed key in upgrade operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45b6d36cf7f228190dc3d20952d1e001c91bd12d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 29 20:51:04 2012 +1000 Make key_in_keychain available in library In preparation for checking key presence and downloading needed keys before conflict checking. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 + NEWS | 80 ++++++++++++++++++ README | 79 ++++++++++++++++-- lib/libalpm/alpm.h | 13 ++- lib/libalpm/be_package.c | 64 ++++++++++++++ lib/libalpm/be_sync.c | 4 +- lib/libalpm/signing.c | 211 ++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/signing.h | 8 ++ lib/libalpm/sync.c | 92 ++++++++++++++++++--- src/pacman/callback.c | 13 +++ src/pacman/pacman.c | 2 + src/pacman/sync.c | 1 + 12 files changed, 509 insertions(+), 59 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Patch decisions required
by Allan McRae 07 Feb '13

07 Feb '13

Dan/Dave, I'd like comments on these patches - which at least to me are not obvious whether to include or not. A simple yes/no/fix would be good. >From patchwork: * pacman: print version information in debug output https://patchwork.archlinux.org/patch/114/ * removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h https://patchwork.archlinux.org/patch/304/ * Remove "ts=2 sw=2" from Vim modelines for pacman-contrib https://patchwork.archlinux.org/patch/689/ (I think this was approved - Dan?) * Remove tab width config from Vim modelines in doc/ https://patchwork.archlinux.org/patch/690/ (I think this was approved - Dan?) * Log if dbs are up to date, synced, or failed to sync https://patchwork.archlinux.org/patch/760/ * Move logging of sysupgrade start, add log when done https://patchwork.archlinux.org/patch/761/ * Exit with failure status if download or installation is not confirmed https://patchwork.archlinux.org/patch/876/ >From the days before patchwork...: * Skip reading sync db deltas files if UseDelta is unset https://projects.archlinux.org/users/allan/pacman.git/commit/?h=working&id=… * Quieten the build process some more https://projects.archlinux.org/users/allan/pacman.git/commit/?h=working&id=…

2 1