January 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 2/2] add missing utilities to contrib/README
by Andrew Gregory 30 Jan '13

30 Jan '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- contrib/README | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/README b/contrib/README index 04b656f..b9f6524 100644 --- a/contrib/README +++ b/contrib/README @@ -4,11 +4,14 @@ PKGBUILD.vim - a vim/gvim syntax file for PKGBUILDs. Colors known variable names, highlights common errors such as invalid characters in pkgname or pkgver, etc. +bacman - regenerate a pacman package based on installed files and the pacman +database entries. Useful for reuse, or possible config file extension. + bash_completion - a bash completion script for pacman, install in /etc/bash_completion.d/ for use (but rename to something descriptive!). -zsh_completion - a zsh completion script, install (with a rename) to -/usr/share/zsh/site-functions/. +paccache - a flexible package cache cleaning utility that allows greater +control over which packages are removed. pacdiff - a simple pacnew/pacorig/pacsave updater for /etc/. @@ -16,6 +19,8 @@ paclist - list all packages installed from a given repository. Useful for seeing which packages you may have installed from the testing repository, for instance. +paclog-pkglist - lists currently installs packages based pacman's log. + pacscripts - tries to print out the {pre,post}_{install,remove,upgrade} scripts of a given package. @@ -23,8 +28,13 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. -bacman - regenerate a pacman package based on installed files and the pacman -database entries. Useful for reuse, or possible config file extension. +pacsysclean - lists installed packages sorted by size. + +rankmirrors - ranks pacman mirrors by their connection and opening speed. + +updpkgsums - performs an in place update of the checksums in a PKGBUILD. vimprojects - a project file for the vim project plugin. +zsh_completion - a zsh completion script, install (with a rename) to +/usr/share/zsh/site-functions/. -- 1.8.1.2

1 0

[pacman-dev] Compiling pacman with libarchive in nonstandard location
by Michael Schubert 29 Jan '13

29 Jan '13

Dear List Members, I've been trying to compile pacman for a while now but I can't figure out how to properly set the libarchive path with the following setup: - I'm working on a server where I don't have root access - the $PATH and $LD_LIBRARY_PATH are a mess - an old libarchive is in /usr/lib64/libarchive.so.2 - the current libarchive is in ~/.arch/usr/lib - I'd like ./configure to pick up the new libarchive I have tried almost all combinations of the environment variables (used full paths, ~ for clarity): export LD_LIBRARY_PATH=~/.arch/usr/lib:$LD_LIBRARY_PATH export LIBS=-L~/.arch/usr/lib export LDFLAGS=-L~/.arch/usr/lib export CFLAGS=-I~/.arch/usr/include export CXXFLAGS=-I~/.arch/usr/include echo > ChangeLog echo > ABOUT-NLS ~/.arch/usr/bin/autoreconf --force -B~/.arch/usr/include ./configure But it still fails with the message: checking for archive_read_data in -larchive... no configure: error: libarchive is needed to compile pacman! I think I somehow need to prepend the personal library path to the paths searched, but how? Any suggestions would be greatly appreciated. Thanks Michael

2 3

[pacman-dev] [PATCH] Compress manpages only after checking for $srcdir and $pkgdir
by Chirantan Ekbote 29 Jan '13

29 Jan '13

