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

[pacman-dev] [PATCH 1/3] remove retry check from signature validation
by Andrew Gregory 30 Sep '14

30 Sep '14

The retry path was removed by 4ccf16dff589ce9f369d377bb5d3f490bd27c624 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4c74a3a..27e720d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1307,14 +1307,8 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) /* this can only happen maliciously */ total_bytes = total_bytes ? total_bytes : 1; - /* this one is special: -1 is failure, 1 is retry, 0 is success */ - while(1) { - int ret = check_validity(handle, total, total_bytes); - if(ret == 0) { - break; - } else if(ret < 0) { - return -1; - } + if(check_validity(handle, total, total_bytes) != 0) { + return -1; } if(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) { -- 2.1.1

2 4

[pacman-dev] [PATCH] doc/translation-help.txt: Fix link to tutorial on sarovar.org
by Miguel de Val-Borro 30 Sep '14

30 Sep '14

The website sarovar.org has been shut down. Link is replaced by the latest available archive.org capture from August 2013. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 1fdb6e0..523ca1d 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -14,7 +14,7 @@ gettext website is a very useful guide to read before embarking on translation work, as it describes many of the commands in more detail than I will here: https://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. In addition, this site presents a small tutorial that I found useful: -http://oriya.sarovar.org/docs/gettext/[]. +https://web.archive.org/web/20130802092826/http://oriya.sarovar.org/docs/gettext/[]. Translating Messages -- 2.1.1

5 5

[pacman-dev] Pull translation updates from Transifex
by Alex Henrie 30 Sep '14

30 Sep '14

The translations have not been pulled since last June, and are in serious need of updating. For example, the Catalan translation contained the misspelling "instal.lant" when "instal·lant" was intended. I tried sending this update as a patch, but the mailing list rejected it because it was too large. -Alex ---------------------------------------------------------------- The following changes since commit 31b98626003fec9e33483152552906a601c072d4: pacman.c: Add -gg, -ii, and -yy to help summary (2014-09-23 23:29:03 +1000) are available in the git repository at: https://github.com/alexhenrie/pacman.git master for you to fetch changes up to a93cdb4be654eb71dee49cb15faed4fc3f2fdb9f: Pull translation updates from Transifex (2014-09-29 13:09:46 -0600) ---------------------------------------------------------------- Alex Henrie (1): Pull translation updates from Transifex lib/libalpm/po/ach.po | 616 +++++++++++++++++++++ lib/libalpm/po/ar.po | 306 ++++++----- lib/libalpm/po/ast.po | 618 +++++++++++++++++++++ lib/libalpm/po/bg.po | 616 +++++++++++++++++++++ lib/libalpm/po/ca.po | 49 +- lib/libalpm/po/cs.po | 19 +- lib/libalpm/po/da.po | 18 +- lib/libalpm/po/de.po | 63 +-- lib/libalpm/po/el.po | 26 +- lib/libalpm/po/en_GB.po | 18 +- lib/libalpm/po/eo.po | 11 +- lib/libalpm/po/es.po | 145 +++-- lib/libalpm/po/eu.po | 618 +++++++++++++++++++++ lib/libalpm/po/fa.po | 11 +- lib/libalpm/po/fa_IR.po | 616 +++++++++++++++++++++ lib/libalpm/po/fi.po | 38 +- lib/libalpm/po/fr.po | 51 +- lib/libalpm/po/gl.po | 59 +- lib/libalpm/po/hr.po | 76 +-- lib/libalpm/po/hu.po | 41 +- lib/libalpm/po/id.po | 24 +- lib/libalpm/po/it.po | 55 +- lib/libalpm/po/ja.po | 25 +- lib/libalpm/po/kk.po | 18 +- lib/libalpm/po/ko.po | 37 +- lib/libalpm/po/lt.po | 29 +- lib/libalpm/po/nb.po | 19 +- lib/libalpm/po/nl.po | 20 +- lib/libalpm/po/pl.po | 30 +- lib/libalpm/po/pt.po | 41 +- lib/libalpm/po/pt_BR.po | 42 +- lib/libalpm/po/ro.po | 65 +-- lib/libalpm/po/ru.po | 30 +- lib/libalpm/po/sk.po | 21 +- lib/libalpm/po/sl.po | 278 +++++----- lib/libalpm/po/sr.po | 26 +- lib/libalpm/po/sr(a)latin.po | 26 +- lib/libalpm/po/sv.po | 42 +- lib/libalpm/po/tr.po | 19 +- lib/libalpm/po/uk.po | 23 +- lib/libalpm/po/ur.po | 617 +++++++++++++++++++++ lib/libalpm/po/uz.po | 617 +++++++++++++++++++++ lib/libalpm/po/vi.po | 617 +++++++++++++++++++++ lib/libalpm/po/vi_VN.po | 616 +++++++++++++++++++++ lib/libalpm/po/zh_CN.po | 23 +- lib/libalpm/po/zh_TW.po | 22 +- scripts/po/ach.po | 1212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/ar.po | 316 +++++------ scripts/po/ast.po | 1213 +++++++++++++++++++++++++++++++++++++++++ scripts/po/bg.po | 1212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/ca.po | 383 +++++-------- scripts/po/cs.po | 217 +++----- scripts/po/da.po | 264 ++++----- scripts/po/de.po | 513 ++++++------------ scripts/po/el.po | 283 ++++------ scripts/po/en_GB.po | 219 +++----- scripts/po/eo.po | 83 +-- scripts/po/es.po | 767 ++++++++++++-------------- scripts/po/eu.po | 1214 +++++++++++++++++++++++++++++++++++++++++ scripts/po/fa.po | 83 +-- scripts/po/fa_IR.po | 1212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/fi.po | 255 ++++----- scripts/po/fr.po | 463 +++++----------- scripts/po/gl.po | 655 ++++++++++++----------- scripts/po/hr.po | 161 +++--- scripts/po/hu.po | 348 ++++-------- scripts/po/id.po | 259 ++++----- scripts/po/it.po | 316 ++++------- scripts/po/ja.po | 244 +++------ scripts/po/kk.po | 131 ++--- scripts/po/ko.po | 802 ++++++++++++++-------------- scripts/po/lt.po | 276 ++++------ scripts/po/nb.po | 275 ++++------ scripts/po/nl.po | 83 +-- scripts/po/pl.po | 443 +++++++-------- scripts/po/pt.po | 370 +++++-------- scripts/po/pt_BR.po | 370 ++++--------- scripts/po/ro.po | 367 +++++-------- scripts/po/ru.po | 312 ++++------- scripts/po/sk.po | 248 +++------ scripts/po/sl.po | 332 ++++++------ scripts/po/sr.po | 179 +++---- scripts/po/sr(a)latin.po | 182 +++---- scripts/po/sv.po | 544 +++++++++---------- scripts/po/tr.po | 291 ++++------ scripts/po/uk.po | 267 ++++------ scripts/po/ur.po | 1212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/uz.po | 1213 +++++++++++++++++++++++++++++++++++++++++ scripts/po/vi.po | 1212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/vi_VN.po | 1212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/zh_CN.po | 147 +++-- scripts/po/zh_TW.po | 83 +-- src/pacman/po/ach.po | 1272 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/ar.po | 315 ++++++----- src/pacman/po/ast.po | 1272 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/bg.po | 1274 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/ca.po | 222 +++----- src/pacman/po/cs.po | 164 ++---- src/pacman/po/da.po | 168 ++---- src/pacman/po/de.po | 270 ++++------ src/pacman/po/el.po | 153 ++---- src/pacman/po/en_GB.po | 133 ++--- src/pacman/po/eo.po | 45 +- src/pacman/po/es.po | 478 +++++++---------- src/pacman/po/eu.po | 1274 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/fa.po | 38 +- src/pacman/po/fa_IR.po | 1267 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/fi.po | 185 +++---- src/pacman/po/fr.po | 242 +++------ src/pacman/po/gl.po | 350 +++++------- src/pacman/po/hr.po | 367 ++++--------- src/pacman/po/hu.po | 197 +++---- src/pacman/po/id.po | 121 ++--- src/pacman/po/it.po | 233 +++----- src/pacman/po/ja.po | 160 ++---- src/pacman/po/kk.po | 118 ++-- src/pacman/po/ko.po | 621 ++++++++++----------- src/pacman/po/lt.po | 179 ++----- src/pacman/po/nb.po | 199 +++---- src/pacman/po/nl.po | 600 ++++++++++----------- src/pacman/po/pl.po | 412 ++++++-------- src/pacman/po/pt.po | 246 +++------ src/pacman/po/pt_BR.po | 237 +++----- src/pacman/po/ro.po | 271 ++++------ src/pacman/po/ru.po | 133 ++--- src/pacman/po/sk.po | 167 ++---- src/pacman/po/sl.po | 358 ++++++------- src/pacman/po/sr.po | 187 ++----- src/pacman/po/sr(a)latin.po | 190 +++---- src/pacman/po/sv.po | 245 ++++----- src/pacman/po/tr.po | 158 ++---- src/pacman/po/uk.po | 160 ++---- src/pacman/po/ur.po | 1273 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/uz.po | 1268 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/vi.po | 1267 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/vi_VN.po | 1267 +++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/zh_CN.po | 76 +-- src/pacman/po/zh_TW.po | 69 +-- 138 files changed, 36371 insertions(+), 13370 deletions(-) create mode 100644 lib/libalpm/po/ach.po create mode 100644 lib/libalpm/po/ast.po create mode 100644 lib/libalpm/po/bg.po create mode 100644 lib/libalpm/po/eu.po create mode 100644 lib/libalpm/po/fa_IR.po create mode 100644 lib/libalpm/po/ur.po create mode 100644 lib/libalpm/po/uz.po create mode 100644 lib/libalpm/po/vi.po create mode 100644 lib/libalpm/po/vi_VN.po create mode 100644 scripts/po/ach.po create mode 100644 scripts/po/ast.po create mode 100644 scripts/po/bg.po create mode 100644 scripts/po/eu.po create mode 100644 scripts/po/fa_IR.po create mode 100644 scripts/po/ur.po create mode 100644 scripts/po/uz.po create mode 100644 scripts/po/vi.po create mode 100644 scripts/po/vi_VN.po create mode 100644 src/pacman/po/ach.po create mode 100644 src/pacman/po/ast.po create mode 100644 src/pacman/po/bg.po create mode 100644 src/pacman/po/eu.po create mode 100644 src/pacman/po/fa_IR.po create mode 100644 src/pacman/po/ur.po create mode 100644 src/pacman/po/uz.po create mode 100644 src/pacman/po/vi.po create mode 100644 src/pacman/po/vi_VN.po

2 2

[pacman-dev] [PATCH] doc/translation-help.txt: Fix link to tutorial on sarovar.org
by Miguel de Val-Borro 30 Sep '14

30 Sep '14

The website sarovar.org has been shut down. Link is replaced by the latest available archive.org capture from August 2013. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 1fdb6e0..523ca1d 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -14,7 +14,7 @@ gettext website is a very useful guide to read before embarking on translation work, as it describes many of the commands in more detail than I will here: https://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. In addition, this site presents a small tutorial that I found useful: -http://oriya.sarovar.org/docs/gettext/[]. +https://web.archive.org/web/20130802092826/http://oriya.sarovar.org/docs/gettext/[]. Translating Messages -- 2.1.1

1 0

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

30 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 60c1f2857bad53deed4a8849c1d733dc7d526379 (commit) via 699937e94d0f9614474e50bf2a77acb4a4619ab0 (commit) via cb9489119e15425eabdaa1e82a82c8879720b2a5 (commit) via 235562a85e25492f3ea258f71904d8753941e0c5 (commit) via 963f7fe02fcb1429224c6c936e3110f0eb10d107 (commit) via 51353edc6156ae46cb32e7adc18c415a1732e2dc (commit) via a3d7230e4dd85f5d7b9bd3877ae9ad4259fa71b0 (commit) via b52ed49d75ff77ef4f6ad2bef576184bda9b98d0 (commit) from 31b98626003fec9e33483152552906a601c072d4 (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 60c1f2857bad53deed4a8849c1d733dc7d526379 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 15 11:42:02 2014 -0400 makepkg: move negation in inequality comparisons This commit changes the few remaining instances of: [[ ! $foo = "$bar" ]] to the more common: [[ $foo != "$bar" ]] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 699937e94d0f9614474e50bf2a77acb4a4619ab0 Author: Maxim Andersson <thesilentboatman(a)gmail.com> Date: Mon Sep 29 01:06:00 2014 +0200 paccache: parse_filename bug fix Filenames got parsed wrongly, causing whitelist- and blacklist-checks to always return false. Caused by 8122fae51a when full path names to pkgs were introduced. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> commit cb9489119e15425eabdaa1e82a82c8879720b2a5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 21 10:42:10 2014 -0400 makepkg: abort if we can't add install/changelog to package commit 235562a85e25492f3ea258f71904d8753941e0c5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 9 18:02:33 2014 -0400 updpkgsums: update to recognize arch-specific sources This change reveals a bootstrapping bug -- since we call the bare "makepkg" and rely on PATH lookup, we might not have a makepkg which can generate architecture-specific checksums. commit 963f7fe02fcb1429224c6c936e3110f0eb10d107 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 7 12:41:20 2014 -0400 PKGBUILD: add support for arch-specific sources This implements support for declarations such as: arch=('i686' 'x86_64') ... source=("somescript.sh") source_i686=("http://evilmonster.com/i686/ponies-9001-1.i686.bin") source_x86_64=("http://evilmonster.com/i686/ponies-9001-1.x86_64.bin") md5sums=('d41d8cd98f00b204e9800998ecf8427e') md5sums_i686=('e4ca381035a34b7a852184cc0dd89baa') md5sums_x86_64=('4019740e6998f30a3c534bac6a83f582') Just the same as the "untagged" sources, multiple integrity algorithms are supported. The manpage is updated to reflect support for these suffices. This commit also refactors download_sources slightly: 1) to use the otherwise preferred convention of lowercase local variable names, and to make the handling of $1 more clear. 2) rename the "fast" parameter to "novcs", to make it more clear what this token does. 3) add a new possible token "allarch" to ensure that download_sources will fetch all sources, for all architectures. commit 51353edc6156ae46cb32e7adc18c415a1732e2dc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 7 19:56:04 2014 -0400 makepkg: break out checksum generation to its own function This also fixes a "bug" in which a PKGBUILD without any source array would generate "md5sums=()". While not technically wrong, we can easily do better and emit nothing at all. commit a3d7230e4dd85f5d7b9bd3877ae9ad4259fa71b0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Aug 6 22:01:41 2014 -0400 makepkg: break out check_checksums to reasonably sized functions commit b52ed49d75ff77ef4f6ad2bef576184bda9b98d0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Sep 28 17:45:35 2014 -0400 Revert "Remove log_cb, add ALPM_EVENT_LOG instead" 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 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.sh.in | 7 +- contrib/updpkgsums.sh.in | 2 +- doc/PKGBUILD.5.txt | 4 + lib/libalpm/alpm.h | 36 +++-- lib/libalpm/handle.c | 13 ++ lib/libalpm/handle.h | 1 + lib/libalpm/log.c | 14 +- scripts/makepkg.sh.in | 333 +++++++++++++++++++++++++++++++++-------------- 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 +- 14 files changed, 321 insertions(+), 172 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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