- Pacman-dev - lists.archlinux.org

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

02 Sep '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 9d3a8efb7bc0b932a1a6c543bfee6da02f58230e (commit) via a7c4159b16ee651563e9346a2b2ca8c28a32ec00 (commit) via 54b63de0980c62248b554616e222eaae5d7f1a71 (commit) from 90c45f7bbe6811a2f32ef81e57bce8237d491e9f (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 9d3a8efb7bc0b932a1a6c543bfee6da02f58230e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 1 21:16:49 2010 -0500 3.4.1 version bump Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7c4159b16ee651563e9346a2b2ca8c28a32ec00 Author: Gaspar Santos <omeuviolino(a)gmail.com> Date: Wed Sep 1 21:15:07 2010 -0500 Add new European Portuguese translation This is being checked in as 'pt' rather than 'pt_PT' as that is what Transifex seems to want, and it is also the dominant choice of packages already installed on my system when doing a count of the files located in the /usr/share/locale translation directories. Thanks for the new translation! Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 54b63de0980c62248b554616e222eaae5d7f1a71 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 1 21:13:17 2010 -0500 Add dir missing from autoclean.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: autoclean.sh | 2 +- configure.ac | 4 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{pt_BR.po => pt.po} | 179 ++++---- po/LINGUAS | 1 + po/{pt_BR.po => pt.po} | 786 +++++++++++++++++++----------------- 6 files changed, 511 insertions(+), 462 deletions(-) copy lib/libalpm/po/{pt_BR.po => pt.po} (73%) copy po/{pt_BR.po => pt.po} (66%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] fixed FS#20216: corrected phrasing in German translation
by Martti Kühne 28 Aug '10

28 Aug '10

Hello list This is the form in which you take patches, right? :-) fixed FS#20216: corrected phrasing in German translation --- po/de.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index bb0f811..e4542d7 100644 --- a/po/de.po +++ b/po/de.po @@ -979,11 +979,11 @@ msgstr "Pakete (%d):" #, c-format msgid "Total Download Size: %.2f MB\n" -msgstr "Gesamtgröße der heruntergeladenen Pakete: %.2f MB\n" +msgstr "Gesamtgröße der Downloads: %.2f MB\n" #, c-format msgid "Total Installed Size: %.2f MB\n" -msgstr "Gesamtgröße der installierten Pakete: %.2f MB\n" +msgstr "Gesamtgröße der zu installierenden Pakete: %.2f MB\n" #, c-format msgid "Remove (%d):" -- 1.7.2.2

3 2

[pacman-dev] [PATCH] Use pipe to create compressed package instead of an intermediate tar file
by Juergen Hoetzel 27 Aug '10

27 Aug '10

A pipe between tar and compression command is used. This improves performance by running tar and the compression command simultaneously. Using a pipe also reduces IO by not writing an intermediate tar file to disk. Signed-off-by: Juergen Hoetzel <juergen(a)archlinux.org> --- scripts/makepkg.sh.in | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dc720ca..aa85b85 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1032,26 +1032,25 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local tar_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" local ret=0 # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - bsdtar -cf - $comp_files * > "$tar_file" || ret=$? - shopt -u nullglob + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + bsdtar -cf - $comp_files * | + case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar) cat ;; + esac > ${pkg_file} || ret=$? - if (( ! ret )); then - case "$PKGEXT" in - *tar.gz) gzip -f -n "$tar_file" ;; - *tar.bz2) bzip2 -f "$tar_file" ;; - *tar.xz) xz -z -f "$tar_file" ;; - *tar) true ;; - esac - ret=$? - fi + shopt -u nullglob + shopt -u -o pipefail if (( ret )); then error "$(gettext "Failed to create package file.")" -- 1.7.2.2

3 2

[pacman-dev] [PATCH] Use pipe to create compressed package instead of an intermediate tar file
by Juergen Hoetzel 27 Aug '10

27 Aug '10

