- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix pointer declarations to be globally consistent
by micah＠lexme.org 15 Dec '14

15 Dec '14

From: Micah Saint Germain <micah(a)lexme.org> Refactored inconsistent pointer declarations to better improve consistency throughout the pacman codebase which will, in turn, increase readability to the user. Expected format of a pointer declaration: `typename *varname` Signed-off-by: Micah Saint Germain <micah(a)lexme.org> --- src/pacman/callback.h | 2 +- src/pacman/pacman.c | 10 +++++----- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 5480c73..498536f 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -28,7 +28,7 @@ void cb_event(alpm_event_t *event); /* callback to handle questions from libalpm (yes/no) */ -void cb_question(alpm_question_t* question); +void cb_question(alpm_question_t *question); /* callback to handle display of progress */ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 6161048..f43105a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -97,11 +97,11 @@ static void usage(int op, const char * const myname) alpm_list_t *list = NULL, *i; /* prefetch some strings for usage below, which moves a lot of calls * out of gettext. */ - char const * const str_opt = _("options"); - char const * const str_file = _("file(s)"); - char const * const str_pkg = _("package(s)"); - char const * const str_usg = _("usage"); - char const * const str_opr = _("operation"); + char const *const str_opt = _("options"); + char const *const str_file = _("file(s)"); + char const *const str_pkg = _("package(s)"); + char const *const str_usg = _("usage"); + char const *const str_opr = _("operation"); /* please limit your strings to 80 characters in width */ if(op == PM_OP_MAIN) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4609186..215497f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -230,7 +230,7 @@ static int sync_cleancache(int level) } if(level <= 1) { - static const char * const glob_skips[] = { + static const char *const glob_skips[] = { /* skip signature files - they are removed with their package file */ "*.sig", /* skip package database within the cache directory */ diff --git a/src/util/pactree.c b/src/util/pactree.c index 5c76542..14579e4 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -339,7 +339,7 @@ static void cleanup(void) static void print_text(const char *pkg, const char *provision, tdepth *depth, int last) { - const char* tip = ""; + const char *tip = ""; int level = 1; if(!pkg && !provision) { /* not much we can do */ -- 2.1.0

1 0

[pacman-dev] [PATCH 1/2] shut up GCC on -Wmaybe-initialized warnings
by Dave Reisner 15 Dec '14

15 Dec '14

Admittedly, these are totally bogus, but a clean build is a happy build. --- src/pacman/conf.c | 2 +- src/pacman/pacman.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 5028284..873ca0e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -459,7 +459,7 @@ static int process_cleanmethods(alpm_list_t *values, static void setrepeatingoption(char *ptr, const char *option, alpm_list_t **list) { - char *val, *saveptr; + char *val, *saveptr = NULL; val = strtok_r(ptr, " ", &saveptr); while(val) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 6161048..6234570 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -341,8 +341,7 @@ static void invalid_opt(int used, const char *opt1, const char *opt2) static int parsearg_util_addlist(alpm_list_t **list) { - char *i, *save; - + char *i, *save = NULL; for(i = strtok_r(optarg, ",", &save); i; i = strtok_r(NULL, ",", &save)) { *list = alpm_list_add(*list, strdup(i)); -- 2.1.3

3 3

[pacman-dev] [PATCH] updpkgsums: drop in-place rewrite hack, use a tempfile
by Dave Reisner 14 Dec '14

14 Dec '14

This apparently exposes (what I think is) a subtle bug in cygwin's handling of subst'd drives. Let's just drop the hackery and use a tempfile, which should always work. Also, introduce a proper die() function which replaces previous hand-rolled error+exit pattern, but which wrote to stdout. --- contrib/updpkgsums.sh.in | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index e0524bd..a40845b 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -40,6 +40,11 @@ version() { echo 'Copyright (C) 2012-2013 Dave Reisner <dreisner(a)archlinux.org>' } +die() { + printf "==> ERROR: $1\n" "${@:2}" >&2 + exit 1 +} + case $1 in -h|--help) usage; exit ;; -V|--version) version; exit ;; @@ -47,8 +52,7 @@ esac buildfile=${1:-PKGBUILD} if [[ ! -f $buildfile ]]; then - printf "==> ERROR: %s not found or is not a file\n" "$buildfile" - exit 1 + die "%s not found or is not a file" "$buildfile" fi # Resolve any symlinks to avoid replacing the symlink with a file. But, we @@ -71,18 +75,19 @@ fi # Check $PWD/ for permission to unlink the $buildfile and write a new one if [[ ! -w . ]]; then - printf "==> ERROR: No write permission in '%s'\n" "$PWD" - exit 1 + die "No write permission in '%s'" "$PWD" fi -{ - # Generate the new sums and try to unlink the file before writing stdin back - # into it. This final precaution shouldn't fail based on the previous checks, - # but it's better to be extra careful before unlinking files. - export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) - trap "rm -rf '$BUILDDIR'" EXIT - newsums=$(makepkg -g -p "$buildfile") && rm -f "$buildfile" && - awk -v newsums="$newsums" ' +# Generate the new sums +export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) +newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX) + +# In case the eventual replacement fails, we don't want to leave behind +# $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement +# succeeds. +trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT +newsums=$(makepkg -g -p "$buildfile") && +awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { print newsums @@ -93,7 +98,11 @@ fi 1 END { if (!w) print newsums } - ' > "$buildfile" -} < "$buildfile" +' "$buildfile" > "$newbuildfile" + +# Replace the original buildfile. +if ! mv -- "$newbuildfile" "$buildfile"; then + die "Failed to update %s. The file has not been modified." "$buildfile" +fi # vim: set noet: -- 2.1.3

1 0

[pacman-dev] updpkgsums read/write collision
by David Macek 14 Dec '14

14 Dec '14

Hi all. I have noticed a problem with updpkgsums on Windows when it's run on a subst'd drive (created with `subst` or using an entry in `DOS Devices` registry key). The error message I see is following: /usr/bin/updpkgsums: line 85: PKGBUILD: Permission denied The PKGBUILD is then gone. I don't fully understand what's going on on lines 78-97 with the input/output redirection and deleting, but I assume this can be fixed by 1) either enhancing the routine for dereferencing symlinks (lines 54-62) to recognize subst'd drives, 2) or by modifying the script to first rename the original $buildfile, and delete it after finishing the new $buildfile. For the time being, I worked around the problem by modifying the script to first read $buildfile into a variable, then delete it and then pass the variable contents to awk to write to $buildfile. My question is following: can the script be changed in order to avoid this issue? Ref: https://github.com/Alexpux/MSYS2-packages/issues/143 -- David Macek

2 4

[pacman-dev] Anyone want to update NEWS and README files?
by Allan McRae 08 Dec '14

08 Dec '14

The last thing for the 4.1 release is to updated the NEWS and README files. The README file is updated by looking at "git diff v4.1.0 lib/libalpm/alpm.h" and noting the changes. NEWS is updated by scrolling through the commits/bugtracker and looking for points of interest. I doubt I can get to this before the weekend, so if someone else does this, the release can be made! Cheers, Allan

1 0

[pacman-dev] [PATCH] doc/translation-help.txt: Transifex example usage
by Miguel de Val-Borro 30 Nov '14

30 Nov '14

Replace harcoded language code in example Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 9b7def0..99ce3d8 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -46,8 +46,8 @@ resources (See `tx status` output for a quick overview). Or to just push one of the two available resources: - tx push -r archlinux-pacman.pacman-pot -t -l fi - tx push -r archlinux-pacman.libalpm-pot -t -l fi + tx push -r archlinux-pacman.pacman-pot -t -l <mylang> + tx push -r archlinux-pacman.libalpm-pot -t -l <mylang> See the <<Notes,Notes>> section for additional hints on translating. -- 2.1.3

1 0

[pacman-dev] [PATCH] remove.c: honor inverted patterns in noupgrade
by Andrew Gregory 29 Nov '14

29 Nov '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 4 ++-- test/pacman/tests/TESTS | 1 + test/pacman/tests/noupgrade-inverted.py | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 test/pacman/tests/noupgrade-inverted.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dd061e5..f9b24ef 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -326,7 +326,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, { char filepath[PATH_MAX]; - if(alpm_list_find(skip_remove, file->name, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(skip_remove, file->name) == 0) { /* return success because we will never actually remove this file */ return 1; } @@ -451,7 +451,7 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, /* check the remove skip list before removing the file. * see the big comment block in db_find_fileconflicts() for an * explanation. */ - if(alpm_list_find(skip_remove, fileobj->name, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(skip_remove, fileobj->name) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", file); return 1; diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 052cf4b..12adf6d 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -63,6 +63,7 @@ TESTS += test/pacman/tests/ldconfig003.py TESTS += test/pacman/tests/mode001.py TESTS += test/pacman/tests/mode002.py TESTS += test/pacman/tests/mode003.py +TESTS += test/pacman/tests/noupgrade-inverted.py TESTS += test/pacman/tests/pacman001.py TESTS += test/pacman/tests/pacman002.py TESTS += test/pacman/tests/pacman003.py diff --git a/test/pacman/tests/noupgrade-inverted.py b/test/pacman/tests/noupgrade-inverted.py new file mode 100644 index 0000000..8e7f1ea --- /dev/null +++ b/test/pacman/tests/noupgrade-inverted.py @@ -0,0 +1,19 @@ +self.description = "Upgrade a package with files that match negated NoUpgrade patterns" + +lp = pmpkg("foobar") +lp.files = ["foo/bar", "foo/baz"] +self.addpkg2db("local", lp) + +p = pmpkg("foobar", "1.0-2") +p.files = ["foo/bar"] +self.addpkg(p) + +self.option["NoUpgrade"] = ["foo/*", "!foo/bar", "!foo/baz"] + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=foobar|1.0-2") +self.addrule("!FILE_EXIST=foo/baz") +self.addrule("FILE_MODIFIED=foo/bar") +self.addrule("!FILE_PACNEW=foo/bar") +self.addrule("!FILE_PACSAVE=foo/bar") -- 2.1.3

1 0

[pacman-dev] [PATCH] add alpm_option_match_noupgrade
by Andrew Gregory 29 Nov '14

29 Nov '14

For parity with alpm_option_match_noextract. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 234bd6b..e6ef3ae 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -815,6 +815,7 @@ alpm_list_t *alpm_option_get_noupgrades(alpm_handle_t *handle); int alpm_option_add_noupgrade(alpm_handle_t *handle, const char *path); int alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *path); +int alpm_option_match_noupgrade(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of no-extract files. diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5ef619e..fa99948 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -527,6 +527,11 @@ int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pk return _alpm_option_strlist_rem(handle, &(handle->noupgrade), pkg); } +int SYMEXPORT alpm_option_match_noupgrade(alpm_handle_t *handle, const char *path) +{ + return _alpm_fnmatch_patterns(handle->noupgrade, path); +} + int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *path) { return _alpm_option_strlist_add(handle, &(handle->noextract), path); -- 2.1.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-507-ged4032a
by allan＠archlinux.org 27 Nov '14

27 Nov '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 ed4032a90813ba29ee11c71ac6af3090d96789ce (commit) from 41c8263ba289dac191d7f74faaa62476baf41c28 (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 ed4032a90813ba29ee11c71ac6af3090d96789ce Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 25 21:58:05 2014 +1000 pacman-db-upgrade: fix issue with find argument list length overflow Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/pacman-db-upgrade.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] pacman-db-upgrade: fix issue with find argument list length overflow
by Allan McRae 26 Nov '14

26 Nov '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-db-upgrade.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 2fced9b..7bb277b 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -174,7 +174,10 @@ if [[ -z "$db_version" ]]; then dirlist+=("${pacroot}${dir%/}") done < <(grep -h '/$' "$dbroot"/local/*/files | sort -ru) - mapfile -t dirlist < <(find "${dirlist[@]}" -maxdepth 0 -type l) + mapfile -t dirlist < <( + for dir in "${dirlist[@]}"; do + [[ -L "$dir" ]] && echo "$dir" + done) if [[ ${#dirlist[@]} != 0 ]]; then msg "$(gettext "Pre-4.2 database format detected - upgrading...")" -- 2.1.3

1 0