- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] Store a package info level flag if we fail to load data
by Dan McGee 29 Jul '11

29 Jul '11

If we are missing a local database file, we get repeated messages over and over telling us the same thing, rather than being sane and erroring only once. This package adds an INFRQ_ERROR level that is added to the mask if we encounter any errors on a local_db_read() operation, and short circuits future calls if found in the value. This fixes FS#25313. Note that this does not make any behavior changes other than suppressing error messages and repeated code calls to failure cases; we still have more to do in the "local database is hosed" department. Also make a small update to the wrong but unused flags set in be_package; using INFRQ_ALL there was not totally correct. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 14 +++++++++++--- lib/libalpm/be_package.c | 4 ++-- lib/libalpm/db.h | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 261ad87..73b533f 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -533,6 +533,13 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) /* already loaded all of this info, do nothing */ return 0; } + + if(info->infolevel & INFRQ_ERROR) { + /* We've encountered an error loading this package before. Don't attempt + * repeated reloads, just give up. */ + return -1; + } + _alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", info->name, inforeq); @@ -619,6 +626,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } fclose(fp); fp = NULL; + info->infolevel |= INFRQ_DESC; } /* FILES */ @@ -673,6 +681,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } fclose(fp); fp = NULL; + info->infolevel |= INFRQ_FILES; } /* INSTALL */ @@ -681,15 +690,14 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) if(access(path, F_OK) == 0) { info->scriptlet = 1; } + info->infolevel |= INFRQ_SCRIPTLET; } - /* internal */ - info->infolevel |= inforeq; - free(pkgpath); return 0; error: + info->infolevel |= INFRQ_ERROR; free(pkgpath); if(fp) { fclose(fp); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 0edaa5a..550f303 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -437,9 +437,9 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, _alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); newpkg->files.files = files_msort(files, files_count); newpkg->files.count = files_count; - newpkg->infolevel = INFRQ_ALL; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES | INFRQ_SCRIPTLET; } else { - newpkg->infolevel = INFRQ_BASE | INFRQ_DESC; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET; } return newpkg; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5c7988b..a09c7e2 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -40,7 +40,8 @@ typedef enum _alpm_dbinfrq_t { INFRQ_SCRIPTLET = (1 << 3), INFRQ_DSIZE = (1 << 4), /* ALL should be info stored in the package or database */ - INFRQ_ALL = 0x1F + INFRQ_ALL = 0x1F, + INFRQ_ERROR = (1 << 31) } alpm_dbinfrq_t; /** Database status. Bitflags. */ -- 1.7.6

1 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-518-g804e250
by dan＠archlinux.org 27 Jul '11

27 Jul '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 804e2505cf4474791537a9f0ae8e9b6c274cb0c2 (commit) via c5d4c92ad411998b9d47d7bf89d84af547117be4 (commit) via d9875c5e6cbc0b59a4ba7c56e974da3d138f235d (commit) via 49d9426b6a3e6a019a0973ec73b0ff6cf402fa89 (commit) via 2b3405e01ba756a48ff374bf632f525ad44c47c1 (commit) via 94f61c5b29274df164b01105165945e445289ae7 (commit) via 9929a34a6d493c94bd176b66198bdbd734678043 (commit) via ccdb2fa800f3e89641d371056961fa1d654f363d (commit) via 03447ce39cd6a3adb7a56bb978368a5f11659374 (commit) via a7940e7419a6fb39eeafb0bfd053b90a64946d5c (commit) via 819f6750047cbdb7ecb7fa4724f90e532cd73446 (commit) via 00949db191d0f31add4919ae56ebdfef9813a90e (commit) via 06974ebf2f6674baf01da79be9658277cbf2650e (commit) from 98073afe5527aa8a08c7119b61d0251250168e82 (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 804e2505cf4474791537a9f0ae8e9b6c274cb0c2 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue Jul 19 20:52:07 2011 +0800 pacman-key: Add --import and --import-trustdb Currently, pacman-key allows the user to import their keys using the --add option. However, no similar functionality exists for importing ownertrust values. The --import-trustdb option takes a list of directories and imports ownertrust values if the directories have a trustdb.gpg database. The --import option takes a list of directories and imports keys from pubring.gpg and ownertrust values from trustdb.gpg. Think of it as a combination of --add and --import-trustdb Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5d4c92ad411998b9d47d7bf89d84af547117be4 Author: DJ Mills <danielmills1(a)gmail.com> Date: Wed Jul 20 14:28:39 2011 +1000 pacman-key: change GPG_PACMAN and GPG_NOKEYRING to arrays Allows the commands to safely handle any possible arguments Signed-off-by: DJ Mills <danielmills1(a)gmail.com> Allan: rebase patch Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9875c5e6cbc0b59a4ba7c56e974da3d138f235d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 20 14:19:53 2011 +1000 pacman-key: fix syntax error in -r arg parsing Previous fix did not work... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49d9426b6a3e6a019a0973ec73b0ff6cf402fa89 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 19:58:54 2011 +1000 makepkg: refactor checking source integrity Move the source integrity checking into its own function as the code was duplicated and is now more complicated with the separation of the two checks types. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2b3405e01ba756a48ff374bf632f525ad44c47c1 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 16 22:42:32 2011 +1000 makepkg: more control of skipping integrity checks Allows the skipping of all integrity checks (checksum and PGP) or either the checksum or PGP checks individually. Original-patch-by: Wieland Hoffman <theminew(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 94f61c5b29274df164b01105165945e445289ae7 Author: Wieland Hoffmann <themineo(a)googlemail.com> Date: Wed Jul 6 13:02:19 2011 +0200 makepkg: Add support for verifying pgp signatures Many projects provide signature files along with the source code archives. It's good to check these, too, when verifying the integrity of source code archives. Not everybody is using gpg so the verification can be disabled with --skippgpcheck. Additionally, only a warning is displayed when the key that signed the source file is unknown. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9929a34a6d493c94bd176b66198bdbd734678043 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 12:12:18 2011 -0500 Remove duplicate code shared between sync and upgrade Pacman did a great job of having almost (but not quite) duplicate code paths through the sync and upgrade code. We can use the same logic in both upgrade in sync once the targets are resolved, so extract a function and delete a bunch of code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccdb2fa800f3e89641d371056961fa1d654f363d Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 21:42:53 2011 +1000 makepkg: get package version with overrides When epoch, pkgver and/or pkgrel were overridden in a split package function, makepkg failed hard finding the real version for checking if packages were already built or trying to install packages. Fix the get_full_version function to deal with overrides and return the actual package version. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03447ce39cd6a3adb7a56bb978368a5f11659374 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 20:08:39 2011 +1000 makepkg: allow epoch to be overridden We can override pkgver and pkgrel so it is only logical to add epoch to that list Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7940e7419a6fb39eeafb0bfd053b90a64946d5c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 19:47:07 2011 +1000 makepkg: check arch overrides for required architecture Check any overrides of the "arch" variable contain the required architecture. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 819f6750047cbdb7ecb7fa4724f90e532cd73446 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 16:30:41 2011 +1000 makepkg: check overrides for pkgrel and pkgver Enforce syntax checking for pkgrel and pkgver overrides in package functions. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 00949db191d0f31add4919ae56ebdfef9813a90e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 22 12:37:25 2011 +1000 makepkg: pkgver and pkgrel can not have whitespace There is always someone who tries to break things (cough *Dave* cough...) Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06974ebf2f6674baf01da79be9658277cbf2650e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 27 12:44:17 2011 -0500 contrib/pacsearch: skip non-matching lines This prevents some perl errors from popping up when pacman prints error or warning messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsearch.in | 2 + doc/PKGBUILD.5.txt | 2 +- doc/makepkg.8.txt | 8 ++- doc/pacman-key.8.txt | 7 ++ proto/PKGBUILD-split.proto | 1 + scripts/makepkg.sh.in | 239 ++++++++++++++++++++++++++++++++++---------- scripts/pacman-key.sh.in | 93 ++++++++++++----- src/pacman/pacman.h | 1 + src/pacman/sync.c | 19 ++-- src/pacman/upgrade.c | 114 +-------------------- 10 files changed, 287 insertions(+), 199 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix group selection entry for large inputs
by Dan McGee 25 Jul '11

25 Jul '11

Hardcoding anything always ends up burning you, and the arbitrary length of 64 here did just that. Add the ability to reallocate the readline buffer for longer inputs if necessary, and add other error checking as approprate. This also plugs one small memory leak of the group processing code selection array. Addresses FS#24253. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 11 ++++++++++- src/pacman/util.c | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index c56934b..6962306 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -644,7 +644,15 @@ static int process_group(alpm_list_t *dbs, char *group) group); select_display(pkgs); char *array = malloc(count); - multiselect_question(array, count); + if(!array) { + ret = 1; + goto cleanup; + } + if(multiselect_question(array, count)) { + ret = 1; + free(array); + goto cleanup; + } int n = 0; for(i = pkgs; i; i = alpm_list_next(i)) { if(array[n++] == 0) @@ -657,6 +665,7 @@ static int process_group(alpm_list_t *dbs, char *group) goto cleanup; } } + free(array); } else { for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); diff --git a/src/pacman/util.c b/src/pacman/util.c index f695ffb..53dbd63 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -796,8 +796,9 @@ static int multiselect_parse(char *array, int count, char *response) int multiselect_question(char *array, int count) { - char response[64]; + char *response, *lastchar; FILE *stream; + size_t response_len = 64; if(config->noconfirm) { stream = stdout; @@ -806,19 +807,45 @@ int multiselect_question(char *array, int count) stream = stderr; } + response = malloc(response_len); + if(!response) { + return -1; + } + lastchar = response + response_len - 1; + /* sentinel byte to later see if we filled up the entire string */ + *lastchar = 1; + while(1) { memset(array, 1, count); fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); fprintf(stream, ": "); + fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; } - if(fgets(response, sizeof(response), stdin)) { + if(fgets(response, response_len, stdin)) { + const size_t response_incr = 64; + /* handle buffer not being large enough to read full line case */ + while(*lastchar == '\0' && lastchar[-1] != '\n') { + response_len += response_incr; + response = realloc(response, response_len); + if(!response) { + return -1; + } + lastchar = response + response_len - 1; + /* sentinel byte */ + *lastchar = 1; + if(fgets(response + response_len - response_incr - 1, + response_incr + 1, stdin) == 0) { + free(response); + return -1; + } + } strtrim(response); if(strlen(response) > 0) { if(multiselect_parse(array, count, response) == -1) { @@ -826,9 +853,14 @@ int multiselect_question(char *array, int count) continue; } } + break; + } else { + free(response); + return -1; } - break; } + + free(response); return(0); } -- 1.7.6

1 0