A pipe between tar and compression command is used. This improves performance by running tar and the compression command simultaneously. Using a pipe also reduces IO by not writing an intermediate tar file to disk. Signed-off-by: Juergen Hoetzel <juergen(a)archlinux.org> --- scripts/makepkg.sh.in | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 17fd5de..1d66411 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1032,26 +1032,25 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local tar_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" local ret=0 # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - bsdtar -cf - $comp_files * > "$tar_file" || ret=$? - shopt -u nullglob + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + bsdtar -cf - $comp_files * | + case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar) cat ;; + esac > ${pkg_file} || ret=$? - if (( ! ret )); then - case "$PKGEXT" in - *tar.gz) gzip -f -n "$tar_file" ;; - *tar.bz2) bzip2 -f "$tar_file" ;; - *tar.xz) xz -z -f "$tar_file" ;; - *tar) true ;; - esac - ret=$? - fi + shopt -u nullglob + shopt -u -o pipefail if (( ret )); then error "$(gettext "Failed to create package file.")" -- 1.7.2.2

1 0

[pacman-dev] [PATCH] Use pipe to create compressed package instead of an intermediate tar file
by Juergen Hoetzel 27 Aug '10

27 Aug '10

A pipe between tar and compression command is used. This improves performance by running tar and the compression command simultaneously. Using a pipe also reduces IO by not writing an intermediate tar file to disk. Signed-off-by: Juergen Hoetzel <juergen(a)archlinux.org> --- scripts/makepkg.sh.in | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 66e1225..2200e98 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1032,26 +1032,25 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local tar_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" local ret=0 # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - bsdtar -cf - $comp_files * > "$tar_file" || ret=$? - shopt -u nullglob + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + bsdtar -cf - $comp_files *| + case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar) cat ;; + esac >>${pkg_file} || ret=$? - if (( ! ret )); then - case "$PKGEXT" in - *tar.gz) gzip -f -n "$tar_file" ;; - *tar.bz2) bzip2 -f "$tar_file" ;; - *tar.xz) xz -z -f "$tar_file" ;; - *tar) true ;; - esac - ret=$? - fi + shopt -u nullglob + shopt -u -o pipefail if (( ret )); then error "$(gettext "Failed to create package file.")" -- 1.7.2.2

3 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-34-g90c45f7
by dan＠archlinux.org 27 Aug '10

27 Aug '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 90c45f7bbe6811a2f32ef81e57bce8237d491e9f (commit) from 9fbf5d9336455649528843efe9a551291dafb257 (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: test/pacman/pmtest.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-82-g693ebbd
by dan＠archlinux.org 27 Aug '10

27 Aug '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 693ebbd16bc1560ec3ec166d9944e44583141259 (commit) via 0223a028e0835b6e09e2654e62ce5fd462370ffb (commit) via d14a98db25c3dd1843510a1608064dda913ea230 (commit) via a8dcfeccfcd0fc78554e6dad7ae07d53034363e1 (commit) via 90c45f7bbe6811a2f32ef81e57bce8237d491e9f (commit) via 9fbf5d9336455649528843efe9a551291dafb257 (commit) from 8d88f0c897e5dd531a2c74dd2bca56db56a3c63d (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 693ebbd16bc1560ec3ec166d9944e44583141259 Author: Jonathan Conder <j(a)skurvy.no-ip.org> Date: Thu Aug 19 00:07:21 2010 +1200 use execv to avoid using sh just to run ldconfig Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0223a028e0835b6e09e2654e62ce5fd462370ffb Author: Jonathan Conder <j(a)skurvy.no-ip.org> Date: Thu Aug 19 00:07:18 2010 +1200 redirect scriptlet stderr synchronously through alpm Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. For simplicity it redirects all scriptlet output through SCRIPTLET_INFO, and all callbacks in the child process have been replaced for thread-safety. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d14a98db25c3dd1843510a1608064dda913ea230 Merge: a8dcfec 90c45f7 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 27 11:19:05 2010 -0500 Merge branch 'maint' commit a8dcfeccfcd0fc78554e6dad7ae07d53034363e1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 27 10:52:05 2010 -0500 makepkg: remove trailing quote mark in regex Regular expressions in bash should not be quoted. Glad this was in the documentation and I didn't have to go to #bash to ask... Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/trans.c | 5 ++- lib/libalpm/util.c | 98 +++++++++++++++++++++++++++++------------------- lib/libalpm/util.h | 2 +- po/zh_CN.po | 2 +- scripts/makepkg.sh.in | 2 +- test/pacman/pmtest.py | 5 ++- 6 files changed, 70 insertions(+), 44 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use pipe to create compressed package instead of an intermediate tar file
by Juergen Hoetzel 27 Aug '10

27 Aug '10

