- Pacman-dev - lists.archlinux.org

[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

[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

[pacman-dev] [PATCH] Check return value of chdir and getwd
by Allan McRae 30 Jun '10

30 Jun '10

Prevents compiler warnings when building with -D_FORTIFY_SOURCE=2 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- In commit_single_pkg in lib/libalpm/add.c the failure of changing directory has now become an error. From the comment above it, it looks like it should be an error if it fails, but I have been wrong before... lib/libalpm/add.c | 18 +++++++++++++----- lib/libalpm/util.c | 8 ++++++-- src/pacman/pacman.c | 17 +++++++++++++++-- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f39a0ec..e45073e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -556,6 +556,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, struct archive *archive; struct archive_entry *entry; char cwd[PATH_MAX] = ""; + int restore_cwd = 0; _alpm_log(PM_LOG_DEBUG, "extracting files\n"); @@ -579,11 +580,16 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, /* save the cwd so we can restore it later */ if(getcwd(cwd, PATH_MAX) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not get current working directory\n")); - cwd[0] = 0; + } else { + restore_cwd = 1; } /* libarchive requires this for extracting hard links */ - chdir(handle->root); + if(chdir(handle->root) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"), handle->root, strerror(errno)); + ret = -1; + goto cleanup; + } /* call PROGRESS once with 0 percent, as we sort-of skip that here */ if(is_upgrade) { @@ -629,9 +635,11 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, } archive_read_finish(archive); - /* restore the old cwd is we have it */ - if(strlen(cwd)) { - chdir(cwd); + /* restore the old cwd if we have it */ + if(restore_cwd) { + if(chdir(cwd) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"), cwd, strerror(errno)); + } } if(errors) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index b033e0a..383568c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -365,7 +365,9 @@ cleanup: umask(oldmask); archive_read_finish(_archive); if(restore_cwd) { - chdir(cwd); + if(chdir(cwd) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"), cwd, strerror(errno)); + } } return(ret); } @@ -535,7 +537,9 @@ int _alpm_run_chroot(const char *root, const char *cmd) cleanup: if(restore_cwd) { - chdir(cwd); + if(chdir(cwd) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"), cwd, strerror(errno)); + } } return(retval); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 78407d6..913b487 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -676,6 +676,7 @@ int download_with_xfercommand(const char *url, const char *localpath, struct stat st; char *parsedcmd,*tempcmd; char cwd[PATH_MAX]; + int restore_cwd = 0; char *destfile, *tempfile, *filename; if(!config->xfercommand) { @@ -708,8 +709,14 @@ int download_with_xfercommand(const char *url, const char *localpath, parsedcmd = strreplace(tempcmd, "%u", url); free(tempcmd); + /* save the cwd so we can restore it later */ + if(getcwd(cwd, PATH_MAX) == NULL) { + pm_printf(PM_LOG_ERROR, _("could not get current working directory\n")); + } else { + restore_cwd = 1; + } + /* cwd to the download directory */ - getcwd(cwd, PATH_MAX); if(chdir(localpath)) { pm_printf(PM_LOG_WARNING, _("could not chdir to download directory %s\n"), localpath); ret = -1; @@ -736,7 +743,13 @@ int download_with_xfercommand(const char *url, const char *localpath, } cleanup: - chdir(cwd); + /* restore the old cwd if we have it */ + if(restore_cwd) { + if(chdir(cwd) != 0) { + pm_printf(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"), cwd, strerror(errno)); + } + } + if(ret == -1) { /* hack to let an user the time to cancel a download */ sleep(2); -- 1.7.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-36-g96a1255
by dan＠archlinux.org 30 Jun '10

30 Jun '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 96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c (commit) via c11bf581a33babdbdf7b769567415b1faf1c4219 (commit) via 081e6a83608a28516abb326c1f66a07b691e1a32 (commit) via 0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (commit) via 8b23aa172f6229dd82c381704d4802d9747e118b (commit) via d7c98d4e45f614495399636bf02bc718e4a90ab8 (commit) via 21d5dedfddb290da4e9beafe3e28abcdee1b7091 (commit) from 630e7508ee44f2c41ba3f5d17c0c9ac15b15af3b (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 96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c Merge: c11bf58 0ea52e3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 30 08:41:43 2010 -0500 Merge branch 'maint' commit c11bf581a33babdbdf7b769567415b1faf1c4219 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 30 22:16:25 2010 +1000 makepkg: clarify aborting on packaging failure When makepkg catches a command failure it currently prints "Aborting..." and exits. Clarify the reason for aborting from packaging is a failure during one of the PKGBUILDs functions. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 081e6a83608a28516abb326c1f66a07b691e1a32 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 28 23:44:31 2010 +1000 Do not compare signed and unsigned types The casting of nread is safe as it is tested to be >0 when it is initally assigned. It is also being implicitly cast in the fwrite call in the line above. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + lib/libalpm/dload.c | 2 +- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 11 ++++++----- scripts/repo-add.sh.in | 5 ++++- src/pacman/pacman.c | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-13-g0ea52e3
by dan＠archlinux.org 30 Jun '10

30 Jun '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 0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (commit) via 8b23aa172f6229dd82c381704d4802d9747e118b (commit) via d7c98d4e45f614495399636bf02bc718e4a90ab8 (commit) via 21d5dedfddb290da4e9beafe3e28abcdee1b7091 (commit) from 6f4f9c1b66ed859b3679d70e15c003ab4907b823 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 6 +++--- scripts/repo-add.sh.in | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: clarify aborting on packaging failure
by Allan McRae 30 Jun '10

30 Jun '10

When makepkg catches a command failure it currently prints "Aborting..." and exits. Clarify the reason for aborting from packaging is a command failure. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The message is still crap... Any ideas for better clarity? scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cbc344d..a21a672 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -721,6 +721,7 @@ error_function() { fi # first exit all subshells, then print the error if (( ! BASH_SUBSHELL )); then + error "$(gettext "A command failure occurred during packaging.")" plain "$(gettext "Aborting...")" remove_deps fi -- 1.7.1

3 5

[pacman-dev] [PATCH 01/11] makepkg: fix variable checks when writing pkginfo
by Andres P 30 Jun '10

30 Jun '10

Regression in c71fe7db checked for wrong variables when populating .PKGINFO. Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 678359f..d0b8b4b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -923,14 +923,14 @@ write_pkginfo() { echo "force = true" fi - [[ $license ]] && printf "license = %s\n" "${license[@]}" - [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" - [[ $groups ]] && printf "group = %s\n" "${groups[@]}" - [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" - [[ $optdepend ]] && printf "optdepend = %s\n" "${optdepends[@]}" - [[ $conflict ]] && printf "conflict = %s\n" "${conflicts[@]}" - [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" - [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" + [[ $license ]] && printf "license = %s\n" "${license[@]}" + [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" + [[ $groups ]] && printf "group = %s\n" "${groups[@]}" + [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}" + [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" + [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" + [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" for it in "${packaging_options[@]}"; do local ret="$(check_option $it)" -- 1.7.1

6 80