[pacman-dev] [PATCH] libalpm: Set ret correctly in download_internal()
by Lukas Fleischer 25 Jul '11

25 Jul '11

Immediately jump to the cleanup code after setting the return code to -1 in case rename() fails. Otherwise, it will be reset to 0 right after we leave the if branch. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Just spotted this one in maint. I realized the download_internal() code was completely refactored in master; the only reason I submit this is to fix this minor issue in case there will be another maintenance release before pacman hits the big 4.0.0. If there isn't going to be such a thing, you might ignore this or not. lib/libalpm/dload.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a98d84a..e3d30f2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -308,6 +308,7 @@ static int download_internal(const char *url, const char *localpath, _alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), tempfile, destfile, strerror(errno)); ret = -1; + goto cleanup; } ret = 0; -- 1.7.6

2 1

[pacman-dev] package signing for pacman
by Shaun Kluzek 25 Jul '11

25 Jul '11

Hi, my name is Shaun Kluzek. I have been using linux now for about a decade and have spent the last two years using arch linux and previously using gentoo. I studied computer science in Melbourne Australia at RMIT University and program well in C. After reading "The real story behind Arch Linux package signing" by Dan Mcgee, I headed over to Alan McRae's TODO list for package signing, and spotted the pacman signature verification, acting upon this I built the gpgme documentation from the texi files and have spent the last two days reading and understanding it( gnu don't make this very easy ). As a result, I have successfully written a small C program that verifies a detached ascii armored signature with its accompanying file against users in your keyring. The code at this stage is test code and very messy, however, it loads in a detached sig say signed.asc, then loads in the signed file somefile and then verifies it, giving the validation back in a bit vector. The code needs to be rewritten and split into some nice funtions. I have obtained the pacman source code from git and had a brief look through it just prior to writing the libgpgme stuff. Once tidied up ( into funtions and descriptive error output ) I dont think it would be much problem adding it into pacman. How should I proceed ? Shaun Kluzek

2 1

[pacman-dev] [PATCH] makepkg: allow epoch to be overridden
by Allan McRae 22 Jul '11

22 Jul '11

We can override pkgver and pkgrel so it is only logical to add epoch to that list Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4b8f167..88afe7b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,9 +44,9 @@ startdir="$PWD" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') -splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ - 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ - 'backup' 'options' 'install' 'changelog') +splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'license' \ + 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ + 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides # Options @@ -1455,10 +1455,13 @@ check_sanity() { fi done || ret=1 - if [[ ! $epoch =~ ^[0-9]*$ ]]; then - error "$(gettext "%s must be an integer.")" "epoch" - ret=1 - fi + awk -F'=' '/^[[:space:]]*epoch=/ { $1=""; print $0 }' "$BUILDFILE" | + while read i; do + if [[ ! $i =~ ^[0-9]*$ ]]; then + error "$(gettext "%s must be an integer.")" "epoch" + return 1 + fi + done || ret=1 if [[ $arch != 'any' ]]; then if ! in_array $CARCH ${arch[@]}; then -- 1.7.6

2 7

[pacman-dev] [PATCH] makepkg: pkgver and pkgrel can not have whitespace
by Allan McRae 22 Jul '11

22 Jul '11

There is always someone who tries to break things (cough *Dave* cough...) Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0682e4f..ec5b388 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1438,12 +1438,14 @@ check_sanity() { error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" ret=1 fi - if [[ $pkgver =~ [:-] ]]; then - error "$(gettext "%s is not allowed to contain colons or hyphens.")" "pkgver" + + if [[ $pkgver =~ [[:space:]:-] ]]; then + error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" ret=1 fi - if [[ $pkgrel != ${pkgrel//-/} ]]; then - error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" + + if [[ $pkgrel =~ [[:space:]-] ]]; then + error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" ret=1 fi -- 1.7.6

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-505-g98073af
by dan＠archlinux.org 21 Jul '11

21 Jul '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 98073afe5527aa8a08c7119b61d0251250168e82 (commit) via 768d3589a36c1a3c86cd91c4db401bc47737c47a (commit) via 2bd1687f51b51b21fa6a28a9d91d8509fb7c7c9f (commit) via 9f500f684d7db93c235d701be8d948402fd3b7ef (commit) via bb3dada8711fbb822513cd556167867b537f8986 (commit) via 058ee1737182c2d5e900e0feba57f0d6496e735e (commit) via 70d6fe66325e66a39e6c3d79ef79c6a9ad8225f0 (commit) from 61410814c2cb33055e0eb0276444b9073c3a1e7a (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 98073afe5527aa8a08c7119b61d0251250168e82 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 20 13:26:44 2011 -0400 pacman-key: refactor post parse opt check into a case This is a cleaner expression of the same information. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 768d3589a36c1a3c86cd91c4db401bc47737c47a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 20 10:47:06 2011 -0400 pacman-key: s/UPDATEBD/UPDATEDB/ Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2bd1687f51b51b21fa6a28a9d91d8509fb7c7c9f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 19 14:25:16 2011 -0400 pacman-key: fix syntax error in -r arg parsing Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f500f684d7db93c235d701be8d948402fd3b7ef Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jul 19 14:28:53 2011 -0400 pacman-key: return $ret, not errors fixes: /usr/bin/pacman-key: line 286: return: errors: numeric argument required Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bb3dada8711fbb822513cd556167867b537f8986 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 19 04:47:29 2011 -0500 Convert package filelists to an array instead of linked list This accomplishes quite a few things with one rather invasive change. 1. Iteration is much more performant, due to a reduction in pointer chasing and linear item access. 2. Data structures are smaller- we no longer have the overhead of the linked list as the file struts are now laid out consecutively in memory. 3. Memory allocation has been massively reworked. Before, we would allocate three different pieces of memory per file item- the list struct, the file struct, and the copied filename. What this resulted in was massive fragmentation of memory when loading filelists since the memory allocator had to leave holes all over the place. The new situation here now removes the need for any list item allocation; allocates the file structs in contiguous memory (and reallocs as necessary), leaving only the strings as individually allocated. Tests using valgrind (massif) show some pretty significant memory reductions on the worst case `pacman -Ql > /dev/null` (366387 files on my machine): Before: Peak heap: 54,416,024 B Useful heap: 36,840,692 B Extra heap: 17,575,332 B After: Peak heap: 38,004,352 B Useful heap: 28,101,347 B Extra heap: 9,903,005 B Several small helper methods have been introduced, including a list to array conversion helper as well as a filelist merge sort that works directly on arrays. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 058ee1737182c2d5e900e0feba57f0d6496e735e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 19 05:02:06 2011 -0500 contrib: add paclog-pkglist to gitignore Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70d6fe66325e66a39e6c3d79ef79c6a9ad8225f0 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 19 00:23:42 2011 -0500 Clean up my debug logger mess Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 + lib/libalpm/alpm.h | 11 +++++- lib/libalpm/alpm_list.c | 32 +++++++++++++++++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_local.c | 41 +++++++++++++++++----- lib/libalpm/be_package.c | 86 +++++++++++++++++++++++++++++++++++++++------- lib/libalpm/be_sync.c | 2 - lib/libalpm/conflict.c | 65 +++++++++++++++++++--------------- lib/libalpm/conflict.h | 4 +- lib/libalpm/diskspace.c | 24 ++++++++---- lib/libalpm/package.c | 46 ++++++++++++++----------- lib/libalpm/package.h | 8 ++-- lib/libalpm/remove.c | 25 ++++++++----- scripts/pacman-key.sh.in | 29 +++++++-------- src/pacman/package.c | 9 +++-- src/pacman/query.c | 19 ++++++---- 16 files changed, 277 insertions(+), 126 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/6] Initial patches for better optdep support
by Benedikt Morbach 21 Jul '11

21 Jul '11

Hi, I've send this before, but it seems like it didn't reach the list. I apologize if I'm flooding your inbox and you got this patch series twice. The pacman codebase is completely new to me, so please forgive me the obvious mistakes that I overlooked and feel free to point them out and yell at me. This implements most features from https://wiki.archlinux.org/index.php/User:Allan/Pacman_OptDepends It probably isn't quite ready to be merged yet, but I want to gather some feedback on the stuff I've already done. What is there: - No regressions afaics - Only show uninstalled optdepends during install/upgrade - In package info, show [installed] after installed optdepends - In package info (local or -ii) show packages which optionally depend on the queried package - '-Qt' doesn't consider optdepends to be orphans, unless '--nooptdeps/-n' is given What is missing: - Show which of the packages listed by '-Qtn' is an optdepend and what optdeps on it - In package info display the description alongside the "reverse optdeps" - Recursive removal of unneeded optdeps - Anything listed under "Other Ideas" - Tests (mainly needed for the package removal stuff I think) - Docs with less sucky english ;-) -- Benedikt Benedikt Morbach (6): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Show optdep install status in package info optdepends are not orphans unless --nooptdepends is specified Make package info show optional requirements doc/pacman.8.txt | 6 ++++ lib/libalpm/alpm.h | 14 ++++++++- lib/libalpm/be_local.c | 11 +++++- lib/libalpm/be_package.c | 5 ++- lib/libalpm/be_sync.c | 7 ++++- lib/libalpm/deps.c | 70 ++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/deps.h | 3 ++ lib/libalpm/package.c | 39 ++++++++++++++++------- src/pacman/conf.h | 1 + src/pacman/package.c | 13 ++++++-- src/pacman/pacman.c | 3 ++ src/pacman/query.c | 16 ++++++++-- src/pacman/util.c | 75 +++++++++++++++++++++++++++++++++++++++------- src/pacman/util.h | 1 + src/util/pactree.c | 2 +- 15 files changed, 230 insertions(+), 36 deletions(-) -- 1.7.6

2 11

[pacman-dev] [PATCH] Change GPG_PACMAN and GPG_NOKEYRING to arrays
by DJ Mills 20 Jul '11

20 Jul '11

Allow the commands to safely handle any possible arguments. Signed-off-by: DJ Mills <danielmills1(a)gmail.com> --- scripts/pacman-key.sh.in | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 833943c..5ad83c3 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -78,7 +78,7 @@ get_from() { reload_keyring() { local PACMAN_SHARE_DIR='@prefix@/share/pacman' - local GPG_NOKEYRING="gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR}" + local GPG_NOKEYRING=(gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir "${PACMAN_KEYRING_DIR}") # Variable used for iterating on keyrings local key @@ -97,7 +97,7 @@ reload_keyring() { # Verify signatures of related files, if they exist if [[ -r "${ADDED_KEYS}" ]]; then msg "$(gettext "Verifying official keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${ADDED_KEYS}.sig" 1>/dev/null; then + if ! "${GPG_PACMAN[@]}" --quiet --batch --verify "${ADDED_KEYS}.sig" 1>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" exit 1 fi @@ -105,7 +105,7 @@ reload_keyring() { if [[ -r "${DEPRECATED_KEYS}" ]]; then msg "$(gettext "Verifying deprecated keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${DEPRECATED_KEYS}.sig" 1>/dev/null; then + if ! "${GPG_PACMAN[@]}" --quiet --batch --verify "${DEPRECATED_KEYS}.sig" 1>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" exit 1 fi @@ -113,7 +113,7 @@ reload_keyring() { if [[ -r "${REMOVED_KEYS}" ]]; then msg "$(gettext "Verifying deleted keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${REMOVED_KEYS}.sig"; then + if ! "${GPG_PACMAN[@]}" --quiet --batch --verify "${REMOVED_KEYS}.sig"; then error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" exit 1 fi @@ -126,7 +126,7 @@ reload_keyring() { if [[ -r "${REMOVED_KEYS}" ]]; then while read key; do local key_values name - key_values=$(${GPG_PACMAN} --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5,10 --output-delimiter=' ') + key_values=$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5,10 --output-delimiter=' ') if [[ -n $key_values ]]; then # The first word is the key_id key_id=${key_values%% *} @@ -146,7 +146,7 @@ reload_keyring() { # Remove the keys that must be kept from the set of keys that should be removed if [[ -n ${HOLD_KEYS} ]]; then for key in ${HOLD_KEYS}; do - key_id=$(${GPG_PACMAN} --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5) + key_id=$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5) if [[ -n "${removed_ids[$key_id]}" ]]; then unset removed_ids[$key_id] fi @@ -157,22 +157,22 @@ reload_keyring() { # be updated automatically. if [[ -r "${ADDED_KEYS}" ]]; then msg "$(gettext "Appending official keys...")" - local add_keys=$(${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) + local add_keys=$("${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) for key_id in ${add_keys}; do # There is no point in adding a key that will be deleted right after if [[ -z "${removed_ids[$key_id]}" ]]; then - ${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --export "${key_id}" | ${GPG_PACMAN} --import + "${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import fi done fi if [[ -r "${DEPRECATED_KEYS}" ]]; then msg "$(gettext "Appending deprecated keys...")" - local add_keys=$(${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) + local add_keys=$("${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) for key_id in ${add_keys}; do # There is no point in adding a key that will be deleted right after if [[ -z "${removed_ids[$key_id]}" ]]; then - ${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | ${GPG_PACMAN} --import + "${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import fi done fi @@ -182,13 +182,13 @@ reload_keyring() { msg "$(gettext "Removing deleted keys from keyring...")" for key_id in "${!removed_ids[@]}"; do echo " removing key $key_id - ${removed_ids[$key_id]}" - ${GPG_PACMAN} --quiet --batch --yes --delete-key "${key_id}" + "${GPG_PACMAN[@]}" --quiet --batch --yes --delete-key "${key_id}" done fi # Update trustdb, just to be sure msg "$(gettext "Updating trust database...")" - ${GPG_PACMAN} --batch --check-trustdb + "${GPG_PACMAN[@]}" --batch --check-trustdb } # PROGRAM START @@ -229,7 +229,7 @@ fi if [[ GPGDIR=$(get_from "$CONFIG" "GPGDir") == 0 ]]; then PACMAN_KEYRING_DIR="${GPGDIR}" fi -GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" +GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning) # Try to create $PACMAN_KEYRING_DIR if non-existent # Check for simple existence rather than for a directory as someone may want @@ -247,29 +247,29 @@ shift case "${command}" in -a|--add) # If there is no extra parameter, gpg will read stdin - ${GPG_PACMAN} --quiet --batch --import "$@" + "${GPG_PACMAN[@]}" --quiet --batch --import "$@" ;; -d|--del) if (( $# == 0 )); then error "$(gettext "You need to specify at least one key identifier")" exit 1 fi - ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" + "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "$@" ;; -u|--updatedb) - ${GPG_PACMAN} --batch --check-trustdb + "${GPG_PACMAN[@]}" --batch --check-trustdb ;; --reload) reload_keyring ;; -l|--list) - ${GPG_PACMAN} --batch --list-sigs "$@" + "${GPG_PACMAN[@]}" --batch --list-sigs "$@" ;; -f|--finger) - ${GPG_PACMAN} --batch --fingerprint "$@" + "${GPG_PACMAN[@]}" --batch --fingerprint "$@" ;; -e|--export) - ${GPG_PACMAN} --armor --export "$@" + "${GPG_PACMAN[@]}" --armor --export "$@" ;; -r|--receive) if (( $# < 2 )); then @@ -278,7 +278,7 @@ case "${command}" in fi keyserver="$1" shift - ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" + "${GPG_PACMAN[@]}" --keyserver "${keyserver}" --recv-keys "$@" ;; -t|--trust) if (( $# == 0 )); then @@ -287,8 +287,8 @@ case "${command}" in fi while (( $# > 0 )); do # Verify if the key exists in pacman's keyring - if ${GPG_PACMAN} --list-keys "$1" > /dev/null 2>&1; then - ${GPG_PACMAN} --edit-key "$1" + if "${GPG_PACMAN[@]}" --list-keys "$1" > /dev/null 2>&1; then + "${GPG_PACMAN[@]}" --edit-key "$1" else error "$(gettext "The key identified by %s doesn't exist")" "$1" exit 1 @@ -297,8 +297,8 @@ case "${command}" in done ;; --adv) - msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" - ${GPG_PACMAN} "$@" || ret=$? + msg "$(gettext "Executing: %s ")$*" ""${GPG_PACMAN[@]}"" + "${GPG_PACMAN[@]}" "$@" || ret=$? exit $ret ;; -h|--help) -- 1.7.6

2 1

[pacman-dev] [PATCH 1/2] pacman-key: fix syntax error in -r arg parsing
by Dave Reisner 20 Jul '11

20 Jul '11

fixes: /usr/bin/pacman-key: line 437: ${1[0]}: bad substitution Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Allan, I'm pretty sure this was your intention. Feel free to correct me if I'm wrong. scripts/pacman-key.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index cb108ac..b478b23 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -310,7 +310,7 @@ while true; do --gpgdir) shift; PACMAN_KEYRING_DIR=$1 ;; --init) INIT=1 ;; -l|--list) LIST=1 ;; - -r|--receive) RECEIVE=1; shift; KEYSERVER="${1[0]}"; KEYIDS=("${1[@]:1}") ;; + -r|--receive) RECEIVE=1; shift; KEYSERVER=$1; KEYIDS=("${@:1}") ;; --reload) RELOAD=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; -- 1.7.6

