- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] files.c: add vim modeline
by Andrew Gregory 02 Nov '15

02 Nov '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 31ce9e0..9536005 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -289,6 +289,7 @@ int pacman_files(alpm_list_t *targets) return files_list(files_dbs, targets); } - return 0; } + +/* vim: set noet: */ -- 2.6.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-242-gd8621b9
by allan＠archlinux.org 28 Oct '15

28 Oct '15

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 d8621b981e100ecf46d260e1a85cc13d202cafda (commit) via dcc1b22cb33a7a9d9477ffc84f833317860bf751 (commit) via 1142a32c7f6f8ab82528581277b7c7cac6b2d1ae (commit) via 960b64553db7c738202d5108abff77af0bdb87b5 (commit) via 6fdc589fc6d5598c2ce3f3e029594417dcb25b39 (commit) via 5b6526a2adad6140c3878838ae0e7b61d5ee7594 (commit) via b46bdeea146b19f026b2bb2ad4d281aa89fff777 (commit) via 3c671270180163798cb0d08ea163e7100ab21ee6 (commit) via 0c5dbdbfeca8a26d015230a8edd6d7c4c91d386a (commit) via 4c5bf09eec4835f8dfd300215f16289d106266d5 (commit) via 456ebe8f8eee82c467805613f107edd84e73ac26 (commit) via 9809102237f89b73a120250260bf3f68d6bc4ba9 (commit) via e28aff4d87f9456c213359adaf7299a882cdcb04 (commit) via aa8a674b6b2c8474a1111b16806c27d4562b5d80 (commit) via 19d373c9b95ff5c9ee6d5a4cdb097670f69068d4 (commit) via 4b3df10d5d53af94475e006c71ed262efcab6f0f (commit) via 2c72c8b822d21c45a8020e49f03691830f3bcff2 (commit) via 2627b423ff786edd60123a2670a69841fe4cb5a4 (commit) via 70e6875ad9afd6ee0e26c7fbe283466f7a6767e5 (commit) via 5d4a3f101ca15bb1ae7944ec305c7f10c9f504d0 (commit) via 5301d3fe8fc3fc0a65f6361ba3b4afcdcb9c2cf8 (commit) via 29d4dcf767b7325ac7e9bbaa4c0b45e3e3ee2c73 (commit) via 501242a35bce01f19312b774c6364b4edaaec619 (commit) from 0ee1beca12f6070d406bbf09c3036124018e57bf (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 d8621b981e100ecf46d260e1a85cc13d202cafda Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 28 17:04:08 2015 +1000 scripts/po: fix translated file name This file was renamed during review and its entry in POTFILES.in was not updated. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dcc1b22cb33a7a9d9477ffc84f833317860bf751 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 28 00:04:05 2015 -0400 _alpm_hook_run: check path length before copying If a hook path equals or exceeds PATH_MAX characters the path will be left unterminated. Pre-calculating the path length also allows us to use the more efficient memcpy over strncpy. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1142a32c7f6f8ab82528581277b7c7cac6b2d1ae Author: Benjamin Yates <benjamin(a)rqdq.com> Date: Tue Oct 27 16:22:57 2015 -0400 makepkg: fix $pkgname element duplication run_split_packaging did not preserve the $pkgname array correctly, and would create duplicate entries in the list during restore. After restoring the backup (a b c) would become (a b c b c). This probably went unnoticed because during --install, pacman would reconcile the duplicates. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 960b64553db7c738202d5108abff77af0bdb87b5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 27 20:44:57 2015 +1000 libmakepkg: fix pkgver checking Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6fdc589fc6d5598c2ce3f3e029594417dcb25b39 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Oct 27 00:47:32 2015 -0400 add alpm-hooks man page Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b6526a2adad6140c3878838ae0e7b61d5ee7594 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Oct 27 00:47:31 2015 -0400 hook.c: print invalid option name Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b46bdeea146b19f026b2bb2ad4d281aa89fff777 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Oct 27 00:47:30 2015 -0400 order hooks by file name Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3c671270180163798cb0d08ea163e7100ab21ee6 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Tue Oct 27 09:38:10 2015 +0100 Align titles automatically in information display Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c5dbdbfeca8a26d015230a8edd6d7c4c91d386a Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Sun Oct 25 12:39:27 2015 +0100 Alpm, check for NULL in free-functions Also, use FREE() instead of free() in _alpm_backup_free() to set the pointers to NULL. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4c5bf09eec4835f8dfd300215f16289d106266d5 Author: Mohammad Alsaleh <ce.mohammad.alsaleh(a)gmail.com> Date: Fri Oct 23 01:38:49 2015 +0300 zsh_completion: Add --asdeps/--asexplicit to -U options Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 456ebe8f8eee82c467805613f107edd84e73ac26 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Wed Oct 21 11:11:17 2015 +0200 Use ARRAYSIZE macro for non-string array size computation Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9809102237f89b73a120250260bf3f68d6bc4ba9 Author: Mohammad Alsaleh <ce.mohammad.alsaleh(a)gmail.com> Date: Thu Oct 22 02:27:09 2015 +0300 makepkg: Fix hard-coded debug suffix Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e28aff4d87f9456c213359adaf7299a882cdcb04 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Mon Aug 10 21:42:39 2015 +0200 pacsort: clean up if error * free memory * close open file Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa8a674b6b2c8474a1111b16806c27d4562b5d80 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Mon Aug 10 21:42:38 2015 +0200 pacsort: don't overwrite memory if realloc fails That makes it impossible to free it later. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19d373c9b95ff5c9ee6d5a4cdb097670f69068d4 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Mon Aug 10 21:42:37 2015 +0200 pacsort: handle failing list_add Since it can fail, check the return value. If it fails, we need to free the memory of the object we wanted to add to the list. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b3df10d5d53af94475e006c71ed262efcab6f0f Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Tue Oct 20 15:30:32 2015 +0200 HACKING: Allow the use of 'sizeof' on values Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2c72c8b822d21c45a8020e49f03691830f3bcff2 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Sep 15 22:17:04 2015 +0200 makepkg: Set CCACHE_BASEDIR to make paths in $srcdir relative Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2627b423ff786edd60123a2670a69841fe4cb5a4 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Sep 15 22:17:03 2015 +0200 makepkg: Correctly layer distcc and ccache ccache expects further compiler wrappers to be specified via CCACHE_PREFIX. Otherwise, ccache will hash the wrapper executable instead of the real one. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 70e6875ad9afd6ee0e26c7fbe283466f7a6767e5 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Mon Oct 19 03:33:24 2015 +0200 libmakepkg: Add check_buildoption for distcc and ccache makepkg used to check OPTIONS too, which could override BUILDENV. Implement a new function that handles these options more like OPTIONS. This also reduces code duplication a bit. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d4a3f101ca15bb1ae7944ec305c7f10c9f504d0 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 19 14:25:35 2015 +1000 makepkg: separate "sourcefile" into two words Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5301d3fe8fc3fc0a65f6361ba3b4afcdcb9c2cf8 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 19 13:47:19 2015 +1000 Remove space before ellipses Makes all use of ellipses consistent... Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 29d4dcf767b7325ac7e9bbaa4c0b45e3e3ee2c73 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 19 13:43:26 2015 +1000 Pluralize malloc failure string Not particularly useful in English (will always be plural), but useful in languages that have multiple plural forms. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 501242a35bce01f19312b774c6364b4edaaec619 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 18 16:05:42 2015 +1000 Ignore cov-int directory for Coverity scan Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + HACKING | 14 +-- contrib/zsh_completion.in | 2 + doc/.gitignore | 1 + doc/Makefile.am | 4 + doc/alpm-hooks.5.txt | 118 ++++++++++++++++++ lib/libalpm/backup.c | 7 +- lib/libalpm/conflict.c | 2 + lib/libalpm/db.c | 1 + lib/libalpm/delta.c | 1 + lib/libalpm/deps.c | 2 + lib/libalpm/graph.c | 1 + lib/libalpm/hook.c | 37 ++++-- lib/libalpm/pkghash.c | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 4 +- scripts/libmakepkg/source/bzr.sh.in | 4 +- scripts/libmakepkg/util/option.sh | 34 +++++ scripts/makepkg.sh.in | 36 +++--- scripts/pacman-key.sh.in | 2 +- scripts/po/POTFILES.in | 2 +- scripts/repo-add.sh.in | 2 +- src/common/util-common.h | 2 + src/pacman/conf.c | 4 +- src/pacman/package.c | 173 +++++++++++++++++++++----- src/pacman/pacman.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 2 +- src/util/pacsort.c | 27 ++-- 28 files changed, 400 insertions(+), 89 deletions(-) create mode 100644 doc/alpm-hooks.5.txt hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] _alpm_hook_run: check path length before copying
by Andrew Gregory 28 Oct '15

28 Oct '15

If a hook path equals or exceeds PATH_MAX characters the path will be left unterminated. Pre-calculating the path length also allows us to use the more efficient memcpy over strncpy. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/hook.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 668e086..b440e08 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -621,30 +621,41 @@ int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when) struct dirent entry, *result; DIR *d; - if(!(d = opendir(i->data))) { + if((dirlen = strlen(i->data)) >= PATH_MAX) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), + (char *)i->data, strerror(ENAMETOOLONG)); + ret = -1; + continue; + } + memcpy(path, i->data, dirlen + 1); + + if(!(d = opendir(path))) { if(errno == ENOENT) { continue; } else { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), - (char *)i->data, strerror(errno)); + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not open directory: %s: %s\n"), path, strerror(errno)); ret = -1; continue; } } - strncpy(path, i->data, PATH_MAX); - dirlen = strlen(i->data); - while((err = readdir_r(d, &entry, &result)) == 0 && result) { struct _alpm_hook_cb_ctx ctx = { handle, NULL }; struct stat buf; - size_t name_len = strlen(entry.d_name); + size_t name_len; if(strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) { continue; } - strncpy(path + dirlen, entry.d_name, PATH_MAX - dirlen); + if((name_len = strlen(entry.d_name)) >= PATH_MAX - dirlen) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file: %s%s: %s\n"), + path, entry.d_name, strerror(ENAMETOOLONG)); + ret = -1; + continue; + } + memcpy(path + dirlen, entry.d_name, name_len + 1); if(name_len < suflen || strcmp(entry.d_name + name_len - suflen, suffix) != 0) { -- 2.6.2

1 0

[pacman-dev] [PATCH] makepkg: fix $pkgname element duplication
by Benjamin Yates 28 Oct '15

28 Oct '15

run_split_packaging did not preserve the $pkgname array correctly, and would create duplicate entries in the list during restore. After restoring the backup (a b c) would become (a b c b c). This probably went unnoticed because during --install, pacman would reconcile the duplicates. --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6ededa3..224f089 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1664,7 +1664,7 @@ restore_package_variables() { } run_split_packaging() { - local pkgname_backup=${pkgname[@]} + local pkgname_backup=("${pkgname[@]}") for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" @@ -1676,7 +1676,7 @@ run_split_packaging() { create_debug_package restore_package_variables done - pkgname=${pkgname_backup[@]} + pkgname=("${pkgname_backup[@]}") } m4_include(library/parseopts.sh) -- 1.7.1

2 1

[pacman-dev] [PATCH] libmakepkg: fix pkgver checking
by Allan McRae 27 Oct '15

27 Oct '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 3fa4ff7..265a3fd 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -30,7 +30,7 @@ lint_pkgbuild_functions+=('lint_pkgver') check_pkgver() { - if [[ -z ${pkgver} ]]; then + if [[ -z $1 ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgver" return 1 fi @@ -47,5 +47,5 @@ lint_pkgver() { return 0 fi - check_pkgver + check_pkgver $pkgver } -- 2.6.2

1 0

[pacman-dev] [PATCH v6] Align titles automatically in information display
by Pierre Neidhardt 27 Oct '15

27 Oct '15

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- src/pacman/package.c | 173 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 141 insertions(+), 32 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 6b86599..dbd23f5 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -25,6 +25,7 @@ #include <limits.h> #include <errno.h> #include <time.h> +#include <wchar.h> #include <alpm.h> #include <alpm_list.h> @@ -36,6 +37,107 @@ #define CLBUF_SIZE 4096 +/* The term "title" refers to the first field of each line in the package + * information displayed by pacman. Titles are stored in the `titles` array and + * referenced by the following indices. + */ +enum { + T_ARCHITECTURE = 0, + T_BACKUP_FILES, + T_BUILD_DATE, + T_COMPRESSED_SIZE, + T_CONFLICTS_WITH, + T_DEPENDS_ON, + T_DESCRIPTION, + T_DOWNLOAD_SIZE, + T_GROUPS, + T_INSTALL_DATE, + T_INSTALL_REASON, + T_INSTALL_SCRIPT, + T_INSTALLED_SIZE, + T_LICENSES, + T_MD5_SUM, + T_NAME, + T_OPTIONAL_DEPS, + T_OPTIONAL_FOR, + T_PACKAGER, + T_PROVIDES, + T_REPLACES, + T_REPOSITORY, + T_REQUIRED_BY, + T_SHA_256_SUM, + T_SIGNATURES, + T_URL, + T_VALIDATED_BY, + T_VERSION, + /* the following is a sentinel and should remain in last position */ + _T_MAX +}; + +/* As of 2015/10/20, the longest title (all locales considered) was less than 30 + * characters long. We set the title maximum length to 50 to allow for some + * potential growth. + */ +#define TITLE_MAXLEN 50 + +static char titles[_T_MAX][TITLE_MAXLEN * sizeof(wchar_t)]; + +/** Build the `titles` array of localized titles and pad them with spaces so + * that they align with the longest title. Storage for strings is stack + * allocated and naively truncated to TITLE_MAXLEN characters. + */ +static void make_aligned_titles(void) +{ + unsigned int i; + size_t max = 0; + static const wchar_t *title_suffix = L" :"; + static const size_t title_suffix_len = sizeof(title_suffix); + wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + title_suffix_len]; + size_t wlen[ARRAYSIZE(wbuf)]; + char *buf[ARRAYSIZE(wbuf)]; + buf[T_ARCHITECTURE] = _("Architecture"); + buf[T_BACKUP_FILES] = _("Backup Files"); + buf[T_BUILD_DATE] = _("Build Date"); + buf[T_COMPRESSED_SIZE] = _("Compressed Size"); + buf[T_CONFLICTS_WITH] = _("Conflicts With"); + buf[T_DEPENDS_ON] = _("Depends On"); + buf[T_DESCRIPTION] = _("Description"); + buf[T_DOWNLOAD_SIZE] = _("Download Size"); + buf[T_GROUPS] = _("Groups"); + buf[T_INSTALL_DATE] = _("Install Date"); + buf[T_INSTALL_REASON] = _("Install Reason"); + buf[T_INSTALL_SCRIPT] = _("Install Script"); + buf[T_INSTALLED_SIZE] = _("Installed Size"); + buf[T_LICENSES] = _("Licenses"); + buf[T_MD5_SUM] = _("MD5 Sum"); + buf[T_NAME] = _("Name"); + buf[T_OPTIONAL_DEPS] = _("Optional Deps"); + buf[T_OPTIONAL_FOR] = _("Optional For"); + buf[T_PACKAGER] = _("Packager"); + buf[T_PROVIDES] = _("Provides"); + buf[T_REPLACES] = _("Replaces"); + buf[T_REPOSITORY] = _("Repository"); + buf[T_REQUIRED_BY] = _("Required By"); + buf[T_SHA_256_SUM] = _("SHA-256 Sum"); + buf[T_SIGNATURES] = _("Signatures"); + buf[T_URL] = _("URL"); + buf[T_VALIDATED_BY] = _("Validated By"); + buf[T_VERSION] = _("Version"); + + for(i = 0; i < ARRAYSIZE(wbuf); i++) { + wlen[i] = mbstowcs(wbuf[i], buf[i], strlen(buf[i]) + 1); + if(wlen[i] > max) { + max = wlen[i]; + } + } + + for(i = 0; i < ARRAYSIZE(wbuf); i++) { + wmemset(wbuf[i] + wlen[i], L' ', max - wlen[i]); + wmemcpy(wbuf[i] + max, title_suffix, title_suffix_len); + wcstombs(titles[i], wbuf[i], sizeof(wbuf[i])); + } +} + /** Turn a depends list into a text list. * @param deps a list with items of type alpm_depend_t */ @@ -70,7 +172,7 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) } text = alpm_list_add(text, depstring); } - list_display_linebreak(_("Optional Deps :"), text, cols); + list_display_linebreak(titles[T_OPTIONAL_DEPS], text, cols); FREELIST(text); } @@ -91,6 +193,13 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) const char *label, *reason; alpm_list_t *validation = NULL, *requiredby = NULL, *optionalfor = NULL; + /* make aligned titles once only */ + static int need_alignment = 1; + if(need_alignment) { + need_alignment = 0; + make_aligned_titles(); + } + from = alpm_pkg_get_origin(pkg); /* set variables here, do all output below */ @@ -124,7 +233,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) validation = alpm_list_add(validation, _("MD5 Sum")); } if(v & ALPM_PKG_VALIDATION_SHA256SUM) { - validation = alpm_list_add(validation, _("SHA256 Sum")); + validation = alpm_list_add(validation, _("SHA-256 Sum")); } if(v & ALPM_PKG_VALIDATION_SIGNATURE) { validation = alpm_list_add(validation, _("Signature")); @@ -144,33 +253,33 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) /* actual output */ if(from == ALPM_PKG_FROM_SYNCDB) { - string_display(_("Repository :"), + string_display(titles[T_REPOSITORY], alpm_db_get_name(alpm_pkg_get_db(pkg)), cols); } - string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); - string_display(_("Version :"), alpm_pkg_get_version(pkg), cols); - string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); - string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); - string_display(_("URL :"), alpm_pkg_get_url(pkg), cols); - list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), cols); - list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); - deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg), cols); - deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg), cols); + string_display(titles[T_NAME], alpm_pkg_get_name(pkg), cols); + string_display(titles[T_VERSION], alpm_pkg_get_version(pkg), cols); + string_display(titles[T_DESCRIPTION], alpm_pkg_get_desc(pkg), cols); + string_display(titles[T_ARCHITECTURE], alpm_pkg_get_arch(pkg), cols); + string_display(titles[T_URL], alpm_pkg_get_url(pkg), cols); + list_display(titles[T_LICENSES], alpm_pkg_get_licenses(pkg), cols); + list_display(titles[T_GROUPS], alpm_pkg_get_groups(pkg), cols); + deplist_display(titles[T_PROVIDES], alpm_pkg_get_provides(pkg), cols); + deplist_display(titles[T_DEPENDS_ON], alpm_pkg_get_depends(pkg), cols); optdeplist_display(pkg, cols); if(extra || from == ALPM_PKG_FROM_LOCALDB) { - list_display(_("Required By :"), requiredby, cols); - list_display(_("Optional For :"), optionalfor, cols); + list_display(titles[T_REQUIRED_BY], requiredby, cols); + list_display(titles[T_OPTIONAL_FOR], optionalfor, cols); } - deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols); - deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), cols); + deplist_display(titles[T_CONFLICTS_WITH], alpm_pkg_get_conflicts(pkg), cols); + deplist_display(titles[T_REPLACES], alpm_pkg_get_replaces(pkg), cols); size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), + printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_DOWNLOAD_SIZE], config->colstr.nocolor, size, label); } else if(from == ALPM_PKG_FROM_FILE) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Compressed Size:"), + printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_COMPRESSED_SIZE], config->colstr.nocolor, size, label); } else { /* autodetect size for "Installed Size" */ @@ -178,17 +287,17 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } size = humanize_size(alpm_pkg_get_isize(pkg), label[0], 2, &label); - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), + printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_INSTALLED_SIZE], config->colstr.nocolor, size, label); - string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); - string_display(_("Build Date :"), bdatestr, cols); + string_display(titles[T_PACKAGER], alpm_pkg_get_packager(pkg), cols); + string_display(titles[T_BUILD_DATE], bdatestr, cols); if(from == ALPM_PKG_FROM_LOCALDB) { - string_display(_("Install Date :"), idatestr, cols); - string_display(_("Install Reason :"), reason, cols); + string_display(titles[T_INSTALL_DATE], idatestr, cols); + string_display(titles[T_INSTALL_REASON], reason, cols); } if(from == ALPM_PKG_FROM_FILE || from == ALPM_PKG_FROM_LOCALDB) { - string_display(_("Install Script :"), + string_display(titles[T_INSTALL_SCRIPT], alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"), cols); } @@ -206,27 +315,27 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) keys = alpm_list_add(keys, _("None")); } - string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); - string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); - list_display(_("Signatures :"), keys, cols); + string_display(titles[T_MD5_SUM], alpm_pkg_get_md5sum(pkg), cols); + string_display(titles[T_SHA_256_SUM], alpm_pkg_get_sha256sum(pkg), cols); + list_display(titles[T_SIGNATURES], keys, cols); if(base64_sig) { FREELIST(keys); } } else { - list_display(_("Validated By :"), validation, cols); + list_display(titles[T_VALIDATED_BY], validation, cols); } if(from == ALPM_PKG_FROM_FILE) { alpm_siglist_t siglist; int err = alpm_pkg_check_pgp_signature(pkg, &siglist); if(err && alpm_errno(config->handle) == ALPM_ERR_SIG_MISSING) { - string_display(_("Signatures :"), _("None"), cols); + string_display(titles[T_SIGNATURES], _("None"), cols); } else if(err) { - string_display(_("Signatures :"), + string_display(titles[T_SIGNATURES], alpm_strerror(alpm_errno(config->handle)), cols); } else { - signature_display(_("Signatures :"), &siglist, cols); + signature_display(titles[T_SIGNATURES], &siglist, cols); } alpm_siglist_cleanup(&siglist); } @@ -290,7 +399,7 @@ void dump_pkg_backups(alpm_pkg_t *pkg) { alpm_list_t *i; const char *root = alpm_option_get_root(config->handle); - printf("%s%s%s", config->colstr.title, _("Backup Files:\n"), + printf("%s%s\n%s", config->colstr.title, titles[T_BACKUP_FILES], config->colstr.nocolor); if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ -- 2.6.2

2 1

[pacman-dev] [PATCH] Alpm, check for NULL in free-functions
by Rikard Falkeborn 27 Oct '15

27 Oct '15

Also, use FREE() instead of free() in _alpm_backup_free() to set the pointers to NULL. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- lib/libalpm/backup.c | 7 ++++--- lib/libalpm/conflict.c | 2 ++ lib/libalpm/db.c | 1 + lib/libalpm/delta.c | 1 + lib/libalpm/deps.c | 2 ++ lib/libalpm/graph.c | 1 + 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 5ccec03..3d1d6de 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -76,9 +76,10 @@ alpm_backup_t *_alpm_needbackup(const char *file, alpm_pkg_t *pkg) void _alpm_backup_free(alpm_backup_t *backup) { - free(backup->name); - free(backup->hash); - free(backup); + ASSERT(backup != NULL, return); + FREE(backup->name); + FREE(backup->hash); + FREE(backup); } alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0af3e3a..41b8393 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -68,6 +68,7 @@ error: */ void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict) { + ASSERT(conflict != NULL, return); FREE(conflict->package2); FREE(conflict->package1); FREE(conflict); @@ -301,6 +302,7 @@ error: */ void SYMEXPORT alpm_fileconflict_free(alpm_fileconflict_t *conflict) { + ASSERT(conflict != NULL, return); FREE(conflict->ctarget); FREE(conflict->file); FREE(conflict->target); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index b94d334..bb4c4bd 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -344,6 +344,7 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local) void _alpm_db_free(alpm_db_t *db) { + ASSERT(db != NULL, return); /* cleanup pkgcache */ _alpm_db_free_pkgcache(db); /* cleanup server list */ diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index a43269d..5ea2069 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -335,6 +335,7 @@ error: void _alpm_delta_free(alpm_delta_t *delta) { + ASSERT(delta != NULL, return); FREE(delta->delta); FREE(delta->delta_md5); FREE(delta->from); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 34ac8d3..f846b1c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -37,6 +37,7 @@ void SYMEXPORT alpm_dep_free(alpm_depend_t *dep) { + ASSERT(dep != NULL, return); FREE(dep->name); FREE(dep->version); FREE(dep->desc); @@ -63,6 +64,7 @@ error: void SYMEXPORT alpm_depmissing_free(alpm_depmissing_t *miss) { + ASSERT(miss != NULL, return); alpm_dep_free(miss->depend); FREE(miss->target); FREE(miss->causingpkg); diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 4d58169..7c3cce1 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -31,6 +31,7 @@ alpm_graph_t *_alpm_graph_new(void) void _alpm_graph_free(void *data) { + ASSERT(data != NULL, return); alpm_graph_t *graph = data; alpm_list_free(graph->children); free(graph); -- 2.6.2

2 1

[pacman-dev] [PATCH v5 1/2] Use ARRAYSIZE macro for non-string array size computation
by Pierre Neidhardt 27 Oct '15

27 Oct '15

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- lib/libalpm/pkghash.c | 2 +- src/common/util-common.h | 2 ++ src/pacman/pacman.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 989a8c1..5328ce4 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -66,7 +66,7 @@ alpm_pkghash_t *_alpm_pkghash_create(unsigned int size) CALLOC(hash, 1, sizeof(alpm_pkghash_t), return NULL); size = size / initial_hash_load + 1; - loopsize = sizeof(prime_list) / sizeof(*prime_list); + loopsize = ARRAYSIZE(prime_list); for(i = 0; i < loopsize; i++) { if(prime_list[i] > size) { hash->buckets = prime_list[i]; diff --git a/src/common/util-common.h b/src/common/util-common.h index a2093be..373db19 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -34,6 +34,8 @@ char *safe_fgets(char *s, int size, FILE *stream); char *strndup(const char *s, size_t n); #endif +#define ARRAYSIZE(a) (sizeof (a) / sizeof (a[0])) + #endif /* _PM_UTIL_COMMON_H */ /* vim: set noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c680067..b71ac43 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1136,7 +1136,7 @@ int main(int argc, char *argv[]) new_action.sa_flags = SA_RESTART; /* assign our handler to any signals we care about */ - for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { + for(i = 0; i < ARRAYSIZE(signals); i++) { int signal = signals[i]; sigaction(signal, NULL, &old_action); if(old_action.sa_handler != SIG_IGN) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3c20199..2a0f4b5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -228,7 +228,7 @@ static int sync_cleancache(int level) }; size_t j; - for(j = 0; j < sizeof(glob_skips) / sizeof(glob_skips[0]); j++) { + for(j = 0; j < ARRAYSIZE(glob_skips); j++) { if(fnmatch(glob_skips[j], ent->d_name, 0) == 0) { delete = 0; break; diff --git a/src/pacman/util.c b/src/pacman/util.c index 3d71d8b..53f7f6e 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1114,7 +1114,7 @@ double humanize_size(off_t bytes, const char target_unit, int precision, { static const char *labels[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}; - static const int unitcount = sizeof(labels) / sizeof(labels[0]); + static const int unitcount = ARRAYSIZE(labels); double val = (double)bytes; int index; -- 2.6.1

2 3

[pacman-dev] [PATCH] Add support for whirlpool checksum
by Luke 25 Oct '15

25 Oct '15

Hello, Per bug report #45859, here is a patch to add whirlpool checksum ability to makepkg. This algorithm has been available in Gentoo for some time. It's also very easy to add to our available checksums since it contains only one word to an existing array in makepkg.sh.in. Thanks. Luke

1 0

[pacman-dev] [PATCH] add_fileconflict, don't free if CALLOC fail
by Rikard Falkeborn 25 Oct '15

25 Oct '15

If CALLOC fails, conflict is NULL, so we shouldn't attempt to free it's members, since that would lead to a NULL pointer dereference. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- Is there a reason none of the alpm_*_free() functions check if the input is NULL? That would be more robust, and what I think would be expected, since free() accepts NULL as input. lib/libalpm/conflict.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0af3e3a..823fb67 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -273,7 +273,8 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_fileconflict_t *conflict; - CALLOC(conflict, 1, sizeof(alpm_fileconflict_t), goto error); + CALLOC(conflict, 1, sizeof(alpm_fileconflict_t), + RET_ERR(handle, ALPM_ERR_MEMORY, conflicts)); STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); -- 2.6.2

1 1