- Pacman-dev - lists.archlinux.org

[pacman-dev] Download sources from git/hg/etc
by seblu＠seblu.net 06 Jul '11

06 Jul '11

Hello, I would add a new feature in makepkg, which allow downloading of git/hg/cvs/etc content directly by makepkg. This feature can be great for packages in AUR. We have a lot of -git packages which can use this to escape to do it manually each time. I looked over the code and there is a design choice to make. Currently sources url is [filename::]http://toto. If we want to know which kind of url is (regular / git / hg) we need to have this information in PKGBUILD because git can download from http/ftp/git protocol. We can have many array in PKGBUILD as source=("http://toto") gitsouce=("git://toto.git) hgsource=("http://otot.hg) or have a more complex url syntax like [type:::][filename::]http://toto where type can be git/hg/cvs/etc. What do you think? -- Sébastien Luttringer www.seblu.net

7 7

[pacman-dev] [PATCH] doc/PKGBUILD: clarify scriptlet version arguments
by Dan McGee 06 Jul '11

06 Jul '11

It was a bit unclear that both pkgver and pkgrel were included in the passed version strings; clarify this fact in the manpage. Also make two other minor consistency touchups to code-print variables in text. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- On maint, not that I think we will be doing another release. doc/PKGBUILD.5.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c0fa594..0ead546 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -99,7 +99,7 @@ similar to `$_basekernver`. An array of source files required to build the package. Source files must either reside in the same directory as the PKGBUILD file, or be a fully-qualified URL that makepkg will use to download the file. In order - to make the PKGBUILD as useful as possible, use the $pkgname and $pkgver + to make the PKGBUILD as useful as possible, use the `$pkgname` and `$pkgver` variables if possible when specifying the download location. Any files that are compressed will automatically be extracted, unless found in the noextract array listed below. @@ -255,7 +255,7 @@ use here. The function is run in `bash -e` mode, meaning any command that exits with a non-zero status will cause the function to exit. Be sure any exotic commands used are covered by `makedepends`. -All of the above variables such as `pkgname` and `pkgver` are available for use +All of the above variables such as `$pkgname` and `$pkgver` are available for use in the build function. In addition, makepkg defines three variables for your use during the build and install process. These three variables are as follows: @@ -325,27 +325,27 @@ The exact time the script is run varies with each operation: *pre_install*:: script is run right before files are extracted. One argument is passed: - new package version. + new package 'pkgver-pkgrel'. *post_install*:: script is run right after files are extracted. One argument is passed: - new package version. + new package 'pkgver-pkgrel'. *pre_upgrade*:: script is run right before files are extracted. Two arguments are passed - in the following order: new package version, old package version. + in this order: new package 'pkgver-pkgrel', old package 'pkgver-pkgrel'. *post_upgrade*:: script is run after files are extracted. Two arguments are passed - in the following order: new package version, old package version. + in this order: new package 'pkgver-pkgrel', old package 'pkgver-pkgrel'. *pre_remove*:: script is run right before files are removed. One argument is passed: - old package version. + old package 'pkgver-pkgrel'. *post_remove*:: script is run right after files are removed. One argument is passed: - old package version. + old package 'pkgver-pkgrel'. To use this feature, create a file such as 'pkgname.install' and put it in the same directory as the PKGBUILD script. Then use the install directive: -- 1.7.6

1 1

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

