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

[pacman-dev] [PATCH] makepkg: fix sudo/su calling of pacman
by Allan McRae 01 Jul '10

01 Jul '10

This fixes two issues: 1) using "sudo -l" results in excess password asking under certian configurations. Revert to the pre 3.4 behaviour of always using sudo if it is installed. 2) Properly escape the command so that that versioned dependencies, such as "foo>4", do not get treated as output redirection. This also unifies the generation of the pacman line and its privilege escalation. Based on patches supplied by Andres P <aepd87(a)gmail.com> with minor adjustments for suitability for the maint branch. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a fix for the maint branch. The reworking of the privilege escalation to a configurable option will need to go on the master branch at a later date. scripts/makepkg.sh.in | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f3c7217..25bbc74 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -368,17 +368,15 @@ download_file() { } run_pacman() { - local ret=0 + local cmd=$(printf "%q " "$PACMAN" $PACMAN_OPTS "$@") if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then - if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then - sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + if [ "$(type -p sudo)" ]; then + cmd="sudo $cmd" else - su -c "$PACMAN $PACMAN_OPTS $*" || ret=$? + cmd="su -c '$cmd'" fi - else - $PACMAN $PACMAN_OPTS "$@" || ret=$? fi - return $ret + eval "$cmd" } check_deps() { -- 1.7.1

4 4

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

01 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 622326bb37a9f7eb1db27ac0166e791d7a949e0c (commit) via 68dff73463dd06d2055bcbd48be9bc74e786be5c (commit) from 0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (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 622326bb37a9f7eb1db27ac0166e791d7a949e0c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 30 20:42:30 2010 +1000 makepkg: fix sudo/su calling of pacman This fixes two issues: 1) using "sudo -l" results in excess password asking under certian configurations. Revert to the pre 3.4 behaviour of always using sudo if it is installed. 2) Properly escape the command so that that versioned dependencies, such as "foo>4", do not get treated as output redirection when using su. This also unifies the generation of the pacman line and its privilege escalation. Based on patches supplied by Andres P <aepd87(a)gmail.com> with minor adjustments for suitability for the maint branch. Original-work-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 68dff73463dd06d2055bcbd48be9bc74e786be5c Author: 甘露(Gan Lu) <rhythm.gan(a)gmail.com> Date: Thu Jul 1 00:21:08 2010 -0500 Update Chinese translation to fix gettext positional params Because the shell gettext doesn't allow for positional gettext substitution, be more careful about where we use it. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 82 ++++++++++++++++++++++++------------------------ scripts/makepkg.sh.in | 13 +++---- 2 files changed, 47 insertions(+), 48 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

01 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 5a3aae02fed68379b5ede7abc9c7675632ce403a (commit) via 41724cbcdef11cb00fcd720c75d399288ea41fd0 (commit) from 96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c (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 5a3aae02fed68379b5ede7abc9c7675632ce403a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 27 20:32:11 2010 +1000 Check return value of chdir and getcwd Prevents compiler warnings when building with -D_FORTIFY_SOURCE=2 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41724cbcdef11cb00fcd720c75d399288ea41fd0 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 27 21:13:01 2010 +1000 Check return value of fwrite when copying files Check that writing to destination file actually occurs in _alpm_copyfile. Required adding a new error (PM_ERR_WRITE) as none of the others appeared appropriate. Prevents compiler warning when using -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: lib/libalpm/add.c | 16 +++++++++++----- lib/libalpm/alpm.h | 1 + lib/libalpm/util.c | 18 +++++++++++++----- src/pacman/pacman.c | 15 +++++++++++++-- 4 files changed, 38 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] weird error when makepkg
by 甘露(Gan Lu) 01 Jul '10

01 Jul '10

there are two reports related to my translation (Chinese simplified), but I can't find any similar items in my po file, so I ask here for help: 1. when makepkg with -sifr， there are error in finishing: ==> 完成创建：plymouth-git 20100624-1 (2010年 06月 24日星期四 15:48:46 CST) /usr/bin/makepkg: line 93: printf: `$': invalid format character the correspondent line in /usr/bin/makepkg is: printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 sorry for Chinese but this error only occurs in zh_CN environment, C or en_US.UTF-8 works well. 2. other one is (report by others, I currently don't know what argue he use 'makepkg'): /usr/bin/makepkg: line 902: * 1024 : syntax error: operand expected (error token is "* 1024 ") the correspondent line in /usr/bin/makepkg is: size="$(( ${size%%[^0-9]*} * 1024 ))" Anyone? [root@myhost plymouth-git]# pacman -Qs pacman local/pacman 3.4.0-2 (base) A library-based package manager with dependency support

3 10