- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Change GPG_PACMAN to array
by DJ Mills 16 Jul '11

16 Jul '11

Allows GPG_PACMAN to safely handle any arguments Signed-off-by: DJ Mills <danielmills1(a)gmail.com> --- scripts/pacman-key.sh.in | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 833943c..0d3729d 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 @@ -161,7 +161,7 @@ reload_keyring() { 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 @@ -172,7 +172,7 @@ reload_keyring() { 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,11 +297,11 @@ 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) + -h|--help usage; exit 0 ;; -V|--version) version; exit 0 ;; -- 1.7.6

2 5

[pacman-dev] [PATCH] Fix compilation without gpgme
by Allan McRae 16 Jul '11

16 Jul '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Note that the testsuite really does not handle building pacman without gpgme very well... Total = 242 Pass = 173 ( 71.49%) Expected Fail = 8 ( 3.31%) Unexpected Pass = 2 ( 0.83%) Fail = 59 ( 24.38%) lib/libalpm/signing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index cfa9a02..ae90378 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -391,8 +391,8 @@ error: return ret; } #else -int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, - const char *base64_sig) +int _alpm_gpgme_checksig(alpm_handle_t UNUSED *handle, const char UNUSED *path, + const char UNUSED *base64_sig, alpm_sigresult_t UNUSED *result) { return -1; } -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: only test for writable PKGDEST when needed.
by Allan McRae 16 Jul '11

16 Jul '11

From: Rogutės Sparnuotos <rogutes(a)googlemail.com> 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> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 74dfa43..296bab3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1971,7 +1971,7 @@ pkgdir="$BUILDDIR/pkg" PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined -if [[ ! -w $PKGDEST ]]; then +if (( ! (NOBUILD || GENINTEG) )) && [[ ! -w $PKGDEST ]]; then error "$(gettext "You do not have write permission to store packages in %s.")" "$PKGDEST" plain "$(gettext "Aborting...")" exit 1 -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: fix issue with filenames with spaces break and noextract
by Allan McRae 16 Jul '11

