August 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacsysclean: Add new contrib script
by Eric Bélanger 17 Nov '11

17 Nov '11

pacsysclean sort installed packages by decreasing installed size. It's useful for finding large unused package when doing system clean-up. This script is an improved version of other similar scripts posted on the forums. Thanks goes to Dave as I reused the size_to_human function from his paccache script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- If you can think of a better name, feel free to suggest one. --- contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/pacsysclean.in | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 1bd145f..19b81e0 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -6,5 +6,6 @@ paclist paclog-pkglist pacscripts pacsearch +pacsysclean wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 10b03a2..754096d 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,7 +5,8 @@ OURSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ - pacsearch + pacsearch \ + pacsysclean OURFILES = \ bash_completion \ @@ -21,6 +22,7 @@ EXTRA_DIST = \ paclist.in \ pacscripts.in \ pacsearch.in \ + pacsysclean.in \ vimprojects \ zsh_completion.in \ README @@ -59,6 +61,7 @@ paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in +pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in zsh_completion: $(srcdir)/zsh_completion.in diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in new file mode 100755 index 0000000..e393e24 --- /dev/null +++ b/contrib/pacsysclean.in @@ -0,0 +1,87 @@ +#!/bin/bash + +# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# +# Copyright (C) 2011 Eric Bélanger <eric(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/>. + +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' + +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } +fi + +usage() { + echo "$0 - Sort installed packages by decreasing installed size." + echo + echo "Usage: $0 [options]" + echo + echo "Options:" + echo " -a List all packages (Default)" + echo " -e List unrequired explicitely installed packages" + echo " -h, --help Show this help message and exit" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +PACMAN_OPTS="-Qq" +if [ -n "$1" ]; then + case "$1" in + -a) PACMAN_OPTS="-Qq" ;; + -e) PACMAN_OPTS="-Qetq" ;; + -h|--help) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +fi + +TEMPDIR=$(mktemp -d /tmp/cleanup-script.XXXX) +cd $TEMPDIR + +# Sort installed packages by decreasing installed size. Useful for system clean-up. +for package in $(pacman $PACMAN_OPTS); do + echo $(pacman -Qi $package |grep 'Installed Size' |awk '{print $4}') $package +done | sort -g -r -o raw.txt + +N=0 +while read LINE ; do + N=$((N+1)) + size_to_human $(echo -n $LINE |cut -d' ' -f1) >> sorted-list.txt + echo -n ' : ' >> sorted-list.txt + echo -n $LINE |cut -d' ' -f2 >> sorted-list.txt +done < raw.txt + +echo "Files saved to $TEMPDIR" -- 1.7.6

3 10

[pacman-dev] Examples in the manpages
by Nico Schottelius 04 Oct '11

04 Oct '11

Dear pacman-devs, after a funny replace pacman-with-pacman-git evening, I digged around a bit into makepkg and pacman and noticed there are no examples in the manpages. Is that intented or would you like to/accept patches which add the EXAMPLES section? Cheers, Nico -- New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0 Please resign, if you signed 9885188C or 8D0E27A4. Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...

13 47

[pacman-dev] [PATCH 0/3] Add --verifylvl option to pacman
by Pang Yan Han 30 Aug '11

30 Aug '11

This is a reroll of a series to add the --verifylvl option to pacman, taking into account of the recent changes in libalpm. The --verifylvl option can be used to change pacman's signature verification level to one of "always", "optional", or "never". Patch 1/3 changes option_verifysig to accept non-capitalized versions of "Always", "Optional" and "Never". Patch 2/3 adds the --verifylvl to pacman. Patch 3/3 adds the "VerifySig" option to etc/pacman.conf.in Pang Yan Han (3): option_verifysig: Accept non-caps sig levels pacman: Add --verifylvl option etc/pacman.conf.in : Add VerifySig option doc/pacman.8.txt | 7 +++++++ etc/pacman.conf.in | 1 + src/pacman/conf.c | 15 ++++++++++++--- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 6 ++++++ 5 files changed, 29 insertions(+), 4 deletions(-) -- 1.7.6.rc0

