January 2012 - Pacman-dev - lists.archlinux.org

[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