- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] repo-add: indicate whether package signature is found
by Allan McRae 13 Aug '11

13 Aug '11

When adding a package to a repo, it is useful to be able to see that repo-add has indeed found the signature file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5e08592..2991d30 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -277,6 +277,7 @@ db_write_entry() { # compute base64'd PGP signature if [[ -f "$pkgfile.sig" ]]; then + msg2 "$(gettext "Found package signature file...")" pgpsig=$(openssl base64 -in "$pkgfile.sig" | tr -d '\n') fi -- 1.7.6

1 0

[pacman-dev] API changes for 3.5.0 -> 4.0.0
by Dave Reisner 13 Aug '11

13 Aug '11

Took a stab at making some sense out of this... turned out to be easier to look at the git log from 3.5.4 to master than staring at the meaningless diff of alpm.h. I think I've got the majority of it, but feel free to point out where I've missed anything. Backwards compat is for suckers! d API CHANGES BETWEEN 3.5 AND 4.0 =============================== [REMOVED] - error codes: PM_ERR_LIBFETCH, PM_ERR_WRITE - alpm_option_set_root(), alpm_option_set_dbpath() - alpm_list_first() - alpm_grp_get_name(), alpm_grp_get_pkgs() - alpm_delta_get_from(), alpm_delta_get_to(), alpm_delta_get_filename(), alpm_delta_get_md5sum(), alpm_delta_get_size() - alpm_miss_get_target(), alpm_miss_get_dep(), alpm_miss_get_causingpkg() - alpm_dep_get_mod(), alpm_dep_get_name(), alpm_dep_get_version() - alpm_conflict_get_package1(), alpm_conflict_get_package2(), alpm_conflict_get_reason() - alpm_fileconflict_get_target(), alpm_fileconflict_get_type(), alpm_fileconflict_get_file(), alpm_fileconflict_get_ctarget() - alpm_db_get_url() [CHANGED] - PM_ prefixes for enum values are now ALPM_ - pm prefixes for structs and enums are now alpm_ - alpm_initialize now has parameters: char *root, char *dbpath, _alpm_errno_t *err and returns an alpm_handle_t struct. - alpm_release now takes an alpm_handle_t *. - alpm_db_register_sync() now requires a extra parameter of a alpm_siglevel_t. - alpm_pkg_load() now requires an extra parameter of an alpm_siglevel_t - alpm_db_setserver() replaced by alpm_db_set_servers(), alpm_db_add_server(), alpm_db_remove_server() - many functions now require a first parameter of an alpm_handle_t *: - alpm_option_get_* - alpm_option_set_* - alpm_option_add_* - alpm_option_remove_* - alpm_trans_* - alpm_add_pkg - alpm_checkconflicts - alpm_checkdeps - alpm_db_register_sync - alpm_db_set_pkgreason - alpm_db_unregister_all - alpm_fetch_pkgurl - alpm_find_dbs_satisfier - alpm_logaction - alpm_pkg_load - alpm_release - alpm_remove_pkg - alpm_sync_sysupgrade - several structs are no longer opaque - alpm_conflict_t - alpm_delta_t - alpm_depend_t - alpm_depmissing_t - alpm_depmod_t - alpm_fileconflict_t - alpm_group_t - alpm_pkg_reason_t [ADDED] - package signing functions: alpm_option_get_default_siglevel(), alpm_option_set_default_siglevel(), alpm_option_get_gpgdir(), alpm_option_set_gpgdir(), alpm_db_get_siglevel(), alpm_sigresult_cleanup(), alpm_db_check_pgp_signature(), alpm_pkg_check_pgp_signature() - list functions: alpm_list_to_array(), alpm_list_previous() - structs: alpm_backup_t, alpm_file_t, alpm_filelist_t - enums: alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t - error codes: ALPM_ERR_DB_INVALID, ALPM_ERR_DB_INVALID_SIG, ALPM_ERR_GPGME, ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, ALPM_ERR_SIG_INVALID, ALPM_ERR_SIG_MISSING

1 0

[pacman-dev] [PATCH 1/3] Update MD5 routines with changes from PolarSSL
by Dan McGee 11 Aug '11

11 Aug '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/md5.c | 61 +++++++++++++++++++++------------------------------- lib/libalpm/md5.h | 12 +++++++-- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/lib/libalpm/md5.c b/lib/libalpm/md5.c index 9063504..b4391a6 100644 --- a/lib/libalpm/md5.c +++ b/lib/libalpm/md5.c @@ -1,7 +1,12 @@ /* * RFC 1321 compliant MD5 implementation * - * Copyright (C) 2006-2007 Christophe Devine + * Copyright (C) 2006-2010, Brainspark B.V. + * + * This file is part of PolarSSL (http://www.polarssl.org) + * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> + * + * All rights reserved. * * 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 @@ -24,29 +29,19 @@ /* * Pacman Notes: * - * Taken from the XySSL project at www.xyssl.org under terms of the - * GPL. This is from version 0.9 of the library, and has been modified + * Taken from the PolarSSL project at http://polarssl.org under terms of the + * GPL. This is from version 1.0.0 of the library, and has been modified * as following, which may be helpful for future updates: - * * remove "xyssl/config.h" include - * * change include from "xyssl/md5.h" to "md5.h" + * * remove "polarssl/config.h" include + * * change include from "polarssl/sha2.h" to "sha2.h" * * removal of HMAC code * * removal of SELF_TEST code - * * removal of ipad and opad from the md5_context struct in md5.h - * * change of md5_file prototype from - * int md5_file( char *path, unsigned char *output ) - * to - * int md5_file( const char *path, unsigned char *output ) - * * use a dynamically-allocated buffer in md5_file, and increase the size - * for performance reasons - * * various static/inline changes - * - * NOTE: XySSL has been renamed to PolarSSL, which is available at - * www.polarssl.org. If we update, we should get it from there. + * * removal of ipad and opad from the md5_context struct in sha2.h + * * increase the size of buffer for performance reasons + * * various static changes */ -#include <string.h> #include <stdio.h> -#include <stdlib.h> #include "md5.h" @@ -76,7 +71,7 @@ /* * MD5 context setup */ -static inline void md5_starts( md5_context *ctx ) +static void md5_starts( md5_context *ctx ) { ctx->total[0] = 0; ctx->total[1] = 0; @@ -87,7 +82,7 @@ static inline void md5_starts( md5_context *ctx ) ctx->state[3] = 0x10325476; } -static inline void md5_process( md5_context *ctx, unsigned char data[64] ) +static void md5_process( md5_context *ctx, const unsigned char data[64] ) { unsigned long X[16], A, B, C, D; @@ -161,7 +156,7 @@ static inline void md5_process( md5_context *ctx, unsigned char data[64] ) P( B, C, D, A, 12, 20, 0x8D2A4C8A ); #undef F - + #define F(x,y,z) (x ^ y ^ z) P( A, B, C, D, 5, 4, 0xFFFA3942 ); @@ -213,9 +208,9 @@ static inline void md5_process( md5_context *ctx, unsigned char data[64] ) /* * MD5 process buffer */ -static inline void md5_update( md5_context *ctx, unsigned char *input, int ilen ) +static void md5_update( md5_context *ctx, const unsigned char *input, size_t ilen ) { - int fill; + size_t fill; unsigned long left; if( ilen <= 0 ) @@ -224,7 +219,7 @@ static inline void md5_update( md5_context *ctx, unsigned char *input, int ilen left = ctx->total[0] & 0x3F; fill = 64 - left; - ctx->total[0] += ilen; + ctx->total[0] += (unsigned long) ilen; ctx->total[0] &= 0xFFFFFFFF; if( ctx->total[0] < (unsigned long) ilen ) @@ -254,7 +249,7 @@ static inline void md5_update( md5_context *ctx, unsigned char *input, int ilen } } -static unsigned char md5_padding[64] = +static const unsigned char md5_padding[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -265,7 +260,7 @@ static unsigned char md5_padding[64] = /* * MD5 final digest */ -static inline void md5_finish( md5_context *ctx, unsigned char output[16] ) +static void md5_finish( md5_context *ctx, unsigned char output[16] ) { unsigned long last, padn; unsigned long high, low; @@ -293,7 +288,7 @@ static inline void md5_finish( md5_context *ctx, unsigned char output[16] ) /* * output = MD5( input buffer ) */ -void md5( unsigned char *input, int ilen, unsigned char output[16] ) +void md5( const unsigned char *input, size_t ilen, unsigned char output[16] ) { md5_context ctx; @@ -312,25 +307,19 @@ int md5_file( const char *path, unsigned char output[16] ) FILE *f; size_t n; md5_context ctx; - unsigned char *buf; + unsigned char buf[4096]; - if( ( buf = calloc(8192, sizeof(unsigned char)) ) == NULL ) + if( ( f = fopen( path, "rb" ) ) == NULL ) return( 1 ); - if( ( f = fopen( path, "rb" ) ) == NULL ) { - free( buf ); - return( 1 ); - } - md5_starts( &ctx ); while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) - md5_update( &ctx, buf, (int) n ); + md5_update( &ctx, buf, n ); md5_finish( &ctx, output ); memset( &ctx, 0, sizeof( md5_context ) ); - free( buf ); if( ferror( f ) != 0 ) { diff --git a/lib/libalpm/md5.h b/lib/libalpm/md5.h index ddcea8c..d03013a 100644 --- a/lib/libalpm/md5.h +++ b/lib/libalpm/md5.h @@ -1,7 +1,12 @@ /* * RFC 1321 compliant MD5 implementation * - * Copyright (C) 2006-2007 Christophe Devine + * Copyright (C) 2006-2010, Brainspark B.V. + * + * This file is part of PolarSSL (http://www.polarssl.org) + * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> + * + * All rights reserved. * * 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 @@ -16,10 +21,11 @@ * 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 _MD5_H #define _MD5_H +#include <string.h> + /** * \brief MD5 context structure */ @@ -38,7 +44,7 @@ md5_context; * \param ilen length of the input data * \param output MD5 checksum result */ -void md5( unsigned char *input, int ilen, unsigned char output[16] ); +void md5( const unsigned char *input, size_t ilen, unsigned char output[16] ); /** * \brief Output = MD5( file contents ) -- 1.7.6

1 2

[pacman-dev] [PATCH] pactest: -U --recursive
by Pang Yan Han 11 Aug '11

11 Aug '11

--- test/pacman/tests/upgrade078.py | 56 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/upgrade078.py diff --git a/test/pacman/tests/upgrade078.py b/test/pacman/tests/upgrade078.py new file mode 100644 index 0000000..718d587 --- /dev/null +++ b/test/pacman/tests/upgrade078.py @@ -0,0 +1,56 @@ +self.description = "-U --recursive upgrades outdated dependencies" + +# git (new package) +# |-- perl (up to date) +# |-- glibc (out of date, will be updated) +# |-- curl (out of date, will be updated) +# |-- expat (up to date) + +perl_lpkg = pmpkg("perl", "5.14.1-3") +perl_lpkg.depends = ["glibc"] +self.addpkg2db("local", perl_lpkg) + +glibc_lpkg = pmpkg("glibc", "2.1.3-1") +self.addpkg2db("local", glibc_lpkg) + +curl_lpkg = pmpkg("curl", "7.20-1") +self.addpkg2db("local", curl_lpkg) + +expat_lpkg = pmpkg("expat", "2.0.1-6") +self.addpkg2db("local", expat_lpkg) + +# Sync db +curl_sync = pmpkg("curl", "7.21.7-1") +self.addpkg2db("sync", curl_sync) + +glibc_sync = pmpkg("glibc", "2.1.4-4") +self.addpkg2db("sync", glibc_sync) + +perl_sync = pmpkg("perl", "5.14.1-3") +perl_sync.depends = ["glibc"] +self.addpkg2db("sync", perl_sync) + +expat_sync = pmpkg("expat", "2.0.1-6") +self.addpkg2db("sync", expat_sync) + +p = pmpkg("git", "1.7.6-1") +p.depends = ["curl", "expat", "perl"] + +self.addpkg(p) +self.args = "-U --recursive %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_DEPENDS=git|curl") +self.addrule("PKG_DEPENDS=git|expat") +self.addrule("PKG_DEPENDS=git|perl") +self.addrule("PKG_DEPENDS=perl|glibc") +self.addrule("PKG_EXIST=git") +self.addrule("PKG_VERSION=git|1.7.6-1") +self.addrule("PKG_EXIST=curl") +self.addrule("PKG_VERSION=curl|7.21.7-1") +self.addrule("PKG_EXIST=glibc") +self.addrule("PKG_VERSION=glibc|2.1.4-4") +self.addrule("PKG_EXIST=perl") +self.addrule("PKG_VERSION=perl|5.14.1-3") +self.addrule("PKG_EXIST=expat") +self.addrule("PKG_VERSION=expat|2.0.1-6") -- 1.7.6.178.g55272

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-1-gfffaba5
by dan＠archlinux.org 11 Aug '11

11 Aug '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 fffaba50fb6227462d3312b667f55293aa0b9214 (commit) from c5eccedc63dedd6a0ac89f86c8fc54e7ccad40be (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 fffaba50fb6227462d3312b667f55293aa0b9214 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 11:56:47 2011 -0500 scripts/pkgdelta: fix `make distcheck` --help and --version are required by the sanity checks performed by `make distcheck`. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/pkgdelta.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.0.0rc1, created. v4.0.0rc1
by dan＠archlinux.org 11 Aug '11

11 Aug '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 annotated tag, v4.0.0rc1 has been created at a6a0774cf63d50c43547c64b1c70a27cd536a5c2 (tag) tagging c5eccedc63dedd6a0ac89f86c8fc54e7ccad40be (commit) replaces v3.5.4 tagged by Dan McGee on Thu Aug 11 11:46:14 2011 -0500 - Log ----------------------------------------------------------------- Initial 4.0.0 RC release, let's break stuff -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk5EB2IACgkQXC5GoPU6du1KCACfWpFdl3dtXvVb0TRgGqW4gCUY pXYAn0dPRAgkmA3DCJIbXJfO0ef4vtfe =oxAG -----END PGP SIGNATURE----- Allan McRae (120): makepkg: place signature symlink in build dir repo-add: add symlink to signature file pacman-key: improve usage output Report output from signature checking to debug log Add functions for verifying database signature Download and verify package database signatures Do not reuse old signature Document makepkg package signing options Add configure option to specify package signing key repo-add: simplify usage message repo-add: check for valid key when signing is requested repo-add: check for gpg early repo-add: document -k option repo-add: update copyright message Deal with unused function parameters correctly Dan broke my patch pacman-key: update copyright Remove incorrect output with download only and IgnorePkg pkgdelta: add vim modeline pacman-key: add vim modeline and fix whitespace issues Fix name of original files in scripts Fix bracket type in makefile makepkg: reword purge message makepkg: move option parsing code to separate file scripts: refactor output formatting functions scripts/library: add README file parse_options: adjust error messages Clean up makefile for script generation makepkg: create source package inside fakeroot makepkg: Add UPX compression support makepkg: allow specifying alternative build directory makepkg: adjust libprovides/depends messages makepkg: move comment into correct place Remove old TODO lists makepkg: add software check function makepkg: clean-up of output messages Document group and providers selection makepkg: remove the cleancache option Add scripts po directory to autoclean.sh Remove two alpm_list_count usages Rename pmpkgreason_t to alpm_pkgreason_t Rename pmdepmod_t to alpm_depmod_t Rename pmfileconflicttype_t to alpm_fileconflicttype_t Rename pmhandle_t to alpm_handle_t Rename pmdb_t to alpm_db_t Rename pmpkg_t to alpm_pkg_t Rename pmtrans_t to alpm_trans_t Rename pmdepend_t to alpm_depend_t Rename pmdepmissing_t to alpm_depmissing_t Rename pmconflict_t to alpm_conflict_t Rename pmfileconflict_t to alpm_fileconflict_t Rename pmgrp_t to alpm_group_t Rename pmdelta_t to alpm_delta_t Rename pmbackup_t to alpm_backup_t Rename pmloglevel_t to alpm_loglevel_t Rename pmtransflag_t to alpm_transflag_t Rename pmtransevt_t to alpm_transevt_t Rename pmtransconv_t to alpm_transconv_t Rename pmtransprog_t to alpm_transprog_t Rename pmerrno_t to alpm_errno_t Rename pmpkgfrom_t to alpm_pkgfrom_t Rename pmgraph_t to alpm_graph_t Rename pmpkghash_t to alpm_pkghash_t Rename pmtransstate_t to alpm_transstate_t Rename pmdbinfrq_t to alpm_dbinfrq_t Rename _pmdbstatus_t to _alpm_dbstatus_t Update README with changes to struct names Rename public functions with grp in their name Rename internal functions with grp in their name Use ignoregroup rather than ignoregrp in the handle makepkg: fix removing symbolic link Prefix alpm_pkgreason_t members with ALPM Prefix alpm_depmod_t members with ALPM Prefix alpm_fileconflicttype_t members with ALPM Prefix alpm_loglevel_t members with ALPM Prefix alpm_transflag_t members with ALPM Prefix alpm_transevt_t members with ALPM Prefix alpm_transconv_t members with ALPM Prefix alpm_transprog_t members with ALPM Prefix _alpm_errno_t members with ALPM Add alpm_list_previous method Do not replicate files list when removing packages Remove alpm_list_first Simplify alpm_list_previous parse_options: add missing newlines parse_options: implement optional arguments parse_options: accept multiple arguments Add library files to POTFILES.in makepkg: update --pkg desciption in man page pacman-key: fix syntax highlighting repo-add: backup old database signature too Move some .gitignore entries repo-add: always remove repo signature symlink repo-add: do not print full path of signature file makepkg.conf: remove curl from other common tools configure: output more compile settings Fix compilation without gpgme pacman-key: use our option parser pacman-key: remove the --adv option pacman-key: rename --del to --delete pacman-key: allow the export of all key ids pacman-key: rename --trust to --edit-key pacman-key: update man page pacman-key: move --edit-key and --receive processing to functions pacman-key: move verifying keyring files to own function pacman-key: check only a single operation has been specified pacman-key: add --verify option pacman-key: add --init option pacman-key: check required permissions on keyring pacman-key: add dependency on parse_options to Makefile makepkg: pkgver and pkgrel can not have whitespace makepkg: check overrides for pkgrel and pkgver makepkg: check arch overrides for required architecture makepkg: allow epoch to be overridden makepkg: get package version with overrides makepkg: more control of skipping integrity checks makepkg: refactor checking source integrity pacman-key: fix syntax error in -r arg parsing pacman-key: follow gpg options for listing keys makepkg: fix removing symbolic link Chris Brannon (1): Let pacman specify GnuPG's home directory. DJ Mills (3): makepkg: Remove OPT_TEMP hack in parse_options call makepkg: Remove pre-optimization from in_array() pacman-key: change GPG_PACMAN and GPG_NOKEYRING to arrays Dan McGee (279): Merge branch 'download' Merge branch 'maint' Merge branch 'maint' Style change: return(x) --> return x Ensure dlcb is defined before calling it Merge branch 'maint' makepkg: allow signatures to work with split packages repo-add: allow signing of the package database repo-add: add -v/--verify option repo-add: Fix up usage with GPG options pacman-key help, round three pacman-key manpage updates Merge branch 'maint' Merge branch 'gpg-pacman-key' repo-add: add sha256sum values to repo database Merge branch 'gpg-build-tools' Add base64 algorithms from PolarSSL to libalpm Allow PGP signature to be read from sync database Add PGP signature support to pactest Read in .sig files when opening a package file Remove libfetch error code Add a few pactests for PGP integration Merge branch 'gpg-libalpm-basics' Actually read PGPSIG field in sync DB code Add signature directory as option on libalpm handle Add some error codes for signature verification Integrate GPGME into libalpm Add a pactest showing failed GPG verification Remove unnecessary sanity check on db->setserver Refactor signature loading code into common function Merge branch 'maint' Merge branch 'maint' Temporary fix for new warnings from gcc 4.6 Documentation formatting updates Merge branch 'maint' Unify filelist operation functions in conflict checking Merge branch 'maint' Don't create two pmpkg_t objects in be_package Move graph.h functions into graph.c Remove indirection on get_name and get_version operations Include "config.h" in header files using off_t Merge branch 'maint' Remove outdated comments Merge branch 'maint' Put comments on their own line alpm.h: forward-declare shared enumerations syntax: if/while statements should have no trailing space Header inclusion cleanup Form the signature file location in one place Rename gpgsig struct fields for clarity Merge remote-tracking branch 'remy/doxygen' be_sync: use _alpm_db_get_sigverify_level() libalpm/dload: const and static correctness cleanup: add_pkg() and remove_pkg() Merge branch 'maint' libalpm/dload: add allow_resume and reorder error checks libalpm/dload: major refactor of signature downloading Make dump_pkg_full a little less insane signing: let GPGME handle loading signatures from files Rein in the complexity of the signature type sync_commit: refactor out file downloads sync_commit: refactor out validate_deltas Perform package verification at package load time Enhance GPGME debug output signing: add more detail to unexpected signature count error Allow conditional compilation with GPGME configure: add output showing what libraries will be used Merge branch 'maint' Reduce duplicate signing debug code and fix logic condition Fix warnings reported by -Wwrite-strings pactree: make -Wwrite-strings friendly Merge branch 'maint' dload: make sure we never print a bogus error buffer Fix incorrect memory allocation assignment dload: ensure we return success if we found files on any mirror pactest: run with root in /tmp and clean up automatically Move parseconfig to conf.c Make config parsing a two-part affair Logging changes during DB load Improve database server API Don't null-check handle lists before setting Merge branch 'maint' Refactor VerifySig option value parsing into standalone method Rework config parsing to reduce variable duplication Remove sync DB reregister check Don't balk on .sig files being invalid in package cache Merge branch 'maint' Merge branch 'maint' doc: monospace attribute escape fixes Add two currently failing test cases from bug reports Show net upgrade size on -U/-S operations Merge branch 'maint' Remove ALPM_LOG_FUNC macro Remove unnecessary handle != NULL asserts Add handle attribute to pmdb_t struct Add handle attribute to pmpkg_t struct Push down extern handle variable to files that need it Remove global handle from util.c Remove global handle from diskspace.c Remove global handle from some package and db code Remove global handle from remove.c Remove global handle dependencies from sync/upgrade paths Use standard errno codes in return from _alpm_archive_fgets Add helper methods for setting directory options Be consistent with memory treatment for plural option setters Add cachedirs one-by-one in set_cachedirs() New signatures for alpm initialize and release Update utilities for new initialize/release methods Revamp pacman setup code to handle new alpm initialize routine Merge branch 'maint' Plug a memory leak pactest: only create install file if necessary Fix graph free valgrind warnings Merge remote-tracking branch 'allan/working' _alpm_lstat: only duplicate string if necessary Kill all remaining 'PATH_MAX + 1' usages Require handle argument to alpm_logaction() Require handle argument to all alpm_option_(get|set)_*() methods Require handle argument to all alpm_trans_*() methods Require handle for alpm_db_register_sync() Require handle for alpm_sync_sysupgrade() commit_single_pkg(): Use handle object directly Fix all current return(x) usages Fix memory leak if package sig was invalid Add handle argument to alpm_(add|remove)_pkg() Require handle for alpm_pkg_load() Require handle for alpm_checkconflicts() Add handle argument to two more alpm methods Move pm_errno onto the handle Switch all logging to use handle directly Remove global handle variable Always pass data to trans_commit() conf: _parseconfig() cleanups and documentation conf: do batch processing of repo sections alpm_db_update(): refactor out sync dir create/check Add a helper method for retrieving the DB signature path Remove alpm_db_get_url() Merge branch 'maint' Merge remote-tracking branch 'florian/sodeps' Add handle argument to _alpm_pkg_should_ignore() Small handle related cleanups Conflict check and skip_remove code cleanups Avoid setting sigverify option twice Ensure handle is valid and pm_errno is reset when calling into API Alpm pkg accessors: ensure pkg argument is non-NULL Rename and rework signing helper methods valgrind.supp: add known leak exposed by cURL Merge branch 'maint' API: change 'signaturedir' to 'gpgdir' Make pmfileconflict_t type public Make struct pmconflict_t public Make pmdepend_t and pmdepmissing_t public Make pmdelta_t public Make pmgrp_t public Don't call public API in _alpm_log() Merge branch 'public-structs' Clean up util md5sum method Correctly duplicate delta objects Improve cachedir removal and error handling pactest: add retcode=0 to several tests repo-add: allow creating a database with no compression makepkg: fix 'check_sofware' typo Convert backup list to new pmbackup_t type makepkg: remove distcc/makeflags option interaction Let configure gettext setup know we use ngettext() Update all translation files po/: split into scripts/po/ and src/pacman/po/ scripts/po/: prune message catalog and translations src/pacman/po/: prune message catalog and translations scripts/po/: add pacman-key Merge branch 'po-split' Prevent segfault when parsing unexpected sync database file Remove three unnecessary usages of alpm_list_count() pactest: add isize attribute, fix url attribute pactest: clean up database section writing pactest: small cleanups and chmod -x most files pactest: make pmfile a bit more pythonic pactest: move filelist/backup generation into package object pactest: refactor install file creation pactest: generate sync DB's in memory Do database signature checking at load time Move database 'version' check to registration time Add a 'valid' flag to the database object Move locking functions to handle Don't require a transaction for sync DB updates valgrind.supp: add known leaks from GPGME archive_fgets(): ensure we return any trailing text with no newline Make sync DB reading a bit more flexible Merge branch 'maint' Fix several -Wshadow warnings Remove setter for DB signature level Merge remote-tracking branch 'dave/repo-add' pacman-optimize: use output library repo-add: remove extra exit call Revert "Merge branch 'master' of git://projects.archlinux.org/pacman" makepkg: only source user override if using default config file repo-add: fix db creation one last time Merge remote-tracking branch 'allan/breakshit' Merge remote-tracking branch 'dave/makepkg' Fix a few warnings pointed out via clang scan-build Make local_db_read() private to the local backend pactest: create packages in memory pactest: remove no longer necessary newline hacks Add an alpm_db_get_valid() public function Make alpm_db_get_sigverify_level() public signing: check validity of all available signatures be_sync: make READ_NEXT() a no-arg macro be_local: use macros in database loading similar to be_sync checkdeps: remove unnecessary list join and copy Fix debug logger without a newline pactest: add a few more checks to fileconflict checks Move alpm filelists to a struct object diskspace: remove all libarchive usage conflict code tweaks and cleanups Merge remote-tracking branch 'allan/ALPM' signing: move to new signing verification and return scheme Correctly check the GPG error codes Allow frontend access to signature verification information Allow invalid sync DBs to be returned by the library Remove most usages of strncmp() Rework -Si display logic Merge remote-tracking branch 'dave/download' include util.h in rawstr.c Unify package removal code Add 'compress' compression format as an available option Allow fileconflict if unowned file moving into backup array Make alpm_db_set_pkgreason() arguments more sane doc/PKGBUILD: clarify scriptlet version arguments Handle removal of empty directories properly Add a new epoch pactest Merge branch 'maint' Fix test suite when GPGME is disabled Merge remote-tracking branch 'allan/pacman-key' Clean up my debug logger mess contrib: add paclog-pkglist to gitignore Convert package filelists to an array instead of linked list contrib/pacsearch: skip non-matching lines Remove duplicate code shared between sync and upgrade Unify modelines in Asciidoc files Merge remote-tracking branch 'dave/scripts-fixup' Make free_groupcache() private Tidy up testdb to match coding styles Revamp signing checks pactest: use subprocess module instead of os.system Don't trim whitespace when reading database entries Implement parsing of the new SigLevel directive docs/pacman.conf: Document SigLevel option Check return value of rename() calls Bash-ify test/util/vercmptest.sh Add a test harness for new pacsort command Store a package info level flag if we fail to load data Merge branch 'maint' _alpm_access(): don't call gettext() in debug level loggers Update all translation files Update transifex config for new translation layout Update several translation strings Attempt to fix up some of the brokenness around failed package loads Add reason to corrupted package callback pactest: improve speed of local DB dependent rules Depend on name_hash being set Fix compile error when curl is not used doc/pacman.conf: make SigLevel overview an unordered list Don't walk off front of string when stripping newline Add a slightly simpler versioned replace test Update string catalogs after string tweaks Conflict comparison performance enhancements Parse replaces strings as dep strings with version specs Merge branch 'maint' Fix stupid typo in NEWS file updates build: remove mucking with CARCHFLAGS configure: simplify CARCH generation madness Dependency code style cleanups Add -S --recursive operation Allow --needed and --recursive on -U operations Update trust level strings in -Qi display Attempt to update zsh_completion Merge branch 'maint' Enable recursive/needed sync on SyncFirst Bump version to 4.0.0rc1 Dave Reisner (97): Add configure.ac option for --with-curl add curl to alpm initialization and teardown routines handle: Add CURL* and CURLcode vars to struct prefix fetch based functions with fetch_ share code between libfetch and libcurl handle error case for PM_ERR_LIBCURL dload.c: add curl_download_internal dload: temp patch to allow curl/fetch coexistance Remove all traces of libfetch Fix triple progress bars on download remove antiquated contrib/wget-xdelta.sh lib/dload.c: remove lingering libfetch specific headers INSTALL: replace libfetch with libcurl lib/dload.c: fix opening braces to conform with coding style buildsys: use libcurl's m4 macro for buildtime detection lib/dload.c: fix compiler warnings generated by -Wfloat-equal lib/dload.c: Fix progress callback issues on download lib/dload.c: don't request compressed transport lib/dload.c: don't use deprecated curl symbols lib/dload.c: Check for dlcb == NULL earlier etc/makepkg.conf: use curl in place of wget as a DLAGENT lib/dload: pass a struct with filename and size to curl_progress pacman/pacman.c: fix setting of useragent string lib/dload: merge get_{destfile,tempfile} into get_fullpath lib/dload: code simplification lib/dload: remove proxy debug output lib/dload: abstract out helper function to set utimes Rely on the return value of type instead of its output pacman/util: flush terminal input before reading response lib: remove dead code in be_local and be_package style cleanup: cast as (type *) not (type*) Allow VerifySig to act as a default verification in [options] dload: abort transfer on CURLOPT_LOW_SPEED_LIMIT lib/dload.c: remove assumption in continuation logic lib/handle: use CALLOC macro instead of bare calloc pacman/util.c: support terminals with unknown width lib/util: call _alpm_log before setting handle->pm_errno repo-add: use bash equivalents of basename/dirname repo-add: show better error when path to repo does not exist repo-add: style cleanup repo-add: fix path designation regression parse-options: simplify unused-arg & parameter printing makepkg: fix incorrect parenthesis in gettext call pactree: carry a list of databases for dep resolution Merge branch 'master' of git://projects.archlinux.org/pacman repo-add: bashify reading of .PKGINFO file repo-add: store multi-value fields as arrays repo-add: use format_entry for all desc/depends fields repo-add.8.txt: document valid DB file extensions pactree: add -s option to walk sync DBs repo-add: refactor repacking of repo file repo-add: move command invocation out of arg parsing loop repo-add: enforce file extensions repo-add: add new command, repo-elephant makepkg: remove unneeded echo makepkg: fix vim syntax highlighting makepkg: simplify SIGNPKG check repo-add.sh.in: avoid being clever with repo repacking lib/alpm: unlock the handle before freeing it lib/util: modify entry_prefix, not prefix pacman: return with 128+signum on signaled exit move proto files to new subdirectory, proto/ lib/rawstr: borrow raw string functions from curl dload: rearrange code to avoid extra cpp block contrib/paclist: rewrite in bash dload: handle irregular URLs lib/dload: prevent large file attacks absorb some _alpm_download params into payload struct absorb fileinfo struct into dload_payload makepkg: skip devel_check when reading from a pipe makepkg: remove unused -C option from option list contrib/bash_completion: update with new makepkg opts contrib/paclog-pkglist: new contribution contrib/paclog-pkglist: rework as bash wrapping awk contrib/paclog-pkglist: whitespace cleanup PKGBUILD.vim: add new var and assert bash syntax pacman-key: refactor get_from pacman-key: tidy up logic for finding pacman keyring directory pacman/callback: show .sig suffix on sig download pacman-key: return $ret, not errors pacman-key: fix syntax error in -r arg parsing pacman-key: s/UPDATEBD/UPDATEDB/ pacman-key: refactor post parse opt check into a case scripts/repo-add: show usage when no DB file specified scripts/pkgdelta: exit properly on missing args paccache: add new contrib script contrib/paccache: misc cleanup and bugfix makepkg: ignore epoch when undeclared pacsort: add new utility src/util/Makefile.am: alphabetize targets paccache: use pacsort instead of sort -V mark option structs as const dload: remove unnecessary cast in alpm_load_payload_free stop progress callbacks after curl_easy_perform returns pacman: remove --dbonly shortopt bash_completion: update for adjusted options pactest: add sync302 to test recursive syncfirst Denis A. Altoé Falqueto (4): pacman-key: keyring management tool pacman-key: remake of --reload command makepkg: command line options for signing packages repo-add: add option to specify a different key to sign with Eric Bélanger (4): makepkg: Added checks in check_software for distcc, ccache, strip and gzip makepkg: Move check for sudo into check_software function makepkg: Add warning if VCS tool is not present when determining latest VCS revision Remove -f option from ln for POSIX compliance Florian Pritz (11): makepkg: add libprovides support makepkg: add libdepends support doc/PKGBUILD: document libdeps doc/PKGBUILD: misc changes doc/PKGBUILD: misc changes makepkg: fix broken syntax (double $) fix vim syntax highlighting of .sh files fix segfault if pacman.conf can't be read add _alpm_access() wrapper signing.c: check if needed files are readable replace access() calls for debug info where applicable Geoffroy Carrier (2): Add GPG signature support to makepkg Add PGPSIG field in repo-add Guillaume Alaux (1): Add man-page for pacman-key Ivan Kanakarakis (5): makepkg, pacman-key: unify help message with other scripts pacman-key: display the unsupported command to the user pacman-key: improved reading of the configuration file pacman-key: fix quotation on several variable assignments pacman-key: hide output of executed commands on logic checks Jakob Gruber (8): Remove ShowSize option Add a utility function to humanize sizes Use IEC unit prefixes Refactor display_targets for readability Table formatted output functions New VerbosePkgLists option Use pm_fprintpf in table_create_format Ensure humanize_size works for negative values Kerrick Staley (4): Added initialization code for database siglevel Documented purpose of be_*.c Documented _alpm_download() Fixed outdated documentation in test/pacman/README Lukas Fleischer (1): Don't initialize progress to zero before calling curl_easy_perform(). Pang Yan Han (6): Let pacman -v print GPG Dir Update pacman manpage and pacman.conf for gpgdir pacman-key: print default gpgdir in usage pacman-key: correct spelling mistake pacman-key: --init: correct creation of gpg.conf pacman-key: Add --import and --import-trustdb Ray Kohler (7): Fix use of relative paths for packages in repo-add makepkg: allow PKGEXT and SRCEXT to be overridden by env variables Sign database even if empty Clean up repo-add usage message Update repo-add manpage Add manpage for pkgdelta Create pacman keyring directory if missing Rogutės Sparnuotos (1): makepkg: only test for writable PKGDEST when needed. Rémy Oudompheng (7): libalpm: consistently use int as return type for option setters alpm.h: add/improve function documentation alpm.h: rationalize option getters/setters documentation alpm.h: add several missing documentation strings handle.c: force sigverify level not to be PM_PGP_VERIFY_UNKNOWN sync.c: remove unnecessary check for PM_PGP_VERIFY_UNKNOWN makepkg: fix typo (missing quotes) Wieland Hoffmann (2): makepkg: Remove a lone quotation mark makepkg: Add support for verifying pgp signatures Xavier Chantry (4): Added gpg verification options per repo to the config file. configure.ac: we use fabs now so -lm is needed dload: dont forget to initialize open_mode pacman.c : useless extra parenthesis ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.4-567-gc5ecced
by dan＠archlinux.org 11 Aug '11

11 Aug '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 c5eccedc63dedd6a0ac89f86c8fc54e7ccad40be (commit) via a58dc9283c6a48d4e664dfe622d8be38b6999409 (commit) via 09034520325efcc2e684f05fa7a99c02bad1f5be (commit) via dd865d298146ef77effb2110d7db172b3bffe9b0 (commit) via d0c64c41965d49ac840a747d009de85b7eb9e92e (commit) via 0bfefa87c8a7b34f9c8eeb7b2b7e4b1ba0e056d1 (commit) via 6e4f695a0f583a832e616034db59779444d86d69 (commit) via 725edde73fb16564b0ce33257d7a069b10eb8cea (commit) via 857357f9405b6c07236550b7ec1558ed1b116c6b (commit) via f3fa77bcf1d792971c314f8c0de255866e89f3f3 (commit) via 1f6afe6b0b3e1f222b5624e93af6e6272afea423 (commit) via ca41470462c3a674966e55be7186c5bdefbe6242 (commit) via f0803f6ece49e760c2992895e35517fd1cf141c9 (commit) via edd9ed6a3bbe0a351fdf09b3d4b33c8d2fd66899 (commit) via c4112da8c3c628570d059679abd5bd4c79286184 (commit) via c493eef643ecb3a54c79083c51a8975f816ed9de (commit) via 05608ee57e89c1f55a573377f90c8025afd7c618 (commit) via e0f41e0fb4ec9eb7d1e2c54744e6dbcd4d61a713 (commit) via c36dbf97118d8098ccf124b6299ff958a289d3c4 (commit) via 6b57118c15c6ba60fd84e72ab1ec32bad7f7f7de (commit) via 07996bfac7cf172e656f7527794512fd596a9edf (commit) from 82d45d66ca36f48dd89867e817d198bd9e055829 (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 c5eccedc63dedd6a0ac89f86c8fc54e7ccad40be Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 11:45:27 2011 -0500 Bump version to 4.0.0rc1 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a58dc9283c6a48d4e664dfe622d8be38b6999409 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 11 08:14:13 2011 -0400 pactest: add sync302 to test recursive syncfirst Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 09034520325efcc2e684f05fa7a99c02bad1f5be Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 01:05:49 2011 -0500 Enable recursive/needed sync on SyncFirst Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd865d298146ef77effb2110d7db172b3bffe9b0 Merge: d0c64c4 c493eef Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 11:32:09 2011 -0500 Merge branch 'maint' Conflicts: scripts/repo-add.sh.in commit d0c64c41965d49ac840a747d009de85b7eb9e92e Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 11:27:45 2011 -0500 Attempt to update zsh_completion Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0bfefa87c8a7b34f9c8eeb7b2b7e4b1ba0e056d1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 11 09:37:04 2011 -0400 bash_completion: update for adjusted options Remove -k option excepting query operations and add --recursive for sync and upgrade operations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e4f695a0f583a832e616034db59779444d86d69 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 11 09:18:55 2011 -0400 pacman: remove --dbonly shortopt This is somewhat of a dangerous option with limited use cases. Don't advertise it as an easily accessibly option. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 725edde73fb16564b0ce33257d7a069b10eb8cea Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 10:28:59 2011 -0500 Update trust level strings in -Qi display It makes more sense to use the same tense and construction on all of these. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 857357f9405b6c07236550b7ec1558ed1b116c6b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 08:55:12 2011 -0500 Allow --needed and --recursive on -U operations Trivial to implement as the same backend machinery is used anyway. Document it and add it to the accepted options. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f3fa77bcf1d792971c314f8c0de255866e89f3f3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 01:00:47 2011 -0500 Add -S --recursive operation This closely matches what we had before for -R --recursive. Basically, when specifying a target (e.g., pacman), we can now recursively pull all dependencies, regardless of version specifiers and whether they are already satisfied in the local database. This could be used to update pacman on a system with an old glibc, for example, as both pacman and glibc would get pulled into the transaction. This is most useful with --needed to prevent needless reinstalls as described in the man page changes. The end goal of this change is to wire it into SyncFirst and have it be the default mode of operation there, but that belongs in a separate changeset. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1f6afe6b0b3e1f222b5624e93af6e6272afea423 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 10 23:28:57 2011 -0500 Dependency code style cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ca41470462c3a674966e55be7186c5bdefbe6242 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 10 22:40:30 2011 -0500 configure: simplify CARCH generation madness Rather than a hardcoded list of only a few select architectures (of the 250+ case statements in config.guess), simply define CARCH to be the first component of the "target triplet". This introduces one "regression"- powerpc will no longer become ppc. However, this is easily worked around in downstream distros if wanted. This was the only CPU architecture with this oddity so it was felt worth the price to make this change. Note that 'ppc64' wasn't handled in this same odd fashion before anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0803f6ece49e760c2992895e35517fd1cf141c9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 10 22:14:41 2011 -0500 build: remove mucking with CARCHFLAGS We've never received an update to this, and gcc has sane defaults out of the box anyway, as do most projects in their build systems. Remove the magic here and just let downstream distros handle any changes or additions necessary, as we already do for LDFLAGS. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit edd9ed6a3bbe0a351fdf09b3d4b33c8d2fd66899 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 11 08:19:39 2011 -0400 stop progress callbacks after curl_easy_perform returns This prevents possible null dereferences in FTP transfers when the progress callback is touched during connection teardown. http://curl.haxx.se/mail/lib-2011-08/0128.html Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4112da8c3c628570d059679abd5bd4c79286184 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 11 08:15:24 2011 -0400 dload: remove unnecessary cast in alpm_load_payload_free Dan: make it compile, s/load/payload/. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 9 +++++ configure.ac | 53 ++++---------------------------- contrib/bash_completion.in | 6 ++-- contrib/zsh_completion.in | 8 ++++- doc/index.txt | 2 + doc/pacman.8.txt | 22 ++++++++++++- etc/Makefile.am | 1 - etc/makepkg.conf.in | 8 ++--- lib/libalpm/deps.c | 69 ++++++++++++++++++++++++++++++----------- lib/libalpm/dload.c | 13 ++++---- lib/libalpm/remove.c | 6 ++- src/pacman/conf.h | 4 ++- src/pacman/pacman.c | 20 ++++++++---- src/pacman/sync.c | 2 + src/pacman/util.c | 6 ++-- test/pacman/tests/sync302.py | 49 +++++++++++++++++++++++++++++ 16 files changed, 183 insertions(+), 95 deletions(-) create mode 100644 test/pacman/tests/sync302.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH][RFC] pacman: remove --dbonly shortopt
by Dave Reisner 11 Aug '11

11 Aug '11

This is somewhat of a dangerous option with limited use cases. Don't advertise it as an easily accessibly option. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This also removes -k from double duty with -Q, which might relieve some confusion. doc/pacman.8.txt | 2 +- src/pacman/conf.h | 3 ++- src/pacman/pacman.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a362d2c..20e2e99 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -177,7 +177,7 @@ Transaction Options (apply to '-S', '-R' and '-U') dependencies are installed and there are no package conflicts in the system. Specify this option twice to skip all dependency checks. -*-k, \--dbonly*:: +*\--dbonly*:: Adds/Removes the database entry only, leaves all files in place. *\--noprogressbar*:: diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 33a8798..396cde5 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -124,7 +124,8 @@ enum { OP_ARCH, OP_PRINTFORMAT, OP_GPGDIR, - OP_RECURSIVE + OP_RECURSIVE, + OP_DBONLY }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 585c8e0..fee30a2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -187,7 +187,7 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); - addlist(_(" -k, --dbonly only modify database entries, not package files\n")); + addlist(_(" --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); addlist(_(" --print print the targets instead of performing the operation\n")); @@ -486,7 +486,7 @@ static int parsearg_trans(int opt) config->flags |= ALPM_TRANS_FLAG_NODEPVERSION; } break; - case 'k': config->flags |= ALPM_TRANS_FLAG_DBONLY; break; + case OP_DBONLY: config->flags |= ALPM_TRANS_FLAG_DBONLY; break; case OP_NOPROGRESSBAR: config->noprogressbar = 1; break; case OP_NOSCRIPTLET: config->flags |= ALPM_TRANS_FLAG_NOSCRIPTLET; break; case 'p': config->print = 1; break; @@ -598,7 +598,6 @@ static int parseargs(int argc, char *argv[]) {"groups", no_argument, 0, 'g'}, {"help", no_argument, 0, 'h'}, {"info", no_argument, 0, 'i'}, - {"dbonly", no_argument, 0, 'k'}, {"check", no_argument, 0, 'k'}, {"list", no_argument, 0, 'l'}, {"foreign", no_argument, 0, 'm'}, @@ -634,6 +633,7 @@ static int parseargs(int argc, char *argv[]) {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, {"recursive", no_argument, 0, OP_RECURSIVE}, + {"dbonly", no_argument, 0, OP_DBONLY}, {0, 0, 0, 0} }; -- 1.7.6

1 0

[pacman-dev] [PATCH 1/2] Add -S --recursive operation
by Dan McGee 11 Aug '11

11 Aug '11

This closely matches what we had before for -R --recursive. Basically, when specifying a target (e.g., pacman), we can now recursively pull all dependencies, regardless of version specifiers and whether they are already satisfied in the local database. This could be used to update pacman on a system with an old glibc, for example, as both pacman and glibc would get pulled into the transaction. This is most useful with --needed to prevent needless reinstalls as described in the man page changes. The end goal of this change is to wire it into SyncFirst and have it be the default mode of operation there, but that belongs in a separate changeset. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman.8.txt | 7 +++++++ lib/libalpm/deps.c | 29 +++++++++++++++++++++++++++++ src/pacman/conf.h | 3 ++- src/pacman/pacman.c | 8 +++++++- 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 3240022..a362d2c 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -400,6 +400,13 @@ system upgrade and install/upgrade the foo package in the same operation. *\--needed*:: Don't reinstall the targets that are already up to date. +*\--recursive*:: + Recursively reinstall all dependencies of the targets. This forces upgrades + or reinstalls of all dependencies without requiring explicit version + requirements. This is most useful in combination with the '\--needed' flag, + which will induce a deep dependency upgrade without any unnecessary + reinstalls. + Handling Config Files[[HCF]] ---------------------------- diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 51ae0fb..992ebe2 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -701,6 +701,12 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, return 0; } + if(handle->trans->flags & ALPM_TRANS_FLAG_RECURSE) { + /* removing local packages from the equation causes the entire dep chain to + * get pulled for each target- e.g., pactree -u output */ + localpkgs = NULL; + } + /* Create a copy of the packages list, so that it can be restored on error */ packages_copy = alpm_list_copy(*packages); @@ -753,6 +759,29 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_list_free(deps); } + if(handle->trans->flags & ALPM_TRANS_FLAG_NEEDED) { + /* remove any deps that were pulled that match installed version */ + /* odd loop syntax so we can modify the list as we iterate */ + i = *packages; + while(i) { + alpm_pkg_t *tpkg = i->data; + alpm_pkg_t *local = _alpm_db_get_pkgfromcache( + handle->db_local, tpkg->name); + if(local && _alpm_pkg_compare_versions(tpkg, local) == 0) { + /* with the NEEDED flag, packages up to date are not reinstalled */ + _alpm_log(handle, ALPM_LOG_DEBUG, + "not adding dep %s-%s as it is not needed, same version\n", + local->name, local->version); + j = i; + i = i->next; + *packages = alpm_list_remove_item(*packages, j); + free(j); + } else { + i = i->next; + } + } + } + if(ret != 0) { alpm_list_free(*packages); *packages = packages_copy; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index bce42ab..33a8798 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -123,7 +123,8 @@ enum { OP_ASEXPLICIT, OP_ARCH, OP_PRINTFORMAT, - OP_GPGDIR + OP_GPGDIR, + OP_RECURSIVE }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 21ccc96..585c8e0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -165,6 +165,7 @@ static void usage(int op, const char * const myname) addlist(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); addlist(_(" -y, --refresh download fresh package databases from the server\n")); addlist(_(" --needed don't reinstall up to date packages\n")); + addlist(_(" --recursive reinstall all dependencies of target packages\n")); } else if(op == PM_OP_DATABASE) { printf("%s: %s {-D --database} <%s> <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -506,6 +507,9 @@ static int parsearg_remove(int opt) case 'c': config->flags |= ALPM_TRANS_FLAG_CASCADE; break; case 'n': config->flags |= ALPM_TRANS_FLAG_NOSAVE; break; case 's': + case OP_RECURSIVE: + /* 's' is the legacy flag here, but since recursive is used in -S without + * a shortopt, we need to do funky tricks */ if(config->flags & ALPM_TRANS_FLAG_RECURSE) { config->flags |= ALPM_TRANS_FLAG_RECURSEALL; } else { @@ -544,6 +548,7 @@ static int parsearg_sync(int opt) return 0; switch(opt) { case OP_NEEDED: config->flags |= ALPM_TRANS_FLAG_NEEDED; break; + case OP_RECURSIVE: config->flags |= ALPM_TRANS_FLAG_RECURSE; break; case 'c': (config->op_s_clean)++; break; case 'g': (config->group)++; break; case 'i': (config->op_s_info)++; break; @@ -603,7 +608,6 @@ static int parseargs(int argc, char *argv[]) {"print", no_argument, 0, 'p'}, {"quiet", no_argument, 0, 'q'}, {"root", required_argument, 0, 'r'}, - {"recursive", no_argument, 0, 's'}, {"search", no_argument, 0, 's'}, {"unrequired", no_argument, 0, 't'}, {"upgrades", no_argument, 0, 'u'}, @@ -612,6 +616,7 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, + {"noconfirm", no_argument, 0, OP_NOCONFIRM}, {"config", required_argument, 0, OP_CONFIG}, {"ignore", required_argument, 0, OP_IGNORE}, @@ -628,6 +633,7 @@ static int parseargs(int argc, char *argv[]) {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, + {"recursive", no_argument, 0, OP_RECURSIVE}, {0, 0, 0, 0} }; -- 1.7.6

1 2

[pacman-dev] [PATCH 1/2] dload: remove unnecessary cast in alpm_load_payload_free
by Dave Reisner 11 Aug '11

11 Aug '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ac47e94..689fe6e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -490,8 +490,6 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) } void _alpm_dload_payload_free(struct dload_payload *payload) { - struct dload_payload *load = (struct dload_payload *)payload; - ASSERT(load, return); FREE(load->fileurl); -- 1.7.6

2 3

[pacman-dev] [PATCH 1/2] build: remove mucking with CARCHFLAGS
by Dan McGee 11 Aug '11

11 Aug '11

We've never received an update to this, and gcc has sane defaults out of the box anyway, as do most projects in their build systems. Remove the magic here and just let downstream distros handle any changes or additions necessary, as we already do for LDFLAGS. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 11 ----------- etc/Makefile.am | 1 - etc/makepkg.conf.in | 8 +++----- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 6ad5be5..9f5b1cb 100644 --- a/configure.ac +++ b/configure.ac @@ -243,47 +243,37 @@ AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) # Check for architecture, used in default makepkg.conf -# (Note single space left after CARCHFLAGS) case "${host}" in i686-*) CARCH="i686" - CARCHFLAGS="-march=i686 " ;; x86_64-*) CARCH="x86_64" - CARCHFLAGS="-march=x86-64 " ;; ia64-*) CARCH="ia64" - CARCHFLAGS="-march=ia64 " ;; sparc-*) CARCH="sparc" - CARCHFLAGS="-mcpu=v9 " ;; ppc-* | powerpc-*) CARCH="ppc" - CARCHFLAGS="-mcpu=750 " ;; i386-*) CARCH="i386" - CARCHFLAGS="-march=i386 " ;; arm-*) CARCH="arm" - CARCHFLAGS="-march=armv4 " ;; *) AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]]) CARCH="unknown" - CARCHFLAGS="" ;; esac # Now do some things common to all architectures CHOST="${host}" AC_SUBST(CARCH) -AC_SUBST(CARCHFLAGS) AC_SUBST(CHOST) # Check for documentation support and status @@ -407,7 +397,6 @@ ${PACKAGE_NAME}: linker flags : ${LDFLAGS} Architecture : ${CARCH} - Architecture flags : ${CARCHFLAGS} Host Type : ${CHOST} Filesize command : ${SIZECMD} In-place sed command : ${SEDINPLACE} diff --git a/etc/Makefile.am b/etc/Makefile.am index 25f1834..67c0e98 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -19,7 +19,6 @@ edit = sed \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ - -e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g' \ -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' $(dist_sysconf_DATA): Makefile diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 778c530..65d8ab9 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -26,11 +26,9 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % CARCH="@CARCH@" CHOST="@CHOST@" -#-- Exclusive: will only run on @CARCH@ -# -march (or -mcpu) builds exclusively for an architecture -# -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +#-- Compiler and Linker Flags +#CFLAGS="-O2 -pipe" +#CXXFLAGS="-O2 -pipe" #LDFLAGS="" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" -- 1.7.6

1 1

[pacman-dev] segfault after curl_easy_cleanup via progress callback
by Dave Reisner 11 Aug '11

11 Aug '11

Hi all, I received a bug report with backtrace [1] for a curl powered app that I work on. It shows a segfault in a progress callback, which is triggered _after_ curl_easy_cleanup has been called. Unfortunately, I can't reproduce this, and it's still a development version of pacman with a limited userbase. There's a half dozen devs using this on a daily basis, and this is a routine operation that one of us would have surely run into by now. That said, the bug reporter was able to find another bug report[2] with a very similar backtrace. Note that this bug report uses an earlier version of curl, I believe 7.20, while we're using 7.21.7. The documentation for curl_easy_cleanup states that further calls to the handle are invalid after this call so I'm a bit confused as to why curl would be hitting the progress callback at this point. This indirectly _insists_ that the application touches the handle. Am I misunderstanding the expectation of curl_easy_cleanup that it's _possible_ due to an unfinished transfer that the progress callback may be hit one final time? In case it's relevant, I'll point to the where the majority of our curl implementation lies [3], but I'm somewhat confident that pacman "does the right thing" here. If anyone can point me in the right direction, I've be hugely appreciative. Thanks, Dave Reisner [1] http://pastebin.com/Pef1Qedq [2] http://www.crosswire.org/bugs/browse/API-128 [3] https://github.com/falconindy/pacman/blob/master/lib/libalpm/dload.c#L180

2 1

[pacman-dev] [PATCH] [makepkg] New patch for split debug support, using generic split packaging mechanism
by Vitaliy Gorbunov 10 Aug '11

10 Aug '11

I rewrite patch from Remy Oudomphen**g (http://bugs.archlinux.org/task/10975<http://bugs.archlinux.org/task/10975>) in order to use generic split packaging mechanism. The main idea is that debug packages will be added to pkgname array and for each of it package_<name>-dbg function will be created. So it treated like usual split packages. Tested on split and non-split packages. All seems to work fine.

2 1

[pacman-dev] [PATCH v2 0/2] Save backup files with extension .pacsave.n
by Pang Yan Han 10 Aug '11

10 Aug '11

This is a 2 patch series which teaches pacman to save backup files with extension .pacsave.n Patch 1/2 introduces _alpm_mbasename and _alpm_mdirname from src/pacman/util.c into libalpm. These 2 functions are used in Patch 2/2. Patch 2/2 teaches pacman to save backup files with extension .pacsave.n We look at the existing <name>.pacsave files, find the largest n, and rename each existing <name>.pacsave.n file to <name>.pacsave.n+1 . If <name>.pacsave exists, it shall be renamed to <name>.pacsave.1 . The newest backup file is then saved as <name>.pacsave . Pang Yan Han (2): libalpm: Introduce _alpm_mbasename and _alpm_mdirname Save backup files with extension .pacsave.n lib/libalpm/remove.c | 75 ++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.c | 42 ++++++++++++++++++++++ lib/libalpm/util.h | 2 + test/pacman/tests/remove012.py | 20 +++++++++++ 4 files changed, 139 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/remove012.py -- 1.7.6

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.4-2-gc493eef
by dan＠archlinux.org 10 Aug '11

10 Aug '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, maint has been updated via c493eef643ecb3a54c79083c51a8975f816ed9de (commit) via 05608ee57e89c1f55a573377f90c8025afd7c618 (commit) from e0f41e0fb4ec9eb7d1e2c54744e6dbcd4d61a713 (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 c493eef643ecb3a54c79083c51a8975f816ed9de Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 22:47:35 2011 +1000 makepkg: fix removing symbolic link The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> (cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c) commit 05608ee57e89c1f55a573377f90c8025afd7c618 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 19:52:15 2011 -0500 Fix stupid typo in NEWS file updates Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.5.4, created. v3.5.4
by dan＠archlinux.org 10 Aug '11

10 Aug '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 annotated tag, v3.5.4 has been created at 1135258b79ad32db42be0f482377bcc92568b164 (tag) tagging e0f41e0fb4ec9eb7d1e2c54744e6dbcd4d61a713 (commit) replaces v3.5.3 tagged by Dan McGee on Tue Aug 9 19:30:26 2011 -0500 - Log ----------------------------------------------------------------- 3.5.4 maint release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk5B0ScACgkQXC5GoPU6du34cACgxPKuK37nbkzjWlxzam6WOZRf 74gAoJS3XxmtPIIp2t+KFe4LO+pwuLWw =26vM -----END PGP SIGNATURE----- Allan McRae (3): Fix man page generation for out of tree build makepkg: fix issue with filenames with spaces and noextract Document group and providers selection Dan McGee (9): Add late-breaking 3.5.3 NEWS Fix list_display on non-ttys and other output fixes list_display: fix incorrect assignment File conflict code cleanups Ensure a file can be replaced by a directory Fix group selection entry for large inputs Update translations from transifex Fix divide by zero when downloading zero length files 3.5.4 release preparation Dave Reisner (1): pacman/util: flush terminal input before reading response Eric Bélanger (2): Added check option to BUILDENV array in makepkg.conf man page Remove -f option from ln for POSIX compliance Florian Pritz (1): doc/PKGBUILD: fix pkgver for -git packages Lukas Fleischer (1): libalpm: Set ret correctly in download_internal() ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-17-ge0f41e0
by dan＠archlinux.org 10 Aug '11

10 Aug '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, maint has been updated via e0f41e0fb4ec9eb7d1e2c54744e6dbcd4d61a713 (commit) via c36dbf97118d8098ccf124b6299ff958a289d3c4 (commit) via 6b57118c15c6ba60fd84e72ab1ec32bad7f7f7de (commit) via 07996bfac7cf172e656f7527794512fd596a9edf (commit) from 4885a7fa3a54e9a81831916c7925b2996b695f50 (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 e0f41e0fb4ec9eb7d1e2c54744e6dbcd4d61a713 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 19:15:04 2011 -0500 3.5.4 release preparation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c36dbf97118d8098ccf124b6299ff958a289d3c4 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Jun 26 15:13:48 2011 -0400 Remove -f option from ln for POSIX compliance Fixes FS#24893. Conflicts: scripts/makepkg.sh.in scripts/repo-add.sh.in Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> (cherry picked from commit 51ed7dff0d30a5dcb73ce271e5d02bdb0d119cb9) commit 6b57118c15c6ba60fd84e72ab1ec32bad7f7f7de Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 18 11:03:28 2011 -0400 pacman/util: flush terminal input before reading response Addresses FS#20538 Conflicts: src/pacman/util.c Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> (cherry picked from commit 9477abc3591905a20acbfe7b8ce7832617d72701) commit 07996bfac7cf172e656f7527794512fd596a9edf Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 22 14:07:27 2011 +1000 Document group and providers selection The format required for selection of packages within the group selection dialog is not entirely obvious, so provide some documentation. Fixes FS#24134. Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 94d22f93096e210cd00d2e9c97c65f77d49ae387) ----------------------------------------------------------------------- Summary of changes: NEWS | 9 +++++++++ configure.ac | 9 +++++---- doc/index.txt | 2 ++ doc/pacman.8.txt | 12 ++++++++---- scripts/makepkg.sh.in | 13 ++++++++----- scripts/repo-add.sh.in | 5 +++-- src/pacman/util.c | 21 +++++++++++++++++++++ 7 files changed, 56 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-563-g82d45d6
by dan＠archlinux.org 09 Aug '11

09 Aug '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 82d45d66ca36f48dd89867e817d198bd9e055829 (commit) via 5c1b83d9b1e8c25e78fd9f24faf0f15b9a933c8b (commit) via ce74f76a4c923f9c13463189dedbdb04683b2142 (commit) via 76dfea6e83616f094b4d516e5139c2ffa2eaabff (commit) via 5a6ebec7b27e0ec15c2fe79b394f9f65aecc33cd (commit) via 96c4b1c3033e4f018ab20af5d35cf9cbd8b31cf4 (commit) via a42e52a09f8ccf25a46d7953b2e0a30f306ed223 (commit) via 6803260f2608b0a0028f5382c5a498d61bce45c3 (commit) via 40ea6cd607d5edb2699c084259b237d435313670 (commit) via 9d3d647f0031edd31fc7442f9d2cd9729718e41c (commit) via 5f38660be12c898e6ddef0d09b973d259d80c763 (commit) via 9d09c9fdf7f6156e81c28045e36970158f26d2f1 (commit) via 1d16875db7461a05eee456b39e815893c7aefd96 (commit) via 4885a7fa3a54e9a81831916c7925b2996b695f50 (commit) from 21240d4746be470b2cdabf106289034cbd27c579 (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 82d45d66ca36f48dd89867e817d198bd9e055829 Merge: 5c1b83d 4885a7f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 16:24:55 2011 -0500 Merge branch 'maint' Conflicts: src/pacman/callback.c commit 5c1b83d9b1e8c25e78fd9f24faf0f15b9a933c8b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 23:54:46 2011 -0500 Parse replaces strings as dep strings with version specs This is done extremely crudely and is not very efficient, but it does push us down the path of being closer to right, as one additional test now passes. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ce74f76a4c923f9c13463189dedbdb04683b2142 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 23:25:45 2011 -0500 Conflict comparison performance enhancements * Add *_hash fields to conflict struct and populate them * Remove unnecessary backwards string comparisons Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 76dfea6e83616f094b4d516e5139c2ffa2eaabff Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 15:50:58 2011 -0500 Update string catalogs after string tweaks This also pulls in some early translations we had entered in Transifex in the last day so those would not be lost. The diffstat is huge and not very telling as usual, as all sorts of fuzzyness switches happened this time around for some reason. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5a6ebec7b27e0ec15c2fe79b394f9f65aecc33cd Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 23:52:52 2011 -0500 Add a slightly simpler versioned replace test It turns out we have a few problems here which are best tackled independently. The first is simply parsing replacements as dep strings; the second will be dealing with replaces when the original package name still exists in the repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 96c4b1c3033e4f018ab20af5d35cf9cbd8b31cf4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 02:34:11 2011 -0500 Don't walk off front of string when stripping newline If the string was zero-length to begin with, or consists of only newline characters, nothing stopped us from incrementing right off the front of the string. Ensure len stays above zero the whole time. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a42e52a09f8ccf25a46d7953b2e0a30f306ed223 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 15:17:15 2011 -0500 doc/pacman.conf: make SigLevel overview an unordered list Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6803260f2608b0a0028f5382c5a498d61bce45c3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 9 15:21:02 2011 -0500 Fix compile error when curl is not used Noticed in my PowerPC Linux VM: cc1: warnings being treated as errors dload.c:45: error: 'get_filename' defined but not used make[3]: *** [dload.lo] Error 1 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 40ea6cd607d5edb2699c084259b237d435313670 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 23:57:19 2011 -0500 Depend on name_hash being set This is a fairly valid assumption at this point, or at least as good of one as assuming packages all have names. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9d3d647f0031edd31fc7442f9d2cd9729718e41c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 23:32:19 2011 -0500 pactest: improve speed of local DB dependent rules We were doing some really silly stuff before and abusing the os.walk() call, having to walk the entire local database for every single PKG rule. We really only need top level directories, and we can cache any generated package since calls to db_read() are well-defined and only happen in one place. This speeds up the running of tests that may want to add 100 PKG_VERSION rules at once, where before we had to limit how many we used in order to not put a serious cramp in the speed of the test suite run. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f38660be12c898e6ddef0d09b973d259d80c763 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 19:55:44 2011 -0500 Add reason to corrupted package callback Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9d09c9fdf7f6156e81c28045e36970158f26d2f1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 19:42:52 2011 -0500 Attempt to fix up some of the brokenness around failed package loads This is a bit of a mess, due to the fact that we have a progress meter running. It is also ironic that we are in the midst of a method named "commit" when we haven't done a damn thing yet, and can still fail hard if either a checksum or signature is invalid or unrecognized. Adapt the former test_md5sum method to be invoked for any of the various failure types, which at least gives the user some indication of what packages are failing. A second patch will be needed to actually show worthwhile error codes, but this is going to involve modifying the actual data passed with the callback. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d16875db7461a05eee456b39e815893c7aefd96 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 19:01:26 2011 -0500 Update several translation strings * Fix typos/capitalization * Make sure large blocks of text are translated in one unit Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 10 +- lib/libalpm/alpm.h | 3 + lib/libalpm/be_package.c | 2 +- lib/libalpm/conflict.c | 34 +- lib/libalpm/deps.c | 3 +- lib/libalpm/dload.c | 6 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 3 +- lib/libalpm/po/ca.po | 60 +-- lib/libalpm/po/cs.po | 61 +-- lib/libalpm/po/da.po | 48 +- lib/libalpm/po/de.po | 60 +-- lib/libalpm/po/el.po | 60 +-- lib/libalpm/po/en_GB.po | 60 +-- lib/libalpm/po/es.po | 62 +-- lib/libalpm/po/fi.po | 55 +-- lib/libalpm/po/fr.po | 59 +-- lib/libalpm/po/hu.po | 59 +-- lib/libalpm/po/it.po | 61 +-- lib/libalpm/po/kk.po | 58 +-- lib/libalpm/po/libalpm.pot | 6 +- lib/libalpm/po/nb.po | 59 +-- lib/libalpm/po/pl.po | 59 +-- lib/libalpm/po/pt.po | 59 +-- lib/libalpm/po/pt_BR.po | 61 +-- lib/libalpm/po/ro.po | 64 +-- lib/libalpm/po/ru.po | 61 +-- lib/libalpm/po/sk.po | 60 +-- lib/libalpm/po/sr.po | 59 +-- lib/libalpm/po/sr(a)latin.po | 59 +-- lib/libalpm/po/sv.po | 44 +- lib/libalpm/po/tr.po | 60 +-- lib/libalpm/po/uk.po | 44 +- lib/libalpm/po/zh_CN.po | 61 +-- lib/libalpm/sync.c | 61 ++- lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 20 +- scripts/pacman-key.sh.in | 10 +- scripts/po/ca.po | 378 ++++----------- scripts/po/cs.po | 383 +++++----------- scripts/po/da.po | 366 ++++----------- scripts/po/de.po | 372 ++++----------- scripts/po/el.po | 387 +++++----------- scripts/po/en_GB.po | 493 ++++++++------------ scripts/po/es.po | 384 ++++----------- scripts/po/fi.po | 382 ++++----------- scripts/po/fr.po | 386 ++++------------ scripts/po/hu.po | 380 ++++------------ scripts/po/it.po | 379 ++++----------- scripts/po/kk.po | 374 ++++----------- scripts/po/nb.po | 386 +++++----------- scripts/po/pacman-scripts.pot | 50 +-- scripts/po/pl.po | 381 +++++----------- scripts/po/pt.po | 383 ++++------------ scripts/po/pt_BR.po | 385 ++++------------ scripts/po/ro.po | 372 ++++----------- scripts/po/ru.po | 385 ++++------------ scripts/po/sk.po | 388 +++++----------- scripts/po/sr.po | 382 +++++----------- scripts/po/sr(a)latin.po | 383 +++++----------- scripts/po/sv.po | 362 ++++----------- scripts/po/tr.po | 379 ++++----------- scripts/po/uk.po | 350 ++++----------- scripts/po/zh_CN.po | 388 +++++----------- scripts/repo-add.sh.in | 2 +- src/pacman/callback.c | 31 +- src/pacman/po/ca.po | 98 ++--- src/pacman/po/cs.po | 99 ++--- src/pacman/po/da.po | 91 ++-- src/pacman/po/de.po | 125 +++--- src/pacman/po/el.po | 97 ++-- src/pacman/po/en_GB.po | 122 +++--- src/pacman/po/es.po | 100 ++--- src/pacman/po/fi.po | 96 ++-- src/pacman/po/fr.po | 99 ++--- src/pacman/po/hu.po | 97 ++--- src/pacman/po/it.po | 98 ++--- src/pacman/po/kk.po | 96 ++--- src/pacman/po/nb.po | 96 ++-- src/pacman/po/pacman.pot | 6 +- src/pacman/po/pl.po | 97 ++--- src/pacman/po/pt.po | 98 ++-- src/pacman/po/pt_BR.po | 102 ++--- src/pacman/po/ro.po | 100 ++--- src/pacman/po/ru.po | 100 ++--- src/pacman/po/sk.po | 96 ++-- src/pacman/po/sr.po | 97 ++-- src/pacman/po/sr(a)latin.po | 96 ++-- src/pacman/po/sv.po | 87 ++-- src/pacman/po/tr.po | 98 ++--- src/pacman/po/uk.po | 87 ++-- src/pacman/po/zh_CN.po | 97 ++--- src/pacman/sync.c | 4 +- test/pacman/pmdb.py | 26 +- test/pacman/tests/replace101.py | 9 +- test/pacman/tests/replace102.py | 38 +- test/pacman/tests/{replace102.py => replace110.py} | 0 97 files changed, 4523 insertions(+), 9315 deletions(-) copy test/pacman/tests/{replace102.py => replace110.py} (100%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-13-g4885a7f
by dan＠archlinux.org 09 Aug '11

09 Aug '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, maint has been updated via 4885a7fa3a54e9a81831916c7925b2996b695f50 (commit) from 67445334e71eaf6138561eee8e5561733a59fc69 (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 4885a7fa3a54e9a81831916c7925b2996b695f50 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 18:18:09 2011 -0500 Fix divide by zero when downloading zero length files If someone did a 'touch bogusrepo.db', we had the potential to throw a SIGFPE or divide by zero, given that the total file size was 0 and getting passed up to the pacman callback. Fix this so we get weird but sane output and don't blow up when downloading: :: Synchronizing package databases... core 35.7K 306.7K/s 00:00:00 [###################] 100% bogusrepo 0.0K 0.0K/s 00:00:00 [###################] 100% Exception as seen in gdb: Program received signal SIGFPE, Arithmetic exception. 0x000000000040cc73 in cb_dl_progress (filename=0x619dfc "bogusrepo.db", file_xfered=0, file_total=0) at callback.c:584 584 file_percent = (file_xfered * 100) / file_total; Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/callback.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Parse conflicts/provides/replaces at database load time
by Dan McGee 09 Aug '11

09 Aug '11

We did this with depends way back in commit c244cfecf654d3 in 2007. We can do it with these fields as well. Of note is the inclusion of provides even though only '=' is supported- we'll parse other things, but no guarantees are given as to behavior, which is more or less similar to before since we only looked for the equals sign. Also of note is the non-inclusion of optdepends; this will likely be resolved down the road. The biggest benefactors of this change will be the resolving code that formerly had to parse and reparse several of these fields; it only happens once now at load time. This does lead to the disadvantage that we will now always be parsing this information up front even if we never need it in the split form, but as these are uncommon fields and our parser is quite efficient it shouldn't be a big concern. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This sets up the code to make looking at versioned specs in replaces a lot more efficient and easier, especially in the face of switching things around so they still work when the package isn't removed from the repositories. It does introduce an API type change on elements in a few of the lists, but since we've totally changed everything this release anyway, I didn't feel like this was a bad thing. All of the inline alpm.h docs have been updated. -Dan lib/libalpm/alpm.h | 12 ++++++------ lib/libalpm/be_local.c | 31 +++++++++++++++++++------------ lib/libalpm/be_package.c | 9 ++++++--- lib/libalpm/be_sync.c | 19 ++++++++++--------- lib/libalpm/conflict.c | 21 ++++++++++----------- lib/libalpm/db.c | 3 ++- lib/libalpm/deps.c | 30 ++++++++++++------------------ lib/libalpm/package.c | 22 ++++++++++++++++------ lib/libalpm/sync.c | 7 ++----- src/pacman/package.c | 34 +++++++++++++++++++++------------- src/pacman/sync.c | 7 ++++--- 11 files changed, 108 insertions(+), 87 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 32db687..4948cdf 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -155,7 +155,7 @@ typedef struct _alpm_conflict_t { unsigned long package2_hash; char *package1; char *package2; - char *reason; + alpm_depend_t *reason; } alpm_conflict_t; /** File conflict */ @@ -663,15 +663,15 @@ alpm_list_t *alpm_pkg_get_depends(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_get_optdepends(alpm_pkg_t *pkg); -/** Returns the list of package names conflicting with pkg. +/** Returns the list of packages conflicting with pkg. * @param pkg a pointer to package - * @return a reference to an internal list of strings. + * @return a reference to an internal list of alpm_depend_t structures. */ alpm_list_t *alpm_pkg_get_conflicts(alpm_pkg_t *pkg); -/** Returns the list of package names provided by pkg. +/** Returns the list of packages provided by pkg. * @param pkg a pointer to package - * @return a reference to an internal list of strings. + * @return a reference to an internal list of alpm_depend_t structures. */ alpm_list_t *alpm_pkg_get_provides(alpm_pkg_t *pkg); @@ -683,7 +683,7 @@ alpm_list_t *alpm_pkg_get_deltas(alpm_pkg_t *pkg); /** Returns the list of packages to be replaced by pkg. * @param pkg a pointer to package - * @return a reference to an internal list of strings. + * @return a reference to an internal list of alpm_depend_t structures. */ alpm_list_t *alpm_pkg_get_replaces(alpm_pkg_t *pkg); diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5d136c9..b1d9aee 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -516,6 +516,12 @@ static char *get_pkgpath(alpm_db_t *db, alpm_pkg_t *info) f = alpm_list_add(f, linedup); \ } while(1) /* note the while(1) and not (0) */ +#define READ_AND_SPLITDEP(f) do { \ + if(fgets(line, sizeof(line), fp) == NULL && !feof(fp)) goto error; \ + if(_alpm_strip_newline(line) == 0) break; \ + f = alpm_list_add(f, _alpm_splitdep(line)); \ +} while(1) /* note the while(1) and not (0) */ + static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) { FILE *fp = NULL; @@ -608,20 +614,15 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) /* also store this value to isize */ info->isize = info->size; } else if(strcmp(line, "%REPLACES%") == 0) { - READ_AND_STORE_ALL(info->replaces); + READ_AND_SPLITDEP(info->replaces); } else if(strcmp(line, "%DEPENDS%") == 0) { - /* Different than the rest because of the _alpm_splitdep call. */ - while(1) { - READ_NEXT(); - if(strlen(line) == 0) break; - info->depends = alpm_list_add(info->depends, _alpm_splitdep(line)); - } + READ_AND_SPLITDEP(info->depends); } else if(strcmp(line, "%OPTDEPENDS%") == 0) { READ_AND_STORE_ALL(info->optdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { - READ_AND_STORE_ALL(info->conflicts); + READ_AND_SPLITDEP(info->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { - READ_AND_STORE_ALL(info->provides); + READ_AND_SPLITDEP(info->provides); } } fclose(fp); @@ -778,7 +779,9 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq if(info->replaces) { fputs("%REPLACES%\n", fp); for(lp = info->replaces; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); + char *depstring = alpm_dep_compute_string(lp->data); + fprintf(fp, "%s\n", depstring); + free(depstring); } fprintf(fp, "\n"); } @@ -837,14 +840,18 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq if(info->conflicts) { fputs("%CONFLICTS%\n", fp); for(lp = info->conflicts; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); + char *depstring = alpm_dep_compute_string(lp->data); + fprintf(fp, "%s\n", depstring); + free(depstring); } fprintf(fp, "\n"); } if(info->provides) { fputs("%PROVIDES%\n", fp); for(lp = info->provides; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); + char *depstring = alpm_dep_compute_string(lp->data); + fprintf(fp, "%s\n", depstring); + free(depstring); } fprintf(fp, "\n"); } diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 41b1eb2..8a3f7a5 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -194,11 +194,14 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * } else if(strcmp(key, "optdepend") == 0) { newpkg->optdepends = alpm_list_add(newpkg->optdepends, strdup(ptr)); } else if(strcmp(key, "conflict") == 0) { - newpkg->conflicts = alpm_list_add(newpkg->conflicts, strdup(ptr)); + alpm_depend_t *conflict = _alpm_splitdep(ptr); + newpkg->conflicts = alpm_list_add(newpkg->conflicts, conflict); } else if(strcmp(key, "replaces") == 0) { - newpkg->replaces = alpm_list_add(newpkg->replaces, strdup(ptr)); + alpm_depend_t *replace = _alpm_splitdep(ptr); + newpkg->replaces = alpm_list_add(newpkg->replaces, replace); } else if(strcmp(key, "provides") == 0) { - newpkg->provides = alpm_list_add(newpkg->provides, strdup(ptr)); + alpm_depend_t *provide = _alpm_splitdep(ptr); + newpkg->provides = alpm_list_add(newpkg->provides, provide); } else if(strcmp(key, "backup") == 0) { alpm_backup_t *backup; CALLOC(backup, 1, sizeof(alpm_backup_t), return -1); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d4c71a8..bdaa7c0 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -460,6 +460,12 @@ static int sync_db_populate(alpm_db_t *db) f = alpm_list_add(f, linedup); \ } while(1) /* note the while(1) and not (0) */ +#define READ_AND_SPLITDEP(f) do { \ + if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) goto error; \ + if(_alpm_strip_newline(buf.line) == 0) break; \ + f = alpm_list_add(f, _alpm_splitdep(line)); \ +} while(1) /* note the while(1) and not (0) */ + static int sync_db_read(alpm_db_t *db, struct archive *archive, struct archive_entry *entry, alpm_pkg_t **likely_pkg) { @@ -548,20 +554,15 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%PGPSIG%") == 0) { READ_AND_STORE(pkg->base64_sig); } else if(strcmp(line, "%REPLACES%") == 0) { - READ_AND_STORE_ALL(pkg->replaces); + READ_AND_SPLITDEP(pkg->replaces); } else if(strcmp(line, "%DEPENDS%") == 0) { - /* Different than the rest because of the _alpm_splitdep call. */ - while(1) { - READ_NEXT(); - if(strlen(line) == 0) break; - pkg->depends = alpm_list_add(pkg->depends, _alpm_splitdep(line)); - } + READ_AND_SPLITDEP(pkg->depends); } else if(strcmp(line, "%OPTDEPENDS%") == 0) { READ_AND_STORE_ALL(pkg->optdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { - READ_AND_STORE_ALL(pkg->conflicts); + READ_AND_SPLITDEP(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { - READ_AND_STORE_ALL(pkg->provides); + READ_AND_SPLITDEP(pkg->provides); } else if(strcmp(line, "%DELTAS%") == 0) { /* Different than the rest because of the _alpm_delta_parse call. */ while(1) { diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 91e6b67..fe18209 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -42,7 +42,7 @@ #include "deps.h" static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, - const char *reason) + alpm_depend_t *reason) { alpm_conflict_t *conflict; @@ -52,7 +52,7 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, conflict->package2_hash = pkg2->name_hash; STRDUP(conflict->package1, pkg1->name, return NULL); STRDUP(conflict->package2, pkg2->name, return NULL); - STRDUP(conflict->reason, reason, return NULL); + conflict->reason = reason; return conflict; } @@ -61,7 +61,6 @@ void _alpm_conflict_free(alpm_conflict_t *conflict) { FREE(conflict->package2); FREE(conflict->package1); - FREE(conflict->reason); FREE(conflict); } @@ -74,7 +73,7 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) newconflict->package2_hash = conflict->package2_hash; STRDUP(newconflict->package1, conflict->package1, return NULL); STRDUP(newconflict->package2, conflict->package2, return NULL); - STRDUP(newconflict->reason, conflict->reason, return NULL); + newconflict->reason = conflict->reason; return newconflict; } @@ -103,16 +102,18 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) * @param reason reason for this conflict */ static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps, - alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, const char *reason) + alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, alpm_depend_t *reason) { alpm_conflict_t *conflict = conflict_new(pkg1, pkg2, reason); if(!conflict) { return -1; } - _alpm_log(handle, ALPM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n", - pkg1->name, pkg2->name, reason); if(!conflict_isin(conflict, *baddeps)) { + char *conflict_str = alpm_dep_compute_string(reason); *baddeps = alpm_list_add(*baddeps, conflict); + _alpm_log(handle, ALPM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n", + pkg1->name, pkg2->name, conflict_str); + free(conflict_str); } else { _alpm_conflict_free(conflict); } @@ -144,9 +145,8 @@ static void check_conflict(alpm_handle_t *handle, alpm_list_t *j; for(j = alpm_pkg_get_conflicts(pkg1); j; j = j->next) { - const char *conflict = j->data; + alpm_depend_t *conflict = j->data; alpm_list_t *k; - alpm_depend_t *parsed_conflict = _alpm_splitdep(conflict); for(k = list2; k; k = k->next) { alpm_pkg_t *pkg2 = k->data; @@ -157,7 +157,7 @@ static void check_conflict(alpm_handle_t *handle, continue; } - if(_alpm_depcmp(pkg2, parsed_conflict)) { + if(_alpm_depcmp(pkg2, conflict)) { if(order >= 0) { add_conflict(handle, baddeps, pkg1, pkg2, conflict); } else { @@ -165,7 +165,6 @@ static void check_conflict(alpm_handle_t *handle, } } } - _alpm_dep_free(parsed_conflict); } } } diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9e8e75b..5765ab2 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -437,7 +437,8 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) if(!matched) { /* check provides */ for(k = alpm_pkg_get_provides(pkg); k; k = k->next) { - if(regexec(&reg, k->data, 0, 0, 0) == 0) { + alpm_depend_t *provide = k->data; + if(regexec(&reg, provide->name, 0, 0, 0) == 0) { matched = k->data; break; } diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index aef66d2..c284edf 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -383,25 +383,19 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep) } } - /* check provisions, format : "name=version" */ + /* check provisions, name and version if available */ for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) { - const char *provision = i->data; - const char *provver = strchr(provision, '='); - - if(provver == NULL) { /* no provision version */ - satisfy = (dep->mod == ALPM_DEP_MOD_ANY - && strcmp(provision, dep->name) == 0); - } else { - /* This is a bit tricker than the old code for performance reasons. To - * prevent the need to copy and duplicate strings, strncmp only the name - * portion if they are the same length, since there is a version and - * operator in play here. Cast is to silence sign conversion warning; - * we know provver >= provision if we are here. */ - size_t namelen = (size_t)(provver - provision); - provver += 1; - satisfy = (strlen(dep->name) == namelen - && strncmp(provision, dep->name, namelen) == 0 - && dep_vercmp(provver, dep->mod, dep->version)); + alpm_depend_t *provision = i->data; + + if(dep->mod == ALPM_DEP_MOD_ANY) { + /* any version will satisfy the requirement */ + satisfy = (provision->name_hash == dep->name_hash + && strcmp(provision->name, dep->name) == 0); + } else if (provision->mod == ALPM_DEP_MOD_EQ) { + /* provision specifies a version, so try it out */ + satisfy = (provision->name_hash == dep->name_hash + && strcmp(provision->name, dep->name) == 0 + && dep_vercmp(provision->version, dep->mod, dep->version)); } } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 947f62e..741c0de 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -483,7 +483,9 @@ alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) newpkg->reason = pkg->reason; newpkg->licenses = alpm_list_strdup(pkg->licenses); - newpkg->replaces = alpm_list_strdup(pkg->replaces); + for(i = pkg->replaces; i; i = alpm_list_next(i)) { + newpkg->replaces = alpm_list_add(newpkg->replaces, _alpm_dep_dup(i->data)); + } newpkg->groups = alpm_list_strdup(pkg->groups); if(pkg->files.count) { size_t filenum; @@ -504,8 +506,12 @@ alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) newpkg->depends = alpm_list_add(newpkg->depends, _alpm_dep_dup(i->data)); } newpkg->optdepends = alpm_list_strdup(pkg->optdepends); - newpkg->conflicts = alpm_list_strdup(pkg->conflicts); - newpkg->provides = alpm_list_strdup(pkg->provides); + for(i = pkg->conflicts; i; i = alpm_list_next(i)) { + newpkg->conflicts = alpm_list_add(newpkg->conflicts, _alpm_dep_dup(i->data)); + } + for(i = pkg->provides; i; i = alpm_list_next(i)) { + newpkg->provides = alpm_list_add(newpkg->provides, _alpm_dep_dup(i->data)); + } for(i = pkg->deltas; i; i = alpm_list_next(i)) { newpkg->deltas = alpm_list_add(newpkg->deltas, _alpm_delta_dup(i->data)); } @@ -543,8 +549,10 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) FREE(pkg->md5sum); FREE(pkg->base64_sig); FREE(pkg->arch); + FREELIST(pkg->licenses); - FREELIST(pkg->replaces); + alpm_list_free_inner(pkg->replaces, (alpm_list_fn_free)_alpm_dep_free); + alpm_list_free(pkg->replaces); FREELIST(pkg->groups); if(pkg->files.count) { size_t i; @@ -558,8 +566,10 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) alpm_list_free_inner(pkg->depends, (alpm_list_fn_free)_alpm_dep_free); alpm_list_free(pkg->depends); FREELIST(pkg->optdepends); - FREELIST(pkg->conflicts); - FREELIST(pkg->provides); + alpm_list_free_inner(pkg->conflicts, (alpm_list_fn_free)_alpm_dep_free); + alpm_list_free(pkg->conflicts); + alpm_list_free_inner(pkg->provides, (alpm_list_fn_free)_alpm_dep_free); + alpm_list_free(pkg->provides); alpm_list_free_inner(pkg->deltas, (alpm_list_fn_free)_alpm_delta_free); alpm_list_free(pkg->deltas); alpm_list_free(pkg->delta_path); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 878971e..84656f7 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -150,14 +150,11 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { spkg = k->data; for(l = alpm_pkg_get_replaces(spkg); l; l = l->next) { - const char *replace = l->data; - alpm_depend_t *parsed_replace = _alpm_splitdep(replace); - if(_alpm_depcmp(lpkg, parsed_replace)) { + alpm_depend_t *replace = l->data; + if(_alpm_depcmp(lpkg, replace)) { found = 1; - _alpm_dep_free(parsed_replace); break; } - _alpm_dep_free(parsed_replace); } if(found) { /* check IgnorePkg/IgnoreGroup */ diff --git a/src/pacman/package.c b/src/pacman/package.c index 45afded..55c764e 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -37,6 +37,22 @@ #define CLBUF_SIZE 4096 +/** Turn a depends list into a text list. + * @param deps a list with items of type alpm_depend_t + * @return a string list, must be freed + */ +static void deplist_display(const char *title, + alpm_list_t *deps) +{ + alpm_list_t *i, *text = NULL; + for(i = deps; i; i = alpm_list_next(i)) { + alpm_depend_t *dep = alpm_list_getdata(i); + text = alpm_list_add(text, alpm_dep_compute_string(dep)); + } + list_display(title, text); + FREELIST(text); +} + /** * Display the details of a package. * Extra information entails 'required by' info for sync packages and backup @@ -52,8 +68,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) char bdatestr[50] = "", idatestr[50] = ""; const char *label; double size; - const alpm_list_t *i; - alpm_list_t *requiredby = NULL, *depstrings = NULL; + alpm_list_t *requiredby = NULL; if(pkg == NULL) { return; @@ -81,12 +96,6 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) break; } - /* turn depends list into a text list */ - for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { - alpm_depend_t *dep = (alpm_depend_t *)alpm_list_getdata(i); - depstrings = alpm_list_add(depstrings, alpm_dep_compute_string(dep)); - } - if(extra || from == PKG_FROM_LOCALDB) { /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); @@ -102,14 +111,14 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) string_display(_("URL :"), alpm_pkg_get_url(pkg)); list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg)); list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); - list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); - list_display(_("Depends On :"), depstrings); + deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg)); + deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); list_display_linebreak(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg)); if(extra || from == PKG_FROM_LOCALDB) { list_display(_("Required By :"), requiredby); } - list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); - list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); + deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); + deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); size = humanize_size(alpm_pkg_get_size(pkg), 'K', 1, &label); if(from == PKG_FROM_SYNCDB) { @@ -157,7 +166,6 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) /* final newline to separate packages */ printf("\n"); - FREELIST(depstrings); FREELIST(requiredby); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f4f8fc4..259d3ef 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -779,13 +779,14 @@ int sync_prepare_execute(void) for(i = data; i; i = alpm_list_next(i)) { alpm_conflict_t *conflict = alpm_list_getdata(i); /* only print reason if it contains new information */ - if(strcmp(conflict->package1, conflict->reason) == 0 || - strcmp(conflict->package2, conflict->reason) == 0) { + if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { printf(_(":: %s and %s are in conflict\n"), conflict->package1, conflict->package2); } else { + char *reason = alpm_dep_compute_string(conflict->reason); printf(_(":: %s and %s are in conflict (%s)\n"), - conflict->package1, conflict->package2, conflict->reason); + conflict->package1, conflict->package2, reason); + free(reason); } } break; -- 1.7.6

1 0

[pacman-dev] [PATCH] Parse replaces strings as dep strings with version specs
by Dan McGee 09 Aug '11

09 Aug '11

This is done extremely crudely and is not very efficient, but it does push us down the path of being closer to right, as one additional test now passes. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 27 +++++++++++++++++---------- test/pacman/tests/replace101.py | 2 -- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e860591..878971e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -85,20 +85,16 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn /** Search for packages to upgrade and add them to the transaction. */ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j; alpm_trans_t *trans; - alpm_db_t *db_local; - alpm_list_t *dbs_sync; CHECK_HANDLE(handle, return -1); trans = handle->trans; - db_local = handle->db_local; - dbs_sync = handle->dbs_sync; ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(handle, ALPM_ERR_TRANS_NOT_INITIALIZED, -1)); _alpm_log(handle, ALPM_LOG_DEBUG, "checking for package upgrades\n"); - for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { + for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { alpm_pkg_t *lpkg = i->data; if(_alpm_pkg_find(trans->add, lpkg->name)) { @@ -108,7 +104,7 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) /* Search for literal then replacers in each sync database. * If found, don't check other databases */ - for(j = dbs_sync; j; j = j->next) { + for(j = handle->dbs_sync; j; j = j->next) { alpm_db_t *sdb = j->data; /* Check sdb */ alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); @@ -150,10 +146,20 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) } else { /* 2. search for replacers in sdb */ int found = 0; + alpm_list_t *k, *l; for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { spkg = k->data; - if(alpm_list_find_str(alpm_pkg_get_replaces(spkg), lpkg->name)) { - found = 1; + for(l = alpm_pkg_get_replaces(spkg); l; l = l->next) { + const char *replace = l->data; + alpm_depend_t *parsed_replace = _alpm_splitdep(replace); + if(_alpm_depcmp(lpkg, parsed_replace)) { + found = 1; + _alpm_dep_free(parsed_replace); + break; + } + _alpm_dep_free(parsed_replace); + } + if(found) { /* check IgnorePkg/IgnoreGroup */ if(_alpm_pkg_should_ignore(handle, spkg) || _alpm_pkg_should_ignore(handle, lpkg)) { @@ -197,7 +203,8 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) } } if(found) { - break; /* jump to next local package */ + /* jump to next local package */ + break; } } } diff --git a/test/pacman/tests/replace101.py b/test/pacman/tests/replace101.py index ee0f860..00d2b6b 100644 --- a/test/pacman/tests/replace101.py +++ b/test/pacman/tests/replace101.py @@ -16,5 +16,3 @@ self.addrule("!PKG_EXIST=python-yaml") self.addrule("PKG_VERSION=python2-yaml|5-1") self.addrule("FILE_EXIST=lib/python2/file") - -self.expectfailure = True -- 1.7.6

1 0

[pacman-dev] [PATCH] Add a slightly simpler versioned replace test
by Dan McGee 09 Aug '11

09 Aug '11

It turns out we have a few problems here which are best tackled independently. The first is simply parsing replacements as dep strings; the second will be dealing with replaces when the original package name still exists in the repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Note the commit diffstat looks a bit weird (as does the diff); I just wanted to have two very similar tests numbered next to each other so I moved the next one up to the next block of 10. 101 and 102 are almost the same; the only difference is the to be replaced package is still in the repos in 102 (albeit a newer version). -Dan test/pacman/tests/replace101.py | 7 +------ test/pacman/tests/{replace101.py => replace102.py} | 2 +- test/pacman/tests/{replace102.py => replace110.py} | 0 3 files changed, 2 insertions(+), 7 deletions(-) copy test/pacman/tests/{replace101.py => replace102.py} (88%) rename test/pacman/tests/{replace102.py => replace110.py} (100%) diff --git a/test/pacman/tests/replace101.py b/test/pacman/tests/replace101.py index 86c40ac..ee0f860 100644 --- a/test/pacman/tests/replace101.py +++ b/test/pacman/tests/replace101.py @@ -1,4 +1,4 @@ -self.description = "Sysupgrade with a versioned replacement" +self.description = "Sysupgrade with a versioned replacement, original disappears" sp1 = pmpkg("python2-yaml", "5-1") sp1.replaces = ["python-yaml<5"] @@ -6,11 +6,6 @@ sp1.files = ["lib/python2/file"] self.addpkg2db("sync", sp1) -# the python3 version -sp2 = pmpkg("python-yaml", "5-1") -sp2.files = ["lib/python3/file"] -self.addpkg2db("sync", sp2) - lp1 = pmpkg("python-yaml", "4-1") lp1.files = ["lib/python2/file"] self.addpkg2db("local", lp1) diff --git a/test/pacman/tests/replace101.py b/test/pacman/tests/replace102.py similarity index 88% copy from test/pacman/tests/replace101.py copy to test/pacman/tests/replace102.py index 86c40ac..ca05d4e 100644 --- a/test/pacman/tests/replace101.py +++ b/test/pacman/tests/replace102.py @@ -1,4 +1,4 @@ -self.description = "Sysupgrade with a versioned replacement" +self.description = "Sysupgrade with a versioned replacement, original stays" sp1 = pmpkg("python2-yaml", "5-1") sp1.replaces = ["python-yaml<5"] diff --git a/test/pacman/tests/replace102.py b/test/pacman/tests/replace110.py similarity index 100% rename from test/pacman/tests/replace102.py rename to test/pacman/tests/replace110.py -- 1.7.6

1 0

[pacman-dev] [PATCH] Conflict comparison performance enhancements
by Dan McGee 09 Aug '11

09 Aug '11

* Add *_hash fields to conflict struct and populate them * Remove unnecessary backwards string comparisons Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 2 ++ lib/libalpm/conflict.c | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8a95f26..32db687 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -151,6 +151,8 @@ typedef struct _alpm_depmissing_t { /** Conflict */ typedef struct _alpm_conflict_t { + unsigned long package1_hash; + unsigned long package2_hash; char *package1; char *package2; char *reason; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 538c4c7..91e6b67 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -41,15 +41,17 @@ #include "log.h" #include "deps.h" -static alpm_conflict_t *conflict_new(const char *package1, const char *package2, +static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, const char *reason) { alpm_conflict_t *conflict; MALLOC(conflict, sizeof(alpm_conflict_t), return NULL); - STRDUP(conflict->package1, package1, return NULL); - STRDUP(conflict->package2, package2, return NULL); + conflict->package1_hash = pkg1->name_hash; + conflict->package2_hash = pkg2->name_hash; + STRDUP(conflict->package1, pkg1->name, return NULL); + STRDUP(conflict->package2, pkg2->name, return NULL); STRDUP(conflict->reason, reason, return NULL); return conflict; @@ -68,6 +70,8 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) alpm_conflict_t *newconflict; CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL); + newconflict->package1_hash = conflict->package1_hash; + newconflict->package2_hash = conflict->package2_hash; STRDUP(newconflict->package1, conflict->package1, return NULL); STRDUP(newconflict->package2, conflict->package2, return NULL); STRDUP(newconflict->reason, conflict->reason, return NULL); @@ -78,15 +82,12 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) { alpm_list_t *i; - const char *npkg1 = needle->package1; - const char *npkg2 = needle->package2; - for(i = haystack; i; i = i->next) { alpm_conflict_t *conflict = i->data; - const char *cpkg1 = conflict->package1; - const char *cpkg2 = conflict->package2; - if((strcmp(cpkg1, npkg1) == 0 && strcmp(cpkg2, npkg2) == 0) - || (strcmp(cpkg1, npkg2) == 0 && strcmp(cpkg2, npkg1) == 0)) { + if(needle->package1_hash == conflict->package1_hash + && needle->package2_hash == conflict->package2_hash + && strcmp(needle->package1, conflict->package1) == 0 + && strcmp(needle->package2, conflict->package2) == 0) { return 1; } } @@ -102,14 +103,14 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) * @param reason reason for this conflict */ static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps, - const char *pkg1, const char *pkg2, const char *reason) + alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, const char *reason) { alpm_conflict_t *conflict = conflict_new(pkg1, pkg2, reason); if(!conflict) { return -1; } _alpm_log(handle, ALPM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n", - pkg1, pkg2, reason); + pkg1->name, pkg2->name, reason); if(!conflict_isin(conflict, *baddeps)) { *baddeps = alpm_list_add(*baddeps, conflict); } else { @@ -140,7 +141,6 @@ static void check_conflict(alpm_handle_t *handle, } for(i = list1; i; i = i->next) { alpm_pkg_t *pkg1 = i->data; - const char *pkg1name = alpm_pkg_get_name(pkg1); alpm_list_t *j; for(j = alpm_pkg_get_conflicts(pkg1); j; j = j->next) { @@ -150,18 +150,18 @@ static void check_conflict(alpm_handle_t *handle, for(k = list2; k; k = k->next) { alpm_pkg_t *pkg2 = k->data; - const char *pkg2name = alpm_pkg_get_name(pkg2); - if(strcmp(pkg1name, pkg2name) == 0) { + if(pkg1->name_hash == pkg2->name_hash + && strcmp(pkg1->name, pkg2->name) == 0) { /* skip the package we're currently processing */ continue; } if(_alpm_depcmp(pkg2, parsed_conflict)) { if(order >= 0) { - add_conflict(handle, baddeps, pkg1name, pkg2name, conflict); + add_conflict(handle, baddeps, pkg1, pkg2, conflict); } else { - add_conflict(handle, baddeps, pkg2name, pkg1name, conflict); + add_conflict(handle, baddeps, pkg2, pkg1, conflict); } } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Don't walk off front of string when stripping newline
by Dan McGee 09 Aug '11

09 Aug '11

If the string was zero-length to begin with, or consists of only newline characters, nothing stopped us from incrementing right off the front of the string. Ensure len stays above zero the whole time. 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 bd0526c..adb1d19 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -219,7 +219,7 @@ size_t _alpm_strip_newline(char *str) return 0; } len = strlen(str); - while(str[len - 1] == '\n') { + while(len > 0 && str[len - 1] == '\n') { len--; } str[len] = '\0'; -- 1.7.6

1 0

[pacman-dev] [PATCH] Fix compile error when curl is not used
by Dan McGee 09 Aug '11

09 Aug '11

Noticed in my PowerPC Linux VM: cc1: warnings being treated as errors dload.c:45: error: 'get_filename' defined but not used make[3]: *** [dload.lo] Error 1 Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index dc4f91e..ac47e94 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -42,6 +42,9 @@ #include "util.h" #include "handle.h" +#ifdef HAVE_LIBCURL +static double prevprogress; /* last download amount */ + static const char *get_filename(const char *url) { char *filename = strrchr(url, '/'); @@ -51,9 +54,6 @@ static const char *get_filename(const char *url) return filename; } -#ifdef HAVE_LIBCURL -static double prevprogress; /* last download amount */ - static char *get_fullpath(const char *path, const char *filename, const char *suffix) { -- 1.7.6

1 0