2 4

Re: [pacman-dev] [PATCH 1/3] Revise siglevel_t, adding PACKAGE_HASH_OK field
by Kerrick Staley 20 Jul '11

20 Jul '11

This will just require a SHA256 in addition to an MD5 (if one is even present), that's all (for some reason I thought it was more complicated than that, but you're right). MD5s haven't exactly been broken for our purposes (there are no working preimage attacks against MD5 yet), but there is little reason to expect that it will stay this way for much longer. So yeah, scratch the flag and the corresponding config option, but we should also make SHA256 a requirement at some point. -Kerrick Staley On Jul 18, 2011 2:31 AM, "Allan McRae" <allan(a)archlinux.org> wrote:

2 2

[pacman-dev] Implement SigLevel config parsing, v2.0
by Kerrick Staley 20 Jul '11

20 Jul '11

These revised patches make some fixes based on Dave's suggestions and also fix some problems I noticed after submitting the original patches. I don't think Optional is actually the default if no SigLevel is specified, but it's probably a good default going forward. -Kerrick Staley

4 11

[pacman-dev] [PATCH] Convert package filelists to an array instead of linked list
by Dan McGee 19 Jul '11

19 Jul '11

This accomplishes quite a few things with one rather invasive change. 1. Iteration is much more performant, due to a reduction in pointer chasing and linear item access. 2. Data structures are smaller- we no longer have the overhead of the linked list as the file struts are now laid out consecutively in memory. 3. Memory allocation has been massively reworked. Before, we would allocate three different pieces of memory per file item- the list struct, the file struct, and the copied filename. What this resulted in was massive fragmentation of memory when loading filelists since the memory allocator had to leave holes all over the place. The new situation here now removes the need for any list item allocation; allocates the file structs in contiguous memory (and reallocs as necessary), leaving only the strings as individually allocated. Tests using valgrind (massif) show some pretty significant memory reductions on the worst case `pacman -Ql > /dev/null` (366387 files on my machine): Before: Peak heap: 54,416,024 B Useful heap: 36,840,692 B Extra heap: 17,575,332 B After: Peak heap: 38,004,352 B Useful heap: 28,101,347 B Extra heap: 9,903,005 B Several small helper methods have been introduced, including a list to array conversion helper as well as a filelist merge sort that works directly on arrays. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 11 +++++- lib/libalpm/alpm_list.c | 32 ++++++++++++++++++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_local.c | 34 ++++++++++++++----- lib/libalpm/be_package.c | 79 ++++++++++++++++++++++++++++++++++++++------- lib/libalpm/conflict.c | 65 +++++++++++++++++++++----------------- lib/libalpm/conflict.h | 4 +- lib/libalpm/diskspace.c | 24 +++++++++----- lib/libalpm/package.c | 46 +++++++++++++++----------- lib/libalpm/package.h | 8 ++-- lib/libalpm/remove.c | 25 +++++++++------ src/pacman/package.c | 9 +++-- src/pacman/query.c | 19 ++++++----- 13 files changed, 248 insertions(+), 109 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 6e1e4bc..d9f3504 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -184,6 +184,12 @@ typedef struct _alpm_file_t { mode_t mode; } alpm_file_t; +/** Package filelist container */ +typedef struct _alpm_filelist_t { + size_t count; + alpm_file_t *files; +} alpm_filelist_t; + /** Local package or package file backup entry */ typedef struct _alpm_backup_t { char *name; @@ -671,9 +677,10 @@ alpm_list_t *alpm_pkg_get_replaces(alpm_pkg_t *pkg); * The filenames are relative to the install root, * and do not include leading slashes. * @param pkg a pointer to package - * @return a reference to an internal list of strings. + * @return a pointer to a filelist object containing a count and an array of + * package file objects */ -alpm_list_t *alpm_pkg_get_files(alpm_pkg_t *pkg); +alpm_filelist_t *alpm_pkg_get_files(alpm_pkg_t *pkg); /** Returns the list of files backed up when installing pkg. * The elements of the returned list have the form diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 071cd99..2dcf08d 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -749,6 +749,38 @@ alpm_list_t SYMEXPORT *alpm_list_diff(const alpm_list_t *lhs, return ret; } +/** + * @brief Copy a list and data into a standard C array of fixed length. + * Note that the data elements are shallow copied so any contained pointers + * will point to the original data. + * + * @param list the list to copy + * @param n the size of the list + * @param size the size of each data element + * + * @return an array version of the original list, data copied as well + */ +void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n, + size_t size) +{ + size_t i; + const alpm_list_t *item; + char *array; + + if(n == 0) { + return NULL; + } + + array = calloc(n, size); + if(array == NULL) { + return NULL; + } + for(i = 0, item = list; i < n && item; i++, item = item->next) { + memcpy(array + i * n, item->data, size); + } + return array; +} + /** @} */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 5e8ca46..cd7b029 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -81,6 +81,7 @@ char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn); void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright); +void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size); #ifdef __cplusplus } diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 70f242d..a725076 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -177,10 +177,10 @@ static alpm_list_t *_cache_get_deltas(alpm_pkg_t UNUSED *pkg) return NULL; } -static alpm_list_t *_cache_get_files(alpm_pkg_t *pkg) +static alpm_filelist_t *_cache_get_files(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_FILES, NULL); - return pkg->files; + return &(pkg->files); } static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg) @@ -631,13 +631,28 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) while(fgets(line, sizeof(line), fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { + size_t files_count = 0, files_size = 8; + alpm_file_t *files; + + CALLOC(files, files_size, sizeof(alpm_file_t), goto error); while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - alpm_file_t *file; - CALLOC(file, 1, sizeof(alpm_file_t), goto error); - STRDUP(file->name, line, goto error); + if(files_count >= files_size) { + files = realloc(files, sizeof(alpm_file_t) * files_size * 2); + if(!files) { + ALLOC_FAIL(sizeof(alpm_file_t) * files_size * 2); + goto error; + } + memset(files + files_size, 0, sizeof(alpm_file_t) * files_size); + files_size *= 2; + } + STRDUP(files[files_count].name, line, goto error); /* TODO: lstat file, get mode/size */ - info->files = alpm_list_add(info->files, file); + files_count++; } + /* attempt to hand back any memory we don't need */ + files = realloc(files, sizeof(alpm_file_t) * files_count); + info->files.count = files_count; + info->files.files = files; } else if(strcmp(line, "%BACKUP%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { alpm_backup_t *backup; @@ -834,10 +849,11 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq retval = -1; goto cleanup; } - if(info->files) { + if(info->files.count) { + size_t i; fprintf(fp, "%%FILES%%\n"); - for(lp = info->files; lp; lp = lp->next) { - const alpm_file_t *file = lp->data; + for(i = 0; i < info->files.count; i++) { + const alpm_file_t *file = info->files.files + i; fprintf(fp, "%s\n", file->name); } fprintf(fp, "\n"); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 46bdaed..d13837f 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -223,6 +223,53 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * return 0; } +static void files_merge(alpm_file_t a[], alpm_file_t b[], alpm_file_t c[], + size_t m, size_t n) +{ + size_t i = 0, j = 0, k = 0; + while(i < m && j < n) { + if(strcmp(a[i].name, b[j].name) < 0) { + c[k++] = a[i++]; + } else { + c[k++] = b[j++]; + } + } + while(i < m) { + c[k++] = a[i++]; + } + while(j < n) { + c[k++] = b[j++]; + } +} + +static alpm_file_t *files_msort(alpm_file_t *files, size_t n) +{ + alpm_file_t *work; + size_t blocksize = 1; + + CALLOC(work, n, sizeof(alpm_file_t), return NULL); + + for(blocksize = 1; blocksize < n; blocksize *= 2) { + size_t i, max_extent = 0; + for(i = 0; i < n - blocksize; i += 2 * blocksize) { + /* this limits our actual merge to the length of the array, since we will + * not likely be a perfect power of two. */ + size_t right_blocksize = blocksize; + if(i + blocksize * 2 > n) { + right_blocksize = n - i - blocksize; + } + files_merge(files + i, files + i + blocksize, work + i, + blocksize, right_blocksize); + max_extent = i + blocksize + right_blocksize; + } + /* ensure we only copy what we actually touched on this merge pass, + * no more, no less */ + memcpy(files, work, max_extent * sizeof(alpm_file_t)); + } + free(work); + return files; +} + /** * Load a package and create the corresponding alpm_pkg_t struct. * @param handle the context handle @@ -241,7 +288,8 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, struct archive_entry *entry; alpm_pkg_t *newpkg = NULL; struct stat st; - size_t files_count = 0; + size_t files_count = 0, files_size = 0; + alpm_file_t *files = NULL; if(pkgfile == NULL || strlen(pkgfile) == 0) { RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); @@ -326,12 +374,21 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, * already been handled (for future possibilities) */ } else if(full) { /* Keep track of all files for filelist generation */ - alpm_file_t *file; - CALLOC(file, 1, sizeof(alpm_file_t), goto error); - STRDUP(file->name, entry_name, goto error); - file->size = archive_entry_size(entry); - file->mode = archive_entry_mode(entry); - newpkg->files = alpm_list_add(newpkg->files, file); + if(files_count >= files_size) { + if(files_size == 0) { + files_size = 4; + } + files = realloc(files, sizeof(alpm_file_t) * files_size * 2); + if(!files) { + ALLOC_FAIL(sizeof(alpm_file_t) * files_size * 2); + goto error; + } + memset(files + files_size, 0, sizeof(alpm_file_t) * files_size); + files_size *= 2; + } + STRDUP(files[files_count].name, entry_name, goto error); + files[files_count].size = archive_entry_size(entry); + files[files_count].mode = archive_entry_mode(entry); files_count++; } @@ -371,14 +428,10 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, if(full) { /* "checking for conflicts" requires a sorted list, ensure that here */ _alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); - newpkg->files = alpm_list_msort(newpkg->files, files_count, - _alpm_files_cmp); + newpkg->files.files = files_msort(files, files_count); + newpkg->files.count = files_count; newpkg->infolevel = INFRQ_ALL; } else { - /* get rid of any partial filelist we may have collected, it is invalid */ - alpm_list_free_inner(newpkg->files, (alpm_list_fn_free)_alpm_files_free); - alpm_list_free(newpkg->files); - newpkg->files = NULL; newpkg->infolevel = INFRQ_BASE | INFRQ_DESC; } diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index eda6ba1..538c4c7 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -229,22 +229,22 @@ static const int INTERSECT = 1; * DIFFERENCE - a difference operation is performed. filesA - filesB. * INTERSECT - an intersection operation is performed. filesA & filesB. */ -static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB, - int operation) +static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, + alpm_filelist_t *filesB, int operation) { alpm_list_t *ret = NULL; - alpm_list_t *pA = filesA, *pB = filesB; + size_t ctrA = 0, ctrB = 0; - while(pA && pB) { - alpm_file_t *fileA = pA->data; - alpm_file_t *fileB = pB->data; + while(ctrA < filesA->count && ctrB < filesB->count) { + alpm_file_t *fileA = filesA->files + ctrA; + alpm_file_t *fileB = filesB->files + ctrB; const char *strA = fileA->name; const char *strB = fileB->name; /* skip directories, we don't care about them */ if(strA[strlen(strA)-1] == '/') { - pA = pA->next; + ctrA++; } else if(strB[strlen(strB)-1] == '/') { - pB = pB->next; + ctrB++; } else { int cmp = strcmp(strA, strB); if(cmp < 0) { @@ -252,29 +252,29 @@ static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB, /* item only in filesA, qualifies as a difference */ ret = alpm_list_add(ret, fileA); } - pA = pA->next; + ctrA++; } else if(cmp > 0) { - pB = pB->next; + ctrB++; } else { if(operation == INTERSECT) { /* item in both, qualifies as an intersect */ ret = alpm_list_add(ret, fileA); } - pA = pA->next; - pB = pB->next; + ctrA++; + ctrB++; } } } /* if doing a difference, ensure we have completely emptied pA */ - while(operation == DIFFERENCE && pA) { - alpm_file_t *fileA = pA->data; + while(operation == DIFFERENCE && ctrA < filesA->count) { + alpm_file_t *fileA = filesA->files + ctrA; const char *strA = fileA->name; /* skip directories */ if(strA[strlen(strA)-1] != '/') { ret = alpm_list_add(ret, fileA); } - pA = pA->next; + ctrA++; } return ret; @@ -319,16 +319,16 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) FREE(conflict); } -const alpm_file_t *_alpm_filelist_contains(const alpm_list_t *haystack, - const char *needle) +const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, + const char *name) { - const alpm_list_t *lp = haystack; - while(lp) { - const alpm_file_t *file = lp->data; - if(strcmp(file->name, needle) == 0) { + size_t i; + const alpm_file_t *file = filelist->files; + for(i = 0; i < filelist->count; i++) { + if(strcmp(file->name, name) == 0) { return file; } - lp = lp->next; + file++; } return NULL; } @@ -400,8 +400,10 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * different cases. */ for(current = 0, i = upgrade; i; i = i->next, current++) { alpm_pkg_t *p1 = i->data; - alpm_list_t *j, *tmpfiles; + alpm_list_t *j; + alpm_filelist_t tmpfiles; alpm_pkg_t *dbpkg; + size_t filenum; int percent = (current * 100) / numtargs; PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent, @@ -444,16 +446,21 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * that the former list needs to be freed while the latter list should NOT * be freed. */ if(dbpkg) { + alpm_list_t *difference; /* older ver of package currently installed */ - tmpfiles = filelist_operation(alpm_pkg_get_files(p1), + difference = filelist_operation(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg), DIFFERENCE); + tmpfiles.count = alpm_list_count(difference); + tmpfiles.files = alpm_list_to_array(difference, tmpfiles.count, + sizeof(alpm_file_t)); + alpm_list_free(difference); } else { /* no version of package currently installed */ - tmpfiles = alpm_pkg_get_files(p1); + tmpfiles = *alpm_pkg_get_files(p1); } - for(j = tmpfiles; j; j = j->next) { - alpm_file_t *file = j->data; + for(filenum = 0; filenum < tmpfiles.count; filenum++) { + alpm_file_t *file = tmpfiles.files + filenum; const char *filestr = file->name; const char *relative_path; alpm_list_t *k; @@ -572,7 +579,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, FREELIST(conflicts); if(dbpkg) { /* only freed if it was generated from filelist_operation() */ - alpm_list_free(tmpfiles); + free(tmpfiles.files); } return NULL; } @@ -580,7 +587,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } if(dbpkg) { /* only freed if it was generated from filelist_operation() */ - alpm_list_free(tmpfiles); + free(tmpfiles.files); } } PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100, diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index f2ab625..8b7471f 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -33,8 +33,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, void _alpm_fileconflict_free(alpm_fileconflict_t *conflict); -const alpm_file_t *_alpm_filelist_contains(const alpm_list_t *haystack, - const char *needle); +const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, + const char *name); #endif /* _ALPM_CONFLICT_H */ diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 3ab62a8..b28b88a 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -147,14 +147,18 @@ static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points, static int calculate_removed_size(alpm_handle_t *handle, const alpm_list_t *mount_points, alpm_pkg_t *pkg) { - alpm_list_t *i; + size_t i; + alpm_filelist_t *filelist = alpm_pkg_get_files(pkg); - alpm_list_t *files = alpm_pkg_get_files(pkg); - for(i = files; i; i = i->next) { + if(!filelist->count) { + return 0; + } + + for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file = filelist->files + i; alpm_mountpoint_t *mp; struct stat st; char path[PATH_MAX]; - const alpm_file_t *file = i->data; const char *filename = file->name; snprintf(path, PATH_MAX, "%s%s", handle->root, filename); @@ -185,13 +189,17 @@ static int calculate_removed_size(alpm_handle_t *handle, static int calculate_installed_size(alpm_handle_t *handle, const alpm_list_t *mount_points, alpm_pkg_t *pkg) { - alpm_list_t *i; + size_t i; + alpm_filelist_t *filelist = alpm_pkg_get_files(pkg); - for(i = alpm_pkg_get_files(pkg); i; i = i->next) { - const alpm_file_t *file = i->data; + if(!filelist->count) { + return 0; + } + + for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file = filelist->files + i; alpm_mountpoint_t *mp; char path[PATH_MAX]; - const char *filename = file->name; /* libarchive reports these as zero size anyways */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ae9b9a9..fd3d0c6 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -106,7 +106,7 @@ static alpm_list_t *_pkg_get_conflicts(alpm_pkg_t *pkg) { return pkg->conflicts static alpm_list_t *_pkg_get_provides(alpm_pkg_t *pkg) { return pkg->provides; } static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg) { return pkg->replaces; } static alpm_list_t *_pkg_get_deltas(alpm_pkg_t *pkg) { return pkg->deltas; } -static alpm_list_t *_pkg_get_files(alpm_pkg_t *pkg) { return pkg->files; } +static alpm_filelist_t *_pkg_get_files(alpm_pkg_t *pkg) { return &(pkg->files); } static alpm_list_t *_pkg_get_backup(alpm_pkg_t *pkg) { return pkg->backup; } static void *_pkg_changelog_open(alpm_pkg_t UNUSED *pkg) @@ -313,7 +313,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_deltas(alpm_pkg_t *pkg) return pkg->ops->get_deltas(pkg); } -alpm_list_t SYMEXPORT *alpm_pkg_get_files(alpm_pkg_t *pkg) +alpm_filelist_t SYMEXPORT *alpm_pkg_get_files(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); pkg->handle->pm_errno = 0; @@ -427,22 +427,14 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) /** @} */ -void _alpm_files_free(alpm_file_t *file) +alpm_file_t *_alpm_file_copy(alpm_file_t *dest, + const alpm_file_t *src) { - free(file->name); - free(file); -} - -alpm_file_t *_alpm_files_dup(const alpm_file_t *file) -{ - alpm_file_t *newfile; - CALLOC(newfile, 1, sizeof(alpm_file_t), return NULL); - - STRDUP(newfile->name, file->name, return NULL); - newfile->size = file->size; - newfile->mode = file->mode; + STRDUP(dest->name, src->name, return NULL); + dest->size = src->size; + dest->mode = src->mode; - return newfile; + return dest; } /* Helper function for comparing files list entries @@ -493,8 +485,17 @@ alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) newpkg->licenses = alpm_list_strdup(pkg->licenses); newpkg->replaces = alpm_list_strdup(pkg->replaces); newpkg->groups = alpm_list_strdup(pkg->groups); - for(i = pkg->files; i; i = alpm_list_next(i)) { - newpkg->files = alpm_list_add(newpkg->files, _alpm_files_dup(i->data)); + if(pkg->files.count) { + size_t filenum; + size_t len = sizeof(alpm_file_t) * pkg->files.count; + MALLOC(newpkg->files.files, len, goto cleanup); + for(filenum = 0; filenum < pkg->files.count; filenum++) { + if(!_alpm_file_copy(newpkg->files.files + filenum, + pkg->files.files + filenum)) { + goto cleanup; + } + } + newpkg->files.count = pkg->files.count; } for(i = pkg->backup; i; i = alpm_list_next(i)) { newpkg->backup = alpm_list_add(newpkg->backup, _alpm_backup_dup(i->data)); @@ -545,8 +546,13 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) FREELIST(pkg->licenses); FREELIST(pkg->replaces); FREELIST(pkg->groups); - alpm_list_free_inner(pkg->files, (alpm_list_fn_free)_alpm_files_free); - alpm_list_free(pkg->files); + if(pkg->files.count) { + size_t i; + for(i = 0; i < pkg->files.count; i++) { + free(pkg->files.files[i].name); + } + free(pkg->files.files); + } alpm_list_free_inner(pkg->backup, (alpm_list_fn_free)_alpm_backup_free); alpm_list_free(pkg->backup); alpm_list_free_inner(pkg->depends, (alpm_list_fn_free)_alpm_dep_free); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index f76812b..d19d833 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -69,7 +69,7 @@ struct pkg_operations { alpm_list_t *(*get_provides) (alpm_pkg_t *); alpm_list_t *(*get_replaces) (alpm_pkg_t *); alpm_list_t *(*get_deltas) (alpm_pkg_t *); - alpm_list_t *(*get_files) (alpm_pkg_t *); + alpm_filelist_t *(*get_files) (alpm_pkg_t *); alpm_list_t *(*get_backup) (alpm_pkg_t *); void *(*changelog_open) (alpm_pkg_t *); @@ -126,7 +126,6 @@ struct __alpm_pkg_t { alpm_list_t *licenses; alpm_list_t *replaces; alpm_list_t *groups; - alpm_list_t *files; alpm_list_t *backup; alpm_list_t *depends; alpm_list_t *optdepends; @@ -137,10 +136,11 @@ struct __alpm_pkg_t { alpm_list_t *removes; /* in transaction targets only */ struct pkg_operations *ops; + + alpm_filelist_t files; }; -void _alpm_files_free(alpm_file_t *file); -alpm_file_t *_alpm_files_dup(const alpm_file_t *file); +alpm_file_t *_alpm_file_copy(alpm_file_t *dest, const alpm_file_t *src); int _alpm_files_cmp(const void *f1, const void *f2); alpm_pkg_t* _alpm_pkg_new(void); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 2c5d98c..83c437f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -262,15 +262,15 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, local_pkgs = _alpm_db_get_pkgcache(handle->db_local); for(local = local_pkgs; local && !found; local = local->next) { alpm_pkg_t *local_pkg = local->data; - alpm_list_t *files; + alpm_filelist_t *filelist; /* we duplicated the package when we put it in the removal list, so we * so we can't use direct pointer comparison here. */ if(_alpm_pkg_cmp(info, local_pkg) == 0) { continue; } - files = alpm_pkg_get_files(local_pkg); - if(_alpm_filelist_contains(files, fileobj->name)) { + filelist = alpm_pkg_get_files(local_pkg); + if(_alpm_filelist_contains(filelist, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (owned by %s)\n", file, local_pkg->name); found = 1; @@ -320,11 +320,13 @@ int _alpm_remove_single_package(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) { - alpm_list_t *files, *skip_remove, *lp; + alpm_list_t *skip_remove; size_t filenum = 0, position = 0; const char *pkgname = oldpkg->name; const char *pkgver = oldpkg->version; + alpm_filelist_t *filelist; char scriptlet[PATH_MAX]; + size_t i; if(newpkg) { _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", @@ -349,7 +351,8 @@ int _alpm_remove_single_package(alpm_handle_t *handle, } if(newpkg) { - alpm_list_t *newfiles, *b; + alpm_filelist_t *newfiles; + alpm_list_t *b; skip_remove = alpm_list_join( alpm_list_strdup(handle->trans->skip_remove), alpm_list_strdup(handle->noupgrade)); @@ -371,9 +374,10 @@ int _alpm_remove_single_package(alpm_handle_t *handle, skip_remove = alpm_list_strdup(handle->trans->skip_remove); } - files = alpm_pkg_get_files(oldpkg); - for(lp = files; lp; lp = lp->next) { - if(!can_remove_file(handle, lp->data, skip_remove)) { + filelist = alpm_pkg_get_files(oldpkg); + for(i = 0; i < filelist->count; i++) { + alpm_file_t *file = filelist->files + i; + if(!can_remove_file(handle, file, skip_remove)) { _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", pkgname); RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); @@ -390,9 +394,10 @@ int _alpm_remove_single_package(alpm_handle_t *handle, } /* iterate through the list backwards, unlinking files */ - for(lp = alpm_list_last(files); lp; lp = alpm_list_previous(lp)) { + for(i = filelist->count; i > 0; i--) { + alpm_file_t *file = filelist->files + i - 1; int percent; - unlink_file(handle, oldpkg, lp->data, skip_remove, + unlink_file(handle, oldpkg, file, skip_remove, handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE); if(!newpkg) { diff --git a/src/pacman/package.c b/src/pacman/package.c index afbac6b..45afded 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -230,15 +230,16 @@ void dump_pkg_backups(alpm_pkg_t *pkg) void dump_pkg_files(alpm_pkg_t *pkg, int quiet) { const char *pkgname, *root; - alpm_list_t *i, *pkgfiles; + alpm_filelist_t *pkgfiles; + size_t i; pkgname = alpm_pkg_get_name(pkg); pkgfiles = alpm_pkg_get_files(pkg); root = alpm_option_get_root(config->handle); - for(i = pkgfiles; i; i = alpm_list_next(i)) { - const alpm_file_t *file = alpm_list_getdata(i); - if(!quiet){ + for(i = 0; i < pkgfiles->count; i++) { + const alpm_file_t *file = pkgfiles->files + i; + if(!quiet) { fprintf(stdout, "%s %s%s\n", pkgname, root, file->name); } else { fprintf(stdout, "%s%s\n", root, file->name); diff --git a/src/pacman/query.c b/src/pacman/query.c index 251c4dd..163c331 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -191,12 +191,13 @@ static int query_fileowner(alpm_list_t *targets) free(dname); for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { - alpm_list_t *j; alpm_pkg_t *info = alpm_list_getdata(i); + alpm_filelist_t *filelist = alpm_pkg_get_files(info); + size_t i; - for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) { + for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file = filelist->files + i; char *ppath, *pdname; - const alpm_file_t *file = alpm_list_getdata(j); const char *pkgfile = file->name; /* avoid the costly resolve_path usage if the basenames don't match */ @@ -402,11 +403,12 @@ static int filter(alpm_pkg_t *pkg) * loop through files to check if they exist. */ static int check(alpm_pkg_t *pkg) { - alpm_list_t *i; - const char *root; + const char *root, *pkgname; int allfiles = 0, errors = 0; size_t rootlen; char f[PATH_MAX]; + alpm_filelist_t *filelist; + size_t i; root = alpm_option_get_root(config->handle); rootlen = strlen(root); @@ -417,10 +419,11 @@ static int check(alpm_pkg_t *pkg) } strcpy(f, root); - const char *pkgname = alpm_pkg_get_name(pkg); - for(i = alpm_pkg_get_files(pkg); i; i = alpm_list_next(i)) { + pkgname = alpm_pkg_get_name(pkg); + filelist = alpm_pkg_get_files(pkg); + for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file = filelist->files + i; struct stat st; - const alpm_file_t *file = alpm_list_getdata(i); const char *path = file->name; if(rootlen + 1 + strlen(path) > PATH_MAX) { -- 1.7.6

