- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/3] Char signedness issues
by Rikard Falkeborn 04 Jan '16

04 Jan '16

I tried compiling pacman on my RPi (Arm), where char is unsigned by default. That leads to some things not working the way they are expected too. The problem is as follows: char a = -1; if (a == -1) { ... } If char is unsigned, we will not enter the if-statement (a is converted to int) before making the comparisson. Gcc will warn about these comparissons. The first two patches fixes the cases I (and Gcc) could find, and the third one is a couple of tests I wrote to convince myself there was a problem in pacsort (and more importantly, that the changes actually fixes something). After doing this, I realize that the simplest solution probably would be to add -fsigned-char as an argument to the compiler... thoughts? Rikard Falkeborn (3): Make alpm_graph state signedness explicit pacsort, introduce define for escape_char error code Add pacsort tests with invalid input lib/libalpm/graph.h | 2 +- src/util/pacsort.c | 11 ++++++----- test/util/pacsorttest.sh | 18 +++++++++++++++++- 3 files changed, 24 insertions(+), 7 deletions(-) -- 2.6.4

2 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-303-gfa72c2c
by allan＠archlinux.org 04 Jan '16

04 Jan '16

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 fa72c2cdc2682eb55edd0d8b19fb1eba4e061670 (commit) via 4742f5929dda4a7418781bc4b3d834a9f22b2d62 (commit) via 8ca96447ddb6f5b3f8bbb4a7ed946fc9a2907524 (commit) via 6aee32102f667a18b050e934759585260cae9ae6 (commit) via 774c7eb24dde6d72d7a9d9e7d6ae248a5a35f480 (commit) from a671fa497c7317e240e014e93bddfdbf1d270b2b (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 fa72c2cdc2682eb55edd0d8b19fb1eba4e061670 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 21 15:07:49 2015 +1000 Update README for pacman-5.0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4742f5929dda4a7418781bc4b3d834a9f22b2d62 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 3 13:48:43 2016 +1000 Update copyright years for 2016 make update-copyright OLD=2015 NEW=2016 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ca96447ddb6f5b3f8bbb4a7ed946fc9a2907524 Author: Daniel Hahler <git(a)thequod.de> Date: Wed Dec 23 19:56:51 2015 +0100 zsh_completion: add -q/--quiet for -Q/-S This should also be added for "-Fh", but that is missing completely in zsh_completion. 1: https://lists.archlinux.org/pipermail/pacman-dev/2015-November/020538.html Signed-off-by: Daniel Hahler <git(a)thequod.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6aee32102f667a18b050e934759585260cae9ae6 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Thu Dec 31 13:10:21 2015 +1300 Replace mktemp's --tmpdir option with shell code. bacman and updpkgsums used GNU mktemp's --tmpdir option, which is not supported by some other implementations (including busybox). Replace that with shell code. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 774c7eb24dde6d72d7a9d9e7d6ae248a5a35f480 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 21 16:58:36 2015 +1000 Do not warn about missing files in NoExtract The CheckSpace option checks the size of all files in a package being replaced and gives a warning when it can not read the file. However, files in NoExtract are expected to be missing and should not be warned about. Fixes FS#47470. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 25 ++++++++++++++++++---- contrib/bacman.sh.in | 6 +++--- contrib/pacdiff.sh.in | 4 ++-- contrib/pacscripts.sh.in | 2 +- contrib/updpkgsums.sh.in | 4 ++-- contrib/zsh_completion.in | 2 ++ doc/index.txt | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 8 ++++--- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/hook.c | 2 +- lib/libalpm/hook.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/libmakepkg/lint_package.sh.in | 2 +- .../libmakepkg/lint_package/build_references.sh.in | 2 +- .../libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/install.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/options.sh.in | 2 +- .../lint_pkgbuild/package_function.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/source.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/source/bzr.sh.in | 2 +- scripts/libmakepkg/source/file.sh.in | 2 +- scripts/libmakepkg/source/git.sh.in | 2 +- scripts/libmakepkg/source/hg.sh.in | 2 +- scripts/libmakepkg/source/local.sh.in | 2 +- scripts/libmakepkg/source/svn.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/optipng.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/tidy/upx.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- scripts/libmakepkg/util/message.sh | 2 +- scripts/libmakepkg/util/option.sh | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 2 +- scripts/libmakepkg/util/util.sh | 2 +- scripts/makepkg-template.pl.in | 4 ++-- scripts/makepkg-wrapper.sh.in | 2 +- scripts/makepkg.sh.in | 4 ++-- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-key.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- scripts/repo-add.sh.in | 4 ++-- src/common/ini.c | 2 +- src/common/ini.h | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/files.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 4 ++-- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sighandler.c | 2 +- src/pacman/sighandler.h | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pacsort.c | 2 +- src/util/pactree.c | 2 +- src/util/testpkg.c | 2 +- src/util/vercmp.c | 2 +- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tap.py | 2 +- test/pacman/util.py | 2 +- test/util/pacsorttest.sh | 2 +- test/util/vercmptest.sh | 2 +- 151 files changed, 187 insertions(+), 166 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Update copyright years for 2016
by Allan McRae 03 Jan '16

03 Jan '16

1 0

[pacman-dev] Updating bash and zsh completion
by Allan McRae 01 Jan '16

01 Jan '16

Does anyone want to look at updating our bash adn zsh completion to include the new options for -D and -F (and anything else that is missing)? There is a patch for zsh here: https://bugs.archlinux.org/index.php?do=details&task_id=47559 And an issue for bash completion here: https://bugs.archlinux.org/index.php?do=details&task_id=47333 Allan

2 1

[pacman-dev] [PATCH] Update NEWS for pacman-5.0
by Allan McRae 01 Jan '16

01 Jan '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a4d3dba..e2ae89b 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,69 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- -5.0.0 - pacman can check the validity of the local and sync databases +5.0.0 - pacman can run hooks pre- and post-transaction. See the + alpm-hooks(5) man page for details and an example hook (FS#2985) + - pacman can now sync and read .files databases (-Fy) and do basic + searching for files in sync repos (-Fs, -Fo) (FS#23787) + - pacman can check the validity of the local and sync databases (-Dk and -Dkk respectively). This replaces the 'testdb' - software + software (FS#42444) + - the package description output (-Si ,-Qi) is now correctly + aligned regardless of locale (FS#43983, FS#45997) + - ensure internal package version matches database version after + downloading (FS#45687) + - improved signal handling and lock file removal (FS#45995, + FS#46375, FS#47011) + - print more information when encountering dependency errors + - fix conflict with CheckSpace and NoExtract (FS#47470) + - improved configuration parsing with a new ini parser + - handle a symlink to a directory being replaced by a directory + - The 'pkgbase' variable is now recorded in the local package db + - Remove support for ".pacorig" files. Instead, packages files + are extracted as a ".pacnew" and the original stays in place + - prevent install scriptlets using stdin for user interaction + - provides are considered when displaying optdepends install + status (FS#36412) + - always update corrupt database whether or not a newer version + is found on the remote server + - fix build issues when libarchive was in a non-standard location + - Many issues found using Coverity were address (primarily freeing + memory on error conditions) + - The pactest suite was upgraded to allow parallel testing using + the tap.sh library + - makepkg: + - makepkg is in the process of being split into a library. This + allows various areas to be extended by adding a file into + libmakepkg (e.g. package/PKGBUILD checking, adjusting + files before creating the final package). + - PKGBUILD variables checked to be arrays or not as appropriate + - pkgver() and prepare() are now run with --noextract (FS#43498, + FS#46800) + - the ability to build a single package in a PKGBUILD has been + removed + - the output when checking checksums for architecture specific + sources is improved (FS#43444) + - improved handling of bazaar sources (FS#43448) + - fix source package signing with SRCPKGDIR set + - add option to compress png images with optipng + - add --packagelist option, which lists all packages build from + a PKGBUILD + - add --printsrcinfo flag to print SRCINFO file for a PKGBUILD + - record build information in a .BUILDINFO file + - add whirlpool to list of hashing options (FS#45859) + - makepkg-template: + - support multiple --template-dir + - added a testsuite + - repo-add: + - Always generate the .files database + - Only update database if the entire operation succeeds + - unarmored package signatures are rejected + - contrib: + - checkupdates: give error when fakeroot is missing + - checkupdates: provide packages versions in output + - checkupdates: fix failure in some locales (FS#40405) + - paccache: Add -q/--quiet + - pacdiff: do not require DIFFPROG for -o/--output (FS#46184) + - zsh_completion: updated to fix many missing options 4.2.1 - Remove warnings about incorrect directory ownership until packaging files with dynamic users/groups is improved - Do not require a specific automake version when building from -- 2.6.4

2 2

[pacman-dev] [PATCH] [RFC] alpm: Add a new hook type: PackageDir
by Olivier Brunel 01 Jan '16

01 Jan '16

Same as Package only instead of defining matching packages in the .hook file, it is done on the filesystem. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- Hey there, So I may be totally wrong, but I thought one of the cool things that could be done with hooks was that instead of having e.g. 3 packages refreshing a cache in their post_upgrade scriptlets, it'll be done via one post-transaction hook, so that it only runs once. And unless I'm missing something, this doesn't seem possible currently. At least not in a "good" way, since all matching packages must be included inside the .hook file itself. So am I wrong and was this never planned? Or is actually possible? Or is it meant to be added later? In case, here's a patch (though no documentation) that adds a new type of hooks: PackageDir Those are just like Package (and in fact turned into Package once validated/filled), only no targets should be featured inside the hook file itself, instead alpm will check for a directory by the hook name plus ".d" inside all the hookdirs (in order), so e.g. for hook "foobar" folders "foobar.d" will be looked for. Inside those dirs, a regular file means a target to add, said target being the name of the file. So files must be named after the packages to add/trigger the hook. A symlink however will mean to remove said package from the targets; The idea being that a user could create a symlink (to /dev/null) in e.g. /etc/pacman.d/hooks/foobar.d by the name of a package, to "undo"/mask a file by the same name in /usr/lib/alpm/hooks/foobar.d, file that could be part of any (other) package. That way, the font package provides the hook font-cache and any package that needs to trigger it simply adds an empty file to /usr/lib/alpm/hooks/font-cache.d by the name of the package. Also works for mkinitcpio providing a hook to rebuild the initramfs, which can then be triggered by any of e.g. mkinitcpio, linux, systemd, etc Thoughts? -j lib/libalpm/hook.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index b5ed17d..876beaf 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -37,6 +37,7 @@ enum _alpm_hook_op_t { enum _alpm_trigger_type_t { ALPM_HOOK_TYPE_PACKAGE = 1, + ALPM_HOOK_TYPE_PACKAGE_DIR, ALPM_HOOK_TYPE_FILE, }; @@ -95,12 +96,97 @@ static void _alpm_hook_free(struct _alpm_hook_t *hook) } } +static int _alpm_trigger_load_targets(alpm_handle_t *handle, + struct _alpm_trigger_t *trigger, char *hookname) +{ + int ret = 0; + size_t len = strlen(hookname); + alpm_list_t *i; + + for(i = handle->hookdirs; i && ret == 0; i = alpm_list_next(i)) { + int err; + char path[PATH_MAX]; + size_t dirlen = strlen(i->data); + struct dirent entry, *result; + DIR *d; + + if(dirlen + len + 3 >= PATH_MAX) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), + (char *)i->data, strerror(ENAMETOOLONG)); + ret = -1; + break; + } + memcpy(path, i->data, dirlen); + memcpy(path + dirlen, hookname, len); + memcpy(path + dirlen + len, ".d/", 4); + + if(!(d = opendir(path))) { + if(errno == ENOENT) { + continue; + } else { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not open directory: %s: %s\n"), path, strerror(errno)); + ret = -1; + break; + } + } + + while((err = readdir_r(d, &entry, &result)) == 0 && result) { + struct stat buf; + + if(strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) { + continue; + } + + if(fstatat(dirfd(d), entry.d_name, &buf, 0) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not stat file %s%s: %s\n"), path, entry.d_name, strerror(errno)); + ret = -1; + break; + } + + if(S_ISREG(buf.st_mode)) { + if(!alpm_list_find_str(trigger->targets, entry.d_name)) { + char *s; + STRDUP(s, entry.d_name, ret = -1; break); + trigger->targets = alpm_list_add(trigger->targets, s); + } + } else if(S_ISLNK(buf.st_mode)) { + char *s; + trigger->targets = alpm_list_remove_str(trigger->targets, entry.d_name, &s); + free(s); + } + } + + if(err != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not read directory: %s: %s\n"), + (char *) i->data, strerror(errno)); + ret = -1; + } + + closedir(d); + } + + return ret; +} + static int _alpm_trigger_validate(alpm_handle_t *handle, - struct _alpm_trigger_t *trigger, const char *file) + struct _alpm_trigger_t *trigger, const char *file, char *hookname) { int ret = 0; - if(trigger->targets == NULL) { + if(trigger->type == ALPM_HOOK_TYPE_PACKAGE_DIR) { + trigger->type = ALPM_HOOK_TYPE_PACKAGE; + if(trigger->targets) { + ret = -1; + _alpm_log(handle, ALPM_LOG_ERROR, + _("Unexpected targets for PackageDir trigger in hook: %s\n"), file); + } else if(_alpm_trigger_load_targets(handle, trigger, hookname) < 0) { + ret = -1; + } + /* we allow no targets in this case, since e.g. they could have been + * "masked" by the user via symlinks */ + } else if(trigger->targets == NULL) { ret = -1; _alpm_log(handle, ALPM_LOG_ERROR, _("Missing trigger targets in hook: %s\n"), file); @@ -134,7 +220,7 @@ static int _alpm_hook_validate(alpm_handle_t *handle, } for(i = hook->triggers; i; i = i->next) { - if(_alpm_trigger_validate(handle, i->data, file) != 0) { + if(_alpm_trigger_validate(handle, i->data, file, hook->name) != 0) { ret = -1; } } @@ -297,6 +383,8 @@ static int _alpm_hook_parse_cb(const char *file, int line, } else if(strcmp(key, "Type") == 0) { if(strcmp(value, "Package") == 0) { t->type = ALPM_HOOK_TYPE_PACKAGE; + } else if(strcmp(value, "PackageDir") == 0) { + t->type = ALPM_HOOK_TYPE_PACKAGE_DIR; } else if(strcmp(value, "File") == 0) { t->type = ALPM_HOOK_TYPE_FILE; } else { -- 2.6.4

3 4

[pacman-dev] [PATCH] Use a bashism instead of mktemp's --tmpdir option.
by Alastair Hughes 01 Jan '16

01 Jan '16

I discovered that bacman and updpkgsums use --tmpdir while playing around in a busybox environment with pacman installed, as updpkgsums did not work. I've tested the attached patch in both that environment against pacman 4.2.1, and against a git checkout on a normal Arch system; both appear to work, but I may have misunderstood the reasoning behind using --tmpdir.

3 4

[pacman-dev] Display messages from install scripts after all packages have been installed
by Jashandeep Sohi 24 Dec '15

24 Dec '15

Hi, I'm sure this question/request must have been asked before, however I wasn't able to find anything by searching for it. Apologies in advance if this is the wrong place to post. Install scripts bundled with packages sometimes print *important* changes/warnings when a package is installed or upgraded. These warnings are clearly visible when installing a single package, but tend to get lost when installing lots of packages because the install script hooks run right after each package is installed. I'm wondering if there is someway to delay the printing of these messages/warnings until all packages have been installed. Could/should a new hook be added that could run after all packages have been installed? Does anyone besides me even care? Thanks, Jashandeep

4 5

[pacman-dev] [PATCH] contrib/PKGBUILD.vim: handle arch suffixes with keywords
by genml+pacman-dev＠thequod.de 23 Dec '15

23 Dec '15

From: Daniel Hahler <git(a)thequod.de> --- contrib/PKGBUILD.vim | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 35ca6bd..8a9f411 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -93,37 +93,37 @@ syn match pbValidGroups /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote " depends -syn keyword pb_k_depends depends contained +syn keyword pb_k_depends depends depends_i686 depends_x86_64 contained syn match pbValidDepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbDependsGroup start=/^depends=(/ end=/)/ contains=pb_k_depends,pbValidDepends,shDoubleQuote,shSingleQuote " makedepends -syn keyword pb_k_makedepends makedepends contained +syn keyword pb_k_makedepends makedepends makedepends_i686 makedepends_x86_64 contained syn match pbValidMakedepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote " optdepends -syn keyword pb_k_optdepends optdepends contained +syn keyword pb_k_optdepends optdepends optdepends_i686 optdepends_x86_64 contained syn match pbValidOptdepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote " checkdepends -syn keyword pb_k_ckdepends checkdepends contained +syn keyword pb_k_ckdepends checkdepends checkdepends_i686 checkdepends_x86_64 contained syn match pbValidCkdepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbCkdependsGroup start=/^checkdepends=(/ end=/)/ contains=pb_k_ckdepends,pbValidCkdepends,shDoubleQuote,shSingleQuote " conflicts -syn keyword pb_k_conflicts conflicts contained +syn keyword pb_k_conflicts conflicts conflicts_i686 conflicts_x86_64 contained syn match pbValidConflicts /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbConflictsGroup start=/^conflicts=(/ end=/)/ contains=pb_k_conflicts,pbValidConflicts,shDoubleQuote,shSingleQuote " provides -syn keyword pb_k_provides provides contained +syn keyword pb_k_provides provides provides_i686 provides_x86_64 contained syn match pbValidProvides /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbProvidesGroup start=/^provides=(/ end=/)/ contains=pb_k_provides,pbValidProvides,shDoubleQuote,shSingleQuote " replaces -syn keyword pb_k_replaces replaces contained +syn keyword pb_k_replaces replaces replaces_i686 replaces_x86_64 contained syn match pbValidReplaces /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbReplacesGroup start=/^replaces=(/ end=/)/ contains=pb_k_replaces,pbValidReplaces,shDoubleQuote,shSingleQuote @@ -148,14 +148,14 @@ syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChange syn clear shStatement syn keyword shStatement xxx wait getopts return autoload whence printf true popd nohup enable r trap readonly fc fg kill ulimit umask disown stop pushd read history logout times local exit test pwd time eval integer suspend dirs shopt hash false newgrp bg print jobs continue functions exec help cd break unalias chdir type shift builtin let bind -syn keyword pb_k_source source contained +syn keyword pb_k_source source source_i686 source_x86_64 contained syn match pbIllegalSource /$http\|ftp\|https$.*\.\+$dl\|download.\?$\.$sourceforge\|sf$.net/ syn region pbSourceGroup start=/^source=(/ end=/)/ contains=pb_k_source,pbIllegalSource,shNumber,shDoubleQuote,shSingleQuote,pbDerefEmulation syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained hi def link pbDerefEmulation PreProc " md5sums -syn keyword pb_k_md5sums md5sums contained +syn keyword pb_k_md5sums md5sums md5sums_i686 md5sums_x86_64 contained syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums syn match pbValidMd5sums /\x\{32\}/ contained syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend @@ -166,7 +166,7 @@ hi def link pbMd5Hash Error hi def link pbValidMd5sums Number " sha1sums -syn keyword pb_k_sha1sums sha1sums contained +syn keyword pb_k_sha1sums sha1sums sha1sums_i686 sha1sums_x86_64 contained syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums syn match pbValidSha1sums /\x\{40\}/ contained syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend @@ -177,7 +177,7 @@ hi def link pbSha1Hash Error hi def link pbValidSha1sums Number " sha256sums -syn keyword pb_k_sha256sums sha256sums contained +syn keyword pb_k_sha256sums sha256sums sha256sums_i686 sha256sums_x86_64 contained syn match pbIllegalSha256sums /[^='"()\/ ]/ contained contains=pbValidSha256sums syn match pbValidSha256sums /\x\{64\}/ contained syn region pbSha256sumsGroup start=/^sha256sums/ end=/)/ contains=pb_k_sha256sums,pbSha256Quotes,pbSha256Hash,pbIllegalSha256sums keepend @@ -188,7 +188,7 @@ hi def link pbSha256Hash Error hi def link pbValidSha256sums Number " sha384sums -syn keyword pb_k_sha384sums sha384sums contained +syn keyword pb_k_sha384sums sha384sums sha384sums_i686 sha384sums_x86_64 contained syn match pbIllegalSha384sums /[^='"()\/ ]/ contained contains=pbValidSha384sums syn match pbValidSha384sums /\x\{96\}/ contained syn region pbSha384sumsGroup start=/^sha384sums/ end=/)/ contains=pb_k_sha384sums,pbSha384Quotes,pbSha384Hash,pbIllegalSha384sums keepend @@ -199,7 +199,7 @@ hi def link pbSha384Hash Error hi def link pbValidSha384sums Number " sha512sums -syn keyword pb_k_sha512sums sha512sums contained +syn keyword pb_k_sha512sums sha512sums sha512sums_i686 sha512sums_x86_64 contained syn match pbIllegalSha512sums /[^='"()\/ ]/ contained contains=pbValidSha512sums syn match pbValidSha512sums /\x\{128\}/ contained syn region pbSha512sumsGroup start=/^sha512sums/ end=/)/ contains=pb_k_sha512sums,pbSha512Quotes,pbSha512Hash,pbIllegalSha512sums keepend -- 2.6.4

2 2

[pacman-dev] [PATCH] Changed implicit NULL check to explicit one, to comply with style guide.
by Terry Bolt 23 Dec '15

23 Dec '15

Signed-off-by: Terry Bolt <bolt.terry(a)gmail.com> --- lib/libalpm/diskspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 5bb2173..7ee1289 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -62,7 +62,7 @@ static void mount_point_list_free(alpm_list_t *mount_points) { alpm_list_t *i; - for(i = mount_points; i; i = i->next) { + for(i = mount_points; i != NULL; i = i->next) { alpm_mountpoint_t *data = i->data; FREE(data->mount_dir); } -- 2.6.4

2 4