- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] skip unneeded parsing
by jjacky 11 Jan '12

11 Jan '12

parsing config file is a two-steps process, one for "options" and one for the repos. in each of those, there's no need to parse the other section(s), so we'll skip it. (most notably, when parsing for "options" it would read all included files for repos, while just ignoring everything in them) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/conf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..09749ea 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -755,6 +755,12 @@ static int _parseconfig(const char *file, struct section_t *section, continue; } + /* skip unnecessary parsing */ + if ( (parse_options && !section->is_options) + || (!parse_options && section->is_options) ) { + continue; + } + /* directive */ /* strsep modifies the 'line' string: 'key \0 value' */ key = line; -- 1.7.8.3

3 9

[pacman-dev] [PATCH] Moved the check for max depth
by jjacky 10 Jan '12

10 Jan '12

Moved the check for max depth when processing an Include directive, to avoid doing the glob process for nothing. Added file & line number in max depth error message. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/conf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 09749ea..2ff16d2 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -700,13 +700,6 @@ static int _parseconfig(const char *file, struct section_t *section, int ret = 0; const int max_depth = 10; - if(depth >= max_depth) { - pm_printf(ALPM_LOG_ERROR, - _("config parsing exceeded max recursion depth of %d.\n"), max_depth); - ret = 1; - goto cleanup; - } - pm_printf(ALPM_LOG_DEBUG, "config: attempting to read file %s\n", file); fp = fopen(file, "r"); if(fp == NULL) { @@ -794,6 +787,16 @@ static int _parseconfig(const char *file, struct section_t *section, ret = 1; goto cleanup; } + + /* if we've reached max depth, we're done */ + if(depth + 1 >= max_depth) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: parsing exceeded max recursion depth of %d.\n"), + file, linenum, max_depth); + ret = 1; + goto cleanup; + } + /* Ignore include failures... assume non-critical */ globret = glob(value, GLOB_NOCHECK, NULL, &globbuf); switch(globret) { -- 1.7.8.3

1 0

[pacman-dev] [PATCH] updpkgsums: add new contrib script
by Dave Reisner 10 Jan '12

10 Jan '12

updpkgsums updates checksums in a PKGBUILD "in place" --- This is really a whole lot of sanity checking and very little actual noise, but given what this script does (deleting a file), I chose to err on the side of extreme caution. I remembered to add to .gitignore this time! contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/updpkgsums.in | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletions(-) create mode 100755 contrib/updpkgsums.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 19b81e0..4f8e1e7 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -7,5 +7,6 @@ paclog-pkglist pacscripts pacsearch pacsysclean +updpkgsums wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index eca39e7..fab8d7c 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -12,7 +12,8 @@ OURSCRIPTS = \ paclog-pkglist \ pacscripts \ pacsearch \ - pacsysclean + pacsysclean \ + updpkgsums OURFILES = \ bash_completion \ @@ -29,6 +30,7 @@ EXTRA_DIST = \ pacscripts.in \ pacsearch.in \ pacsysclean.in \ + updpkgsums.in \ vimprojects \ zsh_completion.in \ README @@ -84,6 +86,7 @@ pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in +updpkgsums: $(srcdir)/updpkgsums.in zsh_completion: $(srcdir)/zsh_completion.in # vim:set ts=2 sw=2 noet: diff --git a/contrib/updpkgsums.in b/contrib/updpkgsums.in new file mode 100755 index 0000000..304f5db --- /dev/null +++ b/contrib/updpkgsums.in @@ -0,0 +1,90 @@ +#!/bin/bash +# +# updpkgsums - update source checksums in-place in PKGBUILDs +# +# Copyright (C) 2012 Dave Reisner <dreisner(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +shopt -s extglob + +declare -r myname='updpkgsums' +declare -r myver='@PACKAGE_VERSION@' + +usage() { + printf 'usage: %s [buildfile]\n\n' "$myname" + printf ' -h, --help display this help message and exit\n' + printf ' -V, --version display version information and exit\n\n' + printf '%s will perform an in place update the checksums in the\n' "$myname" + printf 'path specified by [buildfile], defaulting to PKGBUILD in the current\n' + printf 'working directory.\n' +} + +version() { + printf "%s %s\n" "$myname" "$myver" + echo 'Copyright (C) 2012 Dave Reisner <dreisner(a)archlinux.org>' +} + +case $1 in + -h|--help) usage; exit ;; + -V|--version) version; exit ;; +esac + +buildfile=${1:-PKGBUILD} +if [[ ! -f $buildfile ]]; then + printf $'==> ERROR: \`%s\' not found or is not a file: %s\n' "$buildfile" + exit 1 +fi + +# Resolve any symlinks to avoid replacing the symlink with a file. But, we +# have to do this portably... readlink's flags are inconsistent across OS's. +while [[ -L $buildfile ]]; do + buildfile=$(readlink "$buildfile") + cd "${buildfile%/*}" + buildfile=${buildfile##*/} +done + +# cd into the directory with the build file. this avoids creating random src/ +# directories scattered about the filesystem, and avoids cases where we might +# not be able to write in the $PWD. +if [[ $buildfile == */* ]]; then + cd "${buildfile%/*}" + buildfile=${buildfile##*/} +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 +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. + newsums=$(makepkg -g -p "$buildfile") && rm -f "$buildfile" && + exec awk -v newsums="$newsums" ' + /^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*(#.*)?$/ { + if (!w) { + print newsums + w++ + } + next + } + + 1 + ' > "$buildfile" +} < "$buildfile" + +# vim: set ts=2 sw=2 noet: -- 1.7.8.3

1 1

[pacman-dev] [PATCH 2/2] Only create string when needed (libalpm)
by jjacky 09 Jan '12

09 Jan '12

The entry's name is only used when not "." or ".." so only print the string then. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e2cbd8c..4245039 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -427,8 +427,8 @@ int _alpm_rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + sprintf(name, "%s/%s", path, dp->d_name); errflag += _alpm_rmrf(name); } } -- 1.7.8.3

1 0

[pacman-dev] [PATCH 1/2] only create string when needed
by jjacky 09 Jan '12

09 Jan '12

The entry's name is only used when not "." or ".." so only print the string then. (I'm guessing enormous speed improvements right there... :p) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 467bedf..2d88bac 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -191,9 +191,9 @@ int rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + char name[PATH_MAX]; + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); errflag += rmrf(name); } } -- 1.7.8.3

1 0

[pacman-dev] [PATCH 2/2] only create string when needed
by jjacky 09 Jan '12

09 Jan '12

the entry's name is only used when not "." or ".." so only print the string then. (i'm guessing enormous speed improvements right there... :p) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 467bedf..2d88bac 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -191,9 +191,9 @@ int rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + char name[PATH_MAX]; + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); errflag += rmrf(name); } } -- 1.7.8.3

2 2

[pacman-dev] [PATCH] Only create string when needed (libalpm)
by jjacky 09 Jan '12

09 Jan '12

The entry's name is only used when not "." or ".." so only print the string then. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e2cbd8c..4245039 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -427,8 +427,8 @@ int _alpm_rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + sprintf(name, "%s/%s", path, dp->d_name); errflag += _alpm_rmrf(name); } } -- 1.7.8.3

1 0

[pacman-dev] Couple of questions about libalpm doc, and pacman/copyright
by jjacky 09 Jan '12

09 Jan '12

Hey there, So I've been working on a little app using libalpm, and I have a couple of questions. Hopefully it's okay to ask this here. First off, a quick question regarding the doc. Looking at the source code i see functions are nicely commented, but all I could find as documentation was this man page: https://www.archlinux.org/pacman/libalpm.3.html Since it's totally possible, did I actually miss something (obvious), or are there no (generated) doc publicly available? It's certainly not a problem, especially since I find the libalpm/pacman source code to be really clean/easy to read/follow; It's quite simple to figure out how things work and how to use them, so congratulations on that, great work. (I wish my code looked as nice.) But while I read pacman's code a lot to see how things are done, I happen to actually also full copy/paste stuff in my app, including complete functions (e.g. the whole parsing of the config file, strtrim(), humanize_size(), etc). So I wonder, what's the right thing to do when it comes to this, and copyright? I should probably mention that I'm very new at all this, so I'm not sure, for instance, what should be included in the source files of my app, on its copyright/version message, etc I'll release my stuff on GPL3+, and I believe pacman is GPL2+, so based on what I read it's compatible/allowed, I just wonder what's the proper way to do it. Like, should I include something like this: Copyright (C) 2012 Pacman Development Team Lastly, while doing all this I came up with 2 (very) minor patches for pacman, so I'll share those. But I'm guessing it would be better as separate emails/threads, so I'll do it that way. Thanks, -jjacky

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-133-g4f02b98
by dan＠archlinux.org 08 Jan '12