3 3

[pacman-dev] [PATCH v3] pacman-key: Add --import and --import-trustdb
by Pang Yan Han 19 Jul '11

19 Jul '11

Currently, pacman-key allows the user to import their keys using the --add option. However, no similar functionality exists for importing ownertrust values. The --import-trustdb option takes a list of directories and imports ownertrust values if the directories have a trustdb.gpg database. The --import option takes a list of directories and imports keys from pubring.gpg and ownertrust values from trustdb.gpg. Think of it as a combination of --add and --import-trustdb Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- doc/pacman-key.8.txt | 7 +++++++ scripts/pacman-key.sh.in | 45 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index cf72b83..14f3cb9 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -60,6 +60,13 @@ Options *-h, \--help*:: Output syntax and command line options. +*--import* <dir(s)>:: + Adds keys from pubring.gpg into pacman's keyring and imports ownertrust + values from trustdb.gpg in the specified directories. + +*--import-dirs* <dir(s)> :: + Imports ownertrust values from trustdb.gpg in the specified directories. + *--init*:: Ensure the keyring is properly initialized and has the required access permissions. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index cb108ac..ef23290 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -32,6 +32,8 @@ DELETE=0 EDITKEY=0 EXPORT=0 FINGER=0 +IMPORT=0 +IMPORT_TRUSTDB=0 INIT=0 LIST=0 RECEIVE=0 @@ -39,6 +41,9 @@ RELOAD=0 UPDATEDB=0 VERIFY=0 +# Globals +TMP_TRUSTDB='tmp_trustdb.gpg' + m4_include(library/output_format.sh) m4_include(library/parse_options.sh) @@ -66,6 +71,8 @@ usage() { echo "$(gettext " --edit-key <keyid(s)> Present a menu for key management task on keyids")" echo "$(gettext " --gpgdir <dir> Set an alternate directory for gnupg")" printf "$(gettext " (instead of '%s')")\n" "@sysconfdir@/pacman.d/gnupg" + echo "$(gettext " --import <dir(s)> Imports pubring.gpg and trustdb.gpg from dir(s)")" + echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" echo "$(gettext " --reload Reload the default keys")" } @@ -278,6 +285,33 @@ edit_keys() { done } +import_trustdb() { + local importdir + ${GPG_PACMAN} --export-ownertrust > ${TMP_TRUSTDB} + + for importdir in "${IMPORT_DIRS[@]}"; do + if [[ -f "${importdir}/trustdb.gpg" ]]; then + gpg --homedir "${importdir}" --export-ownertrust >> ${TMP_TRUSTDB} + fi + done + + ${GPG_PACMAN} --import-ownertrust ${TMP_TRUSTDB} + rm -f ${TMP_TRUSTDB} +} + +import() { + local importdir + + # Imports public keys, then import trustdbs + for importdir in "${IMPORT_DIRS[@]}"; do + if [[ -f "${importdir}/pubring.gpg" ]]; then + ${GPG_PACMAN} --quiet --batch --import "${importdir}/pubring.gpg" + fi + done + + import_trustdb +} + # PROGRAM START if ! type gettext &>/dev/null; then gettext() { @@ -287,7 +321,8 @@ fi OPT_SHORT="a::d:e:f::hlr:uv:V" OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" -OPT_LONG+=",help,init,list,receive:,reload,updatedb,verify:,version" +OPT_LONG+=",help,import:,import-trustdb:,init,list,receive:,reload,updatedb" +OPT_LONG+=",verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -308,6 +343,8 @@ while true; do -e|--export) EXPORT=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; -f|--finger) FINGER=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --gpgdir) shift; PACMAN_KEYRING_DIR=$1 ;; + --import) IMPORT=1; shift; IMPORT_DIRS=($1) ;; + --import-trustdb) IMPORT_TRUSTDB=1; shift; IMPORT_DIRS=($1) ;; --init) INIT=1 ;; -l|--list) LIST=1 ;; -r|--receive) RECEIVE=1; shift; KEYSERVER="${1[0]}"; KEYIDS=("${1[@]:1}") ;; @@ -330,7 +367,7 @@ if ! type -p gpg >/dev/null; then exit 1 fi -if (( (ADD || DELETE || EDITKEY || INIT || RECEIVE || RELOAD || UPDATEDB) && EUID != 0 )); then +if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || RECEIVE || RELOAD || UPDATEDB) && EUID != 0 )); then error "$(gettext "%s needs to be run as root for this operation.")" "pacman-key" exit 1 fi @@ -348,7 +385,7 @@ 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 -numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + INIT + LIST + RECEIVE + RELOAD + UPDATEBD + VERIFY )) +numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + INIT + LIST + RECEIVE + RELOAD + UPDATEBD + VERIFY )) if (( ! numopt )); then error "$(gettext "No operations specified")" @@ -370,6 +407,8 @@ fi (( EDITKEY )) && edit_keys (( EXPORT )) && ${GPG_PACMAN} --armor --export "${KEYIDS[@]}" (( FINGER )) && ${GPG_PACMAN} --batch --fingerprint "${KEYIDS[@]}" +(( IMPORT )) && import +(( IMPORT_TRUSTDB)) && import_trustdb (( INIT )) && initialize (( LIST )) && ${GPG_PACMAN} --batch --list-sigs "${KEYIDS[@]}" (( RECEIVE )) && receive_keys -- 1.7.6.178.g55272