3 6

[pacman-dev] [PATCH v2] Improve advice for sync ops when db.lck is present
by Pang Yan Han 30 Aug '11

30 Aug '11

When the database is locked, sync operations involving transactions, such as pacman -Syy, show the following: :: Synchronizing package databases... error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community (unable to lock database) error: failed to update multilib (unable to lock database) error: failed to synchronize any databases Whereas pacman -U <pkg> shows: error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck Which is much more meaningful, since the presence of db.lck may indicate an erroneous lockfile instead of an ongoing transaction. Improve the error messages for sync operations by advising the user to remove db.lck if he is sure that no package manager is running. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- src/pacman/sync.c | 1 + src/pacman/util.c | 22 +++++++++++++--------- src/pacman/util.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e97da37..d553ba0 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -304,6 +304,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) */ if(!success) { pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to synchronize any databases\n")); + trans_init_error(); } return (success > 0); } diff --git a/src/pacman/util.c b/src/pacman/util.c index 47fbaeb..599c18c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -63,20 +63,24 @@ int trans_init(alpm_transflag_t flags, int check_valid) } if(ret == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); - pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), - alpm_strerror(err)); - if(err == ALPM_ERR_HANDLE_LOCK) { - fprintf(stderr, _(" if you're sure a package manager is not already\n" - " running, you can remove %s\n"), - alpm_option_get_lockfile(config->handle)); - } - + trans_init_error(); return -1; } return 0; } +void trans_init_error(void) +{ + enum _alpm_errno_t err = alpm_errno(config->handle); + pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), + alpm_strerror(err)); + if(err == ALPM_ERR_HANDLE_LOCK) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), + alpm_option_get_lockfile(config->handle)); + } +} + int trans_release(void) { if(alpm_trans_release(config->handle) == -1) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 6669847..6a26b08 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -39,6 +39,7 @@ /* update speed for the fill_progress based functions */ #define UPDATE_SPEED_SEC 0.2f +void trans_init_error(void); int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); int needs_root(void); -- 1.7.6.1.385.gb7fcd0

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-132-g234b6ff
by dan＠archlinux.org 30 Aug '11

30 Aug '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 234b6ffc2c39268d1efdc414e02bc4b352e5d931 (commit) via d74dad79b7770725090e1eb2a015cbd6f88aed66 (commit) via 515720a6fcc54c35420b5b5cf9258c8f2b5dc01b (commit) via 8129b93afe13a6546f46c6615c316ed85f341191 (commit) via e3676ae7b51fdaa68fcf2923c19681ec7d6f3952 (commit) via 499e09734bc6f4a121b3363d88aeb085bcfd9ce9 (commit) via b3c0ae5205ee9615af077ff00b1a01be3aab4eb6 (commit) via 7480df68ce7fe60e93dd833faf83dd5f2d6149c1 (commit) from f46db04f98cb63b48208026865943e42e7ece2f4 (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 234b6ffc2c39268d1efdc414e02bc4b352e5d931 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 12:12:54 2011 -0500 Parse > 2GiB file sizes correctly We were using atol(), which on 32 bit, cannot handle values greater than 2GiB, which is fail. Switch to a strtoull() wrapper function tailored toward parsing off_t values. This allows parsing of very large positive integer values. off_t is a signed type, but in our usages, we never parse or have a need for negative values, so the function will return -1 on error. Before: $ pacman -Si flightgear-data | grep Size Download Size : 2097152.00 K Installed Size : 2097152.00 K After: $ ./src/pacman/pacman -Si flightgear-data | grep Size Download Size : 2312592.52 KiB Installed Size : 5402896.00 KiB Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d74dad79b7770725090e1eb2a015cbd6f88aed66 Author: Helder Martins <heldermartins89(a)gmail.com> Date: Mon Aug 29 22:07:26 2011 +0100 lib/libalpm/handle.c: Removed redundant if condition Signed-off-by: Helder Martins <heldermartins89(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 515720a6fcc54c35420b5b5cf9258c8f2b5dc01b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 16:23:06 2011 -0500 Ensure progress callback updates if XX/YY numerator changes We only updated if the percentage incremented and enough time had elapsed, even though the numerator of the current/howmany fraction may have changed. Ensure we proceed with the progress bar update in these cases so as to not mislead the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8129b93afe13a6546f46c6615c316ed85f341191 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 10:52:12 2011 -0500 pacman-key: fix broken logic around updating trust database Any option that flips UPDATEDB=1 doesn't work right now due to what we thought was a good idea in commit cab1379a1ab14. Fix this by not including the update operation in the option count and special casing it where necessary. Also, bring back the helpful "Updating trust database" message. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3676ae7b51fdaa68fcf2923c19681ec7d6f3952 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 29 21:28:22 2011 +1000 Run pacman test-suite with LC_ALL=C Running the pacman test-suite in a non-English locale results in a few failures. Force the test-suite to run with LC_ALL=C. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 499e09734bc6f4a121b3363d88aeb085bcfd9ce9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:29:53 2011 -0500 Streamline alpm_splitdep() comparisons This reduces from 5 to 3 the number of searches needed on the string looking for a comparison operator, since we can so a second quick comparison looking for '=' if we find '<' or '>'. It also makes every search doable with strchr() or memchr() rather than the slower strstr() method. In testing, only 10% of splitdep calls (~1600 / 16000) during an -Ss database load found a version comparison operator, so optimizing the not found path to be require less work makes sense. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b3c0ae5205ee9615af077ff00b1a01be3aab4eb6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 29 20:46:28 2011 -0400 pacsort: use boolean, not binary OR operation Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7480df68ce7fe60e93dd833faf83dd5f2d6149c1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 07:48:59 2011 -0500 Rework scriptlet tests to not depend on pacman output This actually does something in a scriptlet we can check with our normal set of rules, rather than relying on pacman debug output. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- lib/libalpm/be_local.c | 4 ++-- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/delta.c | 2 +- lib/libalpm/deps.c | 32 +++++++++++++++++++------------- lib/libalpm/handle.c | 7 +++---- lib/libalpm/util.c | 25 +++++++++++++++++++++++++ lib/libalpm/util.h | 1 + scripts/pacman-key.sh.in | 14 ++++++++++---- src/pacman/callback.c | 13 ++++++++----- src/util/pacsort.c | 2 +- test/pacman/tests/scriptlet001.py | 13 +++++-------- test/pacman/tests/scriptlet002.py | 13 +++++-------- 14 files changed, 84 insertions(+), 50 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] lib/libalpm/handle.c: Removed redudant if condition
by Helder Martins 29 Aug '11