Move the manpage compression code from tidy_install to create_package. Since tidy_install could remove a backup file, it should go before check_package. Alternatively, we could move all the code from tidy_install into create_package since those two are always called together. Fixes FS#33318. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> --- scripts/makepkg.sh.in | 58 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc24f7..be433ad 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1497,34 +1497,6 @@ tidy_install() { done fi - if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then - msg2 "$(gettext "Compressing man and info pages...")" - local file files inode link - while read -rd ' ' inode; do - read file - find ${MAN_DIRS[@]} -type l 2>/dev/null | - while read link ; do - if [[ "${file}" -ef "${link}" ]] ; then - rm -f "$link" "${link}.gz" - if [[ ${file%/*} = ${link%/*} ]]; then - ln -s -- "${file##*/}.gz" "${link}.gz" - else - ln -s -- "/${file}.gz" "${link}.gz" - fi - fi - done - if [[ -z ${files[$inode]} ]]; then - files[$inode]=$file - gzip -9 -n -f "$file" - else - rm -f "$file" - ln "${files[$inode]}.gz" "${file}.gz" - chmod 644 "${file}.gz" - fi - done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ - -exec @INODECMD@ '{}' + 2>/dev/null) - fi - if check_option "strip" "y"; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping @@ -1786,6 +1758,36 @@ create_package() { check_package cd_safe "$pkgdir" + + # compress manpages + if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then + msg2 "$(gettext "Compressing man and info pages...")" + local file files inode link + while read -rd ' ' inode; do + read file + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [[ "${file}" -ef "${link}" ]] ; then + rm -f "$link" "${link}.gz" + if [[ ${file%/*} = ${link%/*} ]]; then + ln -s -- "${file##*/}.gz" "${link}.gz" + else + ln -s -- "/${file}.gz" "${link}.gz" + fi + fi + done + if [[ -z ${files[$inode]} ]]; then + files[$inode]=$file + gzip -9 -n -f "$file" + else + rm -f "$file" + ln "${files[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" + fi + done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ + -exec @INODECMD@ '{}' + 2>/dev/null) + fi + msg "$(gettext "Creating package \"%s\"...")" "$pkgname" pkgarch=$(get_pkg_arch) -- 1.8.1

4 5

[pacman-dev] [PATCH 1/2] add libarchive compatability object
by Dave Reisner 29 Jan '13

29 Jan '13

This allows us to support both libarchive 2.8.x as well as 3.x without deprecation warnings on compile. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Decided to just do this since libarchive 3.x has been a little scary from a stability standpoint. Compile tested on both 3.1.1 and 3.0.4. lib/libalpm/Makefile.am | 1 + lib/libalpm/libarchive-compat.c | 65 +++++++++++++++++++++++++++++++++++++++++ lib/libalpm/libarchive-compat.h | 33 +++++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 lib/libalpm/libarchive-compat.c create mode 100644 lib/libalpm/libarchive-compat.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 5cf66b9..55fec9c 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -44,6 +44,7 @@ libalpm_la_SOURCES = \ graph.h graph.c \ group.h group.c \ handle.h handle.c \ + libarchive-compat.h libarchive-compat.c \ log.h log.c \ package.h package.c \ pkghash.h pkghash.c \ diff --git a/lib/libalpm/libarchive-compat.c b/lib/libalpm/libarchive-compat.c new file mode 100644 index 0000000..56af2e1 --- /dev/null +++ b/lib/libalpm/libarchive-compat.c @@ -0,0 +1,65 @@ +/* + * libarchive-compat.c + * + * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdint.h> + +#include "libarchive-compat.h" + +int _alpm_archive_read_free(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_read_free(archive); +#else + return archive_read_finish(archive); +#endif +} + +int64_t _alpm_archive_compressed_ftell(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_filter_bytes(archive, -1); +#else + return archive_position_compressed(archive); +#endif +} + +int _alpm_archive_read_open_file(struct archive *archive, + const char *filename, size_t block_size) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_read_open_filename(archive, filename, block_size); +#else + return archive_read_open_file(archive, filename, block_size); +#endif +} + +int _alpm_archive_filter_code(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_filter_code(archive, 0); +#else + return archive_compression(archive); +#endif +} + +int _alpm_archive_read_support_filter_all(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_read_support_filter_all(archive); +#else + return archive_read_support_compression_all(archive); +#endif +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h new file mode 100644 index 0000000..a1b379e --- /dev/null +++ b/lib/libalpm/libarchive-compat.h @@ -0,0 +1,33 @@ +/* + * libarchive-compat.h + * + * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _LIBARCHIVE_H +#define _LIBARCHIVE_H + +#include <archive.h> + +int _alpm_archive_read_free(struct archive *archive); +int64_t _alpm_archive_compressed_ftell(struct archive *archive); +int _alpm_archive_read_open_file(struct archive *archive, + const char *filename, size_t block_size); +int _alpm_archive_filter_code(struct archive *archive); +int _alpm_archive_read_support_filter_all(struct archive *archive); + +#endif /* _LIBARCHIVE_H */ + +/* vim: set ts=2 sw=2 noet: */ -- 1.8.1.1

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-531-g3aece8f
by allan＠archlinux.org 29 Jan '13