2 2

[pacman-dev] [PATCH 0/2] Add support for verifying pgp signatures to makepkg
by Wieland Hoffmann 19 Jul '11

19 Jul '11

Hi, this adds support for verifying pgp signatures provided by upstream to makepkg. A new array pgpsigs is defined holding the URLs to all the signature files. However, there're still a few quirks: * You have to manually import the key which signed the source. Actually that's good, but: * You don't know why the verification failed. It's either a wrong signature or the key is simply not known to gnupg. This is really bad, so I've chosen to make pgp verification optional for now. makepkg --pgp enables it. Wieland Hoffmann (2): Add support for verifying pgp signatures to makepkg And update the manpages accordingly doc/PKGBUILD.5.txt | 5 ++++ doc/makepkg.8.txt | 3 ++ scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) -- 1.7.5.4

4 24

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-498-g6141081
by dan＠archlinux.org 19 Jul '11

19 Jul '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 61410814c2cb33055e0eb0276444b9073c3a1e7a (commit) via 05f7c0280e31d25e0b9b5c5cca349eb93e24f04f (commit) via f1d25ba2dd2640054b8e2e1c7c39669abb0cc6e8 (commit) via 333269482a08e02d4e730dd739fc9e8625efde32 (commit) via fa3aaa41e3563e8d4632c12cda989a471627aa20 (commit) via 7e5dea5d329a84293fe363ee098aede5aa1825af (commit) via 31c9a521b47a84ae01f3f9c9e25980694e1c472d (commit) via 0c9e86bab17691bf17c4251b2e16d65f517b88c8 (commit) via 0be9e4a4cd2c6a5d5c5246c8dc269931e883c1fe (commit) via df7b390514efa0ae6b84e8404806dee63d3524ad (commit) via 0e85c4989b7a7a20978ba0dcc7b56f0f1853b974 (commit) via fec10d4a65ebfdcac1f0e3dec9e24c1fe67bb52a (commit) via 74f6d717a3e25957ca5f3cf80897b218b990eea8 (commit) via 74e5a494b0cfea7a987fd2b253b765ca4362b456 (commit) via 7963c5d0000a9dc6fe895e0b321cd6f978168c34 (commit) via e37adcd66427acecac934fd97fcf8428080c62e4 (commit) via e458606ad2fce01e973eb02fb44f0a3f27baafa9 (commit) via 15ca6dca5c7be3253f650d615756f3bff1149d35 (commit) via b300b991a7c489731f7e30117be169f69ffb8745 (commit) via 8ee0724558a33e224c06dddd63d6560d6e41cb44 (commit) via 95d7e1616361ab2b2be38ba5283328f6f9312012 (commit) via 7d205a70a26f1c3d283e995ec590b6838eb8283d (commit) via d86a60c6946eeb27ee1092760c8608e207cccb8d (commit) from dad96ccce2eea8b171cd2d14ec20b8185f0009a8 (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 61410814c2cb33055e0eb0276444b9073c3a1e7a Merge: 05f7c02 3332694 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 21:10:56 2011 -0500 Merge remote-tracking branch 'allan/pacman-key' commit 05f7c0280e31d25e0b9b5c5cca349eb93e24f04f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 20:30:28 2011 -0500 Fix test suite when GPGME is disabled As noted by Allan, we failed pretty hard if gpgme was compiled out. With these changes, only sign001.py fails. This can/will be fixed later once we beef up the test suite with more signing tests anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f1d25ba2dd2640054b8e2e1c7c39669abb0cc6e8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:54:58 2011 -0400 pacman/callback: show .sig suffix on sig download Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 333269482a08e02d4e730dd739fc9e8625efde32 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sun Jul 10 12:26:42 2011 +0800 pacman-key: --init: correct creation of gpg.conf Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa3aaa41e3563e8d4632c12cda989a471627aa20 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sun Jul 10 12:23:47 2011 +0800 pacman-key: correct spelling mistake Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e5dea5d329a84293fe363ee098aede5aa1825af Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 10 16:53:03 2011 +1000 pacman-key: add dependency on parse_options to Makefile Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31c9a521b47a84ae01f3f9c9e25980694e1c472d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 21:51:01 2011 +1000 pacman-key: check required permissions on keyring Makes sure that the pacman keyring is readable and that the user has permissions to create a lock file if lock-never is not specified in the gpg.conf file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c9e86bab17691bf17c4251b2e16d65f517b88c8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 17:26:17 2011 +1000 pacman-key: add --init option Add an --init option that ensures that the pacman keyring has all the necessary files and they have the correct permissions for being read as a user. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0be9e4a4cd2c6a5d5c5246c8dc269931e883c1fe Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 9 12:48:41 2011 +1000 pacman-key: tidy up logic for finding pacman keyring directory Signed-off-by: Allan McRae <allan(a)archlinux.org> commit df7b390514efa0ae6b84e8404806dee63d3524ad Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jul 8 22:40:25 2011 -0400 pacman-key: refactor get_from This function had a variety of pitfalls, including the inability to successfully find a key=value pair where no whitespace surrounded the equals sign. Make it more robust by splitting the line on the equals itself, and performing whitespace trimming on the resulting key/value pair. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e85c4989b7a7a20978ba0dcc7b56f0f1853b974 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:41:04 2011 +1000 pacman-key: add --verify option Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fec10d4a65ebfdcac1f0e3dec9e24c1fe67bb52a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:28:57 2011 +1000 pacman-key: check only a single operation has been specified Follow the example of gpg and only allow a single operation to be specified each time. Prevents having to deal with conflicting variable names and potential issues due to the order in which the operations are run. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 74f6d717a3e25957ca5f3cf80897b218b990eea8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:16:12 2011 +1000 pacman-key: move verifying keyring files to own function Also check all files before bailing on errors. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 74e5a494b0cfea7a987fd2b253b765ca4362b456 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:07:29 2011 +1000 pacman-key: move --edit-key and --receive processing to functions This moves the processing of the --edit-key and --receive options to functions, keeping the final option processing to be all single line statements. Also rework the --edit-key option to validate all input before processing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7963c5d0000a9dc6fe895e0b321cd6f978168c34 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 8 22:30:09 2011 +1000 pacman-key: update man page Update man page to reflect current options. Also add a description on how to manually interact with the pacman keyring with gpg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e37adcd66427acecac934fd97fcf8428080c62e4 Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:09 2011 +0300 pacman-key: hide output of executed commands on logic checks This commit correctly redirects to /dev/null the output of several commands that get executed on logic checks. Original-patch-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e458606ad2fce01e973eb02fb44f0a3f27baafa9 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 8 21:14:53 2011 +1000 pacman-key: rename --trust to --edit-key This keeps the naming of the option more consistent with what is actually being called by gpg. Original-patch-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15ca6dca5c7be3253f650d615756f3bff1149d35 Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:08 2011 +0300 pacman-key: fix quotation on several variable assignments This commit adds quotes to several variable assignments. Unquoted values can cause problems on several occasions if the value is empty. It is safer to have every assignment quoted. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> commit b300b991a7c489731f7e30117be169f69ffb8745 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:41:52 2011 +1000 pacman-key: allow the export of all key ids The gpg --export will exprt all keys if none are specified. Replicate this behavior in pacman-key. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ee0724558a33e224c06dddd63d6560d6e41cb44 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:34:04 2011 +1000 pacman-key: rename --del to --delete There is already the short -d alias provided, so stay verbose with the longer option name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95d7e1616361ab2b2be38ba5283328f6f9312012 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:27:23 2011 +1000 pacman-key: remove the --adv option The conversion to using parse_options causes this option to break. It is preferable to remove the option rather than fix it as it is simply a wrapper for "gpg --homedir @sysconfdir@/pacman.d/gnupg". Any user using more advanced keyring management than provided by pacman-key can manage to point gpg at the right place themselves... How to manually edit the keyring with gpg will instead be documented in the man page in a later commit. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7d205a70a26f1c3d283e995ec590b6838eb8283d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:05:08 2011 +1000 pacman-key: use our option parser The pacman-key script is complicated enough to warrent usage of the parse_options script. This is especially helpful in dealing with all the configuration file override flags as the no longer need to be specified first. It also allows us to do the right thing early with --help/--version and no option cases cleanly. This change also makde the check for root privileges only occur on operations where they are needed. This patch is inspired by and supercedes some patches submitted by Denis A. Altoé Falqueto and Ivan Kanakarakis who were altering the previous option handling in an attempt to deal with the above issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d86a60c6946eeb27ee1092760c8608e207cccb8d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:01:59 2011 -0400 PKGBUILD.vim: add new var and assert bash syntax * assert is_bash to pickup more valid syntax * add checkdepends highlighting Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 7 + doc/pacman-key.8.txt | 67 +++++---- lib/libalpm/be_sync.c | 8 + lib/libalpm/db.c | 1 - lib/libalpm/handle.c | 8 + scripts/Makefile.am | 3 +- scripts/pacman-key.sh.in | 347 +++++++++++++++++++++++++++------------------- src/pacman/callback.c | 11 ++- 8 files changed, 277 insertions(+), 175 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix test suite when GPGME is disabled
by Dan McGee 19 Jul '11

