- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Update NEWS for 4.0.0 release
by Dan McGee 06 Oct '11

06 Oct '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- NEWS | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 8d18236..6215951 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,73 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +4.0.0 - well-integrated and powerful signed packages and databases + support in pacman, the library, and scripts (FS#5331) + - over 800 commits to pacman.git since 3.5.4 release + - many code cleanup commits across library/binaries/scripts + - many performance improvement commits across library/binaries + - add new -S --recursive operation to upgrade a full dep chain + - report upgrade size on sync operations (FS#12566) + - early terminal input is flushed before question prompts + - remove duplicate code shared in sync and upgrade operations + - remove ShowSize; replaced with VerbosePkgLists (FS#15772) + - print callback (warning, error) messages to stderr (FS#25099) + - download progress callback has more room for filenames + - fix selection entry for long values (FS#25253) + - make config parsing two-pass process, enhance error messages + - print helpful tips on -Qi <filename> or -S <filename> + - replace libfetch with libcurl for backend download library + - timeout when mirror is not responding (FS#15369) + - full HTTPS protocol support (FS#22435) + - support of non-traditional/redirected URLs (FS#22645) + - ensure downloads are only resumed if appropriate (FS#23803) + - only remove empty directories if no remaining owner (FS#25141) + - better cache directory choosing and honor $TMPDIR (FS#25435) + - replaces are parsed as dependency-style strings (FS#23410) + - split package verification and load stages + - sync database reading refactor for performance + - filelists now have a dedicated type with metadata + - diskspace check no longer requires iterating package archives + - update and add checksum routines from PolarSSL + - validate sync database sha256sum if available + - correctly parse sizes in database > 2GiB + - API: several type renames from pm* to alpm_* prefix + - API: several enum constant renames from PM to ALPM_* prefix + - API: several types are now public exposed structs + - API: handle is no longer a single global variable + - API: more changes than can be mentioned here, see README + - much improved API documentation for use by Doxygen + - pactest: several performance/checking improvements + - scripts: + - refactor some common components into shared bash library + - split translations into pacman-scripts catalog (FS#15148) + - makepkg: + - allow signing packages after creation + - allow verifying source file signatures (FS#20448) + - support UPX compression of executables (FS#17213) + - allow usage of an alternate build directory (FS#22308) + - cleancache option has been removed; use shell instead + - improved variable sanity checking (FS#16004) + - better handling of package extensions (.tar.Z or invalid) + - allow PKGEXT/SRCEXT environment overrides (FS#19860) + - only check for writable PKGDEST if necessary (FS#24735) + - check_software function exits early if missing req'd binaries + - do source packaging in fakeroot (FS#24330) + - be more POSIX-compatible in use of `ln` (FS#24893) + - handle spaces with filenames in noextract (FS#25100) + - repo-add: + - handle and include package signatures in databases + - verify database signature before modification + - sign database after creation/modification + - general script cleanup and bash-ification + - add sha256sums to database (FS#23103) + - pkgdelta: add a manpage + - pacman-key: new keyring management tool for signed data + - pactree: support sync databases with -s option + - pacsort: new utility, sort version numbers as pacman does + - contrib/paclog-pkglist: new, recover from missing local DB + - contrib/paccache: new, pacman cache cleanup script + - documentation: extensive updates to all manpages + - translations: extensive updates, new languages: lt, zh_TW 3.5.4 - fix display of lists on non-TTYs and other output fixes - fix group selection entry for large inputs (FS#24253) - fix divide by zero when downloading zero length files -- 1.7.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-58-ga8ca9b9
by dan＠archlinux.org 06 Oct '11

06 Oct '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 a8ca9b93f8efbbca2311cb0b99d9bd31c1636527 (commit) via 2df519f80789a67668a6d8718f746d3876b86eeb (commit) via dc7d691b20b1d105fc44ac860efc3afa6e134553 (commit) via 484d5ec624f12220df809b63bba719105eafdb8f (commit) via ab7d2890a47f051a892b05b4d551de0e5c5c8282 (commit) via cf0edb92ba349afad02e6bc1ca79da0cb6a72ea3 (commit) from 94bc64ae1bd6a51d71829a58a2e1972f629d47fb (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 a8ca9b93f8efbbca2311cb0b99d9bd31c1636527 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 22:39:05 2011 -0500 Update translation message catalogs in prep for 4.0 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2df519f80789a67668a6d8718f746d3876b86eeb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 22:36:34 2011 -0500 Add a top-level 'update-po' make target This makes the maintainer's life (read: my life) a lot easier when updating translation files to push to Transifex. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dc7d691b20b1d105fc44ac860efc3afa6e134553 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 22:30:14 2011 -0500 Update translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 484d5ec624f12220df809b63bba719105eafdb8f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 13:18:19 2011 -0500 pacman-key: treat foo-trusted as an ownertrust export file This allows it to serve double-duty. In order to allow users to base verification decisions off of both a valid signature and a trusted signature, we need to assign some level of owner trust to the keys we designate as trusted on import. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab7d2890a47f051a892b05b4d551de0e5c5c8282 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 12:41:27 2011 -0500 pacman-key: refine and clarify import/import-trustdb behavior * --import now only imports keys from pubkey.gpg and does not import owner trust; if you want to have both simply run the operations in sequence. * --import-trustdb has been simplified; it will overwrite existing values in the trust database as before, but there is no need to export it first as those values are safe if left untouched. * Fix the manpage referring to a non-existent option. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cf0edb92ba349afad02e6bc1ca79da0cb6a72ea3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 4 15:31:17 2011 -0500 Parse '0' as a valid package installed size This was a bad oversight on my part, pointed out by Jakob. Whoops. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 5 + doc/pacman-key.8.txt | 15 +- lib/libalpm/po/ca.po | 18 +- lib/libalpm/po/cs.po | 17 +- lib/libalpm/po/da.po | 14 +- lib/libalpm/po/de.po | 19 +- lib/libalpm/po/el.po | 19 +- lib/libalpm/po/en_GB.po | 18 +- lib/libalpm/po/es.po | 20 +-- lib/libalpm/po/fi.po | 20 +- lib/libalpm/po/fr.po | 24 ++-- lib/libalpm/po/hu.po | 18 +- lib/libalpm/po/it.po | 19 +-- lib/libalpm/po/kk.po | 18 +- lib/libalpm/po/libalpm.pot | 8 +- lib/libalpm/po/lt.po | 19 +- lib/libalpm/po/nb.po | 43 +++--- lib/libalpm/po/pl.po | 16 +- lib/libalpm/po/pt.po | 17 +- lib/libalpm/po/pt_BR.po | 25 ++-- lib/libalpm/po/ro.po | 19 +- lib/libalpm/po/ru.po | 18 +- lib/libalpm/po/sk.po | 17 +- lib/libalpm/po/sr.po | 17 +- lib%2Flibalpm%2Fpo%2Fsr(a)latin.po | 17 +- lib/libalpm/po/sv.po | 14 +- lib/libalpm/po/tr.po | 44 +++--- lib/libalpm/po/uk.po | 19 +- lib/libalpm/po/zh_CN.po | 18 +- lib/libalpm/po/zh_TW.po | 20 +- lib/libalpm/util.c | 2 +- scripts/pacman-key.sh.in | 37 +++-- scripts/po/ca.po | 14 +- scripts/po/cs.po | 14 +- scripts/po/da.po | 14 +- scripts/po/de.po | 79 ++------- scripts/po/el.po | 95 ++++------- scripts/po/en_GB.po | 94 ++++------- scripts/po/es.po | 79 ++------- scripts/po/fi.po | 14 +- scripts/po/fr.po | 105 ++++-------- scripts/po/hu.po | 13 +- scripts/po/it.po | 75 ++------- scripts/po/kk.po | 14 +- scripts/po/lt.po | 99 ++++------- scripts/po/nb.po | 314 +++++++++++++++++++--------------- scripts/po/pacman-scripts.pot | 20 ++- scripts/po/pl.po | 14 +- scripts/po/pt.po | 14 +- scripts/po/pt_BR.po | 250 ++++++++++++---------------- scripts/po/ro.po | 76 ++------- scripts/po/ru.po | 13 +- scripts/po/sk.po | 14 +- scripts/po/sr.po | 14 +- scripts%2Fpo%2Fsr(a)latin.po | 14 +- scripts/po/sv.po | 14 +- scripts/po/tr.po | 26 +-- scripts/po/uk.po | 376 +++++++++++++++++++++++++---------------- scripts/po/zh_CN.po | 14 +- scripts/po/zh_TW.po | 4 +- src/pacman/po/ca.po | 65 +++----- src/pacman/po/cs.po | 69 +++----- src/pacman/po/da.po | 43 ++--- src/pacman/po/de.po | 78 +++------ src/pacman/po/el.po | 91 +++++------ src/pacman/po/en_GB.po | 102 +++++------- src/pacman/po/es.po | 78 +++------ src/pacman/po/fi.po | 79 ++++----- src/pacman/po/fr.po | 93 +++++------ src/pacman/po/hu.po | 64 +++---- src/pacman/po/it.po | 76 +++------ src/pacman/po/kk.po | 63 +++---- src/pacman/po/lt.po | 95 +++++------ src/pacman/po/nb.po | 153 ++++++++--------- src/pacman/po/pacman.pot | 14 +- src/pacman/po/pl.po | 70 +++----- src/pacman/po/pt.po | 67 +++----- src/pacman/po/pt_BR.po | 230 +++++++++++++------------- src/pacman/po/ro.po | 80 +++------ src/pacman/po/ru.po | 70 ++++----- src/pacman/po/sk.po | 80 ++++------ src/pacman/po/sr.po | 71 ++++----- src%2Fpacman%2Fpo%2Fsr(a)latin.po | 71 ++++----- src/pacman/po/sv.po | 47 +++--- src/pacman/po/tr.po | 152 ++++++++--------- src/pacman/po/uk.po | 93 +++++------ src/pacman/po/zh_CN.po | 63 +++---- src/pacman/po/zh_TW.po | 77 ++++----- 88 files changed, 2105 insertions(+), 2729 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Parse '0' as a valid package installed size
by Dan McGee 04 Oct '11

04 Oct '11

This was a bad oversight on my part, pointed out by Jakob. Whoops. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 18d1c36..beefa93 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1089,7 +1089,7 @@ off_t _alpm_strtoofft(const char *line) errno = 0; /* we are trying to parse bare numbers only, no leading anything */ - if(line[0] < '1' || line[0] > '9') { + if(line[0] < '0' || line[0] > '9') { return (off_t)-1; } result = strtoull(line, &end, 10); -- 1.7.7

1 0

[pacman-dev] Examples in the manpages
by Nico Schottelius 04 Oct '11

04 Oct '11

Dear pacman-devs, after a funny replace pacman-with-pacman-git evening, I digged around a bit into makepkg and pacman and noticed there are no examples in the manpages. Is that intented or would you like to/accept patches which add the EXAMPLES section? Cheers, Nico -- New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0 Please resign, if you signed 9885188C or 8D0E27A4. Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...

13 47

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-52-g94bc64a
by dan＠archlinux.org 03 Oct '11

03 Oct '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 94bc64ae1bd6a51d71829a58a2e1972f629d47fb (commit) via c4d6688694975c877e6bff3d6147ae23207a0cbe (commit) via b0543440caad87f1f660eefd6ec5f1a07c7763a0 (commit) via 39b0ac43fcbe35897f616a8e202ae9f3bcb1ee5c (commit) via 73139ccb3c47ed1ebb1a62a27deb080b66d92bf4 (commit) from 6bb594802588240405efee0813f7aa1daa9648b3 (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 94bc64ae1bd6a51d71829a58a2e1972f629d47fb Author: lolilolicon <lolilolicon(a)gmail.com> Date: Sat Oct 1 15:31:00 2011 +0800 makepkg: create tar file for bogus PKGEXT If PKGEXT is not one of the recognized tar*'s, create_package() would create an empty package file and fail, since bsdtar on the left side of the pipe returns 141 on SIGPIPE (broken pipe). This patch changes the behavior for an invalid PKGEXT. A warning is printed on stderr, and a tar file is created. Also retire the obsolete $EXT variable. Add the obligatory comment why we don't use bsdtar's compression. Finally, fix mixed-tab-space indentation. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c4d6688694975c877e6bff3d6147ae23207a0cbe Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 30 11:08:49 2011 -0500 Use _alpm_local_db_pkgpath in _cache_changelog_open Another place where we were doing the dirty work by hand. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b0543440caad87f1f660eefd6ec5f1a07c7763a0 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Fri Sep 30 15:32:49 2011 +0800 makepkg: support .tar.Z source packages creation SRCEXT should allow whatever PKGEXT does. Also address an uninitialized use of $ret. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 39b0ac43fcbe35897f616a8e202ae9f3bcb1ee5c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:43:23 2011 -0500 Revamp scriptlet path formation for scriptlets in local database Expose the current static get_pkgpath() function internally to the rest of the library as _alpm_local_db_pkgpath(). This allows use of this convenience function in add.c and remove.c when forming the path to the scriptlet location. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73139ccb3c47ed1ebb1a62a27deb080b66d92bf4 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 03:45:46 2011 -0500 Refactor _alpm_runscriptlet() Add an is_archive parameter to reduce the amount of black magic going on. Rework to use fewer PATH_MAX sized local variables, and simplify some of the logic where appropriate in both this function and in the callers where duplicate calls can be replaced by some conditional parameter code. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 46 +++++++++++++++-------------------------- lib/libalpm/be_local.c | 27 ++++++++++++----------- lib/libalpm/db.h | 1 + lib/libalpm/remove.c | 14 +++++++----- lib/libalpm/trans.c | 53 +++++++++++++++++++++++++++++++---------------- lib/libalpm/trans.h | 4 +- scripts/makepkg.sh.in | 30 +++++++++++--------------- 7 files changed, 90 insertions(+), 85 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: create tar file for bogus PKGEXT
by lolilolicon 02 Oct '11

02 Oct '11

If PKGEXT is not one of the recognized tar*'s, create_package() would create an empty package file and fail, since bsdtar on the left side of the pipe returns 141 on SIGPIPE (broken pipe). This patch changes the behavior for an invalid PKGEXT. A warning is printed on stderr, and a tar file is created. Also retire the obsolete $EXT variable. Also add the obligatory comment why we don't use bsdtar's compression. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/makepkg.sh.in | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc06baa..213ac32 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1256,17 +1256,6 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" - local EXT - case "$PKGEXT" in - *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 ;; - esac - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${PKGARCH}${PKGEXT}" local ret=0 @@ -1279,13 +1268,18 @@ create_package() { shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail + # bsdtar's gzip compression always saves the time stamp, making one + # archive created using the same command line distinct from another. + # Disable bsdtar compression and use gzip -n for now. bsdtar -cf - $comp_files * | case "$PKGEXT" in - *tar.gz) gzip -c -f -n ;; - *tar.bz2) bzip2 -c -f ;; - *tar.xz) xz -c -z - ;; - *tar.Z) compress -c -f ;; - *tar) cat ;; + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar.Z) compress -c -f ;; + *tar) cat ;; + *) warning "$(gettext "'%s' is not a valid archive extension." <&-)" \ + "$PKGEXT" <&- >&2; cat ;; esac > "${pkg_file}" || ret=$? shopt -u nullglob -- 1.7.6.4

3 6

[pacman-dev] [PATCH] makepkg: support .tar.Z source packages creation
by lolilolicon 01 Oct '11

01 Oct '11

Also address an uninitialized use of $ret. --- scripts/makepkg.sh.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d426661..8f76656 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1332,6 +1332,7 @@ create_signature() { } create_srcpackage() { + local ret=0 msg "$(gettext "Creating source package...")" local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" mkdir "${srclinks}"/${pkgbase} @@ -1369,6 +1370,7 @@ create_srcpackage() { *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; *tar.xz) TAR_OPT="J" ;; + *tar.Z) TAR_OPT="Z" ;; *tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; @@ -1380,7 +1382,9 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase} + ret=$? + if (( ret )); then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 1.7.6.4

2 4

[pacman-dev] [PATCH 0/1] Simple config parser added to scripts library
by lolilolicon 30 Sep '11

30 Sep '11

We're aware of many duplicates in our scripts, among which are things like eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) which is obviously utterly hackish and potentially dangerous, yet (shockingly) quite a common practice in our scripts. Trying to fix all these here and there is a waste of time. As suggested by Dave, I took the liberty to add a config parser to the scripts library. Currently there're only two functions conf_key_val and conf_key_set, which are modified from pacman-key's get_from(). The usage is a bit different, as described in the commit message. If we agree on this change, feel free to port our scripts to use this. lolilolicon (1): scripts/library: add config_parser.sh scripts/library/README | 3 ++ scripts/library/config_parser.sh | 56 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 scripts/library/config_parser.sh -- 1.7.6.4

3 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-47-g6bb5948
by dan＠archlinux.org 30 Sep '11

30 Sep '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 6bb594802588240405efee0813f7aa1daa9648b3 (commit) via e0400fff96497d915e67d190052820d53443d98f (commit) via 938fb2c87859cf495ac72d678d4edb9f6c3217c2 (commit) via 07ecd40a1a1ffba5e5b1c3edd199a0f159496c48 (commit) via 6dfb9d35f8601c3752dc5bd0e8558c48f41a8215 (commit) from 83c05e71bc6e614f6f3d190d5e752a0c5239a2d1 (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 6bb594802588240405efee0813f7aa1daa9648b3 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Sep 29 10:45:22 2011 +0800 paccache: proper quoting in [[ expression ]] Always quote the right-hand side of expression when the == or != operator is used, unless intended as a pattern. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e0400fff96497d915e67d190052820d53443d98f Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Sep 29 10:45:21 2011 +0800 paccache: declare variables explicitly Declare and initialize integer variables 'needsroot' and 'verbose'. Don't use the fact that (( undefined_variable )) evaluates to 0. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 938fb2c87859cf495ac72d678d4edb9f6c3217c2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Sep 30 06:07:55 2011 -0400 pacman-key: remove errexit flag from shebang We're ill equipped to be using this flag as we don't trap and respond to the ERR signal. The result is that if is ever tripped, pacman-key will instantly exit with no indication of why. At the same time, we're already fairly good about doing our own error checking and verbalizing it before dying. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07ecd40a1a1ffba5e5b1c3edd199a0f159496c48 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Sep 30 13:40:00 2011 +1000 pacman-key: return 0 from get_from if default value used This prevents the error trap being set off when GPGDir is commented in pacman.conf. Bug introduced in 507b01b9. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6dfb9d35f8601c3752dc5bd0e8558c48f41a8215 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 29 21:13:22 2011 +1000 Remove redundant transaction size output Printing all of "Installed", "Removed" and "Net Upgrade" sizes is redundant as the difference of the first two is the last. Instead, only print "Installed Size" and "Net Upgrade Size" when both the installed and removed are non-zero. This results in the following output in the following cases: - package installation only: Installed Size - package removal only: Removed Size - package installation involving replacement: Installed + Net Upgrade Size - package upgrade: Installed + Net Upgrade Size - combination upgrade and installation: Installed + Net Upgrade Size Download Size remains outputted whenever something is downloaded. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 4 ++-- scripts/pacman-key.sh.in | 7 +++++-- src/pacman/util.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Refactor _alpm_runscriptlet()
by Dan McGee 30 Sep '11

30 Sep '11

Add an is_archive parameter to reduce the amount of black magic going on. Rework to use fewer PATH_MAX sized local variables, and simplify some of the logic where appropriate in both this function and in the callers where duplicate calls can be replaced by some conditional parameter code. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 48 +++++++++++++++++--------------------------- lib/libalpm/remove.c | 4 +- lib/libalpm/trans.c | 53 +++++++++++++++++++++++++++++++++----------------- lib/libalpm/trans.h | 4 +- 4 files changed, 58 insertions(+), 51 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 170d09e..33b85c0 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -452,17 +452,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { int i, ret = 0, errors = 0; - char scriptlet[PATH_MAX]; - int is_upgrade = 0; + int is_upgrade; alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; ASSERT(trans != NULL, return -1); - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", - _alpm_db_path(db), newpkg->name, newpkg->version); - /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); if(local) { @@ -474,30 +470,23 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, goto cleanup; } - EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); - _alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n", - newpkg->name, newpkg->version); - /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - /* pre_upgrade scriptlet */ - if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_upgrade", newpkg->version, local->version); - } + EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); } else { is_upgrade = 0; - EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); - _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s\n", - newpkg->name, newpkg->version); + } - /* pre_install scriptlet */ - if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_install", newpkg->version, NULL); - } + _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", + is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + /* pre_install/pre_upgrade scriptlet */ + if(alpm_pkg_has_scriptlet(newpkg) && + !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install"; + _alpm_runscriptlet(handle, newpkg->origin_data.file, + scriptlet_name, newpkg->version, NULL, 1); } /* we override any pre-set reason if we have alldeps or allexplicit set */ @@ -661,13 +650,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - if(is_upgrade) { - _alpm_runscriptlet(handle, scriptlet, "post_upgrade", - newpkg->version, oldpkg ? oldpkg->version : NULL); - } else { - _alpm_runscriptlet(handle, scriptlet, "post_install", - newpkg->version, NULL); - } + char scriptlet[PATH_MAX]; + const char *scriptlet_name; + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(db), newpkg->name, newpkg->version); + scriptlet_name = is_upgrade ? "post_upgrade" : "post_install"; + + _alpm_runscriptlet(handle, scriptlet, scriptlet_name, + newpkg->version, oldpkg ? oldpkg->version : NULL, 0); } if(is_upgrade) { diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a3aa4a5..7f917fa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -376,7 +376,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); } } @@ -453,7 +453,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); } } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index fbc5fee..cb97a4a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -275,40 +275,50 @@ static int grep(const char *fn, const char *needle) return 0; } -int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, - const char *script, const char *ver, const char *oldver) +int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, + const char *script, const char *ver, const char *oldver, int is_archive) { - char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; - char tmpdir[PATH_MAX]; char *argv[] = { "sh", "-c", cmdline, NULL }; - char *scriptpath; + char *tmpdir, *scriptfn = NULL, *scriptpath; int retval = 0; + size_t len; - if(_alpm_access(handle, NULL, installfn, R_OK) != 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); + if(_alpm_access(handle, NULL, filepath, R_OK) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", filepath); return 0; } - /* creates a directory in $root/tmp/ for copying/extracting the scriptlet */ - snprintf(tmpdir, PATH_MAX, "%stmp/", handle->root); + if(!is_archive && !grep(filepath, script)) { + /* script not found in scriptlet file; we can only short-circuit this early + * if it is an actual scriptlet file and not an archive. */ + return 0; + } + + /* create a directory in $root/tmp/ for copying/extracting the scriptlet */ + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + MALLOC(tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(tmpdir, len, "%stmp/", handle->root); if(access(tmpdir, F_OK) != 0) { _alpm_makepath_mode(tmpdir, 01777); } - snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", handle->root); + snprintf(tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); if(mkdtemp(tmpdir) == NULL) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); + free(tmpdir); return 1; } /* either extract or copy the scriptlet */ - snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir); - if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) { - if(_alpm_unpack_single(handle, installfn, tmpdir, ".INSTALL")) { + len += strlen("/.INSTALL"); + MALLOC(scriptfn, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(scriptfn, len, "%s/.INSTALL", tmpdir); + if(is_archive) { + if(_alpm_unpack_single(handle, filepath, tmpdir, ".INSTALL")) { retval = 1; } } else { - if(_alpm_copyfile(installfn, scriptfn)) { + if(_alpm_copyfile(filepath, scriptfn)) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno)); retval = 1; } @@ -317,8 +327,8 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, goto cleanup; } - if(!grep(scriptfn, script)) { - /* script not found in scriptlet file */ + if(is_archive && !grep(scriptfn, script)) { + /* script not found in extracted scriptlet file */ goto cleanup; } @@ -338,10 +348,17 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, retval = _alpm_run_chroot(handle, "/bin/sh", argv); cleanup: - if(_alpm_rmrf(tmpdir)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); + if(scriptfn && unlink(scriptfn)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove %s\n"), scriptfn); + } + if(rmdir(tmpdir)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove tmpdir %s\n"), tmpdir); } + free(scriptfn); + free(tmpdir); return retval; } diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 38f45ff..ff944b0 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -47,8 +47,8 @@ struct __alpm_trans_t { void _alpm_trans_free(alpm_trans_t *trans); int _alpm_trans_init(alpm_trans_t *trans, alpm_transflag_t flags); -int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, - const char *script, const char *ver, const char *oldver); +int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, + const char *script, const char *ver, const char *oldver, int is_archive); #endif /* _ALPM_TRANS_H */ -- 1.7.6.4

1 1