16 Jul '11

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> --- Can probably go on maint in case we ever make another release from there. scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 16c4400..74dfa43 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -758,7 +758,7 @@ extract_sources() { local netfile for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") - if in_array "$file" ${noextract[@]}; then + if in_array "$file" "${noextract[@]}"; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue -- 1.7.6

1 1

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

16 Jul '11

Currently, pacman-key allows users to import their keys using the --add option but no similar functionality exists for importing ownertrust values. The --import-trustdb option takes in a list of directories and imports ownertrust values if the directories have a trustdb.gpg database. The --import is a combination of --add and --import-trustdb. It takes in a list of directories and imports keys from pubring.gpg, ownertrust values from trustdb.gpg if any of these files exist. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- NOTE: There is this very strange bug such that when new keys are added, previously imported keys will fail for signature verification. This happens with both --add and --import. Eg. Say you want to import trustdb.gpg and pubring.gpg from directories "first", "second" and "third", you'd have to: # pacman-key --import first second third # pacman-key --import first second third doc/pacman-key.8.txt | 7 +++++++ scripts/pacman-key.sh.in | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 892f14d..6071474 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -59,6 +59,13 @@ Commands *-h, \--help*:: Output syntax and command line options. +*\--import* dir ...:: + Adds keys from pubring.gpg into pacman's keyring and imports ownertrust + values from trustdb.gpg in the specified directories. + +*\--import-trustdb* dir ...:: + Imports ownertrust values from trustdb.gpg in the specified directories. + *-l, \--list*:: Equivalent to --list-sigs from GnuPG. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 20ec20f..425f010 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -70,6 +70,8 @@ usage() { echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -V, --version Show program version")" echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" + 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)")" printf "$(gettext " --reload Reload the default keys")" echo } @@ -228,6 +230,27 @@ if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != " fi fi +import() { + local importdir + for importdir in "$@"; do + if [[ -f "${importdir}/trustdb.gpg" ]]; then + import_trustdb "${importdir}" + fi + if [[ -f "${importdir}/pubring.gpg" ]]; then + ${GPG_PACMAN} --quiet --batch --import "${importdir}/pubring.gpg" + fi + done +} + +import_trustdb() { + local importdir + for importdir in "$@"; do + if [[ -f "${importdir}/trustdb.gpg" ]]; then + gpg --homedir "${importdir}" --export-ownertrust | ${GPG_PACMAN} --import-ownertrust + fi + done +} + # Parse global options CONFIG="@sysconfdir@/pacman.conf" PACMAN_KEYRING_DIR="@sysconfdir@/pacman.d/gnupg" @@ -322,6 +345,20 @@ case "${command}" in ;; -h|--help) usage; exit 0 ;; + --import-trustdb) + if (( $# == 0 )); then + error "$(gettext "You need to specify at least one trustdb")" + exit 1 + fi + import_trustdb "$@" + ;; + --import) + if (( $# == 0 )); then + error "$(gettext "You need to specify at least one gpg directory")" + exit 1 + fi + import "$@" + ;; -V|--version) version; exit 0 ;; *) -- 1.7.6.rc0

2 3

[pacman-dev] [PATCH] makepkg: more control of skipping integrity checks
by Allan McRae 16 Jul '11

16 Jul '11

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> --- doc/makepkg.8.txt | 7 +++++-- scripts/makepkg.sh.in | 44 +++++++++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 57c1f89..34cecdc 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -85,10 +85,13 @@ Options using "`makepkg -g >> PKGBUILD`". *--skipinteg*:: - Do not perform any integrity checks, just print a warning instead. + Do not perform any integrity checks (checksum and PGP) on source files. + +*\--skipchecksums*:: + Do not verify checksums of source files. *\--skippgpcheck*:: - Do not verify PGP signatures of the source files. + Do not verify PGP signatures of source files. *-h, \--help*:: Output syntax and command line options. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cbd9314..16c4400 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -56,7 +56,7 @@ DEP_BIN=0 FORCE=0 INFAKEROOT=0 GENINTEG=0 -SKIPINTEG=0 +SKIPCHECKSUMS=0 SKIPPGPCHECK=0 INSTALL=0 NOBUILD=0 @@ -630,6 +630,7 @@ generate_checksums() { } check_checksums() { + (( SKIPCHECKSUMS )) && return 0 (( ! ${#source[@]} )) && return 0 local correlation=0 @@ -1567,7 +1568,7 @@ check_software() { fi # openssl - checksum operations - if (( ! SKIPINTEG )); then + if (( ! SKIPCHECKSUMS )); then if ! type -p openssl >/dev/null; then error "$(gettext "Cannot find the %s binary required for validating sourcefile checksums.")" "openssl" ret=1 @@ -1802,7 +1803,8 @@ usage() { echo "$(gettext " --nosign Do not create a signature for the package")" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" printf "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" - echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" + echo "$(gettext " --skipchecksums Do not verify checksums of the source files")" + echo "$(gettext " --skipinteg Do not perform any verification checks on source files")" echo "$(gettext " --skippgpcheck Do not verify source files with pgp signatures")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo @@ -1840,7 +1842,9 @@ OPT_SHORT="AcdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver,skippgpcheck" OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" -OPT_LONG+=",repackage,skipinteg,skippgpcheck,sign,source,syncdeps,version,config:" +OPT_LONG+=",repackage,skipchecksums,skipinteg,skippgpcheck,sign,source,syncdeps" +OPT_LONG+=",version,config:" + # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then @@ -1881,7 +1885,8 @@ while true; do --pkg) shift; PKGLIST=($1) ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; - --skipinteg) SKIPINTEG=1 ;; + --skipchecksums) SKIPCHECKSUMS=1 ;; + --skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; --skippgpcheck) SKIPPGPCHECK=1;; --sign) SIGNPKG='y' ;; --source) SOURCEONLY=1 ;; @@ -2204,15 +2209,22 @@ if (( SOURCEONLY )); then mkdir -p "$srcdir" chmod a-s "$srcdir" cd "$srcdir" - if (( ! SKIPINTEG || SOURCEONLY == 2 )); then + if ( (( ! SKIPCHECKSUMS )) || \ + ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ) || \ + (( SOURCEONLY == 2 )); then download_sources fi - if (( ! SKIPINTEG )); then - # We can only check checksums if we have all files. - check_checksums + 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 - warning "$(gettext "Skipping integrity checks.")" + check_checksums + check_pgpsigs fi cd "$startdir" @@ -2287,11 +2299,17 @@ elif (( REPKG )); then fi else download_sources - if (( ! SKIPINTEG )); then - check_checksums + 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 - warning "$(gettext "Skipping integrity checks.")" + check_checksums + check_pgpsigs fi extract_sources fi -- 1.7.6

1 0

[pacman-dev] Package Quiz
by Yaşar Arabacı 15 Jul '11

15 Jul '11

Hi, I have created a simple package knowledge quiz game with pyalpm and wanted to share it. It doesn't have a difficulty concept right now so it could get a little frustrating. You will need to install pyalpm and pyqt in order to run it. You can find it in the attachment. In order to open, just run gui.py. Have fun! Yaşar Arabacı

4 10

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

14 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 e20995560640d11491905bfa80aa993c2efde7c4 (commit) via 8f72ffbc4521008897fff0819cae4c80f8405391 (commit) via 0fe93bc34c4f463fbaeaa8be7a00e10bc0bc8b4d (commit) via 1376ba5b0e261f9bd1988598e8fc3237f9d1fef7 (commit) via 6907a22b275859dcdf4c80ac6df87099414b0b04 (commit) via 727e03fe198e58e53434ad445e6156f06daf5e94 (commit) via 282be6bf4b87678d3b634a5bc6a8a1c097e593ea (commit) via 7f5b24597bec4d74328c62467ad778f7eaae75a1 (commit) via af357d6ab00d8ca258dfd7abb689d6fd2eb4090f (commit) via 36e48573ceee0f707de0dcc55d1da442d949d3dc (commit) via 00628c7268e3b81045961be51a0ca640aea368b0 (commit) via 1d53dd716d7c7bea297a532809c4557b805a9918 (commit) from b678e002714b732d7ea6a48029ac1a5b285d04e5 (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 e20995560640d11491905bfa80aa993c2efde7c4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 22:48:50 2011 -0500 doc/PKGBUILD: clarify scriptlet version arguments It was a bit unclear that both pkgver and pkgrel were included in the passed version strings; clarify this fact in the manpage. Also include epoch in the mix now that it exists. Also make two other minor consistency touchups to code-print variables in text. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f72ffbc4521008897fff0819cae4c80f8405391 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 6 13:37:18 2011 -0500 Make alpm_db_set_pkgreason() arguments more sane This can only ever operate on the local database, and a local package at that. Change the function signature to take a handle and package object, add the relevant asserts, and ensure the frontend can detect the package not found condition when finding packages to pass to this method. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fe93bc34c4f463fbaeaa8be7a00e10bc0bc8b4d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 6 09:19:44 2011 -0400 contrib/paclog-pkglist: new contribution converts a pacman log file to a list of installed packages, which should match the output of `pacman -Q'. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1376ba5b0e261f9bd1988598e8fc3237f9d1fef7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 6 22:19:58 2011 -0400 contrib/bash_completion: update with new makepkg opts Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6907a22b275859dcdf4c80ac6df87099414b0b04 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 8 09:01:37 2011 -0400 makepkg: remove unused -C option from option list We nuke it from the completion file as well along with its longopt. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 727e03fe198e58e53434ad445e6156f06daf5e94 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 10 19:36:00 2011 -0400 makepkg: skip devel_check when reading from a pipe Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 282be6bf4b87678d3b634a5bc6a8a1c097e593ea Author: DJ Mills <danielmills1(a)gmail.com> Date: Fri Jul 8 00:31:22 2011 -0400 makepkg: Remove pre-optimization from in_array() The '[[ -z' test in in_array() is redundant, so remove it. Signed-off-by: DJ Mills <danielmills1(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7f5b24597bec4d74328c62467ad778f7eaae75a1 Author: DJ Mills <danielmills1(a)gmail.com> Date: Fri Jul 8 00:31:23 2011 -0400 makepkg: Remove OPT_TEMP hack in parse_options call Instead of hacking around the error trap, simply do an explicit test for failure. Signed-off-by: DJ Mills <danielmills1(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit af357d6ab00d8ca258dfd7abb689d6fd2eb4090f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 14 15:32:03 2011 -0500 Allow fileconflict if unowned file moving into backup array The bulk of this commit is adding new tests to ensure the new behavior works without disrupting old behavior. This is a relatively sane maneuver when a package adds a conf file (e.g. '/etc/mercurial/hgrc') that was not previously in the package, but it is placed in the backup array. In essence, we can treat the existing file as having always been a part of the package and do our normal compare/install as pacnew logic checks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36e48573ceee0f707de0dcc55d1da442d949d3dc Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 14 14:58:46 2011 -0500 Add 'compress' compression format as an available option This adds the '.tar.Z' option to both repo-add and makepkg for no other reason than "why not", and because bsdtar supports it natively with the '-Z' flag. Also update the documentation accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 00628c7268e3b81045961be51a0ca640aea368b0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 6 09:18:59 2011 -0500 Unify package removal code This code duplication has always been a rather clumsy casuality of fixing some past upgrade issues. Unify the removal code across upgrade and remove operations into a new _alpm_remove_single_package() method wihch makes it very clear how we handle upgrade and remove differently, via several conditionals on newpkg. This commit highlights interesting behavior such as the fact that the implicit removal in every package upgrade never gets transaction events or progress callbacks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d53dd716d7c7bea297a532809c4557b805a9918 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 5 22:36:40 2011 -0500 include util.h in rawstr.c Fixes "error: no previous prototype for '_alpm_raw_cmp' [-Werror=missing-prototypes]" warnings, and also prevents someone from getting the prototypes and functions out of sync. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/Makefile.am | 1 + contrib/bash_completion.in | 10 +- contrib/paclog-pkglist | 57 ++++++ doc/PKGBUILD.5.txt | 34 ++-- doc/makepkg.conf.5.txt | 3 +- doc/pacman.conf.5.txt | 11 +- doc/repo-add.8.txt | 4 +- lib/libalpm/add.c | 6 +- lib/libalpm/alpm.h | 7 +- lib/libalpm/backup.c | 7 +- lib/libalpm/backup.h | 2 +- lib/libalpm/conflict.c | 16 ++ lib/libalpm/db.c | 34 ++-- lib/libalpm/rawstr.c | 2 + lib/libalpm/remove.c | 204 +++++++++---------- lib/libalpm/remove.h | 5 +- scripts/makepkg.sh.in | 13 +- scripts/repo-add.sh.in | 1 + src/pacman/database.c | 3 +- test/pacman/tests/fileconflict003.py | 2 +- test/pacman/tests/{upgrade022.py => upgrade027.py} | 13 +- test/pacman/tests/{upgrade021.py => upgrade028.py} | 13 +- test/pacman/tests/upgrade029.py | 24 +++ 23 files changed, 291 insertions(+), 181 deletions(-) create mode 100755 contrib/paclog-pkglist copy test/pacman/tests/{upgrade022.py => upgrade027.py} (51%) copy test/pacman/tests/{upgrade021.py => upgrade028.py} (51%) create mode 100644 test/pacman/tests/upgrade029.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Adding a new config file to a package (e.g. mercurial file conflict)
by Dan McGee 14 Jul '11

14 Jul '11

I did an -Syu on my Arch box today, which updated Mercurial, and the new package contains a /etc/mercurial/hgrc file. I had already created one on my system, and the old package did not contain one, so I got a file conflict. (54/54) checking package integrity [######################] 100% (54/54) checking for file conflicts [######################] 100% error: failed to commit transaction (conflicting files) mercurial: /etc/mercurial/hgrc exists in filesystem Errors occurred, no packages were upgraded. So instead, I had to -Sf the package, which installs the file with a pacnew: (1/1) checking package integrity [######################] 100% (1/1) checking available disk space [######################] 100% (1/1) upgrading mercurial [######################] 100% warning: /etc/mercurial/hgrc installed as /etc/mercurial/hgrc.pacnew This behavior is a bit...odd. We don't like people using -f, and they are trained to assume the worst, so most would not expect the backup logic to still kick into effect. A pactest is below, but I'm asking for thoughts on expected behavior in this case. Many possibilities listed for completeness, some of which are just plain dumb. 1) Keep as is with file conflict error, require -Sf, keep backing up file to pacnew 2) Keep as is with file conflict error, require -Sf, don't backup (this is stupid) 3) Don't error at all, treat as a normal backup case except pretend old file is the same as /dev/null (aka empty). 4) Same as (3), but make the pacnew warning message slightly different, e.g. "%s is new in package, installed as %s" or something. 5) Something like (3) or (4) but don't even treat it the same as an empty file, treat it as never matching anything. My vote is 3 or 4, not that we are a democracy. :) -Dan self.description = "Upgrade a package, with a file entering the pkg in 'backup'" lp = pmpkg("dummy") lp.files = ["usr/bin/dummy"] self.addpkg2db("local", lp) p = pmpkg("dummy", "1.0-2") p.files = ["usr/bin/dummy", "etc/dummy.conf"] p.backup = ["etc/dummy.conf"] self.addpkg(p) self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") self.addrule("!FILE_PACSAVE=etc/dummy.conf") self.addrule("FILE_PACNEW=etc/dummy.conf") self.addrule("FILE_EXIST=etc/dummy.conf")

4 3

[pacman-dev] [PATCH] Add 'compress' compression format as an available option
by Dan McGee 14 Jul '11

14 Jul '11

This adds the '.tar.Z' option to both repo-add and makepkg for no other reason than "why not", and because bsdtar supports it natively with the '-Z' flag. Also update the documentation accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is about as random as it gets. Did notice we lack some consistency in our doc/ directory regarding extension quoting, as you can see the two different styles below (and a third in use elsewhere). doc/makepkg.conf.5.txt | 3 ++- doc/pacman.conf.5.txt | 11 ++++++----- doc/repo-add.8.txt | 4 ++-- scripts/makepkg.sh.in | 2 ++ scripts/repo-add.sh.in | 1 + 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index aa0174c..dce9b59 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -215,7 +215,8 @@ Options **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The - current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2` and `.tar.xz`. + current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and + `.tar.Z`. Do not touch these unless you know what you are doing. See Also diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index bdf0bc8..a28e00f 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -225,11 +225,12 @@ directory with these packages so pacman can find it when run with '\--refresh'. The above command will generate a compressed database named '/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form -'\{treename\}.db.tar.gz', where '\{treename\}' is the name of the section defined in -the configuration file. That's it! Now configure your custom section in the -configuration file as shown in the config example above. Pacman will now use your -package repository. If you add new packages to the repository, remember to -re-generate the database and use pacman's '\--refresh' option. +'\{treename\}.db.tar.{ext}', where '\{treename\}' is the name of the section +defined in the configuration file and '\{ext\}' is a valid compression type as +documented in linkman:repo-add[8]. That's it! Now configure your custom section +in the configuration file as shown in the config example above. Pacman will now +use your package repository. If you add new packages to the repository, +remember to re-generate the database and use pacman's '\--refresh' option. For more information on the repo-add command, see ``repo-add \--help'' or linkman:repo-add[8]. diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 2de5be8..e03384f 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -31,8 +31,8 @@ can be specified on the command line. A package database is a tar file, optionally compressed. Valid extensions are ``.db'' or ``.files'' followed by an archive extension of ``.tar'', -``.tar.gz'', ``.tar.bz2'', or ``.tar.xz''. The file does not need to exist, but -all parent directories must exist. +``.tar.gz'', ``.tar.bz2'', ``.tar.xz'', or ``.tar.Z''. The file does not need +to exist, but all parent directories must exist. Common Options diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1b132a9..5d9a382 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1152,6 +1152,7 @@ create_package() { *tar.gz) EXT=${PKGEXT%.gz} ;; *tar.bz2) EXT=${PKGEXT%.bz2} ;; *tar.xz) EXT=${PKGEXT%.xz} ;; + *tar.Z) EXT=${PKGEXT%.Z} ;; *tar) EXT=${PKGEXT} ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; @@ -1174,6 +1175,7 @@ create_package() { *tar.gz) gzip -c -f -n ;; *tar.bz2) bzip2 -c -f ;; *tar.xz) xz -c -z - ;; + *tar.Z) compress -c -f ;; *tar) cat ;; esac > "${pkg_file}" || ret=$? diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 474e21d..19fe660 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -228,6 +228,7 @@ verify_repo_extension() { *.(a)(db|files).tar.gz) TAR_OPT="z" ;; *.(a)(db|files).tar.bz2) TAR_OPT="j" ;; *.(a)(db|files).tar.xz) TAR_OPT="J" ;; + *.(a)(db|files).tar.Z) TAR_OPT="Z" ;; *.(a)(db|files).tar) TAR_OPT="" ;; *) error "$(gettext "'%s' does not have a valid archive extension.")" \ "$repofile" -- 1.7.6

1 0