- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: save path to PACMAN and test availability
by Allan McRae 13 Nov '12

13 Nov '12

After we install dependencies, we source /etc/profile so that new elements get added to the path. As this can override any local setting of PATH, we store the full path of the PACMAN variable passed to makepkg. Also, add a check for PACMAN availability if it is needed to deal with any dependency operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a replacement for the patch provided by Martin Panter. While dealing with patches today, I decided that the check for the full pacman path was being done in the wrong place and we should do the usual check of software availability if "pacman" is needed. scripts/makepkg.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f650b1b..16e421b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -875,9 +875,9 @@ source_has_signatures() { run_pacman() { local cmd if [[ ! $1 = -@(T|Qq) ]]; then - cmd=("$PACMAN" $PACMAN_OPTS "$@") + cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@") else - cmd=("$PACMAN" "$@") + cmd=("$PACMAN_PATH" "$@") fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then @@ -2191,6 +2191,14 @@ check_software() { # check for needed software local ret=0 + # check for PACMAN if we need it + if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then + if [[ -z $PACMAN_PATH ]]; then + error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" + ret=1 + fi + fi + # check for sudo if we will need it during makepkg execution if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then if ! type -p sudo >/dev/null; then @@ -2548,6 +2556,8 @@ fi # set pacman command if not already defined PACMAN=${PACMAN:-pacman} +# save full path to command as PATH may change when sourcing /etc/profile +PACMAN_PATH=$(type -P $PACMAN) || true # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW @@ -2825,7 +2835,7 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "$PACMAN" >/dev/null; then +else if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi @@ -2853,8 +2863,6 @@ elif type -p "$PACMAN" >/dev/null; then error "$(gettext "Could not resolve all dependencies.")" exit 1 fi -else - warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH" fi # ensure we have a sane umask set -- 1.8.0

2 4

[pacman-dev] [PATCH 2/2 v2] Save path to $PACMAN, to avoid losing access due to --syncdeps
by Martin Panter 13 Nov '12

13 Nov '12

Unmangled version: https://github.com/vadmium/pacman-arch/commit/3992a1d.patch >From 3992a1dc7a40c4eefed99ae82e7c682babb4d01b Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 02:45:36 +0000 Subject: [PATCH] Save path to $PACMAN, to avoid losing access due to --syncdeps --- scripts/makepkg.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0f266df..9c6c0ae 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2728,7 +2728,12 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "$PACMAN" >/dev/null; then +elif output="$(command -v "$PACMAN")"; then + # Save full path in case the --syncdeps operation resets the $PATH by + # invoking /etc/profile. If $PACMAN refers to a command in ~/bin/ it + # could become inaccessible. + PACMAN="$output" + if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi -- 1.8.0

2 4

[pacman-dev] [PATCH 1/2 v2] Remove last traces of handling command arguments in $PACMAN
by Martin Panter 11 Nov '12

11 Nov '12

New version removing the arguments rather than adding them back. Unmangled version: https://github.com/vadmium/pacman-arch/commit/7d15a05.patch >From 7d15a057e37defece4c93bf17e4bbdac1db4106d Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 03:05:42 +0000 Subject: [PATCH] Remove last traces of handling command arguments in $PACMAN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This resolves an inconsistency with how the $PACMAN variable was interpreted. Previously “makepkg” would extract the first word from the $PACMAN variable and check that it existed as a command. This appears to have been happening ever since the variable was implemented in revision 66c6d28 (makepkg: allow to specify an alternative pacman command). Thus it looks like command arguments were originally allowed in the variable. However the run_pacman() function now quotes $PACMAN, so the whole variable has to be just the command name. This quoting was introduced more recently, perhaps in revision 622326b (makepkg: fix sudo/su calling of pacman). --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..0f266df 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2728,7 +2728,7 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "${PACMAN%% *}" >/dev/null; then +elif type -p "$PACMAN" >/dev/null; then if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi @@ -2757,7 +2757,7 @@ elif type -p "${PACMAN%% *}" >/dev/null; then exit 1 fi else - warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "${PACMAN%% *}" "PATH" + warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH" fi # ensure we have a sane umask set -- 1.8.0

1 0

[pacman-dev] [PATCH 0/8] [RFC] Signature checking overhaul
by Allan McRae 07 Nov '12

07 Nov '12

The main change here is that pacman will now check the needed keys are in the keyring before doing package validation. Example output: :: Retrieving packages ... systemd-sysvcompat-... 5.4 KiB 671K/s 00:00 [######################] 100% (1/1) checking keys in keyring [######################] 100% :: Import PGP key 2048R/F56C0C53, "Dave Reisner <d(a)falconindy.com>", created: 2011-06-26? [Y/n] (1/1) checking package integrity [######################] 100% (1/1) loading package files [######################] 100% This removed the repeat validation after key downloading and made the following much easier to implement: 1) packages with bad signatures get the "pkg is corrupt, delete?" type message 2) pacman -U now downloads a signature if needed. These patches need a very good review... Allan McRae (8): Make key_in_keychain available in library Move key importing into separate function Add function to extract key id from signatures Make decode_signature available to the library Check keys are in keyring before package validation Remove retry path from signature validation Prompt to delete packages with signature fails Import key if needed when installing package from file lib/libalpm/alpm.h | 9 ++- lib/libalpm/be_package.c | 40 ++++++++++ lib/libalpm/signing.c | 197 ++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/signing.h | 7 ++ lib/libalpm/sync.c | 87 ++++++++++++++++++--- src/pacman/callback.c | 9 +++ 6 files changed, 300 insertions(+), 49 deletions(-) -- 1.8.0

3 14

[pacman-dev] [PATCH 1/2] Restore ability for $PACMAN to include arguments and document it
by Martin Panter 03 Nov '12

03 Nov '12

Unmangled version: https://github.com/vadmium/pacman-arch/commit/70b1327.patch >From 70b1327c0443818d163e10b649ba882a4fd5a0f3 Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 03:05:42 +0000 Subject: [PATCH] Restore ability for $PACMAN to include arguments and document it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Judging by the “${PACMAN%% *}” incantation from revision 66c6d28 (makepkg: allow to specify an alternative pacman command), it looks like this was consciously intended. Currently, including arguments in $PACMAN means the --syncdeps operation may be attempted, but each Pacman invocation will probably fail. However in other cases the operation would be skipped if $PACMAN cannot be found. Looks like this inconsistency comes from revision 622326b (makepkg: fix sudo/su calling of pacman). --- doc/makepkg.8.txt | 3 ++- scripts/makepkg.sh.in | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 9d19e38..8b440a3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -196,7 +196,8 @@ Environment Variables The command that will be used to check for missing dependencies and to install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U operations must be supported by this command. If the variable is not - set or empty, makepkg will fall back to `pacman'. + set or empty, makepkg will fall back to `pacman'. The variable may + include command arguments, separated with spaces. **PKGDEST=**"/path/to/folder":: Folder where the resulting packages will be stored. Overrides the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..3b4f27f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -873,9 +873,9 @@ source_has_signatures() { run_pacman() { local cmd if [[ ! $1 = -@(T|Qq) ]]; then - cmd=("$PACMAN" $PACMAN_OPTS "$@") + cmd=($PACMAN $PACMAN_OPTS "$@") else - cmd=("$PACMAN" "$@") + cmd=($PACMAN "$@") fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then -- 1.7.12

2 3

[pacman-dev] [PATCH 2/2] Save path to Pacman, which could be lost during --syncdeps operation
by Martin Panter 03 Nov '12

03 Nov '12

Unmangled version: https://github.com/vadmium/pacman-arch/commit/b984a8b.patch Turns out it wasn’t too hard to allow spaces in the path returned from “command -v”, while handling any extra arguments. >From b984a8b2cb3daa05177420d1a9d83648d6c0aa0d Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 02:45:36 +0000 Subject: [PATCH] Save path to Pacman, which could be lost during --syncdeps operation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Access to the Pacman command could be lost when /etc/profile is invoked and $PATH is reset. Tested to make sure the following scenarios behave sensibly, where “roopwn” is in ~/bin/: PACMAN="pacman --config /etc/pacman.conf" makepkg --syncdeps --install PACMAN="nonexistent --dummy" makepkg --syncdeps --install PACMAN="nonexistent --dummy" makepkg PACMAN="roopwn --verbose" makepkg --syncdeps --install --- scripts/makepkg.sh.in | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3b4f27f..2b224b8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -873,9 +873,9 @@ source_has_signatures() { run_pacman() { local cmd if [[ ! $1 = -@(T|Qq) ]]; then - cmd=($PACMAN $PACMAN_OPTS "$@") + cmd=("${PACMAN[@]}" $PACMAN_OPTS "$@") else - cmd=($PACMAN "$@") + cmd=("${PACMAN[@]}" "$@") fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then @@ -898,7 +898,7 @@ check_deps() { if (( ret == 127 )); then #unresolved deps printf "%s\n" "$pmout" elif (( ret )); then - error "$(gettext "'%s' returned a fatal error (%i): %s")" "$PACMAN" "$ret" "$pmout" + error "$(gettext "'%s' returned a fatal error (%i): %s")" "${PACMAN[*]}" "$ret" "$pmout" return "$ret" fi } @@ -920,7 +920,7 @@ handle_deps() { msg "$(gettext "Installing missing dependencies...")" if ! run_pacman -S --asdeps $deplist; then - error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" + error "$(gettext "'%s' failed to install missing dependencies.")" "${PACMAN[*]}" exit 1 # TODO: error code fi fi @@ -1899,9 +1899,9 @@ install_package() { (( ! INSTALL )) && return if (( ! SPLITPKG )); then - msg "$(gettext "Installing package %s with %s...")" "$pkgname" "$PACMAN -U" + msg "$(gettext "Installing package %s with %s...")" "$pkgname" "${PACMAN[*]} -U" else - msg "$(gettext "Installing %s package group with %s...")" "$pkgbase" "$PACMAN -U" + msg "$(gettext "Installing %s package group with %s...")" "$pkgbase" "${PACMAN[*]} -U" fi local fullver pkgarch pkg pkglist @@ -2457,8 +2457,9 @@ if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then source_safe ~/.makepkg.conf fi -# set pacman command if not already defined -PACMAN=${PACMAN:-pacman} +# Set pacman command if not already defined. Convert to Bash array so that +# spaces can be included in the path while any arguments are retained. +PACMAN=(${PACMAN:-pacman}) # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW @@ -2728,7 +2729,11 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "${PACMAN%% *}" >/dev/null; then +elif output="$(command -v "$PACMAN")"; then + # Save full path to Pacman in case the --syncdeps operation modifies + # the $PATH and makes it inaccessible + PACMAN="$output" + if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi @@ -2757,7 +2762,7 @@ elif type -p "${PACMAN%% *}" >/dev/null; then exit 1 fi else - warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "${PACMAN%% *}" "PATH" + warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH" fi # ensure we have a sane umask set -- 1.7.12

3 6

[pacman-dev] Tar backend for local db
by Allan McRae 01 Nov '12

01 Nov '12

I was thinking about the local database backend in pacman and how we could improve it. The tar-based backed for sync dbs have been quite a success. Ever since we did that, I have been wanting to do the same with the local database. But there were two issues: 1) tar is not designed for removing and updating files in place 2) with a directory/files per package structure, we are quite robust to corruption as a single file effects only a single package. Well... I have a cunning plan... How about we do both! Have the local database in a tarball but also extracted. All reading is done from the tarball, so -Q operations would be fast due to not require reading from lots of small files. With an operation that adds/removes/updates a package, the local database is still read from the tarball, but the modifications are done on the files backend and then the tarball is recreated at the end. We could even be efficient during the recreation and read all the old files from the old tarball and only read the new files from the filesystem (which will be in the kernel cache...). This would also give another use for "pacman -D" - an option could be added to recreate the local db tarball - in case it became corrupt or the files were manually edited. What do people think?

8 12

[pacman-dev] Fwd: [PATCH] Hack to detect Pacman-command-no-found error
by Martin Panter 31 Oct '12

31 Oct '12

[Resending after subscribing my address. If this works perhaps a note should be added saying you have to subscribe to be able to send to the list?] Original [patch] in case it gets garbled: https://github.com/vadmium/pacman-arch/commit/0a71ece.patch If the spirit of the change is appropriate but you’re not happy about using the ”test” command, I’m happy to learn how to use the Bash-specific way with double square brackets. Or someone who already knows can translate it :) >From 0a71ece90951894953ffd7bae741d69af927bf3f Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Thu, 18 Oct 2012 06:31:07 +0000 Subject: [PATCH] Hack to detect Pacman-command-no-found error Bash also uses exit code 127 for command-not-found errors, which can occur if we lose access to the command given by $PACMAN. For instance after invoking /etc/profile, $PATH may be reset. --- 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 d387b7d..307ceeb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -895,7 +895,7 @@ check_deps() { pmout=$(run_pacman -T "$@") ret=$? - if (( ret == 127 )); then #unresolved deps + if test "$ret" -eq 127 -a -n "$pmout"; then #unresolved deps printf "%s\n" "$pmout" elif (( ret )); then error "$(gettext "'%s' returned a fatal error (%i): %s")" "$PACMAN" "$ret" "$pmout" -- 1.7.12

2 3

[pacman-dev] Changing from double quotes to single quotes
by Alexander Rødseth 30 Oct '12

30 Oct '12

Hi, Patch 1 and 4 are for changing quotes from double to single for the pkgdesc in PKGBUILD.proto and PKGBUILD-split.proto. Since few packages perform variable replacement in the package description, I think it would make sense to make single quotes the default. Patch 2 is for doing the same for the url. Patch 3 and 5 are for removing quotes when using cd and make. I was informed that this is safe to do when using $pkgdir. Best regards, Alexander Rødseth

4 14

[pacman-dev] Getting fingerprint of key used to make signature
by Allan McRae 29 Oct '12

29 Oct '12

Can anyone figure out how to take the PGP signature and extract the key ID used to make it in gpgme _without_ completely verifying the signature? Allan

1 0