October 2011 - Pacman-dev - lists.archlinux.org

[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