29 Jan '13

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 3aece8f0eedd703349bcd7bd6bf4b221d9f5775c (commit) via e1e4bbb79ddd23e46b8d3a01168f4eb410308d5b (commit) via 2a57c2068c3ea744608c364f9cacedd3f0c14849 (commit) via 266b3dd70698db05cd2e531fdcf2c5c2a741e3cb (commit) via 27067b137286a40c47ae48bf6f296caf14688cd3 (commit) via f21e1f54aa92e78f701c11696a2b4b404ed5672b (commit) via cb43bd8dfbee0396ff6f56c20690995adfcf3b99 (commit) from 8624eddb31dc360312b50b5435f6688bec4543c5 (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 3aece8f0eedd703349bcd7bd6bf4b221d9f5775c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 29 13:22:42 2013 +1000 Restore libarchive 2.8.x compatibility We still call some of these 'deprecated' methods elsewhere, so this shouldn't present a problem. When we decide 2.x support is to be dropped, we should update all of the code to not call deprecated methods. Allan: Adjusted with respect to previous patches adding libarchive compatibilty layer. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e1e4bbb79ddd23e46b8d3a01168f4eb410308d5b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jan 28 20:23:25 2013 -0500 Use libarchive compat header for relevant symbols Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2a57c2068c3ea744608c364f9cacedd3f0c14849 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jan 28 20:23:24 2013 -0500 add libarchive compatability object This allows us to support both libarchive 2.8.x as well as 3.x without deprecation warnings on compile. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 266b3dd70698db05cd2e531fdcf2c5c2a741e3cb Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Mon Jan 28 21:14:02 2013 -0500 makepkg: Integrate check_install into tidy_install Rearrange tidy_install so we first remove docs, unwanted files, libtool files, and empty directories. Then check for missing backup files and references to $srcdir and $pkgdir. Finally compress manpages, strip debug symbols, and compress executables with upx. Fixes FS33318 Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 27067b137286a40c47ae48bf6f296caf14688cd3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jan 28 20:24:20 2013 -0500 dload: pass back the effective URL to callers of _alpm_download I suspect that eventually we're going to end up returning a pointer to an allocated struct to describe the download result, but that's for another patch when the need arises... Fixes FS#33508. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f21e1f54aa92e78f701c11696a2b4b404ed5672b Author: LANGLOIS Olivier PIS -EXT <olivier.pis.langlois(a)transport.alstom.com> Date: Tue Jan 29 00:43:09 2013 +0000 Relax requirement of what constitutes a dead connection Users have hit issues behind corporate firewalls that initially throttle downloads to ~1B/sec. Signed-off-by: Olivier Langlois < olivier.pis.langlois(a)transport.alstom.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cb43bd8dfbee0396ff6f56c20690995adfcf3b99 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Dec 13 10:06:41 2012 -0500 Consolidate --foreign/--native filtering Also fix a small bug where pacman won't check if the sync dbs are first downloaded when invoked with --native (it should). Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/Makefile.am | 1 + lib/libalpm/add.c | 7 ++-- lib/libalpm/be_local.c | 9 +++-- lib/libalpm/be_package.c | 11 ++--- lib/libalpm/be_sync.c | 9 +++-- lib/libalpm/dload.c | 22 +++++----- lib/libalpm/dload.h | 2 +- lib/libalpm/libarchive-compat.c | 65 ++++++++++++++++++++++++++++++ lib/libalpm/{log.h => libarchive-compat.h} | 23 ++++++----- lib/libalpm/sync.c | 2 +- lib/libalpm/util.c | 7 ++-- scripts/makepkg.sh.in | 59 ++++++++++++--------------- src/pacman/check.c | 2 +- src/pacman/conf.h | 11 ++++- src/pacman/pacman.c | 4 +- src/pacman/query.c | 16 +++----- 16 files changed, 161 insertions(+), 89 deletions(-) create mode 100644 lib/libalpm/libarchive-compat.c copy lib/libalpm/{log.h => libarchive-compat.h} (56%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Restore libarchive 2.8.x compatibility
by Allan McRae 29 Jan '13

29 Jan '13

From: Dan McGee <dan(a)archlinux.org> We still call some of these 'deprecated' methods elsewhere, so this shouldn't present a problem. When we decide 2.x support is to be dropped, we should update all of the code to not call deprecated methods. Allan: Adjusted with respect to previous patches adding libarchive compatibilty layer. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Dave: can you confirm this compiles without warning with libarchive 3.1? lib/libalpm/be_local.c | 2 +- src/pacman/check.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 564e109..49b1c74 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -239,7 +239,7 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg) goto error; } - archive_read_support_filter_gzip(mtree); + _alpm_archive_read_support_filter_all(mtree); archive_read_support_format_mtree(mtree); if((r = _alpm_archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { diff --git a/src/pacman/check.c b/src/pacman/check.c index 92ce05c..d7fe2d6 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -90,7 +90,7 @@ static int check_file_permissions(const char *pkgname, const char *filepath, /* mode */ fsmode = st->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); - if(fsmode != archive_entry_perm(entry)) { + if(fsmode != (~AE_IFMT & archive_entry_mode(entry))) { errors++; if(!config->quiet) { pm_printf(ALPM_LOG_WARNING, _("%s: %s (Permissions mismatch)\n"), -- 1.8.1.1

1 1

[pacman-dev] [PATCH] dload: pass back the effective URL to callers of _alpm_download
by Dave Reisner 29 Jan '13

29 Jan '13

I suspect that eventually we're going to end up returning a pointer to an allocated struct to describe the download result, but that's for another patch when the need arises... Fixes FS#33508. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/dload.c | 20 ++++++++++++-------- lib/libalpm/dload.h | 2 +- lib/libalpm/sync.c | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index a5a2c10..66e351b 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -218,7 +218,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.force = force; payload.unlink_on_fail = 1; - ret = _alpm_download(&payload, syncpath, NULL); + ret = _alpm_download(&payload, syncpath, NULL, NULL); _alpm_dload_payload_reset(&payload); if(ret == 0 && (level & ALPM_SIG_DATABASE)) { @@ -244,7 +244,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) /* set hard upper limit of 16KiB */ payload.max_size = 16 * 1024; - sig_ret = _alpm_download(&payload, syncpath, NULL); + sig_ret = _alpm_download(&payload, syncpath, NULL, NULL); /* errors_ok suppresses error messages, but not the return code */ sig_ret = payload.errors_ok ? 0 : sig_ret; _alpm_dload_payload_reset(&payload); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 83d2051..927b0f4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -386,7 +386,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat #define HOSTNAME_SIZE 256 static int curl_download_internal(struct dload_payload *payload, - const char *localpath, char **final_file) + const char *localpath, char **final_file, char **final_url) { int ret = -1; FILE *localf = NULL; @@ -523,6 +523,10 @@ static int curl_download_internal(struct dload_payload *payload, curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &timecond); curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url); + if(final_url != NULL) { + *final_url = effective_url; + } + /* time condition was met and we didn't download anything. we need to * clean up the 0 byte .part file that's left behind. */ if(timecond == 1 && DOUBLE_EQ(bytes_dl, 0)) { @@ -613,13 +617,13 @@ cleanup: * @return 0 on success, -1 on error (pm_errno is set accordingly if errors_ok == 0) */ int _alpm_download(struct dload_payload *payload, const char *localpath, - char **final_file) + char **final_file, char **final_url) { alpm_handle_t *handle = payload->handle; if(handle->fetchcb == NULL) { #ifdef HAVE_LIBCURL - return curl_download_internal(payload, localpath, final_file); + return curl_download_internal(payload, localpath, final_file, final_url); #else RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif @@ -653,7 +657,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) { char *filepath; const char *cachedir; - char *final_file = NULL; + char *final_file = NULL, *final_pkg_url = NULL; struct dload_payload payload; int ret = 0; @@ -673,7 +677,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) payload.handle = handle; /* download the file */ - ret = _alpm_download(&payload, cachedir, &final_file); + ret = _alpm_download(&payload, cachedir, &final_file, &final_pkg_url); _alpm_dload_payload_reset(&payload); if(ret == -1) { _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url); @@ -688,9 +692,9 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) char *sig_filepath, *sig_final_file = NULL; size_t len; - len = strlen(url) + 5; + len = strlen(final_pkg_url) + 5; MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - snprintf(payload.fileurl, len, "%s.sig", url); + snprintf(payload.fileurl, len, "%s.sig", final_pkg_url); sig_filepath = filecache_find_url(handle, payload.fileurl); if(sig_filepath == NULL) { @@ -701,7 +705,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) /* set hard upper limit of 16KiB */ payload.max_size = 16 * 1024; - ret = _alpm_download(&payload, cachedir, &sig_final_file); + ret = _alpm_download(&payload, cachedir, &sig_final_file, NULL); if(ret == -1 && !payload.errors_ok) { _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), payload.fileurl); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 70e3479..95bb91a 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -48,7 +48,7 @@ struct dload_payload { void _alpm_dload_payload_reset(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, - char **final_file); + char **final_file, char **final_url); #endif /* _ALPM_DLOAD_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index efd5c3f..6a5cab6 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -877,7 +877,7 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name); - if(_alpm_download(payload, cachedir, NULL) != -1) { + if(_alpm_download(payload, cachedir, NULL, NULL) != -1) { return 0; } -- 1.8.1.1

2 1

[pacman-dev] [PATCH] Add robustness to dload against throtling firewall
by LANGLOIS Olivier PIS -EXT 29 Jan '13

29 Jan '13

Implemented as discussed in this thread: https://mailman.archlinux.org/pipermail/pacman-dev/2013-January/016273.html I have been running this diff without any regression and it does fix my firewall throttling issue Signed-off-by: Olivier Langlois < olivier.pis.langlois(a)transport.alstom.com> --- lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 83d2051..19f629d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -294,7 +294,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, dload_progress_cb); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); - curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); -- 1.8.1.1 ________________________________ CONFIDENTIALITY : This e-mail and any attachments are confidential and may be privileged. If you are not a named recipient, please notify the sender immediately and do not disclose the contents to another person, use it for any purpose or store or copy the information in any medium.

3 2

[pacman-dev] [PATCH] [FINAL RFC] Add configuration option for Upgrade operation SigLevel
by Allan McRae 29 Jan '13

29 Jan '13

Add LocalFileSigLevel and RemoteFileSigLevel to control the signature checking for "pacman -U <file>" and "pacman -U <url>" operations respectively. The starting value for both these options is SigLevel, if it is specified in the [options] section, or the built-in system default. The specified values override and/or supplement this initial value. Note there is no destintion between setting "Required" and "PackageRequired" as there is not database options for Upgrade operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This patch has been floating around for quite some time now. I would like some final comments before I write the documentation and push. I have this in my pacman.conf: SigLevel = Required DatabaseOptional TrustedOnly LocalFileSigLevel = Optional TrustedOnly #RemoteFileSigLevel = Required so if I "pacman -U /path/to/file", a signature is only checked if it is present, but "pacman -U http://...." always checks the signature. It also means that I do not need have my global SigLevel as Optional and add PackageRequired to every Arch repo. I'd like a comment, even if it is a simple "Ack". lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/handle.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ lib/libalpm/handle.h | 4 ++++ src/pacman/conf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/conf.h | 2 ++ src/pacman/upgrade.c | 21 ++++++++++++++++++--- 6 files changed, 131 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index f524c19..b681840 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -115,6 +115,9 @@ typedef enum _alpm_siglevel_t { ALPM_SIG_DATABASE_MARGINAL_OK = (1 << 12), ALPM_SIG_DATABASE_UNKNOWN_OK = (1 << 13), + ALPM_SIG_PACKAGE_SET = (1 << 27), + ALPM_SIG_PACKAGE_TRUST_SET = (1 << 28), + ALPM_SIG_USE_DEFAULT = (1 << 31) } alpm_siglevel_t; @@ -561,6 +564,12 @@ int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); +alpm_siglevel_t alpm_option_get_local_file_siglevel(alpm_handle_t *handle); +int alpm_option_set_local_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); + +alpm_siglevel_t alpm_option_get_remote_file_siglevel(alpm_handle_t *handle); +int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 1a840ab..53c86c5 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -594,6 +594,18 @@ int SYMEXPORT alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio) return 0; } +alpm_db_t SYMEXPORT *alpm_get_localdb(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->db_local; +} + +alpm_list_t SYMEXPORT *alpm_get_syncdbs(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dbs_sync; +} + int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) { CHECK_HANDLE(handle, return -1); @@ -621,16 +633,44 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_default_siglevel(alpm_handle_t *handle return handle->siglevel; } -alpm_db_t SYMEXPORT *alpm_get_localdb(alpm_handle_t *handle) +int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, + alpm_siglevel_t level) { - CHECK_HANDLE(handle, return NULL); - return handle->db_local; + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBGPGME + handle->localfilesiglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif + return 0; } -alpm_list_t SYMEXPORT *alpm_get_syncdbs(alpm_handle_t *handle) +alpm_siglevel_t SYMEXPORT alpm_option_get_local_file_siglevel(alpm_handle_t *handle) { - CHECK_HANDLE(handle, return NULL); - return handle->dbs_sync; + CHECK_HANDLE(handle, return -1); + return handle->localfilesiglevel; +} + +int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, + alpm_siglevel_t level) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBGPGME + handle->remotefilesiglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif + return 0; +} + +alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->remotefilesiglevel; } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c24e97a..5e84d58 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -92,6 +92,10 @@ struct __alpm_handle_t { int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ + alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file + upgrade operations */ + alpm_siglevel_t remotefilesiglevel; /* Signature verification level for remote file + upgrade operations */ /* error code */ alpm_errno_t pm_errno; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 1bea2b0..95dce35 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -56,6 +56,8 @@ config_t *config_new(void) if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) { newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; + newconfig->localfilesiglevel = ALPM_SIG_USE_DEFAULT; + newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } return newconfig; @@ -279,6 +281,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(strcmp(value, "Never") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE; + level |= ALPM_SIG_PACKAGE_SET; } if(database) { level &= ~ALPM_SIG_DATABASE; @@ -287,6 +290,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level |= ALPM_SIG_PACKAGE; level |= ALPM_SIG_PACKAGE_OPTIONAL; + level |= ALPM_SIG_PACKAGE_SET; } if(database) { level |= ALPM_SIG_DATABASE; @@ -296,6 +300,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level |= ALPM_SIG_PACKAGE; level &= ~ALPM_SIG_PACKAGE_OPTIONAL; + level |= ALPM_SIG_PACKAGE_SET; } if(database) { level |= ALPM_SIG_DATABASE; @@ -305,6 +310,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; + level |= ALPM_SIG_PACKAGE_TRUST_SET; } if(database) { level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; @@ -314,6 +320,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level |= ALPM_SIG_PACKAGE_MARGINAL_OK; level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; + level |= ALPM_SIG_PACKAGE_TRUST_SET; } if(database) { level |= ALPM_SIG_DATABASE_MARGINAL_OK; @@ -343,6 +350,30 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, return ret; } +/** + * Merge the package entires of two signature verification levels. + * @param base initial siglevel + * @param over overridden siglevel, derived value is stored here + */ +static void merge_siglevel(alpm_siglevel_t *base, alpm_siglevel_t *over) +{ + alpm_siglevel_t level = *over; + if(level & ALPM_SIG_USE_DEFAULT) { + level = *base; + } else { + if(!(level & ALPM_SIG_PACKAGE_SET)) { + level |= *base & ALPM_SIG_PACKAGE; + level |= *base & ALPM_SIG_PACKAGE_OPTIONAL; + } + if(!(level & ALPM_SIG_PACKAGE_TRUST_SET)) { + level |= *base & ALPM_SIG_PACKAGE_MARGINAL_OK; + level |= *base & ALPM_SIG_PACKAGE_UNKNOWN_OK; + } + } + + *over = level; +} + static int process_cleanmethods(alpm_list_t *values, const char *file, int linenum) { @@ -484,6 +515,22 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "LocalFileSigLevel") == 0) { + alpm_list_t *values = NULL; + setrepeatingoption(value, "LocalFileSigLevel", &values); + if(process_siglevel(values, &config->localfilesiglevel, file, linenum)) { + FREELIST(values); + return 1; + } + FREELIST(values); + } else if(strcmp(key, "RemoteFileSigLevel") == 0) { + alpm_list_t *values = NULL; + setrepeatingoption(value, "RemoteFileSigLevel", &values); + if(process_siglevel(values, &config->remotefilesiglevel, file, linenum)) { + FREELIST(values); + return 1; + } + FREELIST(values); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -606,6 +653,11 @@ static int setup_libalpm(void) alpm_option_set_default_siglevel(handle, config->siglevel); + merge_siglevel(&config->siglevel, &config->localfilesiglevel); + merge_siglevel(&config->siglevel, &config->remotefilesiglevel); + alpm_option_set_local_file_siglevel(handle, config->localfilesiglevel); + alpm_option_set_remote_file_siglevel(handle, config->remotefilesiglevel); + if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); } else if(!(alpm_capabilities() & ALPM_CAPABILITY_DOWNLOADER)) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 06d2fd5..ff099fe 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -73,6 +73,8 @@ typedef struct __config_t { unsigned int ask; alpm_transflag_t flags; alpm_siglevel_t siglevel; + alpm_siglevel_t localfilesiglevel; + alpm_siglevel_t remotefilesiglevel; /* conf file options */ /* I Love Candy! */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 7f69091..222f7fa 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -40,8 +40,7 @@ int pacman_upgrade(alpm_list_t *targets) { int retval = 0; - alpm_list_t *i; - alpm_siglevel_t level = alpm_option_get_default_siglevel(config->handle); + alpm_list_t *i, *remote = NULL; if(targets == NULL) { pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n")); @@ -51,6 +50,8 @@ int pacman_upgrade(alpm_list_t *targets) /* Check for URL targets and process them */ for(i = targets; i; i = alpm_list_next(i)) { + int *r = malloc(sizeof(int)); + if(strstr(i->data, "://")) { char *str = alpm_fetch_pkgurl(config->handle, i->data); if(str == NULL) { @@ -60,8 +61,13 @@ int pacman_upgrade(alpm_list_t *targets) } else { free(i->data); i->data = str; + *r = 1; } + } else { + *r = 0; } + + remote = alpm_list_add(remote, r); } if(retval) { @@ -75,9 +81,16 @@ int pacman_upgrade(alpm_list_t *targets) printf(_("loading packages...\n")); /* add targets to the created transaction */ - for(i = targets; i; i = alpm_list_next(i)) { + for(i = targets; i; i = alpm_list_next(i), remote = alpm_list_next(remote)) { const char *targ = i->data; alpm_pkg_t *pkg; + alpm_siglevel_t level; + + if(*(int *)remote->data) { + level = alpm_option_get_remote_file_siglevel(config->handle); + } else { + level = alpm_option_get_local_file_siglevel(config->handle); + } if(alpm_pkg_load(config->handle, targ, 1, level, &pkg) != 0) { pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", @@ -95,6 +108,8 @@ int pacman_upgrade(alpm_list_t *targets) config->explicit_adds = alpm_list_add(config->explicit_adds, pkg); } + FREELIST(remote); + if(retval) { trans_release(); return retval; -- 1.8.1.1

2 1

[pacman-dev] [RFC] libalpm: replace deprecated libarchive calls
by Dave Reisner 28 Jan '13

28 Jan '13

This raises our minimum libarchive version to 3.0.0, which is reflected by autoconf. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- There's a soname bump with libarchive 3.1 (which no one in Arch Linux land has been brave enough to touch yet). Maybe this will help us get started. The test suite still passes, though there is a CPIO based failure in libarchive 3.1.1 which should be dealt with separately. I mark this as an RFC since it's a library requirement bump. As an alternative, I propose that we could create a header, perhaps lib/libalpm/libarchive.h which has wrapper methods and preprocessor logic to Do The Right Thing™. Personally, I'd rather not get into this business. configure.ac | 4 ++-- lib/libalpm/add.c | 6 +++--- lib/libalpm/be_local.c | 6 +++--- lib/libalpm/be_package.c | 10 +++++----- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/util.c | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index a7364ba..08af5a3 100644 --- a/configure.ac +++ b/configure.ac @@ -190,8 +190,8 @@ AC_CHECK_LIB([m], [fabs], , AC_MSG_ERROR([libm is needed to compile pacman!])) # Check for libarchive -PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , - AC_MSG_ERROR([*** libarchive >= 2.8.0 is needed to compile pacman!])) +PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , + AC_MSG_ERROR([*** libarchive >= 3.0.0 is needed to compile pacman!])) # Check for OpenSSL have_openssl=no diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 9b67813..7bdb032 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -555,7 +555,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(chdir(handle->root) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"), handle->root, strerror(errno)); - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); ret = -1; goto cleanup; @@ -577,7 +577,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* Using compressed size for calculations here, as newpkg->isize is not * exact when it comes to comparing to the ACTUAL uncompressed size * (missing metadata sizes) */ - int64_t pos = archive_position_compressed(archive); + int64_t pos = archive_filter_bytes(archive, -1); percent = (pos * 100) / newpkg->size; if(percent >= 100) { percent = 100; @@ -597,7 +597,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* extract the next file from the archive */ errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); } - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); /* restore the old cwd if we have it */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 0f60b6d..6c58920 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -241,11 +241,11 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg) archive_read_support_filter_gzip(mtree); archive_read_support_format_mtree(mtree); - if((r = archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { + if((r = archive_read_open_filename(mtree, mtfile, ALPM_BUFFER_SIZE))) { _alpm_log(pkg->handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), mtfile, archive_error_string(mtree)); pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE; - archive_read_finish(mtree); + archive_read_close(mtree); goto error; } @@ -279,7 +279,7 @@ static int _cache_mtree_next(const alpm_pkg_t UNUSED *pkg, static int _cache_mtree_close(const alpm_pkg_t UNUSED *pkg, struct archive *mtree) { - return archive_read_finish(mtree); + return archive_read_close(mtree); } static int _cache_force_load(alpm_pkg_t *pkg) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 18fc14a..d920a76 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -74,7 +74,7 @@ static void *_package_changelog_open(alpm_pkg_t *pkg) changelog = malloc(sizeof(struct package_changelog)); if(!changelog) { pkg->handle->pm_errno = ALPM_ERR_MEMORY; - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); return NULL; } @@ -84,7 +84,7 @@ static void *_package_changelog_open(alpm_pkg_t *pkg) } } /* we didn't find a changelog */ - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); errno = ENOENT; @@ -124,7 +124,7 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) { int ret; struct package_changelog *changelog = fp; - ret = archive_read_finish(changelog->archive); + ret = archive_read_close(changelog->archive); CLOSE(changelog->fd); free(changelog); return ret; @@ -471,7 +471,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, goto pkg_invalid; } - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); /* internal fields for package struct */ @@ -503,7 +503,7 @@ pkg_invalid: handle->pm_errno = ALPM_ERR_PKG_INVALID; error: _alpm_pkg_free(newpkg); - archive_read_finish(archive); + archive_read_close(archive); if(fd >= 0) { CLOSE(fd); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index a5a2c10..77bfc1e 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -383,7 +383,7 @@ static size_t estimate_package_count(struct stat *st, struct archive *archive) { int per_package; - switch(archive_compression(archive)) { + switch(archive_filter_code(archive, 0)) { case ARCHIVE_COMPRESSION_NONE: per_package = 3015; break; @@ -471,7 +471,7 @@ static int sync_db_populate(alpm_db_t *db) count, db->treename); cleanup: - archive_read_finish(archive); + archive_read_close(archive); if(fd >= 0) { CLOSE(fd); } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5960be6..f2258d6 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -240,7 +240,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, RET_ERR(handle, ALPM_ERR_LIBARCHIVE, -1); } - archive_read_support_compression_all(*archive); + archive_read_support_filter_all(*archive); archive_read_support_format_all(*archive); _alpm_log(handle, ALPM_LOG_DEBUG, "opening archive %s\n", path); @@ -271,7 +271,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, return fd; error: - archive_read_finish(*archive); + archive_read_close(*archive); *archive = NULL; if(fd >= 0) { CLOSE(fd); @@ -392,7 +392,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix, cleanup: umask(oldmask); - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); if(cwdfd >= 0) { if(fchdir(cwdfd) != 0) { -- 1.8.1.1

3 2