29 Aug '11

Removed redudant if condition in lib/libalpm/handle.c, _alpm_handle_unlock() Signed-off-by: Helder Martins <heldermartins89(a)gmail.com> --- lib/libalpm/handle.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 266b4bc..b9d71db 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -132,10 +132,9 @@ int _alpm_handle_unlock(alpm_handle_t *handle) ASSERT(handle->lockfile != NULL, return -1); ASSERT(handle->lckstream != NULL, return 0); - if(handle->lckstream != NULL) { - fclose(handle->lckstream); - handle->lckstream = NULL; - } + fclose(handle->lckstream); + handle->lckstream = NULL; + if(unlink(handle->lockfile) && errno != ENOENT) { return -1; } -- 1.7.6.1

2 1

[pacman-dev] [PATCH 1/2] Ensure progress callback updates if XX/YY numerator changes
by Dan McGee 29 Aug '11

29 Aug '11

We only updated if the percentage incremented and enough time had elapsed, even though the numerator of the current/howmany fraction may have changed. Ensure we proceed with the progress bar update in these cases so as to not mislead the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 04b3a52..e832b49 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -43,9 +43,6 @@ static off_t list_xfered = 0.0; static off_t list_total = 0.0; static struct timeval initial_time; -/* transaction progress bar */ -static int prevpercent = 0; /* for less progressbar output */ - /* delayed output during progress bar */ static int on_progress = 0; static alpm_list_t *output = NULL; @@ -349,6 +346,8 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, size_t howmany, size_t current) { + static int prevpercent; + static size_t prevcurrent; /* size of line to allocate for text printing (e.g. not progressbar) */ int infolen; int digits, textlen; @@ -373,14 +372,18 @@ void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, return; } } else { - if(!pkgname || percent == prevpercent || get_update_timediff(0) < UPDATE_SPEED_SEC) { + if(current != prevcurrent) { + /* update always */ + } else if(!pkgname || percent == prevpercent || + get_update_timediff(0) < UPDATE_SPEED_SEC) { /* only update the progress bar when we have a package name, the - * percentage has changed, and it has been long enough. */ + * percentage has changed, and it has been long enough. */ return; } } prevpercent = percent; + prevcurrent = current; /* set text of message to display */ switch (event) { -- 1.7.6.1

1 1

[pacman-dev] Possible redudant condition in handle.c
by Helder Martins 29 Aug '11

29 Aug '11

Hi. I saw this little piece of code in handle.c in libpalm, starts at line 130: ASSERT(handle->lockfile != NULL, return -1); -> ASSERT(handle->lckstream != NULL, return 0); -> if(handle->lckstream != NULL) { fclose(handle->lckstream); handle->lckstream = NULL; } So i was wondering if that assert or the if condition are redundant, and if yes which one has the correct behaviour for the objective of this function. I can provide the patch once i know which one is the correct behaviour. Thanks, Helder Martins

2 2

[pacman-dev] [PATCH] Parse > 2GiB file sizes correctly
by Dan McGee 29 Aug '11

29 Aug '11

We were using atol(), which on 32 bit, cannot handle values greater than 2GiB, which is fail. Switch to a strtoull() wrapper function tailored toward parsing off_t values. This allows parsing of very large positive integer values. off_t is a signed type, but in our usages, we never parse or have a need for negative values, so the function will return -1 on error. Before: $ pacman -Si flightgear-data | grep Size Download Size : 2097152.00 K Installed Size : 2097152.00 K After: $ ./src/pacman/pacman -Si flightgear-data | grep Size Download Size : 2312592.52 KiB Installed Size : 5402896.00 KiB Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 4 ++-- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/delta.c | 2 +- lib/libalpm/util.c | 25 +++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index be02bb5..dc9e361 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -619,7 +619,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) READ_AND_STORE(info->packager); } else if(strcmp(line, "%REASON%") == 0) { READ_NEXT(); - info->reason = (alpm_pkgreason_t)atol(line); + info->reason = (alpm_pkgreason_t)atoi(line); } else if(strcmp(line, "%SIZE%") == 0) { /* NOTE: the CSIZE and SIZE fields both share the "size" field * in the pkginfo_t struct. This can be done b/c CSIZE @@ -627,7 +627,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) * only used in local databases. */ READ_NEXT(); - info->size = atol(line); + info->size = _alpm_strtoofft(line); /* also store this value to isize */ info->isize = info->size; } else if(strcmp(line, "%REPLACES%") == 0) { diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 0e58d20..98a1240 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -187,7 +187,7 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * STRDUP(newpkg->arch, ptr, return -1); } else if(strcmp(key, "size") == 0) { /* size in the raw package is uncompressed (installed) size */ - newpkg->isize = atol(ptr); + newpkg->isize = _alpm_strtoofft(ptr); } else if(strcmp(key, "depend") == 0) { alpm_depend_t *dep = _alpm_splitdep(ptr); newpkg->depends = alpm_list_add(newpkg->depends, dep); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 12d5b7f..982d355 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -566,14 +566,14 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, * in sync databases, and SIZE is only used in local databases. */ READ_NEXT(); - pkg->size = atol(line); + pkg->size = _alpm_strtoofft(line); /* also store this value to isize if isize is unset */ if(pkg->isize == 0) { pkg->isize = pkg->size; } } else if(strcmp(line, "%ISIZE%") == 0) { READ_NEXT(); - pkg->isize = atol(line); + pkg->isize = _alpm_strtoofft(line); } else if(strcmp(line, "%MD5SUM%") == 0) { READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%SHA256SUM%") == 0) { diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 1b7e3ee..c88955f 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -299,7 +299,7 @@ alpm_delta_t *_alpm_delta_parse(char *line) tmp2 = tmp; tmp = strchr(tmp, ' '); *(tmp++) = '\0'; - delta->delta_size = atol(tmp2); + delta->delta_size = _alpm_strtoofft(tmp2); tmp2 = tmp; tmp = strchr(tmp, ' '); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 98eaa17..4cb31a8 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1074,6 +1074,31 @@ unsigned long _alpm_hash_sdbm(const char *str) return hash; } +off_t _alpm_strtoofft(const char *line) +{ + char *end; + unsigned long long result; + errno = 0; + + /* we are trying to parse bare numbers only, no leading anything */ + if(line[0] < '1' || line[0] > '9') { + return (off_t)-1; + } + result = strtoull(line, &end, 10); + if (result == 0 && end == line) { + /* line was not a number */ + return (off_t)-1; + } else if (result == ULLONG_MAX && errno == ERANGE) { + /* line does not fit in unsigned long long */ + return (off_t)-1; + } else if (*end) { + /* line began with a number but has junk left over at the end */ + return (off_t)-1; + } + + return (off_t)result; +} + long _alpm_parsedate(const char *line) { if(isalpha((unsigned char)line[0])) { diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 921ed45..c5544a0 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -119,6 +119,7 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b); int _alpm_splitname(const char *target, char **name, char **version, unsigned long *name_hash); unsigned long _alpm_hash_sdbm(const char *str); +off_t _alpm_strtoofft(const char *line); long _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); -- 1.7.6.1

1 0

[pacman-dev] [PATCH] pacman-key: fix broken logic around updating trust database
by Dan McGee 29 Aug '11

29 Aug '11

Any option that flips UPDATEDB=1 doesn't work right now due to what we thought was a good idea in commit cab1379a1ab14. Fix this by not including the update operation in the option count and special casing it where necessary. Also, bring back the helpful "Updating trust database" message. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Allan broke it! :) But in all seriousness, this code is getting a bit hacky/dirty, so open to other suggestions if we can clean anything up. scripts/pacman-key.sh.in | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 1bac3d3..0b46b10 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -419,13 +419,16 @@ PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" || echo " GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) # check only a single operation has been given +# don't include UPDATEDB in here as other opts can induce it numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + - INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + UPDATEDB + VERIFY )) + INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + VERIFY )) case $numopt in 0) - error "$(gettext "no operation specified (use -h for help)")" - exit 1 + if (( ! UPDATEDB )); then + error "$(gettext "no operation specified (use -h for help)")" + exit 1 + fi ;; [!1]) error "$(gettext "Multiple operations specified")" @@ -450,6 +453,9 @@ esac (( RECEIVE )) && receive_keys (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE -(( UPDATEDB )) && "${GPG_PACMAN[@]}" --batch --check-trustdb +if (( UPDATEDB )); then + msg "$(gettext "Updating trust database...")" + "${GPG_PACMAN[@]}" --batch --check-trustdb +fi # vim: set ts=2 sw=2 noet: -- 1.7.6.1

1 0