19 Jul '11

As noted by Allan, we failed pretty hard if gpgme was compiled out. With these changes, only sign001.py fails. This can/will be fixed later once we beef up the test suite with more signing tests anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_sync.c | 6 ++++++ lib/libalpm/db.c | 1 - lib/libalpm/handle.c | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d7e14ba..cd69513 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -600,6 +600,12 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); +#ifndef HAVE_GPGME + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); + } +#endif + db = _alpm_db_new(treename, 0); if(db == NULL) { RET_ERR(handle, ALPM_ERR_DB_CREATE, NULL); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0c2b26a..746293f 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -327,7 +327,6 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local) CALLOC(db, 1, sizeof(alpm_db_t), return NULL); STRDUP(db->treename, treename, return NULL); db->is_local = is_local; - db->siglevel = 0; return db; } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 9bffd4f..be51bfc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -45,8 +45,10 @@ alpm_handle_t *_alpm_handle_new() CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); +#ifdef HAVE_GPGME handle->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; +#endif return handle; } @@ -579,7 +581,13 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { CHECK_HANDLE(handle, return -1); +#ifdef HAVE_GPGME handle->siglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif return 0; } -- 1.7.6

1 1

[pacman-dev] Added SigLevel parsing code
by Kerrick Staley 19 Jul '11