08 Jan '12

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 4f02b98338437b9395addb29000893b91d1ae21e (commit) via 73d0d743bda5367fcab2453bbe21c15e481150c2 (commit) via 2b38f4eab7684e0f1e78b0b10953bf28915e963a (commit) via 36413aa856a7cace1851679c1398403b30417e80 (commit) via 102e6209c7c850f75b0594e002fc51db83e6c39b (commit) via 24c166f42aab6b28a326e7cdbb3185e101814812 (commit) via 7f51ba99ae6db204d69ce271cd5cc4e959135738 (commit) via 6f9ab22fd8c446eab58f1a6bbef7cb984575ef8a (commit) via 2d794cc031b634c55c77ec17b2b7864f7150ab34 (commit) via b7ecff160ee541904e7b75c9ba88a455c9502409 (commit) via d59324c8fff0a91930bf226d013273691f0580e6 (commit) via a857b9c8e09abc733aa4f32777bdce8dc95858bc (commit) via c6e1d4ddde97db2ce5c6becd31cec1a06e42222f (commit) via a1437cbf1bccc025d33e083e1a79e85c57c6e2df (commit) via def9e45affaf5212cd10b71a55f0b668f2e73ee4 (commit) from 6513b0ba591e44b4da75aa924046a34b8a269e9d (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 4f02b98338437b9395addb29000893b91d1ae21e Merge: 7f51ba9 73d0d74 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 8 12:14:04 2012 -0600 Merge branch 'maint' Conflicts: lib/libalpm/signing.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f51ba99ae6db204d69ce271cd5cc4e959135738 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 8 11:53:22 2012 -0600 Fix segfaults on opening invalid archive files "invalid" in this case simply means files that may or may not be archives. Discovered via a `pacman -Sc` operation with delta files in the package cache directory, but can be triggered if any file is passed to `pacman -Ql` that isn't an archive, for instance, or if the sync database file is not an archive. Fix it up so we are more careful about calling archive_read_finish() only on archives that are valid and have not already been closed, and teach our archive open function to set the returned archive to NULL if we aren't going to be returning something valid anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f9ab22fd8c446eab58f1a6bbef7cb984575ef8a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 7 11:26:22 2012 -0600 testdb: check local database for duplicate files This adds an additional check step to find files in the local database that claim to be owned by more than one package at once, which is definitely not a supported setup. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2d794cc031b634c55c77ec17b2b7864f7150ab34 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 7 11:25:04 2012 -0600 Update sync database size estimation values As the comment states, this is more like a dartboard than science. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b7ecff160ee541904e7b75c9ba88a455c9502409 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 6 16:09:19 2012 -0600 Clean up <inttypes.h> header inclusions In both cases we can go with the slightly leaner <stdint.h> header include since we aren't using the print macros. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d59324c8fff0a91930bf226d013273691f0580e6 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 6 16:02:52 2012 -0600 Use 32-bit wide integer type in PolarSSL code A look at what this does on 64 bit systems since we were using the unnecessarily large 'unsigned long' type before even though it was 64 bits wide: $ ~/bin/bloat-o-meter libalpm.so.old lib/libalpm/.libs/libalpm.so add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-10412 (-10412) function old new delta md5_finish 370 356 -14 sha2_finish 547 531 -16 md5_process 3762 2643 -1119 sha2_process 20356 11093 -9263 The code size is nearly halved in the sha2 case (44% smaller code size), and md5 gets a nice size reduction (27% smaller) as well. We also move base64 code to <stdint.h> types as well; we can use 'uint32_t' rather than 'unsigned long' for at least two variables in the decode function. This doesn't net the same size benefit as the hash code case, but it is more proper. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 4 +- contrib/zsh_completion.in | 8 +- lib/libalpm/add.c | 3 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/base64.c | 6 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/be_sync.c | 54 +++-------- lib/libalpm/md5.c | 81 ++++++++-------- lib/libalpm/remove.c | 1 - lib/libalpm/sha2.c | 87 +++++++++--------- lib/libalpm/signing.c | 25 ++++- lib/libalpm/util.c | 21 +++-- scripts/makepkg.sh.in | 14 ++-- scripts/po/ca.po | 10 ++- scripts/po/cs.po | 10 ++- scripts/po/da.po | 10 ++- scripts/po/de.po | 10 ++- scripts/po/el.po | 10 ++- scripts/po/en_GB.po | 13 ++- scripts/po/es.po | 10 ++- scripts/po/fi.po | 10 ++- scripts/po/fr.po | 10 ++- scripts/po/hu.po | 28 +++--- scripts/po/it.po | 10 ++- scripts/po/kk.po | 10 ++- scripts/po/lt.po | 19 +++-- scripts/po/nb.po | 10 ++- scripts/po/pacman-scripts.pot | 7 +- scripts/po/pl.po | 17 ++- scripts/po/pt.po | 10 ++- scripts/po/pt_BR.po | 10 ++- scripts/po/ro.po | 10 ++- scripts/po/ru.po | 10 ++- scripts/po/sk.po | 203 +++++++++++++++++++++++----------------- scripts/po/sr.po | 10 ++- scripts/po/sr(a)latin.po | 10 ++- scripts/po/sv.po | 10 ++- scripts/po/tr.po | 63 +++++++++---- scripts/po/uk.po | 18 ++-- scripts/po/zh_CN.po | 10 ++- scripts/po/zh_TW.po | 7 +- src/pacman/po/fi.po | 6 +- src/pacman/po/hu.po | 10 +- src/pacman/po/lt.po | 9 +- src/pacman/po/sk.po | 25 +++--- src/pacman/po/uk.po | 10 +- src/util/testdb.c | 85 ++++++++++++++++-- 47 files changed, 626 insertions(+), 394 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-25-g73d0d74
by dan＠archlinux.org 08 Jan '12

08 Jan '12

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, maint has been updated via 73d0d743bda5367fcab2453bbe21c15e481150c2 (commit) via 2b38f4eab7684e0f1e78b0b10953bf28915e963a (commit) via 36413aa856a7cace1851679c1398403b30417e80 (commit) via 102e6209c7c850f75b0594e002fc51db83e6c39b (commit) via 24c166f42aab6b28a326e7cdbb3185e101814812 (commit) via a857b9c8e09abc733aa4f32777bdce8dc95858bc (commit) via c6e1d4ddde97db2ce5c6becd31cec1a06e42222f (commit) via a1437cbf1bccc025d33e083e1a79e85c57c6e2df (commit) via def9e45affaf5212cd10b71a55f0b668f2e73ee4 (commit) from f1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa (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 73d0d743bda5367fcab2453bbe21c15e481150c2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 8 23:57:48 2012 +1000 makepkg: abort on missing download agent makepkg would not abort on a missing download agent due to the output variable being declared local on the same line as the function call in the assignment. That would result in strange output such as: ==> Retrieving Sources... ==> ERROR: There is no agent set up to handle foo URLs. Check /etc/makepkg.conf. Aborting... -> Downloading foobaz... /home/arch/code/pacman/scripts/makepkg: line 401: foo://foobaz: No such file or directory ==> ERROR: Failure while downloading foobaz Aborting... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2b38f4eab7684e0f1e78b0b10953bf28915e963a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 8 21:54:35 2012 +1000 makepkg: fix missing source file detection Declaring the variable as local on the same line as the assignment results in result of the assignment being returned rather than the result of the function on the righthand side of the assignment. Declaring the variable as local on a separate line means the result of the function on the r.h.s. is returned and our error function will be invoked if necessary (although it is practically impossible to ever trigger it...). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36413aa856a7cace1851679c1398403b30417e80 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 8 21:48:04 2012 +1000 makepkg: simplify source archive generation Simplify the source tarball generation by unifying the handling of local and remote files. This also allows local files to be found in $SRCDEST (FS#26580) and makepkg will abort on missing local source files (only possible to trigger in combination with --skipinteg). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 102e6209c7c850f75b0594e002fc51db83e6c39b Author: canyonknight <canyonknight(a)gmail.com> Date: Sat Jan 7 16:15:02 2012 -0500 Fix zsh completion for *.pkg.tar Signed-off-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24c166f42aab6b28a326e7cdbb3185e101814812 Author: canyonknight <canyonknight(a)gmail.com> Date: Sat Jan 7 16:12:55 2012 -0500 Fix bash completion for *.pkg.tar Signed-off-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a857b9c8e09abc733aa4f32777bdce8dc95858bc Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 5 17:04:42 2012 -0600 Update translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c6e1d4ddde97db2ce5c6becd31cec1a06e42222f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 5 17:02:10 2012 -0600 Update scripts translation catalog Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a1437cbf1bccc025d33e083e1a79e85c57c6e2df Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 5 16:48:21 2012 -0600 Remove useless logger message We don't need two log messages back-to-back about the same thing here. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit def9e45affaf5212cd10b71a55f0b668f2e73ee4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 5 16:34:51 2012 -0600 Search for PGP subkeys in a keyserver-acceptable way PGP keyservers are pieces of sh** when it comes to searching for subkeys, and only allow it if you submit an 8-character fingerprint rather than the recommended and less chance of collision 16-character fingerprint. Add a second remote lookup for the 8-character version of a key ID if we don't find anything the first time we look up the key. This fixes FS#27612 and the deficiency has been sent upstream to the GnuPG users mailing list as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 4 +- contrib/zsh_completion.in | 8 +- lib/libalpm/remove.c | 1 - lib/libalpm/signing.c | 26 ++++- scripts/makepkg.sh.in | 14 ++-- scripts/po/ca.po | 10 ++- scripts/po/cs.po | 10 ++- scripts/po/da.po | 10 ++- scripts/po/de.po | 10 ++- scripts/po/el.po | 10 ++- scripts/po/en_GB.po | 13 ++- scripts/po/es.po | 10 ++- scripts/po/fi.po | 10 ++- scripts/po/fr.po | 10 ++- scripts/po/hu.po | 28 +++--- scripts/po/it.po | 10 ++- scripts/po/kk.po | 10 ++- scripts/po/lt.po | 19 +++-- scripts/po/nb.po | 10 ++- scripts/po/pacman-scripts.pot | 7 +- scripts/po/pl.po | 17 ++- scripts/po/pt.po | 10 ++- scripts/po/pt_BR.po | 10 ++- scripts/po/ro.po | 10 ++- scripts/po/ru.po | 10 ++- scripts/po/sk.po | 203 +++++++++++++++++++++++----------------- scripts/po/sr.po | 10 ++- scripts/po/sr(a)latin.po | 10 ++- scripts/po/sv.po | 10 ++- scripts/po/tr.po | 63 +++++++++---- scripts/po/uk.po | 18 ++-- scripts/po/zh_CN.po | 10 ++- scripts/po/zh_TW.po | 7 +- src/pacman/po/fi.po | 6 +- src/pacman/po/hu.po | 10 +- src/pacman/po/lt.po | 9 +- src/pacman/po/sk.po | 25 +++--- src/pacman/po/uk.po | 10 +- 38 files changed, 426 insertions(+), 252 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix missing source file detection
by Allan McRae 08 Jan '12

08 Jan '12

Declaring the variable as local on the same line as the assignment results in result of the assignment being returned rather than the result of the function on the righthand side of the assignment. Declaring the variable as local on a separate line means the result of the function on the r.h.s. is returned and our error function will be invoked if necessary (although it is practically impossible to ever trigger it...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- @Dave: is my explanation correct there? scripts/makepkg.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b06c78a..cfdb530 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -624,7 +624,8 @@ generate_checksums() { local netfile for netfile in "${source[@]}"; do - local file="$(get_filepath "$netfile")" || missing_source_file "$netfile" + local file + file="$(get_filepath "$netfile")" || missing_source_file "$netfile" local sum="$(openssl dgst -${integ} "$file")" sum=${sum##* } (( ct )) && echo -n "$indent" -- 1.7.8.1

2 1

[pacman-dev] [PATCH] Fix segfaults on opening invalid archive files
by Dan McGee 08 Jan '12

08 Jan '12

"invalid" in this case simply means files that may or may not be archives. Discovered via a `pacman -Sc` operation with delta files in the package cache directory, but can be triggered if any file is passed to `pacman -Ql` that isn't an archive, for instance, or if the sync database file is not an archive. Fix it up so we are more careful about calling archive_read_finish() only on archives that are valid and have not already been closed, and teach our archive open function to set the returned archive to NULL if we aren't going to be returning something valid anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 4 ++-- lib/libalpm/be_sync.c | 5 +++-- lib/libalpm/util.c | 21 +++++++++++++-------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index fccbb10..3188a2f 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -380,7 +380,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int ret, fd, config = 0; struct archive *archive; struct archive_entry *entry; - alpm_pkg_t *newpkg = NULL; + alpm_pkg_t *newpkg; struct stat st; size_t files_count = 0, files_size = 0; alpm_file_t *files = NULL; @@ -394,7 +394,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, if(errno == ENOENT) { handle->pm_errno = ALPM_ERR_PKG_NOT_FOUND; } - goto error; + return NULL; } newpkg = _alpm_pkg_new(); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b16271b..c4673b1 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -391,7 +391,7 @@ static int sync_db_populate(alpm_db_t *db) { const char *dbpath; size_t est_count; - int count = -1, fd; + int count, fd; struct stat buf; struct archive *archive; struct archive_entry *entry; @@ -412,13 +412,14 @@ static int sync_db_populate(alpm_db_t *db) fd = _alpm_open_archive(db->handle, dbpath, &buf, &archive, ALPM_ERR_DB_OPEN); if(fd < 0) { - goto cleanup; + return -1; } est_count = estimate_package_count(&buf, archive); db->pkgcache = _alpm_pkghash_create(est_count); if(db->pkgcache == NULL) { db->handle->pm_errno = ALPM_ERR_MEMORY; + count = -1; goto cleanup; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2cce824..e2cbd8c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -213,6 +213,8 @@ size_t _alpm_strip_newline(char *str) * This takes care of creating the libarchive 'archive' struct, setting up * compression and format options, opening a file descriptor, setting up the * buffer size, and performing a stat on the path once opened. + * On error, no file descriptor is opened, and the archive pointer returned + * will be set to NULL. * @param handle the context handle * @param path the path of the archive to open * @param buf space for a stat buffer for the given path @@ -238,16 +240,13 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, if(fd < 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); - archive_read_finish(*archive); - RET_ERR(handle, error, -1); + goto error; } if(fstat(fd, buf) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not stat file %s: %s\n"), path, strerror(errno)); - archive_read_finish(*archive); - CLOSE(fd); - RET_ERR(handle, error, -1); + goto error; } #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE if(buf->st_blksize > ALPM_BUFFER_SIZE) { @@ -258,12 +257,18 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, if(archive_read_open_fd(*archive, fd, bufsize) != ARCHIVE_OK) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, archive_error_string(*archive)); - archive_read_finish(*archive); - CLOSE(fd); - RET_ERR(handle, error, -1); + goto error; } return fd; + +error: + archive_read_finish(*archive); + *archive = NULL; + if(fd >= 0) { + CLOSE(fd); + } + RET_ERR(handle, error, -1); } /** Unpack a specific file in an archive. -- 1.7.8.1

1 0

[pacman-dev] [PATCH 1/2] makepkg: abstract license check into separate function
by Dave Reisner 08 Jan '12

08 Jan '12

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 13185ee..eada195 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1102,6 +1102,15 @@ find_libprovides() { done } +check_license() { + # TODO maybe remove this at some point + # warn if license array is not present or empty + if [[ -z $license ]]; then + warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" + plain "$(gettext "Example for GPL\'ed software: %s.")" "license=('GPL')" + fi +} + write_pkginfo() { local builddate=$(date -u "+%s") if [[ -n $PACKAGER ]]; then @@ -1179,12 +1188,7 @@ write_pkginfo() { fi done - # TODO maybe remove this at some point - # warn if license array is not present or empty - if [[ -z $license ]]; then - warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" - plain "$(gettext "Example for GPL\'ed software: %s.")" "license=('GPL')" - fi + check_license } check_package() { -- 1.7.8.1

2 3

[pacman-dev] [PATCH] makepkg: abort on missing download agent
by Allan McRae 08 Jan '12

08 Jan '12

makepkg would not abort on a missing download agent due to the output variable being declared local on the same line as the function call in the assignment. That would result in strange output such as: ==> Retrieving Sources... ==> ERROR: There is no agent set up to handle foo URLs. Check /etc/makepkg.conf. Aborting... -> Downloading foobaz... /home/arch/code/pacman/scripts/makepkg: line 401: foo://foobaz: No such file or directory ==> ERROR: Failure while downloading foobaz Aborting... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cfdb530..f6d8294 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -551,7 +551,8 @@ download_sources() { fi # find the client we should use for this URL - local dlclient=$(get_downloadclient "$url") || exit $? + local dlclient + dlclient=$(get_downloadclient "$url") || exit $? msg2 "$(gettext "Downloading %s...")" "$file" # fix flyspray bug #3289 -- 1.7.8.1

1 0

[pacman-dev] [PATCH 1/4] Use 32-bit wide integer type in PolarSSL code
by Dan McGee 08 Jan '12

08 Jan '12

A look at what this does on 64 bit systems since we were using the unnecessarily large 'unsigned long' type before even though it was 64 bits wide: $ ~/bin/bloat-o-meter libalpm.so.old lib/libalpm/.libs/libalpm.so add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-10412 (-10412) function old new delta md5_finish 370 356 -14 sha2_finish 547 531 -16 md5_process 3762 2643 -1119 sha2_process 20356 11093 -9263 The code size is nearly halved in the sha2 case (44% smaller code size), and md5 gets a nice size reduction (27% smaller) as well. We also move base64 code to <stdint.h> types as well; we can use 'uint32_t' rather than 'unsigned long' for at least two variables in the decode function. This doesn't net the same size benefit as the hash code case, but it is more proper. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/base64.c | 6 ++- lib/libalpm/md5.c | 81 +++++++++++++++++++++++----------------------- lib/libalpm/sha2.c | 87 +++++++++++++++++++++++++------------------------ 3 files changed, 89 insertions(+), 85 deletions(-) diff --git a/lib/libalpm/base64.c b/lib/libalpm/base64.c index 0d29f65..32c4445 100644 --- a/lib/libalpm/base64.c +++ b/lib/libalpm/base64.c @@ -32,6 +32,8 @@ * * removal of SELF_TEST code */ +#include <stdint.h> + #include "base64.h" static const unsigned char base64_enc_map[64] = @@ -133,8 +135,8 @@ int base64_encode( unsigned char *dst, size_t *dlen, int base64_decode( unsigned char *dst, size_t *dlen, const unsigned char *src, size_t slen ) { - size_t i, j, n; - unsigned long x; + size_t i, n; + uint32_t j, x; unsigned char *p; for( i = j = n = 0; i < slen; i++ ) diff --git a/lib/libalpm/md5.c b/lib/libalpm/md5.c index b4391a6..0d5ed9e 100644 --- a/lib/libalpm/md5.c +++ b/lib/libalpm/md5.c @@ -33,33 +33,34 @@ * GPL. This is from version 1.0.0 of the library, and has been modified * as following, which may be helpful for future updates: * * remove "polarssl/config.h" include - * * change include from "polarssl/sha2.h" to "sha2.h" + * * change include from "polarssl/md5.h" to "md5.h" * * removal of HMAC code * * removal of SELF_TEST code - * * removal of ipad and opad from the md5_context struct in sha2.h + * * removal of ipad and opad from the md5_context struct in md5.h * * increase the size of buffer for performance reasons - * * various static changes + * * change 'unsigned long' to uint32_t */ #include <stdio.h> +#include <stdint.h> #include "md5.h" /* * 32-bit integer manipulation macros (little endian) */ -#ifndef GET_ULONG_LE -#define GET_ULONG_LE(n,b,i) \ +#ifndef GET_U32_LE +#define GET_U32_LE(n,b,i) \ { \ - (n) = ( (unsigned long) (b)[(i) ] ) \ - | ( (unsigned long) (b)[(i) + 1] << 8 ) \ - | ( (unsigned long) (b)[(i) + 2] << 16 ) \ - | ( (unsigned long) (b)[(i) + 3] << 24 ); \ + (n) = ( (uint32_t) (b)[(i) ] ) \ + | ( (uint32_t) (b)[(i) + 1] << 8 ) \ + | ( (uint32_t) (b)[(i) + 2] << 16 ) \ + | ( (uint32_t) (b)[(i) + 3] << 24 ); \ } #endif -#ifndef PUT_ULONG_LE -#define PUT_ULONG_LE(n,b,i) \ +#ifndef PUT_U32_LE +#define PUT_U32_LE(n,b,i) \ { \ (b)[(i) ] = (unsigned char) ( (n) ); \ (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \ @@ -84,24 +85,24 @@ static void md5_starts( md5_context *ctx ) static void md5_process( md5_context *ctx, const unsigned char data[64] ) { - unsigned long X[16], A, B, C, D; - - GET_ULONG_LE( X[ 0], data, 0 ); - GET_ULONG_LE( X[ 1], data, 4 ); - GET_ULONG_LE( X[ 2], data, 8 ); - GET_ULONG_LE( X[ 3], data, 12 ); - GET_ULONG_LE( X[ 4], data, 16 ); - GET_ULONG_LE( X[ 5], data, 20 ); - GET_ULONG_LE( X[ 6], data, 24 ); - GET_ULONG_LE( X[ 7], data, 28 ); - GET_ULONG_LE( X[ 8], data, 32 ); - GET_ULONG_LE( X[ 9], data, 36 ); - GET_ULONG_LE( X[10], data, 40 ); - GET_ULONG_LE( X[11], data, 44 ); - GET_ULONG_LE( X[12], data, 48 ); - GET_ULONG_LE( X[13], data, 52 ); - GET_ULONG_LE( X[14], data, 56 ); - GET_ULONG_LE( X[15], data, 60 ); + uint32_t X[16], A, B, C, D; + + GET_U32_LE( X[ 0], data, 0 ); + GET_U32_LE( X[ 1], data, 4 ); + GET_U32_LE( X[ 2], data, 8 ); + GET_U32_LE( X[ 3], data, 12 ); + GET_U32_LE( X[ 4], data, 16 ); + GET_U32_LE( X[ 5], data, 20 ); + GET_U32_LE( X[ 6], data, 24 ); + GET_U32_LE( X[ 7], data, 28 ); + GET_U32_LE( X[ 8], data, 32 ); + GET_U32_LE( X[ 9], data, 36 ); + GET_U32_LE( X[10], data, 40 ); + GET_U32_LE( X[11], data, 44 ); + GET_U32_LE( X[12], data, 48 ); + GET_U32_LE( X[13], data, 52 ); + GET_U32_LE( X[14], data, 56 ); + GET_U32_LE( X[15], data, 60 ); #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n))) @@ -211,7 +212,7 @@ static void md5_process( md5_context *ctx, const unsigned char data[64] ) static void md5_update( md5_context *ctx, const unsigned char *input, size_t ilen ) { size_t fill; - unsigned long left; + uint32_t left; if( ilen <= 0 ) return; @@ -219,10 +220,10 @@ static void md5_update( md5_context *ctx, const unsigned char *input, size_t ile left = ctx->total[0] & 0x3F; fill = 64 - left; - ctx->total[0] += (unsigned long) ilen; + ctx->total[0] += (uint32_t) ilen; ctx->total[0] &= 0xFFFFFFFF; - if( ctx->total[0] < (unsigned long) ilen ) + if( ctx->total[0] < (uint32_t) ilen ) ctx->total[1]++; if( left && ilen >= fill ) @@ -262,16 +263,16 @@ static const unsigned char md5_padding[64] = */ static void md5_finish( md5_context *ctx, unsigned char output[16] ) { - unsigned long last, padn; - unsigned long high, low; + uint32_t last, padn; + uint32_t high, low; unsigned char msglen[8]; high = ( ctx->total[0] >> 29 ) | ( ctx->total[1] << 3 ); low = ( ctx->total[0] << 3 ); - PUT_ULONG_LE( low, msglen, 0 ); - PUT_ULONG_LE( high, msglen, 4 ); + PUT_U32_LE( low, msglen, 0 ); + PUT_U32_LE( high, msglen, 4 ); last = ctx->total[0] & 0x3F; padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); @@ -279,10 +280,10 @@ static void md5_finish( md5_context *ctx, unsigned char output[16] ) md5_update( ctx, (unsigned char *) md5_padding, padn ); md5_update( ctx, msglen, 8 ); - PUT_ULONG_LE( ctx->state[0], output, 0 ); - PUT_ULONG_LE( ctx->state[1], output, 4 ); - PUT_ULONG_LE( ctx->state[2], output, 8 ); - PUT_ULONG_LE( ctx->state[3], output, 12 ); + PUT_U32_LE( ctx->state[0], output, 0 ); + PUT_U32_LE( ctx->state[1], output, 4 ); + PUT_U32_LE( ctx->state[2], output, 8 ); + PUT_U32_LE( ctx->state[3], output, 12 ); } /* diff --git a/lib/libalpm/sha2.c b/lib/libalpm/sha2.c index 3632c13..366dc65 100644 --- a/lib/libalpm/sha2.c +++ b/lib/libalpm/sha2.c @@ -38,28 +38,29 @@ * * removal of SELF_TEST code * * removal of ipad and opad from the sha2_context struct in sha2.h * * increase the size of buffer for performance reasons - * * various static changes + * * change 'unsigned long' to uint32_t */ #include <stdio.h> +#include <stdint.h> #include "sha2.h" /* * 32-bit integer manipulation macros (big endian) */ -#ifndef GET_ULONG_BE -#define GET_ULONG_BE(n,b,i) \ +#ifndef GET_U32_BE +#define GET_U32_BE(n,b,i) \ { \ - (n) = ( (unsigned long) (b)[(i) ] << 24 ) \ - | ( (unsigned long) (b)[(i) + 1] << 16 ) \ - | ( (unsigned long) (b)[(i) + 2] << 8 ) \ - | ( (unsigned long) (b)[(i) + 3] ); \ + (n) = ( (uint32_t) (b)[(i) ] << 24 ) \ + | ( (uint32_t) (b)[(i) + 1] << 16 ) \ + | ( (uint32_t) (b)[(i) + 2] << 8 ) \ + | ( (uint32_t) (b)[(i) + 3] ); \ } #endif -#ifndef PUT_ULONG_BE -#define PUT_ULONG_BE(n,b,i) \ +#ifndef PUT_U32_BE +#define PUT_U32_BE(n,b,i) \ { \ (b)[(i) ] = (unsigned char) ( (n) >> 24 ); \ (b)[(i) + 1] = (unsigned char) ( (n) >> 16 ); \ @@ -106,25 +107,25 @@ static void sha2_starts( sha2_context *ctx, int is224 ) static void sha2_process( sha2_context *ctx, const unsigned char data[64] ) { - unsigned long temp1, temp2, W[64]; - unsigned long A, B, C, D, E, F, G, H; - - GET_ULONG_BE( W[ 0], data, 0 ); - GET_ULONG_BE( W[ 1], data, 4 ); - GET_ULONG_BE( W[ 2], data, 8 ); - GET_ULONG_BE( W[ 3], data, 12 ); - GET_ULONG_BE( W[ 4], data, 16 ); - GET_ULONG_BE( W[ 5], data, 20 ); - GET_ULONG_BE( W[ 6], data, 24 ); - GET_ULONG_BE( W[ 7], data, 28 ); - GET_ULONG_BE( W[ 8], data, 32 ); - GET_ULONG_BE( W[ 9], data, 36 ); - GET_ULONG_BE( W[10], data, 40 ); - GET_ULONG_BE( W[11], data, 44 ); - GET_ULONG_BE( W[12], data, 48 ); - GET_ULONG_BE( W[13], data, 52 ); - GET_ULONG_BE( W[14], data, 56 ); - GET_ULONG_BE( W[15], data, 60 ); + uint32_t temp1, temp2, W[64]; + uint32_t A, B, C, D, E, F, G, H; + + GET_U32_BE( W[ 0], data, 0 ); + GET_U32_BE( W[ 1], data, 4 ); + GET_U32_BE( W[ 2], data, 8 ); + GET_U32_BE( W[ 3], data, 12 ); + GET_U32_BE( W[ 4], data, 16 ); + GET_U32_BE( W[ 5], data, 20 ); + GET_U32_BE( W[ 6], data, 24 ); + GET_U32_BE( W[ 7], data, 28 ); + GET_U32_BE( W[ 8], data, 32 ); + GET_U32_BE( W[ 9], data, 36 ); + GET_U32_BE( W[10], data, 40 ); + GET_U32_BE( W[11], data, 44 ); + GET_U32_BE( W[12], data, 48 ); + GET_U32_BE( W[13], data, 52 ); + GET_U32_BE( W[14], data, 56 ); + GET_U32_BE( W[15], data, 60 ); #define SHR(x,n) ((x & 0xFFFFFFFF) >> n) #define ROTR(x,n) (SHR(x,n) | (x << (32 - n))) @@ -241,7 +242,7 @@ static void sha2_process( sha2_context *ctx, const unsigned char data[64] ) static void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) { size_t fill; - unsigned long left; + uint32_t left; if( ilen <= 0 ) return; @@ -249,10 +250,10 @@ static void sha2_update( sha2_context *ctx, const unsigned char *input, size_t i left = ctx->total[0] & 0x3F; fill = 64 - left; - ctx->total[0] += (unsigned long) ilen; + ctx->total[0] += (uint32_t) ilen; ctx->total[0] &= 0xFFFFFFFF; - if( ctx->total[0] < (unsigned long) ilen ) + if( ctx->total[0] < (uint32_t) ilen ) ctx->total[1]++; if( left && ilen >= fill ) @@ -292,16 +293,16 @@ static const unsigned char sha2_padding[64] = */ static void sha2_finish( sha2_context *ctx, unsigned char output[32] ) { - unsigned long last, padn; - unsigned long high, low; + uint32_t last, padn; + uint32_t high, low; unsigned char msglen[8]; high = ( ctx->total[0] >> 29 ) | ( ctx->total[1] << 3 ); low = ( ctx->total[0] << 3 ); - PUT_ULONG_BE( high, msglen, 0 ); - PUT_ULONG_BE( low, msglen, 4 ); + PUT_U32_BE( high, msglen, 0 ); + PUT_U32_BE( low, msglen, 4 ); last = ctx->total[0] & 0x3F; padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); @@ -309,16 +310,16 @@ static void sha2_finish( sha2_context *ctx, unsigned char output[32] ) sha2_update( ctx, (unsigned char *) sha2_padding, padn ); sha2_update( ctx, msglen, 8 ); - PUT_ULONG_BE( ctx->state[0], output, 0 ); - PUT_ULONG_BE( ctx->state[1], output, 4 ); - PUT_ULONG_BE( ctx->state[2], output, 8 ); - PUT_ULONG_BE( ctx->state[3], output, 12 ); - PUT_ULONG_BE( ctx->state[4], output, 16 ); - PUT_ULONG_BE( ctx->state[5], output, 20 ); - PUT_ULONG_BE( ctx->state[6], output, 24 ); + PUT_U32_BE( ctx->state[0], output, 0 ); + PUT_U32_BE( ctx->state[1], output, 4 ); + PUT_U32_BE( ctx->state[2], output, 8 ); + PUT_U32_BE( ctx->state[3], output, 12 ); + PUT_U32_BE( ctx->state[4], output, 16 ); + PUT_U32_BE( ctx->state[5], output, 20 ); + PUT_U32_BE( ctx->state[6], output, 24 ); if( ctx->is224 == 0 ) - PUT_ULONG_BE( ctx->state[7], output, 28 ); + PUT_U32_BE( ctx->state[7], output, 28 ); } /* -- 1.7.8.1

2 4

[pacman-dev] [PATCH] Search for PGP subkeys in a keyserver-acceptable way
by Dan McGee 08 Jan '12

08 Jan '12

PGP keyservers are pieces of sh** when it comes to searching for subkeys, and only allow it if you submit an 8-character fingerprint rather than the recommended and less chance of collision 16-character fingerprint. Add a second remote lookup for the 8-character version of a key ID if we don't find anything the first time we look up the key. This fixes FS#27612 and the deficiency has been sent upstream to the GnuPG users mailing list as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/signing.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 92f34b5..1a53dea 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -251,10 +251,24 @@ static int key_search(alpm_handle_t *handle, const char *fpr, err = gpgme_get_key(ctx, fpr, &key, 0); if(gpg_err_code(err) == GPG_ERR_EOF) { _alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n"); - ret = 0; - goto error; - } else if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { - _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); + /* Try an alternate lookup using the 8 character fingerprint value, since + * busted-ass keyservers can't support lookups using subkeys with the full + * value as of now. This is why 2012 is not the year of PGP encryption. */ + if(strlen(fpr) > 8) { + const char *short_fpr = fpr + strlen(fpr) - 8; + _alpm_log(handle, ALPM_LOG_DEBUG, + "looking up key %s remotely\n", short_fpr); + err = gpgme_get_key(ctx, short_fpr, &key, 0); + if(gpg_err_code(err) == GPG_ERR_EOF) { + _alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n"); + ret = 0; + } + } else { + ret = 0; + } + } + + if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto error; } @@ -270,9 +284,11 @@ static int key_search(alpm_handle_t *handle, const char *fpr, pgpkey->email = key->uids->email; pgpkey->created = key->subkeys->timestamp; pgpkey->expires = key->subkeys->expires; - ret = 1; + gpgme_release(ctx); + return 1; error: + _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); gpgme_release(ctx); return ret; } -- 1.7.8.1

2 1

[pacman-dev] [PATCH] makepkg: simplify source archive generation
by Allan McRae 08 Jan '12

08 Jan '12

Simplify the source tarball generation by unifying the handling of local and remote files. This also allows local files to be found in $SRCDEST (FS#26580) and makepkg will abort on missing local source files (only possible to trigger in combination with --skipinteg). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 769bec7..b06c78a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1348,11 +1348,9 @@ create_srcpackage() { local file for file in "${source[@]}"; do - if [[ -f $file ]]; then - msg2 "$(gettext "Adding %s...")" "$file" - ln -s "${startdir}/$file" "$srclinks/$pkgbase" - elif (( SOURCEONLY == 2 )); then - local absfile=$(get_filepath "$file") || missing_source_file "$file" + if [[ "$file" == $(get_filename "$file") ]] || (( SOURCEONLY == 2 )); then + local absfile + absfile=$(get_filepath "$file") || missing_source_file "$file" msg2 "$(gettext "Adding %s...")" "${absfile##*/}" ln -s "$absfile" "$srclinks/$pkgbase" fi -- 1.7.8.1

1 0

[pacman-dev] [pacman 4] error: failed to prepare transaction (could not find database)
by Karol Blazewicz 06 Jan '12

06 Jan '12

If pacman 3.5.4-4 can't connect to a repo that's listed in pacman.conf, it will throw a bunch of errors error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' ... but will let you update and install packages from other repos. pacman 4.0.1-X errors out: [karol@black ~]$ pacman -Syu warning: database file for 'allanbrokeit' does not exist :: Synchronizing package databases... testing is up to date community-testing is up to date core is up to date extra is up to date community is up to date error: failed retrieving file 'allanbrokeit.db' from allanmcrae.com : The requested URL returned error: 404 error: failed to update allanbrokeit (download library error) :: Starting full system upgrade... error: failed to prepare transaction (could not find database) [karol@black ~]$ pacman -S hdparm warning: database file for 'allanbrokeit' does not exist error: failed to prepare transaction (could not find database) hdparm is in [core]. allanbrokeit repo is already back online, so you have to test it with some nonexistent repo & db. The error messages are clear enough and you only have to comment out the repo that e.g. went offline to "fix" pacman. This behavior may be a feature [1] but I wanted to make sure this is how it's meant to be. [1] See Allan's post https://bbs.archlinux.org/viewtopic.php?pid=1034943#p1034943

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-118-g6513b0b
by dan＠archlinux.org 03 Jan '12

03 Jan '12

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 6513b0ba591e44b4da75aa924046a34b8a269e9d (commit) via f1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa (commit) via 0b9cd9448c16dcf5e21ee8822698dbe908db520f (commit) via 6507fd6bf0a05dfd65bc035ffca1f8941b784801 (commit) via 177beb91c96a078f729bd11c2f6c1144082e69e3 (commit) via 29e94dc065c8d85139ec16c462d835ad63f87984 (commit) via eb5cb8ec02bf31b4a5e84ea38c196dae67bf2aac (commit) via 496f7b4f642af43beeafc1476294da56b433a587 (commit) via 566f5210ce23e1d869472c49ae87ab56cf577468 (commit) via 2ce4f85f1ecea37d2c2ab2ea7393dc04adeeaa1d (commit) via 819c28bf8c666a61ef3b0a016dcbd6962ecaf4e4 (commit) via 627cf6bca88c241d7e0d5563db46f87f64792653 (commit) via 39cb865e71432fbce826d7526b1006be0e036761 (commit) via 7113ea4e08fdc9ca12b8e7a4829d749923029941 (commit) from b264fb9e9ddcc31dc8782390309421965e507383 (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 6513b0ba591e44b4da75aa924046a34b8a269e9d Merge: 0b9cd94 f1d9b0a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 2 19:44:00 2012 -0600 Merge branch 'maint' Conflicts: doc/Makefile.am commit 0b9cd9448c16dcf5e21ee8822698dbe908db520f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 2 13:29:40 2012 -0600 pkghash improvements/modifications This patch changes a variety of small things related to our pkghash implementation with an eye toward performance, especially on native 32-bit systems. * Use `unsigned int` rather than `size_t` for hash sizes. We already return ERANGE for any attempted creation of a hash greater than 1 million elements, so unsigned int is more than large enough for our purposes. Switching to this type allows 32 bit systems to do native math without helper functions from libgcc. * _alpm_pkghash_create() now internally adds extra padding for additional array elements, rather than that being the responsibility of the caller. * #define values are moved into static const values in pkghash.c; a new `stride` value is also extracted (but remains set at 1). * Division and modulus operators are removed from the normal find and add paths if possible. We store the upper limit of the number of elements in the hash so we no longer need to calculate this every element addition. When doing wraparound position calculations, we only apply the modulus operator if the value is greater than the number of buckets. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 177beb91c96a078f729bd11c2f6c1144082e69e3 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 2 13:17:44 2012 -0600 Minor optimization on likely sync package lookup We have a name_hash value here, so add a cheap compare of it before falling to the strcmp() call. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29e94dc065c8d85139ec16c462d835ad63f87984 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jan 2 14:31:46 2012 +1000 be_package.c: fix compiler warning be_package.c: In function 'parse_descfile': be_package.c:181:28: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] ptr - key + 2 is guaranteed to be > 0 so we can cast to size_t Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb5cb8ec02bf31b4a5e84ea38c196dae67bf2aac Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 2 12:52:00 2012 -0600 Remove unnecessary counters in file removal code Now that filelist arrays know their own size, we don't need to do the bookkeeping we used to do when they were linked lists. Remove some of the counter variables and use math instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 496f7b4f642af43beeafc1476294da56b433a587 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 31 20:25:53 2011 -0600 alpm_list_msort: inline alpm_list_nth() call This reduces the number of functions we call by log(n) in this function, and the inlined version is trivial and barely increases the size of the function. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 566f5210ce23e1d869472c49ae87ab56cf577468 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 31 19:51:48 2011 -0600 contrib: add install rules for bash and zsh completion Uninstall rules are provided as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2ce4f85f1ecea37d2c2ab2ea7393dc04adeeaa1d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 31 19:18:46 2011 -0600 Convert get_update_timediff to integer return value We don't need absolute floating point precision at all here; we can stick to integer land and use milliseconds which are precise enough for our purposes. This also removes most floating point math out of the non-update code path. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 819c28bf8c666a61ef3b0a016dcbd6962ecaf4e4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 30 12:17:52 2011 -0600 Only compile delta regex once This reduces the number of regcomp() calls when parsing delta entries in the database from once per entry to once for the entire context handle by storing the compiled regex data on the handle itself. Just as we do with the cURL handle, we initialize it the first time it is needed and free it when releasing the handle. A few other small tweaks to the parsing function also take place, including using the stack to store the transient and short file size string while parsing it. When parsing a sync database with 1378 delta entries, this reduces the time of a `pacman -Sl deltas` operation by 50% from 0.22s to 0.12s. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 627cf6bca88c241d7e0d5563db46f87f64792653 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 29 15:17:04 2011 -0600 Fix delta parsing In commit 4c5e7af32f9, we changed this code to use the regex gathered substrings. However, we failed to correctly store the delta file name (leaking memory), as well as freeing the temporary string used to hold the file size string. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 39cb865e71432fbce826d7526b1006be0e036761 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 29 11:24:38 2011 -0600 Simplify hash function to a single multiplication More than likely the compiler will do the three operation breakdown we had here before (2 shifts + subtraction), but let the compiler do the optimizations and make the actual operation more obvious. This actually slightly shrinks the function binary size, likely due to instruction reordering or something. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/Makefile.am | 10 ++++ doc/Makefile.am | 6 +- lib/libalpm/alpm_list.c | 21 +++++--- lib/libalpm/be_local.c | 3 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 9 ++-- lib/libalpm/db.c | 6 +- lib/libalpm/delta.c | 34 +++++++----- lib/libalpm/delta.h | 2 +- lib/libalpm/handle.c | 3 + lib/libalpm/handle.h | 5 ++ lib/libalpm/pkghash.c | 114 ++++++++++++++++++++++++++---------------- lib/libalpm/pkghash.h | 14 +++--- lib/libalpm/remove.c | 8 +-- lib/libalpm/util.c | 2 +- src/pacman/callback.c | 51 ++++++++++-------- src/pacman/util.h | 3 - test/pacman/tests/sync305.py | 67 ++++++++++++++++++++++++ test/pacman/tests/sync306.py | 63 +++++++++++++++++++++++ 19 files changed, 305 insertions(+), 118 deletions(-) create mode 100644 test/pacman/tests/sync305.py create mode 100644 test/pacman/tests/sync306.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-16-gf1d9b0a
by dan＠archlinux.org 03 Jan '12

03 Jan '12

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, maint has been updated via f1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa (commit) via 6507fd6bf0a05dfd65bc035ffca1f8941b784801 (commit) via 7113ea4e08fdc9ca12b8e7a4829d749923029941 (commit) from 5b749eeee999b5b332ad7545688297a37542b9a5 (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 f1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jan 2 17:14:40 2012 -0500 add new pactest for syncfirst with recursive deps Add 1 failing for the -Su case, and the same case using -S (and passing). This is based on a real (current) issue of upgrading staging chroots with the new pacman in staging for a libarchive build, and a new toolchain in testing. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6507fd6bf0a05dfd65bc035ffca1f8941b784801 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 24 20:21:51 2011 +1000 Prevent rebuild of man pages when using release tarballs Commit 43cad9c8 made the building of all docs depend on the Makefile. However, the Makefile is generated after running ./configure so is always newer than any pregenerated docs. This means that people building from released pacman tarballs are forced to rebuild the docs (and thus have asciidoc installed). That defeats the purpose of prebuilding the documentation. Have the documentatin depends on Makefile.am instead as this is probably what was intended. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7113ea4e08fdc9ca12b8e7a4829d749923029941 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 29 14:23:47 2011 -0600 Fix bogus string cast in search debug message Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 6 ++-- lib/libalpm/db.c | 6 ++-- test/pacman/tests/sync305.py | 67 ++++++++++++++++++++++++++++++++++++++++++ test/pacman/tests/sync306.py | 63 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 test/pacman/tests/sync305.py create mode 100644 test/pacman/tests/sync306.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] add new pactest for syncfirst with recursive deps
by Dave Reisner 02 Jan '12

02 Jan '12

Add 1 failing for the -Su case, and the same case using -S (and passing). This is based on a real (current) issue of upgrading staging chroots with the new pacman in staging for a libarchive build, and a new toolchain in testing. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Longest. pactest. ever. And its pretty hideous. I'm sure this could be made a little simpler by taking out some intermediate packages, but it was easier to write these by just mimicking reality. Dan, I think we had briefly discussed this, but I don't recall anything conclusive. Eric brought this up in IRC, so I figured I'd write up some test so we don't forget about it. test/pacman/tests/sync305.py | 67 ++++++++++++++++++++++++++++++++++++++++++ test/pacman/tests/sync306.py | 63 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/sync305.py create mode 100644 test/pacman/tests/sync306.py diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py new file mode 100644 index 0000000..24fcee4 --- /dev/null +++ b/test/pacman/tests/sync305.py @@ -0,0 +1,67 @@ +self.description = "Sysupgrade: syncfirst with recursive/cascading deps" + +sp = pmpkg("pacman", "4.0.1-2") +sp.depends = ["glibc>=2.15", "curl"] +self.addpkg2db("sync", sp) + +glibcdep = pmpkg("glibc", "2.15-1") +self.addpkg2db("sync", glibcdep) + +gcldep = pmpkg("gcc-libs", "4.6.2-5") +gcldep.depends = ["glibc>=2.14"] +self.addpkg2db("sync", gcldep) + +curldep = pmpkg("curl", "7.23.1-2") +curldep.depends = ["openssl"] +self.addpkg2db("sync", curldep) + +openssldep = pmpkg("openssl", "1.0.0.e-1") +openssldep.depends = ["perl"] +self.addpkg2db("sync", openssldep) + +gccdep = pmpkg("gcc", "4.6.2-5") +gccdep.depends = ["gcc-libs=4.6.2-5"] +self.addpkg2db("sync", gccdep) + +perldep = pmpkg("perl", "5.14.2-5") +perldep.depends = ["db"] +self.addpkg2db("sync", perldep) + +dbdep = pmpkg("db", "5.2.36-2") +dbdep.depends = ["gcc-libs"] +self.addpkg2db("sync", dbdep) + + +lp = pmpkg("pacman", "4.0.1-1") +lp.depends = ["glibc>=2.14", "curl"] +self.addpkg2db("local", lp) + +lp2 = pmpkg("glibc", "2.14-2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("curl", "7.23.1-2") +self.addpkg2db("local", lp3) + +lp4 = pmpkg("gcc-libs", "4.6.2-3") +self.addpkg2db("local", lp4) + +lp5 = pmpkg("gcc", "4.6.2-3") +lp5.depends = ["gcc-libs=4.6.2-3"] +self.addpkg2db("local", lp5) + +lp6 = pmpkg("perl", "5.14.2-5") +lp6.depends = ["db"] +self.addpkg2db("local", lp6) + +lp7 = pmpkg("db", "5.2.36-2") +lp7.depends = ["gcc-libs"] +self.addpkg2db("local", lp7) + +self.option["SyncFirst"] = ["pacman"] + +self.args = "-Su" +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|4.0.1-2") + +self.expectfailure = True diff --git a/test/pacman/tests/sync306.py b/test/pacman/tests/sync306.py new file mode 100644 index 0000000..ca7a547 --- /dev/null +++ b/test/pacman/tests/sync306.py @@ -0,0 +1,63 @@ +self.description = "install with recursive/cascading deps" + +sp = pmpkg("pacman", "4.0.1-2") +sp.depends = ["glibc>=2.15", "curl"] +self.addpkg2db("sync", sp) + +glibcdep = pmpkg("glibc", "2.15-1") +self.addpkg2db("sync", glibcdep) + +gcldep = pmpkg("gcc-libs", "4.6.2-5") +gcldep.depends = ["glibc>=2.14"] +self.addpkg2db("sync", gcldep) + +curldep = pmpkg("curl", "7.23.1-2") +curldep.depends = ["openssl"] +self.addpkg2db("sync", curldep) + +openssldep = pmpkg("openssl", "1.0.0.e-1") +openssldep.depends = ["perl"] +self.addpkg2db("sync", openssldep) + +gccdep = pmpkg("gcc", "4.6.2-5") +gccdep.depends = ["gcc-libs=4.6.2-5"] +self.addpkg2db("sync", gccdep) + +perldep = pmpkg("perl", "5.14.2-5") +perldep.depends = ["db"] +self.addpkg2db("sync", perldep) + +dbdep = pmpkg("db", "5.2.36-2") +dbdep.depends = ["gcc-libs"] +self.addpkg2db("sync", dbdep) + + +lp = pmpkg("pacman", "4.0.1-1") +lp.depends = ["glibc>=2.14", "curl"] +self.addpkg2db("local", lp) + +lp2 = pmpkg("glibc", "2.14-2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("curl", "7.23.1-2") +self.addpkg2db("local", lp3) + +lp4 = pmpkg("gcc-libs", "4.6.2-3") +self.addpkg2db("local", lp4) + +lp5 = pmpkg("gcc", "4.6.2-3") +lp5.depends = ["gcc-libs=4.6.2-3"] +self.addpkg2db("local", lp5) + +lp6 = pmpkg("perl", "5.14.2-5") +lp6.depends = ["db"] +self.addpkg2db("local", lp6) + +lp7 = pmpkg("db", "5.2.36-2") +lp7.depends = ["gcc-libs"] +self.addpkg2db("local", lp7) + +self.args = "-S pacman" +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|4.0.1-2") -- 1.7.8.1

1 0

[pacman-dev] [PATCH] pkghash improvements/modifications
by Dan McGee 02 Jan '12

02 Jan '12

This patch changes a variety of small things related to our pkghash implementation with an eye toward performance, especially on native 32-bit systems. * Use `unsigned int` rather than `size_t` for hash sizes. We already return ERANGE for any attempted creation of a hash greater than 1 million elements, so unsigned int is more than large enough for our purposes. Switching to this type allows 32 bit systems to do native math without helper functions from libgcc. * _alpm_pkghash_create() now internally adds extra padding for additional array elements, rather than that being the responsibility of the caller. * #define values are moved into static const values in pkghash.c; a new `stride` value is also extracted (but remains set at 1). * Division and modulus operators are removed from the normal find and add paths if possible. We store the upper limit of the number of elements in the hash so we no longer need to calculate this every element addition. When doing wraparound position calculations, we only apply the modulus operator if the value is greater than the number of buckets. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +- lib/libalpm/be_sync.c | 3 +- lib/libalpm/pkghash.c | 114 +++++++++++++++++++++++++++++------------------ lib/libalpm/pkghash.h | 14 +++--- 4 files changed, 79 insertions(+), 55 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2deef22..36b2c5d 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -402,8 +402,7 @@ static int local_db_populate(alpm_db_t *db) est_count -= 2; } - /* initialize hash at 50% full */ - db->pkgcache = _alpm_pkghash_create(est_count * 2); + db->pkgcache = _alpm_pkghash_create(est_count); if(db->pkgcache == NULL){ closedir(dbdir); RET_ERR(db->handle, ALPM_ERR_MEMORY, -1); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 07134e7..76c31f5 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -439,8 +439,7 @@ static int sync_db_populate(alpm_db_t *db) } est_count = estimate_package_count(&buf, archive); - /* initialize hash at 66% full */ - db->pkgcache = _alpm_pkghash_create(est_count * 3 / 2); + db->pkgcache = _alpm_pkghash_create(est_count); if(db->pkgcache == NULL) { db->handle->pm_errno = ALPM_ERR_MEMORY; goto cleanup; diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 963ba25..f007092 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -26,42 +26,51 @@ * * The maximum table size is the last prime under 1,000,000. That is * more than an order of magnitude greater than the number of packages - * in any Linux distribution. + * in any Linux distribution, and well under UINT_MAX. */ -static const size_t prime_list[] = +static const unsigned int prime_list[] = { - 11ul, 13ul, 17ul, 19ul, 23ul, 29ul, 31ul, 37ul, 41ul, 43ul, 47ul, - 53ul, 59ul, 61ul, 67ul, 71ul, 73ul, 79ul, 83ul, 89ul, 97ul, 103ul, - 109ul, 113ul, 127ul, 137ul, 139ul, 149ul, 157ul, 167ul, 179ul, 193ul, - 199ul, 211ul, 227ul, 241ul, 257ul, 277ul, 293ul, 313ul, 337ul, 359ul, - 383ul, 409ul, 439ul, 467ul, 503ul, 541ul, 577ul, 619ul, 661ul, 709ul, - 761ul, 823ul, 887ul, 953ul, 1031ul, 1109ul, 1193ul, 1289ul, 1381ul, - 1493ul, 1613ul, 1741ul, 1879ul, 2029ul, 2179ul, 2357ul, 2549ul, - 2753ul, 2971ul, 3209ul, 3469ul, 3739ul, 4027ul, 4349ul, 4703ul, - 5087ul, 5503ul, 5953ul, 6427ul, 6949ul, 7517ul, 8123ul, 8783ul, - 9497ul, 10273ul, 11113ul, 12011ul, 12983ul, 14033ul, 15173ul, - 16411ul, 17749ul, 19183ul, 20753ul, 22447ul, 24281ul, 26267ul, - 28411ul, 30727ul, 33223ul, 35933ul, 38873ul, 42043ul, 45481ul, - 49201ul, 53201ul, 57557ul, 62233ul, 67307ul, 72817ul, 78779ul, - 85229ul, 92203ul, 99733ul, 107897ul, 116731ul, 126271ul, 136607ul, - 147793ul, 159871ul, 172933ul, 187091ul, 202409ul, 218971ul, 236897ul, - 256279ul, 277261ul, 299951ul, 324503ul, 351061ul, 379787ul, 410857ul, - 444487ul, 480881ul, 520241ul, 562841ul, 608903ul, 658753ul, 712697ul, - 771049ul, 834181ul, 902483ul, 976369ul + 11u, 13u, 17u, 19u, 23u, 29u, 31u, 37u, 41u, 43u, 47u, + 53u, 59u, 61u, 67u, 71u, 73u, 79u, 83u, 89u, 97u, 103u, + 109u, 113u, 127u, 137u, 139u, 149u, 157u, 167u, 179u, 193u, + 199u, 211u, 227u, 241u, 257u, 277u, 293u, 313u, 337u, 359u, + 383u, 409u, 439u, 467u, 503u, 541u, 577u, 619u, 661u, 709u, + 761u, 823u, 887u, 953u, 1031u, 1109u, 1193u, 1289u, 1381u, + 1493u, 1613u, 1741u, 1879u, 2029u, 2179u, 2357u, 2549u, + 2753u, 2971u, 3209u, 3469u, 3739u, 4027u, 4349u, 4703u, + 5087u, 5503u, 5953u, 6427u, 6949u, 7517u, 8123u, 8783u, + 9497u, 10273u, 11113u, 12011u, 12983u, 14033u, 15173u, + 16411u, 17749u, 19183u, 20753u, 22447u, 24281u, 26267u, + 28411u, 30727u, 33223u, 35933u, 38873u, 42043u, 45481u, + 49201u, 53201u, 57557u, 62233u, 67307u, 72817u, 78779u, + 85229u, 92203u, 99733u, 107897u, 116731u, 126271u, 136607u, + 147793u, 159871u, 172933u, 187091u, 202409u, 218971u, 236897u, + 256279u, 277261u, 299951u, 324503u, 351061u, 379787u, 410857u, + 444487u, 480881u, 520241u, 562841u, 608903u, 658753u, 712697u, + 771049u, 834181u, 902483u, 976369u }; -/* Allocate a hash table with at least "size" buckets */ -alpm_pkghash_t *_alpm_pkghash_create(size_t size) +/* How far forward do we look when linear probing for a spot? */ +static const unsigned int stride = 1; +/* What is the maximum load percentage of our hash table? */ +static const double max_hash_load = 0.68; +/* Initial load percentage given a certain size */ +static const double initial_hash_load = 0.58; + +/* Allocate a hash table with space for at least "size" elements */ +alpm_pkghash_t *_alpm_pkghash_create(unsigned int size) { alpm_pkghash_t *hash = NULL; - size_t i, loopsize; + unsigned int i, loopsize; CALLOC(hash, 1, sizeof(alpm_pkghash_t), return NULL); + size = size / initial_hash_load + 1; loopsize = sizeof(prime_list) / sizeof(*prime_list); for(i = 0; i < loopsize; i++) { if(prime_list[i] > size) { hash->buckets = prime_list[i]; + hash->limit = hash->buckets * max_hash_load; break; } } @@ -78,15 +87,19 @@ alpm_pkghash_t *_alpm_pkghash_create(size_t size) return hash; } -static size_t get_hash_position(unsigned long name_hash, alpm_pkghash_t *hash) +static unsigned int get_hash_position(unsigned long name_hash, + alpm_pkghash_t *hash) { - size_t position; + unsigned int position; position = name_hash % hash->buckets; /* collision resolution using open addressing with linear probing */ while(hash->hash_table[position] != NULL) { - position = (position + 1) % hash->buckets; + position += stride; + if(position >= hash->buckets) { + position %= hash->buckets; + } } return position; @@ -96,7 +109,7 @@ static size_t get_hash_position(unsigned long name_hash, alpm_pkghash_t *hash) static alpm_pkghash_t *rehash(alpm_pkghash_t *oldhash) { alpm_pkghash_t *newhash; - size_t newsize, position, i; + unsigned int newsize, i; /* Hash tables will need resized in two cases: * - adding packages to the local database @@ -129,8 +142,7 @@ static alpm_pkghash_t *rehash(alpm_pkghash_t *oldhash) for(i = 0; i < oldhash->buckets; i++) { if(oldhash->hash_table[i] != NULL) { alpm_pkg_t *package = oldhash->hash_table[i]->data; - - position = get_hash_position(package->name_hash, newhash); + unsigned int position = get_hash_position(package->name_hash, newhash); newhash->hash_table[position] = oldhash->hash_table[i]; oldhash->hash_table[i] = NULL; @@ -144,16 +156,17 @@ static alpm_pkghash_t *rehash(alpm_pkghash_t *oldhash) return newhash; } -static alpm_pkghash_t *pkghash_add_pkg(alpm_pkghash_t *hash, alpm_pkg_t *pkg, int sorted) +static alpm_pkghash_t *pkghash_add_pkg(alpm_pkghash_t *hash, alpm_pkg_t *pkg, + int sorted) { alpm_list_t *ptr; - size_t position; + unsigned int position; if(pkg == NULL || hash == NULL) { return hash; } - if((hash->entries + 1) / MAX_HASH_LOAD > hash->buckets) { + if(hash->entries >= hash->limit) { hash = rehash(hash); } @@ -189,7 +202,8 @@ alpm_pkghash_t *_alpm_pkghash_add_sorted(alpm_pkghash_t *hash, alpm_pkg_t *pkg) return pkghash_add_pkg(hash, pkg, 1); } -static size_t move_one_entry(alpm_pkghash_t *hash, size_t start, size_t end) +static unsigned int move_one_entry(alpm_pkghash_t *hash, + unsigned int start, unsigned int end) { /* Iterate backwards from 'end' to 'start', seeing if any of the items * would hash to 'start'. If we find one, we move it there and break. If @@ -201,7 +215,7 @@ static size_t move_one_entry(alpm_pkghash_t *hash, size_t start, size_t end) while(end != start) { alpm_list_t *i = hash->hash_table[end]; alpm_pkg_t *info = i->data; - size_t new_position = get_hash_position(info->name_hash, hash); + unsigned int new_position = get_hash_position(info->name_hash, hash); if(new_position == start) { hash->hash_table[start] = i; @@ -212,7 +226,7 @@ static size_t move_one_entry(alpm_pkghash_t *hash, size_t start, size_t end) /* the odd math ensures we are always positive, e.g. * e.g. (0 - 1) % 47 == -1 * e.g. (47 + 0 - 1) % 47 == 46 */ - end = (hash->buckets + end - 1) % hash->buckets; + end = (hash->buckets + end - stride) % hash->buckets; } return end; } @@ -230,7 +244,7 @@ alpm_pkghash_t *_alpm_pkghash_remove(alpm_pkghash_t *hash, alpm_pkg_t *pkg, alpm_pkg_t **data) { alpm_list_t *i; - size_t position; + unsigned int position; if(data) { *data = NULL; @@ -246,7 +260,7 @@ alpm_pkghash_t *_alpm_pkghash_remove(alpm_pkghash_t *hash, alpm_pkg_t *pkg, if(info->name_hash == pkg->name_hash && strcmp(info->name, pkg->name) == 0) { - size_t stop, prev; + unsigned int stop, prev; /* remove from list and hash */ hash->list = alpm_list_remove_item(hash->list, i); @@ -260,11 +274,17 @@ alpm_pkghash_t *_alpm_pkghash_remove(alpm_pkghash_t *hash, alpm_pkg_t *pkg, /* Potentially move entries following removed entry to keep open * addressing collision resolution working. We start by finding the * next null bucket to know how far we have to look. */ - stop = (position + 1) % hash->buckets; + stop = position + stride; + if(stop >= hash->buckets) { + stop %= hash->buckets; + } while(hash->hash_table[stop] != NULL && stop != position) { - stop = (stop + 1) % hash->buckets; + stop += stride; + if(stop >= hash->buckets) { + stop %= hash->buckets; + } } - stop = (hash->buckets + stop - 1) % hash->buckets; + stop = (hash->buckets + stop - stride) % hash->buckets; /* We now search backwards from stop to position. If we find an * item that now hashes to position, we will move it, and then try @@ -277,7 +297,10 @@ alpm_pkghash_t *_alpm_pkghash_remove(alpm_pkghash_t *hash, alpm_pkg_t *pkg, return hash; } - position = (position + 1) % hash->buckets; + position += stride; + if(position >= hash->buckets) { + position %= hash->buckets; + } } return hash; @@ -285,8 +308,8 @@ alpm_pkghash_t *_alpm_pkghash_remove(alpm_pkghash_t *hash, alpm_pkg_t *pkg, void _alpm_pkghash_free(alpm_pkghash_t *hash) { - size_t i; if(hash != NULL) { + unsigned int i; for(i = 0; i < hash->buckets; i++) { free(hash->hash_table[i]); } @@ -299,7 +322,7 @@ alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name) { alpm_list_t *lp; unsigned long name_hash; - size_t position; + unsigned int position; if(name == NULL || hash == NULL) { return NULL; @@ -316,7 +339,10 @@ alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name) return info; } - position = (position + 1) % hash->buckets; + position += stride; + if(position >= hash->buckets) { + position %= hash->buckets; + } } return NULL; diff --git a/lib/libalpm/pkghash.h b/lib/libalpm/pkghash.h index edd500e..64a32b2 100644 --- a/lib/libalpm/pkghash.h +++ b/lib/libalpm/pkghash.h @@ -35,17 +35,19 @@ struct __alpm_pkghash_t { /** data held by the hash table */ alpm_list_t **hash_table; - /** number of buckets in hash table */ - size_t buckets; - /** number of entries in hash table */ - size_t entries; /** head node of the hash table data in normal list format */ alpm_list_t *list; + /** number of buckets in hash table */ + unsigned int buckets; + /** number of entries in hash table */ + unsigned int entries; + /** max number of entries before a resize is needed */ + unsigned int limit; }; typedef struct __alpm_pkghash_t alpm_pkghash_t; -alpm_pkghash_t *_alpm_pkghash_create(size_t size); +alpm_pkghash_t *_alpm_pkghash_create(unsigned int size); alpm_pkghash_t *_alpm_pkghash_add(alpm_pkghash_t *hash, alpm_pkg_t *pkg); alpm_pkghash_t *_alpm_pkghash_add_sorted(alpm_pkghash_t *hash, alpm_pkg_t *pkg); @@ -55,6 +57,4 @@ void _alpm_pkghash_free(alpm_pkghash_t *hash); alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name); -#define MAX_HASH_LOAD 0.7 - #endif /* _ALPM_PKGHASH_H */ -- 1.7.8.1

1 0

[pacman-dev] [PATCH 1/6] Simplify hash function to a single multiplication
by Dan McGee 02 Jan '12

02 Jan '12

More than likely the compiler will do the three operation breakdown we had here before (2 shifts + subtraction), but let the compiler do the optimizations and make the actual operation more obvious. This actually slightly shrinks the function binary size, likely due to instruction reordering or something. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- 2^6 + 2^16 - 1 lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index fc0e056..2cce824 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1145,7 +1145,7 @@ unsigned long _alpm_hash_sdbm(const char *str) return hash; } while((c = *str++)) { - hash = c + (hash << 6) + (hash << 16) - hash; + hash = c + hash * 65599; } return hash; -- 1.7.8.1

4 9

[pacman-dev] [PATCH] be_package.c: fix compiler warning
by Allan McRae 02 Jan '12

02 Jan '12

be_package.c: In function 'parse_descfile': be_package.c:181:28: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] ptr - key + 2 is guaranteed to be > 0 so we can cast to size_t Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I did reply to the patch email about this... lib/libalpm/be_package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c602996..fccbb10 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -178,7 +178,7 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * /* line is always in this format: "key = value" * we can be sure the " = " exists, so look for that */ ptr = memchr(key, ' ', len); - if(!ptr || ptr - key + 2 > len || memcmp(ptr, " = ", 3) != 0) { + if(!ptr || (size_t)(ptr - key + 2) > len || memcmp(ptr, " = ", 3) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s: syntax error in description file line %d\n", newpkg->name ? newpkg->name : "error", linenum); -- 1.7.8.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-104-gb264fb9
by dan＠archlinux.org 29 Dec '11

29 Dec '11

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 b264fb9e9ddcc31dc8782390309421965e507383 (commit) via 1b461374264abd62c54133e544dedd5feb866043 (commit) via a77e638c773d8a492f8c48e8c15474030a7e3d71 (commit) via cd75ae46ab10fe295c5a3d3054a3b17eff31122a (commit) via c34b69b5c7aa86fe76f90577195d13bbcf300658 (commit) via 38143770a9a1b4b88503fc7b1b9098a5957e0f4e (commit) via 5b749eeee999b5b332ad7545688297a37542b9a5 (commit) via aac639351f1eb56c1f8f6f19bfe438400a02c614 (commit) via a7cb1509317e929043df973a9814145fecc99513 (commit) via e28f321a486a310aeb3358ceff032793a88e5eb4 (commit) via bec0b0c8234e9fafbf442c4eb18f92e984ee2516 (commit) via 6b29374a60e1568ba626b88ca1b1da915ca0a438 (commit) via 92216c5864efccacf2daa3f4f15de3bb479054bb (commit) via d95c04945fc85bcc584026f7fded57dc8724ba6a (commit) from 7b2f68cc21df469342cb1caa7ec8fb27005cd2dd (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 b264fb9e9ddcc31dc8782390309421965e507383 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 25 19:58:31 2011 +1000 makepkg: calculate exact total file size The current calculation of the total file size for a package using "du" suffers from issues in portability and correctness. Especially on btrfs, this can result in clearly wrong package information such as: Download Size : 14684.29 KiB Installed Size : 7628.00 KiB Use an approach based on "stat" to calculate total file size. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b461374264abd62c54133e544dedd5feb866043 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 22 16:51:22 2011 +1000 makepkg: Use SKIP in checksum to skip integrity check Using the value of "SKIP" in the checksum array will cause that integrity check to be skipped. This makes building packages that rely on user configurable sources less painful. Based-on-patch-by: Dan McGee <dan(a)archlinux.org> Based-on-patch-by: David Campbell <davekong(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a77e638c773d8a492f8c48e8c15474030a7e3d71 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Mon Dec 12 22:36:57 2011 +0100 contrib/*: Support the "--help" and "--version" options Add "--help"/"-h" and "--version"/"-V" support to all contrib scripts. Also, update scripts that used "-v" as a short option for "--version" and use "-V" for the sake of consistency. Additionally: * Move version and usage messages to separate convenience functions in all scripts. * Add a workaround to paccache to support "--help" and "--version". This should be replaced by a proper POSIX-compliant command line parser that supports long options in a future patch. * Add a "$myver" variable to all scripts and use it whenever we refer to the program version (e.g. in version messages). Also, use the pacman version number everywhere instead of using a different versioning scheme for each contrib script. This is achieved by adding a "PACKAGE_VERSION" placeholder that is replaced by sed(1) when the script is built. * Ensure we always return with exit status 0 if "--help" is used and return with exit status 1 if we display the usage message due to invalid arguments. * Add "AUTOMAKE_OPTIONS = std-options" and add all scripts to "bin_SCRIPTS" to make `make installcheck` check that installed scripts actually support the "--help" and "--version" options. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cd75ae46ab10fe295c5a3d3054a3b17eff31122a Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Mon Dec 12 22:36:56 2011 +0100 Makefile.am: Extract "contrib/" into DIST_SUBDIRS This implies following changes: * contrib scripts can be built and installed easily by running make(1) in "contrib/". This removes the need to pick all contrib scripts manually when packaging pacman-contrib. * contrib scripts will no longer be built when running make(1) in the top level source directory. This seems like the most natural approach. We install those separately and should act the same when building stuff. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c34b69b5c7aa86fe76f90577195d13bbcf300658 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 23 14:47:30 2011 -0600 Convert strtrim/strlen paired calls to only strtrim This utilizes the new return value so we don't have to find the length of the string again. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 38143770a9a1b4b88503fc7b1b9098a5957e0f4e Merge: aac6393 5b749ee Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 23 14:40:59 2011 -0600 Merge branch 'maint' commit aac639351f1eb56c1f8f6f19bfe438400a02c614 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 23 14:33:26 2011 -0600 Remove strtrim function from backend The last user of this was the code in the backend for loading packages, but this no longer uses it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7cb1509317e929043df973a9814145fecc99513 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 23 14:32:01 2011 -0600 be_package: be more explicit parsing key/value pairs This eliminates the need for strtrim() usage completely, instead relying on the fact that the only allowed delimiter between key and value is the " = " string. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e28f321a486a310aeb3358ceff032793a88e5eb4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Dec 23 12:02:49 2011 -0500 pactree: cleanup register_syncs - take advantage of the new strtrim return value - tighten scope on line pointer Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit bec0b0c8234e9fafbf442c4eb18f92e984ee2516 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Dec 23 11:57:19 2011 -0500 pactree: update with new strtrim function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6b29374a60e1568ba626b88ca1b1da915ca0a438 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 23 10:12:08 2011 -0600 Rework package removal code Extract the actual unlinking of files into a new method, which eliminates a goto used for flow control. Also fix up a few small issues in the code: * Unnecessary (unsigned long) cast, use '%zd' instead * Total up errors returned from unlink_file calls and return to caller * Be consistent with scriptlets- we run pre_remove on dbonly, so we should also run post_remove. Both can be disabled by way of the --noscriptlet argument. * Don't pass an invalid pointer to oldpkg to the event callbacks; instead call the callback before we free the object. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 92216c5864efccacf2daa3f4f15de3bb479054bb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Dec 22 08:52:08 2011 -0500 pacman/util: return size_t from strtrim Instead of returning the same value as the parameter to this function, return the length of the string, which can be useful to the caller when its non-zero (e.g. to find the end of the string). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 +- configure.ac | 1 - contrib/Makefile.am | 14 ++++++ contrib/bacman.in | 18 +++++---- contrib/paccache.in | 20 ++++++++- contrib/pacdiff.in | 12 +++++- contrib/paclist.in | 21 +++++++++- contrib/paclog-pkglist.in | 19 +++++++- contrib/pacscripts.in | 10 ++++- contrib/pacsearch.in | 20 +++++++-- contrib/pacsysclean.in | 13 +++++- doc/PKGBUILD.5.txt | 7 ++- lib/libalpm/be_package.c | 21 +++++---- lib/libalpm/remove.c | 99 ++++++++++++++++++++++++-------------------- lib/libalpm/util.c | 41 ------------------ lib/libalpm/util.h | 1 - scripts/Makefile.am | 1 - scripts/makepkg.sh.in | 21 +++++---- scripts/pacman-key.sh.in | 6 +- src/pacman/conf.c | 11 +++-- src/pacman/util.c | 36 +++++++++-------- src/pacman/util.h | 2 +- src/util/pactree.c | 33 ++++++++------- 23 files changed, 254 insertions(+), 177 deletions(-) hooks/post-receive -- The official pacman repository

1 0