July 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 4/6] Signature verification functions
by Denis A. Altoé Falqueto 07 Jul '10

07 Jul '10

Two functions were created to verify the signatures made: _alpm_gpg_checksig_memory checks signatures which are in memory. The packages' signatures are stored in the repository database and are kept in memory when they need to be verified. This function will put them in a temporary file and call the function below to make the real verification. _alpm_gpg_checksig_file does the real verification, calling gpg in a subprocess and checking if the signature is valid and the key used is trusted. The return values for both functions are: 0 = valid; 1 = invalid; -1 = error while verifying. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> --- lib/libalpm/signing.c | 282 +++++++++++++++++++++++-------------------------- lib/libalpm/signing.h | 3 +- 2 files changed, 135 insertions(+), 150 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 2b15528..80eba15 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -17,13 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - -#include <stdlib.h> #include <stdio.h> -#include <string.h> -#include <locale.h> /* setlocale() */ -#include <gpgme.h> +#include <errno.h> /* libalpm */ #include "signing.h" @@ -32,169 +27,158 @@ #include "log.h" #include "alpm.h" -#define CHECK_ERR(void) do { \ - if(err != GPG_ERR_NO_ERROR) { goto error; } \ - } while(0) +// Max length of the command line string. I believe that it is enough... +#define MAX_COMMAND 2048 +#define MAX_LINE 1024 +#define TRUST_MARGINAL "[GNUPG:] TRUST_MARGINAL" +#define TRUST_FULLY "[GNUPG:] TRUST_FULLY" +#define TRUST_ULTIMATE "[GNUPG:] TRUST_ULTIMATE" + +// Names of files related to the keyring +#define PACMAN_KEYRING_DIR "/etc/pacman.d/gnupg" +#define PACMAN_SECRET "secret.gpg" +#define PACMAN_TRUSTDB "trustdb.gpg" +#define PACMAN_KEYRING "pacman.gpg" +#define PACMAN_SHARE_DIR "/usr/share/pacman" + +// Commands and common parameters +#define GPG_PROGRAM "gpg2" +#define GPG GPG_PROGRAM " --ignore-time-conflict --no-options --no-default-keyring" +#define GPG_PACMAN GPG " --status-fd 1 --homedir " PACMAN_KEYRING_DIR " --secret-keyring " \ + PACMAN_KEYRING_DIR "/" PACMAN_SECRET " --trustdb-name " PACMAN_KEYRING_DIR \ + "/" PACMAN_TRUSTDB " --keyring " PACMAN_KEYRING_DIR "/" PACMAN_KEYRING \ + " --primary-keyring " PACMAN_KEYRING_DIR "/" PACMAN_KEYRING " 2> /dev/null" -static int gpgme_init(void) +/** + * Check the PGP package signature for the given package file. + * The signature is stored on memory, so it needs to be saved to + * a temporary file. + * @param pkgpath the full path to a package file + * @param sig PGP signature data in raw form (already decoded) + * @return a int value : 0 (valid), 1 (invalid), -1 (an error occured) + */ +int _alpm_gpg_checksig_memory(const char *pkgpath, const pmpgpsig_t *sig) { - static int init = 0; - const char *version; - gpgme_error_t err; - gpgme_engine_info_t enginfo; - - ALPM_LOG_FUNC; - - if(init) { - /* we already successfully initialized the library */ - return(0); + int status = 1, i; + char *tmpName = NULL; + FILE *tmpSig = NULL; + + // Get a temporary file, which will store the signature. + while (tmpSig == NULL) { + tmpName = tempnam(NULL, "pacman"); + if (tmpName == NULL) { + _alpm_log(PM_LOG_ERROR, _("Unable to create a temporary file name.\n")); + status = -1; + goto cleanup; + } + _alpm_log(PM_LOG_DEBUG, "tmpName: \'%s\'\n", tmpName); + + // Write the signature to the temporary file + tmpSig = fopen(tmpName, "w+x"); + if (tmpSig == NULL && errno == EEXIST) { + _alpm_log(PM_LOG_DEBUG, "the temporary file already exists\n"); + FREE(tmpName); + } else if (tmpSig == NULL) { + _alpm_log(PM_LOG_ERROR, _("Unable to create a temporary file.\n")); + status = -1; + goto cleanup; + } } - if(!alpm_option_get_signaturedir()) { - RET_ERR(PM_ERR_SIG_MISSINGDIR, 1); + // Copy the signature into the temp file + // Write the bytes at once, to make it more efficient + for (i = 0; i < sig->rawlen; i++) { + if (fputc(sig->rawdata[i], tmpSig) == EOF) { + _alpm_log(PM_LOG_ERROR, _("Error writing signature to temporary file\n")); + status = -1; + goto cleanup; + } } - /* calling gpgme_check_version() returns the current version and runs - * some internal library setup code */ - version = gpgme_check_version(NULL); - _alpm_log(PM_LOG_DEBUG, "GPGME version: %s\n", version); - gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL)); -#ifdef LC_MESSAGES - gpgme_set_locale(NULL, LC_MESSAGES, setlocale(LC_MESSAGES, NULL)); -#endif - /* NOTE: - * The GPGME library installs a SIGPIPE signal handler automatically if - * the default signal hander is in use. The only time we set a handler - * for SIGPIPE is in dload.c, and we reset it when we are done. Given that - * we do this, we can let GPGME do its automagic. However, if we install - * a library-wide SIGPIPE handler, we will have to be careful. - */ - - /* check for OpenPGP support (should be a no-brainer, but be safe) */ - err = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP); - CHECK_ERR(); - - /* set and check engine information */ - err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, NULL, - alpm_option_get_signaturedir()); - CHECK_ERR(); - err = gpgme_get_engine_info(&enginfo); - CHECK_ERR(); - _alpm_log(PM_LOG_DEBUG, "GPGME engine info: file=%s, home=%s\n", - enginfo->file_name, enginfo->home_dir); - - init = 1; - return(0); - -error: - _alpm_log(PM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); - RET_ERR(PM_ERR_GPGME, 1); + // Close the temporary file so that gpg can use it + fclose(tmpSig); + tmpSig = NULL; + + // Calls the function that checks the signature in a file + status = _alpm_gpg_checksig_file(pkgpath, tmpName); +cleanup: + if (tmpSig != NULL) { + fclose(tmpSig); + } + if (tmpName != NULL) { + // Delete the temporary file, if it exists + if (access(tmpName, F_OK) != -1) { + remove(tmpName); + } + + FREE(tmpName); + } + return status; } /** * Check the PGP package signature for the given package file. + * The signature is stored in a file, which is passed to gpg. * @param pkgpath the full path to a package file - * @param sig PGP signature data in raw form (already decoded) + * @param sigpath path to the PGP Signature file. * @return a int value : 0 (valid), 1 (invalid), -1 (an error occured) */ -int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig) +int _alpm_gpg_checksig_file(const char *pkgpath, const char *sigpath) { - int ret = 0; - gpgme_error_t err; - gpgme_ctx_t ctx; - gpgme_data_t pkgdata, sigdata; - gpgme_verify_result_t result; - gpgme_signature_t gpgsig; - FILE *pkgfile = NULL, *sigfile = NULL; - - ALPM_LOG_FUNC; - - if(!sig || !sig->rawdata) { - RET_ERR(PM_ERR_SIG_UNKNOWN, -1); - } - if(!pkgpath || access(pkgpath, R_OK) != 0) { - RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + int status = 1; + char *command = NULL, *line = NULL; + FILE *output = NULL; + int resultCommand = 0, statusCommand = 0, trusted = 0; + + CALLOC(command, MAX_COMMAND, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL)); + + if (snprintf(command, MAX_COMMAND, GPG_PACMAN " --verify %s %s", sigpath, pkgpath) >= MAX_COMMAND) { + _alpm_log(PM_LOG_ERROR, _("The gpg command string is too long\n")); + status = -1; + goto cleanup; } - if(gpgme_init()) { - /* pm_errno was set in gpgme_init() */ - return(-1); + _alpm_log(PM_LOG_DEBUG, "gpg command is: \'%s\'\n", command); + + output = popen(command, "r"); + if (output == NULL) { + _alpm_log(PM_LOG_ERROR, _("Error calling gpg2 external program\n")); + status = -1; + goto cleanup; } - err = gpgme_new(&ctx); - CHECK_ERR(); - - /* create our necessary data objects to verify the signature */ - /* first the package itself */ - pkgfile = fopen(pkgpath, "rb"); - if(pkgfile == NULL) { - pm_errno = PM_ERR_PKG_OPEN; - ret = -1; - goto error; - } - err = gpgme_data_new_from_stream(&pkgdata, pkgfile); - CHECK_ERR(); - - /* next create data object for the signature */ - err = gpgme_data_new_from_mem(&sigdata, (char*)sig->rawdata, sig->rawlen, 0); - CHECK_ERR(); - - /* here's where the magic happens */ - err = gpgme_op_verify(ctx, sigdata, pkgdata, NULL); - CHECK_ERR(); - result = gpgme_op_verify_result(ctx); - gpgsig = result->signatures; - if (!gpgsig || gpgsig->next) { - _alpm_log(PM_LOG_ERROR, _("Unexpected number of signatures\n")); - ret = -1; - goto error; - } - fprintf(stdout, "\nsummary=%x\n", gpgsig->summary); - fprintf(stdout, "fpr=%s\n", gpgsig->fpr); - fprintf(stdout, "status=%d\n", gpgsig->status); - fprintf(stdout, "timestamp=%lu\n", gpgsig->timestamp); - fprintf(stdout, "wrong_key_usage=%u\n", gpgsig->wrong_key_usage); - fprintf(stdout, "pka_trust=%u\n", gpgsig->pka_trust); - fprintf(stdout, "chain_model=%u\n", gpgsig->chain_model); - fprintf(stdout, "validity=%d\n", gpgsig->validity); - fprintf(stdout, "validity_reason=%d\n", gpgsig->validity_reason); - fprintf(stdout, "key=%d\n", gpgsig->pubkey_algo); - fprintf(stdout, "hash=%d\n", gpgsig->hash_algo); - - if(gpgsig->summary & GPGME_SIGSUM_VALID) { - /* good signature, continue */ - _alpm_log(PM_LOG_DEBUG, _("Package %s has a valid signature.\n"), - pkgpath); - } else if(gpgsig->summary & GPGME_SIGSUM_GREEN) { - /* 'green' signature, not sure what to do here */ - _alpm_log(PM_LOG_WARNING, _("Package %s has a green signature.\n"), - pkgpath); - } else if(gpgsig->summary & GPGME_SIGSUM_KEY_MISSING) { - pm_errno = PM_ERR_SIG_UNKNOWN; - _alpm_log(PM_LOG_WARNING, _("Package %s has a signature from an unknown key.\n"), - pkgpath); - ret = -1; - } else { - /* we'll capture everything else here */ - pm_errno = PM_ERR_SIG_INVALID; - _alpm_log(PM_LOG_ERROR, _("Package %s has an invalid signature.\n"), - pkgpath); - ret = 1; + + // Read the output of the command to see if there are lines with the pattern + // TRUST_MARGINAL, TRUST_FULLY or TRUST_ULTIMATE. These results indicate that + // the level of trust of the key are at leas MARGINAL, which means that the + // users trusts the signer or there is a path in the web of trust that + // assigns at least the MARGINAL level + CALLOC(line, MAX_LINE, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL)); + while (fgets(line, MAX_LINE, output)) { + // Debug of status messages from gpg + if (strncmp(line, "[GNUPG:]", (size_t)strlen("[GNUPG:]")) == 0) { + _alpm_log(PM_LOG_DEBUG, "%s\n", line); + } + if (strncmp(line, TRUST_MARGINAL, (size_t)strlen(TRUST_MARGINAL)) == 0 || + strncmp(line, TRUST_FULLY, (size_t)strlen(TRUST_FULLY)) == 0 || + strncmp(line, TRUST_ULTIMATE, (size_t)strlen(TRUST_ULTIMATE)) == 0) { + trusted = 1; + } } + + resultCommand = pclose(output); -error: - gpgme_data_release(sigdata); - gpgme_data_release(pkgdata); - gpgme_release(ctx); - if(sigfile) { - fclose(sigfile); + // We don't need to check the return status of the command, because the + // trusted variable only is 1 if the signature is valid and trusted. + if (trusted == 1) { + status = 0; } - if(pkgfile) { - fclose(pkgfile); +cleanup: + if (line) { + FREE(line); } - if(err != GPG_ERR_NO_ERROR) { - _alpm_log(PM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); - RET_ERR(PM_ERR_GPGME, -1); + if (command) { + FREE(command); } - return(ret); + return status; } /** @@ -207,7 +191,7 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) ALPM_LOG_FUNC; ASSERT(pkg != NULL, return(0)); - return(_alpm_gpgme_checksig(alpm_pkg_get_filename(pkg), + return(_alpm_gpg_checksig_memory(alpm_pkg_get_filename(pkg), alpm_pkg_get_pgpsig(pkg))); } diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index c004697..fe28a22 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -21,7 +21,8 @@ #include "alpm.h" -int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig); +int _alpm_gpg_checksig_memory(const char *pkgpath, const pmpgpsig_t *sig); +int _alpm_gpg_checksig_file(const char *pkgpath, const char *sigpath); #endif /* _ALPM_SIGNING_H */ -- 1.7.1

1 0

[pacman-dev] [PATCH 3/6] Document new options related to package signing
by Denis A. Altoé Falqueto 07 Jul '10

07 Jul '10

makepkg and repo-add got a new option, so it is possible to select the key used for signing. makepkg.conf got a new option in BUILDENV, so the new packages built with makepkg will be signed in the process of building. pacman.conf got a new option for repositories. VerifySig will enable verification of signatures in repositories that support them. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> --- doc/makepkg.8.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++--- doc/pacman.conf.5.txt | 20 ++++++++++++++++++++ doc/repo-add.8.txt | 7 +++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index a2fdb3f..4d8f26b 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -161,6 +161,10 @@ Options (Passed to pacman) Prevent pacman from displaying a progress bar; useful if you are redirecting makepkg output to file. +*\--signwithkey*:: + Select a specific key to be used to sign the package. If absent, + the default from the keyring key will be used. + Additional Features ------------------- diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index a565bd6..f82bc19 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -94,9 +94,9 @@ Options PKGBUILD options array. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached - signature file, using the GPG agent if it is available. The signature + Generate a PGP signature file using GnuPG. This will execute `gpg2 + --detach-sign` on the built package to generate a detached signature + file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 8c83232..16d1c89 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -204,6 +204,26 @@ listed first will take precedence over those listed later in the file when packages in two repositories have identical names, regardless of version number. +There is an option to allow the verification of digital signatures for +repositories that support them. The option is 'VerifySig' and the possible +values are: + +*Always*:: + Will enforce the verification of signatures as a requirement to + update the database. If there is no signature in the source location + or if the signature is not valid, the updating of this repository + is aborted. + +*Optional*:: + The verification of signatures will be made, but if there is no + signature in the source location, it will proceed with the updating. + The only situation of error will be when the database doesn't match + with the signature (download problem or real mismatch of signature). + +*Never*:: + There will be no verification of signatures for this repository. This + is the default. + Using Your Own Repository ------------------------- If you have numerous custom packages of your own, it is often easier to generate diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index e6cc940..0a5d980 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -10,9 +10,9 @@ repo-add - package database maintenance utility Synopsis -------- -repo-add [-q] <path-to-db> <package1> [<package2> ...] +repo-add [-q] [-s [-k|\--signwithkey key]] <path-to-db> <package1> [<package2> ...] -repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...] +repo-remove [-q] [-s [-k|\--signwithkey key]] <path-to-db> <packagename> [<packagename2> ...] Description @@ -40,6 +40,9 @@ Options signature file, using the GPG agent if it is available. The signature file will be the entire filename of the database with a ``.sig'' extension. +*-k, \--sighwithkey key*:: + Select a specific key to be used for the signing of the database file. + If absent, the default key from the default keyring will be used. See Also -------- -- 1.7.1

1 0

[pacman-dev] [PATCH 1/6] pacman-key: keyring management tool
by Denis A. Altoé Falqueto 07 Jul '10

07 Jul '10

The script pacman-key will manage pacman's keyring. It imports, exports, fetches from keyservers, helps in the process of trusting and updates the trust database. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> --- scripts/.gitignore | 1 + scripts/Makefile.am | 3 + scripts/pacman-key.sh.in | 278 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 282 insertions(+), 0 deletions(-) create mode 100644 scripts/pacman-key.sh.in diff --git a/scripts/.gitignore b/scripts/.gitignore index eafc493..1c662de 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -4,3 +4,4 @@ rankmirrors repo-add repo-remove pkgdelta +pacman-key diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 330acb9..d4f96de 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -7,6 +7,7 @@ bin_SCRIPTS = \ OURSCRIPTS = \ makepkg \ + pacman-key \ pacman-optimize \ pkgdelta \ rankmirrors \ @@ -14,6 +15,7 @@ OURSCRIPTS = \ EXTRA_DIST = \ makepkg.sh.in \ + pacman-key.sh.in \ pacman-optimize.sh.in \ pkgdelta.sh.in \ rankmirrors.sh.in \ @@ -60,6 +62,7 @@ $(OURSCRIPTS): Makefile @mv $@.tmp $@ makepkg: $(srcdir)/makepkg.sh.in +pacman-key: ${srcdir}/pacman-key.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in pkgdelta: $(srcdir)/pkgdelta.sh.in rankmirrors: $(srcdir)/rankmirrors.sh.in diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in new file mode 100644 index 0000000..55ca163 --- /dev/null +++ b/scripts/pacman-key.sh.in @@ -0,0 +1,278 @@ +#!/bin/bash -e +# +# pacman-key - manages pacman's keyring +# @configure_input@ +# +# Copyright (c) 2010 - Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# gettext initialization +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='@localedir@' + +# Based on apt-key, from Debian +# Author: Denis A. Altoé Falqueto <denisfalqueto at gmail dot com> + +PACMAN_KEY_VERSION="@PACKAGE_VERSION@" + +# According to apt-key, gpg doesn't like to be called without a secret keyring. +# We will not really need one, because pacman will not sign packages, just verify +# their integrities. +PACMAN_KEYRING_DIR="/etc/pacman.d/gnupg" +PACMAN_SECRET="secret.gpg" +PACMAN_TRUSTDB="trustdb.gpg" +PACMAN_KEYRING="pacman.gpg" +PACMAN_SHARE_DIR="/usr/share/pacman" + +# Default parameters for the command gpg. Some more will be added when needed +GPG_PROGRAM="gpg2" +GPG="${GPG_PROGRAM} --ignore-time-conflict --no-options --no-default-keyring" +GPG_PACMAN="${GPG} --homedir ${PACMAN_KEYRING_DIR} --secret-keyring ${PACMAN_KEYRING_DIR}/${PACMAN_SECRET} \ + --trustdb-name ${PACMAN_KEYRING_DIR}/${PACMAN_TRUSTDB} --keyring ${PACMAN_KEYRING_DIR}/${PACMAN_KEYRING} \ + --primary-keyring ${PACMAN_KEYRING_DIR}/${PACMAN_KEYRING}" +SIG_EXT=".sig" + +# Read-only keyring with keys to be added to the keyring +ADDED_KEYS="${PACMAN_SHARE_DIR}/addedkeys.gpg" + +# Read-only keyring with keys removed from the keyring. They need to be removed before +# the keys from the added keyring be really imported +REMOVED_KEYS="${PACMAN_SHARE_DIR}/removedkeys.gpg" + +usage() { + echo "pacman-key - Pacman's keyring management utility" + echo "Usage: $(basename $0) command [arguments]" + echo + echo "Manage pacman's list of trusted keys" + echo + echo " pacman-key add <file> ... - add the key contained in <file> ('-' for stdin)" + echo " pacman-key del <keyid> ... - remove the key <keyid>" + echo " pacman-key export <keyid> ... - output the key <keyid>" + echo " pacman-key exportall - output all trusted keys" + echo " pacman-key receive <keyserver> <keyid> ... - fetch the keyids from the specified keyserver URL" + echo " pacman-key trust <keyid> ... - set the truslevel of the given key" + echo " pacman-key updatedb - update the trustdb of pacman" + echo " pacman-key reload - reloads the keys from the keyring package" + echo " pacman-key list - list keys" + echo " pacman-key finger <keyid> ... - list fingerprints" + echo " pacman-key adv <params> - pass advanced options to gpg" + echo " pacman-key help - displays this message" + echo " pacman-key version - displays the current version" + echo + echo "If no specific keyring file is given the command applies to the default keyring." +} + +prepare_homedir() { + if [[ ! -d ${PACMAN_KEYRING_DIR} ]] ; then + mkdir -p "${PACMAN_KEYRING_DIR}" + [[ ! -f "${PACMAN_KEYRING_DIR}/${PACMAN_SECRET}" ]] && touch "${PACMAN_KEYRING_DIR}/${PACMAN_SECRET}" + [[ ! -f "${PACMAN_KEYRING_DIR}/${PACMAN_KEYRING}" ]] && touch "${PACMAN_KEYRING_DIR}/${PACMAN_KEYRING}" + chmod 700 "${PACMAN_KEYRING_DIR}" + chmod 600 "${PACMAN_KEYRING_DIR}"/* + fi +} + +add_key() { + ${GPG_PACMAN} --quiet --batch --import "$1" +} + +remove_key() { + ${GPG_PACMAN} --quiet --batch --delete-key --yes "$1" +} + +update_trustdb() { + ${GPG_PACMAN} --batch --check-trustdb +} + +list_sigs() { + ${GPG_PACMAN} --batch --list-sigs +} + +list_fingerprints() { + ${GPG_PACMAN} --batch --fingerprint $* +} + +export_key() { + ${GPG_PACMAN} --armor --export "$1" +} + +export_all() { + ${GPG_PACMAN} --armor --export +} + +trust_key() { + # Verify if the key exists in pacman's keyring + if ${GPG_PACMAN} --list-key "$1" > /dev/null 2>&1 ; then + ${GPG_PACMAN} --fingerprint "$1" + ${GPG_PACMAN} --edit-key "$1" + else + echo "The key identified by $1 doesn't exist" + exit 1 + fi +} + +reload_keyring() { + # Verify the signature of removed keys file + if [[ -f ${REMOVED_KEYS} ]] && ! ${GPG_PACMAN} --quiet --verify ${REMOVED_KEYS}${SIG_EXT} ; then + echo "The signature of file ${REMOVED_KEYS} is not valid." + exit 1 + fi + + # Verify the signature of the added keys file + if [[ -f ${ADDED_KEYS} ]] && ! ${GPG_PACMAN} --quiet --verify ${ADDED_KEYS}${SIG_EXT} ; then + echo "The signature of file ${ADDED_KEYS} is not valid." + exit 1 + fi + + # Remove the keys from REMOVED_KEYS keyring + [[ -r ${REMOVED_KEYS} ]] && cat "${REMOVED_KEYS}" | while read key ; do + ${GPG_PACMAN} --quiet --batch --yes --delete-keys ${key} + done + + # Add keys from the current set of keys from pacman-keyring package. The web of trust will + # be updated automatically. + if [[ -r ${ADDED_KEYS} ]] ; then + add_keys=$(${GPG} --keyring ${ADDED_KEYS} --with-colons --list-keys | grep ^pub | cut -d: -f5) + for add_key in $add_keys; do + echo "Chave $add_key" + ${GPG} --quiet --batch --keyring $ADDED_KEYS --export $add_key | ${GPG_PACMAN} --import + ADDED=1 + done + fi + + # Update trustdb, just to be sure + update_trustdb +} + +receive() { + keyserver="$1" + shift + ${GPG_PACMAN} --keyserver ${keyserver} $* +} + +# PROGRAM START + +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } +fi + +command="$1" +if [[ -z "$command" ]]; then + usage + exit 1 +fi +shift + +if [[ "$command" != "version" && "$command" != "help" ]] && ! which "${GPG_PROGRAM}" >/dev/null 2>&1; then + echo >&2 "Warning: gnupg does not seem to be installed." + echo >&2 "Warning: pacman-key requires gnupg for most operations." + echo >&2 +fi + +prepare_homedir + +case "$command" in + add) + if (( $# == 0 )) ; then + echo "You need to specify at least one key identifier" + usage + exit 1 + fi + while (( $# > 0 )) ; do + add_key $1 + shift + done + ;; + del|rm|remove) + if (( $# == 0 )) ; then + echo "You need to specify at least one key identifier" + usage + exit 1 + fi + while (( $# > 0 )) ; do + remove_key $1 + shift + done + ;; + updatedb) + update_trustdb + ;; + reload) + reload_keyring + ;; + list) + list_sigs + ;; + finger*) + if (( $# == 0 )) ; then + echo "You need to specify at least one key identifier" + usage + exit 1 + fi + list_fingerprints $* + ;; + export) + if (( $# == 0 )) ; then + echo "You need to specify at least one key identifier" + usage + exit 1 + fi + while (( $# > 0 )) ; do + export_key $1 + shift + done + ;; + exportall) + export_all + ;; + receive) + if (( $# < 2 )) ; then + echo "You need to specify the keyserver and at least one key identifier" + usage + exit 1 + fi + receive $* + ;; + trust) + if (( $# == 0 )) ; then + echo "You need to specify at least one key identifier" + usage + exit 1 + fi + while (( $# > 0 )) ; do + trust_key $1 + shift + done + ;; + adv*) + echo "Executing: ${GPG_PACMAN} $*" + ${GPG_PACMAN} $* || ret=$? + exit $ret + ;; + --help) + usage + ;; + --version) + echo "pacman-key v${PACMAN_KEY_VERSION}" + echo " This program can be freely distributed under the GPL v2" + ;; + *) + usage + exit 1 + ;; +esac -- 1.7.1

1 0

[pacman-dev] Series of patches for package signing
by Denis A. Altoé Falqueto 07 Jul '10

07 Jul '10

Guys, I've lingered a little more than what I would like, but here I am again. I'll start to send a series of 6 patches, which were made from that big one from the other day. Maybe you'll find that some are still big, but I tried to keep each patch as the smaller logical unit that I could find. For example, I don't think would make sense to split a new script (pacman-key). Anyway, the patches will follow this message and I'll wait your evaluation. And thanks for your tips about git, I'm loving it :) -- A: Because it obfuscates the reading. Q: Why is top posting so bad? ------------------------------------------- Denis A. Altoe Falqueto -------------------------------------------

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-48-ga835599
by dan＠archlinux.org 07 Jul '10