19 Jul '11

-Kerrick Staley

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-475-gdad96cc
by dan＠archlinux.org 18 Jul '11

18 Jul '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 dad96ccce2eea8b171cd2d14ec20b8185f0009a8 (commit) via 89c070b263a9e1e4e0734b25c8bc33367a34e504 (commit) via 29a96bcfe179a82adbd575057e2ef9d48a6a72fb (commit) via 48e2a1a119ce84681f25855221b6e2fc2689a760 (commit) via 297cd7897bfe060ce46d703e15ad7cbe37aedced (commit) via c0fe1743e5ba034f70f0740a8f0863d64d0e480a (commit) via f0e34be9903e5523c4bffd35f2659303f80c22fc (commit) via 36db8c50471b4860f6f492c618053bce2559ab73 (commit) via 49427d1fb4f7cb9cfb76e430343510fba5f09e6a (commit) via bf120635a7fdbb2caeb73fa0774bf718f2a127ae (commit) via 3934a842b8121d6fe950fcac323e92e5e35f1538 (commit) via 3294039a00f3aa65181ed23518dc5c73e0201268 (commit) via 0b92d9ed9c6bffcf4b47645a365ea6c3d162e89e (commit) via 1c39e4fbade29d570858ca6eca4958ab72cfbdd0 (commit) via 3a04267cdd0b1324c8153c813e9bc5726b005670 (commit) via 65847fad44216e290986b40b404701432c17ff5a (commit) from e20995560640d11491905bfa80aa993c2efde7c4 (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 dad96ccce2eea8b171cd2d14ec20b8185f0009a8 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 18:26:56 2011 +0200 replace access() calls for debug info where applicable Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c070b263a9e1e4e0734b25c8bc33367a34e504 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 17:24:19 2011 +0200 signing.c: check if needed files are readable If we can't read the keyring, gpgme will output confusing debug information and fail to verify the signature, so we should log some debug information. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29a96bcfe179a82adbd575057e2ef9d48a6a72fb Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 17:22:59 2011 +0200 add _alpm_access() wrapper This is a wrapper function for access() which logs some debug information and eases handling in case of split directory and filename. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 48e2a1a119ce84681f25855221b6e2fc2689a760 Merge: c0fe174 297cd78 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 10:41:37 2011 -0500 Merge branch 'maint' commit c0fe1743e5ba034f70f0740a8f0863d64d0e480a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 01:48:47 2011 +1000 Fix compilation without gpgme Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0e34be9903e5523c4bffd35f2659303f80c22fc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 09:12:18 2011 +1000 configure: output more compile settings Add information on CPPFLAGS, LDFLAGS and LIBS to the end of the configure output. This is very helpful in tracing issues when adjusting the configure file and also will allow us to more easily replicate any issues discovered due to a users build environment. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36db8c50471b4860f6f492c618053bce2559ab73 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 01:27:45 2011 +1000 makepkg.conf: remove curl from other common tools It is now set as the main tool, so make wget another common one. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49427d1fb4f7cb9cfb76e430343510fba5f09e6a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 14:28:04 2011 +1000 repo-add: do not print full path of signature file The full path to the signature file when it is created is in a temporary directory so only print the filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf120635a7fdbb2caeb73fa0774bf718f2a127ae Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 21:05:51 2011 +1000 repo-add: always remove repo signature symlink This prevents a dangling symlink being left behind if the repo goes from being signed to unsigned. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3934a842b8121d6fe950fcac323e92e5e35f1538 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 18 10:33:45 2011 -0400 contrib/paclog-pkglist: whitespace cleanup add a modeline and change 2 space indent to a tab. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3294039a00f3aa65181ed23518dc5c73e0201268 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:04:03 2011 -0400 contrib/paclog-pkglist: rework as bash wrapping awk Avoid some pain in awk's limited handling of command line arguments by wrapping this in a Bash script. We also default to @localstatedir@/log/pacman.log when no args are specified, meaning that -h or --help is required to get the help message. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0b92d9ed9c6bffcf4b47645a365ea6c3d162e89e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 10:34:39 2011 -0500 Add a new epoch pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1c39e4fbade29d570858ca6eca4958ab72cfbdd0 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jul 16 10:07:25 2011 -0500 Handle removal of empty directories properly This addresses FS#25141. We shouldn't remove every empty directory we come across during the removal process unless it is truly not known to any other package. This will prevent removal of essential directories such as '/var/lock/'. This is accomplished by first checking the empty/non-empty status of a directory, which was previously done implicitly by calling rmdir() and ignoring errors. We do this to avoid the next (new) check in most cases, which is to look at all local packages to see if the to-be-removed directory is present in another packages' filelist. If we do not find it anywhere, then we remove it, else we keep the file around. The pactest has been updated to test more cases, as well as finding a flaw in the original expected to fail case- we need separate DIR and FILE based EXIST rules. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a04267cdd0b1324c8153c813e9bc5726b005670 Author: Rogutės Sparnuotos <rogutes(a)googlemail.com> Date: Thu Jun 16 11:40:40 2011 +0300 makepkg: only test for writable PKGDEST when needed. There is no need for a writable PKGDEST when using the --nobuild or --geninteg flags. Allan: added --geninteg Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 65847fad44216e290986b40b404701432c17ff5a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 16 23:01:39 2011 +1000 Move some .gitignore entries Put a .gitignore entry at the right level and sort that file alphabetically. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - configure.ac | 4 + contrib/Makefile.am | 4 +- contrib/{paclog-pkglist => paclog-pkglist.in} | 61 ++++++++++------- etc/makepkg.conf.in | 2 +- lib/libalpm/remove.c | 47 +++++++++++-- lib/libalpm/signing.c | 14 +++- lib/libalpm/trans.c | 3 +- lib/libalpm/util.c | 89 +++++++++++++++++++++++++ lib/libalpm/util.h | 2 + scripts/.gitignore | 5 +- scripts/makepkg.sh.in | 4 +- scripts/repo-add.sh.in | 5 +- test/pacman/pmrule.py | 8 ++ test/pacman/tests/epoch005.py | 25 +++++++ test/pacman/tests/remove070.py | 24 +++++-- 16 files changed, 242 insertions(+), 56 deletions(-) rename contrib/{paclog-pkglist => paclog-pkglist.in} (53%) create mode 100644 test/pacman/tests/epoch005.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-8-g297cd78
by dan＠archlinux.org 18 Jul '11