A pipe between tar and compression command is used. This improves performance by running tar and the compression command simultaneously. Using a pipe also reduces IO by not writing an intermediate tar file to disk. Signed-off-by: Juergen Hoetzel <juergen(a)archlinux.org> --- scripts/makepkg.sh.in | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 66e1225..2200e98 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1032,26 +1032,25 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local tar_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" local ret=0 # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - bsdtar -cf - $comp_files * > "$tar_file" || ret=$? - shopt -u nullglob + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + bsdtar -cf - $comp_files *| + case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar) cat ;; + esac >>${pkg_file} || ret=$? - if (( ! ret )); then - case "$PKGEXT" in - *tar.gz) gzip -f -n "$tar_file" ;; - *tar.bz2) bzip2 -f "$tar_file" ;; - *tar.xz) xz -z -f "$tar_file" ;; - *tar) true ;; - esac - ret=$? - fi + shopt -u nullglob + shopt -u -o pipefail if (( ret )); then error "$(gettext "Failed to create package file.")" -- 1.7.2.2

1 0

[pacman-dev] [PATCH 2/2] use execv to avoid using sh just to run ldconfig
by Jonathan Conder 27 Aug '10

27 Aug '10

Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/trans.c | 5 ++++- lib/libalpm/util.c | 11 ++++++----- lib/libalpm/util.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) I just improved the debug output for this patch, which I've been meaning to do since I first submitted it. diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 523f33b..61d0722 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -343,6 +343,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; char tmpdir[PATH_MAX]; + char *argv[] = { "sh", "-c", cmdline, NULL }; char *scriptpath; int clean_tmpdir = 0; int retval = 0; @@ -400,7 +401,9 @@ int _alpm_runscriptlet(const char *root, const char *installfn, scriptpath, script, ver); } - retval = _alpm_run_chroot(root, cmdline); + _alpm_log(PM_LOG_DEBUG, "executing \"%s\"\n", cmdline); + + retval = _alpm_run_chroot(root, "/bin/sh", argv); cleanup: if(clean_tmpdir && _alpm_rmrf(tmpdir)) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 46460f0..8a1f392 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -452,7 +452,7 @@ int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args) return(ret); } -int _alpm_run_chroot(const char *root, const char *cmd) +int _alpm_run_chroot(const char *root, const char *path, char *const argv[]) { char cwd[PATH_MAX]; pid_t pid; @@ -475,7 +475,7 @@ int _alpm_run_chroot(const char *root, const char *cmd) goto cleanup; } - _alpm_log(PM_LOG_DEBUG, "executing \"%s\" under chroot \"%s\"\n", cmd, root); + _alpm_log(PM_LOG_DEBUG, "executing \"%s\" under chroot \"%s\"\n", path, root); /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); @@ -513,8 +513,8 @@ int _alpm_run_chroot(const char *root, const char *cmd) exit(1); } umask(0022); - execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); - fprintf(stderr, _("call to execl failed (%s)\n"), strerror(errno)); + execv(path, argv); + fprintf(stderr, _("call to execv failed (%s)\n"), strerror(errno)); exit(1); } else { /* this code runs for the parent only (wait on the child) */ @@ -578,7 +578,8 @@ int _alpm_ldconfig(const char *root) if(access(line, F_OK) == 0) { snprintf(line, PATH_MAX, "%ssbin/ldconfig", root); if(access(line, X_OK) == 0) { - _alpm_run_chroot(root, "/sbin/ldconfig"); + char *argv[] = { "ldconfig", NULL }; + _alpm_run_chroot(root, "/sbin/ldconfig", argv); } } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 8a3154a..35c4d28 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -68,7 +68,7 @@ int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn) int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args); -int _alpm_run_chroot(const char *root, const char *cmd); +int _alpm_run_chroot(const char *root, const char *path, char *const argv[]); int _alpm_ldconfig(const char *root); int _alpm_str_cmp(const void *s1, const void *s2); char *_alpm_filecache_find(const char *filename); -- 1.7.2.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-33-g9fbf5d9
by dan＠archlinux.org 25 Aug '10

25 Aug '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 9fbf5d9336455649528843efe9a551291dafb257 (commit) from 3de32a08126480f2a9cd67d09ef104accfde8992 (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 9fbf5d9336455649528843efe9a551291dafb257 Author: 甘露(Gan Lu) <rhythm.gan(a)gmail.com> Date: Wed Aug 25 14:29:44 2010 -0500 Update Chinese translation Submitted through Transifex on 2010-07-02. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0