07 Jul '10

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 a83559949622992faafb628b742893891ead8390 (commit) via 68dcabdfbeadc43c74eccf395a9f04565c5d682e (commit) via 60de8ec932984f1374501c3f11ad1bcfba5c7d5c (commit) from 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 (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 a83559949622992faafb628b742893891ead8390 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 7 16:10:10 2010 +1000 Download sync db into DBPath/sync The sync db should be stored in the sync/ folder. This cleans up DBPath to only have local/ and sync/ directories in it. A nice side effect is that the db are now in the right place so we can implement directly reading from them. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68dcabdfbeadc43c74eccf395a9f04565c5d682e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jun 4 00:10:50 2010 +1000 Remove DBEXT usage With commit 5dffef78, the repo database always has a symlink of the form reponame.db. Use that filename and let libarchive determine the compression type. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 60de8ec932984f1374501c3f11ad1bcfba5c7d5c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 27 21:44:36 2010 +1000 Check return value of fgets calls Prevents compiler warnings with -D_FORTIFY_SOURCE=2 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 --------- lib/libalpm/be_files.c | 24 ++++++++++++++++-------- lib/libalpm/trans.c | 3 +-- scripts/Makefile.am | 1 - scripts/rankmirrors.sh.in | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/util.py | 1 - 8 files changed, 20 insertions(+), 24 deletions(-) hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [PATCH] Fix some whitespace issues
by Allan McRae 07 Jul '10

07 Jul '10

The combination of tabs and spaces is annoying in any editor that does not use a tab width of 2 spaces. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/package.h | 6 +++--- src/pacman/util.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 7b77ae6..3d8c4e3 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -230,7 +230,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) goto pkg_invalid; } - archive_read_finish(archive); + archive_read_finish(archive); /* internal fields for package struct */ newpkg->origin = PKG_FROM_FILE; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 236ec1d..694c38d 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -321,7 +321,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) */ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts, pmfileconflicttype_t type, const char *filestr, - const char* name1, const char* name2) + const char* name1, const char* name2) { pmfileconflict_t *conflict; MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c894644..14f81f9 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -67,10 +67,10 @@ struct __pmpkg_t { /* internal */ pmpkgfrom_t origin; /* Replaced 'void *data' with this union as follows: - origin == PKG_FROM_CACHE, use pkg->origin_data.db - origin == PKG_FROM_FILE, use pkg->origin_data.file + origin == PKG_FROM_CACHE, use pkg->origin_data.db + origin == PKG_FROM_FILE, use pkg->origin_data.file */ - union { + union { pmdb_t *db; char *file; } origin_data; diff --git a/src/pacman/util.c b/src/pacman/util.c index de1b162..f2cb67f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -823,7 +823,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar #if defined(PACMAN_DEBUG) /* If debug is on, we'll timestamp the output */ - if(config->logmask & PM_LOG_DEBUG) { + if(config->logmask & PM_LOG_DEBUG) { time_t t; struct tm *tmp; char timestr[10] = {0}; -- 1.7.1.1

1 0

[pacman-dev] [PATCH] Download sync db into DBPath/sync
by Allan McRae 07 Jul '10

07 Jul '10

The sync db should be stored in the sync/ folder. This cleans up DBPath to only have local/ and sync/ directories in it. A nice side effect is that the db are now in the right place so we can implement directly reading from them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_files.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index e2bbe28..adf41aa 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -208,7 +208,7 @@ static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist) */ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) { - char *dbfile, *dbfilepath; + char *dbfile, *dbfilepath, *syncpath; const char *dbpath, *syncdbpath; alpm_list_t *newdirlist = NULL, *olddirlist = NULL; alpm_list_t *onlynew = NULL, *onlyold = NULL; @@ -236,9 +236,13 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) sprintf(dbfile, "%s.db", db->treename); dbpath = alpm_option_get_dbpath(); + len = strlen(dbpath) + 6; + MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1)); + sprintf(syncpath, "%s%s", dbpath, "sync/"); - ret = _alpm_download_single_file(dbfile, db->servers, dbpath, force); + ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force); free(dbfile); + free(syncpath); if(ret == 1) { /* files match, do nothing */ @@ -253,9 +257,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) syncdbpath = _alpm_db_path(db); /* form the path to the db location */ - len = strlen(dbpath) + strlen(db->treename) + 4; + len = strlen(dbpath) + strlen(db->treename) + 9; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfilepath, "%s%s.db", dbpath, db->treename); + sprintf(dbfilepath, "%ssync/%s.db", dbpath, db->treename); if(force) { /* if forcing update, remove the old dir and extract the db */ -- 1.7.1.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-45-g686b8c1
by dan＠archlinux.org 02 Jul '10

02 Jul '10

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 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 (commit) via 1a9db4cac7cf308188298db48dde5d80ce86a7e9 (commit) via 9ebb596805309076237cb5dd09836cfd2e38745d (commit) via fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (commit) via 3d8be4291cb7e1df69d99741404e7bd1856c3bad (commit) via 622326bb37a9f7eb1db27ac0166e791d7a949e0c (commit) via 68dff73463dd06d2055bcbd48be9bc74e786be5c (commit) from 5a3aae02fed68379b5ede7abc9c7675632ce403a (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 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 Merge: 1a9db4c fcb4f02 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 2 18:29:37 2010 -0500 Merge branch 'maint' Conflicts: scripts/makepkg.sh.in commit 1a9db4cac7cf308188298db48dde5d80ce86a7e9 Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:36 2010 -0430 makepkg: undeclared local variables Variables that are only meaningful within the function they are declared in are now prefixed by "local". Signed-off-by: Andres P <aepd87(a)gmail.com> [Allan: fix whitespace] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9ebb596805309076237cb5dd09836cfd2e38745d Author: Nico Schottelius <nico(a)kr.ethz.ch> Date: Thu Jul 1 09:07:04 2010 +0200 manpage: add real world examples Signed-off-by: Nico Schottelius <nico(a)kr.ethz.ch> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 36 +++++++++++----------- doc/.gitignore | 1 + doc/Makefile.am | 14 +++++++- doc/pacman.8.txt | 19 +++++++++++ po/zh_CN.po | 82 ++++++++++++++++++++++++------------------------ scripts/makepkg.sh.in | 41 +++++++++++++++--------- 6 files changed, 117 insertions(+), 76 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-17-gfcb4f02
by dan＠archlinux.org 02 Jul '10

02 Jul '10

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 fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (commit) via 3d8be4291cb7e1df69d99741404e7bd1856c3bad (commit) from 622326bb37a9f7eb1db27ac0166e791d7a949e0c (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 fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 2 18:20:36 2010 -0500 docs: Add a 'website' target This will allow me to be not quite as lazy in getting website changes out to the Arch Linux server by making it trivial to get everything packaged up and working correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d8be4291cb7e1df69d99741404e7bd1856c3bad Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 2 18:18:58 2010 -0500 Fix some incorrect asciidoc syntax Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 36 ++++++++++++++++++------------------ doc/.gitignore | 1 + doc/Makefile.am | 14 ++++++++++++-- 3 files changed, 31 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Transifex
by 甘露(Gan Lu) 02 Jul '10

02 Jul '10

I see there is a page [1] in Transifex for pacman/libpalm, could any dev gives me a permission to submit my translation from there? I am used to maintain Chinese simplified translation, thanks. [1] http://www.transifex.net/projects/p/archlinux-pacman/

2 2