18 Jul '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, maint has been updated via 297cd7897bfe060ce46d703e15ad7cbe37aedced (commit) from e378170c2555b656ef87715d8284d038037ced5f (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 297cd7897bfe060ce46d703e15ad7cbe37aedced Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 00:09:19 2011 +1000 makepkg: fix issue with filenames with spaces and noextract Specifying a filename with spaces in a PKGBUILDs noextract array fails due to a lack of quoting. Fixes FS#25100. Reported-by: Thomas Weißschuh <thomas_weissschuh(a)lavabit.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Handle removal of empty directories properly
by Dan McGee 18 Jul '11

18 Jul '11

This addresses FS#25141. We shouldn't remove every empty directory we come across during the removal process unless it is truly not known to any other package. This will prevent removal of essential directories such as '/var/lock/'. This is accomplished by first checking the empty/non-empty status of a directory, which was previously done implicitly by calling rmdir() and ignoring errors. We do this to avoid the next (new) check in most cases, which is to look at all local packages to see if the to-be-removed directory is present in another packages' filelist. If we do not find it anywhere, then we remove it, else we keep the file around. The pactest has been updated to test more cases, as well as finding a flaw in the original expected to fail case- we need separate DIR and FILE based EXIST rules. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 41 ++++++++++++++++++++++++++++++++++----- lib/libalpm/util.c | 29 ++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + test/pacman/pmrule.py | 8 +++++++ test/pacman/tests/remove070.py | 24 +++++++++++++++------- 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index b15dbaa..b946abc 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -232,8 +232,8 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, * see the big comment block in db_find_fileconflicts() for an * explanation. */ if(alpm_list_find_str(skip_remove, fileobj->name)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", - file); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s is in skip_remove, skipping removal\n", file); return; } @@ -247,11 +247,40 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, } if(S_ISDIR(buf.st_mode)) { - if(rmdir(file)) { - /* this is okay, other packages are probably using it (like /usr) */ - _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s\n", file); + ssize_t filecount = _alpm_files_in_directory(handle, file); + /* if we have files, no need to remove the directory */ + if(filecount > 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (%zd files)\n", + file, filecount); + } else if(filecount < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (could not count files)\n", file); } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "removing directory %s\n", file); + /* one last check- does any other package own this file? */ + alpm_list_t *local, *local_pkgs; + int found = 0; + local_pkgs = _alpm_db_get_pkgcache(handle->db_local); + for(local = local_pkgs; local && !found; local = local->next) { + alpm_pkg_t *local_pkg = local->data; + alpm_list_t *files; + + /* we duplicated the package when we put it in the removal list, so we + * so we can't use direct pointer comparison here. */ + if(_alpm_pkg_cmp(info, local_pkg) == 0) { + continue; + } + files = alpm_pkg_get_files(local_pkg); + if(_alpm_filelist_contains(files, fileobj->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (owned by %s)\n", file, local_pkg->name); + found = 1; + } + } + if(!found) { + rmdir(file); + _alpm_log(handle, ALPM_LOG_DEBUG, + "removing directory %s (no remaining owners)\n", file); + } } } else { /* if the file needs backup and has been modified, back it up to .pacsave */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index cd7f19c..af2db76 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -388,6 +388,35 @@ int _alpm_rmrf(const char *path) return 0; } +ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path) +{ + ssize_t files = 0; + struct dirent *ent; + DIR *dir = opendir(path); + + if(!dir) { + if(errno == ENOTDIR) { + _alpm_log(handle, ALPM_LOG_DEBUG, "%s was not a directory\n", path); + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, "could not read directory %s\n", + path); + } + return -1; + } + while((ent = readdir(dir)) != NULL) { + const char *name = ent->d_name; + + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } + + files++; + } + + closedir(dir); + return files; +} + int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) { int ret = 0; diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 450dac9..2b71c5c 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -100,6 +100,7 @@ int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); +ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path); int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args); int _alpm_run_chroot(alpm_handle_t *handle, const char *path, char *const argv[]); int _alpm_ldconfig(alpm_handle_t *handle); diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 0f6ae60..cb7ae88 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,6 +146,14 @@ def check(self, test): else: print "FILE rule '%s' not found" % case success = -1 + elif kind == "DIR": + filename = os.path.join(test.root, key) + if case == "EXIST": + if not os.path.isdir(filename): + success = 0 + else: + print "DIR rule '%s' not found" % case + success = -1 elif kind == "LINK": filename = os.path.join(test.root, key) if case == "EXIST": diff --git a/test/pacman/tests/remove070.py b/test/pacman/tests/remove070.py index e0587e1..898e2f5 100644 --- a/test/pacman/tests/remove070.py +++ b/test/pacman/tests/remove070.py @@ -1,21 +1,29 @@ -self.description = "Remove a package with an empty directory needed by another package" +self.description = "Remove a package with various directory overlaps" + +self.filesystem = ["lib/alsoonfs/randomfile"] p1 = pmpkg("pkg1") -p1.files = ["bin/pkg1", "opt/"] +p1.files = ["bin/pkg1", + "opt/", + "lib/onlyinp1/", + "lib/alsoonfs/"] p2 = pmpkg("pkg2") -p2.files = ["bin/pkg2", "opt/"] +p2.files = ["bin/pkg2", + "opt/", + "lib/onlyinp2/"] for p in p1, p2: - self.addpkg2db("local", p) + self.addpkg2db("local", p) self.args = "-R %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("!FILE_EXIST=bin/pkg1") -self.addrule("FILE_EXIST=bin/pkg2") -self.addrule("FILE_EXIST=opt/") -self.expectfailure = True +self.addrule("DIR_EXIST=bin/") +self.addrule("DIR_EXIST=opt/") +self.addrule("!DIR_EXIST=lib/onlyinp1/") +self.addrule("DIR_EXIST=lib/onlyinp2/") +self.addrule("DIR_EXIST=lib/alsoonfs/") -- 1.7.6

4 3

[pacman-dev] [PATCH 1/3] contrib/paclog-pkglist: fix script name in usage
by Dave Reisner 18 Jul '11

18 Jul '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Just an oversight when I renamed the script, as pointed out by Allan. Sadly, awk doesn't have an equivalent of ${0##*/} when excuted under a #!/bin/awk shebang (ARGV[0] will always show 'awk'), so we just hard code it. contrib/paclog-pkglist | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/paclog-pkglist b/contrib/paclog-pkglist index 2c66e63..5948a0d 100755 --- a/contrib/paclog-pkglist +++ b/contrib/paclog-pkglist @@ -19,8 +19,8 @@ BEGIN { if (ARGC < 2) { - printf "usage: log2pkglist <pacman log>\n" - printf "example: log2pkglist /var/log/pacman.log\n" + printf "usage: paclog-pkglist <pacman log>\n" + printf "example: paclog-pkglist /var/log/pacman.log\n" exit } } -- 1.7.6

2 5

[pacman-dev] [PATCH] repo-add: always remove repo signature symlink
by Allan McRae 18 Jul '11

18 Jul '11

This prevents a dangling symlink being left behind if the repo goes from being signed to unsigned. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index db8f6b0..c598ad9 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -652,12 +652,11 @@ if (( success )); then [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} - rm -f "$dblink" + rm -f "$dblink" "$dblink.sig" ln -s "$target" "$dblink" 2>/dev/null || \ ln "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" if [[ -f "$target.sig" ]]; then - rm -f "$dblink.sig" ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \ ln "$target.sig" "$dblink.sig" 2>/dev/null || \ cp "$REPO_DB_FILE.sig" "$dblink.sig" -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: refactor checking source integrity
by Allan McRae 18 Jul '11

18 Jul '11

Move the source integrity checking into its own function as the code was duplicated and is now more complicated with the separation of the two checks types. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 296bab3..0682e4f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -753,6 +753,21 @@ check_pgpsigs() { fi } +check_source_integrity() { + if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then + warning "$(gettext "Skipping all source file integrity checks.")" + elif (( SKIPCHECKSUMS )); then + warning "$(gettext "Skipping verification of source file checksums.")" + check_pgpsigs + elif (( SKIPPGPCHECK )); then + warning "$(gettext "Skipping verification of source file PGP signatures.")" + check_checksums + else + check_checksums + check_pgpsigs + fi +} + extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile @@ -2214,18 +2229,7 @@ if (( SOURCEONLY )); then (( SOURCEONLY == 2 )); then download_sources fi - if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then - warning "$(gettext "Skipping all source file integrity checks.")" - elif (( SKIPCHECKSUMS )); then - warning "$(gettext "Skipping verification of source file checksums.")" - check_pgpsigs - elif (( SKIPPGPCHECK )); then - warning "$(gettext "Skipping verification of source file PGP signatures.")" - check_checksums - else - check_checksums - check_pgpsigs - fi + check_source_integrity cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it @@ -2299,18 +2303,7 @@ elif (( REPKG )); then fi else download_sources - if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then - warning "$(gettext "Skipping all source file integrity checks.")" - elif (( SKIPCHECKSUMS )); then - warning "$(gettext "Skipping verification of source file checksums.")" - check_pgpsigs - elif (( SKIPPGPCHECK )); then - warning "$(gettext "Skipping verification of source file PGP signatures.")" - check_checksums - else - check_checksums - check_pgpsigs - fi + check_source_integrity extract_sources fi -- 1.7.6

1 0