06 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 b678e002714b732d7ea6a48029ac1a5b285d04e5 (commit) via 57eac093c40b0a54ab5d9f14519b9e44140e0c3d (commit) via 3eec745910bb908717a8b4ed7f5b630a92a5c9eb (commit) via 6dc71926f9b16ebcf11b924941092d6eab204224 (commit) via 6c9b82e72ac067207b1d66a3112485ad8d690f32 (commit) via eda741ae93519bea80af45e01ba7417cc50a4e1b (commit) via 043931ca452f6b231eb5b9b0863329843677bd2a (commit) via e2f00abe26c530a380ef687e50d91e07c6ba57c4 (commit) via 62880d7568649a54b4af1ffd8a61b488cbacdfd3 (commit) via 36474af463d0d8ce758f827d31a378624062b955 (commit) via ae7139adcfa65991c71616e8de7910ff722d4166 (commit) via 44889da5b704483b7ee013ec828ff64b64980de8 (commit) via 6cce517f1a78df885a1574252b3db9886185159d (commit) from dfc532668d4a4182ce196a895fdd5b017b505c6f (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 b678e002714b732d7ea6a48029ac1a5b285d04e5 Merge: eda741a 57eac09 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 22:01:29 2011 -0500 Merge remote-tracking branch 'dave/download' commit 57eac093c40b0a54ab5d9f14519b9e44140e0c3d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 22:00:07 2011 -0400 absorb fileinfo struct into dload_payload This transitional struct becomes delicious noms for dload_payload. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3eec745910bb908717a8b4ed7f5b630a92a5c9eb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 21:19:25 2011 -0400 absorb some _alpm_download params into payload struct Restore some sanity to the number of arguments passed to _alpm_download and curl_download_internal. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6dc71926f9b16ebcf11b924941092d6eab204224 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 24 00:18:01 2011 -0400 lib/dload: prevent large file attacks This means creating a new struct which can pass more descriptive data from the back end sync functions to the downloader. In particular, we're interested in the download size read from the sync DB. When the remote server reports a size larger than this (via a content-length header), abort the transfer. In cases where the size is unknown, we set a hard upper limit of: * 25MiB for a sync DB * 16KiB for a signature For reference, 25MiB is more than twice the size of all of the current binary repos (with files) combined, and 16KiB is a truly gargantuan signature. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6c9b82e72ac067207b1d66a3112485ad8d690f32 Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 11 12:50:15 2011 -0400 dload: handle irregular URLs URLs might end with a slash and follow redirects, or could be a generated by a script such as /getpkg.php?id=12345. In both cases, we may have a better filename that we can write to, taken from either content-disposition header, or the effective URL. Specific to the first case, we write to a temporary file of the format 'alpmtmp.XXXXXX', where XXXXXX is randomized by mkstemp(3). Since this is a randomly generated file, we cannot support resuming and the file is unlinked in the event of an interrupt. We also run into the possibility of changing out the filename from under alpm on a -U operation, so callers of _alpm_download can optionally pass a pointer to a *char to be filled in by curl_download_internal with the actual filename we wrote to. Any sync operation will pass a NULL pointer here, as we rely on specific names for packages from a mirror. Fixes FS#22645. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit eda741ae93519bea80af45e01ba7417cc50a4e1b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 5 01:28:27 2011 +1000 repo-add: backup old database signature too If you are keeping a copy of the old database, you probably want to keep a copy of its signature too. Also, delete the previously backed-up database signature if no new one is being copied. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 043931ca452f6b231eb5b9b0863329843677bd2a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 14:18:16 2011 -0500 Rework -Si display logic We did some funny stuff here before to allow specifying fully-qualified package names, such as 'testing/gcc' or 'core/gcc'. However, it was done by duplicating code, not to mention an early escape if a repository could not be found for an early target. Something like `pacman -Si foo/bar core/gcc' would not give expected results, although `pacman -Si bar gcc' would. Clean up the code, remove strncpy() usage, and clarify the error messages a bit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e2f00abe26c530a380ef687e50d91e07c6ba57c4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 04:01:14 2011 +1000 pacman-key: fix syntax highlighting The lone quotation mark in "pacman's" causes issues for some syntax highlighting. Change the printing of the nessage from echo to printf so we can invisibly escape it. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62880d7568649a54b4af1ffd8a61b488cbacdfd3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jun 29 12:59:07 2011 -0400 contrib/paclist: rewrite in bash The original concept for this script was a bash implementation, but turned out to be unreasonable at the time due to the efficiencies of the database format. Since those have been resolved, we can rewrite this in bash as a much simpler script. All the action happens in a single line, but we add extend this a little, binding to gettext to keep our pacman translations intact. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36474af463d0d8ce758f827d31a378624062b955 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Jul 5 23:30:54 2011 +0200 fix segfault if pacman.conf can't be read Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ae7139adcfa65991c71616e8de7910ff722d4166 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 14:16:17 2011 -0500 Remove most usages of strncmp() The supposed safety blanket of this function is better handled by explicit length checking and usages of strlen() on known NULL-terminated strings rather than hoping things fit in a buffer. We also have no need to fully fill a PATH_MAX length variable with NULLs every time as long as a single terminating byte is there. Remove usages of it by using strcpy() or memcpy() as appropriate, after doing length checks via strlen(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 44889da5b704483b7ee013ec828ff64b64980de8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 3 19:58:19 2011 -0400 dload: rearrange code to avoid extra cpp block Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6cce517f1a78df885a1574252b3db9886185159d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 3 18:55:04 2011 -0400 lib/rawstr: borrow raw string functions from curl We'll need these functions to do locale agnostic and case insensitive string comparisons. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paclist.in | 85 ++++------------- lib/libalpm/Makefile.am | 1 + lib/libalpm/be_sync.c | 30 ++++-- lib/libalpm/dload.c | 232 +++++++++++++++++++++++++++++++++------------ lib/libalpm/dload.h | 15 ++- lib/libalpm/handle.c | 2 +- lib/libalpm/rawstr.c | 135 +++++++++++++++++++++++++++ lib/libalpm/sync.c | 39 +++++--- lib/libalpm/util.h | 2 + scripts/pacman-key.sh.in | 2 +- scripts/repo-add.sh.in | 6 +- src/pacman/conf.c | 4 +- src/pacman/query.c | 17 ++-- src/pacman/sync.c | 78 ++++++---------- src/pacman/util.c | 11 +-- src/util/vercmp.c | 2 +- 16 files changed, 439 insertions(+), 222 deletions(-) create mode 100644 lib/libalpm/rawstr.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] fix segfault if pacman.conf can't be read
by Florian Pritz 05 Jul '11

05 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/conf.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3af3fa5..fac6da3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -750,7 +750,9 @@ static int _parseconfig(const char *file, struct section_t *section, } cleanup: - fclose(fp); + if (fp) { + fclose(fp); + } pm_printf(ALPM_LOG_DEBUG, "config: finished parsing %s\n", file); return ret; } -- 1.7.6

1 0

[pacman-dev] [PATCH] fix segfault if pacman.conf can't be read
by Florian Pritz 05 Jul '11

05 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3af3fa5..b724ae3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -750,7 +750,7 @@ static int _parseconfig(const char *file, struct section_t *section, } cleanup: - fclose(fp); + if (fp) fclose(fp); pm_printf(ALPM_LOG_DEBUG, "config: finished parsing %s\n", file); return ret; } -- 1.7.6

1 0

[pacman-dev] [PATCH] fix segfault if pacman.conf can't be read
by Florian Pritz 05 Jul '11

05 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3af3fa5..b724ae3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -750,7 +750,7 @@ static int _parseconfig(const char *file, struct section_t *section, } cleanup: - fclose(fp); + if (fp) fclose(fp); pm_printf(ALPM_LOG_DEBUG, "config: finished parsing %s\n", file); return ret; } -- 1.7.6

2 1

[pacman-dev] Mirrorlist as Dependency
by David J. Haines 05 Jul '11

05 Jul '11

All, I was wondering whether it would be perhaps closer to KISS and/or more logically coherent not to have pacman-mirrorlist as a dependency of pacman. You don't actually need the mirrors to use pacman, and if you maintain a local mirror or build your own packages with ABS, /etc/pacman.d/mirrorlist just gets in the way and/or becomes cruft. Thoughts? David J. Haines dhaines(a)gmail.com

3 4

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

05 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 dfc532668d4a4182ce196a895fdd5b017b505c6f (commit) via 77a93328cfb317ceae4cf0fbde98be14316ff769 (commit) via bfd6d22be20d939dfd77a75f21c790b55548ab4a (commit) via 87ee38d8b3d155310d13e2539e8647a98115df80 (commit) via ddb8617d96675c8009d2aa99d6cc47e002339a51 (commit) via 24324ff0e12a3e19cada669a4c5c391e486790a3 (commit) via 97103f860d48e1f6f9c0dd7c75568618f8ed5163 (commit) via c748eadc80593c3941b55b1d4ec6e46899abd295 (commit) via 07502f2d82393854f36f5c3ff608458e74fcb747 (commit) via e8443b1685cc99cf3a46461e7a12c9b616fac44e (commit) via 7af0ab1cde9398c938a7a221aca5787934a16121 (commit) from 1ce7f39ad73c5c96870c6036014afad3d49a8edf (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 dfc532668d4a4182ce196a895fdd5b017b505c6f Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 00:30:17 2011 +1000 makepkg: update --pkg desciption in man page Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77a93328cfb317ceae4cf0fbde98be14316ff769 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 5 23:46:08 2011 +1000 Add library files to POTFILES.in Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bfd6d22be20d939dfd77a75f21c790b55548ab4a Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 5 20:14:20 2011 +1000 parse_options: accept multiple arguments Allow command-line options to accept multiple arguments without additional quoting by taking the list of arguments until one starting with a "-" is reached. The only current use of this is the --pkg option in makepkg. This allows (e.g.) makepkg --pkg foo bar and packages "foo" and "bar" will be built. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87ee38d8b3d155310d13e2539e8647a98115df80 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 5 19:01:22 2011 +1000 parse_options: implement optional arguments This allows options specified with a trailing "::" to optionally take arguments. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ddb8617d96675c8009d2aa99d6cc47e002339a51 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 5 17:34:03 2011 +1000 parse_options: add missing newlines Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24324ff0e12a3e19cada669a4c5c391e486790a3 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 4 11:17:12 2011 +1000 Simplify alpm_list_previous We can readily detect the first node in a list by checking if node->prev->next is NULL. So there is no need to pass the head of the list to this function and its prototype now looks like all the other item accessors. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 97103f860d48e1f6f9c0dd7c75568618f8ed5163 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 4 08:38:09 2011 +1000 Remove alpm_list_first The only thing this accessor did was remove the const qualifier given our entire list implementation requires passing around the head anyway. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c748eadc80593c3941b55b1d4ec6e46899abd295 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 23:08:06 2011 -0500 Allow invalid sync DBs to be returned by the library They are placeholders, but important for things like trying to re-sync a database missing a signature. By using the alpm_db_validity() method at the right time, a client can take the appropriate action with these invalid databases as necessary. In pacman's case, we disallow just about anything that involves looking at a sync database outside of an '-Sy' operation (although we do check the validity immediately after). A few operations are still permitted- '-Q' ops that don't touch sync databases as well as '-R'. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07502f2d82393854f36f5c3ff608458e74fcb747 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 1 16:50:32 2011 -0500 Allow frontend access to signature verification information Show output in -Qip for each package signature, which includes the UID string from the key ("Joe User <joe(a)example.com>") and the validity of said key. Example output: Signatures : Valid signature from "Dan McGee <dpmcgee(a)gmail.com>" Unknown signature from "<Key Unknown>" Invalid signature from "Dan McGee <dpmcgee(a)gmail.com>" Also add a backend alpm_sigresult_cleanup() function since memory allocation took place on this object, and we need some way of freeing it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e8443b1685cc99cf3a46461e7a12c9b616fac44e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 1 15:51:21 2011 -0500 Correctly check the GPG error codes The error code is in fact a bitmask value of an error code and an error source, so use the proper function to get only the relevant bits. For the no error case, this shouldn't ever matter, but it bit me when I was trying to compare the error code to other values and wondered why it wasn't working, so set a good example. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7af0ab1cde9398c938a7a221aca5787934a16121 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 27 16:29:49 2011 -0500 signing: move to new signing verification and return scheme This gives us more granularity than the former Never/Optional/Always trifecta. The frontend still uses these values temporarily but that will be changed in a future patch. * Use 'siglevel' consistenly in method names, 'level' as variable name * The level becomes an enum bitmask value for flexibility * Signature check methods now return a array of status codes rather than a simple integer success/failure value. This allows callers to determine whether things such as an unknown signature are valid. * Specific signature error codes mostly disappear in favor of the above returned status code; pm_errno is now set only to PKG_INVALID_SIG or DB_INVALID_SIG as appropriate. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 3 +- lib/libalpm/alpm.h | 69 ++++++++++---- lib/libalpm/alpm_list.c | 23 +---- lib/libalpm/alpm_list.h | 3 +- lib/libalpm/be_package.c | 20 ++-- lib/libalpm/be_sync.c | 36 +++----- lib/libalpm/db.c | 16 ++-- lib/libalpm/db.h | 4 +- lib/libalpm/dload.c | 5 +- lib/libalpm/error.c | 12 ++- lib/libalpm/handle.c | 15 ++-- lib/libalpm/handle.h | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 4 +- lib/libalpm/signing.c | 190 ++++++++++++++++++++++++++++++-------- lib/libalpm/signing.h | 5 +- lib/libalpm/sync.c | 14 ++- lib/libalpm/trans.c | 8 -- scripts/library/parse_options.sh | 51 ++++++++--- scripts/po/POTFILES.in | 2 + src/pacman/conf.c | 38 ++++---- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/package.c | 11 ++ src/pacman/query.c | 9 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 17 ++-- src/pacman/upgrade.c | 6 +- src/pacman/util.c | 80 +++++++++++++++- src/pacman/util.h | 4 +- src/util/cleanupdelta.c | 3 +- src/util/pactree.c | 3 +- src/util/testdb.c | 3 +- src/util/testpkg.c | 3 +- 34 files changed, 454 insertions(+), 213 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/3] parse_options: implement features useful for pacman-key
by Allan McRae 05 Jul '11

05 Jul '11

The implementation of optional arguments and accepting multiple arguments are features that are required for using the option parser in pacman-key. e.g. pacman-key --add [<file(s)>] This can take no arguments or an arbitary number of arguments. Allan McRae (3): parse_options: add missing newlines parse_options: implement optional arguments parse_options: accept multiple arguments scripts/library/parse_options.sh | 44 ++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 9 deletions(-) -- 1.7.6

3 9

[pacman-dev] [PATCH] check if keyring is readable
by Florian Pritz 05 Jul '11

05 Jul '11

If we can't read the keyring, gpgme will output confusing debug information and fail to verify the signature, so we should warn the user before. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/signing.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 1ac9963..19d3454 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -110,6 +110,8 @@ static int init_gpgme(alpm_handle_t *handle) const char *version, *sigdir; gpgme_error_t err; gpgme_engine_info_t enginfo; + const char *needed_files[] = {"secring.gpg", "trustdb.gpg", "gpg.conf", NULL}; + int i = 0; if(init) { /* we already successfully initialized the library */ @@ -121,6 +123,21 @@ static int init_gpgme(alpm_handle_t *handle) RET_ERR(handle, ALPM_ERR_SIG_MISSINGDIR, 1); } + i = 0; + while (needed_files[i] != NULL) { + char *check_path = NULL; + size_t len = strlen(sigdir) + strlen(needed_files[i]) + 1; + + CALLOC(check_path, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(check_path, len, "%s%s", sigdir, needed_files[i]); + + if(access(check_path, R_OK) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, _("\"%s\" not readable. Signature verification will likely fail!\n"), check_path); + } + i++; + } + + /* calling gpgme_check_version() returns the current version and runs * some internal library setup code */ version = gpgme_check_version(NULL); -- 1.7.6

1 0