- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Make functions to decode a signature and extract keyid public
by Allan McRae 15 Oct '13

15 Oct '13

These are useful for frontends. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 6 ++++++ lib/libalpm/be_package.c | 2 +- lib/libalpm/signing.c | 6 +++--- lib/libalpm/signing.h | 5 ----- lib/libalpm/sync.c | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b049007..29b9f37 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1075,6 +1075,12 @@ int alpm_db_check_pgp_signature(alpm_db_t *db, alpm_siglist_t *siglist); int alpm_siglist_cleanup(alpm_siglist_t *siglist); +int alpm_decode_signature(const char *base64_data, + unsigned char **data, size_t *data_len); + +int alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, + const unsigned char *sig, const size_t len, alpm_list_t **keys); + /* * Groups */ diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 526d927..3f577ba 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -570,7 +570,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return -1; } - if(_alpm_extract_keyid(handle, filename, sig, len, &keys) == 0) { + if(alpm_extract_keyid(handle, filename, sig, len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index a856f13..7e4d41b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -425,7 +425,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr) * @return 0 on success, -1 on failure to properly decode */ -int _alpm_decode_signature(const char *base64_data, +int SYMEXPORT alpm_decode_signature(const char *base64_data, unsigned char **data, size_t *data_len) { size_t len = strlen(base64_data); @@ -525,7 +525,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, if(base64_sig) { /* memory-based, we loaded it from a sync DB */ size_t data_len; - int decode_ret = _alpm_decode_signature(base64_sig, + int decode_ret = alpm_decode_signature(base64_sig, &decoded_sigdata, &data_len); if(decode_ret) { handle->pm_errno = ALPM_ERR_SIG_INVALID; @@ -964,7 +964,7 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist) * @param keys a pointer to storage for key IDs * @return 0 on success, -1 on error */ -int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, +int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, const unsigned char *sig, const size_t len, alpm_list_t **keys) { size_t pos, spos, blen, hlen, ulen, slen; diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 2d49240..42b60b1 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -34,11 +34,6 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); int _alpm_key_import(alpm_handle_t *handle, const char *fpr); -int _alpm_decode_signature(const char *base64_data, - unsigned char **data, size_t *data_len); -int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, - const unsigned char *sig, const size_t len, alpm_list_t **keys); - #endif /* _ALPM_SIGNING_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9081c73..a4b1bb8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1007,11 +1007,11 @@ static int check_keyring(alpm_handle_t *handle) if((level & ALPM_SIG_PACKAGE) && pkg->base64_sig) { unsigned char *decoded_sigdata = NULL; size_t data_len; - int decode_ret = _alpm_decode_signature(pkg->base64_sig, + int decode_ret = alpm_decode_signature(pkg->base64_sig, &decoded_sigdata, &data_len); if(decode_ret == 0) { alpm_list_t *keys = NULL; - if(_alpm_extract_keyid(handle, pkg->name, decoded_sigdata, + if(alpm_extract_keyid(handle, pkg->name, decoded_sigdata, data_len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { -- 1.8.4

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-172-g968486e
by allan＠archlinux.org 15 Oct '13

15 Oct '13

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 968486ecc0c20f3b075ad9b903b9df862621610a (commit) via e049bb8bd6bb3b8aacf371abde937d2270cfa451 (commit) via e7ad883ebe41a25a63f4349ea08d589ec48c3539 (commit) via c69d71d55bfab10c1d021a0db3efe793250f687a (commit) via fb0f880f0a19d0b1b0630472a8fce83fde9451f3 (commit) via dcfc247a2c56e31ed6d30e56ac982329c641f78d (commit) via 3e903d34cca81a73858309d6a9be289b422ec3b4 (commit) via 217aaaf3ea6d533ee77e4fad19d320c70a302382 (commit) via ed511b141f1680b52efe3338eb90a9598af0a4dd (commit) from e5f23e0ebb14be22623c38130e6c2b3c37954a2b (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 968486ecc0c20f3b075ad9b903b9df862621610a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 14 09:13:28 2013 -0400 makepkg: validate updated pkgver before replacement Validate the new pkgver efore blindly ramming it into the PKGBUILD. This gives us good feedback and prevents corrupting the PKGBUILD, e.g. ==> Starting pkgver()... ==> ERROR: pkgver is not allowed to contain colons, hyphens or whitespace. ==> ERROR: pkgver() generated an invalid version: a horse is not a pkgver As an additional failsafe, exchange a valid for invalid character as command separator in @SEDINPLACE@ expressions. For even more paranoia, exit if sed fails for any reason. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e049bb8bd6bb3b8aacf371abde937d2270cfa451 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 21:04:22 2013 +1000 Ensure packages have a valid version Currently you can manually create and then install a package with a version not containing a pkgrel. The created local database entry is invalid as the directory name can not be split by _alpm_splitname due to the assumtion of hyphens separating name-pkgver-pkgrel. Ensure the package has a valid version when it is loaded. Fixes FS#35514. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e7ad883ebe41a25a63f4349ea08d589ec48c3539 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 16:35:09 2013 +1000 makepkg: use source_safe when resourcing BUILDFILE After updating the pkgver, we still need to safely source the BUILDFILE. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c69d71d55bfab10c1d021a0db3efe793250f687a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 16:12:00 2013 +1000 contrib/pacdiff: error if diffprog is not found FS#35936 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fb0f880f0a19d0b1b0630472a8fce83fde9451f3 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 15:55:39 2013 +1000 proto: remove missed $srcdir redundancies Most of the redundant "cd $srcdir" in the prototypes were removed in commit 5f80d7af. Fix the rest. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dcfc247a2c56e31ed6d30e56ac982329c641f78d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 14:55:20 2013 +1000 Fix progress bar overflow while checking package integrity On 32bit systems, the progress bar intergrity checking can show values greater than 100% with large transactions. This is due to the total size of all package files being greater than a size_t. Use uint64_t for these sizes. Fixes FS#36608 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3e903d34cca81a73858309d6a9be289b422ec3b4 Author: Eric Toombs <ewtoombs(a)uwaterloo.ca> Date: Wed Sep 11 23:21:34 2013 -0400 Added list of mandatory options to PKGBUILD's man page [Allan: Adjust wording due to remove al license warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 217aaaf3ea6d533ee77e4fad19d320c70a302382 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 13 23:20:08 2013 -0400 autogen.sh: remove useless shell flag and subshells $ ./autogen.sh ./autogen.sh: 3: ./autogen.sh: BASH_SOURCE: parameter not set The -u flag causes this (and lots of other mysterious problems). Since there aren't even any variables in this script, it makes no sense to use it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ed511b141f1680b52efe3338eb90a9598af0a4dd Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 20:00:11 2013 +1000 Report which package is missing a signature If any package in a sync transaction is missing a required signature, we give an uninformative error message (which may or may not state that the missing signature is the issue). Always output the package with the missing signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: autogen.sh | 6 ++++-- contrib/pacdiff.sh.in | 5 +++++ doc/PKGBUILD.5.txt | 4 +++- lib/libalpm/be_package.c | 4 ++++ lib/libalpm/sync.c | 13 +++++++++---- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- scripts/makepkg.sh.in | 27 +++++++++++++++++++-------- 8 files changed, 46 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: exit if updating pkgver fails
by Allan McRae 14 Oct '13

14 Oct '13

From: Zach Buhman <zack(a)buhman.org> [Allan: add details to failure message] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cedef4c..db344a3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -813,7 +813,11 @@ update_pkgver() { if [[ -n $newpkgver && $newpkgver != "$pkgver" ]]; then if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then - @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" + if ! @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE"; then + error "$(gettext "Failure updating %s from %s to %s")" + "pkgver" "$pkgver" "$newpkgver" + exit 1 + fi @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" source_safe "$BUILDFILE" local fullver=$(get_full_version) -- 1.8.4

3 3

[pacman-dev] [PATCH] Ensure packages have a valid version
by Allan McRae 14 Oct '13

14 Oct '13

Currently you can manually create and then install a package with a version not containing a pkgrel. The created local database entry is invalid as the directory name can not be split by _alpm_splitname due to the assumtion of hyphens separating name-pkgver-pkgrel. Ensure the package has a valid version when it is loaded. Fixes FS#35514. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 6262621..69871c2 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -413,6 +413,10 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_ERROR, _("missing package version in %s\n"), pkgfile); goto pkg_invalid; } + if(strstr(newpkg->version, "-") == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("invalid package version in %s\n"), pkgfile); + goto pkg_invalid; + } config = 1; continue; } else if(strcmp(entry_name, ".INSTALL") == 0) { -- 1.8.4

2 2

[pacman-dev] [PATCH] makepkg: use source_safe when resourcing BUILDFILE
by Allan McRae 14 Oct '13

14 Oct '13

After updating the pkgver, we still need to safely source the BUILDFILE. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2b01c46..cedef4c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -815,7 +815,7 @@ update_pkgver() { if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" - source "$BUILDFILE" + source_safe "$BUILDFILE" local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" else -- 1.8.4

1 0

[pacman-dev] [PATCH] contrib/pacdiff: error if diffprog is not found
by Allan McRae 14 Oct '13

14 Oct '13

FS#35936 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/pacdiff.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 711763b..6e70fee 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -116,6 +116,11 @@ done m4_include(../scripts/library/term_colors.sh) +if ! type -p $diffprog >/dev/null; then + error "Cannot find the $diffprog binary required for viewing differences." + exit 1 +fi + case $(( USE_FIND + USE_LOCATE + USE_PACDB )) in 0) USE_PACDB=1;; # set the default search option [^1]) error "Only one search option may be used at a time" -- 1.8.4

1 0

[pacman-dev] [PATCH] proto: remove missed $srcdir redundancies
by Allan McRae 14 Oct '13

14 Oct '13

Most of the redundant "cd $srcdir" in the prototypes were removed in commit 5f80d7af. Fix the rest. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index fb4ca7b..f341052 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -30,7 +30,7 @@ noextract=() md5sums=() #generate with 'makepkg -g' prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" } diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 1380a0f..8d26c81 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -30,7 +30,7 @@ noextract=() md5sums=() #generate with 'makepkg -g' prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" } -- 1.8.4

1 0

[pacman-dev] [PATCH] Fix progress bar overflow while checking package integrity
by Allan McRae 14 Oct '13

14 Oct '13

On 32bit systems, the progress bar intergrity checking can show values greater than 100% with large transactions. This is due to the total size of all package files being greater than a size_t. Use uint64_t for these sizes. Fixes FS#36608 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/sync.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 0d01a5a..9081c73 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1054,7 +1054,7 @@ static int check_keyring(alpm_handle_t *handle) #endif /* HAVE_LIBGPGME */ static int check_validity(alpm_handle_t *handle, - size_t total, size_t total_bytes) + size_t total, uint64_t total_bytes) { struct validity { alpm_pkg_t *pkg; @@ -1064,7 +1064,8 @@ static int check_validity(alpm_handle_t *handle, alpm_pkgvalidation_t validation; alpm_errno_t error; }; - size_t current = 0, current_bytes = 0; + size_t current = 0; + uint64_t current_bytes = 0; alpm_list_t *i, *errors = NULL; /* Check integrity of packages */ @@ -1197,7 +1198,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) { alpm_list_t *i, *deltas = NULL; - size_t total = 0, total_bytes = 0; + size_t total = 0; + uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans; if(download_files(handle, &deltas)) { -- 1.8.4

1 0

[pacman-dev] [PATCH] Added list of mandatory options to PKGBUILD's man page
by Allan McRae 14 Oct '13

14 Oct '13

From: Eric Toombs <ewtoombs(a)uwaterloo.ca> [Allan: Adjust wording due to remove al license warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 1b229aa..4ac7dc1 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -30,7 +30,9 @@ Options and Directives ---------------------- The following is a list of standard options and directives available for use in a PKGBUILD. These are all understood and interpreted by makepkg, and most -of them will be directly transferred to the built package. +of them will be directly transferred to the built package. The mandatory +fields for a minimally functional PKGBUILD are *pkgname*, *pkgver*, *pkgrel* +and *arch*. If you need to create any custom variables for use in your build process, it is recommended to prefix their name with an '_' (underscore). -- 1.8.4

1 0

[pacman-dev] [PATCH] autogen.sh: remove useless shell flag and subshells
by Dave Reisner 14 Oct '13

14 Oct '13

>From a bash shell where /bin/sh -> /bin/dash: $ ./autogen.sh ./autogen.sh: 3: ./autogen.sh: BASH_SOURCE: parameter not set The -u flag causes this (and lots of other mysterious problems). Since there aren't even any variables in this script, it makes no sense to use it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- autogen.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 588e63d..18fa641 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,6 @@ -#!/bin/sh -xu +#!/bin/sh -x autoreconf -i -(cd build-aux && (patch -Np0 -i ltmain-asneeded.patch || true)) +patch -d build-aux -Np0 -i ltmain-asneeded.patch + +exit 0 -- 1.8.4

1 0