Fix distcheck invocation in doc/ directory

Commit 5fe41df8 broke `make distcheck` pretty badly for the doc directory.
Looking at what this commit was trying to accomplish, it make sense to
revert a lot of the build system changes and just simplify what we are
showing in the man page anyway- an example, not exactly how it is configured
on your system.

Signed-off-by: Dan McGee <dan@archlinux.org>

.gitattributes

@@ -0,0 +1 @@
+*.py  diff=python

.mailmap

@@ -0,0 +1,28 @@
+Aaron Griffin <aaron@archlinux.org> <aaronmgriffin@gmail.com>
+Allan McRae <allan@archlinux.org> <mcrae_allan@hotmail.com>
+Allan McRae <allan@archlinux.org> <mcrae_allan at hotmail.com>
+Allan McRae <allan@archlinux.org> <allan.mcrae@qimr.edu.au>
+Andres P <aepd87@gmail.com> <stderr@mail.com>
+Bryan Ischo <bryan@ischo.com> <bji-keyword-pacman.3644cb@www.ischo.com>
+Christos Nouskas <nous@archlinux.us> <nouskas@gmail.com>
+Daenyth Blank <daenyth+arch@gmail.com> <Daenyth+Arch@gmail.com>
+Daenyth Blank <Daenyth+Arch@gmail.com> <Daenyth+git@gmail.com>
+甘露(Gan Lu) <rhythm.gan@gmail.com>
+Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com>
+Jaroslaw Swierczynski <swiergot@gmail.com> <swiergot@juvepoland.com>
+Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
+Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> <jotapesan@gmail.com>
+Manuel Tortosa <manutortosa@chakra-project.org> <manutortosa@gmail.com>
+Marc - A. Dahlhaus <mad@wol.de>
+Matthias Gorissen <matthias@archlinux.de> <siquame@web.de>
+Laszlo Papp <djszapi@archlinux.us> <djszapi2@gmail.com>
+Nagy Gabor <ngaba@bibl.u-szeged.hu> <ngaba@petra.hos.u-szeged.hu>
+Nagy Gabor <ngaba@bibl.u-szeged.hu> <ngaba at bibl.u-szeged.hu>
+Nezmer <git@nezmer.info> <Nezmer@allurelinux.org>
+Roman Kyrylych <roman@archlinux.org> <roman.kyrylych@gmail.com>
+Sebastian Nowicki <sebnow@gmail.com> <xilonmu@gmail.com>
+Vojtěch Gondžala <vojtech.gondzala@gmail.com> <vogo@seznam.cz>
+Vojtěch Gondžala <vojtech.gondzala@gmail.com> Vojtech Gondzala <vojtech.gondzala@gmail.com>
+Xavier Chantry <shiningxc@gmail.com>
+Xavier Chantry <shiningxc@gmail.com> <chantry.xavier@gmail.com>
+Xavier Chantry <shiningxc@gmail.com> <xav@chantry.homelinux.org>

AUTHORS

@@ -11,6 +11,6 @@ James Rosten <seinfeld90@gmail.com>
 Roman Kyrylych <Roman.Kyrylych@gmail.com>
 Andrew Fyfe <andrew@neptune-one.net>
 Chantry Xavier <shiningxc@gmail.com>
-Nagy Gabor <ngaba@petra.hos.u-szeged.hu>
+Nagy Gabor <ngaba@bibl.u-szeged.hu>
 Nathan Jones <nathanj@insightbb.com>
 Allan McRae <mcrae_allan@hotmail.com>

HACKING

@@ -12,10 +12,10 @@ Coding style
 1.  All code should be indented with tabs. (Ignore the use of only spaces in
     this file) By default, source files contain the following VIM modeline:
 +
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /* vim: set ts=2 sw=2 noet: */
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 2.  When opening new blocks such as 'while', 'if', or 'for', leave the opening
     brace on the same line as the beginning of the codeblock. The closing brace
@@ -24,8 +24,8 @@ code~~~~~~~~~~
     braces, even if it's just a one-line block. This reduces future error when
     blocks are expanded beyond one line.
 +
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 for(lp = list; lp; lp = lp->next) {
   newlist = _alpm_list_add(newlist, strdup(lp->data));
 }
@@ -40,14 +40,14 @@ while(it) {
   free(it);
   it = ptr;
 }
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 3.  When declaring a new function, put the opening and closing braces on their
     own line. Also, when declaring a pointer, do not put a space between the
     asterisk and the variable name.
 +
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
 {
   alpm_list_t *ptr, *lp;
@@ -58,7 +58,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
   }
   ...
 }
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 4.  Comments should be ANSI-C89 compliant. That means no `// Comment` style;
     use only `/* Comment */` style.
@@ -101,37 +101,50 @@ Currently our #include usage is in messy shape, but this is no reason to
 continue down this messy path. When adding an include to a file, follow this
 general pattern, including blank lines:
 
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #include "config.h"
 
 #include <standardheader.h>
 #include <another.h>
 #include <...>
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Follow this with some more headers, depending on whether the file is in libalpm
 or pacman proper. For libalpm:
 
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /* libalpm */
 #include "yourfile.h"
 #include "alpm_list.h"
 #include "anythingelse.h"
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For pacman:
 
-[C]
-code~~~~~~~~~~
+[code,C]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #include <alpm.h>
 #include <alpm_list.h>
 
 /* pacman */
 #include "yourfile.h"
 #include "anythingelse.h"
-code~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GDB and Valgrind Usage
+~~~~~~~~~~~~~~~~~~~~~~
+
+When using GDB or valgrind on pacman, you will want to run it on the actual
+binary rather than the shell script wrapper produced by libtool. The actual
+binary lives at `src/pacman/.libs/lt-pacman`, and will exist after running
+`./src/pacman/pacman` at least once.
+
+For example, to run valgrind:
+
+    ./src/pacman/pacman
+    valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu
 
 /////
 vim: set ts=2 sw=2 syntax=asciidoc et:

INSTALL

@@ -10,10 +10,19 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 
+You will need to build and install two libraries before you can
+properly build pacman.
+
+libarchive
+http://code.google.com/p/libarchive/
+
+libfetch
+ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/net/libfetch/README.html
+
 Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions are generic. Run `./configure --help` for specific
+options.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses

Makefile.am

@@ -1,22 +1,27 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib
+SUBDIRS = lib/libalpm src/util src/pacman scripts etc po test/pacman test/util contrib
 if WANT_DOC
 SUBDIRS += doc
 endif
 
+# Make sure we test and build manpages when doing distcheck
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version
+
 # Some files automatically included, so they aren't specified below:
 #   AUTHORS, COPYING, NEWS, README
 EXTRA_DIST = HACKING
 
 # Sample makepkg prototype files
 pkgdatadir = ${datadir}/${PACKAGE}
-dist_pkgdata_DATA = PKGBUILD.proto proto.install ChangeLog.proto
+dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto
 
-# run the pactest test suite
-check-local:  src/pacman
-	$(PYTHON) $(top_srcdir)/pactest/pactest.py --debug=1 \
-		--test $(top_srcdir)/pactest/tests/*.py \
+# run the pactest test suite and vercmp tests
+check-local: test/pacman test/util src/pacman src/util
+	$(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \
+		--test $(top_srcdir)/test/pacman/tests/*.py \
 		-p $(top_builddir)/src/pacman/pacman
 	rm -rf $(top_builddir)/root
+	$(SH) $(top_srcdir)/test/util/vercmptest.sh \
+		$(top_builddir)/src/util/vercmp
 
 # create the pacman DB and cache directories upon install
 install-data-local:

NEWS

@@ -1,5 +1,219 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.4.0         - new "Architecture" option that will restrict pacman to
+                installing only packages from the given architecture. Can be
+                set to "auto" in which case the output of "uname -m" is used
+              - use "$arch" when specifying a mirror url to automatically
+                select the correct architecture
+              - Installing packages with -U can handle installing
+                dependencies, conflict resolution and replacing packages
+                (FS#3492, FS#5798)
+              - can upgrade the system and install a new package using 
+                "pacman -Syu <pkg>" (FS#15581)
+              - new -D/--database operation for modifying package install
+                reasons (FS#12950)
+              - new --print and --print-format options to output information
+                in suitable format for wrapper scripts (FS#14208)
+              - only extract new entries when updating a repo database
+              - show "Required by" in -Sii output (FS#16244)
+              - -U and -R options always ask for confirmation
+              - allow -Qo to perform a functional 'which' (FS#8798)
+              - cache cleaning cleans all directories, not just first
+              - cleanupdelta: new utility to help remove unused deltas from
+                a repo database 
+              - bash completion: rewrite for size and performance (FS#16630)
+              - repo-add: handle removing the final package from a repo
+              - rankmirrors: rewrite using bash
+              - vercmp: does not link to libalpm to prevent upgrade issues
+              - makepkg:
+                - automatically aborts on any errors during packaging
+                - changelogs are now included via the "changelog" variable
+                - override pkgver, pkgrel and arch in split packages (FS#15955)
+                - repackaging without a package() function is deprecated
+                - stricter syntax checking for backup and optdepends entries
+                - file stripping options are configurable
+                - New --pkg flag to allow building specific package(s) from
+                  split PKGBUILDs (FS#15956)
+                - build() function is now optional (FS#15147)
+                - warn about reference to build root in a package (FS#14751)
+                - configure source package destination with SRCPKGDEST
+                - major internal refactoring of handling tests ("[" to "[[")
+              - contrib/pactree: print reverse dependency tree
+3.3.3         - correctly check the return code from opendir()
+              - fix possible infinite loop in alpm_list_remove()
+              - makepkg:
+                - quote arrays to preserve spaces in arrays (FS#16871)
+                - allow passing arguments with spaces
+                - adjust preselected option for clearing cache
+              - translations:
+                - zh_CN: fix positional parameter usage in makepkg (FS#16983)
+                - el: fix Y/N response translation (FS#16568)
+3.3.2         - fix infinite filesize download issue (FS#16359)
+              - fix bogus download size on TotalDownload
+              - documentation updates
+              - small translation updates
+              - repo-add: use size of target files and not symlinks
+              - repo-remove: create empty DB when all packages are removed
+3.3.1         - use full path to ldconfig when calling in chroot
+              - optimize the check for modified databases during sync
+              - ensure installed libfetch is new enough
+              - have -Q ops return 1 when no package matches (FS#15938)
+              - skip SyncFirst dialog if unnecessary (FS#15810)
+              - misc documentation updates (FS#15870, FS#15984)
+              - testdb: be less verbose during checks
+              - existing translation updates
+              - two new translations: Norwegian, Swedish
+              - makepkg:
+                - add --skipinteg option (FS#15830)
+                - fix .PKGINFO creation with -R option (FS#15851)
+                - always keep symlinks to sources when unpacking
+3.3.0         - xdelta: many fixes and improvements
+                - new pkgdelta script to create deltas
+                - repo-add can add both deltas and packages to a database
+              - xz archive format supported for packages and databases
+              - in case of unresolvable packages, pacman now asks
+                if they should be skipped instead of aborting
+              - -Suu synchronizes all packages with the version from the
+                repository (including upgrade and downgrade)
+              - replace libdownload dependency by the original libfetch
+              - better support of -q/--quiet flag with -Qo and -Ql
+              - -Sp works without root (FS#8905)
+              - fix a bug where the replacement of a package failed because
+                of a file conflict, and the package was lost (FS#9088)
+              - improved behavior of HoldPkg option (FS#9173)
+              - allow to ignore a package from a group (FS#12059)
+              - search package groups when searching a db (FS#13099)
+              - asciidoc fixes
+              - documentation updates
+              - repo-add: cleanups, improvements and speedup
+              - makepkg:
+                - package splitting support! - see PKGBUILD-split.proto
+                - limit fakeroot usage with addition of package() function
+                - info is handled like man pages and not other documentation
+                - configuration option for man/info page directories
+                - added ability to automatically remove files from package
+                - configuration option for default LDFLAGS
+                - specify alternative configuration file with --config flag
+                - check all integrity checksums provided in PKGBUILD
+                - fix pkgver/pkgrel updating in SCM packages
+                - BUILDSCRIPT option removed from makepkg.conf. Now specified
+                  during configure
+                - enforce no ">" or "<" in provides array
+                - package compression autodetection
+                - check PKGBUILD for CRLF line endings
+                - fix reading PKGBUILD from pipe
+                - increase compatibility with BSDs & Mac OSX
+              - contrib
+                - pacdiff - improvements and new -l flag for using locate
+                - pacscripts - print install scripts for a package
+3.2.2         - log pacsave warnings to pacman.log (FS#12531)
+              - separate local DB creation and writing (FS#12263)
+              - pacman-optimize: rewrite and refresh (FS#11767)
+              - repo-add: use openssl instead of md5sum
+              - simplify doc building process for ease of development
+              - ensure correct handling of syscall interruptions
+              - readd missing newline on -Qi/-Si output (FS#11331)
+              - fix TotalDownload regression (FS#11339)
+              - makepkg:
+                - replace getopt with an internal function
+                - detect incorrect usage of provides (FS#12540)
+                - fix bash substitution to work in older versions
+                - fix updating PKGBUILD and simplify logic for SCM packages
+                - save/restore shell options before/after build() (FS#12344)
+              - documentation updates and asciidoc build fix
+              - existing translation updates
+3.2.1         - drop special handling of file:// URLs
+              - display optdepends on install and upgrade
+              - fix segfault on x86_64 when using UseSyslog (FS#11096)
+              - fix detection of TotalDownload (FS#11180)
+              - fix "No such file" error during --force installs (FS#11218)
+              - better handling of progressbar when behind a proxy (FS#8725)
+              - repo-add: fix whitespace handling (FS#9171, FS#10630)
+              - repo-add: add optdepends to the sync DB (FS#10630)
+              - makepkg:
+                - allow specifying a download filename (related to FS#11292)
+                - fix download functions with weird URLs (FS#11076)
+                - fix creation of source package with local files (FS#11149)
+                - fix error when sourcing profile scripts (FS#11179)
+                - perform case-insensitive checksum comparison (FS#11283)
+              - documentation and help updates (including fix for FS#11203)
+              - new Ukrainian translation
+              - existing translation updates
+3.2.0         - removed -A/--add option from pacman frontend
+              - added --asexplicit option
+              - new remove option --unneeded
+              - add -Rss option to remove all dependencies
+              - removed useless -e/--dependsonly option
+              - config options are now case sensitive
+              - added CleanMethod option for variety in cache cleaning
+              - new Turkish translation, all others updated and revised
+              - handle multiple groups in -Ss and -Qs operations
+              - allow -q/--quiet option with -o/--own and -g/--groups options
+              - removed hack for packages with unknown installed size
+              - add SyncFirst option to pacman.conf
+              - support installation of versioned deps : pacman -S "dep>=2.0"
+              - add --enable-git-version configure flag to identify
+                developmental build version
+              - do not duplicate packages in required by list
+              - pacman.static is no longer built
+              - all error messages use pm_fprintf
+              - disable geteuid in cygwin
+              - use off_t type for large file support
+              - add vercmp test script
+              - moved gensync and updatesync to contrib/
+              - rewrote pacsearch script in perl
+              - paclist script to list installed packages from a repo
+              - bacman script to make backup of package from filesystem
+              - combined repo-add and repo-remove into one script
+              - removed --force option from repo-add
+              - add --quiet option to repo-add/repo-remove
+              - update libtool version to 1.5.26
+              - allow disabling of internal download with new configure
+                flag --disable-internal-download
+              - pactest can now check file permissions
+              - add the possibility to mark the pactests known to fail,
+                which allows more informative results of make check
+              - libalpm-specific changes:
+                - use dynamic string allocation in package structure
+                - new functions for manipulating pmdepend_t objects
+                - store replaces and force in local database
+                - moved deptest functionality to backend
+                - add alpm_checkdbconflicts function
+                - fix PM_ERR_CONFLICTING_DEPS handling
+                - cleanup of pmsyncpkg_t
+                - add alpm_sync_newversion function
+                - cleanup of alpm_list code
+                - refactor of download code
+                - download callback API changes
+                - removed test_delta_md5sum and test_pkg_md5sum functions
+                - add _alpm_archive_fgets function to read line-by-line from
+                  an archive
+                - read .PKGINFO directly from package file with no temp file
+                - native support for both libdownload and libfetch
+                - rework delta algorithm (we still need script updates)
+                - swap parameters of alpm_pkg_find for consistency with
+                  other find functions
+                - swap parameters of PM_TRANS_CONV_INSTALL_IGNOREPKG to make
+                  more sense
+                - fix -Rs when removing multiple items in dependency chain
+              - makepkg-specific changes:
+                - support for resuming source downloads
+                - added zipman option
+                - removed -b/--builddeps
+                - various portability fixes for BSD and Mac OS X
+                - check for valid options in PKGBUILD
+                - add --allsource option
+                - remove deprecated --usesudo option
+                - handle spaces in build directory
+                - made keeping docs the default option
+                - use pacman version dep resolving
+                - fix regression in library stripping
+                - make strip paths configurable
+              - MANY other bug fixes and small improvements
+3.1.4         - various small code cleanups and fixes
+              - small documentation updates
+              - improvements to PKGBUILD.vim
+              - translation updates - ru, zh_CN
 3.1.3         - major updates to i18n output in frontend (all UTF-8 characters
                 should now work with varying byte and char widths)
               - new Simplified Chinese translation

PKGBUILD-split.proto

@@ -0,0 +1,63 @@
+# This is an example of a PKGBUILD for splitting packages. Use this as a
+# start to creating your own, and remove these comments. For more information,
+# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package!
+# If it is unknown, then please put 'unknown'.
+
+# Maintainer: Your Name <youremail@domain.com>
+pkgname=('pkg1' 'pkg2')
+pkgbase=BASE
+pkgver=VERSION
+pkgrel=1
+pkgdesc=""
+arch=()
+url=""
+license=('GPL')
+groups=()
+depends=()
+makedepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=($pkgbase-$pkgver.tar.gz)
+noextract=()
+md5sums=() #generate with 'makepkg -g'
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package_pkg1() {
+  # options and directives that can be overridden
+  pkgver=
+  pkgrel=
+  pkgdesc=""
+  arch=()
+  license=()
+  groups=()
+  depends=()
+  optdepends=()
+  provides=()
+  conflicts=()
+  replaces=()
+  backup=()
+  options=()
+  install=
+  changelog=
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir/" install-pkg1
+}
+
+package_pkg2() {
+  # options and directives overrides
+  pkgdesc=""
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir/" install-pkg2
+}

PKGBUILD.proto

@@ -3,7 +3,7 @@
 # NOTE: Please fill out the license field for your package! If it is unknown,
 # then please put 'unknown'.
 
-# Contributor: Your Name <youremail@domain.com>
+# Maintainer: Your Name <youremail@domain.com>
 pkgname=NAME
 pkgver=VERSION
 pkgrel=1
@@ -14,12 +14,14 @@ license=('GPL')
 groups=()
 depends=()
 makedepends=()
+optdepends=()
 provides=()
 conflicts=()
 replaces=()
 backup=()
 options=()
 install=
+changelog=
 source=($pkgname-$pkgver.tar.gz)
 noextract=()
 md5sums=() #generate with 'makepkg -g'
@@ -28,8 +30,13 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir" install
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et:

README

@@ -2,7 +2,7 @@ ALPM library overview & internals
 =================================
 
 Here is a list of the main objects and files from the ALPM (i.e. Arch Linux
-Package Management) library. This document, whilst not exhaustive, also
+Package Management) library. This document, while not exhaustive, also
 indicates some limitations (on purpose, or sometimes due to its poor design) of
 the library at the present time.
 
@@ -13,9 +13,8 @@ the frontend. Lots of structures are of an opaque type and their fields are
 only accessible in read-only mode, through some clearly defined functions.
 
 In addition to "alpm.h", the interfaces of "alpm_list.h" have also been made
-available to the frontend. It is not a requirement for the frontend to use
-these list functions; however, it prevents frontends from having to reimplement
-a list data structure.
+available to the frontend, for allowing it to manipulate the lists returned by
+the backend.
 
 Several structures and functions have been renamed compared to pacman 2.9 code.
 This was done at first for the sake of naming scheme consistency, and then
@@ -25,7 +24,7 @@ same name declared in both spaces. To avoid such conflicts, internal function
 names have been prepended with "_alpm_".
 
 In a general manner, public library functions are named "alpm_<type>_<action>"
-(examples: alpm_trans_commit(), alpm_release(), alpm_pkg_getinfo(), ...).
+(examples: alpm_trans_commit(), alpm_release(), alpm_pkg_get_name(), ...).
 Internal (and thus private) functions should be named "_alpm_XXX" for instance
 (examples: _alpm_needbackup(), _alpm_runscriplet(), ...). Functions defined and
 used inside a single file should be defined as "static".
@@ -33,59 +32,60 @@ used inside a single file should be defined as "static".
 
 [Initialization]
 
-alpm_init() is used to initialize library internals and to create
+alpm_initialize() is used to initialize library internals and to create
 a transparent handle object. Before its call, the library can't be used.
 
-alpm_lib_release() just does the opposite (memory used by the library, and the
-handle is freed).  After its call, the library is no longer available.
+alpm_release() just does the opposite (memory used by the library, and the
+handle is freed). After its call, the library is no longer available.
 
 
 [Options]
 
-In the future, the library will not use any configuration file.  It will be up
-to the front end to The handle holds a
-number of configuration options instead (IGNOREPKG, SYSLOG usage,
-log file name, registered databases, ...).
+The library does not use any configuration file. It is up to the front end to
+configure the library as needed; the handle holds a number of configuration
+options instead.
 
 All of the following options have a alpm_option_get_* and alpm_option_set_*
-function for getting and setting the value.  The cannot be set before the
+function for getting and setting the value. They cannot be set before the
 library is initialized.
 
 * logcb: The callback function for "log" operations.
-* dlcb: The callback function for download progress.
-* logmask: The logging mask for which level of output is sent to the logcb.
-* root: The root directory on which pacman operates (Default: /)
-* dbpath: The base path to pacman's databases (Default: var/lib/pacman)
-* cachedir: The base path to pacman's download cache (Default: var/cache/pacman)
-* logfile: The base path to pacman's log file (Default: var/log/pacman.log)
+* dlcb: The callback function for download progress of each package.
+* fetchcb: Callback for custom download function.
+* totaldlcb: The callback function for overall download progress.
+* root: The root directory for pacman to install to (Default: /)
+* dbpath: The toplevel database directory (Default: /var/lib/pacman)
+* logfile: The base path to pacman's log file (Default: /var/log/pacman.log)
 * usesyslog: Log to syslog instead of `logfile` for file-base logging.
-* xfercommand: The command to use for downloading instead of pacman's internal
-             downloading functionality.
-* nopassiveftp: Do not use passive FTP commands for ftp connections.
-* chomp: No way, easter eggs are secret!
-* usecolor: Unimplemented, but for the future. You can assume what it means.
 
-The following options also have a `alpm_option_add_*` function, as the values
-are list structures (NOTE: The add functions are NOT plural, as they're in
-english: alpm_option_get_noupgrades -> alpm_option_add_noupgrade).
+The following options also have `alpm_option_{add,remove}_*` functions, as the
+values are list structures.
+NOTE: The add and remove functions are NOT plural, as they are in English:
+alpm_option_{get,set}_noupgrades -> alpm_option_{add,remove}_noupgrade.
 
+* cachedirs: Paths to pacman's download caches (Default: /var/cache/pacman/pkg)
 * noupgrades: Files which will never be touched by pacman (extracted as .pacnew)
 * noextracts: Files which will never be extracted at all (no .pacnew file)
 * ignorepkgs: Packages to ignore when upgrading.
-* holdpkgs: Packages which must be upgraded before continuing.
+* ignoregrps: Groups to ignore when upgrading.
 
 The following options are read-only, having ONLY alpm_option_get_* functions:
 
+* lockfile: The file used for locking the database
+  (Default: <dbpath>/db.lck)
 * localdb: A pmdb_t structure for the local (installed) database
 * syncdbs: A list of pmdb_t structures to which pacman can sync from.
 
+The following options are write-only, having ONLY alpm_option_set_* functions:
+
+* usedelta: Download delta files instead of complete packages if possible.
 
 [Transactions]
 
-The transaction sturcture permits easy manipulations of several packages
+The transaction structure permits easy manipulations of several packages
 at a time (i.e. adding, upgrade and removal operations).
 
-A transaction can be initiated with a type (ADD, UPGRADE or REMOVE),
+A transaction can be initiated with a type (SYNC, UPGRADE or REMOVE),
 and some flags (NODEPS, FORCE, CASCADE, ...).
 
 Note: there can only be one type at a time: a transaction is either
@@ -105,7 +105,7 @@ These targets represent the list of packages to be handled.
 
 Then, a transaction needs to be prepared (alpm_trans_prepare()). It
 means that the various targets added, will be inspected and challenged
-against the set of already installed packages (dependency checkings,
+against the set of already installed packages (dependency checking, etc...)
 
 Last, a callback is associated with each transaction. During the
 transaction resolution, each time a new step is started or done (i.e
@@ -116,27 +116,27 @@ the resolution. Can be useful to implement a progress bar.
 
 [Package Cache]
 
-libalpm maintains two caches for each DB.  One is a general package cache, the
-other is a group cache (for package groups).  These caches are loaded on demand,
-and freed when the libary is.
-It is important to note tha, as a general rule, package structures should NOT be
-freed manually, as they SHOULD be part of the cache.
-The cache of a database is always updated by the library after
-an operation changing the database content (adding and/or removal of
-packages). Beware frontends ;)
+libalpm maintains two caches for each DB. One is a general package cache, the
+other is a group cache (for package groups). These caches are loaded on demand,
+and freed when the library is.
+
+It is important to note that, as a general rule, package structures should NOT
+be freed manually, as they SHOULD be part of the cache.  The cache of a
+database is always updated by the library after an operation changing the
+database content (adding and/or removal of packages).  Beware frontends ;)
 
 
 [Package]
 
-The package structure maintains all information for a package.  In general,
-packages should never be freed from front-ends, as they should always be part of
-the package cache.
+The package structure maintains all information for a package. In general,
+packages should never be freed from front-ends, as they should always be part
+of the package cache.
 
-The 'origin' data member indicates whether the package is from a file
-(i.e. -U operations) or from the package cache.  In the case of a file, all data
-members available are present in the structure.  Packages indicated as being
-from the cache have data members filled on demand.  For this reason, the
-alpm_pkg_get_* functions will load the data from the DB as needed.
+The 'origin' data member indicates whether the package is from a file (i.e. -U
+operations) or from the package cache. In the case of a file, all data members
+available are present in the structure. Packages indicated as being from the
+cache have data members filled on demand. For this reason, the alpm_pkg_get_*
+functions will load the data from the DB as needed.
 
 
 [Errors]
@@ -149,13 +149,15 @@ indicating success, -1 indicating a failure.
 If -1 is returned, the variable pm_errno is set to a meaningful value
 Wise frontends should always care for these returned values.
 
-Note: the helper function alpm_strerror() can also be used to translate
-the error code into a more friendly sentence.
+Note: the helper function alpm_strerror() can also be used to translate one
+specified error code into a more friendly sentence, and alpm_strerrorlast()
+does the same for the last error encountered (represented by pm_errno).
 
 
 [List - alpm_list_t] 
+
 The alpm_list_t structure is a doubly-linked list for use with the libalpm
-routines.  This type is provided publicly so that frontends are free to use it
+routines. This type is provided publicly so that frontends are free to use it
 if they have no native list type (C++, glib, python, etc all have list types).
 See the proper man pages for alpm_list_t references.
 
@@ -179,41 +181,150 @@ perform a special action.
 
 [MAIN] (see pacman.c)
 
-Calls for alpm_lib_init(), and alpm_lib_release().
+Calls for alpm_initialize(), and alpm_release().
 Read the configuration file, and parse command line arguments.
 Based on the action requested, it initiates the appropriate transactions
-(see pacman_add(), pacman_remove(), pacman_sync() in files add.c,
+(see pacman_upgrade(), pacman_remove(), pacman_sync() in files upgrade.c,
 remove.c and sync.c).
 
 
-[CONFIGURATION] (see conf.c)
+[CONFIGURATION] (see conf.h)
 
-The frontend is using a configuration file, usually "/etc/pacman.conf".
-Part of these options are only useful for the frontend only (mainly,
-the download stuffs, and some options like HOLDPKG).
-The rest is used to configure the library.
+The frontend is using a configuration file, usually "/etc/pacman.conf".  Some
+of these options are only useful for the frontend only (mainly the ones used to
+control the output like showsize or totaldownload, or the behavior with
+cleanmethod and syncfirst).  The rest is used to configure the library.
 
 
-[ADD/UPGRADE/REMOVE/SYNC]
-
-Nothing new here, excepted some reorganization.
+[UPGRADE/REMOVE/SYNC]
 
 The file pacman.c has been divided into several smaller files, namely
-add.c, remove.c, sync.c and query.c, to hold the big parts: pacman_add,
+upgrade.c, remove.c, sync.c and query.c, to hold the big parts: pacman_upgrade,
 pacman_remove, pacman_sync.
 
 These 3 functions have been split to ease the code reading.
 
 
-LIMITATIONS/BEHAVIOR CHANGES COMPARED TO PACMAN 2.9
-===================================================
 
-Excepted missing features still needing to be implemented, one can
-notice the following limitations:
+API CHANGES BETWEEN 3.1 AND 3.2
+===============================
 
-- If pacman is out of date, the frontend displays a warning and recommends
-to give up the on-going transanction. The frontend does not allow to
-upgrade pacman itself on-the-fly, and thus it should be restarted with
-only "pacman" as a target.
+[REMOVED]
+- alpm_db_whatprovides()
+- alpm_splitdep (no longer public)
+- trans->targets was removed, so alpm_trans_get_targets() as well
+- error codes:
+    PM_ERR_OPT_*, PM_ERR_PKG_INSTALLED, PM_ERR_DLT_CORRUPTED,
+    PM_ERR_LIBARCHIVE_ERROR
+- event: PM_TRANS_EVT_EXTRACT_DONE
+- PM_TRANS_TYPE_ADD pmtranstype_t (add transaction)
+- PM_TRANS_FLAG_DEPENDSONLY pmtransflag_t
 
-- ...
+[CHANGED]
+- alpm_grp_get_pkgs returns with pmpkg_t list, not package-name list
+- Swap parameters on PM_TRANS_CONV_INSTALL_IGNOREPKG callback function
+- download callback API changed: alpm_cb_download, alpm_cb_totaldl split
+  (+ new alpm_option_get_totaldlcb(), alpm_option_set_totaldlcb() functions)
+- unsigned long->off_t changes where size is used
+- pmsyncpkg_t struct changes:
+  - pmsynctype_t and alpm_sync_get_type() were removed
+  - alpm_sync_get_data() was removed
+  - alpm_sync_get_removes() was added
+
+[ADDED]
+- alpm_delta_get_from_md5sum(), alpm_delta_get_to_md5sum()
+- alpm_miss_get_causingpkg() (new causingpkg field in pmdepmissing_t)
+- alpm_checkdbconflicts()
+- alpm_sync_newversion()
+- alpm_deptest()
+- error codes :
+    PM_ERR_DLT_INVALID, PM_ERR_LIBARCHIVE, PM_ERR_LIBDOWNLOAD and
+    PM_ERR_EXTERNAL_DOWNLOAD
+- flags:
+    PM_TRANS_FLAG_ALLEXPLICIT, PM_TRANS_FLAG_UNNEEDED and
+    PM_TRANS_FLAG_RECURSEALL
+
+
+API CHANGES BETWEEN 3.2 AND 3.3
+===============================
+
+[REMOVED]
+- pmsyncpkg_t struct (pmpkg_t is used for all types of transaction targets):
+  - alpm_sync_get_pkg()
+  - alpm_sync_get_removes() (use alpm_pkg_get_removes() instead)
+- HoldPkg handling (it is the front-end's task):
+  - alpm_option_get_holdpkgs()
+  - alpm_option_add_holdpkg()
+  - alpm_option_set_holdpkgs()
+  - alpm_option_remove_holdpkg()
+  - PM_TRANS_CONV_REMOVE_HOLDPKG conversation
+- Print URIs feature (it is the front-end's task):
+  - flag: PM_TRANS_FLAG_PRINTURIS
+  - event: PM_TRANS_EVT_PRINTURI
+- alpm_delta_get_from_md5sum() and alpm_delta_get_to_md5sum()
+- alpm_sync_sysupgrade()
+- error codes:
+    PM_ERR_TRANS_COMMITING, PM_ERR_TRANS_DOWNLOADING, PM_ERR_PKG_LOAD,
+    PM_ERR_PKG_CANT_FRESH, PM_ERR_GRP_NOT_FOUND, PM_ERR_USER_ABORT,
+    PM_ERR_INTERNAL_ERROR, PM_ERR_DB_SYNC, PM_ERR_PKG_HOLD and
+    PM_ERR_LIBDOWNLOAD
+
+[CHANGED]
+- XferCommand support was removed, any fetch callback function can be defined:
+  - alpm_option_get_xfercommand() and alpm_option_set_xfercommand() were removed
+  - alpm_option_get_fetchcb() and alpm_option_set_fetchcb() were added
+- function renames:
+  - alpm_db_getpkgcache() -> alpm_db_get_pkgcache()
+  - alpm_db_getgrpcache() -> alpm_db_get_grpcache()
+  - alpm_dep_get_string() -> alpm_dep_compute_string()
+  - alpm_get_md5sum() -> alpm_compute_md5sum()
+  - alpm_checkdbconflicts() -> alpm_checkconflicts()
+- alpm_trans_sysupgrade() has a new enable_downgrade parameter
+- alpm_checkdeps() and alpm_checkconflicts() require local package list instead
+  of local database
+- the to-be-upgraded package is passed to the callback function with
+  PM_TRANS_EVT_UPGRADE_START (as the second parameter)
+- the "requiredby" package is never passed to the callback function with
+  PM_TRANS_CONV_INSTALL_IGNOREPKG (the second parameter is always NULL)
+
+[ADDED]
+- alpm_pkg_get_db()
+- alpm_pkg_get_removes()
+- conversation: PM_TRANS_CONV_REMOVE_PKGS (remove unresolvable targets)
+- flag: PM_TRANS_FLAG_NOLOCK (do not lock database)
+- error codes:
+    PM_ERR_SERVER_NONE, PM_ERR_TRANS_NOT_LOCKED, PM_ERR_PKG_IGNORED and
+    PM_ERR_LIBFETCH
+
+
+API CHANGES BETWEEN 3.3 AND 3.4
+===============================
+
+[REMOVED]
+- pmtranstype_t struct (transaction type), alpm_trans_get_type()
+- alpm_option_get_nopassiveftp(), alpm_option_set_nopassiveftp()
+
+[CHANGED]
+- interface for target loading:
+  - alpm_trans_addtarget() and alpm_trans_sysupgrade() were removed
+  - alpm_sync_target() and alpm_sync_dbtarget() can be used to add a sync target
+  - alpm_sync_sysupgrade() can be used to add outdated packages (for sysupgrade)
+  - alpm_add_target() can be used to add an add/upgrade target
+  - alpm_remove_target() can be used to add a remove target
+- interface for target listing:
+  - alpm_trans_get_pkgs() was removed
+  - alpm_pkg_get_removes() was removed
+  - alpm_trans_get_add() can be used to list add/upgrade/sync targets
+  - alpm_trans_get_remove() can be used to list to-be-removed packages
+- the type parameter of alpm_trans_init() was removed
+- the type of alpm_db_fetch callback function: mtimeold and mtimenew parameters
+  were replaced by force parameter
+- unsigned short -> int changes for Boolean variables
+
+[ADDED]
+- alpm_db_set_pkgreason()
+- alpm_option_get_arch(), alpm_option_set_arch()
+- alpm_option_get_usedelta()
+- alpm_pkg_unused_deltas()
+- alpm_conflict_get_reason()
+- error code: PM_ERR_PKG_INVALID_ARCH

TRANSLATORS

@@ -10,33 +10,52 @@ If your language is not listed here and you wish it was, let the pacman mailing
 list know you are interested in making a translation. We will be happy to add
 your language to the mix.
 
+Catalan (ca):
+	Manuel Tortosa <manutortosa@chakra-project.org>
 Czech (cs):
 	Vojtěch Gondžala <vojtech.gondzala@gmail.com>
 German (de):
 	Matthias Gorissen <matthias@archlinux.de>
-	Benjamin Andresen <benny@in-ulm.de>
+Greek (el):
+	Christos Nouskas <nouskas@gmail.com>
 British English (en_GB):
 	Jeff Bailes <thepizzaking@gmail.com>
 Spanish (es):
+	Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
 	Fernando Lagos <fernando@zerial.org>
-	Juan Pablo Gonzalez <jotapesan@gmail.com>
 French (fr):
 	Chantry Xavier <shiningxc@gmail.com>
 Hungarian (hu):
 	Nagy Gabor <ngaba@bibl.u-szeged.hu>
+	Avramucz Péter <muczyjoe@gmail.com>
 Italian (it):
-	Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
+	Giovanni Scafora <giovanni@archlinux.org>
+Kazakh (kk):
+	Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Norwegian (nb):
+	Hans-Kristian Arntzen <maister@archlinux.us>
 Polish (pl):
 	Mateusz Herych <heniekk@gmail.com>
 	Jaroslaw Swierczynski <swiergot@gmail.com>
 	Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
-	<none>
+	Armando M. Baratti <ambaratti@archlinux-br.org>
+	Rodrigo Flores <flores@archlinux-br.org>
+	Marcelo Cavalcante <kalibslack@gmail.com>
+Romanian (ro):
+	Volodia Macovei <blog@volodia.ro>
 Russian (ru):
 	Sergey Tereschenko <serg.partizan@gmail.com>
 	Vitaly Dolgov <ferhiord@gmail.com>
 	Oleg Finkelshteyn <olegfink@gmail.com>
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
+Swedish (sv):
+	Christian Larsson <congacx@gmail.com>
+Turkish (tr):
+	Samed Beyribey <ras0ir@eventualis.org>
+	Alper KANAT <alperkanat@gmail.com>
+Ukrainian (uk):
+	Roman Kyrylych (Роман Кирилич) <roman.kyrylych@gmail.com>
+	Ivan Kovnatsky (Іван Ковнацький) <sevenfourk@gmail.com>
 Simplified Chinese (zh_CN):
 	甘露(Lu.Gan) <rhythm.gan@gmail.com>
-

acinclude.m4

@@ -3770,7 +3770,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -3794,7 +3794,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])

autoclean.sh

@@ -2,33 +2,36 @@
 
 [ -f Makefile ] && make distclean
 rm -rf autom4te.cache
-rm -rf {Makefile.in,Makefile}
-rm -rf {config.h.in,config.h}
-rm -rf config.status
-rm -rf configure
-rm -rf stamp*
-rm -rf aclocal.m4
-rm -rf compile
-rm -rf libtool
+rm -f {Makefile.in,Makefile}
+rm -f {config.h.in,config.h}
+rm -f config.status
+rm -f configure
+rm -f stamp*
+rm -f aclocal.m4
+rm -f compile
+rm -f libtool
 
-rm -rf lib/libalpm/{Makefile.in,Makefile}
-rm -rf src/util/{Makefile.in,Makefile}
-rm -rf src/pacman/{Makefile.in,Makefile}
-rm -rf scripts/{Makefile.in,Makefile}
-rm -rf etc/{Makefile.in,Makefile}
-rm -rf etc/pacman.d/{Makefile.in,Makefile}
-rm -rf etc/abs/{Makefile.in,Makefile}
-rm -rf pactest/{Makefile.in,Makefile}
-rm -rf doc/{Makefile.in,Makefile}
-rm -rf doc/html/*.html
-rm -rf doc/man3/*.3
+rm -f lib/libalpm/{Makefile.in,Makefile}
+rm -f src/util/{Makefile.in,Makefile}
+rm -f src/pacman/{Makefile.in,Makefile}
+rm -f scripts/{Makefile.in,Makefile}
+rm -f etc/{Makefile.in,Makefile}
+rm -f etc/pacman.d/{Makefile.in,Makefile}
+rm -f etc/abs/{Makefile.in,Makefile}
+rm -f test/pacman{,/tests}/{Makefile.in,Makefile}
+rm -f contrib/{Makefile.in,Makefile}
+rm -f doc/{Makefile.in,Makefile}
 
-rm -rf src/pacman/po/{Makefile.in,Makefile}
-rm -rf src/pacman/po/POTFILES
-rm -rf src/pacman/po/stamp-po
-rm -rf src/pacman/po/*.gmo
+rm -f test/pacman/*.pyc
+rm -f doc/html/*.html
+rm -f doc/man3/*.3
 
-rm -rf lib/libalpm/po/{Makefile.in,Makefile}
-rm -rf lib/libalpm/po/POTFILES
-rm -rf lib/libalpm/po/stamp-po
-rm -rf lib/libalpm/po/*.gmo
+rm -f po/{Makefile.in,Makefile}
+rm -f po/POTFILES
+rm -f po/stamp-po
+rm -f po/*.gmo
+
+rm -f lib/libalpm/po/{Makefile.in,Makefile}
+rm -f lib/libalpm/po/POTFILES
+rm -f lib/libalpm/po/stamp-po
+rm -f lib/libalpm/po/*.gmo

config.guess

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-05-17'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -532,7 +532,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -793,12 +793,15 @@ EOF
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

config.sub

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-04-29'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -475,8 +487,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -668,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -813,6 +833,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1021,6 +1049,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;

configure.ac

@@ -40,29 +40,19 @@ AC_PREREQ(2.60)
 #
 #   Bugfix releases:
 #     pacman_version_micro += 1
-#
-#   pacman_version_suffix should be similar to one of the following:
-#     For beta releases:          [beta2]
-#     For code under development: [devel]
-#     For production releases:    []
 
 m4_define([lib_current], [5])
 m4_define([lib_revision], [0])
-m4_define([lib_age], [3])
+m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
-m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [3])
-m4_define([pacman_version_suffix], [])
+m4_define([pacman_version_minor], [4])
+m4_define([pacman_version_micro], [0])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
-m4_define([pacman_display_version],
-					pacman_version[]m4_ifdef([pacman_version_suffix],[pacman_version_suffix]))
 
 # Autoconf initialization
-# AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
-AC_INIT([Pacman Package Manager], [pacman_display_version],
-        [pacman-dev@archlinux.org], [pacman])
+AC_INIT([pacman], [pacman_version], [pacman-dev@archlinux.org])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 
@@ -80,48 +70,54 @@ AC_DEFINE_UNQUOTED([LIB_VERSION], ["$LIB_VERSION"], [libalpm version number])
 
 # Help line for root directory
 AC_ARG_WITH(root-dir,
-	AC_HELP_STRING([--with-root-dir=path], [set the location of pacman's root operating directory]),
+	AS_HELP_STRING([--with-root-dir=path], [set the location of pacman's root operating directory]),
 	[ROOTDIR=$withval], [ROOTDIR=/])
 
 # Help line for package extension
 AC_ARG_WITH(pkg-ext,
-	AC_HELP_STRING([--with-pkg-ext=ext], [set the file extension used by packages]),
+	AS_HELP_STRING([--with-pkg-ext=ext], [set the file extension used by packages]),
 	[PKGEXT=$withval], [PKGEXT=.pkg.tar.gz])
 
 # Help line for source package directory
 AC_ARG_WITH(src-ext,
-	AC_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]),
+	AS_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]),
 	[SRCEXT=$withval], [SRCEXT=.src.tar.gz])
 
 # Help line for database extension
 AC_ARG_WITH(db-ext,
-	AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
+	AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
 	[DBEXT=$withval], [DBEXT=.db.tar.gz])
 
+# Help line for buildscript filename
+AC_ARG_WITH(buildscript,
+	AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]),
+	[BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD])
+
+# Help line for libfetch
+AC_ARG_ENABLE(internal-download,
+	AS_HELP_STRING([--disable-internal-download], [do not build with libfetch support]),
+	[internaldownload=$enableval], [internaldownload=yes])
+
 # Help line for documentation
 AC_ARG_ENABLE(doc,
-	AC_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]),
-	[wantdoc=$enableval], [wantdoc=yes])
+	AS_HELP_STRING([--enable-doc], [run make in doc/ dir]),
+	[wantdoc=$enableval], [wantdoc=no])
 
 # Help line for doxygen
 AC_ARG_ENABLE(doxygen,
-	AC_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]),
+	AS_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]),
 	[wantdoxygen=$enableval], [wantdoxygen=no])
 
-# Help line for asciidoc
-AC_ARG_ENABLE(asciidoc,
-	AC_HELP_STRING([--enable-asciidoc], [build your own manpages with Asciidoc]),
-	[wantasciidoc=$enableval], [wantasciidoc=no])
-
 # Help line for debug
 AC_ARG_ENABLE(debug,
-	AC_HELP_STRING([--enable-debug], [enable debugging support]),
+	AS_HELP_STRING([--enable-debug], [enable debugging support]),
 	[debug=$enableval], [debug=no])
 
-# Help line for pacman.static
-AC_ARG_ENABLE(pacman-static,
-	AC_HELP_STRING([--disable-pacman-static], [do not build static version of pacman]),
-	[pacmanstatic=$enableval], [pacmanstatic=yes])
+# Help line for using git version in pacman version string
+AC_ARG_ENABLE(git-version,
+	AS_HELP_STRING([--enable-git-version],
+		[enable use of git version in version string if available]),
+	[wantgitver=$enableval], [wantgitver=no])
 
 # Checks for programs.
 AC_PROG_AWK
@@ -129,22 +125,37 @@ AC_PROG_CC_C99
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 AC_PROG_LIBTOOL
-AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python], [false])
+AC_CHECK_PROGS([PYTHON], [python2.6 python2.5 python], [false])
 
 # find installed gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.13.1)
 
 # Check for libarchive
-AC_CHECK_LIB([archive], [archive_read_data], , AC_MSG_ERROR([libarchive is needed to compile pacman!]))
+AC_CHECK_LIB([archive], [archive_read_data], ,
+	AC_MSG_ERROR([libarchive is needed to compile pacman!]))
 
-# Check for libdownload
-AC_CHECK_LIB([download], [downloadParseURL], , AC_MSG_ERROR([libdownload is needed to compile pacman!]))
+# Enable or disable usage of libfetch
+AC_MSG_CHECKING(whether to link with libfetch)
+if test "x$internaldownload" = "xyes" ; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library])
+	# Check for a download library if it was actually requested
+	AC_CHECK_LIB([fetch], [fetchParseURL], ,
+		AC_MSG_ERROR([libfetch is needed to compile with internal download support]), [-lcrypto -ldl] )
+	# Check if libfetch supports conditional GET
+	# (version >=2.21, struct url has member last_modified)
+	AC_CHECK_MEMBER(struct url.last_modified, ,
+		AC_MSG_ERROR([libfetch must be version 2.21 or greater]),
+		[#include <fetch.h>] )
+else
+	AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(INTERNAL_DOWNLOAD, test "x$internaldownload" = "xyes")
 
 # Checks for header files.
-AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/statvfs.h sys/time.h syslog.h wchar.h])
+AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h sys/time.h syslog.h wchar.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -156,13 +167,13 @@ AC_STRUCT_TM
 AC_TYPE_UID_T
 
 # Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_FORK
 AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 AC_FUNC_MKTIME
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([realpath regcomp strcasecmp strdup strerror strnlen \
-								strndup strrchr strsep strstr strverscmp uname geteuid])
+AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \
+                strndup strrchr strsep swprintf \
+                wcwidth uname])
 
 # Enable large file support if available
 AC_SYS_LARGEFILE
@@ -172,13 +183,39 @@ GCC_VISIBILITY_CC
 # Check if we have -fgnu89-inline flag
 GCC_GNU89_INLINE_CC
 
-# Host-dependant flags
-case "${host}" in
-	*-*-cygwin*)
+# Host-dependant definitions
+SIZECMD="stat -L -c %s"
+SEDINPLACE="sed -i"
+STRIP_BINARIES="--strip-all"
+STRIP_SHARED="--strip-unneeded"
+STRIP_STATIC="--strip-debug"
+case "${host_os}" in
+	*bsd*)
+		SIZECMD="stat -L -f %z"
+		SEDINPLACE="sed -i ''"
+		;;
+	cygwin*)
+		host_os_cygwin=yes
 		CFLAGS="$CFLAGS -DCYGWIN"
 		;;
+	darwin*)
+		host_os_darwin=yes
+		SIZECMD="/usr/bin/stat -L -f %z"
+		SEDINPLACE="/usr/bin/sed -i ''"
+		STRIP_BINARIES=""
+		STRIP_SHARED="-S"
+		STRIP_STATIC="-S"
+		;;
 esac
 
+AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
+AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
+AC_SUBST(SIZECMD)
+AC_SUBST(SEDINPLACE)
+AC_SUBST(STRIP_BINARIES)
+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
@@ -224,20 +261,26 @@ AC_SUBST(CARCHFLAGS)
 AC_SUBST(CHOST)
 
 # Check for documentation support and status
+AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
 AC_MSG_CHECKING([for building documentation])
 if test "x$wantdoc" = "xyes" ; then
-	AC_MSG_RESULT([yes])
+	if test $ASCIIDOC ; then
+		AC_MSG_RESULT([yes, enabled by configure])
+	else
+		asciidoc="(warning : asciidoc not installed)"
+		AC_MSG_RESULT([yes $asciidoc])
+	fi
 	wantdoc=yes
 else
-	AC_MSG_RESULT([no, disabled by configure])
+	AC_MSG_RESULT([no])
 	wantdoc=no
 fi
 AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes")
 
 # Check for doxygen support and status
+AC_CHECK_PROGS([DOXYGEN], [doxygen])
 AC_MSG_CHECKING([for doxygen])
 if test "x$wantdoxygen" = "xyes" ; then
-	AC_CHECK_PROGS([DOXYGEN], [doxygen])
 	if test $DOXYGEN ; then
 		AC_MSG_RESULT([yes])
 		usedoxygen=yes
@@ -251,23 +294,6 @@ else
 fi
 AM_CONDITIONAL(USE_DOXYGEN, test "x$usedoxygen" = "xyes")
 
-# Check for asciidoc support and status
-AC_MSG_CHECKING([for asciidoc])
-if test "x$wantasciidoc" = "xyes" ; then
-	AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
-	if test $ASCIIDOC ; then
-		AC_MSG_RESULT([yes])
-		useasciidoc=yes
-	else
-		AC_MSG_RESULT([no, asciidoc missing])
-		useasciidoc=no
-	fi
-else
-	AC_MSG_RESULT([no, disabled by configure])
-	useasciidoc=no
-fi
-AM_CONDITIONAL(USE_ASCIIDOC, test "x$useasciidoc" = "xyes")
-
 # Enable or disable debug code
 AC_MSG_CHECKING(for debug mode request)
 if test "x$debug" = "xyes" ; then
@@ -278,21 +304,30 @@ if test "x$debug" = "xyes" ; then
 	# Check for -fstack-protector availability
 	GCC_STACK_PROTECT_LIB
 	GCC_STACK_PROTECT_CC
-	CFLAGS="$CFLAGS -Wall -Werror"
+	CFLAGS="$CFLAGS -g -Wall -Werror"
 else
 	AC_MSG_RESULT(no)
 	CFLAGS="$CFLAGS -Wall"
 fi
 
-# Enable or disable inclusion of pacman.static
-AC_MSG_CHECKING(whether to build pacman.static)
-if test "x$pacmanstatic" = "xyes" ; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([INCLUDE_PACMAN_STATIC], , [Build pacman.static])
+# Enable or disable use of git version in pacman version string
+AC_MSG_CHECKING(whether to use git version if available)
+if test "x$wantgitver" = "xyes" ; then
+	AC_CHECK_PROGS([GIT], [git])
+	AC_CHECK_FILE([.git/], hasgitdir=yes)
+	if test $GIT -a "x$hasgitdir" = "xyes"; then
+		AC_MSG_RESULT([yes])
+		usegitver=yes
+		AC_DEFINE([USE_GIT_VERSION], , [Use GIT version in version string])
+	else
+		AC_MSG_RESULT([no, git or .git dir missing])
+		usegitver=no
+	fi
 else
-	AC_MSG_RESULT(no)
+	AC_MSG_RESULT([no, disabled by configure])
+	usegitver=no
 fi
-AM_CONDITIONAL(INCLUDE_PACMAN_STATIC, test "x$pacmanstatic" = "xyes")
+AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes")
 
 # Set root directory
 AC_SUBST(ROOTDIR)
@@ -305,6 +340,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc
 # Set database file extension
 AC_SUBST(DBEXT)
 AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
+# Set makepkg build script name
+AC_SUBST(BUILDSCRIPT)
+AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg])
 
 # Configuration files
 AC_CONFIG_FILES([
@@ -316,14 +354,16 @@ scripts/Makefile
 doc/Makefile
 etc/Makefile
 po/Makefile.in
-pactest/Makefile
+test/pacman/Makefile
+test/pacman/tests/Makefile
+test/util/Makefile
 contrib/Makefile
 Makefile
 ])
 AC_OUTPUT
 
 echo "
-pacman_display_version:
+${PACKAGE_NAME}:
 
   Build information:
     source code location   : ${srcdir}
@@ -340,23 +380,26 @@ pacman_display_version:
     Architecture           : ${CARCH}
     Architecture flags     : ${CARCHFLAGS}
     Host Type              : ${CHOST}
+    Filesize command       : ${SIZECMD}
+    In-place sed command   : ${SEDINPLACE}
 
     libalpm version        : ${LIB_VERSION}
     libalpm version info   : ${LIB_VERSION_INFO}
     pacman version         : ${PACKAGE_VERSION}
+    using git version      : ${usegitver}
 
   Directory and file information:
     root working directory : ${ROOTDIR}
     package extension      : ${PKGEXT}
     source pkg extension   : ${SRCEXT}
     database extension     : ${DBEXT}
+    build script name      : ${BUILDSCRIPT}
 
   Compilation options:
-    Run make in doc/ dir   : ${wantdoc}
+    Run make in doc/ dir   : ${wantdoc} ${asciidoc}
+    Use download library   : ${internaldownload}
     Doxygen support        : ${usedoxygen}
-    Asciidoc support       : ${useasciidoc}
     debug support          : ${debug}
-    build pacman.static    : ${pacmanstatic}
 "
 
 # vim:set ts=2 sw=2 noet:

contrib/Makefile.am

@@ -1,10 +1,13 @@
 EXTRA_DIST = \
 	PKGBUILD.vim \
+	bacman \
 	bash_completion \
 	pacdiff \
+	paclist \
+	pacscripts \
 	pacsearch \
-	re-pacman \
-	vimproject \
+	pactree \
+	vimprojects \
 	wget-xdelta.sh \
 	zsh_completion \
 	README

contrib/PKGBUILD.vim

@@ -25,6 +25,13 @@ syn match pbValidPkgname /\([[:alnum:]]\|+\|-\|_\){,32}/ contained contains=pbIl
 syn match pbIllegalPkgname /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained
 syn match pbPkgnameGroup /^pkgname=.*/ contains=pbIllegalPkgname,pb_k_pkgname,shDoubleQuote,shSingleQuote
 
+" pkgbase
+" FIXME if '=' is in pkgbase/pkgname/pkgver, it highlights whole string, not just '='
+syn keyword pb_k_pkgbase pkgbase contained
+syn match pbValidPkgbase /\([[:alnum:]]\|+\|-\|_\){,32}/ contained contains=pbIllegalPkgbase
+syn match pbIllegalPkgbase /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained
+syn match pbPkgbaseGroup /^pkgbase=.*/ contains=pbIllegalPkgbase,pb_k_pkgbase,shDoubleQuote,shSingleQuote
+
 " pkgver
 syn keyword pb_k_pkgver pkgver contained
 syn match pbValidPkgver /\([[:alnum:]]\|\.\|+\|_\)/ contained contains=pbIllegalPkgver
@@ -54,10 +61,10 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl
 
 " license
 syn keyword pb_k_license license contained
-syn keyword pbLicense  APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained
+syn keyword pbLicense  APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PHP PSF PerlArtistic RALINK RUBY ZPL contained
 syn match pbLicenseCustom /custom\(:[[:alnum:]]*\)*/ contained
 syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense
-syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense,shDoubleQuote,shSingleQuote
+syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense
 
 " backup
 syn keyword pb_k_backup backup contained
@@ -66,9 +73,9 @@ syn region pbBackupGroup start=/^backup=(/ end=/)/ contains=pb_k_backup,pbValidB
 
 " arch
 syn keyword pb_k_arch arch contained
-syn keyword pbArch i686 x86_64 ppc contained
-syn match pbIllegalArch /[^='() ]/ contained contains=pbArch
-syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch,shDoubleQuote,shSingleQuote
+syn keyword pbArch i686 x86_64 ppc any contained
+syn match pbIllegalArch /[^='"() ]/ contained contains=pbArch
+syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch
 
 " groups
 syn keyword pb_k_groups groups contained
@@ -115,6 +122,12 @@ syn match pbValidInstall /\([[:alnum:]]\|\$\|+\|-\|_\)*\.install/ contained
 syn match pbIllegalInstall /[^=]/ contained contains=pbValidInstall
 syn match pbInstallGroup /^install=.*/ contains=pb_k_install,pbValidInstall,pbIllegalInstall,shDeref,shDoubleQuote,shSingleQuote
 
+" changelog
+syn keyword pb_k_changelog changelog contained
+syn match pbValidChangelog /\([[:alnum:]]\|\$\|+\|-\|_\)*/ contained
+syn match pbIllegalChangelog /[^=]/ contained contains=pbValidChangelog
+syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChangelog,pbIllegalChangelog,shDeref,shDoubleQuote,shSingleQuote
+
 " source:
 " XXX remove source from shStatement, fix strange bug
 syn clear shStatement
@@ -127,13 +140,12 @@ syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained
 hi def link pbDerefEmulation PreProc
 
 " md5sums
-
 syn keyword pb_k_md5sums md5sums contained
 syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums
-syn match pbValidMd5sums /[[:alnum:]]\{32\}/ contained
-syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums
+syn match pbValidMd5sums /\x\{32\}/ contained
+syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend
 syn match pbMd5Quotes /'.*'\|".*"/ contained contains=pbMd5Hash,pbIllegalMd5sums
-syn match pbMd5Hash /[[:alnum:]]\+/ contained contains=pbValidMd5sums
+syn match pbMd5Hash /\x\+/ contained contains=pbValidMd5sums
 hi def link pbMd5Quotes Keyword
 hi def link pbMd5Hash Error
 hi def link pbValidMd5sums  Number
@@ -141,17 +153,17 @@ hi def link pbValidMd5sums  Number
 " sha1sums
 syn keyword pb_k_sha1sums sha1sums contained
 syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums
-syn match pbValidSha1sums /[[:alnum:]]\{40\}/ contained
-syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums
+syn match pbValidSha1sums /\x\{40\}/ contained
+syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend
 syn match pbSha1Quotes /'.*'\|".*"/ contained contains=pbSha1Hash,pbIllegalSha1sums
-syn match pbSha1Hash /[[:alnum:]]\+/ contained contains=pbValidSha1sums
+syn match pbSha1Hash /\x\+/ contained contains=pbValidSha1sums
 hi def link pbSha1Quotes Keyword
 hi def link pbSha1Hash Error
 hi def link pbValidSha1sums  Number
 
 " options
 syn keyword pb_k_options options contained
-syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|ccache\|distcc\|makeflags\|force\)/ contained
+syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|force\)/ contained
 syn match   pbOptionsNeg     /\!/ contained
 syn match   pbOptionsDeprec  /no/ contained
 syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote
@@ -181,6 +193,9 @@ hi def link pbTodo Todo
 hi def link pbIllegalPkgname Error
 hi def link pb_k_pkgname pbKeywords
 
+hi def link pbIllegalPkgbase Error
+hi def link pb_k_pkgbase pbKeywords
+
 hi def link pbIllegalPkgver Error
 hi def link pb_k_pkgver pbKeywords
 
@@ -212,6 +227,9 @@ hi def link pb_k_provides pbKeywords
 hi def link pbIllegalInstall Error
 hi def link pb_k_install pbKeywords
 
+hi def link pbIllegalChangelog Error
+hi def link pb_k_changelog pbKeywords
+
 hi def link pb_k_source pbKeywords
 hi def link pbIllegalSource Error
 

contrib/README

@@ -12,15 +12,24 @@ zsh_completion - a zsh completion script, install (with a rename) to
 
 pacdiff - a simple pacnew/pacorig/pacsave updater for /etc/.
 
+paclist - list all packages installed from a given repository. Useful for
+seeing which packages you may have installed from the testing repository,
+for instance.
+
+pacscripts - tries to print out the {pre,post}_{install,remove,upgrade}
+scripts of a given package.
+
 pacsearch - a colorized search combining both -Ss and -Qs output. Installed
 packages are easily identified with a *** and local-only packages are also
 listed.
 
-re-pacman - regenerate a pacman package based on installed files and the pacman
+pactree - generate a dependency tree of an installed package in textual or
+graphical form (using graphviz).
+
+bacman - regenerate a pacman package based on installed files and the pacman
 database entries. Useful for reuse, or possible config file extension.
 
-vimproject - a project file for the vim project plugin (some files listed
-may need to be updated).
+vimprojects - a project file for the vim project plugin.
 
 wget-xdelta.sh - A download script for pacman which allows binary deltas
 generated with makepkg to be used instead of downloading full binary packages.

contrib/bacman

@@ -0,0 +1,284 @@
+#!/bin/bash
+#
+#   bacman: recreate a package from a running system
+#   This script rebuilds an already installed package using metadata
+#   stored into the pacman database and system files
+#
+#   (c) 2008 - locci <carlocci_at_gmail_dot_com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+readonly progname="bacman"
+readonly progver="0.2.1"
+
+#
+# User Friendliness
+#
+function usage(){
+    echo "This program recreates a package using pacman's db and system files"
+    echo "Usage:   $progname <installed package name>"
+    echo "Example: $progname kernel26"
+}
+
+if [ $# -ne 1 ] ; then
+    usage
+    exit 1
+fi
+
+if [ "$1" = "--help" -o "$1" = "-h" ] ; then
+    usage
+    exit 0
+fi
+
+if [ "$1" = "--version" -o "$1" = "-v" ]; then
+    echo "$progname version $progver"
+    echo "Copyright (C) 2008 locci"
+    exit 0
+fi
+
+#
+# Fakeroot support
+#
+if [ $EUID -gt 0 ]; then
+    if [ -f /usr/bin/fakeroot ]; then
+        echo "Entering fakeroot environment"
+        export INFAKEROOT="1"
+        /usr/bin/fakeroot -u -- $0 $1
+        exit $?
+    else
+        echo "WARNING: installing fakeroot or running ${progname} as root is required to"
+        echo "         preserve the ownership permissions of files in some packages"
+        echo ""
+    fi
+fi
+
+#
+# Setting environmental variables
+#
+if [ ! -r /etc/pacman.conf ]; then
+    echo "ERROR: unable to read /etc/pacman.conf"
+    exit 1
+fi
+
+eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf)
+pac_db="${DBPath:-/var/lib/pacman/}/local"
+
+if [ ! -r /etc/makepkg.conf ]; then
+    echo "ERROR: unable to read /etc/makepkg.conf"
+    exit 1
+fi
+
+source "/etc/makepkg.conf"
+if [ -r ~/.makepkg.conf ]; then
+    source ~/.makepkg.conf
+fi
+
+pkg_arch=${CARCH:-'unknown'}
+pkg_dest="${PKGDEST:-$PWD}"
+pkg_ext=${PKGEXT:-'.pkg.tar.gz'}
+pkg_pkger=${PACKAGER:-'Unknown Packager'}
+
+pkg_name="$1"
+pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)"
+pkg_namver="${pkg_dir##*/}"
+
+#
+# Checks everything is in place
+#
+if [ ! -d "$pac_db" ] ; then
+    echo "ERROR: pacman database directory ${pac_db} not found"
+    exit 1
+fi
+
+if [ ! -d "$pkg_dir" ] ; then
+    echo "ERROR: package ${pkg_name} not found in pacman database"
+    exit 1
+fi
+
+#
+# Begin
+#
+echo Package: ${pkg_namver}
+work_dir=$(mktemp -d -p /tmp)
+cd "$work_dir" || exit 1
+
+#
+# File copying
+#
+echo "Copying package files..."
+
+cat "$pkg_dir"/files |
+while read i; do
+    if [ -z "$i" ] ; then
+        continue
+    fi
+
+    if [[ "$i" =~ %[A-Z]*% ]] ; then
+        current=$i
+        continue
+    fi
+
+    case $current in
+        %FILES%)
+            ret=0
+            if [ -e "/$i" ]; then
+                bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf -
+
+                # Workaround to bsdtar not reporting a missing file as an error
+                if [ ! -e "$work_dir/$i" -a ! -L "$work_dir/$i" ]; then
+                    echo ""
+                    echo "ERROR: unable to add /$i to the package"
+                    echo "       If your user does not have permssion to read this file then"
+                    echo "       you will need to run $progname as root"
+                    rm -rf "$work_dir"
+                    exit 1
+                fi
+            else
+                echo ""
+                echo "WARNING: package file /$i is missing"
+                echo ""
+            fi
+
+
+        ;;
+    esac
+done
+
+ret=$?
+if [ $ret -ne 0 ]; then
+    rm -rf "$work_dir"
+    exit 1
+fi
+
+pkg_size=$(du -sk | awk '{print $1 * 1024}')
+
+if [ -f "$pkg_dir/install" ] ; then
+    cp "$pkg_dir/install" "$work_dir/.INSTALL"
+fi
+if  [ -f $pkg_dir/changelog ] ; then
+    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
+fi
+
+#
+# .PKGINFO stuff
+#
+echo Generating .PKGINFO metadata...
+echo "# Generated by $progname $progver"    > .PKGINFO
+if [ "$INFAKEROOT" = "1" ]; then
+    echo "# Using $(fakeroot -v)"    >> .PKGINFO
+fi
+echo "# $(LC_ALL=C date)"            >> .PKGINFO
+echo "#"                    >> .PKGINFO
+
+cat "$pkg_dir"/{desc,files,depends} |
+while read i; do
+    if [[ -z "$i" ]]; then
+        continue;
+    fi
+
+    if [[ "$i" =~ %[A-Z]*% ]] ; then
+        current=$i
+        continue
+    fi
+
+    case "$current" in
+        # desc
+        %NAME%)
+            echo "pkgname = $i"    >> .PKGINFO
+        ;;
+        %VERSION%)
+            echo "pkgver = $i"    >> .PKGINFO
+        ;;
+        %DESC%)
+            echo "pkgdesc = $i"    >> .PKGINFO
+        ;;
+        %URL%)
+            echo "url = $i"    >> .PKGINFO
+        ;;
+        %LICENSE%)
+            echo "license = $i"    >> .PKGINFO
+        ;;
+        %ARCH%)
+            echo "arch = $i"    >> .PKGINFO
+        ;;
+        %BUILDDATE%)
+            echo "builddate = $(date -u "+%s")"    >> .PKGINFO
+        ;;
+        %PACKAGER%)
+            echo "packager = $pkg_pkger"        >> .PKGINFO
+        ;;
+        %SIZE%)
+            echo "size = $pkg_size"        >> .PKGINFO
+        ;;
+        %GROUPS%)
+            echo "group = $i"    >> .PKGINFO
+        ;;
+        %REPLACES%)
+            echo "replaces = $i"    >> .PKGINFO
+        ;;
+        %FORCE%)
+            echo "force = true" >> .PKGINFO
+        ;;
+
+        # files
+        %BACKUP%)
+            # strip the md5sum after the tab
+            echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
+        ;;
+
+        # depends
+        %DEPENDS%)
+            echo "depend = $i"   >> .PKGINFO
+        ;;
+        %OPTDEPENDS%)
+            echo "optdepend = $i" >> .PKGINFO
+        ;;
+        %CONFLICTS%)
+            echo "conflict = $i" >> .PKGINFO
+        ;;
+        %PROVIDES%)
+            echo "provides = $i"  >> .PKGINFO
+        ;;
+    esac
+done
+
+#
+# Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL
+#
+chown root:root "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
+chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
+
+#
+# Generate the package
+#
+echo "Generating the package..."
+
+ret=0
+bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$?
+if [ $ret -ne 0 ]; then
+    echo "ERROR: unable to write package to $pkg_dest"
+    echo "       Maybe the disk is full or you do not have write access"
+    rm -rf "$work_dir"
+    exit 1
+fi
+
+rm -rf "$work_dir"
+
+echo Done
+
+exit 0
+
+# vim: set ts=2 sw=2 noet:
+

contrib/bash_completion

@@ -1,362 +1,108 @@
-# vim: set ft=sh ts=2 sw=2 et:
-# file: /etc/bash_completion.d/pacman
+# This file is in the public domain.
 
-# Bash completion for pacman
-# Original: Manolis Tzanidakis <mtzanidakis@freemail.gr>
-#
-# Distributed under the terms of the GNU General Public License, v2 or later.
-#
-
-## initial functions
-
-rem_selected ()
-{
-  # (Adapted from bash_completion by Ian Macdonald <ian@caliban.org>)
-  # This removes any options from the list of completions that have
-  # already been specified on the command line.
-  COMPREPLY=($(echo "${COMP_WORDS[@]}" | \
-    (while read -d ' ' i; do
-      [ "${i}" == "" ] && continue
-      # flatten array with spaces on either side,
-      # otherwise we cannot grep on word boundaries of
-      # first and last word
-      COMPREPLY=" ${COMPREPLY[@]} "
-      # remove word from list of completions
-      COMPREPLY=(${COMPREPLY/ ${i%% *} / })
+_arch_compgen() {
+  local i r
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+    for r in ${!COMPREPLY[@]}; do
+      if [[ ${COMP_WORDS[i]} = ${COMPREPLY[r]} ]]; then
+        unset 'COMPREPLY[r]'; break
+      fi
     done
-    echo ${COMPREPLY[@]})))
-  return 0
+  done
 }
 
-_available_repos ()
-{
-  COMPREPLY=( $( compgen -W "$(grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) )
+_arch_ptr2comp() {
+  local list= x y
+  for x; do
+    for y in '0 --' '1 -'; do
+      eval 'set -- ${'$x'[${y% *}]}'
+      list+=\ ${@/#/${y#* }}
+    done
+  done
+  _arch_compgen $list
 }
 
-_installed_pkgs ()
-{
-  local installed_pkgs
-  installed_pkgs=$( ls /var/lib/pacman/local/ )
-  COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do echo ${i%-*-*}; done )" -- $cur ) )
+_arch_incomp() {
+  local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]]
 }
 
-_available_pkgs ()
-{
-  #find balks easilly on a find /foo/*/* type dir, especially one like
-  #   /var/lib/pacman/*/*
-  # This little change-up removes the find *and* only uses enabled repos
-  local available_pkgs
-  local enabled_repos
-  enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )
-  available_pkgs=$( for r in $enabled_repos; do echo /var/lib/pacman/sync/$r/*; done )
-  COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) )
-}
-
-_installed_groups ()
-{
-  local installed_groups
-  installed_groups=$( find /var/lib/pacman/local -name desc -exec sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | sort -u )
-  COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-_available_groups ()
-{
-  #find balks easilly on a find /foo/*/* type dir, especially one like
-  #   /var/lib/pacman/*/*
-  # This little change-up removes the find *and* only uses enabled repos
-  local available_groups
-  local enabled_repos
-  enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )
-  available_groups=$( for r in $enabled_repos; do sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | sort -u; done )
-  COMPREPLY=( $( compgen -W "$( for i in $available_groups; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-## makepkg completion
-
-_makepkg ()
-{
-  local cur prev
+_makepkg() {
+  local cur opts prev
   COMPREPLY=()
-  cur=${COMP_WORDS[COMP_CWORD]}
+  cur=$(_get_cword)
   prev=${COMP_WORDS[COMP_CWORD-1]}
-
-  case "$prev" in
-    -p)
-      _filedir
-      return 0
-    ;;
-    --help|--cleancache)
-      COMPREPLY=''
-      return 0
-    ;;
-  esac
-
-  if [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '\
-      -A --ignorearch \
-      -b --builddeps \
-      -c --clean \
-      -C --cleancache \
-      -d --nodeps \
-      -e --noextract \
-      -f --force \
-      -g --geninteg \
-      -h --help \
-      -i --install \
-      -L --log \
-      -m --nocolor \
-      -o --nobuild \
-      -p \
-      -r --rmdeps \
-      -s --syncdeps \
-      --asroot \
-      --source \
-      --noconfirm \
-      --noprogressbar' -- $cur ) )
+  if [[ $cur = -* && ! $prev =~ ^-(-(cleancache|config|help)$|\w*[Chp]) ]]; then
+    opts=('allsource asroot clean cleancache config force geninteg help holdver
+           ignorearch install log nobuild nocolor noconfirm nodeps noextract
+           noprogressbar pkg repackage rmdeps skipinteg source syncdeps'
+          'A C L R c d e f g h i m o p r s')
+    _arch_ptr2comp opts
   fi
-
-  rem_selected
+  true
 }
-complete -o default -F _makepkg makepkg
 
-## pacman completion
-
-_instring ()
-{
-  str="${1}"
-  shift 1
-  for c in "${@}"; do
-    if [ $(expr index "${str}" "${c}") -gt 0 ]; then
-      return 0
+_pacman_pkg() {
+  _arch_compgen "$(
+    if [[ $2 ]]; then
+      \pacman -$1 | \cut -d' ' -f1 | \sort -u
+    else
+      \pacman -$1
     fi
-  done
-  return 1
+  )"
 }
 
-_pacman ()
-{
-  local a arg toparse op mod cur
+_pacman_file() {
+  compopt -o filenames; _filedir 'pkg.tar.*'
+}
+
+_pacman() {
+  local common core cur database prev query remove sync upgrade o
   COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
+  database=('asdeps asexplicit')
+  query=('changelog check deps explicit file foreign groups info list owns
+          search unrequired upgrades' 'c e g i k l m o p s t u')
+  remove=('cascade dbonly nodeps nosave print recursive unneeded' 'c k n p s u')
+  sync=('asdeps asexplicit clean downloadonly force groups ignore ignoregroup
+         info list needed nodeps print refresh search sysupgrade'
+        'c f g i l p s u w y')
+  upgrade=('asdeps asexplicit force nodeps print' 'f p')
+  common=('arch cachedir config dbpath debug help logfile noconfirm
+           noprogressbar noscriptlet quiet root verbose' 'b d h q r v')
+  core=('database help query remove sync upgrade version' 'D Q R S U V h')
 
-  # This argument parsing is done so we can check for flag existance later
-  #  right now it's a tad crappy, but does the job
-  for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
-    a=${COMP_WORDS[i]}
-    arg="${a:0:2}"
-    toparse="${a:2}"
-
-    case "${arg}" in
-      -@(A|U|R|S|Q|h|V))
-        op="${arg/-}"
-        mod="${mod}${a:2}"
-        ;;
-      --)
-        arg="${a:2}"
-        case "${arg}" in
-          add) op="A" ;;
-          remove) op="R" ;;
-          upgrade) op="U" ;;
-          query) op="Q" ;;
-          sync) op="S" ;;
-          help) op="h" ;;
-          version) op="V" ;;
-          verbose) mod="${mod}v" ;;
-          root) mod="${mod}r" ;;
-          dbpath) mod="${mod}b" ;;
-          nodeps) mod="${mod}d" ;;
-          force) mod="${mod}f" ;;
-          groups) mod="${mod}g" ;;
-          info) mod="${mod}i" ;;
-          list) mod="${mod}l" ;;
-          print-uris) mod="${mod}p" ;;
-          search) mod="${mod}s" ;;
-          sysupgrade) mod="${mod}u" ;;
-          upgrades) mod="${mod}u" ;;
-          downloadonly) mod="${mod}w" ;;
-          refresh) mod="${mod}y" ;;
-          changelog) mod="${mod}c" ;;
-          deps) mod="${mod}d" ;;
-          explicit) mod="${mod}e" ;;
-          unrequired) mod="${mod}t" ;;
-          foreign) mod="${mod}m" ;;
-          owns) mod="${mod}o" ;;
-          file) mod="${mod}p" ;;
-          search) mod="${mod}s" ;;
-          upgrades) mod="${mod}u" ;;
-          cascade) mod="${mod}c" ;;
-          dbonly) mod="${mod}k" ;;
-          nosave) mod="${mod}n" ;;
-          recursive) mod="${mod}s" ;;
-        esac ;;
-      *) toparse="${a}" ;;
-    esac
-
-    arglen=$(( ${#toparse}-1 ))
-    for c in $(seq 0 "${arglen}"); do
-      arg=${toparse:$c:1}
-      [ "${arg}" != "-" ] && mod="${mod}${arg}"
-    done
+  for o in 'D database' 'Q query' 'R remove' 'S sync' 'U upgrade'; do
+    _arch_incomp "$o" && break
   done
 
-  cur=${COMP_WORDS[COMP_CWORD]}
-
-  if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '\
-      -A --add \
-      -h --help \
-      -Q --query \
-      -R --remove \
-      -S --sync \
-      -U --upgrade \
-      -V --version \
-      ' -- $cur ) )
-    rem_selected
-    return 0
-  fi
-
-  if [[ "$cur" == -* ]]; then
-    case "${op}" in
-      A|U)
-        COMPREPLY=( $( compgen -W '\
-          --asdeps \
-          -d --nodeps \
-          -f --force \
-          -h --help \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
-      R)
-        COMPREPLY=( $( compgen -W '\
-          -c --cascade \
-          -d --nodeps \
-          -h --help \
-          -k --dbonly \
-          -n --nosave \
-          -s --recursive \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
-      S)
-        COMPREPLY=( $( compgen -W '\
-          --asdeps \
-          -c --clean \
-          -d --nodeps \
-          -e --dependsonly \
-          -f --force \
-          -g --groups \
-          -h --help \
-          -i --info \
-          -l --list \
-          -p --print-uris \
-          -s --search \
-          -u --sysupgrade \
-          -w --downloadonly \
-          -y --refresh \
-          --needed \
-          --ignore \
-          --ignoregroup \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
+  if [[ $? != 0 ]]; then
+    _arch_ptr2comp core
+  elif ! [[ $prev =~ ^-\w*[Vbhr] ||
+    $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]]
+  then
+    [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common ||
+      case ${o% *} in
+      D|R)
+          _pacman_pkg Qq;;
       Q)
-        COMPREPLY=( $( compgen -W '\
-          -c --changelog \
-          -d --deps \
-          -e --explicit \
-          -g --groups \
-          -h --help \
-          -i --info \
-          -l --list \
-          -m --foreign \
-          -o --owns \
-          -p --file \
-          -s --search \
-          -t --unrequired \
-          -u --upgrades \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
-    esac
-    rem_selected
-  else
-    case "${op}" in
-      A|U)
-        COMPREPLY=( $( compgen -d -- "$cur" ) \
-                    $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
-        return 0
-        ;;
-      h|V)
-        COMPREPLY=''
-        return 0
-        ;;
-      Q)
-        if _instring $mod g; then
-          _installed_groups
-        elif _instring $mod o; then
-          COMPREPLY=( $( compgen -d -- "$cur" ) \
-                      $( compgen -f -- "$cur" ) )
-        elif _instring $mod p; then
-          COMPREPLY=( $( compgen -d -- "$cur" ) \
-                      $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
-        elif _instring $mod u; then
-          COMPREPLY=''
-          return 0
-        else
-          _installed_pkgs
-        fi
-        return 0
-        ;;
-      R)
-        _installed_pkgs
-        return 0
-        ;;
+        { _arch_incomp 'g groups' && _pacman_pkg Qg sort; }    ||
+        { _arch_incomp 'p file'   && _pacman_file; }           ||
+          _arch_incomp 'o owns'   || _arch_incomp 'u upgrades' ||
+          _pacman_pkg Qq;;
       S)
-        if _instring $mod l; then
-          _available_repos
-        else
-          _available_pkgs
-        fi
-        return 0
-        ;;
-    esac
+        { _arch_incomp 'g groups' && _pacman_pkg Sg; }      ||
+        { _arch_incomp 'l list'   && _pacman_pkg Sl sort; } ||
+          _pacman_pkg Slq;;
+      U)
+          _pacman_file;;
+      esac
   fi
-
-  rem_selected
+  true
 }
-complete -o filenames -F _pacman pacman
+
+complete -F _makepkg -o default makepkg
+complete -F _pacman  -o default pacman
+
+# ex:et ts=2 sw=2 ft=sh

contrib/pacdiff

@@ -1,5 +1,5 @@
-#!/bin/sh
-#   pacdiff : a simple pacnew/pacorig/pacsave updater for /etc/
+#!/bin/bash
+#   pacdiff : a simple pacnew/pacorig/pacsave updater
 #
 #   Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com>
 #
@@ -17,29 +17,64 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Original http://phraktured.net/config/bin/pacdiff
-
 diffprog=${DIFFPROG:-vimdiff}
-for x in $(find /etc/ -name *.pacnew -o -name *.pacorig -o -name *.pacsave)
-do
-    echo "File: ${x%.pac*}"
-    chk="$(cmp $x ${x%.pac*})"
-    if [ -z "${chk}" ]; then
-        echo "  Files are identical, removing..."
-        rm $x
-    else
-        echo -n "  File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] "
-        read c
-        c="$(echo $c| tr A-Z a-z)" #tolower
-        if [ "$c" = "r" ]; then
-            rm $x
-        elif [ "$c" = "s" ]; then
-            continue
-        else
-            [ "$c" = "n" -o "$c" = "N" ] || $diffprog $x ${x%.pac*}
-            echo -n "  Remove file? [Y/n] "
-            read c
-            [ "$c" = "n" -o "$c" = "N" ] || rm $x
-        fi
-    fi
-done
+diffsearchpath=${DIFFSEARCHPATH:-/etc}
+locate=0
+
+usage() {
+	echo "pacdiff : a simple pacnew/pacorig/pacsave updater"
+	echo "Usage : pacdiff [-l]"
+	echo "  -l/--locate makes pacdiff use locate rather than find"
+	echo "  DIFFPROG variable allows to override the default vimdiff"
+	echo "  DIFFSEARCHPATH allows to override the default /etc path"
+	echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" pacdiff"
+}
+
+cmd() {
+	if [ $locate -eq 1 ]; then
+		locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave
+	else
+		find $diffsearchpath \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave \) -print0
+	fi
+}
+
+if [ $# -gt 0 ]; then
+	case $1 in
+		-l|--locate)
+		locate=1;;
+		*)
+		usage; exit 0;;
+	esac
+fi
+
+# see http://mywiki.wooledge.org/BashFAQ/020
+while IFS= read -u 3 -r -d '' pacfile; do
+	file="${pacfile%.pac*}"
+	echo "File: $file"
+	if [ ! -f "$file" ]; then
+		echo "  $file does not exist"
+		rm -i "$pacfile"
+		continue
+	fi
+	check="$(cmp "$pacfile" "$file")"
+	if [ -z "${check}" ]; then
+		echo "  Files are identical, removing..."
+		rm "$pacfile"
+	else
+		echo -n "  File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] "
+		while read c; do
+			case $c in
+				r|R) rm "$pacfile"; break ;;
+				v|V)
+				$diffprog "$pacfile" "$file"
+				rm -i "$pacfile"; break ;;
+				s|S) break ;;
+				*) echo -n "  Invalid answer. Try again: [v/s/r] "; continue ;;
+			esac
+		done
+	fi
+done 3< <(cmd)
+
+exit 0
+
+# vim: set ts=2 sw=2 noet:

contrib/paclist

@@ -0,0 +1,88 @@
+#!/usr/bin/perl
+# paclist - List all packages installed from a given repo
+#
+# Copyright (C) 2008 Dan McGee <dpmcgee@gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+my $progname = "paclist";
+my $version = "1.0";
+
+if ($#ARGV != 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") {
+	print "$progname - List all packages installed from a given repo\n";
+	print "Usage:   $progname <repo>\n";
+	print "Example: $progname testing\n";
+	if ($#ARGV != 0) {
+		exit 1;
+	}
+	exit 0;
+}
+
+if ( $ARGV[0] eq "--version" || $ARGV[0] eq "-v") {
+	print "$progname version $version\n";
+	print "Copyright (C) 2008 Dan McGee\n";
+	exit 0;
+}
+
+# This hash table will be used to store pairs of ('name version', count) from
+# the return of both pacman -Sl <repo> and pacman -Q output. We then check to
+# see if a value was added twice (count = 2)- if so, we will print that package
+# as it is both in the repo we queried and installed on our local system.
+my %packages = ();
+my $output;
+
+$output = `pacman -Sl $ARGV[0]`;
+if ($? != 0) {
+	exit 1;
+}
+my @sync = split(/\n/, $output);
+# sample output from pacman -Sl:
+# testing foobar 1.0-1
+foreach $_ (@sync) {
+	my @info = split(/ /);
+	# we only want to store 'foobar 1.0-1' in our hash table
+	my $pkg = $info[1] . " " . $info[2];
+	$packages{$pkg}++;
+}
+
+$output = `pacman -Q`;
+if ($? != 0) {
+	exit 1;
+}
+# sample output from pacman -Q:
+# foobar 1.0-1
+my @local = split(/\n/, $output);
+foreach $_ (@local) {
+	# store 'foobar 1.0-1' in our hash table
+	$packages{$_}++;
+}
+
+# run comparison check- if value was added twice, it was in the intersection
+my @intersection;
+foreach $_ (keys %packages) {
+	if ($packages{$_} == 2) {
+		push @{ \@intersection }, $_;
+	}
+}
+
+# print our intersection, and bask in the glory and speed of perl
+@intersection = sort @intersection;
+foreach $_ (@intersection) {
+	print $_ . "\n";
+}
+
+#vim: set noet:

contrib/pacscripts

@@ -0,0 +1,132 @@
+#!/bin/bash
+#
+#   pacscripts : tries to print out the {pre,post}_{install,remove,upgrade}
+#   scripts of a given package
+#
+#   Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante@gmail.com>
+#   Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# bash options
+set -o nounset
+set -o errexit
+
+progname=$(basename $0)
+progver="0.4"
+
+conf="/etc/pacman.conf"
+
+if [ ! -r "$conf" ]; then
+	echo "ERROR: unable to read $conf"
+	exit 1
+fi
+
+eval $(awk '/DBPath/ {print $1$2$3}' "$conf")
+eval $(awk '/CacheDir/ {print $1$2$3}' "$conf")
+pac_db="${DBPath:-/var/lib/pacman}/local"
+pac_cache="${CacheDir:-/var/cache/pacman/pkg}"
+
+error() {
+	local mesg=$1; shift
+	printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
+}
+
+usage() {
+	echo "This program prints out the {pre,post}_{install,remove,upgrade} scripts"
+	echo "of a given package."
+	echo "Usage: $progname pkgname|pkgfile"
+	echo
+	echo " OPTIONS:"
+	echo "  -h, --help                 Print this help message"
+	echo "  -v, --version              Print program name and version"
+	echo
+	echo "Example: $progname gconf-editor"
+	echo "Example: $progname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz"
+}
+
+spacman() {
+	if [ $EUID -eq 0 ]; then
+		pacman "$@"
+	else
+		if [ ! "$(type -p sudo)" ]; then
+			error "Cannot find the sudo binary! Is sudo installed?"
+			error "Otherwise try to run the program as root"
+			exit 1
+		else
+			sudo pacman "$@"
+		fi
+	fi
+}
+
+print_db() {
+	pkg=$(pacman -Q "$1")
+	pkg=${pkg/ /-}
+	if [ -f $pac_db/$pkg*/install ]; then
+		cat $pac_db/$pkg*/install
+		echo
+		return 0
+	else
+		error "Package $1 does not include any .INSTALL script"
+		return 1
+	fi
+}
+
+print_pkg() {
+	if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then
+		error "Package $1 does not include any .INSTALL script"
+		return 1
+	fi
+	echo
+}
+
+print_scriptlet() {
+	if [ -f "$1" ]; then
+		if bsdtar tf "$1" .PKGINFO &>/dev/null; then
+			print_pkg "$1"
+			return
+		fi
+	fi
+	if pacman -Q "$1" &>/dev/null; then
+		print_db "$1"
+		return
+	fi
+	if ! pacman -Si $1 &>/dev/null; then
+		error "Package $1 not found"
+		return 1
+	fi
+	url=$(spacman -Sdp $1 | tail -n1)
+	filename=$(basename $url)
+	if [ ! -f "$pac_cache/$filename" ]; then
+		if ! spacman -Sdw --noconfirm $1 >&2; then
+			error "Failed to download $1"
+			return 1
+		fi
+		echo >&2
+	fi
+	print_pkg "$pac_cache/$filename"
+	return
+}
+
+if [ $# -ne 1 ] ; then
+	usage
+	exit 1
+fi
+
+case "$1" in
+	--help|-h) usage; exit 0 ;;
+	--version|-v) echo "$progname version $progver"; exit 0 ;;
+	*) print_scriptlet $1 ;;
+esac

contrib/pacsearch

@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/usr/bin/perl
 # pacsearch - Adds color and install information to a 'pacman -Ss' search
 #
+# Copyright (C) 2008, 2010 Dan McGee <dpmcgee@gmail.com>
+#
+# Based off original shell script version:
 # Copyright (C) 2006-2007 Dan McGee <dpmcgee@gmail.com>
 #
 # This program is free software; you can redistribute it and/or
@@ -18,72 +21,110 @@
 
 #TODO: colors flag on commandline
 
-readonly progname="pacsearch"
-readonly version="1.0"
+use strict;
+use warnings;
 
-readonly CLR1='\\\e[0;34m'
-readonly CLR2='\\\e[0;32m'
-readonly CLR3='\\\e[0;35m'
-readonly CLR4='\\\e[0;36m'
-readonly CLR5='\\\e[0;31m'
-readonly CLR6='\\\e[0;33m'
-readonly CLR7='\\\e[1;36m'
-readonly INST='\\\e[1;31m'
-readonly BASE='\\\e[0m'
+my $progname = "pacsearch";
+my $version = "2.0";
 
-if [ "$1" = "--help" -o "$1" = "-h" ]; then
-	echo "Usage: $progname <pattern>"
-	echo "Ex:    $progname ^gnome"
-	exit 0
-fi
+if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") {
+	print "$progname - Add color and install information to a pacman -Ss search\n";
+	print "Usage:   $progname <pattern>\n";
+	print "Example: $progname ^gnome\n";
+	if ($#ARGV lt 0) {
+		exit 1;
+	}
+	exit 0;
+}
 
-if [ "$1" = "--version" -o "$1" = "-v" ]; then
-	echo "$progname version $version"
-	echo "Copyright (C) 2006-2007 Dan McGee"
-	exit 0
-fi
+if ($ARGV[0] eq "--version" || $ARGV[0] eq "-v") {
+	print "$progname version $version\n";
+	print "Copyright (C) 2006-2010 Dan McGee\n";
+	exit 0;
+}
 
-if [ -z "$1" -o "${1:0:1}" = "-" ]; then
-	echo "Usage: $progname <pattern>"
-	echo "Ex:    $progname ^gnome"
-	exit 1
-fi
+# define our colors to use when printing
+my $CLR1 = "\e[0;34m";
+my $CLR2 = "\e[0;32m";
+my $CLR3 = "\e[0;35m";
+my $CLR4 = "\e[0;36m";
+my $CLR5 = "\e[0;31m";
+my $CLR6 = "\e[0;33m";
+my $CLR7 = "\e[1;36m";
+my $INST = "\e[1;31m";
+my $BASE = "\e[0m";
 
-# Make two temp files and send output of commands to these files
-querydump=$(mktemp)
-pacman -Qs $1 > $querydump
-syncdump=$(mktemp)
-pacman -Ss $1 > $syncdump
+# color a "repo/pkgname pkgver" line based on the repository name
+sub to_color {
+	my $line = shift;
+	# get the installed text colored first
+	$line =~ s/(\[.*\]$)/$INST$1$BASE/;
+	# and now the repo and dealings
+	$line =~ s/(^core\/.*)/$CLR1$1$BASE/;
+	$line =~ s/(^extra\/.*)/$CLR2$1$BASE/;
+	$line =~ s/(^community\/.*)/$CLR3$1$BASE/;
+	$line =~ s/(^testing\/.*)/$CLR4$1$BASE/;
+	$line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/;
+	$line =~ s/(^local\/.*)/$CLR7$1$BASE/;
+	# any other unknown repository
+	$line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/;
+	return $line;
+}
 
-# Strip descriptions and 'local/' from -Qs query
-instpkg=$(mktemp)
-egrep '^[^ ]' $querydump | sed -e 's@^local/@@' > $instpkg
+my %allpkgs = ();
 
-# Add pkgs not in sync db, mark pkgs that are installed
-cat $instpkg | while read -r pkg; do
-	if [ -z "$(grep "$pkg" $syncdump)" ]; then
-		# grep package name; pipe to another grep that prints at most one
-		#   line starting with 'local/', allows for comments >1 line
-		grep -A10 "$pkg" $querydump | grep -A10 -m1 "local/" >> $syncdump
-	fi
-	sed -i "s@^\(.\+/$pkg\)@\***\1@" $syncdump
-done
+my $syncout = `pacman -Ss '@ARGV'`;
+# split each sync search entry into its own array entry
+my @syncpkgs = split(/\n^(?=\w)/m, $syncout);
+# remove the extra \n from the last desc entry
+if ($#syncpkgs >= 0) {
+	chomp($syncpkgs[$#syncpkgs]);
+}
 
-# Print colorized package list and descriptions to screen
-echo -e "$(sed -r \
-	-e "s@core/.*@$CLR1&$BASE@" \
-	-e "s@extra/.*@$CLR2&$BASE@" \
-	-e "s@community/.*@$CLR3&$BASE@" \
-	-e "s@testing/.*@$CLR4&$BASE@" \
-	-e "s@unstable/.*@$CLR5&$BASE@" \
-	-e "s@custom/.*@$CLR6&$BASE@" \
-	-e "s@local/.*@$CLR7&$BASE@" \
-	-e "s@(^|\*\*\*)([[:alnum:]]*/.* .*)@\1$CLR6\2$BASE@" \
-	-e "s@\*\*\*@$INST&@" \
-	< $syncdump )"
-echo -en "\e[0m"
+# counter var for packages, used here and in the query loop too
+my $cnt = 0;
+foreach $_ (@syncpkgs) {
+	# we grab 4 fields here: repo, name/ver, installed, and desc
+	my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
+	# since installed is optional, we should fill it in if necessary
+	$pkgfields[2] = "" if not defined $pkgfields[2];
+	# add a fifth field that indicates original order
+	push (@pkgfields, $cnt++);
+	# add each sync pkg by name/ver to a hash table for quick lookup
+	$allpkgs{$pkgfields[1]} = [ @pkgfields ];
+}
 
-rm $querydump
-rm $syncdump
-rm $instpkg
+my $queryout = `pacman -Qs '@ARGV'`;
+# split each querysearch entry into its own array entry
+my @querypkgs = split(/\n^(?=\w)/m, $queryout);
+# remove the extra \n from the last desc entry
+if ($#querypkgs >= 0) {
+	chomp ($querypkgs[$#querypkgs]);
+}
 
+foreach $_ (@querypkgs) {
+	# we grab 4 fields here: repo, name/ver, installed, and desc
+	my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
+	# since installed is optional, we should fill it in if necessary
+	$pkgfields[2] = "" if not defined $pkgfields[2];
+	# check if the package was listed in the sync out
+	if (not exists $allpkgs{$pkgfields[1]}) {
+		$pkgfields[2] = "[installed]";
+		# add a fifth field that indicates original order (after sync)
+		push (@pkgfields, $cnt++);
+		# add our local-only package to the hash
+		$allpkgs{$pkgfields[1]} = [ @pkgfields ];
+	}
+}
+
+# sort by original order (the fifth field) and print
+foreach $_ ( sort{ @{$allpkgs{$a}}[4] <=> @{$allpkgs{$b}}[4] } keys %allpkgs) {
+	my @v = @{$allpkgs{$_}};
+	my $line = "$v[0]/$v[1] $v[2]";
+	$line = to_color($line);
+	# print colorized "repo/pkgname pkgver" string with possible installed text
+	print "$line\n";
+	print "$v[3]\n";
+}
+
+#vim: set noet:

contrib/pactree

@@ -0,0 +1,321 @@
+#!/bin/bash
+# pactree : a simple dependency tree viewer
+#
+# Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci@gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Original http://carlocci.ngi.it/arch/pactree
+# Credit to scj for the graphviz idea
+
+# set the colors
+branch1_color="\033[0;33m"    #Brown
+branch2_color="\033[0;37m"    #Gray
+leaf_color="\033[1;32m"       #Light green
+leaf2_color="\033[0;32m"      #Green
+
+# set the separators
+separator="   "
+branch_tip1="|--"
+branch_tip2="+--"
+provides="provides "
+
+# set the graphviz options
+# http://www.graphviz.org/doc/info/output.html for available output formats
+# http://www.graphviz.org/doc/info/colors.html for available colors
+gformat="png"                 #output format
+start_color="red"             #START color
+nodes_color="green"           #color of the nodes
+arrow1_color="chocolate4"     #color of the normal arrow
+arrow2_color="grey"           #color of the "provided by" headless arrow
+
+readonly prog_name="pactree"
+readonly prog_ver="0.3"
+
+_usage(){
+	echo "This program generates the dependency tree of an installed package"
+	echo "Usage:   $prog_name [OPTIONS] <installed packages>"
+	echo
+	echo " OPTIONS:"
+	echo "  -c, --color                Enable color output"
+	echo "  -d, --depth INT            Limit the shown dependencies depth"
+	echo "  -g, --graph                Use graphviz to make an image of the tree"
+	echo "  -l, --linear               Enable linear output"
+	echo "  -r, --reversed             Show reversed dependancies"
+	echo "  -s, --silent               Shh, let me hear those errors!"
+	echo "  -u, --unique               Print the dependency list with no duplicates"
+	echo
+	echo "  -h, --help                 Print this help message"
+	echo "  -v, --version              Print the program name and version"
+	echo
+	echo "Example: $prog_name -c -d2 readline"
+}
+
+_version(){
+	echo "$prog_name version $prog_ver"
+	echo "Copyright (C) 2008 Carlo \"carlocci\" Bersani <carlocci@gmail.com>"
+}
+# end of the friendliness
+
+
+# grab a field from the database: $1=path/to/file, $2=field to grab
+_grabfield(){
+	for line in $(cat "$1" 2>/dev/null ); do
+		if [ -z "$line" ]; then
+			continue;
+		fi;
+		if [[ "$line" =~ %[A-Z]*% ]]; then
+			current="$line"
+			continue;
+		fi;
+		if [ "$current" = "$2" ]; then
+			echo "$line"
+		fi;
+	done
+}
+
+
+# find a dep in the db: $1=dep, $2=field, $3=dbfile, ret=file list
+_finddep(){
+	for line in $(awk 'BEGIN{RS=""}
+	                   {
+	                   if ($1=="'"$2"'"){
+	                     for (i=2 ; i<=NF ; ++i){
+	                       if ($i ~ /^'"$1"'([<>=]+.*|)$/ ){
+	                         print FILENAME}
+	                       }
+	                     }
+	                   }' $(find $pac_db -name $3)); do
+		echo "${line%/*}"
+	done
+}
+
+
+# Recursive function: does all of the work, pays all of the taxes     #
+_tree(){
+	pkg_name="$1"
+	pkg_dirs="$(echo $pac_db/$pkg_name-[0-9]*)"
+
+	# Is $pkg_name real or provided?
+	[ ! -d "$pkg_dirs" ] && pkg_dirs="$(_finddep $pkg_name %PROVIDES% depends)"
+
+	for pkg_dir in $pkg_dirs ; do
+		spaces="$2"
+		unset provided
+		branch_tip="$branch_tip1"
+		branch_color="$branch1_color"
+		pkg_name="$(_grabfield "$pkg_dir/desc" %NAME%)"
+		if [ ! "$pkg_name" = "$1" ]; then
+			provided="$leaf2_color $provides$leaf_color$1"
+			branch_tip="$branch_tip2"
+			branch_color="$branch2_color"
+			if [ $graphviz -eq 1 ] && [[ ! "${dep_list[@]}" =~ _$1_ ]] && [ $spaces -ne $((max_depth+1)) ]; then
+				echo "\"$1\" -> \"$pkg_name\" [arrowhead=none, color=$arrow2_color];"
+				dep_list=( "${dep_list[@]}" "_$1_" )
+				_tree "$pkg_name" $((spaces+1))
+				continue
+			fi
+		fi
+
+		# Generate the spacer
+		spacer=""
+		for each in $(seq 1 $spaces); do
+			spacer="$spacer$separator"
+		done
+		spacer="$spacer$branch_tip"
+
+		[ $silent -ne 1 ] &&	echo -e "$branch_color$spacer$leaf_color$pkg_name$provided"
+
+		[ ! -d "$pkg_dir" ] && echo "No $pkg_name in the database (inconsistent database?)" >&2
+
+		if [[ ! " ${dep_list[@]} " =~ " $pkg_name " ]] && [ $spaces -ne $max_depth ]; then
+			dep_list=( "${dep_list[@]}" "$pkg_name" )
+			if [ $reversed_dep -eq 0 ]; then
+				deps_pkg="$(_grabfield "$pkg_dir/depends" %DEPENDS%)"
+			else
+				reqs_pkg_dir="$(_finddep "$pkg_name" %DEPENDS% depends)"
+				unset deps_pkg
+				for req_pkg_dir in $reqs_pkg_dir; do
+					deps_pkg=$(echo "$deps_pkg" "$(_grabfield "$req_pkg_dir/desc" %NAME%)")
+				done
+			fi
+			for dep_pkg in $deps_pkg; do
+				spaces=$2		#Bash scoping ;_;
+				if [ $graphviz -eq 1 ]; then
+					echo "\"$1\" -> \"${dep_pkg%%[<>=]*}\" [color=$arrow1_color];"
+				fi
+				_tree "${dep_pkg%%[<>=]*}" $((spaces+1))
+			done
+		fi
+	done
+}
+
+
+# Main program: gets all of the money, pays none of the taxes
+
+# Command line parameters parser
+if [ $# -eq 0 ]; then
+	_usage
+	exit 1
+fi
+
+options=( "$@" )
+len_options=${#options[@]}
+for (( n=0 ; n < $len_options ; n++ )); do
+	if [ "${options[$n]}" = "--" ]; then
+		unset options[$n]
+		break
+	fi
+	if [ "${options[$n]}" = "-h" -o "${options[$n]}" = "--help" ]; then
+		_usage
+		exit 0
+	fi
+
+	if [ "${options[$n]}" = "-v" -o "${options[$n]}" = "--version" ]; then
+		_version
+		exit 0
+	fi
+
+	if [ "${options[$n]}" = "-l" -o "${options[$n]}" = "--linear" ]; then
+		unset options[$n]
+		linear=1
+		continue
+	fi
+
+	if [ "${options[$n]}" = "-s" -o "${options[$n]}" = "--silent" ]; then
+		unset options[$n]
+		silent=1
+		continue
+	fi
+
+	if [ "${options[$n]}" = "-u" -o "${options[$n]}" = "--unique" ]; then
+		unset options[$n]
+		silent=1
+		nodup=1
+		continue
+	fi
+
+	if [ "${options[$n]}" = "-g" -o "${options[$n]}" = "--graph" ]; then
+		unset options[$n]
+		graphviz=1
+		continue
+	fi
+
+	if [ "${options[$n]}" = "-c" -o "${options[$n]}" = "--color" ]; then
+		unset options[$n]
+		colored=1
+		continue
+	fi
+
+	if [ "${options[$n]}" = "-r" -o "${options[$n]}" = "--reversed" ]; then
+		unset options[$n]
+		reversed_dep=1
+		continue
+	fi
+
+	if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then
+		if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then
+			max_depth="${options[$n]#-d}"
+		elif [[ ${options[$((n+1))]} =~ [[:digit:]]+ ]]; then
+			max_depth="${options[$((n+1))]}"
+			unset options[$((n+1))]
+			((++n))
+		fi
+		unset options[$n]
+		continue
+	fi
+done
+# End of the dumb command line parser
+
+# Env
+colored=${colored:-0}
+max_depth=${max_depth:--10}
+linear=${linear:-0}
+silent=${silent:-0}
+nodup=${nodup:-0}
+graphviz=${graphviz:-0}
+reversed_dep=${reversed_dep:-0}
+
+if [ $colored -ne 1 ]; then
+	unset branch1_color
+	unset leaf_color
+	unset leaf2_color
+	unset branch2_color
+fi
+
+if [ $linear -eq 1 ]; then
+	unset separator
+	unset branch_tip1
+	unset branch_tip2
+	unset provides
+fi
+
+if [ $graphviz -eq 1 ]; then
+	silent=1
+	nodup=0
+	if [ ! -f /usr/bin/dot ]; then
+		echo "ERROR: package graphviz is not installed"
+		echo "       Run pacman -S graphviz to install it"
+		exit 1
+	fi
+fi
+
+if [ ! -r /etc/pacman.conf ]; then
+	echo "ERROR: unable to read /etc/pacman.conf"
+	exit 1
+else
+	eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf)
+fi
+
+pac_db="${DBPath:-/var/lib/pacman}/local"
+
+if [ ! -d "$pac_db" ] ; then
+	echo "ERROR: pacman database directory ${pac_db} not found"
+	exit 1
+fi
+# Env End
+
+
+# Program starts
+_main(){
+	for pkg_name in ${options[@]} ; do
+		[ $graphviz -eq 1 ] && echo -e "\"START\" -> \"$pkg_name\" ;"
+		_tree "$pkg_name" 0
+		if [ $nodup -eq 1 ]; then
+			for pkg_tree in ${dep_list[@]} ; do
+				echo "$pkg_tree"
+			done
+		fi
+	done
+	if [ $silent -eq 0 ]; then
+		echo -ne '\033[0m' # return colors to normal?
+		echo -ne '\033[?25h' #return cursor to normal?
+	fi
+}
+
+
+if [ $graphviz -eq 1 ]; then
+	root_pkgs="${options[@]}"
+	# Uncomment for the "generated by pactree" node in graphviz
+	#advert="xyz [height=0.07, fontsize=8.0, label=\"GENERATED WITH PACTREE\",shape=box,color="black",style=filled,fontcolor="white"];\n"
+	if [ $reversed_dep -eq 0 ]; then
+		file_extension="deps.$gformat"
+	else
+		file_extension="reqs.$gformat"
+	fi
+	echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.$file_extension"
+else _main
+fi
+
+# vim: set ts=2 sw=2 noet:

contrib/re-pacman

@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-#   re-pacman: regenerate a pacman package based on installed files and the
-#   pacman database entries.  Useful for reuse, or possible config file
-#   extension
-#  
-#   Copyright (c) 2006 Aaron Griffin <aaron@archlinux.org>
-#  
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-#TODO
-#   * Check for md5 changes in backup lines and change pkgrel
-
-pacinfo () {
-	[ $# -ne 2 ] && return 1
-	#use echo to strip spaces
-	echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-)
-}
-
-make_pkginfo () {
-	echo "# Generated by re-pacman 1.0.0"
-	echo "# On $(date)"
-	echo "pkgname =$(pacinfo ${1} Name)"
-	echo "pkgver =$(pacinfo ${1} Version)"
-	echo "pkgdesc =$(pacinfo ${1} Description)"
-	echo "url =$(pacinfo ${1} URL)"
-	echo "builddate =$(pacinfo ${1} 'Build Date')"
-	echo "packager =$(pacinfo ${1} Packager)"
-	echo "size =$(pacinfo ${1} Size)"
-	echo "arch =$(pacinfo ${1} Architecture)"
-	deps=$(pacinfo ${1} 'Depends On')
-	for d in ${deps}; do
-		echo "depend = ${d}"
-	done
-}
-
-LANG="POSIX"
-
-if [ $# -ne 1 ]; then
-	echo "usage: re-pacman <installed package name>"
-	exit 1
-fi
-
-ver=$(pacinfo ${1} Version)
-if [ "x${ver}" = "x" ]; then
-	echo "Package '${1}' not found, aborting."
-	exit 1
-fi
-
-echo ":: Cleaning up old files"
-rm -f .PKGINFO "${1}-${ver}.pkg.tar.gz"
-
-echo ":: Building PKGINFO"
-make_pkginfo ${1} > .PKGINFO
-
-flist=".PKGINFO"
-flist="${flist} $(pacman -Ql ${1} | sed 's|\w* \(.*\)|/\1|g' | grep -v '/$')"
-
-echo ":: Building final package tarball"
-echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null
-
-rm -f .PKGINFO
-echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation"
-
-# vim: set ts=2 sw=2 noet:

contrib/vimproject

@@ -1,96 +0,0 @@
-This is a project file for the vim-project
-plugin.  I like it, so decided to contribute
-this to the main repo.
-$ pacman -S vim-project
-change the pacman= path below
-$ vim
-:Project vimproject
-
-pacman=~/devel/pacman-lib CD=. flags=S {
- Makefile.am
- configure.ac
- libalpm=lib/libalpm/ filter="*.c *.h *.am"{
-  add.c
-  alpm.c
-  alpm_list.c
-  backup.c
-  be_files.c
-  cache.c
-  conflict.c
-  db.c
-  deps.c
-  error.c
-  group.c
-  handle.c
-  log.c
-  md5.c
-  package.c
-  provide.c
-  remove.c
-  server.c
-  sync.c
-  trans.c
-  util.c
-  add.h
-  alpm.h
-  alpm_list.h
-  backup.h
-  cache.h
-  conflict.h
-  db.h
-  deps.h
-  error.h
-  group.h
-  handle.h
-  log.h
-  md5.h
-  package.h
-  provide.h
-  remove.h
-  server.h
-  sync.h
-  trans.h
-  util.h
-  Makefile.am
-  Makefile.in
- }
- pacman=src/pacman/ filter="*.c *.h *.am" {
-  add.c
-  conf.c
-  deptest.c
-  downloadprog.c
-  log.c
-  package.c
-  pacman.c
-  query.c
-  remove.c
-  sync.c
-  trans.c
-  upgrade.c
-  util.c
-  add.h
-  conf.h
-  deptest.h
-  downloadprog.h
-  log.h
-  package.h
-  query.h
-  remove.h
-  sync.h
-  trans.h
-  upgrade.h
-  util.h
-  Makefile.am
- }
- utils=src/util filter="*.c *.h *.am" {
-  testpkg.c
-  vercmp.c
-  Makefile.am
- }
- contrib=contrib CD=. {
-  bash_completion
-  pacsearch
-  vimproject
-  zsh_completion
- }
-}

contrib/vimprojects

@@ -0,0 +1,25 @@
+This is a project file
+for the vim-project plugin.
+Save it as ~/.vimprojects
+
+$ pacman -S vim-project
+change the pacman path below
+$ vim
+:Project
+
+Press \r in the project view
+on a project name to generate
+the list of files
+
+pacman=~/devel/pacman/ CD=. filter="*.ac *.am" flags=S {
+  libalpm=lib/libalpm/ filter="*.c *.h *.am" {
+  }
+  pacman=src/pacman/ filter="*.c *.h *.am" {
+  }
+  scripts=scripts/ filter="*.sh.in *.py.in *.am" {
+  }
+  utils=src/util filter="*.c *.h *.am" {
+  }
+  contrib=contrib CD=. {
+  }
+}

contrib/zsh_completion

@@ -6,7 +6,6 @@ typeset -A opt_args
 
 # options for passing to _arguments: main pacman commands
 _pacman_opts_commands=(
-	'-A[Add a package to the system]'
 	'-Q[Query the package database]'
 	'-R[Remove a package from the system]'
 	'-S[Synchronize packages]'
@@ -27,13 +26,14 @@ _pacman_opts_common=(
 	'--noconfirm[Do not ask for confirmation]'
 	'--noprogressbar[Do not show a progress bar when downloading files]'
 	'--noscriptlet[Do not execute the install scriptlet if one exists]'
+	'--print[Only print the targets instead of performing the operation]'
 )
 
-# options for passing to _arguments: options for --add and --update commands
+# options for passing to _arguments: options for --upgrade commands
 _pacman_opts_pkgfile=(
 	'-d[Skip dependency checks]'
 	'-f[Overwrite conflicting files]'
-	'*:package file:_files -g "*.pkg.tar.gz(.)"'
+	'*:package file:_files -g "*.pkg.tar.*(.)"'
 )
 
 # options for passing to _arguments: subactions for --query command
@@ -51,6 +51,7 @@ _pacman_opts_query_modifiers=(
 	'-e[List packages explicitly installed]'
 	'-i[View package information]'
 	'-ii[View package information including backup files]'
+	'-k[Check package files]'
 	'-l[List package contents]'
 	'-m[List installed packages not found in sync db(s)]'
 	'-t[List packages not required by any package]'
@@ -78,7 +79,6 @@ _pacman_opts_sync_actions=(
 # options for passing to _arguments: options for --sync command
 _pacman_opts_sync_modifiers=(
 	'-d[Skip dependency checks]'
-	'-e[Install dependencies only]'
 	'-f[Overwrite conflicting files]'
 	'-i[View package information]'
 	'-l[List all packages in a repository]'
@@ -91,15 +91,9 @@ _pacman_opts_sync_modifiers=(
 	'*--ignoregroup[Ignore a group upgrade]:package group:
 		_pacman_completions_all_groups'
 	'--asdeps[Install packages as non-explicitly installed]'
+	'--asexplicit[Install packages as explicitly installed]'
 )
 
-# handles --action subcommand
-_pacman_action_add() {
-	_arguments -s : \
-		"$_pacman_opts_common[@]" \
-		"$_pacman_opts_pkgfile[@]"
-}
-
 # handles --help subcommand
 _pacman_action_help() {
 	_arguments -s : \
@@ -127,7 +121,7 @@ _pacman_action_query() {
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \
-				'*:package file:_files -g "*.pkg.tar.gz"'
+				'*:package file:_files -g "*.pkg.tar.*"'
 				;;
 		query_group)
 			_arguments -s : \
@@ -290,7 +284,6 @@ _pacman_get_command() {
 # main dispatcher
 _pacman() {
 	case $words[2] in
-		-A*)  _pacman_action_add      ;;
 		-Q*g*) # ipkg groups
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
@@ -303,11 +296,11 @@ _pacman() {
 				"$_pacman_opts_query_modifiers[@]" \
 				'*:package file:_files'
 				;;
-		-Q*p*) # file *.pkg.tar.gz
+		-Q*p*) # file *.pkg.tar.*
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \
-				'*:package file:_files -g "*.pkg.tar.gz"'
+				'*:package file:_files -g "*.pkg.tar.*"'
 				;;
 		-Q*)  _pacman_action_query    ;;
 		-R*)  _pacman_action_remove   ;;

doc/.gitignore

@@ -6,5 +6,7 @@ pacman.8
 pacman.conf.5
 repo-add.8
 repo-remove.8
+*.css
+*.html
 *.xml
 man3

doc/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.5.2
+# Doxyfile 1.5.5
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -28,7 +28,8 @@ FULL_PATH_NAMES        = NO
 STRIP_FROM_PATH        = 
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
+QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
 DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
@@ -37,10 +38,14 @@ TAB_SIZE               = 4
 ALIASES                = 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
+TYPEDEF_HIDES_STRUCT   = NO
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -49,6 +54,7 @@ EXTRACT_PRIVATE        = NO
 EXTRACT_STATIC         = NO
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -60,6 +66,7 @@ SHOW_INCLUDE_FILES     = YES
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
+SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
@@ -126,6 +133,10 @@ HTML_FOOTER            =
 HTML_STYLESHEET        = 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+HTML_DYNAMIC_SECTIONS  = NO
 CHM_FILE               = 
 HHC_LOCATION           = 
 GENERATE_CHI           = NO
@@ -194,7 +205,9 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = ../..
 INCLUDE_FILE_PATTERNS  = *.h
-PREDEFINED             = HAVE_CONFIG_H= SYMHIDDEN= SYMEXPORT=
+PREDEFINED             = HAVE_CONFIG_H= \
+                         SYMHIDDEN= \
+                         SYMEXPORT=
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
@@ -227,6 +240,7 @@ DOT_IMAGE_FORMAT       = png
 DOT_PATH               = 
 DOTFILE_DIRS           = 
 DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 3
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES

doc/Makefile.am

@@ -14,7 +14,27 @@ ASCIIDOC_MANS = \
 
 DOXYGEN_MANS = $(wildcard man3/*.3)
 
+HTML_MANPAGES = \
+	pacman.8.html \
+	makepkg.8.html \
+	repo-add.8.html \
+	PKGBUILD.5.html \
+	makepkg.conf.5.html \
+	pacman.conf.5.html \
+	libalpm.3.html
+
+HTML_OTHER = \
+	index.html \
+	submitting-patches.html \
+	translation-help.html \
+	HACKING.html
+
+HTML_DOCS = \
+	$(HTML_MANPAGES) \
+	$(HTML_OTHER)
+
 EXTRA_DIST = \
+	asciidoc.conf \
 	pacman.8.txt \
 	makepkg.8.txt \
 	repo-add.8.txt \
@@ -24,13 +44,27 @@ EXTRA_DIST = \
 	pacman.conf.5.txt \
 	libalpm.3.txt \
 	footer.txt \
+	index.txt \
+	submitting-patches.txt \
+	translation-help.txt \
 	Doxyfile \
 	$(ASCIIDOC_MANS) \
 	$(DOXYGEN_MANS)
 
 # Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = *.xml
-MAINTAINERCLEANFILES = $(ASCIIDOC_MANS)
+MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8
+
+# Ensure manpages are fresh when building a dist tarball
+dist-hook:
+	$(MAKE) $(AM_MAKEFLAGS) clean
+	$(MAKE) $(AM_MAKEFLAGS) all
+
+if USE_GIT_VERSION
+GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty
+REAL_PACKAGE_VERSION = $(GIT_VERSION)
+else
+REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
+endif
 
 man_MANS =
 dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8
@@ -38,39 +72,59 @@ dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8
 if USE_DOXYGEN
 man_MANS += $(DOXYGEN_MANS)
 
-all: doxygen.in
+all-local: doxygen.in
 
 doxygen.in:
 	$(DOXYGEN) $(srcdir)/Doxyfile
 endif
 
-if USE_ASCIIDOC
+html: $(HTML_DOCS)
+
+pkgdatadir = ${datadir}/${PACKAGE}
+
 ASCIIDOC_OPTS = \
 	-f asciidoc.conf \
-	-a pacman_version="$(PACKAGE_VERSION)" \
+	-a pacman_version="$(REAL_PACKAGE_VERSION)" \
 	-a pacman_date="`date +%Y-%m-%d`" \
+	-a pkgdatadir=$(pkgdatadir) \
 	-a sysconfdir=$(sysconfdir)
+
 A2X_OPTS = \
+	--no-xmllint \
 	-d manpage \
 	-f manpage \
-	--xsltproc-opts='-param man.endnotes.list.enabled 0' \
-	--xsltproc-opts='-param man.endnotes.are.numbered 0'
-
-$(ASCIIDOC_MANS):
-	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
+	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
 
 # These rules are due to the includes and files of the asciidoc text
 $(ASCIIDOC_MANS): asciidoc.conf footer.txt
-pacman.8: pacman.8.txt
-makepkg.8: makepkg.8.txt
-repo-add.8: repo-add.8.txt
-PKGBUILD.5: PKGBUILD.5.txt PKGBUILD-example.txt
-makepkg.conf.5: makepkg.conf.5.txt
-pacman.conf.5: pacman.conf.5.txt
-libalpm.3: libalpm.3.txt
+	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
+
+%.html: %.txt
+	asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt
+	dos2unix $@
+
+HACKING.html: ../HACKING
+	asciidoc $(ASCIIDOC_OPTS) -a linkcss -o $@ ../HACKING
+	dos2unix $@
+
+# Customizations for certain HTML docs
+$(HTML_MANPAGES): asciidoc.conf footer.txt
+$(HTML_OTHER): asciidoc.conf
+%.8.html: ASCIIDOC_OPTS += -d manpage
+%.5.html: ASCIIDOC_OPTS += -d manpage
+%.3.html: ASCIIDOC_OPTS += -d manpage
+
+# Dependency rules
+pacman.8 pacman.8.html: pacman.8.txt
+makepkg.8 makepkg.8.html: makepkg.8.txt
+repo-add.8 repo-add.8.html: repo-add.8.txt
+PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt
+makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt
+pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt
+libalpm.3 libalpm.3.html: libalpm.3.txt
 # this one is just a symlink
 repo-remove.8: repo-add.8
-	ln -s repo-add.8 repo-remove.8
-endif
+	rm -f repo-remove.8
+	$(LN_S) repo-add.8 repo-remove.8
 
 # vim:set ts=2 sw=2 noet:

doc/PKGBUILD-example.txt

@@ -1,10 +1,10 @@
-# Maintainer: judd <jvinet@zeroflux.org>
+# Maintainer: Joe User <joe.user@example.com>
 
 pkgname=patch
 pkgver=2.5.4
 pkgrel=3
 pkgdesc="A utility to apply patch files to original sources"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/patch/patch.html"
 license=('GPL')
 groups=('base-devel')
@@ -13,8 +13,8 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make prefix=$pkgdir/usr install
 }

doc/PKGBUILD.5.txt

@@ -20,22 +20,30 @@ This manual page is meant to describe general rules about PKGBUILDs. Once a
 PKGBUILD is written, the actual package is built using makepkg and installed
 with pacman.
 
-NOTE: If you are using Arch Linux and have a local copy of the Arch Build
-System (ABS) tree on your computer, or are using another distribution that
-provides a similar tree of build files, you can copy the provided
-PKGBUILD.proto file to a new package build directory and make customizations to
-suit your needs. An up to date prototype file can also be found in the source
-distribution of this package.
+NOTE: An example PKGBUILD, useful for reference, is located in '{pkgdatadir}'.
+Also located there are other example files such as a ChangeLog and an install
+script. You can copy the provided PKGBUILD.proto file to a new package build
+directory and make customizations to suit your needs.
 
 
 Options and Directives
 ----------------------
+The following is a list of standard options and directives available for use
+in a PKGBUILD. These are all understood and interpreted by makepkg, and most
+will be directly transferred to the built package.
+
+If you need to create any custom variables for use in your build process, it is
+recommended to name your custom variables with an '_' (underscore) prefix.
+This will prevent any possible name clashes with internal makepkg variables.
+For example, to store the base kernel version in a variable, use something
+similar to `$_basekernver`.
+
 *pkgname*::
 	The name of the package. This has be a unix-friendly name as it will be
 	used in the package filename.
 
 *pkgver*::
-	The version of the software as released from the author (e.g. \'2.7.1').
+	The version of the software as released from the author (e.g. '2.7.1').
 
 *pkgrel*::
 	This is the release number specific to the Arch Linux release. This
@@ -55,19 +63,25 @@ Options and Directives
 	This field specifies the license(s) that apply to the package.
 	Commonly-used licenses are found in '/usr/share/licenses/common'. If you
 	see the package's license there, simply reference it in the license
-	field (e.g. `$$license=('GPL')$$`). If the package provides a license not
+	field (e.g. `license=('GPL')`). If the package provides a license not
 	found in '/usr/share/licenses/common', then you should include the license
-	in the package itself and set `$$license=('custom')$$` or
-	`$$license=('custom:LicenseName')$$`. The license should be placed in
+	in the package itself and set `license=('custom')` or
+	`license=('custom:LicenseName')`. The license should be placed in
 	'$pkgdir/usr/share/licenses/$pkgname' when building the package. If
 	multiple licenses are applicable for a package, list all of them:
-	`$$license=('GPL' 'FDL')$$`.
+	`license=('GPL' 'FDL')`.
 
 *install*::
 	Specifies a special install script that is to be included in the package.
 	This file should reside in the same directory as the PKGBUILD, and will
 	be copied into the package by makepkg. It does not need to be included
-	in the source array (e.g. `$$install=pkgname.install$$`).
+	in the source array (e.g. `install=pkgname.install`).
+
+*changelog*::
+	Specifies a changelog file that is to be included in the package.
+	This file should reside in the same directory as the PKGBUILD, and will
+	be copied into the package by makepkg. It does not need to be included
+	in the source array (e.g. `changelog=$pkgname.changelog`).
 
 *source (array)*::
 	An array of source files required to build the package. Source files
@@ -77,6 +91,10 @@ Options and Directives
 	variables if possible when specifying the download location. Any files
 	that are compressed will automatically be extracted, unless found in
 	the noextract array listed below.
++
+It is also possible to specify an optional filename, which is helpful
+with weird URLs and for handling multiple source files with the same
+name. The syntax is: `source=('filename::url')`.
 
 *noextract (array)*::
 	An array of filenames corresponding to those from the source array. Files
@@ -89,14 +107,13 @@ Options and Directives
 	source array (in the same order). makepkg will use this to verify source
 	file integrity during subsequent builds. To easily generate md5sums, run
 	``makepkg -g >> PKGBUILD''. If desired, move the md5sums line to an
-	appropriate location. *NOTE:* makepkg supports multiple integrity
-	algorithms and their corresponding arrays (i.e. sha1sums for the SHA1
-	algorithm); however, official packages use only md5sums for the time
-	being.
+	appropriate location.
 
-*sha1sums, etc.*::
-	Alternative integrity checks that makepkg supports, as noted in md5sums
-	above.
+*sha1sums, sha256sums, sha384sums, sha512sums (arrays)*::
+	Alternative integrity checks that makepkg supports; these all behave
+	similar to the md5sums option described above. To enable use and generation
+	of these checksums, be sure to set up the `INTEGRITY_CHECK` option in
+	linkman:makepkg.conf[5].
 
 *groups (array)*::
 	An array of symbolic names that represent groups of packages, allowing
@@ -105,7 +122,8 @@ Options and Directives
 
 *arch (array)*::
 	Defines on which architectures the given package is available (e.g.
-	`$$arch=('i686' 'x86_64')$$`).
+	`arch=('i686' 'x86_64')`). Packages that contain no architecture specific
+	files may use arch=('any').
 
 *backup (array)*::
 	A space-delimited array of filenames, without preceding slashes, that
@@ -127,11 +145,11 @@ Options and Directives
 	depends.
 
 *optdepends (array)*::
-	An array of optional packages (and accompanying reasons) that are not
-	essential to the package, but would offer increased functionality or other
-	features when installed. optdepends are currently for informational
-	purposes only and are not utilized by pacman during dependency resolution.
-	The format should be similar to the following:
+	An array of packages (and accompanying reasons) that are not essential for
+	base functionality, but may be necessary to make full use of the contents
+	of this package. optdepends are currently for informational purposes only
+	and are not utilized by pacman during dependency resolution. The format
+	for specifying optdepends is:
 
 	optdepends=('fakeroot: for makepkg usage as normal user')
 
@@ -147,7 +165,9 @@ Options and Directives
 	depend on 'cron' rather than 'dcron OR fcron'.
 	Versioned provisions are also possible, in the 'name=version' format.
 	For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0'
-	dependency of other packages.
+	dependency of other packages. Provisions involving the '>' and '<'
+	operators are invalid as only specific versions of a package may be
+	provided.
 
 *replaces (array)*::
 	An array of packages that this package should replace, and can be used
@@ -172,8 +192,8 @@ Options and Directives
 		disable this option.
 
 	*docs*;;
-		Save doc and info directories. If you wish to delete doc and
-		info directories, specify `!docs` in the array.
+		Save doc directories. If you wish to delete doc directories,
+		specify `!docs` in the array.
 
 	*libtool*;;
 		Leave libtool (.la) files in packages. Specify `!libtool` to
@@ -182,6 +202,9 @@ Options and Directives
 	*emptydirs*;;
 		Leave empty directories in packages.
 
+	*zipman*;;
+		Compress man and info pages with gzip.
+
 	*ccache*;;
 		Allow the use of ccache during build. More useful in its negative
 		form `!ccache` with select packages that have problems building
@@ -202,9 +225,65 @@ Options and Directives
 		Force the package to be upgraded by a pacman system upgrade
 		operation, even if the version number would normally not trigger
 		such an upgrade. This is useful when the version numbering scheme
-		of a package changes (or is alphanumeric).
+		of a package changes (or is alphanumeric). See linkman:pacman[8] for
+		more information on version comparisons.
 
 
+build() Function
+----------------
+In addition to the above directives, the optional build() bash function usually
+comprises the remainder of the PKGBUILD. This is directly sourced and executed by
+makepkg, so anything that bash or the system has available is available for use
+here. Be sure any exotic commands used are covered by `makedepends`.
+
+All of the above variables such as `pkgname` and `pkgver` are available for use
+in the build function. In addition, makepkg defines three variables for your
+use during the build and install process. These three variables are as follows:
+
+*startdir*::
+	This contains the absolute path to the directory where the PKGBUILD was
+	located, which is usually the output of `$(pwd)` when makepkg is started.
+
+*srcdir*::
+	This points to the directory where makepkg extracts or copies all source
+	files.
+
+*pkgdir*::
+	This points to the directory where makepkg bundles the installed package
+	(this directory will become the root directory of your built package).
+
+If you create any variables of your own in the build function, it is
+recommended to use the bash `local` keyword to scope the variable to inside
+the build function.
+
+package() Function
+------------------
+An optional package() function can be specified in addition to the build() function.
+This function is run immediately after the build() function. When specified in
+combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot
+usage will be limited to running the packaging stage. An existing build() function
+will be run as the user calling makepkg.
+
+Package Splitting
+-----------------
+makepkg supports building multiple packages from a single PKGBUILD. This is achieved
+by assigning an array of package names to the `pkgname` directive. Each split package
+uses a corresponding packaging function with name `package_foo()`, where `foo` is the
+name of the split package.
+
+All options and directives for the split packages default to the global values given
+within the PKGBUILD. However, some of these can be overridden within each split
+package's packaging function. The following variables can be overridden: `pkgver`,
+`pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, `optdepends`,
+`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`.
+
+An optional global directive is available when building a split package:
+
+*pkgbase*::
+	The name used to refer to the group of packages in the output of makepkg
+	and in the naming of source-only tarballs.  If not specified, the first
+	element in the `pkgname` array is used.
+
 Install/Upgrade/Remove Scripting
 --------------------------------
 Pacman has the ability to store and execute a package-specific script when it
@@ -243,9 +322,8 @@ same directory as the PKGBUILD script. Then use the install directive:
 	install=pkgname.install
 
 The install script does not need to be specified in the source array. A
-template install file is available with the source distribution of this
-program, or one may be provided by your distribution. For example, Arch Linux
-provides prototype install files in the ABS tree.
+template install file is available in '{pkgdatadir}' as 'proto.install' for
+reference with all of the available functions defined.
 
 
 Development Directives
@@ -318,11 +396,10 @@ The following is an example PKGBUILD for the 'patch' package. For more
 examples, look through the build files of your distribution's packages. For
 those using Arch Linux, consult the ABS tree.
 
-[sh]
-source~~~~~
+[source,sh]
+-------------------------------
 include::PKGBUILD-example.txt[]
-source~~~~~
-
+-------------------------------
 
 See Also
 --------

doc/asciidoc.conf

@@ -8,7 +8,11 @@
 # Show man link as: <command>(<section>); if section is defined, else just show
 # the command.
 
+[macros]
+(?su)[\\]?(?P<name>linkman):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+
 [attributes]
+asterisk=&#42;
 plus=&#43;
 caret=&#94;
 startsb=&#91;
@@ -30,13 +34,7 @@ ifndef::docbook-xsl-172[]
 [listingblock]
 <example><title>{title}</title>
 <literallayout>
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
 |
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
 endif::docbook-xsl-172[]

doc/footer.txt

@@ -15,9 +15,16 @@ mailto:pacman-dev@archlinux.org[].
 
 Authors
 -------
+
+Current maintainers:
+
+* Dan McGee <dan@archlinux.org>
+* Xavier Chantry <shiningxc@gmail.com>
+* Aaron Griffin <aaron@archlinux.org>
+
+Past contributors:
+
 * Judd Vinet <jvinet@zeroflux.org>
 * Aurelien Foret <aurelien@archlinux.org>
-* Aaron Griffin <aaron@archlinux.org>
-* Dan McGee <dan@archlinux.org>
 
 See the 'AUTHORS' file for additional contributors.

doc/index.txt

@@ -0,0 +1,200 @@
+Pacman Home Page
+================
+
+A simple library-based package manager.
+
+Introduction
+------------
+pacman is a utility which manages software packages in Linux. It uses simple
+compressed files as a package format, and maintains a text-based package
+database (more of a hierarchy), just in case some hand tweaking is necessary.
+
+pacman does not strive to "do everything." It will add, remove and upgrade
+packages in the system, and it will allow you to query the package database for
+installed packages, files and owners. It also attempts to handle dependencies
+automatically and can download packages from a remote server.
+
+History
+~~~~~~~
+Version 2.0 of pacman introduced the ability to sync packages (the `--sync`
+option) with a master server through the use of package databases. Prior to
+this, packages would have to be installed manually using the `--add` and
+`--upgrade` operations.
+
+Version 3.0 was the switch to a two-part pacman- a backend named libalpm
+(library for Arch Linux Package Management), and the familiar pacman frontend.
+Speed in many cases was improved, along with dependency and conflict resolution
+being able to handle a much wider variety of cases. The switch to a
+library-based program should also make it easier in the future to develop
+alternative front ends.
+
+Documentation
+-------------
+
+Manpages
+~~~~~~~~
+There are several manpages available for the programs, utilities, and
+configuration files dealing with pacman.
+
+* linkman:PKGBUILD[5]
+* linkman:libalpm[3]
+* linkman:makepkg[8]
+* linkman:makepkg.conf[5]
+* linkman:pacman[8]
+* linkman:pacman.conf[5]
+* linkman:repo-add[8]
+
+Changelog
+~~~~~~~~~
+For a good idea of what is going on in pacman development, take a look at the
+link:http://projects.archlinux.org/?p=pacman.git[Gitweb] summary
+page for the project.
+
+See the most recent
+link:http://projects.archlinux.org/?p=pacman.git;a=blob_plain;f=NEWS;hb=HEAD[NEWS]
+file for a not-as-frequently-updated list of changes. However, this should
+contain the biggest changes in a format more concise than the commit log.
+
+
+Releases
+--------
+
+`------------`-------
+Date         Version
+---------------------
+2010-06-16   v3.4.0
+2009-11-10   v3.3.3
+2009-10-05   v3.3.2
+2009-09-22   v3.3.1
+2009-08-02   v3.3.0
+2009-01-05   v3.2.2
+2008-08-26   v3.2.1
+2008-07-30   v3.2.0
+2008-04-01   v3.1.4
+2008-03-06   v3.1.3
+2008-02-20   v3.1.2
+2008-01-20   v3.1.1
+2008-01-09   v3.1.0
+2007-09-16   v3.0.6
+2007-06-17   v3.0.5
+2007-05-08   v3.0.4
+2007-04-28   v3.0.3
+2007-04-23   v3.0.2
+2007-04-04   v3.0.1
+2007-03-25   v3.0.0
+2006-02-02   v2.9.8
+2005-09-16   v2.9.7
+2005-06-10   v2.9.6
+2005-01-11   v2.9.5
+2004-12-19   v2.9.4
+2004-12-18   v2.9.3
+2004-09-25   v2.9.2
+2004-09-24   v2.9.1
+2004-09-18   v2.9
+---------------------
+
+Source code for all releases is available at
+link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest
+available source tarball, unpack it in a directory, and run the three magic
+commands:
+
+    $ ./configure
+    $ make
+    # make install
+
+You may wish to read the options presented by `./configure --help` in order to
+set appropriate paths and build options that are correct for your system.
+
+Development
+-----------
+
+Mailing List
+~~~~~~~~~~~~
+There is a mailing list devoted to pacman development, hosted by Arch Linux.
+link:http://www.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or
+link:http://www.archlinux.org/pipermail/pacman-dev/[view the archives].
+
+Source Code
+~~~~~~~~~~~
+Development of pacman is currently done in GIT. The central repository is
+hosted by Arch Linux, although some of the developers have their own trees (ask
+on the above mailing lists if you are interested in finding the locations of
+these trees).
+
+The current development tree can be fetched with the following command:
+
+    git clone git://projects.archlinux.org/pacman.git pacman
+
+which will fetch the full development history into a directory named pacman.
+You can browse the source as well using
+link:http://projects.archlinux.org/?p=pacman.git[Gitweb].
+
+If you are interested in hacking on pacman, it is highly recommended you join
+the mailing list mentioned above, as well as take a quick glance at our
+link:HACKING.html[HACKING] document.
+link:submitting-patches.html[submitting-patches] is also a recommended read.
+
+Not as familiar with code as you'd like to be, but still want to help out? If
+you speak a foreign language, you can help by either creating or updating a
+translation file for your native language. Instructions can be found in
+link:translation-help.html[translation-help].
+
+Other Utilities
+~~~~~~~~~~~~~~~
+Although the package manager itself is quite simple, many scripts have been
+developed that help automate building and installing packages. These are used
+extensively in link:http://archlinux.org[Arch Linux]. Most of these utilities
+are available in the Arch Linux projects
+link:http://projects.archlinux.org/[Gitweb browser].
+
+Utilities available:
+
+* link:http://projects.archlinux.org/?p=abs.git[abs] - ABS (Arch Build System), scripts to download  & use the Arch Linux PKGBUILD tree
+* link:http://projects.archlinux.org/?p=devtools.git[devtools] - tools to assist in packaging and dependency checking
+* link:http://projects.archlinux.org/?p=namcap.git[namcap] - a package analysis utility written in python
+* link:http://projects.archlinux.org/?p=pacbuild.git[pacbuild] - a package building system utilizing a daemon
+* link:http://projects.archlinux.org/?p=srcpac.git[srcpac] - a bash build-from-source pacman wrapper
+
+Bugs
+----
+If you find bugs (which is quite likely), please email them to the pacman-dev
+mailing last at mailto:pacman-dev@archlinux.org[] with specific information
+such as your commandline, the nature of the bug, and even the package database
+if it helps.
+
+You can also post a bug to the Archlinux bug tracker
+link:http://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
+bugs under the Pacman project.
+
+Pacman/libalpm in the Wild
+--------------------------
+Although Arch Linux is the primary user of pacman and libalpm, other
+distributions and projects also use pacman as a package management tool. In
+addition, there have been several projects started to provide a frontend GUI to
+pacman and/or libalpm.
+
+Arch derivatives:
+
+* link:http://archie.dotsrc.org/[Archie] - Arch Live on steroids
+* link:http://www.faunos.com/[FaunOS] - A portable, fully integrated operating system based on Arch Linux
+* link:http://larch.berlios.de/[larch] - A live CD/DVD/USB-stick construction kit for Arch Linux
+
+Other distributions:
+
+* link:http://www.delilinux.org/[DeLi Linux] - "Desktop Light" Linux, a Linux distribution for old computers
+* link:http://www.frugalware.org/[Frugalware Linux] - A general purpose Linux distribution for intermediate users (pacman is forked and maintained separately)
+
+Pacman/libalpm frontends:
+
+* link:http://shaman.iskrembilen.com/[Shaman] - A GUI frontend using Qt and libalpm
+
+Copyright
+---------
+pacman is Copyright (C) 2006-2010 Pacman Development Team
+<pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet
+<jvinet@zeroflux.org> and is licensed through the GNU General Public License,
+version 2 or later.
+
+/////
+vim: set ts=2 sw=2 syntax=asciidoc et:
+/////

doc/makepkg.8.txt

@@ -43,14 +43,7 @@ Options
 *-A, \--ignorearch*::
 	Ignore a missing or incomplete arch field in the build script. This is
 	for rebuilding packages from source when the PKGBUILD may be slightly
-	outdated and not updated with an `$$arch=('yourarch')$$` field.
-
-*-b, \--builddeps*::
-	Build missing dependencies from source. When makepkg finds missing
-	build-time or run-time dependencies, it will look for the dependencies'
-	PKGBUILD files under `SRCROOT` (set in linkman:makepkg.conf[5]). If it
-	finds them it will call makepkg to build and install the missing
-	dependencies. The child calls will be made with the `-b` and `-i` options.
+	outdated and not updated with an `arch=('yourarch')` field.
 
 *-c, \--clean*::
 	Clean up leftover work files and directories after a successful build.
@@ -59,6 +52,9 @@ Options
 	Removes all cached source files from the directory specified in `SRCDEST`
 	in linkman:makepkg.conf[5].
 
+*--config* <`/path/to/config`>::
+	Use an alternate config file instead of the `/etc/makepkg.conf` default;
+
 *-d, \--nodeps*::
 	Do not perform any dependency checks. This will let you override and
 	ignore any dependencies required. There is a good chance this option
@@ -85,10 +81,14 @@ Options
 
 *-g, \--geninteg*::
 	For each source file in the source array of PKGBUILD, download the file
-	if required and generate integrity checks. The integrity checks
-	generated are determined by the value of the INTEGRITY_CHECK array in
-	linkman:makepkg.conf[5]. This output can be redirected into your
-	PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`".
+	if required and generate integrity checks. The integrity checks generated
+	are determined by the checks present in the PKGBUILD, falling back to the
+	value of the INTEGRITY_CHECK array in makepkg.conf(5) if these are absent
+	This output can be redirected into your PKGBUILD for source validation
+	using "`makepkg -g >> PKGBUILD`".
+
+*--skipinteg*::
+	Do not perform any integrity checks, just print a warning instead.
 
 *-h, \--help*::
 	Output syntax and command line options.
@@ -123,22 +123,35 @@ Options
 
 *-r, \--rmdeps*::
 	Upon successful build, remove any dependencies installed by makepkg
-	during dependency auto-resolution (using `-b` or `-s`).
+	during dependency auto-resolution and installation when using `-s`.
 
 *-R, \--repackage*::
-	Repackage contents of pkg/ without rebuilding the package. This is
-	useful if you forgot a depend or install file in your PKGBUILD and the
-	build itself will not change.
+	Repackage contents of the package without rebuilding the package. This
+	is useful if you forgot a depend or install file in your PKGBUILD and
+	the build itself will not change.
 
 *-s, \--syncdeps*::
 	Install missing dependencies using pacman. When build-time or run-time
 	dependencies are not found, pacman will try to resolve them. If
 	successful, the missing packages will be downloaded and installed.
 
+*\--allsource*::
+	Do not actually build the package, but build a source-only tarball that
+	includes all sources, including those that are normally download via
+	makepkg. This is useful for passing a single tarball to another program
+	such as a chroot or remote builder. It will also satisfy requirements of
+	the GPL when distributing binary packages.
+
 *\--source*::
-	Do not actually build the package, but build a source-only tarball. This
-	is useful for passing a single tarball to another program such as a
-	chroot, remote builder, or an AUR upload.
+	Do not actually build the package, but build a source-only tarball that
+	does not include sources that can be fetched via a download URL. This is
+	useful for passing a single tarball to another program such as a chroot,
+	remote builder, or a tarball upload. Because integrity checks are verified,
+	all source files of the package need to be present or downloadable.
+
+*\--pkg <`list`>*::
+	Only build listed packages from a split package. The use of quotes is
+	necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"`
 
 *\--noconfirm*::
 	(Passed to pacman) Prevent pacman from waiting for user input before
@@ -157,6 +170,23 @@ separate utility 'versionpkg'. See linkman:PKGBUILD[5] for details on how to
 set up a development PKGBUILD.
 
 
+Environment Variables
+---------------------
+*PACMAN*::
+	The command that will be used to check for missing dependencies and to
+	install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U
+	operations must be supported by this command. If the variable is not
+	set or empty, makepkg will fall back to `pacman'.
+
+**PKGDEST=**"/path/to/folder"::
+	Folder where the resulting packages will be stored. Overrides the
+	corresponding value defined in linkman:makepkg.conf[5].
+
+**SRCDEST=**"/path/to/folder"::
+	Folder where the downloaded sources will be stored. Overrides the
+	corresponding value defined in linkman:makepkg.conf[5].
+
+
 Configuration
 -------------
 See linkman:makepkg.conf[5] for more details on configuring makepkg using the

doc/makepkg.conf.5.txt

@@ -34,9 +34,13 @@ Options
 **DLAGENTS=(**\'protocol::/path/to/command [options]' ...**)**::
 	Sets the download agents used to fetch source files specified with a URL in
 	the linkman:PKGBUILD[5] file. Options can be specified for each command as
-	well; the download URL is placed on the end of the command. This is more
-	flexible than the former `FTPAGENT` variable, as any protocol can have a
-	download agent. Several examples are provided in the default makepkg.conf.
+	well, and any protocol can have a download agent. Several examples are provided
+	in the default makepkg.conf.
+	+
+	If present, `%u` will be replaced with the download URL. Otherwise, the
+	download URL will be placed on the end of the command. If present, `%o` will
+	be replaced with the local filename, plus a ``.part'' extension, which allows
+	makepkg to handle resuming file downloads.
 
 **CARCH=**"carch"::
 	Specifies your computer architecture; possible values include such things
@@ -57,11 +61,16 @@ Options
 **CXXFLAGS=**"cxxflags"::
 	Flags used for the C++ compiler; see CFLAGS for more info.
 
+**LDFLAGS=**"ldflags"::
+	Flags used for the linker. Several options may be specified with common
+	usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on
+	available linker flags.
+
 **MAKEFLAGS=**"makeflags"::
 	This is often used to set the number of jobs used, for example, `-j2`.
 	Other flags that make accepts can also be passed.
 
-**BUILDENV=(**fakeroot !distcc color !ccache !xdelta**)**::
+**BUILDENV=(**fakeroot !distcc color !ccache**)**::
 	This array contains options that affect the build environment, the defaults
 	are shown here. All options should always be left in the array; to enable
 	or disable an option simply remove or place an ``!'' at the front of the
@@ -84,18 +93,13 @@ Options
 		be disabled for individual packages by placing `!ccache` in the
 		PKGBUILD options array.
 
-	*xdelta*;;
-		Generate an xdelta binary patch from previous to current package. The
-		previous package must be available in the makepkg cache directory for
-		this to occur.
-
 **DISTCC_HOSTS=**"host1 ..."::
 	If using DistCC, this is used to specify a space-delimited list of hosts
 	running in the DistCC cluster. In addition, you will want to modify your
 	`MAKEFLAGS`.
 
-**OPTIONS=(**strip !docs libtool emptydirs**)**::
-	This array contains options that affect the default packaging. All four are
+**OPTIONS=(**strip !docs libtool emptydirs zipman**)**::
+	This array contains options that affect the default packaging. They are
 	equivalent to options that can be placed in the PKGBUILD; the defaults are
 	shown here. All options should always be left in the array; to enable or
 	disable an option simply remove or place an ``!'' at the front of the
@@ -107,27 +111,67 @@ Options
 		option.
 
 	*docs*;;
-		Save doc and info directories. If you wish to delete doc and info
-		directories, specify `!docs' in the array.
+		Save doc directories. If you wish to delete doc directories, specify
+		`!docs` in the array. The directories affected are specified by the
+		`DOC_DIRS` variable.
 
 	*libtool*;;
-		Leave libtool (.la) files in packages. Specify `!libtool' to remove
+		Leave libtool (.la) files in packages. Specify `!libtool` to remove
 		them.
 
 	*emptydirs*;;
 		Leave empty directories in packages.
 
+	*zipman*;;
+		Compress manual (man and info) pages with gzip. The directories
+		affected are specified by the `MAN_DIRS` variable.
+
+	*purge*;;
+		Remove files specified by the `PURGE_TARGETS` variable from the
+		package.
+
 **INTEGRITY_CHECK=(**check1 ...**)**::
 	File integrity checks to use. Multiple checks may be specified; this
 	affects both generation and checking. The current valid options are:
 	`md5`, `sha1`, `sha256`, `sha384`, and `sha512`.
 
-**DOC_DIRS=(**usr/{,share/}{info,doc} ...**)**::
-	If "!docs" is specified in the OPTIONS array, this variable will
+**STRIP_BINARIES=**"--strip-all"::
+	Options to be used when stripping binaries. See linkman:strip[1]
+	for details.
+
+**STRIP_SHARED=**"--strip-unneeded"::
+	Options to be used when stripping shared libraries. See linkman:strip[1]
+	for details.
+
+**STRIP_STATIC=**"--strip-debug"::
+	Options to be used when stripping static libraries. See  linkman:strip[1]
+	for details.
+
+**MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**::
+	If `zipman` is specified in the OPTIONS array, this variable will
+	instruct makepkg where to look to compress manual (man and info)
+	pages. If you build packages that are located in opt/, you may need
+	to add the directory to this array. *NOTE:* Do not add the leading
+	slash to the directory name.
+
+**DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**::
+	If `!docs` is specified in the OPTIONS array, this variable will
 	instruct makepkg where to look to remove docs. If you build packages
 	that are located in opt/, you may need to add the directory to this
 	array. *NOTE:* Do not add the leading slash to the directory name.
 
+**STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**::
+	If `strip` is specified in the OPTIONS array, this variable will
+	instruct makepkg where to look to for files to strip. If you build
+	packages that are located in opt/, you may need to add the directory
+	to this array. *NOTE:* Do not add the leading slash to the directory
+	name.
+
+**PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**::
+	If `purge` is specified in the OPTIONS array, this variable will
+	instruct makepkg which files to remove from the package. This is
+	useful for index files that are added by multiple packages.
+
 **PKGDEST=**"/path/to/folder"::
 	If this value is not set, packages will by default be placed in the
 	current directory (location of the linkman:PKGBUILD[5]). Many people
@@ -139,11 +183,16 @@ Options
 	in the current directory. Many people like to keep all source files in
 	a central location for easy cleanup, so this path can be set here.
 
-**PACKAGER=**"John Doe <john@doe.com>"::
+**SRCPKGDEST=**"/path/to/folder"::
+	If this value is not set, source package files will be stored in
+	PKGDEST. Many people like to keep all source package files in
+	a central location for easy cleanup, so this path can be set here.
+
+**PACKAGER=**"John Doe <john@example.com>"::
 	This value is used when querying a package to see who was the builder.
 	It is recommended you change this to your name and email address.
 
-*BUILDSCRIPT*, *PKGEXT*, *SRCEXT*, *DB_COMPRESSION*, *DB_CHECKSUMS*::
+*PKGEXT*, *SRCEXT*::
 	Do not touch these unless you know what you are doing.
 
 

doc/pacman.8.txt

@@ -22,28 +22,30 @@ hooks, and the ability to sync your local machine with a remote ftp server to
 automatically upgrade packages. Pacman packages are a zipped tar format.
 
 Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the
-"Arch Linux Package Management" library. This library allows alternative front
-ends to be written (for instance, a GUI front end).
+``Arch Linux Package Management'' library. This library allows alternative
+front ends to be written (for instance, a GUI front end).
 
 
 Operations
 ----------
-*-A, \--add* (deprecated)::
-	Add a package to the system. Either a URL or file path can be specified.
-	The package will be uncompressed into the installation root and the
-	database will be updated. The package will not be installed if another
-	version is already installed. *NOTE*: please use '\--upgrade' in place of
-	this option.
+*-D, \--database*::
+	Modify the package database. This options allows you to modify certain
+	attributes of the installed packages in pacman's database. At the
+	moment, you can only change the install reason using '\--asdeps' and
+	'\--asexplicit' options.
 
 *-Q, \--query*::
 	Query the package database. This operation allows you to view installed
 	packages and their files, as well as meta-information about individual
 	packages (dependencies, conflicts, install date, build date, size). This
 	can be run against the local package database or can be used on
-	individual '.tar.gz' packages. See <<QO,Query Options>> below.
+	individual '.tar.gz' packages. In the first case, if no package names
+	are provided in the command line, all installed packages will be
+	queried. Additionally, various filters can be applied on the package
+	list. See <<QO,Query Options>> below.
 
 *-R, \--remove*::
-	Remove a package from the system. Groups can also be specified to be
+	Remove package(s) from the system. Groups can also be specified to be
 	removed, in which case every package in that group will be removed.
 	Files belonging to the specified package will be deleted, and the
 	database will be updated. Most configuration files will be saved
@@ -56,7 +58,9 @@ Operations
 	example, `pacman -S qt` will download and install qt and all the
 	packages it depends on. If a package name exists in more than one repo, the
 	repo can be explicitly specified to clarify the package to install:
-	`pacman -S testing/qt`.
+	`pacman -S testing/qt`. You can also specify version requirements:
+	`pacman -S "bash>=3.2"`. (Quotes are needed, otherwise your shell
+	interprets ">" as redirection to file.)
 +
 In addition to packages, groups can be specified as well. For example, if
 gnome is a defined package group, then `pacman -S gnome` will install every
@@ -68,12 +72,27 @@ provide the same functionality as foo will be searched for. If any package is
 found, it will be installed.
 +
 You can also use `pacman -Su` to upgrade all packages that are out of date. See
-<<SO,Sync Options>> below.
+<<SO,Sync Options>> below. When upgrading, pacman performs version comparison
+to determine which packages need upgrading. This behavior operates as follows:
+
+  Alphanumeric:
+    1.0a < 1.0alpha < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0
+  Numeric:
+    1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0
+
+*-T, \--deptest*::
+	Check dependencies; this is useful in scripts such as makepkg to check
+	installed packages. This operation will check each dependency specified and
+	return a list of those which are not currently satisfied on the system.
+	This operation accepts no other options. Example usage: `pacman -T qt
+	"bash>=3.2"`.
 
 *-U, \--upgrade*::
-	Upgrade or add a package to the system. Either a URL or file path can be
-	specified. This is a "remove-then-add" process. See <<HCF,Handling Config
-	Files>> for an explanation on how pacman takes care of config files.
+	Upgrade or add package(s) to the system and install the required
+	dependencies from sync repos. Either a URL or file path can be
+	specified. This is a ``remove-then-add'' process. See <<UO,Upgrade
+	Options>> below; also see <<HCF,Handling Config Files>> for an explanation
+	on how pacman takes care of config files.
 
 *-V, \--version*::
 	Display version and exit.
@@ -86,16 +105,22 @@ You can also use `pacman -Su` to upgrade all packages that are out of date. See
 Options
 -------
 *\--asdeps*::
-	Install packages non-explicitly; in other works, fake their install reason
+	Install packages non-explicitly; in other words, fake their install reason
 	to be installed as a dependency. This is useful for makepkg and other
 	build from source tools that need to install dependencies before building
 	the package.
 
+*\--asexplicit*::
+	Install packages explicitly; in other words, fake their install reason to
+	be explicitly installed. This is useful if you want to mark a dependency
+	as explicitly installed so it will not be removed by the '\--recursive'
+	remove operation.
+
 *-b, \--dbpath* <'path'>::
 	Specify an alternative database location (a typical default is
 	``/var/lib/pacman'').  This should not be used unless you know what you are
 	doing. *NOTE*: if specified, this is an absolute path and the root path is
-	not automatically prepended. This behavior changed in pacman 3.1.0.
+	not automatically prepended.
 
 *-d, \--nodeps*::
 	Skips all dependency checks. Normally, pacman will always check a
@@ -113,19 +138,22 @@ Options
 	not be used as a way to install software into ``/usr/local'' instead of
 	``/usr''. This option is used if you want to install a package on a
 	temporary mounted partition which is "owned" by another system.
-	*NOTE*: If database path or logfile are not specified on either the
+	*NOTE*: if database path or logfile are not specified on either the
 	command line or in linkman:pacman.conf[5], their default location will
 	be inside this root path.
 
-*-v, --verbose*::
+*-v, \--verbose*::
 	Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
 
+*\--debug*::
+	Display debug messages. When reporting bugs, this option is recommended
+	to be used.
+
 *\--cachedir* <'dir'>::
 	Specify an alternative package cache location (a typical default is
 	``/var/cache/pacman/pkg''). Multiple cache directories can be specified,
 	and they are tried in the order they are passed to pacman. *NOTE*: this
-	is an absolute path, the root path is not automatically prepended. This
-	behavior changed in pacman 3.1.0.
+	is an absolute path, the root path is not automatically prepended.
 
 *\--config* <'file'>::
 	Specify an alternate configuration file.
@@ -135,7 +163,7 @@ Options
 	the installation root setting.
 
 *\--noconfirm*::
-	Bypass any and all "Are you sure?" messages. It's not a good idea to do
+	Bypass any and all ``Are you sure?'' messages. It's not a good idea to do
 	this unless you want to run pacman from a script.
 
 *\--noprogressbar*::
@@ -146,6 +174,19 @@ Options
 	If an install scriptlet exists, do not execute it. Do not use this
 	unless you know what you are doing.
 
+*\--arch* <'arch'>::
+	Specify an alternate architecture.
+
+*-p, \--print*::
+	Only print the targets instead of performing the actual operation (sync,
+	remove or upgrade).  Use '\--print-format' to specify how targets are
+	displayed.  The default format string is "%l", which displays url with '-S',
+	filename with '-U' and pkgname-pkgver with '-R'.
+
+*\--print-format* <'format'>::
+	Specify a printf-like format to control the output of the '\--print'
+	operation.  The possible are attributes are : %n for pkgname, %v for pkgver, %l
+	for location, %r for repo and %s for size.
 
 Query Options[[QO]]
 -------------------
@@ -154,16 +195,17 @@ Query Options[[QO]]
 	it will be shown if available.
 
 *-d, \--deps*::
-	List all packages installed as dependencies. This option can be combined
-	with '-t' for listing real orphans- packages that were installed as
-	dependencies but are no longer required by any installed package. ('-Qdt'
-	is equivalent to the pacman 3.0.X '-Qe' option.)
+	Restrict or filter output to packages installed as dependencies. This
+	option can be combined with '-t' for listing real orphans- packages that
+	were installed as dependencies but are no longer required by any
+	installed package. ('-Qdt' is equivalent to the pacman 3.0.X '-Qe'
+	option.)
 
 *-e, \--explicit*::
-	List all packages explicitly installed. This option can be combined with
-	'-t' to list top-level packages- those packages that were explicitly
-	installed but are not required by any other package. ('-Qet' is equivalent
-	to the pacman 2.9.X '-Qe' option.)
+	Restrict or filter output to packages explicitly installed. This option
+	can be combined with '-t' to list top-level packages- those packages
+	that were explicitly installed but are not required by any other
+	package. ('-Qet' is equivalent to the pacman 2.9.X '-Qe' option.)
 
 *-g, \--groups*::
 	Display all packages that are members of a named group. If a name is not
@@ -175,6 +217,11 @@ Query Options[[QO]]
 	'\--info' or '-i' flags will also display the list of backup files and
 	their modification states.
 
+*-k \--check*::
+	Check that all files owned by the given package(s) are present on the
+	system. If packages are not specified or filter flags are not provided,
+	check all installed packages.
+
 *-l, \--list*::
 	List all files owned by a given package. Multiple packages can be
 	specified on the command line.
@@ -193,17 +240,31 @@ Query Options[[QO]]
 	not an entry in the database. The file will be decompressed and queried.
 	This is useful in combination with '\--info' and '\--list'.
 
+*-q, \--quiet*::
+	Show less information for certain query operations. (This is useful when
+	pacman's output is processed in a script.) Search will only show package
+	names and not version, group, and description information; owns will
+	only show package names instead of "file is owned by pkg" messages; group
+	will only show package names and omit group names; list will only show
+	files and omit package names; check will only show pairs of package names
+	and missing files; a bare query will only show package names
+	rather than names and versions.
+
 *-s, \--search* <'regexp'>::
 	This will search each locally-installed package for names or
-	descriptions that match `regexp`.
+	descriptions that match `regexp`. When you include multiple search
+	terms, only packages with descriptions matching ALL of those terms will
+	be returned.
 
 *-t, \--unrequired*::
 	Restrict or filter output to packages not required by any currently
 	installed package.
 
 *-u, \--upgrades*::
-	Lists all packages that are out of date on the local system. This option
-	works best if the sync database is refreshed using '-Sy'.
+	Restrict or filter output to packages that are out of date on the local
+	system. (Only package versions are used to find outdated packages,
+	replacements are not checked here.) This option works best if the sync
+	database is refreshed using '-Sy'.
 
 
 Remove Options[[RO]]
@@ -213,7 +274,7 @@ Remove Options[[RO]]
 	or more target packages. This operation is recursive, and must be used
 	with care since it can remove many potentially needed packages.
 
-*-k, \--keep*::
+*-k, \--dbonly*::
 	Removes the database entry only. Leaves all files in place.
 
 *-n, \--nosave*::
@@ -226,7 +287,12 @@ Remove Options[[RO]]
 	that (A) they are not required by other packages; and (B) they were not
 	explicitly installed by the user. This operation is recursive and analogous
 	to a backwards '\--sync' operation, and helps keep a clean system without
-	orphans.
+	orphans. If you want to omit condition (B), pass this option twice.
+
+*-u, \--unneeded*::
+	Removes the targets that are not required by any other packages.
+	This is mostly useful when removing a group without using the '-c' option,
+	to avoid breaking any dependencies.
 
 
 Sync Options[[SO]]
@@ -241,10 +307,9 @@ Sync Options[[SO]]
 	packages that are no longer installed; use two to remove all packages
 	from the cache. In both cases, you will have a yes or no option to
 	remove packages and/or unused downloaded databases.
-
-*-e, \--dependsonly*::
-	Install all dependencies of a package, but not the specified package
-	itself. This is pretty useless and we're not sure why it even exists.
++
+If you use a network shared cache, see the 'CleanMethod' option in
+linkman:pacman.conf[5].
 
 *-g, \--groups*::
 	Display all the members for each package group specified. If no group
@@ -252,21 +317,26 @@ Sync Options[[SO]]
 	view all groups and their members.
 
 *-i, \--info*::
-	Display dependency and other information for a given package. This will
-	search through all repositories for a matching package.
+	Display information on a given sync database package. Passing two '\--info'
+	or '-i' flags will also display those packages in all repositories that
+	depend on this package.
 
 *-l, \--list*::
 	List all packages in the specified repositories. Multiple repositories
 	can be specified on the command line.
 
-*-p, \--print-uris*::
-	Print out URIs for each package that will be installed, including any
-	dependencies yet to be installed. These can be piped to a file and
-	downloaded at a later time, using a program like wget.
+*-q, \--quiet*::
+	Show less information for certain sync operations. (This is useful when
+	pacman's output is processed in a script.) Search will only show package
+	names and not repo, version, group, and description information; list
+	will only show package names and omit databases and versions; group will
+	only show package names and omit group names.
 
 *-s, \--search* <'regexp'>::
 	This will search each package in the sync databases for names or
-	descriptions that match `regexp`.
+	descriptions that match `regexp`. When you include multiple search
+	terms, only packages with descriptions matching ALL of those terms will
+	be returned.
 
 *-u, \--sysupgrade*::
 	Upgrades all packages that are out of date. Each currently-installed
@@ -274,7 +344,12 @@ Sync Options[[SO]]
 	report of all packages to upgrade will be presented and  the operation
 	will not proceed without user confirmation. Dependencies are
 	automatically resolved at this level and will be installed/upgraded if
-	necessary.
+	necessary. Pass this option twice to enable package downgrade; in this
+	case pacman will select sync packages whose version does not match with
+	the local version. This can be useful when the user switches from a testing
+	repo to a stable one. Additional targets can also be specified manually, so
+	that '-Su foo' will do a system upgrade and install/upgrade the foo package in
+	the same operation.
 
 *-w, \--downloadonly*::
 	Retrieve all packages from the server, but do not install/upgrade
@@ -288,7 +363,7 @@ Sync Options[[SO]]
 	to date.
 
 *\--needed*::
-	Only install the targets that are not already installed and up-to-date.
+	Don't reinstall the targets that are already up-to-date.
 
 *\--ignore* <'package'>::
 	Directs pacman to ignore upgrades of package even if there is one
@@ -301,6 +376,14 @@ Sync Options[[SO]]
 	separating them with a comma.
 
 
+Upgrade Options[[UO]]
+--------------------
+*-k, \--dbonly*::
+	Adds the database entries for the specified packages but do not install any
+	of the files. On an upgrade operation, the existing package and all files
+	will be removed and the database entry for the new package will be added.
+
+
 Handling Config Files[[HCF]]
 ----------------------------
 Pacman uses the same logic as rpm to determine action against files that are

doc/pacman.conf.5.txt

@@ -25,6 +25,7 @@ which defines global options.
 
 Example
 -------
+
 --------
 #
 # pacman.conf
@@ -40,6 +41,9 @@ Include = /etc/pacman.d/core
 Server = file:///home/pkgs
 --------
 
+NOTE: Each directive must be in CamelCase. If the case isn't respected, the
+directive won't be recognized. For example. noupgrade or NOUPGRADE will not
+work.
 
 Options
 -------
@@ -55,7 +59,7 @@ Options
 	Overrides the default location of the toplevel database directory.  A
 	typical default is ``/var/lib/pacman/''. Most users will not need to set
 	this option. *NOTE*: if specified, this is an absolute path and the root
-	path is not automatically prepended. This behavior changed in pacman 3.1.0.
+	path is not automatically prepended.
 
 *CacheDir =* path/to/cache/dir::
 	Overrides the default location of the package cache directory. A typical
@@ -63,14 +67,13 @@ Options
 	specified, and they are tried in the order they are listed in the config
 	file. If a file is not found in any cache directory, it will be downloaded
 	to the first cache directory with write access. *NOTE*: this is an absolute
-	path, the root path is not automatically prepended. This behavior changed
-	in pacman 3.1.0.
+	path, the root path is not automatically prepended.
 
 
 *LogFile =* '/path/to/file'::
-	Log actions directly to a file. A typical default is
-	``/var/log/pacman.log''. As of pacman 3.1.0, this does not need to be
-	specified by default. This is an absolute path and root is not prepended.
+	Overrides the default location of the pacman log file. A typical default
+	is ``/var/log/pacman.log''. This is an absolute path and the root directory
+	is not prepended.
 
 *HoldPkg =* package ...::
 	If a user tries to '\--remove' a package that's listed in `HoldPkg`,
@@ -80,13 +83,31 @@ Options
 	Instructs pacman to ignore any upgrades for this package when performing
 	a '\--sysupgrade'.
 
+*SyncFirst =* package ...::
+	Instructs pacman to check for newer version of these packages before any
+	sync operation. The user will have the choice to either cancel the current
+	operation and upgrade these packages first or go on with the current
+	operation. This option is typically used with the 'pacman' package.
+	*NOTE*: when a `SyncFirst` transaction takes place, no command line flags
+	(e.g. '\--force') are honored. If this is not ideal, disabling `SyncFirst`
+	and performing a manual sync of the involved packages may be required.
+
 *IgnoreGroup =* group ...::
 	Instructs pacman to ignore any upgrades for all packages in this
 	group when performing a '\--sysupgrade'.
 
 *Include =* path::
 	Include another config file. This file can include repositories or
-	general configuration  options.
+	general configuration options. Wildcards in the specified paths will get
+	expanded based on linkman:glob[7] rules.
+
+*Architecture =* auto | i686 | x86_64 | ...::
+	If set, pacman will only allow installation of packages of the given
+	architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will
+	use the system architecture, provided by in ``uname -m''.  If unset, no
+	architecture checks are made. *NOTE*: packages with the special
+	architecture 'any' can always be installed, as they are meant to be
+	architecture independent.
 
 *XferCommand =* /path/to/command %u::
 	If set, an external program will be used to download all remote files.
@@ -99,13 +120,12 @@ Options
 	http/ftp support, or need the more advanced proxy support that comes with
 	utilities like wget.
 
-*NoPassiveFtp*::
-	Disables passive ftp connections when downloading packages. (aka Active Mode)
-
 *NoUpgrade =* file ...::
 	All files listed with a `NoUpgrade` directive will never be touched during
-	a package install/upgrade. Do not include the leading slash when specifying
-	files.
+	a package install/upgrade, and the new files will be installed with a
+	'.pacnew' extension.
+	These files refer to files in the package archive, so do not include the
+	leading slash (the RootDir) when specifying them.
 
 *NoExtract =* file ...::
 	All files listed with a `NoExtract` directive will never be extracted from
@@ -113,6 +133,17 @@ Options
 	of a package to be installed. For example, if your httpd root uses an
 	'index.php', then you would not want the 'index.html' file to be extracted
 	from the 'apache' package.
+	These files refer to files in the package archive, so do not include the
+	leading slash (the RootDir) when specifying them.
+
+*CleanMethod =* KeepInstalled | KeepCurrent::
+	If set to `KeepInstalled` (the default), the '-Sc' operation will clean
+	packages that are no longer installed (not present in the local database).
+	If set to `KeepCurrent`, '-Sc' will clean outdated packages (not present in
+	any sync database).
+	The second behavior is useful when the package cache is shared among
+	multiple machines, where the local databases are usually different, but the
+	sync databases in use could be the same.
 
 *UseSyslog*::
 	Log action messages through syslog(). This will insert log entries into
@@ -123,11 +154,11 @@ Options
 
 *UseDelta*::
 	Download delta files instead of complete packages if possible.  Requires
-	the xdelta program to be installed.
+	the xdelta3 program to be installed.
 
 *TotalDownload*::
 	When downloading, display the amount downloaded, download rate, ETA,
-	and completed percentage of the entire download list list rather
+	and completed percentage of the entire download list rather
 	than the percent of each individual download target. The progress
 	bar is still based solely on the current file download.
 
@@ -154,10 +185,12 @@ Include = /etc/pacman.d/mirrorlist
 
 During parsing, pacman will define the `$repo` variable to the name of the
 current section. This is often utilized in files specified using the 'Include'
-directive so all repositories can use the same mirrorfile.
+directive so all repositories can use the same mirrorfile. pacman also defines
+the `$arch` variable to the value of `Architecture`, so the same mirrorfile can
+even be used for different architectures.
 
 --------
-Server = ftp://ftp.archlinux.org/$repo/os/arch
+Server = ftp://ftp.archlinux.org/$repo/os/$arch
 --------
 
 The order of repositories in the configuration files matters; repositories

doc/repo-add.8.txt

@@ -6,19 +6,13 @@ repo-add(8)
 
 Name
 ----
-////
-* If we use this below line, the manpage name comes out all weird. We also
-* can't use two separate lines, which is quite annoying. *
-repo-add, repo-remove - package database maintenance utilities
-////
 repo-add - package database maintenance utility
 
-
 Synopsis
 --------
-repo-add <path-to-db> [--force] <package> ...
+repo-add [-q] <path-to-db> <package1> [<package2> ...]
 
-repo-remove <path-to-db> <packagename> ...
+repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...]
 
 
 Description
@@ -36,12 +30,9 @@ on the command line.
 
 Options
 -------
-*--force* (repo-add only)::
-	Add a force entry to the sync database, which tells pacman to skip version
-	number comparison and update the package regardless. This flag can be
-	specified in the middle of the command line, with any packages listed
-	before the flag being added as normal entries, and any specified after
-	being marked as force upgrades.
+*-q, \--quiet*::
+	Force this program to keep quiet and run silent except for warning and
+	error messages.
 
 
 See Also

doc/submitting-patches.txt

@@ -0,0 +1,98 @@
+Pacman - Submitting Patches
+===========================
+
+This document is here mainly to make the job of those who review patches
+easier and is more of a guideline and not a strict set of rules.  However,
+please try to follow as much as you can.
+
+NOTE: Some of this is paraphrased from the kernel documentation's
+"SubmittingPatches" file.
+
+Getting the most recent source
+------------------------------
+
+Patches need to be submitted in GIT format and are best if they are against the
+latest version of the code. There are several helpful tutorials for getting
+started with GIT if you have not worked with it before.
+
+* http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
+* http://wiki.archlinux.org/index.php/Super_Quick_Git_Guide
+
+The pacman code can be fetched using the following command:
+
+    git clone git://projects.archlinux.org/pacman.git
+
+
+Creating your patch
+-------------------
+
+--
+* use `git commit -s` for creating a commit of your changes.
+
+The -s allows you to credit yourself by adding a "Signed Off By" line to
+indicate who has "signed" the patch - who has approved it.
+
+    Signed-off-by: Aaron Griffin <aaron@archlinux.org>
+
+Please use your real name and email address. Feel free to "scramble" the
+address if you're afraid of spam.
+
+* Describe your patch.
+
+It helps if you describe the overview and goals  of the patch in the git commit
+log.  This allows others to see what you intended so as to compare it to what
+was actually done, and allows better feedback.
+
+* Use `git format-patch` to create patches.
+
+Your commit message will be shown above the patch by default when you will use
+`git-format-patch`, including the signoff line.
+--
+
+Submitting your patch
+---------------------
+
+--
+* Send the patch to the pacman-dev mailing list
+
+The mailing list is the primary queue for review and acceptance.  Here you
+will get feedback, and let me know the details of your patch.
+
+* No MIME, no links, no compression, no attachments.  Just plain text.
+
+Patches should be contained in the actual body of the email.  There are many
+reasons for this.  First, it makes them easier to read with any mail reader,
+it allows easier review "at a glance", and most importantly, it allows people
+to comment on exact lines of the patch in reply emails.
+
+`git send-email` allows you to send git formatted patches in plain text easily
+and is the preferred method for submission to the mailing list.
+
+--
+
+After you submit
+----------------
+
+--
+* Don't get discouraged
+
+Any feedback you get, positive or negative, has nothing to do with you.  If a
+patch is rejected, try taking the suggestions into account and re-submitting.
+We welcome most submissions here, and some may take a bit longer to get
+looked over than others. If you think your patch got lost in the shuffle,
+send another email to the list in reply to the original asking if anyone has
+looked at it yet.
+
+* Respond to feedback
+
+When you do get feedback, it usually merits a response, whether this be a
+resubmit of the patch with corrections or a follow-up email asking for
+clarifications. When neither of these occurs, don't expect your patch to see
+further review. The all-volunteer staff don't have time to fix up patches that
+aren't their own.
+
+--
+
+/////
+vim: set ts=2 sw=2 syntax=asciidoc et:
+/////

etc/Makefile.am

@@ -13,6 +13,9 @@ edit = sed \
 	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
 	-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
 	-e 's|@SRCEXT[@]|$(SRCEXT)|g' \
+	-e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \
+	-e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \
+	-e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \
 	-e 's|@CARCH[@]|$(CARCH)|g' \
 	-e 's|@CHOST[@]|$(CHOST)|g' \
 	-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
@@ -20,9 +23,10 @@ edit = sed \
 	-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
 
 $(dist_sysconf_DATA): Makefile
-	rm -f $@ $@.tmp
-	$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
-	mv $@.tmp $@
+	@echo '    ' GEN $@;
+	@rm -f $@ $@.tmp
+	@$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+	@mv $@.tmp $@
 
 makepkg.conf: $(srcdir)/makepkg.conf.in
 pacman.conf: $(srcdir)/pacman.conf.in

etc/makepkg.conf.in

@@ -8,11 +8,11 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate'
-          'rsync::/usr/bin/rsync -z'
-          'scp::/usr/bin/scp -C')
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'rsync::/usr/bin/rsync -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
 # /usr/bin/snarf
@@ -26,11 +26,12 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3'
 CARCH="@CARCH@"
 CHOST="@CHOST@"
 
-#-- Exclusive: will only run on @CARCHFLAGS@
+#-- 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"
+#LDFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
@@ -38,16 +39,15 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- fakeroot: Allow building packages as a non-root user
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
-#-- xdelta:   Generate delta patch from previous to current package
 #
-BUILDENV=(fakeroot !distcc color !ccache !xdelta)
+BUILDENV=(fakeroot !distcc color !ccache)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -58,20 +58,34 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip !docs libtool emptydirs)
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
 #  A negated option will do the opposite of the comments below.
 #
-#-- strip:     Strip symbols from binaries/libraries
-#-- docs:      Save doc and info directories
+#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS
+#-- docs:      Save doc directories specified by DOC_DIRS
 #-- libtool:   Leave libtool (.la) files in packages
 #-- emptydirs: Leave empty directories in packages
+#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge:     Remove files specified by PURGE_TARGETS
 #
-OPTIONS=(strip !docs libtool emptydirs)
+OPTIONS=(strip docs libtool emptydirs zipman purge)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
-#-- Info and doc directories to remove (if option set correctly above)
-DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc})
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="@STRIP_BINARIES@"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="@STRIP_SHARED@"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="@STRIP_STATIC@"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Directories to be searched for the strip option (if strip is specified)
+STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -83,22 +97,19 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc})
 #PKGDEST=/home/packages
 #-- Source cache: specify a fixed directory where source files will be cached
 #SRCDEST=/home/sources
-#-- Source root: specify location where PKGBUILDs are located for '--builddeps'
-#SRCROOT=/home/pkgbuilds
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
 
 #########################################################################
-# BUILDSCRIPT/EXTENSION DEFAULTS
+# EXTENSION DEFAULTS
 #########################################################################
 #
 # WARNING: Do NOT modify these variables unless you know what you are
 #          doing.
 #
-BUILDSCRIPT='PKGBUILD'
 PKGEXT='@PKGEXT@'
 SRCEXT='@SRCEXT@'
-DB_COMPRESSION='gz'
-DB_CHECKSUMS=(md5)
 
 # vim: set ft=sh ts=2 sw=2 et:

etc/pacman.conf.in

@@ -14,7 +14,25 @@
 #CacheDir    = @localstatedir@/cache/pacman/pkg/
 #LogFile     = @localstatedir@/log/pacman.log
 HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
 
 #
 # REPOSITORIES
@@ -24,6 +42,7 @@ HoldPkg     = pacman glibc
 #   - repositories listed first will take precedence when packages
 #     have identical names, regardless of version number
 #   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
 #
 # Repository entries are of the format:
 #       [repo-name]
@@ -39,7 +58,7 @@ HoldPkg     = pacman glibc
 # servers immediately after the header and they will be used before the
 # default mirrors.
 #[core]
-#Server = ftp://ftp.example.com/foobar/$repo/os/i686/
+#Server = ftp://ftp.example.com/foobar/$repo/os/$arch/
 # The file referenced here should contain a list of 'Server = ' lines.
 #Include = @sysconfdir@/pacman.d/mirrorlist
 

lib/libalpm/Makefile.am

@@ -10,8 +10,12 @@ DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@
 AM_CFLAGS = -pedantic -D_GNU_SOURCE
 
 if ENABLE_VISIBILITY_CC
+if DARWIN
+AM_CFLAGS += -fvisibility=hidden
+else
 AM_CFLAGS += -fvisibility=internal
 endif
+endif
 if ENABLE_GNU89_INLINE_CC
 AM_CFLAGS += -fgnu89-inline
 endif
@@ -22,23 +26,27 @@ libalpm_la_SOURCES = \
 	alpm_list.h alpm_list.c \
 	backup.h backup.c \
 	be_files.c \
+	be_package.c \
 	cache.h cache.c \
 	conflict.h conflict.c \
 	db.h db.c \
 	delta.h delta.c \
 	deps.h deps.c \
-	error.h error.c \
+	dload.h dload.c \
+	error.c \
+	graph.h \
 	group.h group.c \
 	handle.h handle.c \
 	log.h log.c \
 	md5.h md5.c \
 	package.h package.c \
 	remove.h remove.c \
-	server.h server.c \
 	sync.h sync.c \
 	trans.h trans.c \
-	util.h util.c
+	util.h util.c \
+	version.c
 
 libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
+libalpm_la_LIBADD = $(LTLIBINTL)
 
 # vim:set ts=2 sw=2 noet:

lib/libalpm/add.c

@@ -1,7 +1,8 @@
 /*
  *  add.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,6 +28,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <inttypes.h> /* int64_t */
+#include <stdint.h> /* intmax_t */
 
 /* libarchive */
 #include <archive.h>
@@ -37,7 +40,6 @@
 #include "alpm_list.h"
 #include "trans.h"
 #include "util.h"
-#include "error.h"
 #include "cache.h"
 #include "log.h"
 #include "backup.h"
@@ -48,63 +50,58 @@
 #include "remove.h"
 #include "handle.h"
 
-int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
+/** Add a file target to the transaction.
+ * @param target the name of the file target to add
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_add_target(char *target)
 {
 	pmpkg_t *pkg = NULL;
 	const char *pkgname, *pkgver;
 	alpm_list_t *i;
+	pmtrans_t *trans;
 
 	ALPM_LOG_FUNC;
 
+	/* Sanity checks */
+	ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	trans = handle->trans;
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-	ASSERT(name != NULL && strlen(name) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
 
-	_alpm_log(PM_LOG_DEBUG, "loading target '%s'\n", name);
+	_alpm_log(PM_LOG_DEBUG, "loading target '%s'\n", target);
 
-	if(alpm_pkg_load(name, 1, &pkg) != 0) {
+	if(alpm_pkg_load(target, 1, &pkg) != 0) {
 		goto error;
 	}
 	pkgname = alpm_pkg_get_name(pkg);
 	pkgver = alpm_pkg_get_version(pkg);
 
-	if(trans->type != PM_TRANS_TYPE_UPGRADE) {
-		/* only install this package if it is not already installed */
-		if(_alpm_db_get_pkgfromcache(db, pkgname)) {
-			pm_errno = PM_ERR_PKG_INSTALLED;
-			goto error;
-		}
-	}
-
 	/* check if an older version of said package is already in transaction
 	 * packages.  if so, replace it in the list */
-	for(i = trans->packages; i; i = i->next) {
-		pmpkg_t *pkg = i->data;
-		if(strcmp(pkg->name, pkgname) == 0) {
-			if(_alpm_versioncmp(pkg->version, pkgver) < 0) {
-				pmpkg_t *newpkg;
-				_alpm_log(PM_LOG_WARNING, _("replacing older version %s-%s by %s in target list\n"),
-				          pkg->name, pkg->version, pkgver);
-				if((newpkg = _alpm_pkg_load(name, 1)) == NULL) {
-					/* pm_errno is already set by pkg_load() */
-					goto error;
-				}
+	for(i = trans->add; i; i = i->next) {
+		pmpkg_t *transpkg = i->data;
+		if(strcmp(transpkg->name, pkgname) == 0) {
+			if(alpm_pkg_vercmp(transpkg->version, pkgver) < 0) {
+				_alpm_log(PM_LOG_WARNING,
+						_("replacing older version %s-%s by %s in target list\n"),
+						transpkg->name, transpkg->version, pkgver);
 				_alpm_pkg_free(i->data);
-				i->data = newpkg;
+				i->data = pkg;
 			} else {
-				_alpm_log(PM_LOG_WARNING, _("newer version %s-%s is in the target list -- skipping\n"),
-				          pkg->name, pkg->version);
+				_alpm_log(PM_LOG_WARNING,
+						_("skipping %s-%s because newer version %s is in target list\n"),
+						pkgname, pkgver, transpkg->version);
+				_alpm_pkg_free(pkg);
 			}
 			return(0);
 		}
 	}
 
-	if(trans->flags & PM_TRANS_FLAG_ALLDEPS) {
-		pkg->reason = PM_PKG_REASON_DEPEND;
-	}
-
 	/* add the package to the transaction */
-	trans->packages = alpm_list_add(trans->packages, pkg);
+	trans->add = alpm_list_add(trans->add, pkg);
 
 	return(0);
 
@@ -113,187 +110,16 @@ error:
 	return(-1);
 }
 
-
-/* This is still messy. We have a lot of compare functions, and we should
- * try to consolidate them as much as we can (between add and sync) */
-/*static int deppkg_cmp(const void *p1, const void *p2)
-{
-	return(strcmp(((pmdepmissing_t *)p1)->target,
-				        ((pmdepmissing_t *)p2)->target));
-}*/
-
-int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
-{
-	alpm_list_t *lp = NULL;
-
-	ALPM_LOG_FUNC;
-
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-
-	/* Check dependencies
-	 */
-	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
-		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
-
-		/* look for unsatisfied dependencies */
-		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
-		lp = alpm_checkdeps(db, trans->type == PM_TRANS_TYPE_UPGRADE, NULL, trans->packages);
-		if(lp != NULL) {
-			if(data) {
-				*data = lp;
-			} else {
-				FREELIST(lp);
-			}
-			RET_ERR(PM_ERR_UNSATISFIED_DEPS, -1);
-		}
-
-		/* no unsatisfied deps, so look for conflicts */
-		_alpm_log(PM_LOG_DEBUG, "looking for conflicts\n");
-		alpm_list_t *inner = _alpm_innerconflicts(trans->packages);
-		alpm_list_t *outer = _alpm_outerconflicts(db, trans->packages);
-		lp = alpm_list_join(inner, outer);
-
-		/* TODO : factorize the conflict resolving code from sync.c to use it here (FS#3492) */
-
-		if(lp != NULL) {
-			if(data) {
-				*data = lp;
-			} else {
-				FREELIST(lp);
-			}
-			if(inner) {
-				_alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list\n"));
-				_alpm_log(PM_LOG_ERROR, _("you cannot install two conflicting packages at the same time\n"));
-			}
-			if(outer) {
-				_alpm_log(PM_LOG_ERROR, _("replacing packages with -A and -U is not supported yet\n"));
-				_alpm_log(PM_LOG_ERROR, _("you can replace packages manually using -Rd and -U\n"));
-			}
-			RET_ERR(PM_ERR_CONFLICTING_DEPS, -1);
-		}
-
-		/* re-order w.r.t. dependencies */
-		_alpm_log(PM_LOG_DEBUG, "sorting by dependencies\n");
-		lp = _alpm_sortbydeps(trans->packages, PM_TRANS_TYPE_ADD);
-		/* free the old alltargs */
-		alpm_list_free(trans->packages);
-		trans->packages = lp;
-
-		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
-	}
-
-	/* Check for file conflicts */
-	if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
-		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL);
-
-		_alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n");
-		lp = _alpm_db_find_fileconflicts(db, trans, handle->root);
-		if(lp != NULL) {
-			if(data) {
-				*data = lp;
-			} else {
-				FREELIST(lp);
-			}
-			RET_ERR(PM_ERR_FILE_CONFLICTS, -1);
-		}
-
-		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL);
-	}
-
-	return(0);
-}
-
-static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pmdb_t *db) {
-	/* this is kinda odd.  If the old package exists, at this point we make a
-	 * NEW transaction, unrelated to handle->trans, and instantiate a "remove"
-	 * with the type PM_TRANS_TYPE_REMOVEUPGRADE. TODO: kill this weird
-	 * behavior. */
-	pmtrans_t *tr = _alpm_trans_new();
-	_alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n",
-			oldpkg->name, oldpkg->version);
-
-	if(!tr) {
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	if(_alpm_trans_init(tr, PM_TRANS_TYPE_REMOVEUPGRADE, trans->flags,
-				NULL, NULL, NULL) == -1) {
-		_alpm_trans_free(tr);
-		tr = NULL;
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	if(_alpm_remove_loadtarget(tr, db, newpkg->name) == -1) {
-		_alpm_trans_free(tr);
-		tr = NULL;
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	/* copy the remove skiplist over */
-	tr->skip_remove = alpm_list_strdup(trans->skip_remove);
-	const alpm_list_t *b;
-
-	/* Add files in the NEW backup array to the NoUpgrade array
-	 * so this removal operation doesn't kill them */
-	alpm_list_t *old_noupgrade = alpm_list_strdup(handle->noupgrade);
-	/* old package backup list */
-	alpm_list_t *filelist = alpm_pkg_get_files(newpkg);
-	for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) {
-		char *backup = _alpm_backup_file(b->data);
-		/* safety check (fix the upgrade026 pactest) */
-		if(!alpm_list_find_str(filelist, backup)) {
-			continue;
-		}
-		_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
-				backup);
-		handle->noupgrade = alpm_list_add(handle->noupgrade,
-				backup);
-	}
-
-	/* TODO: we could also add files in the OLD backup array, but this would
-	 * change the backup handling behavior, and break several pactests, and we
-	 * can't do this just before 3.1 release.
-	 * The unlink_file function in remove.c would also need to be reviewed. */
-#if 0
-	/* new package backup list */
-	for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) {
-		char *backup = _alpm_backup_file(b->data);
-		/* make sure we don't add duplicate entries */
-		if(!alpm_list_find_ptr(handle->noupgrade, backup)) {
-			_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
-					backup);
-			handle->noupgrade = alpm_list_add(handle->noupgrade,
-					backup);
-		}
-	}
-#endif
-
-	int ret = _alpm_remove_commit(tr, db);
-
-	_alpm_trans_free(tr);
-	tr = NULL;
-
-	/* restore our "NoUpgrade" list to previous state */
-	FREELIST(handle->noupgrade);
-	handle->noupgrade = old_noupgrade;
-
-	if(ret == -1) {
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	return(0);
-}
-
 static int extract_single_file(struct archive *archive,
 		struct archive_entry *entry, pmpkg_t *newpkg, pmpkg_t *oldpkg,
 		pmtrans_t *trans, pmdb_t *db)
 {
-	const char *entryname; /* the name of the file in the archive */
+	const char *entryname;
 	mode_t entrymode;
 	char filename[PATH_MAX]; /* the actual file we're extracting */
 	int needbackup = 0, notouch = 0;
 	char *hash_orig = NULL;
+	char *entryname_orig = NULL;
 	const int archive_flags = ARCHIVE_EXTRACT_OWNER |
 	                          ARCHIVE_EXTRACT_PERM |
 	                          ARCHIVE_EXTRACT_TIME;
@@ -306,14 +132,14 @@ static int extract_single_file(struct archive *archive,
 
 	if(strcmp(entryname, ".INSTALL") == 0) {
 		/* the install script goes inside the db */
-		snprintf(filename, PATH_MAX, "%s/%s-%s/install", db->path,
-				newpkg->name, newpkg->version);
-		archive_entry_set_mode(entry, 0644);
+		snprintf(filename, PATH_MAX, "%s%s-%s/install",
+				_alpm_db_path(db), newpkg->name, newpkg->version);
+		archive_entry_set_perm(entry, 0644);
 	} else if(strcmp(entryname, ".CHANGELOG") == 0) {
 		/* the changelog goes inside the db */
-		snprintf(filename, PATH_MAX, "%s/%s-%s/changelog", db->path,
-				newpkg->name, newpkg->version);
-		archive_entry_set_mode(entry, 0644);
+		snprintf(filename, PATH_MAX, "%s%s-%s/changelog",
+				_alpm_db_path(db), newpkg->name, newpkg->version);
+		archive_entry_set_perm(entry, 0644);
 	} else if(*entryname == '.') {
 		/* for now, ignore all files starting with '.' that haven't
 		 * already been handled (for future possibilities) */
@@ -337,7 +163,8 @@ static int extract_single_file(struct archive *archive,
 
 	/* if a file is in the add skiplist we never extract it */
 	if(alpm_list_find_str(trans->skip_add, filename)) {
-		_alpm_log(PM_LOG_DEBUG, "%s is in trans->skip_add, skipping extraction\n", entryname);
+		_alpm_log(PM_LOG_DEBUG, "%s is in trans->skip_add, skipping extraction\n",
+				entryname);
 		archive_read_data_skip(archive);
 		return(0);
 	}
@@ -367,28 +194,30 @@ static int extract_single_file(struct archive *archive,
 	if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) {
 		/* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
 	} else {
-		if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) {
-			/* case 12: existing dir, ignore it */
-			if(lsbuf.st_mode != entrymode) {
-				/* if filesystem perms are different than pkg perms, warn user */
-				int mask = 07777;
-				_alpm_log(PM_LOG_WARNING, _("directory permissions differ on %s\n"
-							"filesystem: %o  package: %o\n"), entryname, lsbuf.st_mode & mask,
-						entrymode & mask);
-				alpm_logaction("warning: directory permissions differ on %s\n"
+		if(S_ISDIR(lsbuf.st_mode)) {
+			if(S_ISDIR(entrymode)) {
+				/* case 12: existing dir, ignore it */
+				if(lsbuf.st_mode != entrymode) {
+					/* if filesystem perms are different than pkg perms, warn user */
+					mode_t mask = 07777;
+					_alpm_log(PM_LOG_WARNING, _("directory permissions differ on %s\n"
+								"filesystem: %o  package: %o\n"), entryname, lsbuf.st_mode & mask,
+							entrymode & mask);
+					alpm_logaction("warning: directory permissions differ on %s\n"
 							"filesystem: %o  package: %o\n", entryname, lsbuf.st_mode & mask,
-						entrymode & mask);
+							entrymode & mask);
+				}
+				_alpm_log(PM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
+						entryname);
+				archive_read_data_skip(archive);
+				return(0);
+			} else {
+				/* case 10/11: trying to overwrite dir with file/symlink, don't allow it */
+				_alpm_log(PM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"),
+						entryname);
+				archive_read_data_skip(archive);
+				return(1);
 			}
-			_alpm_log(PM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
-					entryname);
-			archive_read_data_skip(archive);
-			return(0);
-		} else if(S_ISDIR(lsbuf.st_mode) && S_ISLNK(entrymode)) {
-			/* case 11: existing dir, symlink in package, ignore it */
-			_alpm_log(PM_LOG_DEBUG, "extract: skipping symlink extraction of %s\n",
-					entryname);
-			archive_read_data_skip(archive);
-			return(0);
 		} else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(entrymode)) {
 			/* case 9: existing symlink, dir in package */
 			if(S_ISDIR(sbuf.st_mode)) {
@@ -404,12 +233,6 @@ static int extract_single_file(struct archive *archive,
 				archive_read_data_skip(archive);
 				return(1);
 			}
-		} else if(S_ISDIR(lsbuf.st_mode) && S_ISREG(entrymode)) {
-			/* case 10: trying to overwrite dir tree with file, don't allow it */
-			_alpm_log(PM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"),
-					entryname);
-			archive_read_data_skip(archive);
-			return(1);
 		} else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) {
 			/* case 6: trying to overwrite file with dir */
 			_alpm_log(PM_LOG_DEBUG, "extract: overwriting file with dir %s\n",
@@ -436,7 +259,7 @@ static int extract_single_file(struct archive *archive,
 
 				/* if we force hash_orig to be non-NULL retroactive backup works */
 				if(needbackup && !hash_orig) {
-					hash_orig = strdup("");
+					STRDUP(hash_orig, "", RET_ERR(PM_ERR_MEMORY, -1));
 				}
 			}
 		}
@@ -444,35 +267,35 @@ static int extract_single_file(struct archive *archive,
 		/* case 5,8: don't need to do anything special */
 	}
 
+	/* we need access to the original entryname later after calls to
+	 * archive_entry_set_pathname(), so we need to dupe it and free() later */
+	STRDUP(entryname_orig, entryname, RET_ERR(PM_ERR_MEMORY, -1));
+
 	if(needbackup) {
-		char *tempfile = NULL;
+		char checkfile[PATH_MAX];
 		char *hash_local = NULL, *hash_pkg = NULL;
-		int fd;
+		int ret;
 
-		/* extract the package's version to a temporary file and checksum it */
-		tempfile = strdup("/tmp/alpm_XXXXXX");
-		fd = mkstemp(tempfile);
+		snprintf(checkfile, PATH_MAX, "%s.paccheck", filename);
+		archive_entry_set_pathname(entry, checkfile);
 
-		archive_entry_set_pathname(entry, tempfile);
-
-		int ret = archive_read_extract(archive, entry, archive_flags);
+		ret = archive_read_extract(archive, entry, archive_flags);
 		if(ret == ARCHIVE_WARN) {
 			/* operation succeeded but a non-critical error was encountered */
 			_alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n",
-					entryname, archive_error_string(archive));
+					entryname_orig, archive_error_string(archive));
 		} else if(ret != ARCHIVE_OK) {
 			_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"),
-					entryname, archive_error_string(archive));
+					entryname_orig, archive_error_string(archive));
 			alpm_logaction("error: could not extract %s (%s)\n",
-					entryname, archive_error_string(archive));
-			unlink(tempfile);
+					entryname_orig, archive_error_string(archive));
 			FREE(hash_orig);
-			close(fd);
+			FREE(entryname_orig);
 			return(1);
 		}
 
-		hash_local = alpm_get_md5sum(filename);
-		hash_pkg = alpm_get_md5sum(tempfile);
+		hash_local = alpm_compute_md5sum(filename);
+		hash_pkg = alpm_compute_md5sum(checkfile);
 
 		/* append the new md5 hash to it's respective entry
 		 * in newpkg's backup (it will be the new orginal) */
@@ -480,16 +303,13 @@ static int extract_single_file(struct archive *archive,
 		for(backups = alpm_pkg_get_backup(newpkg); backups;
 				backups = alpm_list_next(backups)) {
 			char *oldbackup = alpm_list_getdata(backups);
-			if(!oldbackup || strcmp(oldbackup, entryname) != 0) {
+			if(!oldbackup || strcmp(oldbackup, entryname_orig) != 0) {
 				continue;
 			}
 			char *backup = NULL;
 			/* length is tab char, null byte and MD5 (32 char) */
-			int backup_len = strlen(oldbackup) + 34;
-			backup = malloc(backup_len);
-			if(!backup) {
-				RET_ERR(PM_ERR_MEMORY, -1);
-			}
+			size_t backup_len = strlen(oldbackup) + 34;
+			MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1));
 
 			sprintf(backup, "%s\t%s", oldbackup, hash_pkg);
 			backup[backup_len-1] = '\0';
@@ -497,37 +317,41 @@ static int extract_single_file(struct archive *archive,
 			backups->data = backup;
 		}
 
-		_alpm_log(PM_LOG_DEBUG, "checking hashes for %s\n", entryname);
+		_alpm_log(PM_LOG_DEBUG, "checking hashes for %s\n", entryname_orig);
 		_alpm_log(PM_LOG_DEBUG, "current:  %s\n", hash_local);
 		_alpm_log(PM_LOG_DEBUG, "new:      %s\n", hash_pkg);
 		_alpm_log(PM_LOG_DEBUG, "original: %s\n", hash_orig);
 
 		if(!oldpkg) {
-			/* looks like we have a local file that has a different hash as the
-			 * file in the package, move it to a .pacorig */
 			if(strcmp(hash_local, hash_pkg) != 0) {
+				/* looks like we have a local file that has a different hash as the
+				 * file in the package, move it to a .pacorig */
 				char newpath[PATH_MAX];
 				snprintf(newpath, PATH_MAX, "%s.pacorig", filename);
 
 				/* move the existing file to the "pacorig" */
 				if(rename(filename, newpath)) {
-					archive_entry_set_pathname(entry, filename);
-					_alpm_log(PM_LOG_ERROR, _("could not rename %s (%s)\n"), filename, strerror(errno));
-					alpm_logaction("error: could not rename %s (%s)\n", filename, strerror(errno));
+					_alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
+							filename, newpath, strerror(errno));
+					alpm_logaction("error: could not rename %s to %s (%s)\n",
+							filename, newpath, strerror(errno));
 					errors++;
 				} else {
-					/* copy the tempfile we extracted to the real path */
-					if(_alpm_copyfile(tempfile, filename)) {
-						archive_entry_set_pathname(entry, filename);
-						_alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno));
-						alpm_logaction("error: could not copy tempfile to %s (%s)\n", filename, strerror(errno));
+					/* rename the file we extracted to the real name */
+					if(rename(checkfile, filename)) {
+						_alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
+								checkfile, filename, strerror(errno));
+						alpm_logaction("error: could not rename %s to %s (%s)\n",
+								checkfile, filename, strerror(errno));
 						errors++;
 					} else {
-						archive_entry_set_pathname(entry, filename);
 						_alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath);
 						alpm_logaction("warning: %s saved as %s\n", filename, newpath);
 					}
 				}
+			} else {
+				/* local file is identical to pkg one, so just remove pkg one */
+				unlink(checkfile);
 			}
 		} else if(hash_orig) {
 			/* the fun part */
@@ -536,38 +360,48 @@ static int extract_single_file(struct archive *archive,
 				/* installed file has NOT been changed by user */
 				if(strcmp(hash_orig, hash_pkg) != 0) {
 					_alpm_log(PM_LOG_DEBUG, "action: installing new file: %s\n",
-							entryname);
+							entryname_orig);
 
-					if(_alpm_copyfile(tempfile, filename)) {
-						_alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno));
+					if(rename(checkfile, filename)) {
+						_alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
+								checkfile, filename, strerror(errno));
+						alpm_logaction("error: could not rename %s to %s (%s)\n",
+								checkfile, filename, strerror(errno));
 						errors++;
 					}
-					archive_entry_set_pathname(entry, filename);
 				} else {
 					/* there's no sense in installing the same file twice, install
 					 * ONLY is the original and package hashes differ */
 					_alpm_log(PM_LOG_DEBUG, "action: leaving existing file in place\n");
+					unlink(checkfile);
 				}
 			} else if(strcmp(hash_orig, hash_pkg) == 0) {
 				/* originally installed file and new file are the same - this
 				 * implies the case above failed - i.e. the file was changed by a
 				 * user */
 				_alpm_log(PM_LOG_DEBUG, "action: leaving existing file in place\n");
+				unlink(checkfile);
 			} else if(strcmp(hash_local, hash_pkg) == 0) {
 				/* this would be magical.  The above two cases failed, but the
 				 * user changes just so happened to make the new file exactly the
 				 * same as the one in the package... skip it */
 				_alpm_log(PM_LOG_DEBUG, "action: leaving existing file in place\n");
+				unlink(checkfile);
 			} else {
 				char newpath[PATH_MAX];
-				_alpm_log(PM_LOG_DEBUG, "action: keeping current file and installing new one with .pacnew ending\n");
+				_alpm_log(PM_LOG_DEBUG, "action: keeping current file and installing"
+						" new one with .pacnew ending\n");
 				snprintf(newpath, PATH_MAX, "%s.pacnew", filename);
-				if(_alpm_copyfile(tempfile, newpath)) {
-					_alpm_log(PM_LOG_ERROR, _("could not install %s as %s: %s\n"), filename, newpath, strerror(errno));
-					alpm_logaction("error: could not install %s as %s: %s\n", filename, newpath, strerror(errno));
+				if(rename(checkfile, newpath)) {
+					_alpm_log(PM_LOG_ERROR, _("could not install %s as %s (%s)\n"),
+							filename, newpath, strerror(errno));
+					alpm_logaction("error: could not install %s as %s (%s)\n",
+							filename, newpath, strerror(errno));
 				} else {
-					_alpm_log(PM_LOG_WARNING, _("%s installed as %s\n"), filename, newpath);
-					alpm_logaction("warning: %s installed as %s\n", filename, newpath);
+					_alpm_log(PM_LOG_WARNING, _("%s installed as %s\n"),
+							filename, newpath);
+					alpm_logaction("warning: %s installed as %s\n",
+							filename, newpath);
 				}
 			}
 		}
@@ -575,10 +409,9 @@ static int extract_single_file(struct archive *archive,
 		FREE(hash_local);
 		FREE(hash_pkg);
 		FREE(hash_orig);
-		unlink(tempfile);
-		FREE(tempfile);
-		close(fd);
 	} else {
+		int ret;
+
 		/* we didn't need a backup */
 		if(notouch) {
 			/* change the path to a .pacnew extension */
@@ -599,16 +432,17 @@ static int extract_single_file(struct archive *archive,
 
 		archive_entry_set_pathname(entry, filename);
 
-		int ret = archive_read_extract(archive, entry, archive_flags);
+		ret = archive_read_extract(archive, entry, archive_flags);
 		if(ret == ARCHIVE_WARN) {
 			/* operation succeeded but a non-critical error was encountered */
 			_alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n",
-					entryname, archive_error_string(archive));
+					entryname_orig, archive_error_string(archive));
 		} else if(ret != ARCHIVE_OK) {
 			_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"),
-					entryname, archive_error_string(archive));
+					entryname_orig, archive_error_string(archive));
 			alpm_logaction("error: could not extract %s (%s)\n",
-					entryname, archive_error_string(archive));
+					entryname_orig, archive_error_string(archive));
+			FREE(entryname_orig);
 			return(1);
 		}
 
@@ -618,18 +452,15 @@ static int extract_single_file(struct archive *archive,
 			char *backup = NULL, *hash = NULL;
 			char *oldbackup = alpm_list_getdata(b);
 			/* length is tab char, null byte and MD5 (32 char) */
-			int backup_len = strlen(oldbackup) + 34;
+			size_t backup_len = strlen(oldbackup) + 34;
 
-			if(!oldbackup || strcmp(oldbackup, entryname) != 0) {
+			if(!oldbackup || strcmp(oldbackup, entryname_orig) != 0) {
 				continue;
 			}
 			_alpm_log(PM_LOG_DEBUG, "appending backup entry for %s\n", filename);
 
-			hash = alpm_get_md5sum(filename);
-			backup = malloc(backup_len);
-			if(!backup) {
-				RET_ERR(PM_ERR_MEMORY, -1);
-			}
+			hash = alpm_compute_md5sum(filename);
+			MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1));
 
 			sprintf(backup, "%s\t%s", oldbackup, hash);
 			backup[backup_len-1] = '\0';
@@ -638,6 +469,7 @@ static int extract_single_file(struct archive *archive,
 			b->data = backup;
 		}
 	}
+	FREE(entryname_orig);
 	return(errors);
 }
 
@@ -645,34 +477,35 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		pmtrans_t *trans, pmdb_t *db)
 {
 	int i, ret = 0, errors = 0;
-	struct archive *archive;
-	struct archive_entry *entry;
-	char cwd[PATH_MAX] = "";
 	char scriptlet[PATH_MAX+1];
 	int is_upgrade = 0;
-	double percent = 0.0;
 	pmpkg_t *oldpkg = NULL;
 
-	snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
-			alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+	ALPM_LOG_FUNC;
+
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+
+	snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
+			_alpm_db_path(db), alpm_pkg_get_name(newpkg),
+			alpm_pkg_get_version(newpkg));
 
 	/* see if this is an upgrade. if so, remove the old package first */
 	pmpkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name);
 	if(local) {
 		is_upgrade = 1;
 
-		EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, NULL);
+		/* we'll need to save some record for backup checks later */
+		oldpkg = _alpm_pkg_dup(local);
+		/* make sure all infos are loaded because the database entry
+		 * will be removed soon */
+		_alpm_db_read(oldpkg->origin_data.db, oldpkg, INFRQ_ALL);
+
+		EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg);
 		_alpm_log(PM_LOG_DEBUG, "upgrading package %s-%s\n",
 				newpkg->name, newpkg->version);
 
-		/* we'll need to save some record for backup checks later */
-		oldpkg = _alpm_pkg_dup(local);
-		/* copy over the install reason (unless alldeps is set) */
-	if(trans->flags & PM_TRANS_FLAG_ALLDEPS) {
-		newpkg->reason = PM_PKG_REASON_DEPEND;
-	} else {
-		newpkg->reason = alpm_pkg_get_reason(local);
-	}
+		/* copy over the install reason */
+		newpkg->reason = alpm_pkg_get_reason(oldpkg);
 
 		/* pre_upgrade scriptlet */
 		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
@@ -693,27 +526,54 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		}
 	}
 
+	/* we override any pre-set reason if we have alldeps or allexplicit set */
+	if(trans->flags & PM_TRANS_FLAG_ALLDEPS) {
+		newpkg->reason = PM_PKG_REASON_DEPEND;
+	} else if(trans->flags & PM_TRANS_FLAG_ALLEXPLICIT) {
+		newpkg->reason = PM_PKG_REASON_EXPLICIT;
+	}
+
 	if(oldpkg) {
 		/* set up fake remove transaction */
-		int ret = upgrade_remove(oldpkg, newpkg, trans, db);
-		if(ret != 0) {
-			return(ret);
+		if(_alpm_upgraderemove_package(oldpkg, newpkg, trans) == -1) {
+			pm_errno = PM_ERR_TRANS_ABORT;
+			ret = -1;
+			goto cleanup;
 		}
 	}
 
+	/* prepare directory for database entries so permission are correct after
+	   changelog/install script installation (FS#12263) */
+	if(_alpm_db_prepare(db, newpkg)) {
+		alpm_logaction("error: could not create database entry %s-%s\n",
+				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+		pm_errno = PM_ERR_DB_WRITE;
+		ret = -1;
+		goto cleanup;
+	}
+
 	if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
+		struct archive *archive;
+		struct archive_entry *entry;
+		char cwd[PATH_MAX] = "";
+
 		_alpm_log(PM_LOG_DEBUG, "extracting files\n");
 
 		if ((archive = archive_read_new()) == NULL) {
-			RET_ERR(PM_ERR_LIBARCHIVE_ERROR, -1);
+			pm_errno = PM_ERR_LIBARCHIVE;
+			ret = -1;
+			goto cleanup;
 		}
 
 		archive_read_support_compression_all(archive);
 		archive_read_support_format_all(archive);
 
+		_alpm_log(PM_LOG_DEBUG, "archive: %s\n", newpkg->origin_data.file);
 		if(archive_read_open_filename(archive, newpkg->origin_data.file,
 					ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-			RET_ERR(PM_ERR_PKG_OPEN, -1);
+			pm_errno = PM_ERR_PKG_OPEN;
+			ret = -1;
+			goto cleanup;
 		}
 
 		/* save the cwd so we can restore it later */
@@ -735,17 +595,22 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		}
 
 		for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) {
+			double percent;
+
 			if(newpkg->size != 0) {
 				/* Using compressed size for calculations here, as newpkg->isize is not
 				 * exact when it comes to comparing to the ACTUAL uncompressed size
 				 * (missing metadata sizes) */
-				unsigned long pos = archive_position_compressed(archive);
+				int64_t pos = archive_position_compressed(archive);
 				percent = (double)pos / (double)newpkg->size;
-				_alpm_log(PM_LOG_DEBUG, "decompression progress: %f%% (%ld / %ld)\n",
-						percent*100.0, pos, newpkg->size);
+				_alpm_log(PM_LOG_DEBUG, "decompression progress: "
+						"%f%% (%"PRId64" / %jd)\n",
+						percent*100.0, pos, (intmax_t)newpkg->size);
 				if(percent >= 1.0) {
 					percent = 1.0;
 				}
+			} else {
+				percent = 0.0;
 			}
 
 			if(is_upgrade) {
@@ -770,7 +635,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		}
 
 		if(errors) {
-			ret = 1;
+			ret = -1;
 			if(is_upgrade) {
 				_alpm_log(PM_LOG_ERROR, _("problem occurred while upgrading %s\n"),
 						newpkg->name);
@@ -796,7 +661,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
 		alpm_logaction("error: could not update database entry %s-%s\n",
 				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
-		RET_ERR(PM_ERR_DB_WRITE, -1);
+		pm_errno = PM_ERR_DB_WRITE;
+		ret = -1;
+		goto cleanup;
 	}
 
 	if(_alpm_db_add_pkgincache(db, newpkg) == -1) {
@@ -811,7 +678,6 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
 				alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
 	}
-	EVENT(trans, PM_TRANS_EVT_EXTRACT_DONE, NULL, NULL);
 
 	/* run the post-install script if it exists  */
 	if(alpm_pkg_has_scriptlet(newpkg)
@@ -832,12 +698,12 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		EVENT(trans, PM_TRANS_EVT_ADD_DONE, newpkg, oldpkg);
 	}
 
+cleanup:
 	_alpm_pkg_free(oldpkg);
-
-	return(0);
+	return(ret);
 }
 
-int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
+int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db)
 {
 	int pkg_count, pkg_current;
 	alpm_list_t *targ;
@@ -847,15 +713,15 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
-	if(trans->packages == NULL) {
+	if(trans->add == NULL) {
 		return(0);
 	}
 
-	pkg_count = alpm_list_count(trans->targets);
+	pkg_count = alpm_list_count(trans->add);
 	pkg_current = 1;
 
 	/* loop through our package list adding/upgrading one at a time */
-	for(targ = trans->packages; targ; targ = targ->next) {
+	for(targ = trans->add; targ; targ = targ->next) {
 		if(handle->trans->state == STATE_INTERRUPTED) {
 			return(0);
 		}
@@ -866,7 +732,6 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 	}
 
 	/* run ldconfig if it exists */
-	_alpm_log(PM_LOG_DEBUG, "running \"ldconfig -r %s\"\n", handle->root);
 	_alpm_ldconfig(handle->root);
 
 	return(0);

lib/libalpm/add.h

@@ -1,7 +1,8 @@
 /*
  *  add.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,9 +24,7 @@
 #include "alpm_list.h"
 #include "trans.h"
 
-int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name);
-int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data);
-int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db);
+int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db);
 
 #endif /* _ALPM_ADD_H */
 

lib/libalpm/alpm.c

@@ -1,7 +1,8 @@
 /*
  *  alpm.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -25,7 +26,6 @@
 /* libalpm */
 #include "alpm.h"
 #include "alpm_list.h"
-#include "error.h"
 #include "handle.h"
 #include "util.h"
 
@@ -71,6 +71,7 @@ int SYMEXPORT alpm_release(void)
 	}
 
 	_alpm_handle_free(handle);
+	handle = NULL;
 
 	return(0);
 }

lib/libalpm/alpm.h

@@ -1,7 +1,8 @@
 /*
  * alpm.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -26,6 +27,7 @@
 extern "C" {
 #endif
 
+#include <sys/types.h> /* for off_t */
 #include <time.h> /* for time_t */
 #include <stdarg.h> /* for va_list */
 
@@ -45,14 +47,11 @@ typedef struct __pmdb_t pmdb_t;
 typedef struct __pmpkg_t pmpkg_t;
 typedef struct __pmdelta_t pmdelta_t;
 typedef struct __pmgrp_t pmgrp_t;
-typedef struct __pmserver_t pmserver_t;
 typedef struct __pmtrans_t pmtrans_t;
-typedef struct __pmsyncpkg_t pmsyncpkg_t;
 typedef struct __pmdepend_t pmdepend_t;
 typedef struct __pmdepmissing_t pmdepmissing_t;
 typedef struct __pmconflict_t pmconflict_t;
 typedef struct __pmfileconflict_t pmfileconflict_t;
-typedef struct __pmgraph_t pmgraph_t;
 
 /*
  * Library
@@ -68,10 +67,10 @@ const char *alpm_version(void);
 
 /* Levels */
 typedef enum _pmloglevel_t {
-	PM_LOG_ERROR    = 0x01,
-	PM_LOG_WARNING  = 0x02,
-	PM_LOG_DEBUG    = 0x04,
-	PM_LOG_FUNCTION = 0x08
+	PM_LOG_ERROR    = 1,
+	PM_LOG_WARNING  = (1 << 1),
+	PM_LOG_DEBUG    = (1 << 2),
+	PM_LOG_FUNCTION = (1 << 3)
 } pmloglevel_t;
 
 typedef void (*alpm_cb_log)(pmloglevel_t, char *, va_list);
@@ -81,21 +80,35 @@ int alpm_logaction(char *fmt, ...);
  * Downloading
  */
 
-typedef void (*alpm_cb_download)(const char *filename, int file_xfered,
-		int file_total, int list_xfered, int list_total);
+typedef void (*alpm_cb_download)(const char *filename,
+		off_t xfered, off_t total);
+typedef void (*alpm_cb_totaldl)(off_t total);
+/** A callback for downloading files
+ * @param url the URL of the file to be downloaded
+ * @param localpath the directory to which the file should be downloaded
+ * @param force whether to force an update, even if the file is the same
+ * @return 0 on success, 1 if the file exists and is identical, -1 on
+ * error.
+ */
+typedef int (*alpm_cb_fetch)(const char *url, const char *localpath,
+		int force);
 
 /*
  * Options
  */
 
-#define PM_DLFNM_LEN 22
-
 alpm_cb_log alpm_option_get_logcb();
 void alpm_option_set_logcb(alpm_cb_log cb);
 
 alpm_cb_download alpm_option_get_dlcb();
 void alpm_option_set_dlcb(alpm_cb_download cb);
 
+alpm_cb_fetch alpm_option_get_fetchcb();
+void alpm_option_set_fetchcb(alpm_cb_fetch cb);
+
+alpm_cb_totaldl alpm_option_get_totaldlcb();
+void alpm_option_set_totaldlcb(alpm_cb_totaldl cb);
+
 const char *alpm_option_get_root();
 int alpm_option_set_root(const char *root);
 
@@ -113,8 +126,8 @@ int alpm_option_set_logfile(const char *logfile);
 const char *alpm_option_get_lockfile();
 /* no set_lockfile, path is determined from dbpath */
 
-unsigned short alpm_option_get_usesyslog();
-void alpm_option_set_usesyslog(unsigned short usesyslog);
+int alpm_option_get_usesyslog();
+void alpm_option_set_usesyslog(int usesyslog);
 
 alpm_list_t *alpm_option_get_noupgrades();
 void alpm_option_add_noupgrade(const char *pkg);
@@ -131,26 +144,29 @@ void alpm_option_add_ignorepkg(const char *pkg);
 void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs);
 int alpm_option_remove_ignorepkg(const char *pkg);
 
-alpm_list_t *alpm_option_get_holdpkgs();
-void alpm_option_add_holdpkg(const char *pkg);
-void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs);
-int alpm_option_remove_holdpkg(const char *pkg);
-
 alpm_list_t *alpm_option_get_ignoregrps();
 void alpm_option_add_ignoregrp(const char *grp);
 void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps);
 int alpm_option_remove_ignoregrp(const char *grp);
 
-const char *alpm_option_get_xfercommand();
-void alpm_option_set_xfercommand(const char *cmd);
+const char *alpm_option_get_arch();
+void alpm_option_set_arch(const char *arch);
 
-unsigned short alpm_option_get_nopassiveftp();
-void alpm_option_set_nopassiveftp(unsigned short nopasv);
-void alpm_option_set_usedelta(unsigned short usedelta);
+int alpm_option_get_usedelta();
+void alpm_option_set_usedelta(int usedelta);
 
 pmdb_t *alpm_option_get_localdb();
 alpm_list_t *alpm_option_get_syncdbs();
 
+/*
+ * Install reasons -- ie, why the package was installed
+ */
+
+typedef enum _pmpkgreason_t {
+	PM_PKG_REASON_EXPLICIT = 0,  /* explicitly requested by the user */
+	PM_PKG_REASON_DEPEND = 1  /* installed as a dependency for another package */
+} pmpkgreason_t;
+
 /*
  * Databases
  */
@@ -169,12 +185,12 @@ int alpm_db_setserver(pmdb_t *db, const char *url);
 int alpm_db_update(int level, pmdb_t *db);
 
 pmpkg_t *alpm_db_get_pkg(pmdb_t *db, const char *name);
-alpm_list_t *alpm_db_getpkgcache(pmdb_t *db);
-alpm_list_t *alpm_db_whatprovides(pmdb_t *db, const char *name);
+alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db);
 
 pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name);
-alpm_list_t *alpm_db_getgrpcache(pmdb_t *db);
+alpm_list_t *alpm_db_get_grpcache(pmdb_t *db);
 alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
+int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason);
 
 /*
  * Packages
@@ -182,17 +198,11 @@ alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
 
 /* Info parameters */
 
-/* reasons -- ie, why the package was installed */
-typedef enum _pmpkgreason_t {
-	PM_PKG_REASON_EXPLICIT = 0,  /* explicitly requested by the user */
-	PM_PKG_REASON_DEPEND = 1  /* installed as a dependency for another package */
-} pmpkgreason_t;
-
-int alpm_pkg_load(const char *filename, unsigned short full, pmpkg_t **pkg);
+int alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg);
 int alpm_pkg_free(pmpkg_t *pkg);
 int alpm_pkg_checkmd5sum(pmpkg_t *pkg);
 char *alpm_fetch_pkgurl(const char *url);
-int alpm_pkg_vercmp(const char *ver1, const char *ver2);
+int alpm_pkg_vercmp(const char *a, const char *b);
 alpm_list_t *alpm_pkg_compute_requiredby(pmpkg_t *pkg);
 
 const char *alpm_pkg_get_filename(pmpkg_t *pkg);
@@ -205,8 +215,8 @@ time_t alpm_pkg_get_installdate(pmpkg_t *pkg);
 const char *alpm_pkg_get_packager(pmpkg_t *pkg);
 const char *alpm_pkg_get_md5sum(pmpkg_t *pkg);
 const char *alpm_pkg_get_arch(pmpkg_t *pkg);
-unsigned long alpm_pkg_get_size(pmpkg_t *pkg);
-unsigned long alpm_pkg_get_isize(pmpkg_t *pkg);
+off_t alpm_pkg_get_size(pmpkg_t *pkg);
+off_t alpm_pkg_get_isize(pmpkg_t *pkg);
 pmpkgreason_t alpm_pkg_get_reason(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_licenses(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_groups(pmpkg_t *pkg);
@@ -218,14 +228,17 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg);
+pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg);
 void *alpm_pkg_changelog_open(pmpkg_t *pkg);
 size_t alpm_pkg_changelog_read(void *ptr, size_t size,
 		const pmpkg_t *pkg, const void *fp);
 /*int alpm_pkg_changelog_feof(const pmpkg_t *pkg, void *fp);*/
 int alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp);
-unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg);
+int alpm_pkg_has_scriptlet(pmpkg_t *pkg);
+int alpm_pkg_has_force(pmpkg_t *pkg);
 
-unsigned long alpm_pkg_download_size(pmpkg_t *newpkg, pmdb_t *db_local);
+off_t alpm_pkg_download_size(pmpkg_t *newpkg);
+alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg);
 
 /*
  * Deltas
@@ -233,104 +246,139 @@ unsigned long alpm_pkg_download_size(pmpkg_t *newpkg, pmdb_t *db_local);
 
 const char *alpm_delta_get_from(pmdelta_t *delta);
 const char *alpm_delta_get_to(pmdelta_t *delta);
-unsigned long alpm_delta_get_size(pmdelta_t *delta);
 const char *alpm_delta_get_filename(pmdelta_t *delta);
 const char *alpm_delta_get_md5sum(pmdelta_t *delta);
+off_t alpm_delta_get_size(pmdelta_t *delta);
 
 /*
  * Groups
  */
 const char *alpm_grp_get_name(const pmgrp_t *grp);
-const alpm_list_t *alpm_grp_get_pkgs(const pmgrp_t *grp);
+alpm_list_t *alpm_grp_get_pkgs(const pmgrp_t *grp);
 
 /*
  * Sync
  */
 
-/* Types */
-typedef enum _pmsynctype_t {
-	PM_SYNC_TYPE_REPLACE = 1,
-	PM_SYNC_TYPE_UPGRADE,
-	PM_SYNC_TYPE_DEPEND
-} pmsynctype_t;
-
-pmsynctype_t alpm_sync_get_type(const pmsyncpkg_t *sync);
-pmpkg_t *alpm_sync_get_pkg(const pmsyncpkg_t *sync);
-void *alpm_sync_get_data(const pmsyncpkg_t *sync);
-int alpm_sync_sysupgrade(pmdb_t *db_local,
-		alpm_list_t *dbs_sync, alpm_list_t **syncpkgs);
+pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync);
 
 /*
  * Transactions
  */
 
-/* Types */
-typedef enum _pmtranstype_t {
-	PM_TRANS_TYPE_ADD = 1,
-	PM_TRANS_TYPE_REMOVE,
-	PM_TRANS_TYPE_REMOVEUPGRADE,
-	PM_TRANS_TYPE_UPGRADE,
-	PM_TRANS_TYPE_SYNC
-} pmtranstype_t;
 
 /* Flags */
 typedef enum _pmtransflag_t {
-	PM_TRANS_FLAG_NODEPS = 0x01,
-	PM_TRANS_FLAG_FORCE = 0x02,
-	PM_TRANS_FLAG_NOSAVE = 0x04,
-	/* 0x08 flag can go here */
-	PM_TRANS_FLAG_CASCADE = 0x10,
-	PM_TRANS_FLAG_RECURSE = 0x20,
-	PM_TRANS_FLAG_DBONLY = 0x40,
-	PM_TRANS_FLAG_DEPENDSONLY = 0x80,
-	PM_TRANS_FLAG_ALLDEPS = 0x100,
-	PM_TRANS_FLAG_DOWNLOADONLY = 0x200,
-	PM_TRANS_FLAG_NOSCRIPTLET = 0x400,
-	PM_TRANS_FLAG_NOCONFLICTS = 0x800,
-	PM_TRANS_FLAG_PRINTURIS = 0x1000,
-	PM_TRANS_FLAG_NEEDED = 0x2000
+	PM_TRANS_FLAG_NODEPS = 1,
+	PM_TRANS_FLAG_FORCE = (1 << 1),
+	PM_TRANS_FLAG_NOSAVE = (1 << 2),
+	/* (1 << 3) flag can go here */
+	PM_TRANS_FLAG_CASCADE = (1 << 4),
+	PM_TRANS_FLAG_RECURSE = (1 << 5),
+	PM_TRANS_FLAG_DBONLY = (1 << 6),
+	/* (1 << 7) flag can go here */
+	PM_TRANS_FLAG_ALLDEPS = (1 << 8),
+	PM_TRANS_FLAG_DOWNLOADONLY = (1 << 9),
+	PM_TRANS_FLAG_NOSCRIPTLET = (1 << 10),
+	PM_TRANS_FLAG_NOCONFLICTS = (1 << 11),
+	/* (1 << 12) flag can go here */
+	PM_TRANS_FLAG_NEEDED = (1 << 13),
+	PM_TRANS_FLAG_ALLEXPLICIT = (1 << 14),
+	PM_TRANS_FLAG_UNNEEDED = (1 << 15),
+	PM_TRANS_FLAG_RECURSEALL = (1 << 16),
+	PM_TRANS_FLAG_NOLOCK = (1 << 17)
 } pmtransflag_t;
 
-/* Transaction Events */
+/**
+ * @addtogroup alpm_trans
+ * @{
+ */
+/**
+ * @brief Transaction events.
+ * NULL parameters are passed to in all events unless specified otherwise.
+ */
 typedef enum _pmtransevt_t {
+	/** Dependencies will be computed for a package. */
 	PM_TRANS_EVT_CHECKDEPS_START = 1,
+	/** Dependencies were computed for a package. */
 	PM_TRANS_EVT_CHECKDEPS_DONE,
+	/** File conflicts will be computed for a package. */
 	PM_TRANS_EVT_FILECONFLICTS_START,
+	/** File conflicts were computed for a package. */
 	PM_TRANS_EVT_FILECONFLICTS_DONE,
+	/** Dependencies will be resolved for target package. */
 	PM_TRANS_EVT_RESOLVEDEPS_START,
+	/** Dependencies were resolved for target package. */
 	PM_TRANS_EVT_RESOLVEDEPS_DONE,
+	/** Inter-conflicts will be checked for target package. */
 	PM_TRANS_EVT_INTERCONFLICTS_START,
+	/** Inter-conflicts were checked for target package. */
 	PM_TRANS_EVT_INTERCONFLICTS_DONE,
+	/** Package will be installed.
+	 * A pointer to the target package is passed to the callback.
+	 */
 	PM_TRANS_EVT_ADD_START,
+	/** Package was installed.
+	 * A pointer to the new package is passed to the callback.
+	 */
 	PM_TRANS_EVT_ADD_DONE,
+	/** Package will be removed.
+	 * A pointer to the target package is passed to the callback.
+	 */
 	PM_TRANS_EVT_REMOVE_START,
+	/** Package was removed.
+	 * A pointer to the removed package is passed to the callback.
+	 */
 	PM_TRANS_EVT_REMOVE_DONE,
+	/** Package will be upgraded.
+	 * A pointer to the upgraded package is passed to the callback.
+	 */
 	PM_TRANS_EVT_UPGRADE_START,
+	/** Package was upgraded.
+	 * A pointer to the new package, and a pointer to the old package is passed
+	 * to the callback, respectively.
+	 */
 	PM_TRANS_EVT_UPGRADE_DONE,
-	PM_TRANS_EVT_EXTRACT_DONE,
+	/** Target package's integrity will be checked. */
 	PM_TRANS_EVT_INTEGRITY_START,
+	/** Target package's integrity was checked. */
 	PM_TRANS_EVT_INTEGRITY_DONE,
+	/** Target deltas's integrity will be checked. */
 	PM_TRANS_EVT_DELTA_INTEGRITY_START,
+	/** Target delta's integrity was checked. */
 	PM_TRANS_EVT_DELTA_INTEGRITY_DONE,
+	/** Deltas will be applied to packages. */
 	PM_TRANS_EVT_DELTA_PATCHES_START,
+	/** Deltas were applied to packages. */
 	PM_TRANS_EVT_DELTA_PATCHES_DONE,
+	/** Delta patch will be applied to target package.
+	 * The filename of the package and the filename of the patch is passed to the
+	 * callback.
+	 */
 	PM_TRANS_EVT_DELTA_PATCH_START,
+	/** Delta patch was applied to target package. */
 	PM_TRANS_EVT_DELTA_PATCH_DONE,
+	/** Delta patch failed to apply to target package. */
 	PM_TRANS_EVT_DELTA_PATCH_FAILED,
+	/** Scriptlet has printed information.
+	 * A line of text is passed to the callback.
+	 */
 	PM_TRANS_EVT_SCRIPTLET_INFO,
-	PM_TRANS_EVT_PRINTURI,
+	/** Files will be downloaded from a repository.
+	 * The repository's tree name is passed to the callback.
+	 */
 	PM_TRANS_EVT_RETRIEVE_START,
 } pmtransevt_t;
+/*@}*/
 
 /* Transaction Conversations (ie, questions) */
 typedef enum _pmtransconv_t {
-	PM_TRANS_CONV_INSTALL_IGNOREPKG = 0x01,
-	PM_TRANS_CONV_REPLACE_PKG = 0x02,
-	PM_TRANS_CONV_CONFLICT_PKG = 0x04,
-	PM_TRANS_CONV_CORRUPTED_PKG = 0x08,
-	PM_TRANS_CONV_LOCAL_NEWER = 0x10,
-	/* 0x20 flag can go here */
-	PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40
+	PM_TRANS_CONV_INSTALL_IGNOREPKG = 1,
+	PM_TRANS_CONV_REPLACE_PKG = (1 << 1),
+	PM_TRANS_CONV_CONFLICT_PKG = (1 << 2),
+	PM_TRANS_CONV_CORRUPTED_PKG = (1 << 3),
+	PM_TRANS_CONV_LOCAL_NEWER = (1 << 4),
+	PM_TRANS_CONV_REMOVE_PKGS = (1 << 5),
 } pmtransconv_t;
 
 /* Transaction Progress */
@@ -351,20 +399,23 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *,
 /* Transaction Progress callback */
 typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, int, int);
 
-pmtranstype_t alpm_trans_get_type();
-unsigned int alpm_trans_get_flags();
-alpm_list_t * alpm_trans_get_targets();
-alpm_list_t * alpm_trans_get_pkgs();
-int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
+int alpm_trans_get_flags();
+alpm_list_t * alpm_trans_get_add();
+alpm_list_t * alpm_trans_get_remove();
+int alpm_trans_init(pmtransflag_t flags,
                     alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv,
                     alpm_trans_cb_progress cb_progress);
-int alpm_trans_sysupgrade(void);
-int alpm_trans_addtarget(char *target);
 int alpm_trans_prepare(alpm_list_t **data);
 int alpm_trans_commit(alpm_list_t **data);
 int alpm_trans_interrupt(void);
 int alpm_trans_release(void);
 
+int alpm_sync_sysupgrade(int enable_downgrade);
+int alpm_sync_target(char *target);
+int alpm_sync_dbtarget(char *db, char *target);
+int alpm_add_target(char *target);
+int alpm_remove_target(char *target);
+
 /*
  * Dependencies and conflicts
  */
@@ -378,21 +429,25 @@ typedef enum _pmdepmod_t {
 	PM_DEP_MOD_LT
 } pmdepmod_t;
 
-pmdepend_t *alpm_splitdep(const char *depstring);
 int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep);
-alpm_list_t *alpm_checkdeps(pmdb_t *db, int reversedeps,
+alpm_list_t *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 		alpm_list_t *remove, alpm_list_t *upgrade);
+alpm_list_t *alpm_deptest(pmdb_t *db, alpm_list_t *targets);
 
 const char *alpm_miss_get_target(const pmdepmissing_t *miss);
 pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss);
+const char *alpm_miss_get_causingpkg(const pmdepmissing_t *miss);
+
+alpm_list_t *alpm_checkconflicts(alpm_list_t *pkglist);
 
 const char *alpm_conflict_get_package1(pmconflict_t *conflict);
 const char *alpm_conflict_get_package2(pmconflict_t *conflict);
+const char *alpm_conflict_get_reason(pmconflict_t *conflict);
 
 pmdepmod_t alpm_dep_get_mod(const pmdepend_t *dep);
 const char *alpm_dep_get_name(const pmdepend_t *dep);
 const char *alpm_dep_get_version(const pmdepend_t *dep);
-char *alpm_dep_get_string(const pmdepend_t *dep);
+char *alpm_dep_compute_string(const pmdepend_t *dep);
 
 /*
  * File conflicts
@@ -413,7 +468,7 @@ const char *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict);
  */
 
 /* checksums */
-char *alpm_get_md5sum(const char *name);
+char *alpm_compute_md5sum(const char *name);
 
 /*
  * Errors
@@ -439,12 +494,7 @@ enum _pmerrno_t {
 	PM_ERR_DB_REMOVE,
 	/* Servers */
 	PM_ERR_SERVER_BAD_URL,
-	/* Configuration */
-	PM_ERR_OPT_LOGFILE,
-	PM_ERR_OPT_DBPATH,
-	PM_ERR_OPT_LOCALDB,
-	PM_ERR_OPT_SYNCDB,
-	PM_ERR_OPT_USESYSLOG,
+	PM_ERR_SERVER_NONE,
 	/* Transactions */
 	PM_ERR_TRANS_NOT_NULL,
 	PM_ERR_TRANS_NULL,
@@ -453,39 +503,30 @@ enum _pmerrno_t {
 	PM_ERR_TRANS_NOT_PREPARED,
 	PM_ERR_TRANS_ABORT,
 	PM_ERR_TRANS_TYPE,
-	PM_ERR_TRANS_COMMITING,
-	PM_ERR_TRANS_DOWNLOADING,
+	PM_ERR_TRANS_NOT_LOCKED,
 	/* Packages */
 	PM_ERR_PKG_NOT_FOUND,
+	PM_ERR_PKG_IGNORED,
 	PM_ERR_PKG_INVALID,
 	PM_ERR_PKG_OPEN,
-	PM_ERR_PKG_LOAD,
-	PM_ERR_PKG_INSTALLED,
-	PM_ERR_PKG_CANT_FRESH,
 	PM_ERR_PKG_CANT_REMOVE,
 	PM_ERR_PKG_INVALID_NAME,
-	PM_ERR_PKG_CORRUPTED,
+	PM_ERR_PKG_INVALID_ARCH,
 	PM_ERR_PKG_REPO_NOT_FOUND,
 	/* Deltas */
-	PM_ERR_DLT_CORRUPTED,
+	PM_ERR_DLT_INVALID,
 	PM_ERR_DLT_PATCHFAILED,
-	/* Groups */
-	PM_ERR_GRP_NOT_FOUND,
 	/* Dependencies */
 	PM_ERR_UNSATISFIED_DEPS,
 	PM_ERR_CONFLICTING_DEPS,
 	PM_ERR_FILE_CONFLICTS,
 	/* Misc */
-	PM_ERR_USER_ABORT,
-	PM_ERR_INTERNAL_ERROR,
-	PM_ERR_LIBARCHIVE_ERROR,
-	PM_ERR_DB_SYNC,
 	PM_ERR_RETRIEVE,
-	PM_ERR_PKG_HOLD,
 	PM_ERR_INVALID_REGEX,
-  /* Downloading */
-	PM_ERR_CONNECT_FAILED,
-  PM_ERR_FORK_FAILED
+	/* External library errors */
+	PM_ERR_LIBARCHIVE,
+	PM_ERR_LIBFETCH,
+	PM_ERR_EXTERNAL_DOWNLOAD
 };
 
 extern enum _pmerrno_t pm_errno;

lib/libalpm/alpm_list.c

@@ -1,7 +1,8 @@
 /*
  *  alpm_list.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,15 +18,16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 /* libalpm */
 #include "alpm_list.h"
-#include "util.h"
+
+/* check exported library symbols with: nm -C -D <lib> */
+#define SYMEXPORT __attribute__((visibility("default")))
+#define SYMHIDDEN __attribute__((visibility("internal")))
 
 /**
  * @addtogroup alpm_list List Functions
@@ -39,25 +41,6 @@
 
 /* Allocation */
 
-/**
- * @brief Allocate a new alpm_list_t.
- *
- * @return a new alpm_list_t item, or NULL on failure
- */
-alpm_list_t SYMEXPORT *alpm_list_new()
-{
-	alpm_list_t *list = NULL;
-
-	list = malloc(sizeof(alpm_list_t));
-	if(list) {
-		list->data = NULL;
-		list->prev = list; /* maintain a back reference to the tail pointer */
-		list->next = NULL;
-	}
-
-	return(list);
-}
-
 /**
  * @brief Free a list, but not the contained data.
  *
@@ -107,30 +90,26 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
 {
 	alpm_list_t *ptr, *lp;
 
-	ptr = list;
+	ptr = calloc(1, sizeof(alpm_list_t));
 	if(ptr == NULL) {
-		ptr = alpm_list_new();
-		if(ptr == NULL) {
-			return(NULL);
-		}
+		return(list);
 	}
 
-	lp = alpm_list_last(ptr);
-	if(lp == ptr && lp->data == NULL) {
-		/* nada */
-	} else {
-		lp->next = alpm_list_new();
-		if(lp->next == NULL) {
-			return(NULL);
-		}
-		lp->next->prev = lp;
-		lp = lp->next;
-		list->prev = lp;
+	ptr->data = data;
+	ptr->next = NULL;
+
+	/* Special case: the input list is empty */
+	if(list == NULL) {
+		ptr->prev = ptr;
+		return(ptr);
 	}
 
-	lp->data = data;
+	lp = alpm_list_last(list);
+	lp->next = ptr;
+	ptr->prev = lp;
+	list->prev = ptr;
 
-	return(ptr);
+	return(list);
 }
 
 /**
@@ -144,12 +123,15 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
  */
 alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn)
 {
-	if(!fn) {
-		return alpm_list_add(list, data);
+	if(!fn || !list) {
+		return(alpm_list_add(list, data));
 	} else {
 		alpm_list_t *add = NULL, *prev = NULL, *next = list;
 
-		add = alpm_list_new();
+		add = calloc(1, sizeof(alpm_list_t));
+		if(add == NULL) {
+			return(list);
+		}
 		add->data = data;
 
 		/* Find insertion point. */
@@ -159,26 +141,25 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_
 			next = next->next;
 		}
 
-		/*  Insert node before insertion point. */
-		add->prev = prev;
-		add->next = next;
-
-		if(next != NULL) {
-			next->prev = add;   /*  Not at end.  */
-		}
-
-		if(prev != NULL) {
-			prev->next = add;       /*  In middle.  */
-		} else {
-			list = add; /* At beginning, or new list */
-		}
-
-		if(next == NULL) {
-			/* At end, adjust tail pointer on head node */
+		/* Insert the add node to the list */
+		if(prev == NULL) { /* special case: we insert add as the first element */
+			add->prev = list->prev; /* list != NULL */
+			add->next = list;
 			list->prev = add;
+			return(add);
+		} else if(next == NULL) { /* another special case: add last element */
+			add->prev = prev;
+			add->next = NULL;
+			prev->next = add;
+			list->prev = add;
+			return(list);
+		} else {
+			add->prev = prev;
+			add->next = next;
+			next->prev = add;
+			prev->next = add;
+			return(list);
 		}
-
-		return(list);
 	}
 }
 
@@ -198,10 +179,10 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
 	alpm_list_t *tmp;
 
 	if (first == NULL) {
-		return second;
+		return(second);
 	}
 	if (second == NULL) {
-		return first;
+		return(first);
 	}
 	/* tmp is the last element of the first list */
 	tmp = first->prev;
@@ -322,12 +303,17 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl
 		*data = NULL;
 	}
 
+	if(needle == NULL) {
+		return(haystack);
+	}
+
 	while(i) {
 		if(i->data == NULL) {
+			i = i->next;
 			continue;
 		}
 		tmp = i->next;
-		if(fn(needle, i->data) == 0) {
+		if(fn(i->data, needle) == 0) {
 			/* we found a matching item */
 			if(i == haystack) {
 				/* Special case: removing the head node which has a back reference to
@@ -370,6 +356,22 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl
 	return(haystack);
 }
 
+/**
+ * @brief Remove a string from a list.
+ *
+ * @param haystack the list to remove the item from
+ * @param needle   the data member of the item we're removing
+ * @param data     output parameter containing data of the removed item
+ *
+ * @return the resultant list
+ */
+alpm_list_t SYMEXPORT *alpm_list_remove_str(alpm_list_t *haystack,
+		const char *needle, char **data)
+{
+	return(alpm_list_remove(haystack, (const void *)needle,
+				(alpm_list_fn_cmp)strcmp, (void **)data));
+}
+
 /**
  * @brief Create a new list without any duplicates.
  *
@@ -464,18 +466,22 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list,
 alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list)
 {
 	const alpm_list_t *lp;
-	alpm_list_t *newlist = NULL;
+	alpm_list_t *newlist = NULL, *backup;
+
+	if(list == NULL) {
+		return(NULL);
+	}
 
 	lp = alpm_list_last(list);
-	if(list) {
-		/* break our reverse circular list */
-		list->prev = NULL;
-	}
+	/* break our reverse circular list */
+	backup = list->prev;
+	list->prev = NULL;
 
 	while(lp) {
 		newlist = alpm_list_add(newlist, lp->data);
 		lp = lp->prev;
 	}
+	list->prev = backup; /* restore tail pointer */
 	return(newlist);
 }
 
@@ -490,14 +496,18 @@ alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list)
  */
 inline alpm_list_t SYMEXPORT *alpm_list_first(const alpm_list_t *list)
 {
-	return((alpm_list_t*)list);
+	if(list) {
+		return((alpm_list_t*)list);
+	} else {
+		return(NULL);
+	}
 }
 
 /**
  * @brief Return nth element from list (starting from 0).
  *
  * @param list the list
- * @param n    the index of the item to find
+ * @param n    the index of the item to find (n < alpm_list_count(list) IS needed)
  *
  * @return an alpm_list_t node for index `n`
  */
@@ -519,7 +529,11 @@ alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, int n)
  */
 inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node)
 {
-	return(node->next);
+	if(node) {
+		return(node->next);
+	} else {
+		return(NULL);
+	}
 }
 
 /**
@@ -594,7 +608,7 @@ void SYMEXPORT *alpm_list_find(const alpm_list_t *haystack, const void *needle,
 }
 
 /* trivial helper function for alpm_list_find_ptr */
-static int ptrcmp(const void *p, const void *q)
+static int ptr_cmp(const void *p, const void *q)
 {
 	return(p != q);
 }
@@ -602,7 +616,7 @@ static int ptrcmp(const void *p, const void *q)
 /**
  * @brief Find an item in a list.
  *
- * Search for the item whos data matches that of the `needle`.
+ * Search for the item whose data matches that of the `needle`.
  *
  * @param needle   the data to search for (== comparison)
  * @param haystack the list
@@ -611,7 +625,7 @@ static int ptrcmp(const void *p, const void *q)
  */
 void SYMEXPORT *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle)
 {
-	return(alpm_list_find(haystack, needle, ptrcmp));
+	return(alpm_list_find(haystack, needle, ptr_cmp));
 }
 
 /**
@@ -622,17 +636,73 @@ void SYMEXPORT *alpm_list_find_ptr(const alpm_list_t *haystack, const void *need
  *
  * @return `needle` if found, NULL otherwise
  */
-char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack, const char *needle)
+char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack,
+		const char *needle)
 {
-	return((char *)alpm_list_find(haystack, (const void*)needle, (alpm_list_fn_cmp)strcmp));
+	return((char *)alpm_list_find(haystack, (const void*)needle,
+				(alpm_list_fn_cmp)strcmp));
 }
 
 /**
- * @brief Find the items in list `lhs` that are not present in list `rhs`.
+ * @brief Find the differences between list `left` and list `right`
  *
- * Entries are not duplicated. Operation is O(m*n). The first list is stepped
- * through one node at a time, and for each node in the first list, each node
- * in the second list is compared to it.
+ * The two lists must be sorted. Items only in list `left` are added to the
+ * `onlyleft` list. Items only in list `right` are added to the `onlyright`
+ * list.
+ *
+ * @param left      the first list
+ * @param right     the second list
+ * @param fn        the comparison function
+ * @param onlyleft  pointer to the first result list
+ * @param onlyright pointer to the second result list
+ *
+ */
+void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left,
+		const alpm_list_t *right, alpm_list_fn_cmp fn,
+		alpm_list_t **onlyleft, alpm_list_t **onlyright)
+{
+	const alpm_list_t *l = left;
+	const alpm_list_t *r = right;
+
+	if(!onlyleft && !onlyright) {
+		return;
+	}
+
+	while (l != NULL && r != NULL) {
+		int cmp = fn(l->data, r->data);
+		if(cmp < 0) {
+			if(onlyleft) {
+				*onlyleft = alpm_list_add(*onlyleft, l->data);
+			}
+			l = l->next;
+		}
+		else if(cmp > 0) {
+			if(onlyright) {
+				*onlyright = alpm_list_add(*onlyright, r->data);
+			}
+			r = r->next;
+		} else {
+			l = l->next;
+			r = r->next;
+		}
+	}
+	while (l != NULL) {
+		if(onlyleft) {
+			*onlyleft = alpm_list_add(*onlyleft, l->data);
+		}
+		l = l->next;
+	}
+	while (r != NULL) {
+		if(onlyright) {
+			*onlyright = alpm_list_add(*onlyright, r->data);
+		}
+		r = r->next;
+	}
+}
+
+
+/**
+ * @brief Find the items in list `lhs` that are not present in list `rhs`.
  *
  * @param lhs the first list
  * @param rhs the second list
@@ -643,21 +713,18 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack, const char *need
 alpm_list_t SYMEXPORT *alpm_list_diff(const alpm_list_t *lhs,
 		const alpm_list_t *rhs, alpm_list_fn_cmp fn)
 {
-	const alpm_list_t *i, *j;
+	alpm_list_t *left, *right;
 	alpm_list_t *ret = NULL;
-	for(i = lhs; i; i = i->next) {
-		int found = 0;
-		for(j = rhs; j; j = j->next) {
-			if(fn(i->data, j->data) == 0) {
-				found = 1;
-				break;
-			}
-		}
-		if(!found) {
-			ret = alpm_list_add(ret, i->data);
-		}
-	}
 
+	left = alpm_list_copy(lhs);
+	left = alpm_list_msort(left, alpm_list_count(left), fn);
+	right = alpm_list_copy(rhs);
+	right = alpm_list_msort(right, alpm_list_count(right), fn);
+
+	alpm_list_diff_sorted(left, right, fn, &ret, NULL);
+
+	alpm_list_free(left);
+	alpm_list_free(right);
 	return(ret);
 }
 

lib/libalpm/alpm_list.h

@@ -1,7 +1,8 @@
 /*
  *  alpm_list.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,6 +20,8 @@
 #ifndef _ALPM_LIST_H
 #define _ALPM_LIST_H
 
+#include <stdlib.h> /* size_t */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,7 +48,6 @@ typedef void (*alpm_list_fn_free)(void *); /* item deallocation callback */
 typedef int (*alpm_list_fn_cmp)(const void *, const void *); /* item comparison callback */
 
 /* allocation */
-alpm_list_t *alpm_list_new(void);
 void alpm_list_free(alpm_list_t *list);
 void alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn);
 
@@ -56,6 +58,7 @@ alpm_list_t *alpm_list_join(alpm_list_t *first, alpm_list_t *second);
 alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn);
 alpm_list_t *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn);
 alpm_list_t *alpm_list_remove(alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn, void **data);
+alpm_list_t *alpm_list_remove_str(alpm_list_t *haystack, const char *needle, char **data);
 alpm_list_t *alpm_list_remove_dupes(const alpm_list_t *list);
 alpm_list_t *alpm_list_strdup(const alpm_list_t *list);
 alpm_list_t *alpm_list_copy(const alpm_list_t *list);
@@ -75,6 +78,8 @@ void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_
 void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle);
 char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle);
 alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn);
+void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right,
+		alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright);
 
 #ifdef __cplusplus
 }

lib/libalpm/backup.c

@@ -1,6 +1,7 @@
 /*
  *  backup.c
  *
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2005 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -32,7 +33,7 @@
 #include "util.h"
 
 /* split a backup string "file\thash" into two strings : file and hash */
-int _alpm_backup_split(const char *string, char **file, char **hash)
+static int backup_split(const char *string, char **file, char **hash)
 {
 	char *str = strdup(string);
 	char *ptr;
@@ -42,6 +43,9 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
 	if(ptr == NULL) {
 		if(file) {
 			*file = str;
+		} else {
+			/* don't need our dup as the fname wasn't requested, so free it */
+			FREE(str);
 		}
 		return(0);
 	}
@@ -61,14 +65,14 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
 char *_alpm_backup_file(const char *string)
 {
 	char *file = NULL;
-	_alpm_backup_split(string, &file, NULL);
+	backup_split(string, &file, NULL);
 	return(file);
 }
 
 char *_alpm_backup_hash(const char *string)
 {
 	char *hash = NULL;
-	_alpm_backup_split(string, NULL, &hash);
+	backup_split(string, NULL, &hash);
 	return(hash);
 }
 
@@ -91,7 +95,7 @@ char *_alpm_needbackup(const char *file, const alpm_list_t *backup)
 		char *hash = NULL;
 
 		/* no hash found */
-		if(!_alpm_backup_split((char *)lp->data, &filename, &hash)) {
+		if(!backup_split((char *)lp->data, &filename, &hash)) {
 			FREE(filename);
 			continue;
 		}

lib/libalpm/backup.h

@@ -1,7 +1,8 @@
 /*
  *  backup.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

lib/libalpm/be_package.c

@@ -0,0 +1,290 @@
+/*
+ *  be_package.c
+ *
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <ctype.h>
+#include <locale.h> /* setlocale */
+
+/* libarchive */
+#include <archive.h>
+#include <archive_entry.h>
+
+/* libalpm */
+#include "alpm_list.h"
+#include "util.h"
+#include "log.h"
+#include "package.h"
+#include "deps.h" /* _alpm_splitdep */
+
+/**
+ * Parses the package description file for a package into a pmpkg_t struct.
+ * @param archive the archive to read from, pointed at the .PKGINFO entry
+ * @param newpkg an empty pmpkg_t struct to fill with package info
+ *
+ * @return 0 on success, 1 on error
+ */
+static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
+{
+	char line[PATH_MAX];
+	char *ptr = NULL;
+	char *key = NULL;
+	int linenum = 0;
+
+	ALPM_LOG_FUNC;
+
+	/* loop until we reach EOF (where archive_fgets will return NULL) */
+	while(_alpm_archive_fgets(line, PATH_MAX, a) != NULL) {
+		linenum++;
+		_alpm_strtrim(line);
+		if(strlen(line) == 0 || line[0] == '#') {
+			continue;
+		}
+		ptr = line;
+		key = strsep(&ptr, "=");
+		if(key == NULL || ptr == NULL) {
+			_alpm_log(PM_LOG_DEBUG, "%s: syntax error in description file line %d\n",
+								newpkg->name ? newpkg->name : "error", linenum);
+		} else {
+			key = _alpm_strtrim(key);
+			ptr = _alpm_strtrim(ptr);
+			if(!strcmp(key, "pkgname")) {
+				STRDUP(newpkg->name, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "pkgver")) {
+				STRDUP(newpkg->version, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "pkgdesc")) {
+				STRDUP(newpkg->desc, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "group")) {
+				newpkg->groups = alpm_list_add(newpkg->groups, strdup(ptr));
+			} else if(!strcmp(key, "url")) {
+				STRDUP(newpkg->url, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "license")) {
+				newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr));
+			} else if(!strcmp(key, "builddate")) {
+				char first = tolower((unsigned char)ptr[0]);
+				if(first > 'a' && first < 'z') {
+					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
+					setlocale(LC_TIME, "C");
+					strptime(ptr, "%a %b %e %H:%M:%S %Y", &tmp_tm);
+					newpkg->builddate = mktime(&tmp_tm);
+					setlocale(LC_TIME, "");
+				} else {
+					newpkg->builddate = atol(ptr);
+				}
+			} else if(!strcmp(key, "packager")) {
+				STRDUP(newpkg->packager, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "arch")) {
+				STRDUP(newpkg->arch, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "size")) {
+				/* size in the raw package is uncompressed (installed) size */
+				newpkg->isize = atol(ptr);
+			} else if(!strcmp(key, "depend")) {
+				pmdepend_t *dep = _alpm_splitdep(ptr);
+				newpkg->depends = alpm_list_add(newpkg->depends, dep);
+			} else if(!strcmp(key, "optdepend")) {
+				newpkg->optdepends = alpm_list_add(newpkg->optdepends, strdup(ptr));
+			} else if(!strcmp(key, "conflict")) {
+				newpkg->conflicts = alpm_list_add(newpkg->conflicts, strdup(ptr));
+			} else if(!strcmp(key, "replaces")) {
+				newpkg->replaces = alpm_list_add(newpkg->replaces, strdup(ptr));
+			} else if(!strcmp(key, "provides")) {
+				newpkg->provides = alpm_list_add(newpkg->provides, strdup(ptr));
+			} else if(!strcmp(key, "backup")) {
+				newpkg->backup = alpm_list_add(newpkg->backup, strdup(ptr));
+			} else if(!strcmp(key, "makepkgopt")) {
+				/* not used atm */
+			} else {
+				_alpm_log(PM_LOG_DEBUG, "%s: syntax error in description file line %d\n",
+									newpkg->name ? newpkg->name : "error", linenum);
+			}
+		}
+		line[0] = '\0';
+	}
+
+	return(0);
+}
+
+/**
+ * Load a package and create the corresponding pmpkg_t struct.
+ * @param pkgfile path to the package file
+ * @param full whether to stop the load after metadata is read or continue
+ *             through the full archive
+ * @return An information filled pmpkg_t struct
+ */
+static pmpkg_t *pkg_load(const char *pkgfile, int full)
+{
+	int ret = ARCHIVE_OK;
+	int config = 0;
+	struct archive *archive;
+	struct archive_entry *entry;
+	pmpkg_t *newpkg = NULL;
+	struct stat st;
+
+	ALPM_LOG_FUNC;
+
+	if(pkgfile == NULL || strlen(pkgfile) == 0) {
+		RET_ERR(PM_ERR_WRONG_ARGS, NULL);
+	}
+
+	if(stat(pkgfile, &st) != 0) {
+		RET_ERR(PM_ERR_PKG_OPEN, NULL);
+	}
+
+	if((archive = archive_read_new()) == NULL) {
+		RET_ERR(PM_ERR_LIBARCHIVE, NULL);
+	}
+
+	archive_read_support_compression_all(archive);
+	archive_read_support_format_all(archive);
+
+	if (archive_read_open_filename(archive, pkgfile,
+				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+		RET_ERR(PM_ERR_PKG_OPEN, NULL);
+	}
+
+	newpkg = _alpm_pkg_new();
+	if(newpkg == NULL) {
+		archive_read_finish(archive);
+		RET_ERR(PM_ERR_MEMORY, NULL);
+	}
+
+	newpkg->filename = strdup(pkgfile);
+	newpkg->size = st.st_size;
+
+	/* If full is false, only read through the archive until we find our needed
+	 * metadata. If it is true, read through the entire archive, which serves
+	 * as a verfication of integrity and allows us to create the filelist. */
+	while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
+		const char *entry_name = archive_entry_pathname(entry);
+
+		if(strcmp(entry_name, ".PKGINFO") == 0) {
+			/* parse the info file */
+			if(parse_descfile(archive, newpkg) != 0) {
+				_alpm_log(PM_LOG_ERROR, _("could not parse package description file in %s\n"),
+						pkgfile);
+				goto pkg_invalid;
+			}
+			if(newpkg->name == NULL || strlen(newpkg->name) == 0) {
+				_alpm_log(PM_LOG_ERROR, _("missing package name in %s\n"), pkgfile);
+				goto pkg_invalid;
+			}
+			if(newpkg->version == NULL || strlen(newpkg->version) == 0) {
+				_alpm_log(PM_LOG_ERROR, _("missing package version in %s\n"), pkgfile);
+				goto pkg_invalid;
+			}
+			config = 1;
+			continue;
+		} else if(strcmp(entry_name,  ".INSTALL") == 0) {
+			newpkg->scriptlet = 1;
+		} else if(*entry_name == '.') {
+			/* for now, ignore all files starting with '.' that haven't
+			 * already been handled (for future possibilities) */
+		} else {
+			/* Keep track of all files for filelist generation */
+			newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name));
+		}
+
+		if(archive_read_data_skip(archive)) {
+			_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
+					pkgfile, archive_error_string(archive));
+			pm_errno = PM_ERR_LIBARCHIVE;
+			goto error;
+		}
+
+		/* if we are not doing a full read, see if we have all we need */
+		if(!full && config) {
+			break;
+		}
+	}
+
+	if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occured */
+		_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
+				pkgfile, archive_error_string(archive));
+		pm_errno = PM_ERR_LIBARCHIVE;
+		goto error;
+	}
+
+	if(!config) {
+		_alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile);
+		goto pkg_invalid;
+	}
+
+  archive_read_finish(archive);
+
+	/* internal fields for package struct */
+	newpkg->origin = PKG_FROM_FILE;
+	newpkg->origin_data.file = strdup(pkgfile);
+
+	if(full) {
+		/* "checking for conflicts" requires a sorted list, ensure that here */
+		_alpm_log(PM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile);
+		newpkg->files = alpm_list_msort(newpkg->files, alpm_list_count(newpkg->files),
+				_alpm_str_cmp);
+		newpkg->infolevel = INFRQ_ALL;
+	} else {
+		/* get rid of any partial filelist we may have collected, it is invalid */
+		FREELIST(newpkg->files);
+		newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_DEPENDS;
+	}
+
+	return(newpkg);
+
+pkg_invalid:
+	pm_errno = PM_ERR_PKG_INVALID;
+error:
+	_alpm_pkg_free(newpkg);
+	archive_read_finish(archive);
+
+	return(NULL);
+}
+
+/** Create a package from a file.
+ * If full is false, the archive is read only until all necessary
+ * metadata is found. If it is true, the entire archive is read, which
+ * serves as a verfication of integrity and the filelist can be created.
+ * @param filename location of the package tarball
+ * @param full whether to stop the load after metadata is read or continue
+ *             through the full archive
+ * @param pkg address of the package pointer
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(filename != NULL && strlen(filename) != 0,
+			RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+
+	*pkg = pkg_load(filename, full);
+	if(*pkg == NULL) {
+		/* pm_errno is set by pkg_load */
+		return(-1);
+	}
+
+	return(0);
+}
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/cache.c

@@ -1,7 +1,8 @@
 /*
  *  cache.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +20,6 @@
 
 #include "config.h"
 
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -31,7 +31,6 @@
 #include "log.h"
 #include "alpm.h"
 #include "util.h"
-#include "error.h"
 #include "package.h"
 #include "group.h"
 #include "db.h"
@@ -41,32 +40,22 @@
  */
 int _alpm_db_load_pkgcache(pmdb_t *db)
 {
-	pmpkg_t *info;
-	int count = 0;
-
 	ALPM_LOG_FUNC;
 
 	if(db == NULL) {
 		return(-1);
 	}
-
 	_alpm_db_free_pkgcache(db);
 
 	_alpm_log(PM_LOG_DEBUG, "loading package cache for repository '%s'\n",
-	          db->treename);
-
-	_alpm_db_rewind(db);
-	while((info = _alpm_db_scan(db, NULL)) != NULL) {
-		_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
-							alpm_pkg_get_name(info), db->treename);
-		info->origin = PKG_FROM_CACHE;
-		info->origin_data.db = db;
-		/* add to the collection */
-		db->pkgcache = alpm_list_add(db->pkgcache, info);
-		count++;
+			db->treename);
+	if(_alpm_db_populate(db) == -1) {
+		_alpm_log(PM_LOG_DEBUG,
+				"failed to load package cache for repository '%s'\n", db->treename);
+		return(-1);
 	}
 
-	db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp);
+	db->pkgcache_loaded = 1;
 	return(0);
 }
 
@@ -74,23 +63,19 @@ void _alpm_db_free_pkgcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
 
-	if(db == NULL || db->pkgcache == NULL) {
+	if(db == NULL || !db->pkgcache_loaded) {
 		return;
 	}
 
 	_alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'\n",
 	                        db->treename);
 
-	alpm_list_t *tmp;
-	for(tmp = db->pkgcache; tmp; tmp = alpm_list_next(tmp)) {
-		_alpm_pkg_free(tmp->data);
-	}
+	alpm_list_free_inner(db->pkgcache, (alpm_list_fn_free)_alpm_pkg_free);
 	alpm_list_free(db->pkgcache);
 	db->pkgcache = NULL;
+	db->pkgcache_loaded = 0;
 
-	if(db->grpcache) {
-		_alpm_db_free_grpcache(db);
-	}
+	_alpm_db_free_grpcache(db);
 }
 
 alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
@@ -101,32 +86,44 @@ alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
 		return(NULL);
 	}
 
-	if(!db->pkgcache) {
+	if(!db->pkgcache_loaded) {
 		_alpm_db_load_pkgcache(db);
 	}
 
 	/* hmmm, still NULL ?*/
 	if(!db->pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "error: pkgcache is NULL for db '%s'\n", db->treename);
+		_alpm_log(PM_LOG_DEBUG, "warning: pkgcache is NULL for db '%s'\n", db->treename);
 	}
 
 	return(db->pkgcache);
 }
 
+/* "duplicate" pkg with BASE info (to spare some memory) then add it to pkgcache */
 int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg)
 {
 	pmpkg_t *newpkg;
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL || pkg == NULL) {
+	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
 		return(-1);
 	}
 
-	newpkg = _alpm_pkg_dup(pkg);
+	newpkg = _alpm_pkg_new();
 	if(newpkg == NULL) {
 		return(-1);
 	}
+	newpkg->name = strdup(pkg->name);
+	newpkg->version = strdup(pkg->version);
+	if(newpkg->name == NULL || newpkg->version == NULL) {
+		pm_errno = PM_ERR_MEMORY;
+		_alpm_pkg_free(newpkg);
+		return(-1);
+	}
+	newpkg->origin = PKG_FROM_CACHE;
+	newpkg->origin_data.db = db;
+	newpkg->infolevel = INFRQ_BASE; 
+
 	_alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
 						alpm_pkg_get_name(newpkg), db->treename);
 	db->pkgcache = alpm_list_add_sorted(db->pkgcache, newpkg, _alpm_pkg_cmp);
@@ -143,7 +140,7 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL || pkg == NULL) {
+	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
 		return(-1);
 	}
 
@@ -176,12 +173,12 @@ pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target)
 
 	alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db);
 	if(!pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "error: failed to get '%s' from NULL pkgcache\n",
+		_alpm_log(PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n",
 				target);
 		return(NULL);
 	}
 
-	return(_alpm_pkg_find(target, pkgcache));
+	return(_alpm_pkg_find(pkgcache, target));
 }
 
 /* Returns a new group cache from db.
@@ -196,10 +193,6 @@ int _alpm_db_load_grpcache(pmdb_t *db)
 		return(-1);
 	}
 
-	if(db->pkgcache == NULL) {
-		_alpm_db_load_pkgcache(db);
-	}
-
 	_alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n",
 			db->treename);
 
@@ -208,36 +201,33 @@ int _alpm_db_load_grpcache(pmdb_t *db)
 		pmpkg_t *pkg = lp->data;
 
 		for(i = alpm_pkg_get_groups(pkg); i; i = i->next) {
-			if(!alpm_list_find_str(db->grpcache, i->data)) {
-				pmgrp_t *grp = _alpm_grp_new();
+			const char *grpname = i->data;
+			alpm_list_t *j;
+			pmgrp_t *grp = NULL;
+			int found = 0;
 
-				strncpy(grp->name, i->data, GRP_NAME_LEN);
-				grp->name[GRP_NAME_LEN-1] = '\0';
-				grp->packages = alpm_list_add_sorted(grp->packages,
-																						 /* gross signature forces us to
-																							* discard const */
-																						 (void*)alpm_pkg_get_name(pkg),
-																						 _alpm_str_cmp);
-				db->grpcache = alpm_list_add_sorted(db->grpcache, grp, _alpm_grp_cmp);
-			} else {
-				alpm_list_t *j;
+			/* first look through the group cache for a group with this name */
+			for(j = db->grpcache; j; j = j->next) {
+				grp = j->data;
 
-				for(j = db->grpcache; j; j = j->next) {
-					pmgrp_t *grp = j->data;
-
-					if(strcmp(grp->name, i->data) == 0) {
-						const char *pkgname = alpm_pkg_get_name(pkg);
-						if(!alpm_list_find_str(grp->packages, pkgname)) {
-							grp->packages = alpm_list_add_sorted(grp->packages,
-							                                     (void*)pkgname,
-																									 _alpm_str_cmp);
-						}
-					}
+				if(strcmp(grp->name, grpname) == 0
+						&& !alpm_list_find_ptr(grp->packages, pkg)) {
+					grp->packages = alpm_list_add(grp->packages, pkg);
+					found = 1;
+					break;
 				}
 			}
+			if(found) {
+				continue;
+			}
+			/* we didn't find the group, so create a new one with this name */
+			grp = _alpm_grp_new(grpname);
+			grp->packages = alpm_list_add(grp->packages, pkg);
+			db->grpcache = alpm_list_add(db->grpcache, grp);
 		}
 	}
 
+	db->grpcache_loaded = 1;
 	return(0);
 }
 
@@ -247,19 +237,19 @@ void _alpm_db_free_grpcache(pmdb_t *db)
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL || db->grpcache == NULL) {
+	if(db == NULL || !db->grpcache_loaded) {
 		return;
 	}
 
-	for(lg = db->grpcache; lg; lg = lg->next) {
-		pmgrp_t *grp = lg->data;
+	_alpm_log(PM_LOG_DEBUG, "freeing group cache for repository '%s'\n",
+	                        db->treename);
 
-		alpm_list_free(grp->packages);
-		grp->packages = NULL;
+	for(lg = db->grpcache; lg; lg = lg->next) {
 		_alpm_grp_free(lg->data);
 		lg->data = NULL;
 	}
 	FREELIST(db->grpcache);
+	db->grpcache_loaded = 0;
 }
 
 alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db)
@@ -270,7 +260,7 @@ alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db)
 		return(NULL);
 	}
 
-	if(db->grpcache == NULL) {
+	if(!db->grpcache_loaded) {
 		_alpm_db_load_grpcache(db);
 	}
 

lib/libalpm/cache.h

@@ -1,7 +1,8 @@
 /*
  *  cache.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

lib/libalpm/conflict.c

@@ -1,7 +1,8 @@
 /*
  *  conflict.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -25,10 +26,10 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
+#include <dirent.h>
 
 /* libalpm */
 #include "conflict.h"
@@ -36,12 +37,11 @@
 #include "handle.h"
 #include "trans.h"
 #include "util.h"
-#include "error.h"
 #include "log.h"
 #include "cache.h"
 #include "deps.h"
 
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2)
+pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason)
 {
 	pmconflict_t *conflict;
 
@@ -49,12 +49,33 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2)
 
 	MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
-	strncpy(conflict->package1, package1, PKG_NAME_LEN);
-	strncpy(conflict->package2, package2, PKG_NAME_LEN);
+	STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->package2, package2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->reason, reason, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(conflict);
 }
 
+void _alpm_conflict_free(pmconflict_t *conflict)
+{
+	FREE(conflict->package2);
+	FREE(conflict->package1);
+	FREE(conflict->reason);
+	FREE(conflict);
+}
+
+pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict)
+{
+	pmconflict_t *newconflict;
+	CALLOC(newconflict, 1, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
+
+	STRDUP(newconflict->package1, conflict->package1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newconflict->package2, conflict->package2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newconflict->reason, conflict->reason, RET_ERR(PM_ERR_MEMORY, NULL));
+
+	return(newconflict);
+}
+
 int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack)
 {
 	alpm_list_t *i;
@@ -86,7 +107,7 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2)
 {
 	const char *pkg1name = alpm_pkg_get_name(pkg1);
 	const char *pkg2name = alpm_pkg_get_name(pkg2);
-	pmdepend_t *conf = alpm_splitdep(conflict);
+	pmdepend_t *conf = _alpm_splitdep(conflict);
 	int match = 0;
 
 	match = alpm_depcmp(pkg2, conf);
@@ -94,7 +115,7 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2)
 		_alpm_log(PM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n",
 				pkg1name, pkg2name, conflict);
 	}
-	FREE(conf);
+	_alpm_dep_free(conf);
 	return(match);
 }
 
@@ -104,13 +125,13 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2)
  * @param pkg2 package causing conflict
  */
 static void add_conflict(alpm_list_t **baddeps, const char *pkg1,
-		const char *pkg2)
+		const char *pkg2, const char *reason)
 {
-	pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2);
+	pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2, reason);
 	if(conflict && !_alpm_conflict_isin(conflict, *baddeps)) {
 		*baddeps = alpm_list_add(*baddeps, conflict);
 	} else {
-		FREE(conflict);
+		_alpm_conflict_free(conflict);
 	}
 }
 
@@ -150,9 +171,9 @@ static void check_conflict(alpm_list_t *list1, alpm_list_t *list2,
 
 				if(does_conflict(pkg1, conflict, pkg2)) {
 					if(order >= 0) {
-						add_conflict(baddeps, pkg1name, pkg2name);
+						add_conflict(baddeps, pkg1name, pkg2name, conflict);
 					} else {
-						add_conflict(baddeps, pkg2name, pkg1name);
+						add_conflict(baddeps, pkg2name, pkg1name, conflict);
 					}
 				}
 			}
@@ -200,9 +221,13 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages)
 	return(baddeps);
 }
 
-/* Check for transaction conflicts */
-alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages) {
-	return(alpm_list_join(_alpm_innerconflicts(packages), _alpm_outerconflicts(db, packages)));
+/** Check the package conflicts in a database
+ *
+ * @param pkglist the list of packages to check
+ * @return an alpm_list_t of pmconflict_t
+ */
+alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_list_t *pkglist) {
+	return(_alpm_innerconflicts(pkglist));
 }
 
 /* Returns a alpm_list_t* of file conflicts.
@@ -299,15 +324,15 @@ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
 										const char* name1, const char* name2)
 {
 	pmfileconflict_t *conflict;
-	MALLOC(conflict, sizeof(pmfileconflict_t), return(conflicts));
+	MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
 	conflict->type = type;
-	strncpy(conflict->target, name1, PKG_NAME_LEN);
-	strncpy(conflict->file, filestr, CONFLICT_FILE_LEN);
+	STRDUP(conflict->target, name1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->file, filestr, RET_ERR(PM_ERR_MEMORY, NULL));
 	if(name2) {
-		strncpy(conflict->ctarget, name2, PKG_NAME_LEN);
+		STRDUP(conflict->ctarget, name2, RET_ERR(PM_ERR_MEMORY, NULL));
 	} else {
-		conflict->ctarget[0] = '\0';
+		conflict->ctarget = "";
 	}
 
 	conflicts = alpm_list_add(conflicts, conflict);
@@ -317,19 +342,73 @@ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
 	return(conflicts);
 }
 
+void _alpm_fileconflict_free(pmfileconflict_t *conflict)
+{
+	if(strlen(conflict->ctarget) > 0) {
+		FREE(conflict->ctarget);
+	}
+	FREE(conflict->file);;
+	FREE(conflict->target);
+	FREE(conflict);
+}
+
+static int dir_belongsto_pkg(char *dirpath, pmpkg_t *pkg)
+{
+	struct dirent *ent = NULL;
+	struct stat sbuf;
+	char path[PATH_MAX];
+	char abspath[PATH_MAX];
+	DIR *dir;
+
+	snprintf(abspath, PATH_MAX, "%s%s", handle->root, dirpath);
+	dir = opendir(abspath);
+	if(dir == NULL) {
+		return(1);
+	}
+	while((ent = readdir(dir)) != NULL) {
+		const char *name = ent->d_name;
+
+		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+			continue;
+		}
+		snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
+		snprintf(abspath, PATH_MAX, "%s%s", handle->root, path);
+		if(stat(abspath, &sbuf) != 0) {
+			continue;
+		}
+		if(S_ISDIR(sbuf.st_mode)) {
+			if(dir_belongsto_pkg(path, pkg)) {
+				continue;
+			} else {
+				closedir(dir);
+				return(0);
+			}
+		} else {
+			if(alpm_list_find_str(alpm_pkg_get_files(pkg),path)) {
+				continue;
+			} else {
+				closedir(dir);
+				return(0);
+			}
+		}
+	}
+	closedir(dir);
+	return(1);
+}
+
 /* Find file conflicts that may occur during the transaction with two checks:
  * 1: check every target against every target
  * 2: check every target against the filesystem */
-alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *root)
+alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
+		alpm_list_t *upgrade, alpm_list_t *remove)
 {
-	alpm_list_t *i, *conflicts = NULL;
-	alpm_list_t *targets = trans->packages;
-	int numtargs = alpm_list_count(targets);
+	alpm_list_t *i, *j, *conflicts = NULL;
+	int numtargs = alpm_list_count(upgrade);
 	int current;
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL || targets == NULL || root == NULL) {
+	if(db == NULL || upgrade == NULL || trans == NULL) {
 		return(NULL);
 	}
 
@@ -337,8 +416,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo
 	 * be possible with real transactions. Right now we only do half as much
 	 * here as we do when we actually extract files in add.c with our 12
 	 * different cases. */
-	for(current = 1, i = targets; i; i = i->next, current++) {
-		alpm_list_t *j, *k, *tmpfiles = NULL;
+	for(current = 1, i = upgrade; i; i = i->next, current++) {
+		alpm_list_t *k, *tmpfiles = NULL;
 		pmpkg_t *p1, *p2, *dbpkg;
 		char path[PATH_MAX+1];
 
@@ -351,18 +430,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo
 		PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100),
 		         numtargs, current);
 		/* CHECK 1: check every target against every target */
+		_alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s\n",
+								alpm_pkg_get_name(p1));
 		for(j = i->next; j; j = j->next) {
 			p2 = j->data;
 			if(!p2) {
 				continue;
 			}
-			_alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s and %s\n",
-								alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
 			tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2));
 
 			if(tmpfiles) {
 				for(k = tmpfiles; k; k = k->next) {
-					snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data);
+					snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data);
 					conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_TARGET, path,
 							alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
 				}
@@ -378,7 +457,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo
 		_alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", p1->name);
 		dbpkg = _alpm_db_get_pkgfromcache(db, p1->name);
 
-		/* Do two different checks here. f the package is currently installed,
+		/* Do two different checks here. If the package is currently installed,
 		 * then only check files that are new in the new package. If the package
 		 * is not currently installed, then simply stat the whole filelist */
 		if(dbpkg) {
@@ -390,12 +469,10 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo
 			tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1));
 		}
 
-		/* loop over each file to be installed */
 		for(j = tmpfiles; j; j = j->next) {
-			int skip_conflict = 0;
 			filestr = j->data;
 
-			snprintf(path, PATH_MAX, "%s%s", root, filestr);
+			snprintf(path, PATH_MAX, "%s%s", handle->root, filestr);
 
 			/* stat the file - if it exists, do some checks */
 			if(_alpm_lstat(path, &lsbuf) != 0) {
@@ -406,68 +483,75 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo
 			if(path[strlen(path)-1] == '/') {
 				if(S_ISDIR(lsbuf.st_mode)) {
 					_alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path);
-					skip_conflict = 1;
+					continue;
 				} else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) {
 					_alpm_log(PM_LOG_DEBUG,
 							"%s is a symlink to a dir, hopefully not a conflict\n", path);
-					skip_conflict = 1;
+					continue;
 				}
 			}
-			if(!skip_conflict) {
-				_alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path);
+			_alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path);
 
-				/* Make sure the possible conflict is not a symlink that points to a
-				 * path in the old package. This is kind of dirty with inode usage */
-				/* TODO this seems ripe for a cleanup */
-				if(dbpkg) {
-					struct stat pkgbuf;
-					char str[PATH_MAX+1];
-					unsigned ok = 0;
-					for(k = dbpkg->files; k; k = k->next) {
-						snprintf(str, PATH_MAX, "%s%s", root, (char*)k->data);
-						if(!_alpm_lstat(str, &pkgbuf) && lsbuf.st_ino == pkgbuf.st_ino) {
-							ok = 1;
-							_alpm_log(PM_LOG_DEBUG, "conflict was a symlink: %s\n", path);
-							break;
-						}
-					}
-					if(ok == 1) {
-						continue;
-					}
+			int resolved_conflict = 0; /* have we acted on this conflict? */
+
+			/* Check remove list (will we remove the conflicting local file?) */
+			for(k = remove; k && !resolved_conflict; k = k->next) {
+				pmpkg_t *rempkg = k->data;
+				if(rempkg && alpm_list_find_str(alpm_pkg_get_files(rempkg), filestr)) {
+					_alpm_log(PM_LOG_DEBUG, "local file will be removed, not a conflict: %s\n", filestr);
+					resolved_conflict = 1;
 				}
+			}
 
-				/* Look at all the targets to see if file has changed hands */
-				int resolved_conflict = 0; /* have we acted on this conflict? */
-				for(k = targets; k; k = k->next) {
-					p2 = k->data;
-					if(!p2 || strcmp(p1->name, p2->name) == 0) {
-						continue;
-					}
-
-					pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name);
-
-					/* Check if it used to exist in a package, but doesn't anymore */
-					alpm_list_t *pkgfiles, *localfiles; /* added for readability */
-					pkgfiles = alpm_pkg_get_files(p2);
-					localfiles = alpm_pkg_get_files(localp2);
-
-					if(localp2 && !alpm_list_find_str(pkgfiles, filestr)
-						 && alpm_list_find_str(localfiles, filestr)) {
-						/* skip removal of file, but not add. this will prevent a second
-						 * package from removing the file when it was already installed
-						 * by its new owner (whether the file is in backup array or not */
-						trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path));
-						_alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr);
-						resolved_conflict = 1;
-						break;
-					}
+			/* Look at all the targets to see if file has changed hands */
+			for(k = upgrade; k && !resolved_conflict; k = k->next) {
+				p2 = k->data;
+				if(!p2 || strcmp(p1->name, p2->name) == 0) {
+					continue;
 				}
-				if(!resolved_conflict) {
-					_alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path);
-					conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM,
-							path, p1->name, NULL);
+				pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name);
+
+				/* localp2->files will be removed (target conflicts are handled by CHECK 1) */
+				if(localp2 && alpm_list_find_str(alpm_pkg_get_files(localp2), filestr)) {
+					/* skip removal of file, but not add. this will prevent a second
+					 * package from removing the file when it was already installed
+					 * by its new owner (whether the file is in backup array or not */
+					trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr));
+					_alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr);
+					resolved_conflict = 1;
 				}
 			}
+
+			/* check if all files of the dir belong to the installed pkg */
+			if(!resolved_conflict && S_ISDIR(lsbuf.st_mode) && dbpkg) {
+				char *dir = malloc(strlen(filestr) + 2);
+				sprintf(dir, "%s/", filestr);
+				if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),dir)) {
+					_alpm_log(PM_LOG_DEBUG, "check if all files in %s belongs to %s\n",
+							dir, dbpkg->name);
+					resolved_conflict = dir_belongsto_pkg(filestr, dbpkg);
+				}
+				free(dir);
+			}
+
+			if(!resolved_conflict && dbpkg) {
+				char *rpath = calloc(PATH_MAX+1, sizeof(char));
+				if(!realpath(path, rpath)) {
+					FREE(rpath);
+					continue;
+				}
+				char *filestr = rpath + strlen(handle->root);
+				if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) {
+					resolved_conflict = 1;
+				}
+				free(rpath);
+			}
+
+			if(!resolved_conflict) {
+				_alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path);
+				conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM,
+						path, p1->name, NULL);
+			}
 		}
 		FREELIST(tmpfiles);
 	}
@@ -497,6 +581,17 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
 	return conflict->package2;
 }
 
+const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(NULL));
+	ASSERT(conflict != NULL, return(NULL));
+
+	return conflict->reason;
+}
+
 const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict)
 {
 	ALPM_LOG_FUNC;

lib/libalpm/conflict.h

@@ -1,7 +1,8 @@
 /*
  *  conflict.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,26 +24,29 @@
 #include "db.h"
 #include "package.h"
 
-#define CONFLICT_FILE_LEN 512
-
 struct __pmconflict_t {
-	char package1[PKG_NAME_LEN];
-	char package2[PKG_NAME_LEN];
+	char *package1;
+	char *package2;
+	char *reason;
 };
 
 struct __pmfileconflict_t {
-	char target[PKG_NAME_LEN];
+	char *target;
 	pmfileconflicttype_t type;
-	char file[CONFLICT_FILE_LEN];
-	char ctarget[PKG_NAME_LEN];
+	char *file;
+	char *ctarget;
 };
 
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2);
+pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason);
+pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
+void _alpm_conflict_free(pmconflict_t *conflict);
 int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack);
 alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages);
 alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages);
-alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages);
-alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *root);
+alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
+					 alpm_list_t *upgrade, alpm_list_t *remove);
+
+void _alpm_fileconflict_free(pmfileconflict_t *conflict);
 
 #endif /* _ALPM_CONFLICT_H */
 

lib/libalpm/db.c

@@ -1,7 +1,8 @@
 /*
  *  db.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
@@ -23,12 +24,10 @@
 
 #include "config.h"
 
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <stdint.h> /* uintmax_t */
 #include <sys/stat.h>
 #include <dirent.h>
 #include <regex.h>
@@ -39,8 +38,6 @@
 #include "alpm_list.h"
 #include "log.h"
 #include "util.h"
-#include "error.h"
-#include "server.h"
 #include "handle.h"
 #include "cache.h"
 #include "alpm.h"
@@ -89,9 +86,6 @@ static void _alpm_db_unregister(pmdb_t *db)
 		return;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "closing database '%s'\n", db->treename);
-	_alpm_db_close(db);
-
 	_alpm_log(PM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
 	_alpm_db_free(db);
 }
@@ -173,6 +167,8 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 {
 	alpm_list_t *i;
 	int found = 0;
+	char *newurl;
+	int len = 0;
 
 	ALPM_LOG_FUNC;
 
@@ -189,15 +185,18 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
 	}
 
-	if(url && strlen(url)) {
-		pmserver_t *server;
-		if((server = _alpm_server_new(url)) == NULL) {
-			/* pm_errno is set by _alpm_server_new */
-			return(-1);
+	if(url) {
+		len = strlen(url);
+	}
+	if(len) {
+		newurl = strdup(url);
+		/* strip the trailing slash if one exists */
+		if(newurl[len - 1] == '/') {
+			newurl[len - 1] = '\0';
 		}
-		db->servers = alpm_list_add(db->servers, server);
-		_alpm_log(PM_LOG_DEBUG, "adding new server to database '%s': protocol '%s', server '%s', path '%s'\n",
-							db->treename, server->s_url->scheme, server->s_url->host, server->s_url->doc);
+		db->servers = alpm_list_add(db->servers, newurl);
+		_alpm_log(PM_LOG_DEBUG, "adding new server URL to database '%s': %s\n",
+				db->treename, newurl);
 	} else {
 		FREELIST(db->servers);
 		_alpm_log(PM_LOG_DEBUG, "serverlist flushed for '%s'\n", db->treename);
@@ -206,98 +205,6 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
 	return(0);
 }
 
-/** Update a package database
- * @param force if true, then forces the update, otherwise update only in case
- * the database isn't up to date
- * @param db pointer to the package database to update
- * @return 0 on success, > 0 on error (pm_errno is set accordingly), < 0 if up
- * to date
- */
-int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
-{
-	alpm_list_t *lp;
-	char path[PATH_MAX];
-	alpm_list_t *files = NULL;
-	time_t newmtime = 0, lastupdate = 0;
-	const char *dbpath;
-	int ret;
-
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(db != NULL && db != handle->db_local, RET_ERR(PM_ERR_WRONG_ARGS, -1));
-	/* Verify we are in a transaction.  This is done _mainly_ because we need a DB
-	 * lock - if we update without a db lock, we may kludge some other pacman
-	 * process that _has_ a lock.
-	 */
-	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
-	ASSERT(handle->trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
-
-	if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
-	}
-
-	if(!force) {
-		/* get the lastupdate time */
-		lastupdate = _alpm_db_getlastupdate(db);
-		if(lastupdate == 0) {
-			_alpm_log(PM_LOG_DEBUG, "failed to get lastupdate time for %s\n",
-					db->treename);
-		}
-	}
-
-	/* build a one-element list */
-	snprintf(path, PATH_MAX, "%s" DBEXT, db->treename);
-	files = alpm_list_add(files, strdup(path));
-
-	dbpath = alpm_option_get_dbpath();
-
-	ret = _alpm_downloadfiles_forreal(db->servers, dbpath, files, lastupdate,
-			&newmtime, NULL, 0);
-	FREELIST(files);
-	if(ret == 1) {
-		/* mtimes match, do nothing */
-		pm_errno = 0;
-		return(1);
-	} else if(ret == -1) {
-		/* we use downloadLastErrString and downloadLastErrCode here, error returns from
-		 * libdownload */
-		_alpm_log(PM_LOG_DEBUG, "failed to sync db: %s [%d]\n",
-				downloadLastErrString, downloadLastErrCode);
-		RET_ERR(PM_ERR_DB_SYNC, -1);
-	} else {
-		if(newmtime != 0) {
-			_alpm_log(PM_LOG_DEBUG, "sync: new mtime for %s: %ju\n",
-					db->treename, (uintmax_t)newmtime);
-			_alpm_db_setlastupdate(db, newmtime);
-		}
-		snprintf(path, PATH_MAX, "%s%s" DBEXT, dbpath, db->treename);
-
-		/* remove the old dir */
-		_alpm_log(PM_LOG_DEBUG, "flushing database %s\n", db->path);
-		for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
-			pmpkg_t *pkg = lp->data;
-			if(pkg && _alpm_db_remove(db, pkg) == -1) {
-				_alpm_log(PM_LOG_ERROR, _("could not remove database entry %s%s\n"), db->treename,
-									alpm_pkg_get_name(pkg));
-				RET_ERR(PM_ERR_DB_REMOVE, -1);
-			}
-		}
-
-		/* Cache needs to be rebuild */
-		_alpm_db_free_pkgcache(db);
-
-		/* uncompress the sync database */
-		if(_alpm_db_install(db, path) == -1) {
-			return -1;
-		}
-	}
-
-	return(0);
-}
-
 /** Get the name of a package database
  * @param db pointer to the package database
  * @return the name of the package database, NULL on error
@@ -319,19 +226,18 @@ const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db)
  */
 const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
 {
-	char path[PATH_MAX];
-	pmserver_t *s;
+	char *url;
 
 	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
 	ASSERT(handle != NULL, return(NULL));
 	ASSERT(db != NULL, return(NULL));
+	ASSERT(db->servers != NULL, return(NULL));
 
-	s = (pmserver_t*)db->servers->data;
+	url = (char*)db->servers->data;
 
-	snprintf(path, PATH_MAX, "%s://%s%s", s->s_url->scheme, s->s_url->host, s->s_url->doc);
-	return strdup(path);
+	return(url);
 }
 
 
@@ -356,7 +262,7 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
  * @param db pointer to the package database to get the package from
  * @return the list of packages on success, NULL on error
  */
-alpm_list_t SYMEXPORT *alpm_db_getpkgcache(pmdb_t *db)
+alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
 
@@ -367,23 +273,6 @@ alpm_list_t SYMEXPORT *alpm_db_getpkgcache(pmdb_t *db)
 	return(_alpm_db_get_pkgcache(db));
 }
 
-/** Get the list of packages that a package provides
- * @param db pointer to the package database to get the package from
- * @param name name of the package
- * @return the list of packages on success, NULL on error
- */
-alpm_list_t SYMEXPORT *alpm_db_whatprovides(pmdb_t *db, const char *name)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(db != NULL, return(NULL));
-	ASSERT(name != NULL && strlen(name) != 0, return(NULL));
-
-	return(_alpm_db_whatprovides(db, name));
-}
-
 /** Get a group entry from a package database
  * @param db pointer to the package database to get the group from
  * @param name of the group
@@ -405,7 +294,7 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
  * @param db pointer to the package database to get the group from
  * @return the list of groups on success, NULL on error
  */
-alpm_list_t SYMEXPORT *alpm_db_getgrpcache(pmdb_t *db)
+alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
 
@@ -432,54 +321,118 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 	return(_alpm_db_search(db, needles));
 }
 
+/* Set install reason for a package in db
+ * @param db pointer to the package database
+ * @param name the name of the package
+ * @param reason the new install reason
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+
+	pmpkg_t *pkg = _alpm_db_get_pkgfromcache(db, name);
+	if(pkg == NULL) {
+		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "setting install reason %u for %s/%s\n", reason, db->treename, name);
+	/* read DESC */
+	if(_alpm_db_read(db, pkg, INFRQ_DESC)) {
+		return(-1);
+	}
+	if(pkg->reason == reason) {
+		/* we are done */
+		return(0);
+	}
+	/* set reason (in pkgcache) */
+	pkg->reason = reason;
+	/* write DESC */
+	if(_alpm_db_write(db, pkg, INFRQ_DESC)) {
+		return(-1);
+	}
+
+	return(0);
+}
+
 /** @} */
 
-pmdb_t *_alpm_db_new(const char *dbpath, const char *treename)
+static pmdb_t *_alpm_db_new(const char *treename, int is_local)
 {
 	pmdb_t *db;
-	const size_t pathsize = strlen(dbpath) + strlen(treename) + 2;
 
 	ALPM_LOG_FUNC;
 
 	CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL));
-	CALLOC(db->path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
-
-	sprintf(db->path, "%s%s/", dbpath, treename);
-
-	strncpy(db->treename, treename, PATH_MAX);
+	STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL));
+	db->is_local = is_local;
 
 	return(db);
 }
 
 void _alpm_db_free(pmdb_t *db)
 {
-	alpm_list_t *tmp;
-
 	ALPM_LOG_FUNC;
 
 	/* cleanup pkgcache */
 	_alpm_db_free_pkgcache(db);
 	/* cleanup server list */
-	for(tmp = db->servers; tmp; tmp = alpm_list_next(tmp)) {
-		_alpm_server_free(tmp->data);
-	}
-	alpm_list_free(db->servers);
-	FREE(db->path);
+	FREELIST(db->servers);
+	FREE(db->_path);
+	FREE(db->treename);
 	FREE(db);
 
 	return;
 }
 
-int _alpm_db_cmp(const void *db1, const void *db2)
+const char *_alpm_db_path(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-	return(strcmp(((pmdb_t *)db1)->treename, ((pmdb_t *)db2)->treename));
+	if(!db) {
+		return(NULL);
+	}
+	if(!db->_path) {
+		const char *dbpath;
+		size_t pathsize;
+
+		dbpath = alpm_option_get_dbpath();
+		if(!dbpath) {
+			_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
+			RET_ERR(PM_ERR_DB_OPEN, NULL);
+		}
+
+		if(db->is_local) {
+			pathsize = strlen(dbpath) + strlen(db->treename) + 2;
+			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			sprintf(db->_path, "%s%s/", dbpath, db->treename);
+		} else {
+			pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 2;
+			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			/* all sync DBs now reside in the sync/ subdir of the dbpath */
+			sprintf(db->_path, "%ssync/%s/", dbpath, db->treename);
+		}
+		_alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n",
+				db->treename, db->_path);
+	}
+	return(db->_path);
+}
+
+int _alpm_db_cmp(const void *d1, const void *d2)
+{
+	pmdb_t *db1 = (pmdb_t *)d1;
+	pmdb_t *db2 = (pmdb_t *)d2;
+	return(strcmp(db1->treename, db2->treename));
 }
 
 alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 {
 	const alpm_list_t *i, *j, *k;
 	alpm_list_t *ret = NULL;
+	/* copy the pkgcache- we will free the list var after each needle */
+	alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db));
 
 	ALPM_LOG_FUNC;
 
@@ -490,6 +443,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 		if(i->data == NULL) {
 			continue;
 		}
+		ret = NULL;
 		targ = i->data;
 		_alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ);
 
@@ -497,26 +451,24 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 			RET_ERR(PM_ERR_INVALID_REGEX, NULL);
 		}
 
-		for(j = _alpm_db_get_pkgcache(db); j; j = j->next) {
+		for(j = list; j; j = j->next) {
 			pmpkg_t *pkg = j->data;
 			const char *matched = NULL;
+			const char *name = alpm_pkg_get_name(pkg);
+			const char *desc = alpm_pkg_get_desc(pkg);
 
-			/* check name */
-			if (regexec(&reg, alpm_pkg_get_name(pkg), 0, 0, 0) == 0) {
-				matched = alpm_pkg_get_name(pkg);
-			}
-			/* check plain text name */
-			else if (strstr(alpm_pkg_get_name(pkg), targ)) {
-				matched = alpm_pkg_get_name(pkg);
+			/* check name as regex AND as plain text */
+			if(name && (regexec(&reg, name, 0, 0, 0) == 0 || strstr(name, targ))) {
+				matched = name;
 			}
 			/* check desc */
-			else if (regexec(&reg, alpm_pkg_get_desc(pkg), 0, 0, 0) == 0) {
-				matched = alpm_pkg_get_desc(pkg);
+			else if (desc && regexec(&reg, desc, 0, 0, 0) == 0) {
+				matched = desc;
 			}
-			/* check provides */
 			/* TODO: should we be doing this, and should we print something
 			 * differently when we do match it since it isn't currently printed? */
-			else {
+			if(!matched) {
+				/* check provides */
 				for(k = alpm_pkg_get_provides(pkg); k; k = k->next) {
 					if (regexec(&reg, k->data, 0, 0, 0) == 0) {
 						matched = k->data;
@@ -524,6 +476,15 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 					}
 				}
 			}
+			if(!matched) {
+				/* check groups */
+				for(k = alpm_pkg_get_groups(pkg); k; k = k->next) {
+					if (regexec(&reg, k->data, 0, 0, 0) == 0) {
+						matched = k->data;
+						break;
+					}
+				}
+			}
 
 			if(matched != NULL) {
 				_alpm_log(PM_LOG_DEBUG, "    search target '%s' matched '%s'\n",
@@ -532,6 +493,10 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 			}
 		}
 
+		/* Free the existing search list, and use the returned list for the
+		 * next needle. This allows for AND-based package searching. */
+		alpm_list_free(list);
+		list = ret;
 		regfree(&reg);
 	}
 
@@ -540,10 +505,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 
 pmdb_t *_alpm_db_register_local(void)
 {
-	struct stat buf;
 	pmdb_t *db;
-	const char *dbpath;
-	char path[PATH_MAX];
 
 	ALPM_LOG_FUNC;
 
@@ -554,43 +516,18 @@ pmdb_t *_alpm_db_register_local(void)
 
 	_alpm_log(PM_LOG_DEBUG, "registering local database\n");
 
-	/* make sure the database directory exists */
-	dbpath = alpm_option_get_dbpath();
-	if(!dbpath) {
-		_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
-			RET_ERR(PM_ERR_DB_OPEN, NULL);
-	}
-	snprintf(path, PATH_MAX, "%slocal", dbpath);
-	/* TODO this is rediculous, we try to do this even if we can't */
-	if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) {
-		_alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
-				path);
-		if(_alpm_makepath(path) != 0) {
-			RET_ERR(PM_ERR_SYSTEM, NULL);
-		}
-	}
-
-	db = _alpm_db_new(dbpath, "local");
+	db = _alpm_db_new("local", 1);
 	if(db == NULL) {
 		RET_ERR(PM_ERR_DB_CREATE, NULL);
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "opening database '%s'\n", db->treename);
-	if(_alpm_db_open(db) == -1) {
-		_alpm_db_free(db);
-		RET_ERR(PM_ERR_DB_OPEN, NULL);
-	}
-
 	handle->db_local = db;
 	return(db);
 }
 
 pmdb_t *_alpm_db_register_sync(const char *treename)
 {
-	struct stat buf;
 	pmdb_t *db;
-	const char *dbpath;
-	char path[PATH_MAX];
 	alpm_list_t *i;
 
 	ALPM_LOG_FUNC;
@@ -605,83 +542,13 @@ pmdb_t *_alpm_db_register_sync(const char *treename)
 
 	_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
 
-	/* make sure the database directory exists */
-	dbpath = alpm_option_get_dbpath();
-	if(!dbpath) {
-		_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
-			RET_ERR(PM_ERR_DB_OPEN, NULL);
-	}
-	/* all sync DBs now reside in the sync/ subdir of the dbpath */
-	snprintf(path, PATH_MAX, "%ssync/%s", dbpath, treename);
-	/* TODO this is rediculous, we try to do this even if we can't */
-	if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) {
-		_alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
-				path);
-		if(_alpm_makepath(path) != 0) {
-			RET_ERR(PM_ERR_SYSTEM, NULL);
-		}
-	}
-
-	/* Ensure the db gets the real path. */
-	path[0] = '\0';
-	snprintf(path, PATH_MAX, "%ssync/", dbpath);
-
-	db = _alpm_db_new(path, treename);
+	db = _alpm_db_new(treename, 0);
 	if(db == NULL) {
 		RET_ERR(PM_ERR_DB_CREATE, NULL);
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "opening database '%s'\n", db->treename);
-	if(_alpm_db_open(db) == -1) {
-		_alpm_db_free(db);
-		RET_ERR(PM_ERR_DB_OPEN, NULL);
-	}
-
 	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
 	return(db);
 }
 
-/* helper function for alpm_list_find and _alpm_db_whatprovides
- *
- * @return "provision.name" == needle (as string)
- */
-int _alpm_prov_cmp(const void *provision, const void *needle)
-{
-	char *tmpptr;
-	char *provname = strdup(provision);
-	int retval = 0;
-	tmpptr = strchr(provname, '=');
-
-	if(tmpptr != NULL) { /* provision-version */
-		*tmpptr='\0';
-	}
-	retval = strcmp(provname, needle);
-	free(provname);
-	return(retval);
-}
-
-/* return a alpm_list_t of packages in "db" that provide "package"
- */
-alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package)
-{
-	alpm_list_t *pkgs = NULL;
-	alpm_list_t *lp;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || package == NULL || strlen(package) == 0) {
-		return(NULL);
-	}
-
-	for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
-		pmpkg_t *info = lp->data;
-
-		if(alpm_list_find(alpm_pkg_get_provides(info), (const void *)package, _alpm_prov_cmp)) {
-			pkgs = alpm_list_add(pkgs, info);
-		}
-	}
-
-	return(pkgs);
-}
-
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/db.h

@@ -1,7 +1,8 @@
 /*
  *  db.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
  *
@@ -27,49 +28,44 @@
 
 /* Database entries */
 typedef enum _pmdbinfrq_t {
-	INFRQ_BASE = 0x01,
-	INFRQ_DESC = 0x02,
-	INFRQ_DEPENDS = 0x04,
-	INFRQ_FILES = 0x08,
-	INFRQ_SCRIPTLET = 0x10,
-	INFRQ_DELTAS = 0x20,
-	/* ALL should be sum of all above */
+	INFRQ_BASE = 1,
+	INFRQ_DESC = (1 << 1),
+	INFRQ_DEPENDS = (1 << 2),
+	INFRQ_FILES = (1 << 3),
+	INFRQ_SCRIPTLET = (1 << 4),
+	INFRQ_DELTAS = (1 << 5),
+	INFRQ_DSIZE = (1 << 6),
+	/* ALL should be info stored in the package or database */
 	INFRQ_ALL = 0x3F
 } pmdbinfrq_t;
 
 /* Database */
 struct __pmdb_t {
-	char *path;
-	char treename[PATH_MAX];
-	void *handle;
+	char *treename;
+	/* do not access directly, use _alpm_db_path(db) for lazy access */
+	char *_path;
+	int pkgcache_loaded;
+	int grpcache_loaded;
+	int is_local;
 	alpm_list_t *pkgcache;
 	alpm_list_t *grpcache;
 	alpm_list_t *servers;
 };
 
 /* db.c, database general calls */
-pmdb_t *_alpm_db_new(const char *dbpath, const char *treename);
 void _alpm_db_free(pmdb_t *db);
-int _alpm_db_cmp(const void *db1, const void *db2);
+const char *_alpm_db_path(pmdb_t *db);
+int _alpm_db_cmp(const void *d1, const void *d2);
 alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles);
 pmdb_t *_alpm_db_register_local(void);
 pmdb_t *_alpm_db_register_sync(const char *treename);
 
-/* Provision */
-int _alpm_prov_cmp(const void *provision, const void *needle);
-alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package);
-
 /* be.c, backend specific calls */
-int _alpm_db_install(pmdb_t *db, const char *dbfile);
-int _alpm_db_open(pmdb_t *db);
-void _alpm_db_close(pmdb_t *db);
-void _alpm_db_rewind(pmdb_t *db);
-pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target);
+int _alpm_db_populate(pmdb_t *db);
 int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
+int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);
 int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
 int _alpm_db_remove(pmdb_t *db, pmpkg_t *info);
-time_t _alpm_db_getlastupdate(const pmdb_t *db);
-int _alpm_db_setlastupdate(const pmdb_t *db, time_t time);
 
 #endif /* _ALPM_DB_H */
 

lib/libalpm/delta.c

@@ -1,7 +1,8 @@
 /*
  *  delta.c
  *
- *  Copyright (c) 2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2007-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,14 +22,17 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h> /* intmax_t */
+#include <limits.h>
+#include <sys/types.h>
+#include <regex.h>
 
 /* libalpm */
 #include "delta.h"
-#include "error.h"
+#include "alpm_list.h"
 #include "util.h"
 #include "log.h"
-#include "alpm_list.h"
-#include "alpm.h"
+#include "graph.h"
 
 /** \addtogroup alpm_deltas Delta Functions
  * @brief Functions to manipulate libalpm deltas
@@ -37,230 +41,314 @@
 
 const char SYMEXPORT *alpm_delta_get_from(pmdelta_t *delta)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
 	ASSERT(delta != NULL, return(NULL));
-
 	return(delta->from);
 }
 
 const char SYMEXPORT *alpm_delta_get_to(pmdelta_t *delta)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
 	ASSERT(delta != NULL, return(NULL));
-
 	return(delta->to);
 }
 
-unsigned long SYMEXPORT alpm_delta_get_size(pmdelta_t *delta)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(delta != NULL, return(-1));
-
-	return(delta->size);
-}
-
 const char SYMEXPORT *alpm_delta_get_filename(pmdelta_t *delta)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
 	ASSERT(delta != NULL, return(NULL));
-
-	return(delta->filename);
+	return(delta->delta);
 }
 
 const char SYMEXPORT *alpm_delta_get_md5sum(pmdelta_t *delta)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
 	ASSERT(delta != NULL, return(NULL));
+	return(delta->delta_md5);
+}
 
-	return(delta->md5sum);
+off_t SYMEXPORT alpm_delta_get_size(pmdelta_t *delta)
+{
+	ASSERT(delta != NULL, return(-1));
+	return(delta->delta_size);
 }
 
 /** @} */
 
-/** Calculates the combined size of a list of delta files.
- *
- * @param deltas the list of pmdelta_t * objects
- *
- * @return the combined size
- */
-unsigned long _alpm_delta_path_size(alpm_list_t *deltas)
+static alpm_list_t *graph_init(alpm_list_t *deltas, int reverse)
 {
-	unsigned long sum = 0;
-	alpm_list_t *dlts = deltas;
-
-	while(dlts) {
-		pmdelta_t *d = (pmdelta_t *)alpm_list_getdata(dlts);
-		sum += d->size;
-
-		dlts = alpm_list_next(dlts);
+	alpm_list_t *i, *j;
+	alpm_list_t *vertices = NULL;
+	/* create the vertices */
+	for(i = deltas; i; i = i->next) {
+		pmgraph_t *v = _alpm_graph_new();
+		pmdelta_t *vdelta = i->data;
+		vdelta->download_size = vdelta->delta_size;
+		v->weight = LONG_MAX;
+		v->data = vdelta;
+		vertices = alpm_list_add(vertices, v);
 	}
 
-	return(sum);
+	/* compute the edges */
+	for(i = vertices; i; i = i->next) {
+		pmgraph_t *v_i = i->data;
+		pmdelta_t *d_i = v_i->data;
+		/* loop a second time so we make all possible comparisons */
+		for(j = vertices; j; j = j->next) {
+			pmgraph_t *v_j = j->data;
+			pmdelta_t *d_j = v_j->data;
+			/* We want to create a delta tree like the following:
+			 *          1_to_2
+			 *            |
+			 * 1_to_3   2_to_3
+			 *   \        /
+			 *     3_to_4
+			 * If J 'from' is equal to I 'to', then J is a child of I.
+			 * */
+			if((!reverse && strcmp(d_j->from, d_i->to) == 0) ||
+					(reverse && strcmp(d_j->to, d_i->from) == 0)) {
+				v_i->children = alpm_list_add(v_i->children, v_j);
+			}
+		}
+		v_i->childptr = v_i->children;
+	}
+	return(vertices);
 }
 
-/** Calculates the combined size of a list of delta files that are not
- * in the cache.
- *
- * @param deltas the list of pmdelta_t * objects
- *
- * @return the combined size
- */
-unsigned long _alpm_delta_path_size_uncached(alpm_list_t *deltas)
+static void graph_init_size(alpm_list_t *vertices)
 {
-	unsigned long sum = 0;
-	alpm_list_t *dlts = deltas;
+	alpm_list_t *i;
 
-	while(dlts) {
-		pmdelta_t *d = (pmdelta_t *)alpm_list_getdata(dlts);
-		char *fname = _alpm_filecache_find(d->filename);
+	for(i = vertices; i; i = i->next) {
+		char *fpath, *md5sum;
+		pmgraph_t *v = i->data;
+		pmdelta_t *vdelta = v->data;
 
-		if(!fname) {
-			sum += d->size;
+		/* determine whether the delta file already exists */
+		fpath = _alpm_filecache_find(vdelta->delta);
+		md5sum = alpm_compute_md5sum(fpath);
+		if(fpath && md5sum && strcmp(md5sum, vdelta->delta_md5) == 0) {
+			vdelta->download_size = 0;
 		}
+		FREE(fpath);
+		FREE(md5sum);
 
-		FREE(fname);
-
-		dlts = alpm_list_next(dlts);
+		/* determine whether a base 'from' file exists */
+		fpath = _alpm_filecache_find(vdelta->from);
+		if(fpath) {
+			v->weight = vdelta->download_size;
+		}
+		FREE(fpath);
 	}
-
-	return(sum);
 }
 
-/** Calculates the shortest path from one version to another.
- *
- * The shortest path is defined as the path with the smallest combined
- * size, not the length of the path.
- *
- * The algorithm is based on Dijkstra's shortest path algorithm.
- *
- * @param deltas the list of pmdelta_t * objects that a package has
- * @param from the version to start from
- * @param to the version to end at
- * @param path the current path
- *
- * @return the list of pmdelta_t * objects that has the smallest size.
- * NULL (the empty list) is returned if there is no path between the
- * versions.
- */
-static alpm_list_t *shortest_delta_path(alpm_list_t *deltas,
-		const char *from, const char *to, alpm_list_t *path)
+
+static void dijkstra(alpm_list_t *vertices)
 {
-	alpm_list_t *d;
-	alpm_list_t *shortest = NULL;
+	alpm_list_t *i;
+	pmgraph_t *v;
+	while(1) {
+		v = NULL;
+		/* find the smallest vertice not visited yet */
+		for(i = vertices; i; i = i->next) {
+			pmgraph_t *v_i = i->data;
 
-	/* Found the 'to' version, this is a good path so return it. */
-	if(strcmp(from, to) == 0) {
-		return(path);
-	}
+			if(v_i->state == -1) {
+				continue;
+			}
 
-	for(d = deltas; d; d = alpm_list_next(d)) {
-		pmdelta_t *v = alpm_list_getdata(d);
-
-		/* If this vertex has already been visited in the path, go to the
-		 * next vertex. */
-		if(alpm_list_find_ptr(path, v)) {
-			continue;
+			if(v == NULL || v_i->weight < v->weight) {
+				v = v_i;
+			}
+		}
+		if(v == NULL || v->weight == LONG_MAX) {
+			break;
 		}
 
-		/* Once we find a vertex that starts at the 'from' version,
-		 * recursively find the shortest path using the 'to' version of this
-		 * current vertex as the 'from' version in the function call. */
-		if(strcmp(v->from, from) == 0) {
-			alpm_list_t *newpath = alpm_list_copy(path);
-			newpath = alpm_list_add(newpath, v);
-			newpath = shortest_delta_path(deltas, v->to, to, newpath);
+		v->state = -1;
 
-			if(newpath != NULL) {
-				/* The path returned works, now use it unless there is already a
-				 * shorter path found. */
-				if(shortest == NULL) {
-					shortest = newpath;
-				} else if(_alpm_delta_path_size(shortest) > _alpm_delta_path_size(newpath)) {
-					alpm_list_free(shortest);
-					shortest = newpath;
-				} else {
-					alpm_list_free(newpath);
-				}
+		v->childptr = v->children;
+		while(v->childptr) {
+			pmgraph_t *v_c = v->childptr->data;
+			pmdelta_t *d_c = v_c->data;
+			if(v_c->weight > v->weight + d_c->download_size) {
+				v_c->weight = v->weight + d_c->download_size;
+				v_c->parent = v;
+			}
+
+			v->childptr = (v->childptr)->next;
+
+		}
+	}
+}
+
+static off_t shortest_path(alpm_list_t *vertices, const char *to, alpm_list_t **path)
+{
+	alpm_list_t *i;
+	pmgraph_t *v = NULL;
+	off_t bestsize = 0;
+	alpm_list_t *rpath = NULL;
+
+	for(i = vertices; i; i = i->next) {
+		pmgraph_t *v_i = i->data;
+		pmdelta_t *d_i = v_i->data;
+
+		if(strcmp(d_i->to, to) == 0) {
+			if(v == NULL || v_i->weight < v->weight) {
+				v = v_i;
+				bestsize = v->weight;
 			}
 		}
 	}
 
-	alpm_list_free(path);
+	while(v != NULL) {
+		pmdelta_t *vdelta = v->data;
+		rpath = alpm_list_add(rpath, vdelta);
+		v = v->parent;
+	}
+	*path = alpm_list_reverse(rpath);
+	alpm_list_free(rpath);
 
-	return(shortest);
+	return(bestsize);
 }
 
 /** Calculates the shortest path from one version to another.
- *
  * The shortest path is defined as the path with the smallest combined
  * size, not the length of the path.
- *
- * @param deltas the list of pmdelta_t * objects that a package has
- * @param from the version to start from
- * @param to the version to end at
- *
- * @return the list of pmdelta_t * objects that has the smallest size.
- * NULL (the empty list) is returned if there is no path between the
- * versions.
+ * @param deltas the list of pmdelta_t * objects that a file has
+ * @param to the file to start the search at
+ * @param path the pointer to a list location where pmdelta_t * objects that
+ * have the smallest size are placed. NULL is set if there is no path
+ * possible with the files available.
+ * @return the size of the path stored, or LONG_MAX if path is unfindable
  */
-alpm_list_t *_alpm_shortest_delta_path(alpm_list_t *deltas, const char *from,
-		const char *to)
+off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
+		const char *to, alpm_list_t **path)
 {
-	alpm_list_t *path = NULL;
+	alpm_list_t *bestpath = NULL;
+	alpm_list_t *vertices;
+	off_t bestsize = LONG_MAX;
 
-	path = shortest_delta_path(deltas, from, to, path);
+	ALPM_LOG_FUNC;
 
-	return(path);
+	if(deltas == NULL) {
+		*path = NULL;
+		return(bestsize);
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to);
+
+	vertices = graph_init(deltas, 0);
+	graph_init_size(vertices);
+	dijkstra(vertices);
+	bestsize = shortest_path(vertices, to, &bestpath);
+
+	_alpm_log(PM_LOG_DEBUG, "delta shortest-path search complete : '%jd'\n", (intmax_t)bestsize);
+
+	alpm_list_free_inner(vertices, _alpm_graph_free);
+	alpm_list_free(vertices);
+
+	*path = bestpath;
+	return(bestsize);
 }
 
+static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota)
+{
+	alpm_list_t *unused = NULL;
+	alpm_list_t *vertices;
+	alpm_list_t *i;
+	vertices = graph_init(deltas, 1);
+
+	for(i = vertices; i; i = i->next) {
+		pmgraph_t *v = i->data;
+		pmdelta_t *vdelta = v->data;
+		if(strcmp(vdelta->to, to) == 0)
+		{
+			v->weight = vdelta->download_size;
+		}
+	}
+	dijkstra(vertices);
+	for(i = vertices; i; i = i->next) {
+		pmgraph_t *v = i->data;
+		pmdelta_t *vdelta = v->data;
+		if(v->weight > quota) {
+			unused = alpm_list_add(unused, vdelta->delta);
+		}
+	}
+	alpm_list_free_inner(vertices, _alpm_graph_free);
+	alpm_list_free(vertices);
+	return(unused);
+}
+
+alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(pmpkg_t *pkg)
+{
+	off_t pkgsize = alpm_pkg_get_size(pkg);
+	alpm_list_t *unused = find_unused(
+			alpm_pkg_get_deltas(pkg),
+			alpm_pkg_get_filename(pkg),
+			pkgsize * MAX_DELTA_RATIO);
+	return(unused);
+}
+
+
 /** Parses the string representation of a pmdelta_t object.
- *
  * This function assumes that the string is in the correct format.
- *
+ * This format is as follows:
+ * $deltafile $deltamd5 $deltasize $oldfile $newfile
  * @param line the string to parse
- *
  * @return A pointer to the new pmdelta_t object
  */
+/* TODO this does not really belong here, but in a parsing lib */
 pmdelta_t *_alpm_delta_parse(char *line)
 {
 	pmdelta_t *delta;
 	char *tmp = line, *tmp2;
+	regex_t reg;
+
+	regcomp(&reg,
+			"^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*"
+			" [^[:space:]]* [^[:space:]]*$",
+			REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
+	if(regexec(&reg, line, 0, 0, 0) != 0) {
+		/* delta line is invalid, return NULL */
+		regfree(&reg);
+		return(NULL);
+	}
+	regfree(&reg);
 
 	CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	strncpy(delta->from, tmp2, DLT_VERSION_LEN);
+	STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	strncpy(delta->to, tmp2, DLT_VERSION_LEN);
+	STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	delta->size = atol(tmp2);
+	delta->delta_size = atol(tmp2);
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	strncpy(delta->filename, tmp2, DLT_FILENAME_LEN);
+	STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
 
-	strncpy(delta->md5sum, tmp, DLT_MD5SUM_LEN);
+	tmp2 = tmp;
+	STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
+
+	_alpm_log(PM_LOG_DEBUG, "delta : %s %s '%jd'\n", delta->from, delta->to, (intmax_t)delta->delta_size);
 
 	return(delta);
 }
 
+void _alpm_delta_free(pmdelta_t *delta)
+{
+	FREE(delta->from);
+	FREE(delta->to);
+	FREE(delta->delta);
+	FREE(delta->delta_md5);
+	FREE(delta);
+}
+
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/delta.h

@@ -1,7 +1,8 @@
 /*
  *  delta.h
  *
- *  Copyright (c) 2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2007-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,24 +20,29 @@
 #ifndef _ALPM_DELTA_H
 #define _ALPM_DELTA_H
 
+#include <sys/types.h> /* off_t */
+
 #include "alpm.h"
 
-#define DLT_FILENAME_LEN 512
-#define DLT_VERSION_LEN  64
-#define DLT_MD5SUM_LEN   33
-
 struct __pmdelta_t {
-	char from[DLT_VERSION_LEN];
-	char to[DLT_VERSION_LEN];
-	unsigned long size;
-	char filename[DLT_FILENAME_LEN];
-	char md5sum[DLT_MD5SUM_LEN];
+	/** filename of the delta patch */
+	char *delta;
+	/** md5sum of the delta file */
+	char *delta_md5;
+	/** filesize of the delta file */
+	off_t delta_size;
+	/** filename of the 'before' file */
+	char *from;
+	/** filename of the 'after' file */
+	char *to;
+	/** download filesize of the delta file */
+	off_t download_size;
 };
 
-unsigned long _alpm_delta_path_size(alpm_list_t *deltas);
-unsigned long _alpm_delta_path_size_uncached(alpm_list_t *deltas);
 pmdelta_t *_alpm_delta_parse(char *line);
-alpm_list_t *_alpm_shortest_delta_path(alpm_list_t *deltas, const char *from, const char *to);
+void _alpm_delta_free(pmdelta_t *delta);
+off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
+		const char *to, alpm_list_t **path);
 
 #endif /* _ALPM_DELTA_H */
 

lib/libalpm/deps.c

@@ -1,7 +1,8 @@
 /*
  *  deps.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
  *
@@ -30,37 +31,21 @@
 #include "alpm_list.h"
 #include "util.h"
 #include "log.h"
-#include "error.h"
+#include "graph.h"
 #include "package.h"
 #include "db.h"
 #include "cache.h"
 #include "handle.h"
 
-static pmgraph_t *_alpm_graph_new(void)
+void _alpm_dep_free(pmdepend_t *dep)
 {
-	pmgraph_t *graph = NULL;
-
-	MALLOC(graph, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
-
-	if(graph) {
-		graph->state = 0;
-		graph->data = NULL;
-		graph->parent = NULL;
-		graph->children = NULL;
-		graph->childptr = NULL;
-	}
-	return(graph);
+	FREE(dep->name);
+	FREE(dep->version);
+	FREE(dep);
 }
 
-static void _alpm_graph_free(void *data)
-{
-	pmgraph_t *graph = data;
-	alpm_list_free(graph->children);
-	free(graph);
-}
-
-pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepmod_t depmod,
-		const char *depname, const char *depversion)
+pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepend_t *dep,
+		const char *causingpkg)
 {
 	pmdepmissing_t *miss;
 
@@ -68,26 +53,29 @@ pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepmod_t depmod,
 
 	MALLOC(miss, sizeof(pmdepmissing_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
-	strncpy(miss->target, target, PKG_NAME_LEN);
-	miss->depend.mod = depmod;
-	strncpy(miss->depend.name, depname, PKG_NAME_LEN);
-	if(depversion) {
-		strncpy(miss->depend.version, depversion, PKG_VERSION_LEN);
-	} else {
-		miss->depend.version[0] = 0;
-	}
+	STRDUP(miss->target, target, RET_ERR(PM_ERR_MEMORY, NULL));
+	miss->depend = _alpm_dep_dup(dep);
+	STRDUP(miss->causingpkg, causingpkg, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(miss);
 }
 
+void _alpm_depmiss_free(pmdepmissing_t *miss)
+{
+	_alpm_dep_free(miss->depend);
+	FREE(miss->target);
+	FREE(miss->causingpkg);
+	FREE(miss);
+}
+
 /* Convert a list of pmpkg_t * to a graph structure,
  * with a edge for each dependency.
  * Returns a list of vertices (one vertex = one package)
  * (used by alpm_sortbydeps)
  */
-static alpm_list_t *_alpm_graph_init(alpm_list_t *targets)
+static alpm_list_t *dep_graph_init(alpm_list_t *targets)
 {
-	alpm_list_t *i, *j, *k;
+	alpm_list_t *i, *j;
 	alpm_list_t *vertices = NULL;
 	/* We create the vertices */
 	for(i = targets; i; i = i->next) {
@@ -104,12 +92,7 @@ static alpm_list_t *_alpm_graph_init(alpm_list_t *targets)
 		for(j = vertices; j; j = j->next) {
 			pmgraph_t *vertex_j = j->data;
 			pmpkg_t *p_j = vertex_j->data;
-			int child = 0;
-			for(k = alpm_pkg_get_depends(p_i); k && !child; k = k->next) {
-				pmdepend_t *depend = k->data;
-				child = alpm_depcmp(p_j, depend);
-			}
-			if(child) {
+			if(_alpm_dep_edge(p_i, p_j)) {
 				vertex_i->children =
 					alpm_list_add(vertex_i->children, vertex_j);
 			}
@@ -121,20 +104,19 @@ static alpm_list_t *_alpm_graph_init(alpm_list_t *targets)
 
 /* Re-order a list of target packages with respect to their dependencies.
  *
- * Example (PM_TRANS_TYPE_ADD):
+ * Example (reverse == 0):
  *   A depends on C
  *   B depends on A
  *   Target order is A,B,C,D
  *
  *   Should be re-ordered to C,A,B,D
  *
- * mode should be either PM_TRANS_TYPE_ADD or PM_TRANS_TYPE_REMOVE.  This
- * affects the dependency order sortbydeps() will use.
+ * if reverse is > 0, the dependency order will be reversed.
  *
  * This function returns the new alpm_list_t* target list.
  *
  */
-alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
+alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse)
 {
 	alpm_list_t *newtargs = NULL;
 	alpm_list_t *vertices = NULL;
@@ -149,7 +131,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
 
 	_alpm_log(PM_LOG_DEBUG, "started sorting dependencies\n");
 
-	vertices = _alpm_graph_init(targets);
+	vertices = dep_graph_init(targets);
 
 	vptr = vertices;
 	vertex = vertices->data;
@@ -169,7 +151,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
 				pmpkg_t *vertexpkg = vertex->data;
 				pmpkg_t *childpkg = nextchild->data;
 				_alpm_log(PM_LOG_WARNING, _("dependency cycle detected:\n"));
-				if(mode == PM_TRANS_TYPE_REMOVE) {
+				if(reverse) {
 					_alpm_log(PM_LOG_WARNING, _("%s will be removed after its %s dependency\n"), vertexpkg->name, childpkg->name);
 				} else {
 					_alpm_log(PM_LOG_WARNING, _("%s will be installed before its %s dependency\n"), vertexpkg->name, childpkg->name);
@@ -194,8 +176,8 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
 
 	_alpm_log(PM_LOG_DEBUG, "sorting dependencies finished\n");
 
-	if(mode == PM_TRANS_TYPE_REMOVE) {
-		/* we're removing packages, so reverse the order */
+	if(reverse) {
+		/* reverse the order */
 		alpm_list_t *tmptargs = alpm_list_reverse(newtargs);
 		/* free the old one */
 		alpm_list_free(newtargs);
@@ -208,21 +190,53 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
 	return(newtargs);
 }
 
-/* Little helper function for alpm_list_find */
-static int satisfycmp(const void *pkg, const void *depend)
+pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep)
 {
-	return(!alpm_depcmp((pmpkg_t*) pkg, (pmdepend_t*) depend));
+	alpm_list_t *i;
+
+	for(i = pkgs; i; i = alpm_list_next(i)) {
+		pmpkg_t *pkg = i->data;
+		if(alpm_depcmp(pkg, dep)) {
+			return(pkg);
+		}
+	}
+	return(NULL);
 }
 
 /** Checks dependencies and returns missing ones in a list.
  * Dependencies can include versions with depmod operators.
  * @param db pointer to the local package database
+ * @param targets an alpm_list_t* of dependencies strings to satisfy
+ * @return an alpm_list_t* of missing dependencies strings
+ */
+alpm_list_t SYMEXPORT *alpm_deptest(pmdb_t *db, alpm_list_t *targets)
+{
+	alpm_list_t *i, *ret = NULL;
+
+	for(i = targets; i; i = alpm_list_next(i)) {
+		pmdepend_t *dep;
+		char *target;
+
+		target = alpm_list_getdata(i);
+		dep = _alpm_splitdep(target);
+
+		if(!_alpm_find_dep_satisfier(_alpm_db_get_pkgcache(db), dep)) {
+			ret = alpm_list_add(ret, target);
+		}
+		_alpm_dep_free(dep);
+	}
+	return(ret);
+}
+
+/** Checks dependencies and returns missing ones in a list.
+ * Dependencies can include versions with depmod operators.
+ * @param pkglist the list of local packages
  * @param reversedeps handles the backward dependencies
  * @param remove an alpm_list_t* of packages to be removed
  * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade)
  * @return an alpm_list_t* of pmpkg_t* of missing_t pointers.
  */
-alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
+alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 		alpm_list_t *remove, alpm_list_t *upgrade)
 {
 	alpm_list_t *i, *j;
@@ -232,12 +246,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL) {
-		return(NULL);
-	}
-
 	targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
-	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
+	for(i = pkglist; i; i = i->next) {
 		void *pkg = i->data;
 		if(alpm_list_find(targets, pkg, _alpm_pkg_cmp)) {
 			modified = alpm_list_add(modified, pkg);
@@ -257,15 +267,14 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 			pmdepend_t *depend = j->data;
 			/* 1. we check the upgrade list */
 			/* 2. we check database for untouched satisfying packages */
-			if(!alpm_list_find(upgrade, depend, satisfycmp) &&
-			   !alpm_list_find(dblist, depend, satisfycmp)) {
+			if(!_alpm_find_dep_satisfier(upgrade, depend) &&
+			   !_alpm_find_dep_satisfier(dblist, depend)) {
 				/* Unsatisfied dependency in the upgrade list */
-				char *missdepstring = alpm_dep_get_string(depend);
+				char *missdepstring = alpm_dep_compute_string(depend);
 				_alpm_log(PM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n",
 						missdepstring, alpm_pkg_get_name(tp));
 				free(missdepstring);
-				miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), depend->mod,
-						depend->name, depend->version);
+				miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), depend, NULL);
 				baddeps = alpm_list_add(baddeps, miss);
 			}
 		}
@@ -278,18 +287,18 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 			pmpkg_t *lp = i->data;
 			for(j = alpm_pkg_get_depends(lp); j; j = j->next) {
 				pmdepend_t *depend = j->data;
+				pmpkg_t *causingpkg = _alpm_find_dep_satisfier(modified, depend);
 				/* we won't break this depend, if it is already broken, we ignore it */
 				/* 1. check upgrade list for satisfiers */
 				/* 2. check dblist for satisfiers */
-				if(alpm_list_find(modified, depend, satisfycmp) &&
-				   !alpm_list_find(upgrade, depend, satisfycmp) &&
-				   !alpm_list_find(dblist, depend, satisfycmp)) {
-					char *missdepstring = alpm_dep_get_string(depend);
+				if(causingpkg &&
+				   !_alpm_find_dep_satisfier(upgrade, depend) &&
+				   !_alpm_find_dep_satisfier(dblist, depend)) {
+					char *missdepstring = alpm_dep_compute_string(depend);
 					_alpm_log(PM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n",
 							missdepstring, alpm_pkg_get_name(lp));
 					free(missdepstring);
-					miss = _alpm_depmiss_new(lp->name, depend->mod,
-							depend->name, depend->version);
+					miss = _alpm_depmiss_new(lp->name, depend, alpm_pkg_get_name(causingpkg));
 					baddeps = alpm_list_add(baddeps, miss);
 				}
 			}
@@ -309,7 +318,7 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod,
 	if(mod == PM_DEP_MOD_ANY) {
 		equal = 1;
 	} else {
-		int cmp = _alpm_versioncmp(version1, version2);
+		int cmp = alpm_pkg_vercmp(version1, version2);
 		switch(mod) {
 			case PM_DEP_MOD_EQ: equal = (cmp == 0); break;
 			case PM_DEP_MOD_GE: equal = (cmp >= 0); break;
@@ -356,7 +365,7 @@ int SYMEXPORT alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
 	return(satisfy);
 }
 
-pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring)
+pmdepend_t *_alpm_splitdep(const char *depstring)
 {
 	pmdepend_t *depend;
 	char *ptr = NULL;
@@ -365,9 +374,9 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring)
 	if(depstring == NULL) {
 		return(NULL);
 	}
-	newstr = strdup(depstring);
+	STRDUP(newstr, depstring, RET_ERR(PM_ERR_MEMORY, NULL));
 
-	MALLOC(depend, sizeof(pmdepend_t), return(NULL));
+	CALLOC(depend, 1, sizeof(pmdepend_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
 	/* Find a version comparator if one exists. If it does, set the type and
 	 * increment the ptr accordingly so we can copy the right strings. */
@@ -391,25 +400,36 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring)
 		depend->mod = PM_DEP_MOD_GT;
 		*ptr = '\0';
 		ptr += 1;
-
 	} else {
-		/* no version specified - copy in the name and return it */
+		/* no version specified - copy the name and return it */
 		depend->mod = PM_DEP_MOD_ANY;
-		strncpy(depend->name, newstr, PKG_NAME_LEN);
-		depend->version[0] = '\0';
+		STRDUP(depend->name, newstr, RET_ERR(PM_ERR_MEMORY, NULL));
+		depend->version = NULL;
 		free(newstr);
 		return(depend);
 	}
 
 	/* if we get here, we have a version comparator, copy the right parts
 	 * to the right places */
-	strncpy(depend->name, newstr, PKG_NAME_LEN);
-	strncpy(depend->version, ptr, PKG_VERSION_LEN);
+	STRDUP(depend->name, newstr, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(depend->version, ptr, RET_ERR(PM_ERR_MEMORY, NULL));
 	free(newstr);
 
 	return(depend);
 }
 
+pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep)
+{
+	pmdepend_t *newdep;
+	CALLOC(newdep, 1, sizeof(pmdepend_t), RET_ERR(PM_ERR_MEMORY, NULL));
+
+	STRDUP(newdep->name, dep->name, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newdep->version, dep->version, RET_ERR(PM_ERR_MEMORY, NULL));
+	newdep->mod = dep->mod;
+
+	return(newdep);
+}
+
 /* These parameters are messy. We check if this package, given a list of
  * targets and a db is safe to remove. We do NOT remove it if it is in the
  * target list, or if if the package was explictly installed and
@@ -417,9 +437,9 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring)
 static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets,
 		int include_explicit)
 {
-	alpm_list_t *i, *requiredby;
+	alpm_list_t *i;
 
-	if(_alpm_pkg_find(alpm_pkg_get_name(pkg), targets)) {
+	if(_alpm_pkg_find(targets, alpm_pkg_get_name(pkg))) {
 		return(0);
 	}
 
@@ -439,15 +459,12 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets,
 	 * if checkdeps detected it would break something */
 
 	/* see if other packages need it */
-	requiredby = alpm_pkg_compute_requiredby(pkg);
-	for(i = requiredby; i; i = i->next) {
-		pmpkg_t *reqpkg = _alpm_db_get_pkgfromcache(db, i->data);
-		if(reqpkg && !_alpm_pkg_find(alpm_pkg_get_name(reqpkg), targets)) {
-			FREELIST(requiredby);
+	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
+		pmpkg_t *lpkg = i->data;
+		if(_alpm_dep_edge(lpkg, pkg) && !_alpm_pkg_find(targets, lpkg->name)) {
 			return(0);
 		}
 	}
-	FREELIST(requiredby);
 
 	/* it's ok to remove */
 	return(1);
@@ -465,7 +482,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets,
  */
 void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit)
 {
-	alpm_list_t *i, *j, *k;
+	alpm_list_t *i, *j;
 
 	ALPM_LOG_FUNC;
 
@@ -475,149 +492,191 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit)
 
 	for(i = targs; i; i = i->next) {
 		pmpkg_t *pkg = i->data;
-		for(j = alpm_pkg_get_depends(pkg); j; j = j->next) {
-			pmdepend_t *depend = j->data;
-
-			for(k = _alpm_db_get_pkgcache(db); k; k = k->next) {
-				pmpkg_t *deppkg = k->data;
-				if(alpm_depcmp(deppkg,depend)
-						&& can_remove_package(db, deppkg, targs, include_explicit)) {
-					_alpm_log(PM_LOG_DEBUG, "adding '%s' to the targets\n",
-							alpm_pkg_get_name(deppkg));
-						/* add it to the target list */
-					targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg));
-				}
+		for(j = _alpm_db_get_pkgcache(db); j; j = j->next) {
+			pmpkg_t *deppkg = j->data;
+			if(_alpm_dep_edge(pkg, deppkg)
+					&& can_remove_package(db, deppkg, targs, include_explicit)) {
+				_alpm_log(PM_LOG_DEBUG, "adding '%s' to the targets\n",
+						alpm_pkg_get_name(deppkg));
+				/* add it to the target list */
+				targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg));
 			}
 		}
 	}
 }
 
-/* populates *list with packages that need to be installed to satisfy all
- * dependencies (recursive) for syncpkg
+/**
+ * helper function for resolvedeps: search for dep satisfier in dbs
  *
- * @param remove contains packages elected for removal
- * make sure **list is already initialized
- */
-int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
-                      alpm_list_t **list, alpm_list_t *remove, pmtrans_t *trans, alpm_list_t **data)
+ * @param dep is the dependency to search for
+ * @param dbs are the databases to search
+ * @param excluding are the packages to exclude from the search
+ * @param prompt if true, will cause an unresolvable dependency to issue an
+ *        interactive prompt asking whether the package should be removed from
+ *        the transaction or the transaction aborted; if false, simply returns
+ *        an error code without prompting
+ * @return the resolved package
+ **/
+pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
+		alpm_list_t *excluding, int prompt)
 {
-	alpm_list_t *i, *j, *k;
+	alpm_list_t *i, *j;
+	int ignored = 0;
+	/* 1. literals */
+	for(i = dbs; i; i = i->next) {
+		pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name);
+		if(pkg && alpm_depcmp(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) {
+			if(_alpm_pkg_should_ignore(pkg)) {
+				int install = 0;
+				if (prompt) {
+					QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg,
+							 NULL, NULL, &install);
+				} else {
+					_alpm_log(PM_LOG_WARNING, _("ignoring package %s-%s\n"), pkg->name, pkg->version);
+				}
+				if(!install) {
+					ignored = 1;
+					continue;
+				}
+			}
+			return(pkg);
+		}
+	}
+	/* 2. satisfiers (skip literals here) */
+	for(i = dbs; i; i = i->next) {
+		for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) {
+			pmpkg_t *pkg = j->data;
+			if(alpm_depcmp(pkg, dep) && strcmp(pkg->name, dep->name) &&
+			             !_alpm_pkg_find(excluding, pkg->name)) {
+				if(_alpm_pkg_should_ignore(pkg)) {
+					int install = 0;
+					if (prompt) {
+						QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG,
+									pkg, NULL, NULL, &install);
+					} else {
+						_alpm_log(PM_LOG_WARNING, _("ignoring package %s-%s\n"), pkg->name, pkg->version);
+					}
+					if(!install) {
+						ignored = 1;
+						continue;
+					}
+				}
+				_alpm_log(PM_LOG_WARNING, _("provider package was selected (%s provides %s)\n"),
+				                         pkg->name, dep->name);
+				return(pkg);
+			}
+		}
+	}
+	if(ignored) { /* resolvedeps will override these */
+		pm_errno = PM_ERR_PKG_IGNORED;
+	} else {
+		pm_errno = PM_ERR_PKG_NOT_FOUND;
+	}
+	return(NULL);
+}
+
+/* Computes resolvable dependencies for a given package and adds that package
+ * and those resolvable dependencies to a list.
+ *
+ * @param localpkgs is the list of local packages
+ * @param dbs_sync are the sync databases
+ * @param pkg is the package to resolve
+ * @param packages is a pointer to a list of packages which will be
+ *        searched first for any dependency packages needed to complete the
+ *        resolve, and to which will be added any [pkg] and all of its
+ *        dependencies not already on the list
+ * @param remove is the set of packages which will be removed in this
+ *        transaction
+ * @param data returns the dependency which could not be satisfied in the
+ *        event of an error
+ * @return 0 on success, with [pkg] and all of its dependencies not already on
+ *         the [*packages] list added to that list, or -1 on failure due to an
+ *         unresolvable dependency, in which case the [*packages] list will be
+ *         unmodified by this function
+ */
+int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg,
+                      alpm_list_t *preferred, alpm_list_t **packages,
+                      alpm_list_t *remove, alpm_list_t **data)
+{
+	alpm_list_t *i, *j;
 	alpm_list_t *targ;
 	alpm_list_t *deps = NULL;
+	alpm_list_t *packages_copy;
 
 	ALPM_LOG_FUNC;
 
-	if(local == NULL || dbs_sync == NULL || syncpkg == NULL || list == NULL) {
-		return(-1);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "started resolving dependencies\n");
-	targ = alpm_list_add(NULL, syncpkg);
-	deps = alpm_checkdeps(local, 0, remove, targ);
-	alpm_list_free(targ);
-
-	if(deps == NULL) {
+	if(_alpm_pkg_find(*packages, pkg->name) != NULL) {
 		return(0);
 	}
 
-	for(i = deps; i; i = i->next) {
-		int found = 0;
-		pmdepmissing_t *miss = i->data;
-		pmdepend_t *missdep = &(miss->depend);
-		pmpkg_t *sync = NULL;
+	/* Create a copy of the packages list, so that it can be restored
+	   on error */
+	packages_copy = alpm_list_copy(*packages);
+	/* [pkg] has not already been resolved into the packages list, so put it
+	   on that list */
+	*packages = alpm_list_add(*packages, pkg);
 
-		/* check if one of the packages in *list already satisfies this dependency */
-		for(j = *list; j && !found; j = j->next) {
-			pmpkg_t *sp = j->data;
-			if(alpm_depcmp(sp, missdep)) {
-				char *missdepstring = alpm_dep_get_string(missdep);
-				_alpm_log(PM_LOG_DEBUG, "%s satisfies dependency %s -- skipping\n",
-				          alpm_pkg_get_name(sp), missdepstring);
+	_alpm_log(PM_LOG_DEBUG, "started resolving dependencies\n");
+	for(i = alpm_list_last(*packages); i; i = i->next) {
+		pmpkg_t *tpkg = i->data;
+		targ = alpm_list_add(NULL, tpkg);
+		deps = alpm_checkdeps(localpkgs, 0, remove, targ);
+		alpm_list_free(targ);
+		for(j = deps; j; j = j->next) {
+			pmdepmissing_t *miss = j->data;
+			pmdepend_t *missdep = alpm_miss_get_dep(miss);
+			/* check if one of the packages in the [*packages] list already satisfies this dependency */
+			if(_alpm_find_dep_satisfier(*packages, missdep)) {
+				continue;
+			}
+			/* check if one of the packages in the [preferred] list already satisfies this dependency */
+			pmpkg_t *spkg = _alpm_find_dep_satisfier(preferred, missdep);
+			if(!spkg) {
+				/* find a satisfier package in the given repositories */
+				spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0);
+			}
+			if(!spkg) {
+				pm_errno = PM_ERR_UNSATISFIED_DEPS;
+				char *missdepstring = alpm_dep_compute_string(missdep);
+				_alpm_log(PM_LOG_WARNING, _("cannot resolve \"%s\", a dependency of \"%s\"\n"),
+						missdepstring, tpkg->name);
 				free(missdepstring);
-				found = 1;
+				if(data) {
+					pmdepmissing_t *missd = _alpm_depmiss_new(miss->target,
+							miss->depend, miss->causingpkg);
+					if(missd) {
+						*data = alpm_list_add(*data, missd);
+					}
+				}
+				alpm_list_free(*packages);
+				*packages = packages_copy;
+				alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free);
+				alpm_list_free(deps);
+				return(-1);
+			} else {
+				_alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n",
+						alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg));
+				*packages = alpm_list_add(*packages, spkg);
 			}
 		}
-		if(found) {
-			continue;
-		}
+		alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free);
+		alpm_list_free(deps);
+	}
+	alpm_list_free(packages_copy);
+	_alpm_log(PM_LOG_DEBUG, "finished resolving dependencies\n");
+	return(0);
+}
 
-		/* find the package in one of the repositories */
-		/* check literals */
-		for(j = dbs_sync; j && !found; j = j->next) {
-			sync = _alpm_db_get_pkgfromcache(j->data, missdep->name);
-			if(!sync) {
-				continue;
-			}
-			found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove);
-			if(!found) {
-				continue;
-			}
-			/* If package is in the ignorepkg list, ask before we pull it */
-			if(_alpm_pkg_should_ignore(sync)) {
-				pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL);
-				QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found);
-				_alpm_pkg_free(dummypkg);
-			}
-		}
-		/*TODO this autoresolves the first 'satisfier' package... we should fix this
-		 * somehow */
-		/* check provides */
-		/* we don't check literals again to avoid duplicated PM_TRANS_CONV_INSTALL_IGNOREPKG messages */
-		for(j = dbs_sync; j && !found; j = j->next) {
-			for(k = _alpm_db_get_pkgcache(j->data); k && !found; k = k->next) {
-				sync = k->data;
-				if(!sync) {
-					continue;
-				}
-				found = alpm_depcmp(sync, missdep) && strcmp(sync->name, missdep->name)
-					&& !_alpm_pkg_find(alpm_pkg_get_name(sync), remove);
-				if(!found) {
-					continue;
-				}
-				if(_alpm_pkg_should_ignore(sync)) {
-					pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL);
-					QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found);
-					_alpm_pkg_free(dummypkg);
-				}
-			}
-		}
-
-		if(!found) {
-			char *missdepstring = alpm_dep_get_string(missdep);
-			_alpm_log(PM_LOG_ERROR, _("cannot resolve \"%s\", a dependency of \"%s\"\n"),
-			          missdepstring, miss->target);
-			free(missdepstring);
-			if(data) {
-				MALLOC(miss, sizeof(pmdepmissing_t),/*nothing*/);
-				if(!miss) {
-					pm_errno = PM_ERR_MEMORY;
-					FREELIST(*data);
-					goto error;
-				}
-				*miss = *(pmdepmissing_t *)i->data;
-				*data = alpm_list_add(*data, miss);
-			}
-			pm_errno = PM_ERR_UNSATISFIED_DEPS;
-			goto error;
-		} else {
-			_alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n",
-					alpm_pkg_get_name(sync), alpm_pkg_get_name(syncpkg));
-			*list = alpm_list_add(*list, sync);
-			if(_alpm_resolvedeps(local, dbs_sync, sync, list, remove, trans, data)) {
-				goto error;
-			}
+/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */
+int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2)
+{
+	alpm_list_t *i;
+	for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) {
+		if(alpm_depcmp(pkg2, i->data)) {
+			return(1);
 		}
 	}
-
-	_alpm_log(PM_LOG_DEBUG, "finished resolving dependencies\n");
-
-	FREELIST(deps);
-
 	return(0);
-
-error:
-	FREELIST(deps);
-	return(-1);
 }
 
 const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss)
@@ -627,7 +686,17 @@ const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss)
 	/* Sanity checks */
 	ASSERT(miss != NULL, return(NULL));
 
-	return miss->target;
+	return(miss->target);
+}
+
+const char SYMEXPORT *alpm_miss_get_causingpkg(const pmdepmissing_t *miss)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(miss != NULL, return(NULL));
+
+	return miss->causingpkg;
 }
 
 pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss)
@@ -637,7 +706,7 @@ pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss)
 	/* Sanity checks */
 	ASSERT(miss != NULL, return(NULL));
 
-	return &(miss->depend);
+	return(miss->depend);
 }
 
 pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep)
@@ -647,7 +716,7 @@ pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep)
 	/* Sanity checks */
 	ASSERT(dep != NULL, return(-1));
 
-	return dep->mod;
+	return(dep->mod);
 }
 
 const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep)
@@ -657,7 +726,7 @@ const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep)
 	/* Sanity checks */
 	ASSERT(dep != NULL, return(NULL));
 
-	return dep->name;
+	return(dep->name);
 }
 
 const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep)
@@ -667,7 +736,7 @@ const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep)
 	/* Sanity checks */
 	ASSERT(dep != NULL, return(NULL));
 
-	return dep->version;
+	return(dep->version);
 }
 
 /** Reverse of splitdep; make a dep string from a pmdepend_t struct.
@@ -675,9 +744,9 @@ const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep)
  * @param dep the depend to turn into a string
  * @return a string-formatted dependency with operator if necessary
  */
-char SYMEXPORT *alpm_dep_get_string(const pmdepend_t *dep)
+char SYMEXPORT *alpm_dep_compute_string(const pmdepend_t *dep)
 {
-	char *opr, *str = NULL;
+	char *name, *opr, *ver, *str = NULL;
 	size_t len;
 
 	ALPM_LOG_FUNC;
@@ -685,6 +754,12 @@ char SYMEXPORT *alpm_dep_get_string(const pmdepend_t *dep)
 	/* Sanity checks */
 	ASSERT(dep != NULL, return(NULL));
 
+	if(dep->name) {
+		name = dep->name;
+	} else {
+		name = "";
+	}
+
 	switch(dep->mod) {
 		case PM_DEP_MOD_ANY:
 			opr = "";
@@ -709,11 +784,18 @@ char SYMEXPORT *alpm_dep_get_string(const pmdepend_t *dep)
 			break;
 	}
 
+	if(dep->version) {
+		ver = dep->version;
+	} else {
+		ver = "";
+	}
+
 	/* we can always compute len and print the string like this because opr
-	 * and ver will be empty when PM_DEP_MOD_ANY is the depend type */
-	len = strlen(dep->name) + strlen(opr) + strlen(dep->version) + 1;
+	 * and ver will be empty when PM_DEP_MOD_ANY is the depend type. the
+	 * reassignments above also ensure we do not do a strlen(NULL). */
+	len = strlen(name) + strlen(opr) + strlen(ver) + 1;
 	MALLOC(str, len, RET_ERR(PM_ERR_MEMORY, NULL));
-	snprintf(str, len, "%s%s%s", dep->name, opr, dep->version);
+	snprintf(str, len, "%s%s%s", name, opr, ver);
 
 	return(str);
 }

lib/libalpm/deps.h

@@ -1,7 +1,8 @@
 /*
  *  deps.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
  *
@@ -29,31 +30,31 @@
 /* Dependency */
 struct __pmdepend_t {
 	pmdepmod_t mod;
-	char name[PKG_NAME_LEN];
-	char version[PKG_VERSION_LEN];
+	char *name;
+	char *version;
 };
 
 /* Missing dependency */
 struct __pmdepmissing_t {
-	char target[PKG_NAME_LEN];
-	pmdepend_t depend;
+	char *target;
+	pmdepend_t *depend;
+	char *causingpkg; /* this is used in case of remove dependency error only */
 };
 
-/* Graphs */
-struct __pmgraph_t {
-	int state; /* 0: untouched, -1: entered, other: leaving time */
-	void *data;
-	struct __pmgraph_t *parent; /* where did we come from? */
-	alpm_list_t *children;
-	alpm_list_t *childptr; /* points to a child in children list */
-};
-
-pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepmod_t depmod,
-		const char *depname, const char *depversion);
-alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode);
+void _alpm_dep_free(pmdepend_t *dep);
+pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep);
+pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepend_t *dep,
+		const char *causinpkg);
+void _alpm_depmiss_free(pmdepmissing_t *miss);
+alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse);
 void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit);
-int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
-                      alpm_list_t **list, alpm_list_t *remove, pmtrans_t *trans, alpm_list_t **data);
+pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt);
+int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg,
+		alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove,
+		alpm_list_t **data);
+int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2);
+pmdepend_t *_alpm_splitdep(const char *depstring);
+pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep);
 
 #endif /* _ALPM_DEPS_H */
 

lib/libalpm/dload.c

@@ -0,0 +1,440 @@
+/*
+ *  download.c
+ *
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <limits.h>
+/* the following two are needed on BSD for libfetch */
+#if defined(HAVE_SYS_SYSLIMITS_H)
+#include <sys/syslimits.h> /* PATH_MAX */
+#endif
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h> /* MAXHOSTNAMELEN */
+#endif
+
+#if defined(INTERNAL_DOWNLOAD)
+#include <fetch.h>
+#endif
+
+/* libalpm */
+#include "dload.h"
+#include "alpm_list.h"
+#include "alpm.h"
+#include "log.h"
+#include "util.h"
+#include "handle.h"
+
+static char *get_filename(const char *url) {
+	char *filename = strrchr(url, '/');
+	if(filename != NULL) {
+		filename++;
+	}
+	return(filename);
+}
+
+#if defined(INTERNAL_DOWNLOAD)
+static char *get_destfile(const char *path, const char *filename) {
+	char *destfile;
+	/* len = localpath len + filename len + null */
+	size_t len = strlen(path) + strlen(filename) + 1;
+	CALLOC(destfile, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL));
+	snprintf(destfile, len, "%s%s", path, filename);
+
+	return(destfile);
+}
+
+static char *get_tempfile(const char *path, const char *filename) {
+	char *tempfile;
+	/* len = localpath len + filename len + '.part' len + null */
+	size_t len = strlen(path) + strlen(filename) + 6;
+	CALLOC(tempfile, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL));
+	snprintf(tempfile, len, "%s%s.part", path, filename);
+
+	return(tempfile);
+}
+
+static const char *gethost(struct url *fileurl)
+{
+	const char *host = _("disk");
+	if(strcmp(SCHEME_FILE, fileurl->scheme) != 0) {
+		host = fileurl->host;
+	}
+	return(host);
+}
+
+int dload_interrupted;
+static RETSIGTYPE inthandler(int signum)
+{
+	dload_interrupted = 1;
+}
+
+#define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; }
+enum sighandlers { OLD = 0, NEW = 1 };
+
+static int download_internal(const char *url, const char *localpath,
+		int force) {
+	FILE *localf = NULL;
+	struct stat st;
+	int ret = 0;
+	off_t dl_thisfile = 0;
+	ssize_t nread = 0;
+	char *tempfile, *destfile, *filename;
+	struct sigaction sig_pipe[2], sig_int[2];
+
+	off_t local_size = 0;
+	time_t local_time = 0;
+
+	struct url *fileurl;
+	struct url_stat ust;
+	fetchIO *dlf = NULL;
+
+	char buffer[PM_DLBUF_LEN];
+
+	filename = get_filename(url);
+	if(!filename) {
+		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
+		RET_ERR(PM_ERR_SERVER_BAD_URL, -1);
+	}
+
+	fileurl = fetchParseURL(url);
+	if(!fileurl) {
+		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
+		RET_ERR(PM_ERR_LIBFETCH, -1);
+	}
+
+	destfile = get_destfile(localpath, filename);
+	tempfile = get_tempfile(localpath, filename);
+
+	if(stat(tempfile, &st) == 0 && st.st_size > 0) {
+		_alpm_log(PM_LOG_DEBUG, "tempfile found, attempting continuation\n");
+		local_time = fileurl->last_modified = st.st_mtime;
+		local_size = fileurl->offset = (off_t)st.st_size;
+		dl_thisfile = st.st_size;
+		localf = fopen(tempfile, "ab");
+	} else if(!force && stat(destfile, &st) == 0 && st.st_size > 0) {
+		_alpm_log(PM_LOG_DEBUG, "destfile found, using mtime only\n");
+		local_time = fileurl->last_modified = st.st_mtime;
+		local_size = /* no fu->off here */ (off_t)st.st_size;
+	} else {
+		_alpm_log(PM_LOG_DEBUG, "no file found matching criteria, starting from scratch\n");
+	}
+
+	/* pass the raw filename for passing to the callback function */
+	_alpm_log(PM_LOG_DEBUG, "using '%s' for download progress\n", filename);
+
+	/* print proxy info for debug purposes */
+	_alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY"));
+	_alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy"));
+	_alpm_log(PM_LOG_DEBUG, "FTP_PROXY:  %s\n", getenv("FTP_PROXY"));
+	_alpm_log(PM_LOG_DEBUG, "ftp_proxy:  %s\n", getenv("ftp_proxy"));
+
+	/* 10s timeout */
+	fetchTimeout = 10;
+
+	/* ignore any SIGPIPE signals- these may occur if our FTP socket dies or
+	 * something along those lines. Store the old signal handler first. */
+	sig_pipe[NEW].sa_handler = SIG_IGN;
+	sigemptyset(&sig_pipe[NEW].sa_mask);
+	sig_pipe[NEW].sa_flags = 0;
+	sigaction(SIGPIPE, NULL, &sig_pipe[OLD]);
+	sigaction(SIGPIPE, &sig_pipe[NEW], NULL);
+
+	dload_interrupted = 0;
+	sig_int[NEW].sa_handler = &inthandler;
+	sigemptyset(&sig_int[NEW].sa_mask);
+	sig_int[NEW].sa_flags = 0;
+	sigaction(SIGINT, NULL, &sig_int[OLD]);
+	sigaction(SIGINT, &sig_int[NEW], NULL);
+
+	/* NOTE: libfetch does not reset the error code, be sure to do it before
+	 * calls into the library */
+
+	/* find out the remote size *and* mtime in one go. there is a lot of
+	 * trouble in trying to do both size and "if-modified-since" logic in a
+	 * non-stat request, so avoid it. */
+	fetchLastErrCode = 0;
+	if(fetchStat(fileurl, &ust, "") == -1) {
+		pm_errno = PM_ERR_LIBFETCH;
+		_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
+				filename, gethost(fileurl), fetchLastErrString);
+		ret = -1;
+		goto cleanup;
+	}
+	check_stop();
+
+	_alpm_log(PM_LOG_DEBUG, "ust.mtime: %ld local_time: %ld compare: %ld\n",
+			ust.mtime, local_time, local_time - ust.mtime);
+	_alpm_log(PM_LOG_DEBUG, "ust.size: %jd local_size: %jd compare: %jd\n",
+			(intmax_t)ust.size, (intmax_t)local_size, (intmax_t)(local_size - ust.size));
+	if(!force && ust.mtime && ust.mtime == local_time
+			&& ust.size && ust.size == local_size) {
+		/* the remote time and size values agreed with what we have, so move on
+		 * because there is nothing more to do. */
+		_alpm_log(PM_LOG_DEBUG, "files are identical, skipping %s\n", filename);
+		ret = 1;
+		goto cleanup;
+	}
+	if(!ust.mtime || ust.mtime != local_time) {
+		_alpm_log(PM_LOG_DEBUG, "mtimes were different or unavailable, downloading %s from beginning\n", filename);
+		fileurl->offset = 0;
+	}
+
+	fetchLastErrCode = 0;
+	dlf = fetchGet(fileurl, "");
+	check_stop();
+
+	if(fetchLastErrCode != 0 || dlf == NULL) {
+		pm_errno = PM_ERR_LIBFETCH;
+		_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
+				filename, gethost(fileurl), fetchLastErrString);
+		ret = -1;
+		goto cleanup;
+	} else {
+		_alpm_log(PM_LOG_DEBUG, "connected to %s successfully\n", fileurl->host);
+	}
+
+	if(localf && fileurl->offset == 0) {
+		_alpm_log(PM_LOG_WARNING, _("resuming download of %s not possible; starting over\n"), filename);
+		fclose(localf);
+		localf = NULL;
+	} else if(fileurl->offset) {
+		_alpm_log(PM_LOG_DEBUG, "resuming download at position %jd\n", (intmax_t)fileurl->offset);
+	}
+
+
+	if(localf == NULL) {
+		_alpm_rmrf(tempfile);
+		fileurl->offset = (off_t)0;
+		dl_thisfile = 0;
+		localf = fopen(tempfile, "wb");
+		if(localf == NULL) { /* still null? */
+			pm_errno = PM_ERR_RETRIEVE;
+			_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"),
+					tempfile, strerror(errno));
+			ret = -1;
+			goto cleanup;
+		}
+	}
+
+	/* Progress 0 - initialize */
+	if(handle->dlcb) {
+		handle->dlcb(filename, 0, ust.size);
+	}
+
+	while((nread = fetchIO_read(dlf, buffer, PM_DLBUF_LEN)) > 0) {
+		check_stop();
+		size_t nwritten = 0;
+		nwritten = fwrite(buffer, 1, nread, localf);
+		if((nwritten != nread) || ferror(localf)) {
+			pm_errno = PM_ERR_RETRIEVE;
+			_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"),
+					tempfile, strerror(errno));
+			ret = -1;
+			goto cleanup;
+		}
+		dl_thisfile += nread;
+
+		if(handle->dlcb) {
+			handle->dlcb(filename, dl_thisfile, ust.size);
+		}
+	}
+
+	/* did the transfer complete normally? */
+	if (nread == -1) {
+		/* not PM_ERR_LIBFETCH here because libfetch error string might be empty */
+		pm_errno = PM_ERR_RETRIEVE;
+		_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s\n"),
+				filename, gethost(fileurl));
+		ret = -1;
+		goto cleanup;
+	}
+
+	if (ust.size != -1 && dl_thisfile < ust.size) {
+		pm_errno = PM_ERR_RETRIEVE;
+		_alpm_log(PM_LOG_ERROR, _("%s appears to be truncated: %jd/%jd bytes\n"),
+				filename, (intmax_t)dl_thisfile, (intmax_t)ust.size);
+		ret = -1;
+		goto cleanup;
+	}
+
+	/* probably safer to close the file descriptors now before renaming the file,
+	 * for example to make sure the buffers are flushed.
+	 */
+	fclose(localf);
+	localf = NULL;
+	fetchIO_close(dlf);
+	dlf = NULL;
+
+	/* set the times on the file to the same as that of the remote file */
+	if(ust.mtime) {
+		struct timeval tv[2];
+		memset(&tv, 0, sizeof(tv));
+		tv[0].tv_sec = ust.atime;
+		tv[1].tv_sec = ust.mtime;
+		utimes(tempfile, tv);
+	}
+	rename(tempfile, destfile);
+	ret = 0;
+
+cleanup:
+	FREE(tempfile);
+	FREE(destfile);
+	if(localf != NULL) {
+		/* if we still had a local file open, we got interrupted. set the mtimes on
+		 * the file accordingly. */
+		fflush(localf);
+		if(ust.mtime) {
+			struct timeval tv[2];
+			memset(&tv, 0, sizeof(tv));
+			tv[0].tv_sec = ust.atime;
+			tv[1].tv_sec = ust.mtime;
+			futimes(fileno(localf), tv);
+		}
+		fclose(localf);
+	}
+	if(dlf != NULL) {
+		fetchIO_close(dlf);
+	}
+	fetchFreeURL(fileurl);
+
+	/* restore the old signal handlers */
+	sigaction(SIGINT, &sig_int[OLD], NULL);
+	sigaction(SIGPIPE, &sig_pipe[OLD], NULL);
+	/* if we were interrupted, trip the old handler */
+	if(dload_interrupted) {
+		raise(SIGINT);
+	}
+
+	return(ret);
+}
+#endif
+
+static int download(const char *url, const char *localpath,
+		int force) {
+	if(handle->fetchcb == NULL) {
+#if defined(INTERNAL_DOWNLOAD)
+		return(download_internal(url, localpath, force));
+#else
+		RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
+#endif
+	} else {
+		int ret = handle->fetchcb(url, localpath, force);
+		if(ret == -1) {
+			RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
+		}
+		return(ret);
+	}
+}
+
+/*
+ * Download a single file
+ *   - servers must be a list of urls WITHOUT trailing slashes.
+ *
+ * RETURN:  0 for successful download
+ *          1 if the files are identical
+ *         -1 on error
+ */
+int _alpm_download_single_file(const char *filename,
+		alpm_list_t *servers, const char *localpath,
+		int force)
+{
+	alpm_list_t *i;
+	int ret = -1;
+
+	ASSERT(servers != NULL, RET_ERR(PM_ERR_SERVER_NONE, -1));
+
+	for(i = servers; i; i = i->next) {
+		const char *server = i->data;
+		char *fileurl = NULL;
+		size_t len;
+
+		/* print server + filename into a buffer */
+		len = strlen(server) + strlen(filename) + 2;
+		CALLOC(fileurl, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1));
+		snprintf(fileurl, len, "%s/%s", server, filename);
+
+		ret = download(fileurl, localpath, force);
+		FREE(fileurl);
+		if(ret != -1) {
+			break;
+		}
+	}
+
+	return(ret);
+}
+
+int _alpm_download_files(alpm_list_t *files,
+		alpm_list_t *servers, const char *localpath)
+{
+	int ret = 0;
+	alpm_list_t *lp;
+
+	for(lp = files; lp; lp = lp->next) {
+		char *filename = lp->data;
+		if(_alpm_download_single_file(filename, servers,
+					localpath, 0) == -1) {
+			ret++;
+		}
+	}
+
+	return(ret);
+}
+
+/** Fetch a remote pkg.
+ * @param url URL of the package to download
+ * @return the downloaded filepath on success, NULL on error
+ * @addtogroup alpm_misc
+ */
+char SYMEXPORT *alpm_fetch_pkgurl(const char *url)
+{
+	char *filename, *filepath;
+	const char *cachedir;
+	int ret;
+
+	ALPM_LOG_FUNC;
+
+	filename = get_filename(url);
+
+	/* find a valid cache dir to download to */
+	cachedir = _alpm_filecache_setup();
+
+	/* download the file */
+	ret = download(url, cachedir, 0);
+	if(ret == -1) {
+		_alpm_log(PM_LOG_WARNING, _("failed to download %s\n"), url);
+		return(NULL);
+	}
+	_alpm_log(PM_LOG_DEBUG, "successfully downloaded %s\n", url);
+
+	/* we should be able to find the file the second time around */
+	filepath = _alpm_filecache_find(filename);
+	return(filepath);
+}
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/dload.h

@@ -1,7 +1,8 @@
 /*
- *  error.h
+ *  dload.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,13 +17,23 @@
  *  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 _ALPM_ERROR_H
-#define _ALPM_ERROR_H
+#ifndef _ALPM_DLOAD_H
+#define _ALPM_DLOAD_H
 
-#define RET_ERR(err, ret) do { pm_errno = (err); \
-	_alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \
-	return(ret); } while(0)
+#include "alpm_list.h"
+#include "alpm.h"
 
-#endif /* _ALPM_ERROR_H */
+#include <time.h>
+
+#define PM_DLBUF_LEN (1024 * 16)
+
+int _alpm_download_single_file(const char *filename,
+		alpm_list_t *servers, const char *localpath,
+		int force);
+
+int _alpm_download_files(alpm_list_t *files,
+		alpm_list_t *servers, const char *localpath);
+
+#endif /* _ALPM_DLOAD_H */
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/error.c

@@ -1,10 +1,8 @@
 /*
  *  error.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
- *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
- *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
- *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,12 +20,25 @@
 
 #include "config.h"
 
+/* TODO: needed for the libfetch stuff, unfortunately- we should kill it */
+#include <stdio.h>
+#include <limits.h>
+/* the following two are needed on BSD for libfetch */
+#if defined(HAVE_SYS_SYSLIMITS_H)
+#include <sys/syslimits.h> /* PATH_MAX */
+#endif
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h> /* MAXHOSTNAMELEN */
+#endif
+
+#if defined(INTERNAL_DOWNLOAD)
+#include <fetch.h> /* fetchLastErrString */
+#endif
+
 /* libalpm */
-#include "error.h"
 #include "util.h"
 #include "alpm.h"
 
-/* TODO does this really need a file all on its own? */
 const char SYMEXPORT *alpm_strerrorlast(void)
 {
 	return alpm_strerror(pm_errno);
@@ -74,13 +85,8 @@ const char SYMEXPORT *alpm_strerror(int err)
 		/* Servers */
 		case PM_ERR_SERVER_BAD_URL:
 			return _("invalid url for server");
-		/* Configuration */
-		case PM_ERR_OPT_LOGFILE:
-		case PM_ERR_OPT_DBPATH:
-		case PM_ERR_OPT_LOCALDB:
-		case PM_ERR_OPT_SYNCDB:
-		case PM_ERR_OPT_USESYSLOG:
-			return _("could not set parameter");
+		case PM_ERR_SERVER_NONE:
+			return _("no servers configured for repository");
 		/* Transactions */
 		case PM_ERR_TRANS_NOT_NULL:
 			return _("transaction already initialized");
@@ -96,39 +102,30 @@ const char SYMEXPORT *alpm_strerror(int err)
 			return _("transaction aborted");
 		case PM_ERR_TRANS_TYPE:
 			return _("operation not compatible with the transaction type");
-		case PM_ERR_TRANS_COMMITING:
-			return _("could not commit transaction");
-		case PM_ERR_TRANS_DOWNLOADING:
-			return _("could not download all files");
+		case PM_ERR_TRANS_NOT_LOCKED:
+			return _("transaction commit attempt when database is not locked");
 		/* Packages */
 		case PM_ERR_PKG_NOT_FOUND:
 			return _("could not find or read package");
+		case PM_ERR_PKG_IGNORED:
+			return _("operation cancelled due to ignorepkg");
 		case PM_ERR_PKG_INVALID:
 			return _("invalid or corrupted package");
 		case PM_ERR_PKG_OPEN:
 			return _("cannot open package file");
-		case PM_ERR_PKG_LOAD:
-			return _("cannot load package data");
-		case PM_ERR_PKG_INSTALLED:
-			return _("package already installed");
-		case PM_ERR_PKG_CANT_FRESH:
-			return _("package not installed or lesser version");
 		case PM_ERR_PKG_CANT_REMOVE:
 			return _("cannot remove all files for package");
 		case PM_ERR_PKG_INVALID_NAME:
-			return _("package name is not valid");
-		case PM_ERR_PKG_CORRUPTED:
-			return _("corrupted package");
+			return _("package filename is not valid");
+		case PM_ERR_PKG_INVALID_ARCH:
+			return _("package architecture is not valid");
 		case PM_ERR_PKG_REPO_NOT_FOUND:
-			return _("no such repository");
+			return _("could not find repository for target");
 		/* Deltas */
-		case PM_ERR_DLT_CORRUPTED:
-			return _("corrupted delta");
+		case PM_ERR_DLT_INVALID:
+			return _("invalid or corrupted delta");
 		case PM_ERR_DLT_PATCHFAILED:
 			return _("delta patch failed");
-		/* Groups */
-		case PM_ERR_GRP_NOT_FOUND:
-			return _("group not found");
 		/* Dependencies */
 		case PM_ERR_UNSATISFIED_DEPS:
 			return _("could not satisfy dependencies");
@@ -137,20 +134,25 @@ const char SYMEXPORT *alpm_strerror(int err)
 		case PM_ERR_FILE_CONFLICTS:
 			return _("conflicting files");
 		/* Miscellaenous */
-		case PM_ERR_USER_ABORT:
-			return _("user aborted the operation");
-		case PM_ERR_INTERNAL_ERROR:
-			return _("internal error");
-		case PM_ERR_LIBARCHIVE_ERROR:
-			return _("libarchive error");
-		case PM_ERR_PKG_HOLD:
-			/* TODO wow this is not descriptive at all... what does this mean? */
-			return _("not confirmed");
+		case PM_ERR_RETRIEVE:
+			return _("failed to retrieve some files");
 		case PM_ERR_INVALID_REGEX:
 			return _("invalid regular expression");
-		/* Downloading */
-		case PM_ERR_CONNECT_FAILED:
-			return _("connection to remote host failed");
+		/* Errors from external libraries- our own wrapper error */
+		case PM_ERR_LIBARCHIVE:
+			/* it would be nice to use archive_error_string() here, but that
+			 * requires the archive struct, so we can't. Just use a generic
+			 * error string instead. */
+			return _("libarchive error");
+		case PM_ERR_LIBFETCH:
+#if defined(INTERNAL_DOWNLOAD)
+			return fetchLastErrString;
+#else
+			/* obviously shouldn't get here... */
+			return _("download library error");
+#endif
+		case PM_ERR_EXTERNAL_DOWNLOAD:
+			return _("error invoking external downloader");
 		/* Unknown error! */
 		default:
 			return _("unexpected error");

lib/libalpm/graph.h

@@ -0,0 +1,59 @@
+/*
+ *  graph.h - helpful graph structure and setup/teardown methods
+ *
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/types.h> /* off_t */
+
+#include "alpm_list.h"
+#include "util.h" /* MALLOC() */
+#include "alpm.h"
+
+struct __pmgraph_t {
+	char state; /* 0: untouched, -1: entered, other: leaving time */
+	void *data;
+	off_t weight; /* weight of the node */
+	struct __pmgraph_t *parent; /* where did we come from? */
+	alpm_list_t *children;
+	alpm_list_t *childptr; /* points to a child in children list */
+};
+typedef struct __pmgraph_t pmgraph_t;
+
+static pmgraph_t *_alpm_graph_new(void)
+{
+	pmgraph_t *graph = NULL;
+
+	MALLOC(graph, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
+
+	if(graph) {
+		graph->state = 0;
+		graph->data = NULL;
+		graph->parent = NULL;
+		graph->children = NULL;
+		graph->childptr = NULL;
+	}
+	return(graph);
+}
+
+static void _alpm_graph_free(void *data)
+{
+	pmgraph_t *graph = data;
+	alpm_list_free(graph->children);
+	free(graph);
+}
+

lib/libalpm/group.c

@@ -1,7 +1,8 @@
 /*
  *  group.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,17 +28,17 @@
 #include "group.h"
 #include "alpm_list.h"
 #include "util.h"
-#include "error.h"
 #include "log.h"
 #include "alpm.h"
 
-pmgrp_t *_alpm_grp_new()
+pmgrp_t *_alpm_grp_new(const char *name)
 {
 	pmgrp_t* grp;
 
 	ALPM_LOG_FUNC;
 
 	CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(grp);
 }
@@ -50,20 +51,12 @@ void _alpm_grp_free(pmgrp_t *grp)
 		return;
 	}
 
-	FREELIST(grp->packages);
+	FREE(grp->name);
+	/* do NOT free the contents of the list, just the nodes */
+	alpm_list_free(grp->packages);
 	FREE(grp);
 }
 
-/* Helper function for sorting groups
- */
-int _alpm_grp_cmp(const void *g1, const void *g2)
-{
-	pmgrp_t *grp1 = (pmgrp_t *)g1;
-	pmgrp_t *grp2 = (pmgrp_t *)g2;
-
-	return(strcmp(grp1->name, grp2->name));
-}
-
 const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp)
 {
 	ALPM_LOG_FUNC;
@@ -74,7 +67,7 @@ const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp)
 	return grp->name;
 }
 
-const alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp)
+alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp)
 {
 	ALPM_LOG_FUNC;
 

lib/libalpm/group.h

@@ -1,7 +1,8 @@
 /*
  *  group.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,19 +20,17 @@
 #ifndef _ALPM_GROUP_H
 #define _ALPM_GROUP_H
 
-/* Groups */
-#define GRP_NAME_LEN 256
-
 #include "alpm.h"
 
 struct __pmgrp_t {
-	char name[GRP_NAME_LEN];
-	alpm_list_t *packages; /* List of strings */
+	/** group name */
+	char *name;
+	/** list of pmpkg_t packages */
+	alpm_list_t *packages;
 };
 
-pmgrp_t *_alpm_grp_new(void);
+pmgrp_t *_alpm_grp_new(const char *name);
 void _alpm_grp_free(pmgrp_t *grp);
-int _alpm_grp_cmp(const void *g1, const void *g2);
 
 #endif /* _ALPM_GROUP_H */
 

lib/libalpm/handle.c

@@ -1,7 +1,8 @@
 /*
  *  handle.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
  *
@@ -23,7 +24,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <syslog.h>
@@ -36,10 +36,8 @@
 #include "alpm_list.h"
 #include "util.h"
 #include "log.h"
-#include "error.h"
 #include "trans.h"
 #include "alpm.h"
-#include "server.h"
 
 /* global var for handle (private to libalpm) */
 pmhandle_t *handle = NULL;
@@ -51,18 +49,7 @@ pmhandle_t *_alpm_handle_new()
 	ALPM_LOG_FUNC;
 
 	CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
-
 	handle->lckfd = -1;
-	handle->logstream = NULL;
-
-	/* see if we're root or not */
-	handle->uid = geteuid();
-	handle->root = NULL;
-	handle->dbpath = NULL;
-	handle->cachedirs = NULL;
-	handle->lockfile = NULL;
-	handle->logfile = NULL;
-	handle->usedelta = 0;
 
 	return(handle);
 }
@@ -92,12 +79,11 @@ void _alpm_handle_free(pmhandle_t *handle)
 	FREELIST(handle->cachedirs);
 	FREE(handle->logfile);
 	FREE(handle->lockfile);
-	FREE(handle->xfercommand);
+	FREE(handle->arch);
 	FREELIST(handle->dbs_sync);
 	FREELIST(handle->noupgrade);
 	FREELIST(handle->noextract);
 	FREELIST(handle->ignorepkg);
-	FREELIST(handle->holdpkg);
 	FREELIST(handle->ignoregrp);
 	FREE(handle);
 }
@@ -120,6 +106,24 @@ alpm_cb_download SYMEXPORT alpm_option_get_dlcb()
 	return handle->dlcb;
 }
 
+alpm_cb_fetch SYMEXPORT alpm_option_get_fetchcb()
+{
+	if (handle == NULL) {
+		pm_errno = PM_ERR_HANDLE_NULL;
+		return NULL;
+	}
+	return handle->fetchcb;
+}
+
+alpm_cb_totaldl SYMEXPORT alpm_option_get_totaldlcb()
+{
+	if (handle == NULL) {
+		pm_errno = PM_ERR_HANDLE_NULL;
+		return NULL;
+	}
+	return handle->totaldlcb;
+}
+
 const char SYMEXPORT *alpm_option_get_root()
 {
 	if (handle == NULL) {
@@ -165,7 +169,7 @@ const char SYMEXPORT *alpm_option_get_lockfile()
 	return handle->lockfile;
 }
 
-unsigned short SYMEXPORT alpm_option_get_usesyslog()
+int SYMEXPORT alpm_option_get_usesyslog()
 {
 	if (handle == NULL) {
 		pm_errno = PM_ERR_HANDLE_NULL;
@@ -201,15 +205,6 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs()
 	return handle->ignorepkg;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_holdpkgs()
-{
-	if (handle == NULL) {
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
-	return handle->holdpkg;
-}
-
 alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps()
 {
 	if (handle == NULL) {
@@ -219,22 +214,22 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps()
 	return handle->ignoregrp;
 }
 
-const char SYMEXPORT *alpm_option_get_xfercommand()
+const char SYMEXPORT *alpm_option_get_arch()
 {
 	if (handle == NULL) {
 		pm_errno = PM_ERR_HANDLE_NULL;
 		return NULL;
 	}
-	return handle->xfercommand;
+	return handle->arch;
 }
 
-unsigned short SYMEXPORT alpm_option_get_nopassiveftp()
+int SYMEXPORT alpm_option_get_usedelta()
 {
 	if (handle == NULL) {
 		pm_errno = PM_ERR_HANDLE_NULL;
 		return -1;
 	}
-	return handle->nopassiveftp;
+	return handle->usedelta;
 }
 
 pmdb_t SYMEXPORT *alpm_option_get_localdb()
@@ -273,6 +268,24 @@ void SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb)
 	handle->dlcb = cb;
 }
 
+void SYMEXPORT alpm_option_set_fetchcb(alpm_cb_fetch cb)
+{
+	if (handle == NULL) {
+		pm_errno = PM_ERR_HANDLE_NULL;
+		return;
+	}
+	handle->fetchcb = cb;
+}
+
+void SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb)
+{
+	if (handle == NULL) {
+		pm_errno = PM_ERR_HANDLE_NULL;
+		return;
+	}
+	handle->totaldlcb = cb;
+}
+
 int SYMEXPORT alpm_option_set_root(const char *root)
 {
 	struct stat st;
@@ -292,6 +305,7 @@ int SYMEXPORT alpm_option_set_root(const char *root)
 
 	realroot = calloc(PATH_MAX+1, sizeof(char));
 	if(!realpath(root, realroot)) {
+		FREE(realroot);
 		pm_errno = PM_ERR_NOT_A_DIR;
 		return(-1);
 	}
@@ -386,7 +400,7 @@ void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs)
 
 int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir)
 {
-	void *vdata = NULL;
+	char *vdata = NULL;
 	char *newcachedir;
 	size_t cachedirlen;
 	/* verify cachedir ends in a '/' */
@@ -397,8 +411,7 @@ int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir)
 	newcachedir = calloc(cachedirlen + 1, sizeof(char));
 	strncpy(newcachedir, cachedir, cachedirlen);
 	newcachedir[cachedirlen-1] = '/';
-	handle->cachedirs = alpm_list_remove(handle->cachedirs, newcachedir,
-		_alpm_str_cmp, &vdata);
+	handle->cachedirs = alpm_list_remove_str(handle->cachedirs, newcachedir, &vdata);
 	FREE(newcachedir);
 	if(vdata != NULL) {
 		FREE(vdata);
@@ -427,12 +440,13 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
 	}
 	if(handle->logstream) {
 		fclose(handle->logstream);
+		handle->logstream = NULL;
 	}
 	_alpm_log(PM_LOG_DEBUG, "option 'logfile' = %s\n", handle->logfile);
 	return(0);
 }
 
-void SYMEXPORT alpm_option_set_usesyslog(unsigned short usesyslog)
+void SYMEXPORT alpm_option_set_usesyslog(int usesyslog)
 {
 	handle->usesyslog = usesyslog;
 }
@@ -450,9 +464,8 @@ void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade)
 
 int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg)
 {
-	void *vdata = NULL;
-	handle->noupgrade = alpm_list_remove(handle->noupgrade, pkg,
-		_alpm_str_cmp, &vdata);
+	char *vdata = NULL;
+	handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
 		return(1);
@@ -473,9 +486,8 @@ void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract)
 
 int SYMEXPORT alpm_option_remove_noextract(const char *pkg)
 {
-	void *vdata = NULL;
-	handle->noextract = alpm_list_remove(handle->noextract, pkg,
-		_alpm_str_cmp, &vdata);
+	char *vdata = NULL;
+	handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
 		return(1);
@@ -496,32 +508,8 @@ void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
 
 int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg)
 {
-	void *vdata = NULL;
-	handle->ignorepkg = alpm_list_remove(handle->ignorepkg, pkg,
-		_alpm_str_cmp, &vdata);
-	if(vdata != NULL) {
-		FREE(vdata);
-		return(1);
-	}
-	return(0);
-}
-
-void SYMEXPORT alpm_option_add_holdpkg(const char *pkg)
-{
-	handle->holdpkg = alpm_list_add(handle->holdpkg, strdup(pkg));
-}
-
-void SYMEXPORT alpm_option_set_holdpkgs(alpm_list_t *holdpkgs)
-{
-	if(handle->holdpkg) FREELIST(handle->holdpkg);
-	if(holdpkgs) handle->holdpkg = holdpkgs;
-}
-
-int SYMEXPORT alpm_option_remove_holdpkg(const char *pkg)
-{
-	void *vdata = NULL;
-	handle->holdpkg = alpm_list_remove(handle->holdpkg, pkg,
-		_alpm_str_cmp, &vdata);
+	char *vdata = NULL;
+	handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
 		return(1);
@@ -542,9 +530,8 @@ void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
 
 int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp)
 {
-	void *vdata = NULL;
-	handle->ignoregrp = alpm_list_remove(handle->ignoregrp, grp,
-		_alpm_str_cmp, &vdata);
+	char *vdata = NULL;
+	handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
 		return(1);
@@ -552,18 +539,13 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp)
 	return(0);
 }
 
-void SYMEXPORT alpm_option_set_xfercommand(const char *cmd)
+void SYMEXPORT alpm_option_set_arch(const char *arch)
 {
-	if(handle->xfercommand) FREE(handle->xfercommand);
-	if(cmd) handle->xfercommand = strdup(cmd);
+	if(handle->arch) FREE(handle->arch);
+	if(arch) handle->arch = strdup(arch);
 }
 
-void SYMEXPORT alpm_option_set_nopassiveftp(unsigned short nopasv)
-{
-	handle->nopassiveftp = nopasv;
-}
-
-void SYMEXPORT alpm_option_set_usedelta(unsigned short usedelta)
+void SYMEXPORT alpm_option_set_usedelta(int usedelta)
 {
 	handle->usedelta = usedelta;
 }

lib/libalpm/handle.h

@@ -1,7 +1,8 @@
 /*
  *  handle.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +31,6 @@
 
 typedef struct _pmhandle_t {
 	/* internal usage */
-	uid_t uid;              /* current UID */ /* TODO is this used? */
 	pmdb_t *db_local;       /* local db pointer */
 	alpm_list_t *dbs_sync;  /* List of (pmdb_t *) */
 	FILE *logstream;        /* log file stream pointer */
@@ -40,6 +40,8 @@ typedef struct _pmhandle_t {
 	/* callback functions */
 	alpm_cb_log logcb;      /* Log callback function */
 	alpm_cb_download dlcb;  /* Download callback function */
+	alpm_cb_totaldl totaldlcb;  /* Total download callback function */
+	alpm_cb_fetch fetchcb; /* Download file callback function */
 
 	/* filesystem paths */
 	char *root;              /* Root path, default '/' */
@@ -50,16 +52,14 @@ typedef struct _pmhandle_t {
 
 	/* package lists */
 	alpm_list_t *noupgrade;   /* List of packages NOT to be upgraded */
-	alpm_list_t *noextract;   /* List of packages NOT to extract */ /*TODO is this used?*/
+	alpm_list_t *noextract;   /* List of files NOT to extract */
 	alpm_list_t *ignorepkg;   /* List of packages to ignore */
-	alpm_list_t *holdpkg;     /* List of packages which 'hold' pacman */
 	alpm_list_t *ignoregrp;   /* List of groups to ignore */
 
 	/* options */
-	unsigned short usesyslog;    /* Use syslog instead of logfile? */ /* TODO move to frontend */
-	unsigned short nopassiveftp; /* Don't use PASV ftp connections */
-	char *xfercommand;        /* External download command */
-	unsigned short usedelta;     /* Download deltas if possible */
+	int usesyslog;    /* Use syslog instead of logfile? */ /* TODO move to frontend */
+	char *arch;       /* Architecture of packages we should allow */
+	int usedelta;     /* Download deltas if possible */
 } pmhandle_t;
 
 /* global handle variable */

lib/libalpm/log.c

@@ -1,7 +1,8 @@
 /*
  *  log.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +31,6 @@
 #include "log.h"
 #include "handle.h"
 #include "util.h"
-#include "error.h"
 #include "alpm.h"
 
 /** \addtogroup alpm_log Logging Functions

lib/libalpm/log.h

@@ -1,7 +1,8 @@
 /*
  *  log.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

lib/libalpm/md5.c

@@ -3,18 +3,18 @@
  *
  *  Copyright (C) 2006-2007  Christophe Devine
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License, version 2.1 as published by the Free Software Foundation.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- *  This library is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /*
  *  The MD5 algorithm was designed by Ron Rivest in 1991.
@@ -25,8 +25,9 @@
  *  Pacman Notes:
  *
  *  Taken from the XySSL project at www.xyssl.org under terms of the
- *  LGPL. This is from version 0.7 of the library, and has been modified
+ *  GPL. This is from version 0.9 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"
  *  * removal of HMAC code
  *  * removal of SELF_TEST code
@@ -35,12 +36,12 @@
  *        int md5_file( char *path, unsigned char *output )
  *      to
  *        int md5_file( const char *path, unsigned char *output )
+ *  * 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.
  */
 
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
 #include <string.h>
 #include <stdio.h>
 
@@ -49,8 +50,8 @@
 /*
  * 32-bit integer manipulation macros (little endian)
  */
-#ifndef GET_UINT32_LE
-#define GET_UINT32_LE(n,b,i)                            \
+#ifndef GET_ULONG_LE
+#define GET_ULONG_LE(n,b,i)                             \
 {                                                       \
     (n) = ( (unsigned long) (b)[(i)    ]       )        \
         | ( (unsigned long) (b)[(i) + 1] <<  8 )        \
@@ -59,8 +60,8 @@
 }
 #endif
 
-#ifndef PUT_UINT32_LE
-#define PUT_UINT32_LE(n,b,i)                            \
+#ifndef PUT_ULONG_LE
+#define PUT_ULONG_LE(n,b,i)                             \
 {                                                       \
     (b)[(i)    ] = (unsigned char) ( (n)       );       \
     (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
@@ -87,22 +88,22 @@ static inline void md5_process( md5_context *ctx, unsigned char data[64] )
 {
     unsigned long X[16], A, B, C, D;
 
-    GET_UINT32_LE( X[ 0], data,  0 );
-    GET_UINT32_LE( X[ 1], data,  4 );
-    GET_UINT32_LE( X[ 2], data,  8 );
-    GET_UINT32_LE( X[ 3], data, 12 );
-    GET_UINT32_LE( X[ 4], data, 16 );
-    GET_UINT32_LE( X[ 5], data, 20 );
-    GET_UINT32_LE( X[ 6], data, 24 );
-    GET_UINT32_LE( X[ 7], data, 28 );
-    GET_UINT32_LE( X[ 8], data, 32 );
-    GET_UINT32_LE( X[ 9], data, 36 );
-    GET_UINT32_LE( X[10], data, 40 );
-    GET_UINT32_LE( X[11], data, 44 );
-    GET_UINT32_LE( X[12], data, 48 );
-    GET_UINT32_LE( X[13], data, 52 );
-    GET_UINT32_LE( X[14], data, 56 );
-    GET_UINT32_LE( X[15], data, 60 );
+    GET_ULONG_LE( X[ 0], data,  0 );
+    GET_ULONG_LE( X[ 1], data,  4 );
+    GET_ULONG_LE( X[ 2], data,  8 );
+    GET_ULONG_LE( X[ 3], data, 12 );
+    GET_ULONG_LE( X[ 4], data, 16 );
+    GET_ULONG_LE( X[ 5], data, 20 );
+    GET_ULONG_LE( X[ 6], data, 24 );
+    GET_ULONG_LE( X[ 7], data, 28 );
+    GET_ULONG_LE( X[ 8], data, 32 );
+    GET_ULONG_LE( X[ 9], data, 36 );
+    GET_ULONG_LE( X[10], data, 40 );
+    GET_ULONG_LE( X[11], data, 44 );
+    GET_ULONG_LE( X[12], data, 48 );
+    GET_ULONG_LE( X[13], data, 52 );
+    GET_ULONG_LE( X[14], data, 56 );
+    GET_ULONG_LE( X[15], data, 60 );
 
 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
 
@@ -261,7 +262,7 @@ static unsigned char md5_padding[64] =
 /*
  * MD5 final digest
  */
-static inline void md5_finish( md5_context *ctx, unsigned char *output )
+static inline void md5_finish( md5_context *ctx, unsigned char output[16] )
 {
     unsigned long last, padn;
     unsigned long high, low;
@@ -271,8 +272,8 @@ static inline void md5_finish( md5_context *ctx, unsigned char *output )
          | ( ctx->total[1] <<  3 );
     low  = ( ctx->total[0] <<  3 );
 
-    PUT_UINT32_LE( low,  msglen, 0 );
-    PUT_UINT32_LE( high, msglen, 4 );
+    PUT_ULONG_LE( low,  msglen, 0 );
+    PUT_ULONG_LE( high, msglen, 4 );
 
     last = ctx->total[0] & 0x3F;
     padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
@@ -280,17 +281,16 @@ static inline void md5_finish( md5_context *ctx, unsigned char *output )
     md5_update( ctx, (unsigned char *) md5_padding, padn );
     md5_update( ctx, msglen, 8 );
 
-    PUT_UINT32_LE( ctx->state[0], output,  0 );
-    PUT_UINT32_LE( ctx->state[1], output,  4 );
-    PUT_UINT32_LE( ctx->state[2], output,  8 );
-    PUT_UINT32_LE( ctx->state[3], output, 12 );
+    PUT_ULONG_LE( ctx->state[0], output,  0 );
+    PUT_ULONG_LE( ctx->state[1], output,  4 );
+    PUT_ULONG_LE( ctx->state[2], output,  8 );
+    PUT_ULONG_LE( ctx->state[3], output, 12 );
 }
 
 /*
- * Output = MD5( input buffer )
+ * output = MD5( input buffer )
  */
-void md5( unsigned char *input, int ilen,
-          unsigned char *output )
+void md5( unsigned char *input, int ilen, unsigned char output[16] )
 {
     md5_context ctx;
 
@@ -302,9 +302,9 @@ void md5( unsigned char *input, int ilen,
 }
 
 /*
- * Output = MD5( file contents )
+ * output = MD5( file contents )
  */
-int md5_file( const char *path, unsigned char *output )
+int md5_file( const char *path, unsigned char output[16] )
 {
     FILE *f;
     size_t n;

lib/libalpm/md5.h

@@ -3,29 +3,24 @@
  *
  *  Copyright (C) 2006-2007  Christophe Devine
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License, version 2.1 as published by the Free Software Foundation.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- *  This library is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  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
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
- * \internal
  * \brief          MD5 context structure
  */
 typedef struct
@@ -37,18 +32,15 @@ typedef struct
 md5_context;
 
 /**
- * \internal
  * \brief          Output = MD5( input buffer )
  *
  * \param input    buffer holding the  data
  * \param ilen     length of the input data
  * \param output   MD5 checksum result
  */
-void md5( unsigned char *input, int ilen,
-          unsigned char *output );
+void md5( unsigned char *input, int ilen, unsigned char output[16] );
 
 /**
- * \internal
  * \brief          Output = MD5( file contents )
  *
  * \param path     input file name
@@ -57,10 +49,6 @@ void md5( unsigned char *input, int ilen,
  * \return         0 if successful, 1 if fopen failed,
  *                 or 2 if fread failed
  */
-int md5_file( const char *path, unsigned char *output );
-
-#ifdef __cplusplus
-}
-#endif
+int md5_file( const char *path, unsigned char output[16] );
 
 #endif /* md5.h */

lib/libalpm/package.c

@@ -1,7 +1,8 @@
 /*
  *  package.c
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Christian Hamar <krics@linuxforum.hu>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -30,8 +31,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <locale.h> /* setlocale */
 
 /* libarchive */
 #include <archive.h>
@@ -42,7 +41,6 @@
 #include "alpm_list.h"
 #include "log.h"
 #include "util.h"
-#include "error.h"
 #include "db.h"
 #include "cache.h"
 #include "delta.h"
@@ -54,39 +52,13 @@
  * @{
  */
 
-/** Create a package from a file.
- * @param filename location of the package tarball
- * @param full whether to stop the load after metadata is read or continue
- *             through the full archive
- * @param pkg address of the package pointer
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
-int SYMEXPORT alpm_pkg_load(const char *filename, unsigned short full,
-		pmpkg_t **pkg)
-{
-	_alpm_log(PM_LOG_FUNCTION, "enter alpm_pkg_load\n");
-
-	/* Sanity checks */
-	ASSERT(filename != NULL && strlen(filename) != 0,
-			RET_ERR(PM_ERR_WRONG_ARGS, -1));
-	ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
-
-	*pkg = _alpm_pkg_load(filename, full);
-	if(*pkg == NULL) {
-		/* pm_errno is set by pkg_load */
-		return(-1);
-	}
-
-	return(0);
-}
-
 /** Free a package.
  * @param pkg package pointer to free
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
 int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg)
 {
-	_alpm_log(PM_LOG_FUNCTION, "enter alpm_pkg_free\n");
+	ALPM_LOG_FUNC;
 
 	ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
 
@@ -105,8 +77,7 @@ int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg)
 int SYMEXPORT alpm_pkg_checkmd5sum(pmpkg_t *pkg)
 {
 	char *fpath;
-	char *md5sum = NULL;
-	int retval = 0;
+	int retval;
 
 	ALPM_LOG_FUNC;
 
@@ -116,44 +87,19 @@ int SYMEXPORT alpm_pkg_checkmd5sum(pmpkg_t *pkg)
 	ASSERT(pkg->origin_data.db != handle->db_local, RET_ERR(PM_ERR_PKG_INVALID, -1));
 
 	fpath = _alpm_filecache_find(alpm_pkg_get_filename(pkg));
-	md5sum = alpm_get_md5sum(fpath);
 
-	if(md5sum == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not get md5sum for package %s-%s\n"),
-							alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-		pm_errno = PM_ERR_NOT_A_FILE;
+	retval = _alpm_test_md5sum(fpath, alpm_pkg_get_md5sum(pkg));
+
+	if(retval == 0) {
+		return(0);
+	} else if (retval == 1) {
+		pm_errno = PM_ERR_PKG_INVALID;
 		retval = -1;
-	} else {
-		if(strcmp(md5sum, alpm_pkg_get_md5sum(pkg)) == 0) {
-			_alpm_log(PM_LOG_DEBUG, "md5sums for package %s-%s match\n",
-								alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-		} else {
-			_alpm_log(PM_LOG_ERROR, _("md5sums do not match for package %s-%s\n"),
-								alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-			pm_errno = PM_ERR_PKG_INVALID;
-			retval = -1;
-		}
 	}
 
-	FREE(fpath);
-	FREE(md5sum);
-
 	return(retval);
 }
 
-/** Compare versions.
- * @param ver1 first version
- * @param ver2 secont version
- * @return postive, 0 or negative if ver1 is less, equal or more
- * than ver2, respectively.
- */
-int SYMEXPORT alpm_pkg_vercmp(const char *ver1, const char *ver2)
-{
-	ALPM_LOG_FUNC;
-
-	return(_alpm_versioncmp(ver1, ver2));
-}
-
 const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
@@ -166,45 +112,18 @@ const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg)
 		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
 	}
 
-	if(!strlen(pkg->filename)) {
-		/* construct the file name, it's not in the desc file */
-		if(pkg->arch && strlen(pkg->arch) > 0) {
-			snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s-%s" PKGEXT,
-			         pkg->name, pkg->version, pkg->arch);
-		} else {
-			snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s" PKGEXT,
-			         pkg->name, pkg->version);
-		}
-	}
-
 	return pkg->filename;
 }
 
 const char SYMEXPORT *alpm_pkg_get_name(pmpkg_t *pkg)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
 	ASSERT(pkg != NULL, return(NULL));
-
-	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_BASE)) {
-		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_BASE);
-	}
 	return pkg->name;
 }
 
 const char SYMEXPORT *alpm_pkg_get_version(pmpkg_t *pkg)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
 	ASSERT(pkg != NULL, return(NULL));
-
-	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_BASE)) {
-		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_BASE);
-	}
 	return pkg->version;
 }
 
@@ -306,7 +225,7 @@ const char SYMEXPORT *alpm_pkg_get_arch(pmpkg_t *pkg)
 	return pkg->arch;
 }
 
-unsigned long SYMEXPORT alpm_pkg_get_size(pmpkg_t *pkg)
+off_t SYMEXPORT alpm_pkg_get_size(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
 
@@ -320,7 +239,7 @@ unsigned long SYMEXPORT alpm_pkg_get_size(pmpkg_t *pkg)
 	return pkg->size;
 }
 
-unsigned long SYMEXPORT alpm_pkg_get_isize(pmpkg_t *pkg)
+off_t SYMEXPORT alpm_pkg_get_isize(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
 
@@ -376,6 +295,20 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_groups(pmpkg_t *pkg)
 	return pkg->groups;
 }
 
+int SYMEXPORT alpm_pkg_has_force(pmpkg_t *pkg)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(-1));
+	ASSERT(pkg != NULL, return(-1));
+
+	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
+	}
+	return pkg->force;
+}
+
 alpm_list_t SYMEXPORT *alpm_pkg_get_depends(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
@@ -490,6 +423,15 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg)
 	return pkg->backup;
 }
 
+pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg)
+{
+	/* Sanity checks */
+	ASSERT(pkg != NULL, return(NULL));
+	ASSERT(pkg->origin == PKG_FROM_CACHE, return(NULL));
+
+	return(pkg->origin_data.db);
+}
+
 /**
  * Open a package changelog for reading. Similar to fopen in functionality,
  * except that the returned 'file stream' could really be from an archive
@@ -517,10 +459,9 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
 		struct archive *archive = NULL;
 		struct archive_entry *entry;
 		const char *pkgfile = pkg->origin_data.file;
-		int ret = ARCHIVE_OK;
 
 		if((archive = archive_read_new()) == NULL) {
-			RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL);
+			RET_ERR(PM_ERR_LIBARCHIVE, NULL);
 		}
 
 		archive_read_support_compression_all(archive);
@@ -531,7 +472,7 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
 			RET_ERR(PM_ERR_PKG_OPEN, NULL);
 		}
 
-		while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
+		while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
 			const char *entry_name = archive_entry_pathname(entry);
 
 			if(strcmp(entry_name, ".CHANGELOG") == 0) {
@@ -599,7 +540,7 @@ int SYMEXPORT alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp)
 	return(ret);
 }
 
-unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg)
+int SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
 
@@ -614,33 +555,49 @@ unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg)
 	return pkg->scriptlet;
 }
 
-/**
- * @brief Compute the packages requiring a given package.
- * @param pkg a package
- * @return the list of packages requiring pkg
- *
- * A depends on B through n depends <=> A listed in B's requiredby n times
- * n == 0 or 1 in almost all cases */
-alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg)
+static void find_requiredby(pmpkg_t *pkg, pmdb_t *db, alpm_list_t **reqs)
 {
-	const alpm_list_t *i, *j;
-	alpm_list_t *reqs = NULL;
-
-	pmdb_t *localdb = alpm_option_get_localdb();
-	for(i = _alpm_db_get_pkgcache(localdb); i; i = i->next) {
+	const alpm_list_t *i;
+	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
 		if(!i->data) {
 			continue;
 		}
 		pmpkg_t *cachepkg = i->data;
-		const char *cachepkgname = alpm_pkg_get_name(cachepkg);
+		if(_alpm_dep_edge(cachepkg, pkg)) {
+			const char *cachepkgname = cachepkg->name;
+			if(alpm_list_find_str(*reqs, cachepkgname) == 0) {
+				*reqs = alpm_list_add(*reqs, strdup(cachepkgname));
+			}
+		}
+	}
+}
 
-		for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) {
-			pmdepend_t *dep = j->data;
+/**
+ * @brief Compute the packages requiring a given package.
+ * @param pkg a package
+ * @return the list of packages requiring pkg
+ */
+alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg)
+{
+	const alpm_list_t *i;
+	alpm_list_t *reqs = NULL;
+	pmdb_t *db;
 
-			if(alpm_depcmp(pkg, dep)) {
-				_alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'\n",
-				          cachepkgname, pkg->name);
-				reqs = alpm_list_add(reqs, strdup(cachepkgname));
+	if(pkg->origin == PKG_FROM_FILE) {
+		/* The sane option; search locally for things that require this. */
+		db = alpm_option_get_localdb();
+		find_requiredby(pkg, db, &reqs);
+	} else {
+		/* We have a DB package. if it is a local package, then we should
+		 * only search the local DB; else search all known sync databases. */
+		db = pkg->origin_data.db;
+		if(db->is_local) {
+			find_requiredby(pkg, db, &reqs);
+		} else {
+			for(i = handle->dbs_sync; i; i = i->next) {
+				db = i->data;
+				find_requiredby(pkg, db, &reqs);
+				reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp);
 			}
 		}
 	}
@@ -649,106 +606,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg)
 
 /** @} */
 
-/* this function was taken from rpm 4.0.4 and rewritten */
-int _alpm_versioncmp(const char *a, const char *b)
-{
-	char str1[64], str2[64];
-	char *ptr1, *ptr2;
-	char *one, *two;
-	char *rel1 = NULL, *rel2 = NULL;
-	char oldch1, oldch2;
-	int is1num, is2num;
-	int rc;
-
-	ALPM_LOG_FUNC;
-
-	if(!strcmp(a,b)) {
-		return(0);
-	}
-
-	strncpy(str1, a, 64);
-	str1[63] = 0;
-	strncpy(str2, b, 64);
-	str2[63] = 0;
-
-	/* lose the release number */
-	for(one = str1; *one && *one != '-'; one++);
-	if(one) {
-		*one = '\0';
-		rel1 = ++one;
-	}
-	for(two = str2; *two && *two != '-'; two++);
-	if(two) {
-		*two = '\0';
-		rel2 = ++two;
-	}
-
-	one = str1;
-	two = str2;
-
-	while(*one || *two) {
-		while(*one && !isalnum((int)*one)) one++;
-		while(*two && !isalnum((int)*two)) two++;
-
-		ptr1 = one;
-		ptr2 = two;
-
-		/* find the next segment for each string */
-		if(isdigit((int)*ptr1)) {
-			is1num = 1;
-			while(*ptr1 && isdigit((int)*ptr1)) ptr1++;
-		} else {
-			is1num = 0;
-			while(*ptr1 && isalpha((int)*ptr1)) ptr1++;
-		}
-		if(isdigit((int)*ptr2)) {
-			is2num = 1;
-			while(*ptr2 && isdigit((int)*ptr2)) ptr2++;
-		} else {
-			is2num = 0;
-			while(*ptr2 && isalpha((int)*ptr2)) ptr2++;
-		}
-
-		oldch1 = *ptr1;
-		*ptr1 = '\0';
-		oldch2 = *ptr2;
-		*ptr2 = '\0';
-
-		/* see if we ran out of segments on one string */
-		if(one == ptr1 && two != ptr2) {
-			return(is2num ? -1 : 1);
-		}
-		if(one != ptr1 && two == ptr2) {
-			return(is1num ? 1 : -1);
-		}
-
-		/* see if we have a type mismatch (ie, one is alpha and one is digits) */
-		if(is1num && !is2num) return(1);
-		if(!is1num && is2num) return(-1);
-
-		if(is1num) while(*one == '0') one++;
-		if(is2num) while(*two == '0') two++;
-
-		rc = strverscmp(one, two);
-		if(rc) return(rc);
-
-		*ptr1 = oldch1;
-		*ptr2 = oldch2;
-		one = ptr1;
-		two = ptr2;
-	}
-
-	if((!*one) && (!*two)) {
-		/* compare release numbers */
-		if(rel1 && rel2 && strlen(rel1) && strlen(rel2)) return(_alpm_versioncmp(rel1, rel2));
-		return(0);
-	}
-
-	return(*one ? 1 : -1);
-}
-
-
-pmpkg_t *_alpm_pkg_new(const char *name, const char *version)
+pmpkg_t *_alpm_pkg_new(void)
 {
 	pmpkg_t* pkg;
 
@@ -756,47 +614,55 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version)
 
 	CALLOC(pkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
-	if(name && name[0] != 0) {
-		strncpy(pkg->name, name, PKG_NAME_LEN);
-	} else {
-		pkg->name[0] = '\0';
-	}
-	if(version && version[0] != 0) {
-		strncpy(pkg->version, version, PKG_VERSION_LEN);
-	} else {
-		pkg->version[0] = '\0';
-	}
-
 	return(pkg);
 }
 
 pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg)
 {
-	pmpkg_t* newpkg;
+	pmpkg_t *newpkg;
+	alpm_list_t *i;
 
 	ALPM_LOG_FUNC;
 
 	CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
-	memcpy(newpkg, pkg, sizeof(pmpkg_t));
-	newpkg->licenses   = alpm_list_strdup(alpm_pkg_get_licenses(pkg));
-	newpkg->conflicts  = alpm_list_strdup(alpm_pkg_get_conflicts(pkg));
-	newpkg->files      = alpm_list_strdup(alpm_pkg_get_files(pkg));
-	newpkg->backup     = alpm_list_strdup(alpm_pkg_get_backup(pkg));
-	newpkg->depends    = alpm_list_copy_data(alpm_pkg_get_depends(pkg),
-	                                         sizeof(pmdepend_t));
-	newpkg->optdepends = alpm_list_strdup(alpm_pkg_get_optdepends(pkg));
-	newpkg->groups     = alpm_list_strdup(alpm_pkg_get_groups(pkg));
-	newpkg->provides   = alpm_list_strdup(alpm_pkg_get_provides(pkg));
-	newpkg->replaces   = alpm_list_strdup(alpm_pkg_get_replaces(pkg));
-	newpkg->deltas     = alpm_list_copy_data(alpm_pkg_get_deltas(pkg),
-	                                         sizeof(pmdelta_t));
+	STRDUP(newpkg->filename, pkg->filename, RET_ERR(PM_ERR_MEMORY, newpkg));
+	STRDUP(newpkg->name, pkg->name, RET_ERR(PM_ERR_MEMORY, newpkg));
+	STRDUP(newpkg->version, pkg->version, RET_ERR(PM_ERR_MEMORY, newpkg));
+	STRDUP(newpkg->desc, pkg->desc, RET_ERR(PM_ERR_MEMORY, newpkg));
+	STRDUP(newpkg->url, pkg->url, RET_ERR(PM_ERR_MEMORY, newpkg));
+	newpkg->builddate = pkg->builddate;
+	newpkg->installdate = pkg->installdate;
+	STRDUP(newpkg->packager, pkg->packager, RET_ERR(PM_ERR_MEMORY, newpkg));
+	STRDUP(newpkg->md5sum, pkg->md5sum, RET_ERR(PM_ERR_MEMORY, newpkg));
+	STRDUP(newpkg->arch, pkg->arch, RET_ERR(PM_ERR_MEMORY, newpkg));
+	newpkg->size = pkg->size;
+	newpkg->isize = pkg->isize;
+	newpkg->scriptlet = pkg->scriptlet;
+	newpkg->force = pkg->force;
+	newpkg->reason = pkg->reason;
+
+	newpkg->licenses   = alpm_list_strdup(pkg->licenses);
+	newpkg->replaces   = alpm_list_strdup(pkg->replaces);
+	newpkg->groups     = alpm_list_strdup(pkg->groups);
+	newpkg->files      = alpm_list_strdup(pkg->files);
+	newpkg->backup     = alpm_list_strdup(pkg->backup);
+	for(i = pkg->depends; i; i = alpm_list_next(i)) {
+		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);
+	newpkg->deltas     = alpm_list_copy_data(pkg->deltas, sizeof(pmdelta_t));
+
 	/* internal */
+	newpkg->origin = pkg->origin;
 	if(newpkg->origin == PKG_FROM_FILE) {
 		newpkg->origin_data.file = strdup(pkg->origin_data.file);
 	} else {
 		newpkg->origin_data.db = pkg->origin_data.db;
 	}
+	newpkg->infolevel = pkg->infolevel;
 
 	return(newpkg);
 }
@@ -809,48 +675,69 @@ void _alpm_pkg_free(pmpkg_t *pkg)
 		return;
 	}
 
+	FREE(pkg->filename);
+	FREE(pkg->name);
+	FREE(pkg->version);
+	FREE(pkg->desc);
+	FREE(pkg->url);
+	FREE(pkg->packager);
+	FREE(pkg->md5sum);
+	FREE(pkg->arch);
 	FREELIST(pkg->licenses);
+	FREELIST(pkg->replaces);
+	FREELIST(pkg->groups);
 	FREELIST(pkg->files);
 	FREELIST(pkg->backup);
-	FREELIST(pkg->depends);
+	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->groups);
 	FREELIST(pkg->provides);
-	FREELIST(pkg->replaces);
-	FREELIST(pkg->deltas);
+	alpm_list_free_inner(pkg->deltas, (alpm_list_fn_free)_alpm_delta_free);
+	alpm_list_free(pkg->deltas);
+	alpm_list_free(pkg->delta_path);
+	alpm_list_free(pkg->removes);
+
 	if(pkg->origin == PKG_FROM_FILE) {
 		FREE(pkg->origin_data.file);
 	}
 	FREE(pkg);
 }
 
-/* Is pkgB an upgrade for pkgA ? */
-int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
+/* This function should be used when removing a target from upgrade/sync target list
+ * Case 1: If pkg is a loaded package file (PKG_FROM_FILE), it will be freed.
+ * Case 2: If pkg is a pkgcache entry (PKG_FROM_CACHE), it won't be freed,
+ *         only the transaction specific fields of pkg will be freed.
+ */
+void _alpm_pkg_free_trans(pmpkg_t *pkg)
+{
+	ALPM_LOG_FUNC;
+
+	if(pkg == NULL) {
+		return;
+	}
+
+	if(pkg->origin == PKG_FROM_FILE) {
+		_alpm_pkg_free(pkg);
+		return;
+	}
+
+	alpm_list_free(pkg->removes);
+	pkg->removes = NULL;
+}
+
+/* Is spkg an upgrade for locapkg? */
+int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg)
 {
 	int cmp = 0;
 
 	ALPM_LOG_FUNC;
 
-	if(pkg->origin == PKG_FROM_CACHE) {
-		/* ensure we have the /desc file, which contains the 'force' option */
-		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
-	}
+	cmp = alpm_pkg_vercmp(alpm_pkg_get_version(spkg),
+			alpm_pkg_get_version(localpkg));
 
-	/* compare versions and see if we need to upgrade */
-	cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg));
-
-	if(cmp != 0 && pkg->force) {
+	if(cmp < 0 && alpm_pkg_has_force(spkg)) {
 		cmp = 1;
-		_alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s\n"),
-							alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-	} else if(cmp < 0) {
-		/* local version is newer */
-		pmdb_t *db = pkg->origin_data.db;
-		_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
-							alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
-							alpm_db_get_name(db), alpm_pkg_get_version(pkg));
-		cmp = 0;
 	}
 
 	return(cmp);
@@ -860,269 +747,15 @@ int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
  */
 int _alpm_pkg_cmp(const void *p1, const void *p2)
 {
-	pmpkg_t *pk1 = (pmpkg_t *)p1;
-	pmpkg_t *pk2 = (pmpkg_t *)p2;
-
-	return(strcmp(alpm_pkg_get_name(pk1), alpm_pkg_get_name(pk2)));
-}
-
-/* Parses the package description file for the current package
- * TODO: this should ALL be in a backend interface (be_files), we should
- *       be dealing with the abstracted concepts only in this file
- * Returns: 0 on success, 1 on error
- *
- */
-static int parse_descfile(const char *descfile, pmpkg_t *info)
-{
-	FILE* fp = NULL;
-	char line[PATH_MAX];
-	char *ptr = NULL;
-	char *key = NULL;
-	int linenum = 0;
-
-	ALPM_LOG_FUNC;
-
-	if((fp = fopen(descfile, "r")) == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), descfile, strerror(errno));
-		return(-1);
-	}
-
-	while(!feof(fp)) {
-		fgets(line, PATH_MAX, fp);
-		linenum++;
-		_alpm_strtrim(line);
-		if(strlen(line) == 0 || line[0] == '#') {
-			continue;
-		}
-		ptr = line;
-		key = strsep(&ptr, "=");
-		if(key == NULL || ptr == NULL) {
-			_alpm_log(PM_LOG_DEBUG, "%s: syntax error in description file line %d\n",
-								info->name[0] != '\0' ? info->name : "error", linenum);
-		} else {
-			_alpm_strtrim(key);
-			_alpm_strtrim(ptr);
-			if(!strcmp(key, "pkgname")) {
-				strncpy(info->name, ptr, sizeof(info->name));
-			} else if(!strcmp(key, "pkgver")) {
-				strncpy(info->version, ptr, sizeof(info->version));
-			} else if(!strcmp(key, "pkgdesc")) {
-				strncpy(info->desc, ptr, sizeof(info->desc));
-			} else if(!strcmp(key, "group")) {
-				info->groups = alpm_list_add(info->groups, strdup(ptr));
-			} else if(!strcmp(key, "url")) {
-				strncpy(info->url, ptr, sizeof(info->url));
-			} else if(!strcmp(key, "license")) {
-				info->licenses = alpm_list_add(info->licenses, strdup(ptr));
-			} else if(!strcmp(key, "builddate")) {
-				char first = tolower(ptr[0]);
-				if(first > 'a' && first < 'z') {
-					struct tm tmp_tm = {0}; //initialize to null incase of failure
-					setlocale(LC_TIME, "C");
-					strptime(ptr, "%a %b %e %H:%M:%S %Y", &tmp_tm);
-					info->builddate = mktime(&tmp_tm);
-					setlocale(LC_TIME, "");
-				} else {
-					info->builddate = atol(ptr);
-				}
-			} else if(!strcmp(key, "packager")) {
-				strncpy(info->packager, ptr, sizeof(info->packager));
-			} else if(!strcmp(key, "arch")) {
-				strncpy(info->arch, ptr, sizeof(info->arch));
-			} else if(!strcmp(key, "size")) {
-				/* size in the raw package is uncompressed (installed) size */
-				info->isize = atol(ptr);
-			} else if(!strcmp(key, "depend")) {
-				pmdepend_t *dep = alpm_splitdep(ptr);
-				info->depends = alpm_list_add(info->depends, dep);
-			} else if(!strcmp(key, "optdepend")) {
-				info->optdepends = alpm_list_add(info->optdepends, strdup(ptr));
-			} else if(!strcmp(key, "conflict")) {
-				info->conflicts = alpm_list_add(info->conflicts, strdup(ptr));
-			} else if(!strcmp(key, "replaces")) {
-				info->replaces = alpm_list_add(info->replaces, strdup(ptr));
-			} else if(!strcmp(key, "provides")) {
-				info->provides = alpm_list_add(info->provides, strdup(ptr));
-			} else if(!strcmp(key, "backup")) {
-				info->backup = alpm_list_add(info->backup, strdup(ptr));
-			} else {
-				_alpm_log(PM_LOG_DEBUG, "%s: syntax error in description file line %d\n",
-									info->name[0] != '\0' ? info->name : "error", linenum);
-			}
-		}
-		line[0] = '\0';
-	}
-	fclose(fp);
-	unlink(descfile);
-
-	return(0);
-}
-
-
-/**
- * Load a package and create the corresponding pmpkg_t struct.
- * @param pkgfile path to the package file
- * @param full whether to stop the load after metadata is read or continue
- *             through the full archive
- * @return An information filled pmpkg_t struct
- */
-pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full)
-{
-	int ret = ARCHIVE_OK;
-	int config = 0;
-	struct archive *archive;
-	struct archive_entry *entry;
-	pmpkg_t *info = NULL;
-	char *descfile = NULL;
-	int fd = -1;
-	struct stat st;
-
-	ALPM_LOG_FUNC;
-
-	if(pkgfile == NULL || strlen(pkgfile) == 0) {
-		RET_ERR(PM_ERR_WRONG_ARGS, NULL);
-	}
-
-	if((archive = archive_read_new()) == NULL) {
-		RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL);
-	}
-
-	archive_read_support_compression_all(archive);
-	archive_read_support_format_all(archive);
-
-	if (archive_read_open_filename(archive, pkgfile,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		RET_ERR(PM_ERR_PKG_OPEN, NULL);
-	}
-
-	info = _alpm_pkg_new(NULL, NULL);
-	if(info == NULL) {
-		archive_read_finish(archive);
-		RET_ERR(PM_ERR_MEMORY, NULL);
-	}
-
-  if(stat(pkgfile, &st) == 0) {
-		info->size = st.st_size;
-	}
-
-	/* TODO there is no reason to make temp files to read
-	 * from a libarchive archive, it can be done by reading
-	 * directly from the archive
-	 * See: archive_read_data_into_buffer
-	 * requires changes 'parse_descfile' as well
-	 * */
-
-	/* If full is false, only read through the archive until we find our needed
-	 * metadata. If it is true, read through the entire archive, which serves
-	 * as a verfication of integrity and allows us to create the filelist. */
-	while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
-		const char *entry_name = archive_entry_pathname(entry);
-
-		/* NOTE: we used to look for .FILELIST, but it is easier (and safer) for
-		 * us to just generate this on our own. */
-		if(strcmp(entry_name, ".PKGINFO") == 0) {
-			/* extract this file into /tmp. it has info for us */
-			descfile = strdup("/tmp/alpm_XXXXXX");
-			fd = mkstemp(descfile);
-			if(archive_read_data_into_fd(archive, fd) != ARCHIVE_OK) {
-				_alpm_log(PM_LOG_ERROR, _("error extracting package description file to %s\n"),
-						descfile);
-				goto pkg_invalid;
-			}
-			/* parse the info file */
-			if(parse_descfile(descfile, info) == -1) {
-				_alpm_log(PM_LOG_ERROR, _("could not parse package description file in %s\n"),
-						pkgfile);
-				goto pkg_invalid;
-			}
-			if(!strlen(info->name)) {
-				_alpm_log(PM_LOG_ERROR, _("missing package name in %s\n"), pkgfile);
-				goto pkg_invalid;
-			}
-			if(!strlen(info->version)) {
-				_alpm_log(PM_LOG_ERROR, _("missing package version in %s\n"), pkgfile);
-				goto pkg_invalid;
-			}
-			config = 1;
-			unlink(descfile);
-			FREE(descfile);
-			close(fd);
-			continue;
-		} else if(strcmp(entry_name,  ".INSTALL") == 0) {
-			info->scriptlet = 1;
-		} else if(*entry_name == '.') {
-			/* for now, ignore all files starting with '.' that haven't
-			 * already been handled (for future possibilities) */
-		} else {
-			/* Keep track of all files for filelist generation */
-			info->files = alpm_list_add(info->files, strdup(entry_name));
-		}
-
-		if(archive_read_data_skip(archive)) {
-			_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
-					pkgfile, archive_error_string(archive));
-			pm_errno = PM_ERR_LIBARCHIVE_ERROR;
-			goto error;
-		}
-
-		/* if we are not doing a full read, see if we have all we need */
-		if(!full && config) {
-			break;
-		}
-	}
-
-	if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occured */
-		_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
-				pkgfile, archive_error_string(archive));
-		pm_errno = PM_ERR_LIBARCHIVE_ERROR;
-		goto error;
-	}
-
-	if(!config) {
-		_alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile);
-		goto pkg_invalid;
-	}
-
-  archive_read_finish(archive);
-
-	/* internal fields for package struct */
-	info->origin = PKG_FROM_FILE;
-	info->origin_data.file = strdup(pkgfile);
-
-	if(full) {
-		/* "checking for conflicts" requires a sorted list, so we ensure that here */
-		_alpm_log(PM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile);
-		info->files = alpm_list_msort(info->files, alpm_list_count(info->files),
-				_alpm_str_cmp);
-		info->infolevel = INFRQ_ALL;
-	} else {
-		/* get rid of any partial filelist we may have collected, as it is invalid */
-		FREELIST(info->files);
-		info->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_DEPENDS;
-	}
-
-	return(info);
-
-pkg_invalid:
-	pm_errno = PM_ERR_PKG_INVALID;
-	if(descfile) {
-		unlink(descfile);
-		FREE(descfile);
-	}
-	if(fd != -1) {
-		close(fd);
-	}
-error:
-	_alpm_pkg_free(info);
-	archive_read_finish(archive);
-
-	return(NULL);
+	pmpkg_t *pkg1 = (pmpkg_t *)p1;
+	pmpkg_t *pkg2 = (pmpkg_t *)p2;
+	return(strcmp(pkg1->name, pkg2->name));
 }
 
 /* Test for existence of a package in a alpm_list_t*
  * of pmpkg_t*
  */
-pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack)
+pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle)
 {
 	alpm_list_t *lp;
 
@@ -1135,7 +768,7 @@ pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack)
 	for(lp = haystack; lp; lp = lp->next) {
 		pmpkg_t *info = lp->data;
 
-		if(info && strcmp(alpm_pkg_get_name(info), needle) == 0) {
+		if(info && strcmp(info->name, needle) == 0) {
 			return(info);
 		}
 	}

lib/libalpm/package.h

@@ -1,7 +1,8 @@
 /*
  *  package.h
  *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
  *  Copyright (c) 2005, 2006 by Christian Hamar <krics@linuxforum.hu>
@@ -23,7 +24,8 @@
 #ifndef _ALPM_PACKAGE_H
 #define _ALPM_PACKAGE_H
 
-#include <time.h>
+#include <sys/types.h> /* off_t */
+#include <time.h> /* time_t */
 
 #include "alpm.h"
 #include "db.h"
@@ -33,34 +35,22 @@ typedef enum _pmpkgfrom_t {
 	PKG_FROM_FILE
 } pmpkgfrom_t;
 
-/* Packages */
-#define PKG_FILENAME_LEN 512
-#define PKG_NAME_LEN     256
-#define PKG_VERSION_LEN  64
-#define PKG_FULLNAME_LEN (PKG_NAME_LEN + PKG_VERSION_LEN)
-#define PKG_DESC_LEN     512
-#define PKG_URL_LEN      256
-#define PKG_DATE_LEN     32
-#define PKG_TYPE_LEN     32
-#define PKG_PACKAGER_LEN 64
-#define PKG_MD5SUM_LEN   33
-#define PKG_ARCH_LEN     32
-
 struct __pmpkg_t {
-	char filename[PKG_FILENAME_LEN];
-	char name[PKG_NAME_LEN];
-	char version[PKG_VERSION_LEN];
-	char desc[PKG_DESC_LEN];
-	char url[PKG_URL_LEN];
+	char *filename;
+	char *name;
+	char *version;
+	char *desc;
+	char *url;
 	time_t builddate;
 	time_t installdate;
-	char packager[PKG_PACKAGER_LEN];
-	char md5sum[PKG_MD5SUM_LEN];
-	char arch[PKG_ARCH_LEN];
-	unsigned long size;
-	unsigned long isize;
-	unsigned short scriptlet;
-	unsigned short force;
+	char *packager;
+	char *md5sum;
+	char *arch;
+	off_t size;
+	off_t isize;
+	off_t download_size;
+	int scriptlet;
+	int force;
 	pmpkgreason_t reason;
 	alpm_list_t *licenses;
 	alpm_list_t *replaces;
@@ -72,6 +62,8 @@ struct __pmpkg_t {
 	alpm_list_t *conflicts;
 	alpm_list_t *provides;
 	alpm_list_t *deltas;
+	alpm_list_t *delta_path;
+	alpm_list_t *removes; /* in transaction targets only */
 	/* internal */
 	pmpkgfrom_t origin;
 	/* Replaced 'void *data' with this union as follows:
@@ -85,14 +77,13 @@ struct __pmpkg_t {
 	pmdbinfrq_t infolevel;
 };
 
-int _alpm_versioncmp(const char *a, const char *b);
-pmpkg_t* _alpm_pkg_new(const char *name, const char *version);
+pmpkg_t* _alpm_pkg_new(void);
 pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg);
 void _alpm_pkg_free(pmpkg_t *pkg);
+void _alpm_pkg_free_trans(pmpkg_t *pkg);
 int _alpm_pkg_cmp(const void *p1, const void *p2);
 int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg);
-pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full);
-pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack);
+pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle);
 int _alpm_pkg_should_ignore(pmpkg_t *pkg);
 
 #endif /* _ALPM_PACKAGE_H */

lib/libalpm/po/LINGUAS

@@ -1,12 +1,20 @@
 # Set of available languages.
+ca
 cs
 de
+el
 en_GB
 es
 fr
 hu
 it
+kk
+nb
 pl
 pt_BR
+ro
 ru
+sv
+tr
+uk
 zh_CN

lib/libalpm/po/Makevars

@@ -15,7 +15,7 @@ XGETTEXT_OPTIONS = --no-location \
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
 # package.
-COPYRIGHT_HOLDER = Judd Vinet <jvinet@zeroflux.org>
+COPYRIGHT_HOLDER = Pacman Development Team <pacman-dev@archlinux.org>
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings.

lib/libalpm/po/POTFILES.in

@@ -1,23 +1,26 @@
 # List of source files with translatable strings
+# If a file is commented out, it is because it shouldn't have any
+# translatable strings
 
 lib/libalpm/add.c
 lib/libalpm/alpm.c
-lib/libalpm/alpm_list.c
+#lib/libalpm/alpm_list.c
 lib/libalpm/backup.c
 lib/libalpm/be_files.c
+lib/libalpm/be_package.c
 lib/libalpm/cache.c
 lib/libalpm/conflict.c
 lib/libalpm/db.c
 lib/libalpm/delta.c
 lib/libalpm/deps.c
+lib/libalpm/dload.c
 lib/libalpm/error.c
 lib/libalpm/group.c
 lib/libalpm/handle.c
 lib/libalpm/log.c
-lib/libalpm/md5.c
+#lib/libalpm/md5.c
 lib/libalpm/package.c
 lib/libalpm/remove.c
-lib/libalpm/server.c
 lib/libalpm/sync.c
 lib/libalpm/trans.c
 lib/libalpm/util.c

lib/libalpm/po/ca.po

@@ -0,0 +1,563 @@
+# Translation of libpalm.po to Catalan
+# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Manuel Tortosa <manutortosa@gmail.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-12 19:17+0200\n"
+"Last-Translator: Manuel Tortosa <manutortosa@gmail.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr ""
+"s'està reemplaçant l'antiga versió %s-%s per %s en la llista d'objectius\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"s'ometrà %s-%s perquè la versió més nova %s és en la llista d'objectius\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"els permisos del directori difereixen en %s\n"
+"sistema de fitxers: %o paquet: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "extracció: no se sobreescriurà el directori amb el fitxer %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extracció: l'enllaç simbòlic %s no apunta al directori\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "no es pot extreure %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "no es pot reanomenar %s a %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s desat com %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "no es pot instal·lar %s com %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s instal·lat com %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "s'està extraient %s com %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "no es pot obtenir el directori de treball actual\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "ha ocorregut un problema en actualitzar %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "ha ocorregut un problema en instal·lar %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "no s'ha pogut actualitzar l'entrada de la base de dades %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "no s'ha pogut afegir l'entrada '%s' en la memòria cau\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "s'està eliminant la base de dades invàlida: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "no s'ha pogut eliminar el directori de la base de dades %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "no s'ha pogut eliminar la base de dades %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "nom invàlid per l'entrada de la base de dades '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada de la base de dades duplicada '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "entrada de la base de dades corrupta '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "no es pot obrir el fitxer %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "la base de dades %s és inconsistent: nom erroni en el paquet %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "la base de dades %s és inconsistent: versió errònia en el paquet %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "no s'ha pogut crear el directori %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "no s'ha pogut analitzar el fitxers de descripció de paquet en %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "falta nom de paquet en %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "falta versió de paquet en %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "error en llegir paquet %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "falten les metadades del paquet en %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "no s'ha definit la ruta de la base de dades\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "intent de re-registre de la BD 'local'\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "s'ha detectat una dependència cíclica:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s serà eliminat després de la seva dependència %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s serà instal·lar abans de la seva dependència %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "s'està ignorant paquet %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "s'ha seleccionat un paquet proveïdor (%s proveeix %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "no es pot resoldre \"%s\", una dependència de \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disc"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' és invàlid\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "ha fallat en recuperar el fitxer '%s' des de %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "no es pot la reprendre la baixada de %s, s'està iniciant de nou\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "error en escriure al fitxer '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "ha fallat en recuperar el fitxer '%s' de %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s sembla estar truncat: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "ha fallat en baixar %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "memòria esgotada!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "error inesperat del sistema"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "privilegis insuficients"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "no es pot trobar o llegir fitxer"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "no es pot trobar o llegir directori"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "s'ha passat un argument erroni o NULL"
+
+#, c-format
+msgid "library not initialized"
+msgstr "llibreria no inicialitzada"
+
+#, c-format
+msgid "library already initialized"
+msgstr "la llibreria ja s'ha inicialitzat"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "no s'ha pogut bloquejar la base de dades"
+
+#, c-format
+msgid "could not open database"
+msgstr "no s'ha pogut obrir la base de dades"
+
+#, c-format
+msgid "could not create database"
+msgstr "no s'ha pogut crear la base de dades"
+
+#, c-format
+msgid "database not initialized"
+msgstr "base de dades no inicialitzada"
+
+#, c-format
+msgid "database already registered"
+msgstr "la base de dades ja s'ha registrat"
+
+#, c-format
+msgid "could not find database"
+msgstr "no s'ha pogut trobar la base de dades"
+
+#, c-format
+msgid "could not update database"
+msgstr "no s'ha pogut actualitzar la base de dades"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "no s'ha pogut suprimir l'entrada de la base de dades"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "url del servidor invàlid"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "no s'ha configurat cap servidor pel repositori"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "ja s'ha inicialitzat la transacció"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "no s'ha inicialitzat la transacció"
+
+#, c-format
+msgid "duplicate target"
+msgstr "objectiu duplicat"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "transacció no preparada"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "transacció cancel·lada"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "l'operació no és compatible amb el tipus de transacció"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr ""
+"intent de publicació de la transacció amb la base de dades no bloquejada"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "no s'ha pogut trobar o llegir el paquet"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operació cancel·lada degut a ignorepkg"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "paquet invàlid o corrupte"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "no s'ha pogut obrir el fitxer de paquet"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "no s'han pogut eliminar tots els fitxers del paquet"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "el nom de fitxer del paquet no és vàlid"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "l'arquitectura del paquet no és vàlida"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "no s'ha pogut trobar el repositori per l'objectiu"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "delta invàlid o corrupte"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "ha fallat el pedaç delta"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "no s'han pogut satisfer les dependències"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "dependències conflictives"
+
+#, c-format
+msgid "conflicting files"
+msgstr "fitxers conflictius"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "ha fallat en recuperar alguns fitxers"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "expressió regular invàlida"
+
+#, c-format
+msgid "libarchive error"
+msgstr "error de libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "error de la llibreria de baixades"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "error en invocar el baixador extern"
+
+#, c-format
+msgid "unexpected error"
+msgstr "error inesperat"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "no s'ha pogut trobar %s en la base de dades -- s'està ometent\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "s'està eliminant %s de la llista d'objectius\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "no s'ha pogut eliminar el fitxer '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "no s'ha pogut eliminar la entrada de la base de dades %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "no s'ha pogut eliminar l'entrada '%s' de la memòria cau\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: s'ha ignorat l'actualització del paquet (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: s'ha ignorat la desactualització del paquet (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: desactualitzant de la versió %s a la versió %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) és més nou que %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "s'està ignorant el reemplaçament del paquet (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "no s'ha pogut reemplaçar %s per %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s és al dia -- s'ignorarà\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s és al dia -- es reinstal·larà\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "desactualitzant paquet %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "s'ha detectat un paquet amb un conflicte impossible de resoldre\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr ""
+"s'està eliminant '%s' de la llista d'objectius perquè té conflictes amb "
+"'%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "ha fallat en recuperar alguns fitxers de %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "no s'ha pogut publicar la transacció d'eliminació\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "no s'ha pogut publicar la transacció\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "no s'ha pogut eliminar el fitxer de bloqueig %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "no s'ha pogut crear el directori temporal\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "no s'ha pogut copiar el fitxer temporal a %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "no s'ha pogut eliminar el directori temporal %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "no s'ha pogut canviar el directori a %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "no s'ha pogut bifurcar a un nou procés (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "no s'ha pogut canviar el directori arrel (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "no s'ha pogut canviar el directori a / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "ha fallat la crida a popen (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "ha fallat la crida a waitpid (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "l'ordre a fallat a executar-se correctament\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "no existeix memòria cau %s, s'està creant...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "no s'ha pogut crear la memòria cau del paquet, s'usarà /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "s'han trobat paquets conflictius en la llista d'objectius\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "no podeu instal·lar dos paquets amb conflictes alhora\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "no està implementat reemplaçar paquets amb -U\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "podeu reemplaçar paquets manualment usant -Rd i -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "no s'ha especificat l'esquema url, s'està assumint HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "no s'ha pogut escriure al fitxer '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no existeix aquest repositori"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "no s'ha trobat el repositori '%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "no s'ha pogut crear la transacció d'eliminació\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "no s'ha pogut crear la transacció\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "no s'ha pogut inicialitzar la transacció d'eliminació\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "no s'ha pogut inicialitzar la transacció\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "no s'ha pogut preparar la transacció d'eliminació\n"

lib/libalpm/po/cs.po

@@ -1,44 +1,29 @@
 # translation of cs.po to Čeština
-# Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: cs\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-02-12 09:28+0100\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-05 12:56+0200\n"
 "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
-"Language-Team: Čeština\n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "v seznamu cílů nahrazuji starší verzi %s-%s za %s\n"
+msgstr "v seznamu cílů nahrazena starší verze %s-%s za %s\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "v seznamu cílů je novější veze %s-%s -- přeskakuji\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nemůžete instalovat dva konfliktní balíčky společně\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "nahrazování balíčků pomocí -A a -U není nyní podporováno\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "balíčky můžete nahradit ručně použitím -Rd a -U\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "vynechává se %s-%s, protože v seznamu cílů je novější veze %s\n"
 
 #, c-format
 msgid ""
@@ -49,40 +34,36 @@ msgstr ""
 "souborový systém: %o  balíček: %o\n"
 
 #, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "rozbalení: symbolický odkaz %s neodkazuje na adresář\n"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "rozbalení: adresář nebyl přepsán souborem %s\n"
 
 #, c-format
-msgid "extract: not overwriting dir with file %s\n"
-msgstr "rozbalení: nepřepisuji adresář souborem %s\n"
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "rozbalení: symbolický odkaz %s neodkazuje na adresář\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nelze rozbalit %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "nelze přejmenovat %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "nelze přejmenovat %s na %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s uložen jako %s\n"
+msgstr "%s byl uložen jako %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "nelze nainstalovat %s jako %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "%s nelze nainstalovat jako %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
-msgstr "%s nainstalován jako %s\n"
+msgstr "%s byl nainstalován jako %s\n"
 
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "rozbaluji %s jako %s.pacnew\n"
+msgstr "%s byl rozbalen jako %s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
@@ -104,26 +85,78 @@ msgstr "nelze aktualizovat záznam databáze %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "nelze přidat položku '%s' do cache\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "odstraňuje se chybná databáze: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nelze otevřít %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nelze odstranit adresář databáze %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "nelze odstranit záznam v databázi %s\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "chybný název záznamu v databázi '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplicitní záznam v databázi '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "poškozený záznam v databázi '%s'\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nelze otevřít soubor %s: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "nelze odstranit záznam v databázi %s%s\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "databáze %s je nekonzistentní: nesouhlasí jméno balíčku %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "databáze %s je nekonzistentní: nesouhlasí verze balíčku %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "nelze změnit adresář %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "nelze zpracovat soubor s popisem balíčku v %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "chybí jméno balíčku v %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "chybí veze balíčku v %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "chyba při čtení balíčku %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "chybí metadata balíčku v %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "cesta k databázi není definována\n"
 
 #, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
 
-#, c-format
-msgid "database path is undefined\n"
-msgstr "cesta k databázi nebyla určena\n"
-
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "zjištěna cyklická závislost:\n"
@@ -136,9 +169,49 @@ msgstr "%s bude odstraněn po %s, na kterém závisí\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s bude nainstalován před %s, na kterém závisí\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignoruje se balíček %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "byl vybrán nahrazující balíček (%s poskytuje %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nemohu vyřešit \"%s\", závislost \"%s\"\n"
+msgstr "nelze vyřešit \"%s\", závislost \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' je chybná\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "selhalo získání souboru '%s' z %s: %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nelze navázat stahování %s, začíná se znovu\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "chyba při zápisu do souboru '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "selhalo získání souboru '%s' z %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s se zdá být zkrácen:  %jd/%jd bytů\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "selhalo stahování %s\n"
 
 #, c-format
 msgid "out of memory!"
@@ -154,11 +227,11 @@ msgstr "nedostatečná oprávnění"
 
 #, c-format
 msgid "could not find or read file"
-msgstr "nelze najít nebo číst soubor"
+msgstr "nelze nalézt nebo číst soubor"
 
 #, c-format
 msgid "could not find or read directory"
-msgstr "nelze najít nebo číst adresář"
+msgstr "nelze nalézt nebo číst adresář"
 
 #, c-format
 msgid "wrong or NULL argument passed"
@@ -206,11 +279,11 @@ msgstr "nelze odstranit záznam v databázi"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "nesprávná url pro server"
+msgstr "nesprávná URL pro server"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "nelze nastavit parametr"
+msgid "no servers configured for repository"
+msgstr "pro repositář nejsou nastaveny žádné servery"
 
 #, c-format
 msgid "transaction already initialized"
@@ -226,28 +299,28 @@ msgstr "duplicitní cíl"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr "transakce nepřipravena"
+msgstr "transakce není připravena"
 
 #, c-format
 msgid "transaction aborted"
-msgstr "transakce zrušena"
+msgstr "transakce byla zrušena"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operace není kompatibilní s typem transakce"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "nelze provést transakci"
-
-#, c-format
-msgid "could not download all files"
-msgstr "nelze stáhnout všechny soubory"
+msgid "transaction commit attempt when database is not locked"
+msgstr "pokus o uskutečnění transakce v době, kdy není uzamčena databáze"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "nelze nalézt nebo přečíst balíček"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operace byla zrušena kvůli ignorovanému balíčku"
+
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "neplatný nebo poškozený balíček"
@@ -256,46 +329,30 @@ msgstr "neplatný nebo poškozený balíček"
 msgid "cannot open package file"
 msgstr "nelze otevřít soubor balíčku"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "nelze načíst data z balíčku"
-
-#, c-format
-msgid "package already installed"
-msgstr "balíček je již nainstalován"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "balíček není nainstalovaný nebo má nižší verzi"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "nelze odstranit všechny soubory balíčku"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "jméno balíčku není platné"
+msgid "package filename is not valid"
+msgstr "jméno souboru balíčku není platné"
 
 #, c-format
-msgid "corrupted package"
-msgstr "poškozený balíček"
+msgid "package architecture is not valid"
+msgstr "architektura balíčku není platná"
 
 #, c-format
-msgid "no such repository"
-msgstr "není žádný takový repositář"
+msgid "could not find repository for target"
+msgstr "nelze nalézt repositář cíle"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "poškozený delta rozdíl"
+msgid "invalid or corrupted delta"
+msgstr "neplatný nebo poškozený delta rozdíl"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "aplikace delta rozdílu selhala"
 
-#, c-format
-msgid "group not found"
-msgstr "skupina nenalezena"
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "nelze vyřešit závislosti"
@@ -309,76 +366,36 @@ msgid "conflicting files"
 msgstr "konfliktní soubory"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "uživatel zrušil operaci"
-
-#, c-format
-msgid "internal error"
-msgstr "interní chyba"
-
-#, c-format
-msgid "libarchive error"
-msgstr "chyba knihovny libarchive"
-
-#, c-format
-msgid "not confirmed"
-msgstr "nepotvrzeno"
+msgid "failed to retrieve some files"
+msgstr "selhalo získání některých souborů"
 
 #, c-format
 msgid "invalid regular expression"
 msgstr "nesprávný regulární výraz"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "spojení se vzdáleným hostitelem selhalo"
+msgid "libarchive error"
+msgstr "chyba knihovny libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "chyba knihovny pro stahování souborů"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "chyba volání externího programu pro stahování souborů"
 
 #, c-format
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "nelze zjistit md5 kontrolní součet balíčku %s-%s\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "md5 kontrolní součet balíčku %s-%s nesouhlasí\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: vynucená aktualizace na verzi %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: lokální (%s) je novější než %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "nelze získat soubor s popisem balíčku k %s\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "nelze zpracovat soubor s popisem balíčku v %s\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "chybí jméno balíčku v %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "chybí veze balíčku v %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "chyba při čtení balíčku %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "chybí metadata balíčku v %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "nelze nalézt %s v databázi -- přeskakuji\n"
+msgstr "nelze nalézt %s v databázi -- vynechat\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "'%s' odstraněn ze seznamu cílů\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
@@ -392,126 +409,58 @@ msgstr "nelze odstranit záznam databáze %s-%s\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nelze odstranit položku '%s' z cache\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "url '%s' je chybná, ignoruji\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "schéma url nedefinováno, předpokládám http\n"
-
-#, c-format
-msgid "disk"
-msgstr "disk"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "selhalo získání souboru '%s' z %s: %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nelze navázat stahování, začínám znovu\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nelze zapisovat do souboru '%s'\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "chyba při stahování '%s': %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "chyba při zápisu do souboru '%s': %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "nelze změnit adresář na %s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "spouštím XferCommand: větvení selhalo!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "URL neobsahuje soubor pro stažení\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "selhalo stahování %s\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: ignoruji aktualizaci balíčku (bude nahrazen %s-%s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
+msgstr "%s: ignoruje se aktualizace balíčku (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositář '%s' nenalezen\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignoruje se ponížení verze balíčku (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: ponížení z verze %s na verzi %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokální verze (%s) je novější než v %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignoruje se náhrada balíčku (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "nelze nahradit soubor %s souborem %s\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s je aktuální -- přeskakuji\n"
+msgstr "%s-%s je aktuální -- vynechat\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s je aktuální -- přeinstalovávám\n"
+msgstr "%s-%s je aktuální -- přeinstalovat\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "ponížení verze balíčku %s (%s => %s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "selhala alokace paměti: nelze alokovat %zd bytů\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "příkaz: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "nelze získat md5 kontrolní součet pro soubor %s\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "soubor %s byl poškozen (nesouhlasí MD5 kontrolní součet)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "'%s' odstraněn ze seznamu cílů, protože je konfliktní s '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "selhalo stažení některých souborů z %s\n"
-
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nelze vytvořit transakci pro odstranění\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nelze inicializovat transakci pro odstranění\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nelze připravit transakci pro odstranění\n"
+msgstr "selhalo získání některých souborů z %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nelze provést transakci pro odstranění\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nelze vytvořit transakci\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nelze inicializovat transakci\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "nelze připravit transakci\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "nelze provést transakci\n"
@@ -520,14 +469,18 @@ msgstr "nelze provést transakci\n"
 msgid "could not remove lock file %s\n"
 msgstr "nelze odstranit zamykací soubor %s\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "V rodičovském prostředí chybí /bin/sh, ruším provádění skriptů\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "nelze vytvořit dočasný adresář\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "nelze odstranit dočasný adresář %s\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nelze změnit adresář na %s (%s)\n"
@@ -545,41 +498,105 @@ msgid "could not change directory to / (%s)\n"
 msgstr "nelze změnit adresář na / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "volání popen selhalo (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "volání popen selhalo (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "volání waitpid selhalo (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "správné spuštění skriptu selhalo\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "nelze odstranit dočasný adresář %s\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "selhalo vytvoření cesty '%s': %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nelze otevřít %s: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "příkaz se nepodařilo spustit správně\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "neexistuje cache %s, vytvářím...\n"
+msgstr "neexistuje cache %s, vytváří se...\n"
 
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nelze vytvořit cache balíčků, používám /tmp\n"
+msgstr "nelze vytvořit cache balíčků, používá se /tmp\n"
 
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: %s nemohl být otevřen\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
 
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: %s nemohl být přečten\n"
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "nelze instalovat dva konfliktní balíčky současně\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "nahrazování balíčků pomocí -U není nyní podporováno\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "balíčky lze nahradit ručně použitím -Rd a -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schéma URL nedefinováno, předpokládá se HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nelze zapisovat do souboru '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "takový repositář není nastaven"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositář '%s' nebyl nalezen\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nelze vytvořit transakci pro odstranění\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nelze vytvořit transakci\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nelze inicializovat transakci pro odstranění\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nelze inicializovat transakci\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nelze připravit transakci pro odstranění\n"
+
+#~ msgid "error downloading '%s': %s\n"
+#~ msgstr "chyba při stahování '%s': %s\n"
+
+#~ msgid "could not chdir to %s\n"
+#~ msgstr "nelze změnit adresář na %s\n"
+
+#~ msgid "running XferCommand: fork failed!\n"
+#~ msgstr "spouští se XferCommand: větvení selhalo!\n"
+
+#~ msgid "could not commit transaction"
+#~ msgstr "nelze provést transakci"
+
+#~ msgid "could not download all files"
+#~ msgstr "nelze stáhnout všechny soubory"
+
+#~ msgid "cannot load package data"
+#~ msgstr "nelze načíst data z balíčku"
+
+#~ msgid "package not installed or lesser version"
+#~ msgstr "balíček není nainstalovaný nebo má nižší verzi"
+
+#~ msgid "group not found"
+#~ msgstr "skupina nebyla nalezena"
+
+#~ msgid "user aborted the operation"
+#~ msgstr "uživatel zrušil operaci"
+
+#~ msgid "internal error"
+#~ msgstr "interní chyba"
+
+#~ msgid "not confirmed"
+#~ msgstr "nepotvrzeno"
+
+#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+#~ msgstr "%s-%s: ignoruje se aktualizace balíčku (měl být nahrazen %s-%s)\n"
+
+#~ msgid "command: %s\n"
+#~ msgstr "příkaz: %s\n"
+
+#~ msgid "could not prepare transaction\n"
+#~ msgstr "nelze připravit transakci\n"
+
+#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+#~ msgstr "V rodičovském prostředí chybí /bin/sh, ruší se provádění skriptů\n"

lib/libalpm/po/de.po

@@ -1,20 +1,21 @@
 # translation of de.po to German
 # German translations for Pacman package manager package.
-# Copyright (C) 2002-2008 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
 #
 # Marcus Habermehl <bmh1980@frugalware.org>, 2006.
 # Pierre Schmitz <pierre@archlinux.de>, 2007.
 # Niclas Pfeifer <macwolf@archlinux.de>, 2007.
-# Matthias Gorissen <matthias@archlinux.de>, 2008.
+# Matthias Gorissen <matthias@archlinux.de>, 2008-2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-02-15 09:26+0100\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-07 20:02+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,26 +27,9 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "Neuere Version %s-%s ist in der Ziel-Liste -- Überspringe\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
-"Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
-"installieren\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "Das Ersetzen von Paketen mit -A und -U wird noch nicht unterstützt\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "Sie können Pakete manuell mit -Rd und -U ersetzen\n"
+"Überspringe %s-%s, da sich die neuere Version %s in der Ziel-Liste befindet\n"
 
 #, c-format
 msgid ""
@@ -55,33 +39,29 @@ msgstr ""
 "Verzeichnis-Berechtigungen unterscheiden sich für %s\n"
 "Dateisystem: %o Paket: %o\n"
 
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "Entpacken: Symlink %s zeigt nicht zum Verzeichnis\n"
-
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "Entpacken: Überschreibe Verzeichnis nicht mit Datei %s\n"
 
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "Entpacken: Symlink %s zeigt nicht zum Verzeichnis\n"
+
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "Konnte %s nicht entpacken (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "Konnte %s nicht umbenennen (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "Konnte %s nicht in %s umbenennen (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gespeichert als %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "Konnte %s nicht als %s installieren: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "Konnte %s nicht als %s installieren (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -111,26 +91,82 @@ msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "Entferne die ungültige Datenbank: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "Konnte Datei %s nicht öffnen: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "Konnte Datenbank-Verzeichnis %s nicht entfernen\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "Konnte Datenbank %s nicht entfernen\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "Ungültiger Name für Datenbank-Eintrag '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "Doppelter Datenbank-Eintrag '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "Beschädigter Datenbank-Eintrag '%s'\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "Konnte Datenbank-Eintrag %s%s nicht entfernen\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr ""
+"Die Datenbank von %s ist inkonsistent: Die Paketnamen für %s stimmen nicht "
+"überein\n"
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr ""
+"Die Datenbank von %s ist inkonsistent: Die Versionsnummern für das Paket %s "
+"stimmen nicht überein\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "Konnte Verzeichnis %s nicht erstellen: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "Konnte Paket-Beschreibungsdatei in %s nicht analysieren\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "Fehlender Paketname in %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "Fehlende Paket-Version in %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "Fehler beim Lesen des Paketes %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "Fehlende Paket-Metadaten in %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
 msgstr "Datenbank-Pfad ist nicht definiert\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "Abhängigkeits-Zyklus entdeckt:\n"
@@ -143,10 +179,50 @@ msgstr "%s wird nach seiner Abhängigkeit %s entfernt werden\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s wird vor seiner Abhängigkeit %s installiert werden\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "Ignoriere Paket %s-%s)\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "Bereitstellendes Paket wurde ausgewählt (%s enthält %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "Kann \"%s\" nicht auflösen (eine Abhängigkeit von \"%s\")\n"
 
+#, c-format
+msgid "disk"
+msgstr "Platte"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' ist ungültig\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "Kann den Download von %s wieder aufnehmen, starte neu\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "Fehler beim Beschreiben von Datei '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "Konnte Datei '%s' nicht von %s übertragen\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s scheint verstümmelt zu sein: %jd/%jd Byte\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "Konnte %s nicht herunterladen\n"
+
 #, c-format
 msgid "out of memory!"
 msgstr "Speicher ist voll!"
@@ -216,8 +292,8 @@ msgid "invalid url for server"
 msgstr "Ungültige URL für den Server"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "Konnte Parameter nicht setzen"
+msgid "no servers configured for repository"
+msgstr "Es sind keine Server für dieses Repositorium definiert"
 
 #, c-format
 msgid "transaction already initialized"
@@ -244,17 +320,18 @@ msgid "operation not compatible with the transaction type"
 msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "Konnte den Vorgang nicht durchführen"
-
-#, c-format
-msgid "could not download all files"
-msgstr "Konnte nicht alle Dateien herunterladen"
+msgid "transaction commit attempt when database is not locked"
+msgstr ""
+"Vorgang sollte übertragen werden, während die Datenbank nicht geschlossen war"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "Konnte Paket nicht finden oder lesen"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "Vorgang abgebrochen auf Grund von IgnorePkg"
+
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "Ungültiges oder beschädigtes Paket"
@@ -263,46 +340,30 @@ msgstr "Ungültiges oder beschädigtes Paket"
 msgid "cannot open package file"
 msgstr "Kann Paketdatei nicht öffnen"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "Kann Paketdaten nicht laden"
-
-#, c-format
-msgid "package already installed"
-msgstr "Paket ist bereits installiert"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "Paket ist nicht installiert oder ältere Version"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "Konnte nicht alle Dateien des Paketes entfernen"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "Paketname ist nicht gültig"
+msgid "package filename is not valid"
+msgstr "Der Dateiname des Paketes ist nicht gültig"
 
 #, c-format
-msgid "corrupted package"
-msgstr "Beschädigtes Paket"
+msgid "package architecture is not valid"
+msgstr "Die Paket-Architektur ist ungültig"
 
 #, c-format
-msgid "no such repository"
-msgstr "Kein solches Repositorium"
+msgid "could not find repository for target"
+msgstr "Konnte kein Repositorium für das Ziel finden"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "Beschädigtes Delta"
+msgid "invalid or corrupted delta"
+msgstr "Ungültiges oder beschädigtes Delta"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "Delta-Patch versagte"
 
-#, c-format
-msgid "group not found"
-msgstr "Gruppe nicht gefunden"
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "Kann Abhängigkeiten nicht erfüllen"
@@ -316,77 +377,37 @@ msgid "conflicting files"
 msgstr "In Konflikt stehende Dateien"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "Benutzer brach die Aktion ab"
-
-#, c-format
-msgid "internal error"
-msgstr "Interner Fehler"
-
-#, c-format
-msgid "libarchive error"
-msgstr "libarchive-Fehler"
-
-#, c-format
-msgid "not confirmed"
-msgstr "Nicht bestätigt"
+msgid "failed to retrieve some files"
+msgstr "Konnte manche Dateien nicht übertragen"
 
 #, c-format
 msgid "invalid regular expression"
 msgstr "Ungültiger Regulärer Ausdruck"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "Verbindung zum Server fehlgeschlagen"
+msgid "libarchive error"
+msgstr "libarchive-Fehler"
+
+#, c-format
+msgid "download library error"
+msgstr "Fehler in der Bibliothek für Downloads"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "Fehler beim Aufruf eines externen Downloaders"
 
 #, c-format
 msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "Konnte MD5-Prüfsumme für Paket %s-%s nicht ermitteln\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "MD5-Prüfsummen für Paket %s-%s stimmen nicht überein\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "Fehler beim Entpacken der Paket-Beschreibungsdatei nach %s\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "Konnte Paket-Beschreibungsdatei in %s nicht analysieren\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "Fehlender Paketname in %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "Fehlende Paket-Version in %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "Fehler beim Lesen des Paketes %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "Fehlende Paket-Metadaten in %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n"
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "Entferne '%s' aus der Ziel-Liste\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "Kann Datei '%s' nicht entfernen: %s\n"
@@ -399,65 +420,29 @@ msgstr "Konnte Datenbank-Eintrag %s-%s nicht entfernen\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "URL '%s' ist ungültig, wird ignoriert\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "URL-Schema nicht spezifiziert, vermute http\n"
-
-#, c-format
-msgid "disk"
-msgstr "Platte"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "Kann den Download nicht wieder aufnehmen, starte neu\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "Kann Datei '%s' nicht beschreiben\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "Fehler beim Download von '%s': %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "Fehler beim Beschreiben von Datei '%s': %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "Konnte nicht zu Verzeichnis %s wechseln\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "Nutze XferCommand: Zweig versagte!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "Die URL enthält keine Datei zum Download\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "Konnte %s nicht herunterladen\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: Ignoriere zu aktualisierendes Paket (zu ersetzen durch %s-%s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "Repositorium '%s' nicht gefunden\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: Ignoriere Paket-Downgrade (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: Downgrade von Version %s zu Version %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "Ignoriere Paket-Ersetzung (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "Kann %s nicht durch %s ersetzen\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -465,60 +450,28 @@ msgstr "%s-%s ist aktuell -- Überspringe\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s ist aktuell -- Überspringe\n"
+msgstr "%s-%s ist aktuell -- Reinstalliere\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "Downgrade des Paketes %s (%s => %s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc-Fehler: Konnte %zd Bytes nicht zuweisen\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "Befehl: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "Kann MD5-Prüfsumme für Paket %s nicht ermitteln\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "Datei %s war beschädigt (falsche MD5-Prüfsumme)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "Entferne '%s' aus der Ziel-Liste, da es mit '%s' in Konflikt steht\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "Konnte manche Dateien von %s nicht übertragen\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht durchführen\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "Konnte den Vorgang nicht erstellen\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "Konnte den Vorgang nicht beginnen\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "Konnte den Vorgang nicht vorbereiten\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "Konnte den Vorgang nicht durchführen\n"
@@ -527,14 +480,18 @@ msgstr "Konnte den Vorgang nicht durchführen\n"
 msgid "could not remove lock file %s\n"
 msgstr "Konnte Sperrdatei %s nicht entfernen\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Kein /bin/sh im übergeordneten Verzeichnis, breche Skript ab\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "Konnte temporäres Verzeichnis nicht erstellen\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)\n"
@@ -552,28 +509,16 @@ msgid "could not change directory to / (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "Aufruf von 'popen' fehlgeschlagen (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "Aufruf von 'popen' fehlgeschlagen (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "Skript konnte nicht korrekt ausgeführt werden\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "Konnte Pfad '%s' nicht erstellen: %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "Konnte Datei %s nicht öffnen: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "Befehl konnte nicht korrekt ausgeführt werden\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -582,11 +527,3 @@ msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: %s kann nicht geöffnet werden\n"
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: %s kann nicht gelesen werden\n"

lib/libalpm/po/el.po

@@ -0,0 +1,563 @@
+# Greek translations for Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+#
+# Christos Nouskas <nous@archlinux.us>, 2009, 2010.
+# Χρήστος Νούσκας (Christos Nouskas) <nous@archlinux.us>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-09 23:02+0300\n"
+"Last-Translator: Χρήστος Νούσκας (Christos Nouskas) <nous@archlinux.us>\n"
+"Language-Team: Greek <>\n"
+"Language: Greek\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr ""
+"αντικατάσταση παλαιότερης έκδοσης %s-%s από %s στην λίστα διεκπεραίωσης\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"παράλειψη %s-%s καθώς υπάρχει νεότερη έκδοση %s στην λίστα διεκπεραίωσης\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"τα δικαιώματα καταλόγου διαφέρουν στο %s\n"
+"σύστημα αρχείων: %o  πακέτο: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "εξαγωγή: μη αντικατάσταση καταλόγου από αρχείο %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "εξαγωγή: ο συμβολικός δεσμός %s δεν δείχνει σε κατάλογο\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "αδυναμία εξαγωγής %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "αδυναμία μετονομασίας %s σε %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "αποθήκευση %s ως %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "αδυναμία εγκατάστασης %s ως %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "εγκατάσταση %s ως %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "εξαγωγή %s ως %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "αδυναμία χρήσης τρέχοντος καταλόγου\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "πρόβλημα κατά την αναβάθμιση του %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "πρόβλημα κατά την εγκατάσταση του %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "αδυναμία ενημέρωσης εγγραφής %s-%s στην βάση\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "αδυναμία προσθήκης εγγραφής '%s' στην κρύπτη\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "διαγραφή άκυρης βάσης: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "αδυναμία ανάγνωσης %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "αδυναμία διαγραφής καταλόγου βάσης %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "αδυναμία διαγραφής βάσης %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "άκυρο όνομα εγγραφής βάσης '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "διπλότυπη εγγραφή βάσης '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "κατεστραμμένη εγγραφή βάσης '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "αδυναμία ανάγνωσης αρχείου %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "ανακολουθία στην βάση %s: ασυμφωνία ονόματος πακέτου %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "ανακολουθία στην βάση %s: ασυμφωνία έκδοσης πακέτου %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "αδυναμία δημιουργίας καταλόγου %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "αδυναμία ανάλυσης αρχείου περιγραφής πακέτου στο %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "απόν όνομα πακέτου στο %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "απούσα έκδοση πακέτου στο %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "σφάλμα ανάγνωσης πακέτου %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "απόντα μετα-δεδομένα πακέτου στο %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "ακαθόριστη διαδρομή βάσης\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "προσπάθεια επανακαταχώρησης 'τοπικής' βάσης\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "εντοπισμός κυκλικής εξάρτησης:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "κατάργηση του %s μετά την εξάρτησή του %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "εγκατάσταση του %s πρίν από την εξάρτησή του %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "παράβλεψη πακέτου %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "επιλογή παρέχοντος πακέτου (το %s παρέχει το %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "αδυναμία εύρεσης του \"%s\", εξάρτησης του \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "δίσκο"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "άκυρη διεύθυνση '%s'\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "αποτυχία λήψης αρχείου '%s' από %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "συνέχιση λήψης %s αδύνατη, επανεκκίνηση\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "σφάλμα εγγραφής στο '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "αποτυχία λήψης αρχείου '%s' από %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "το %s δείχνει ημιτελές: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "αποτυχία λήψης %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "ανεπαρκής μνήμη!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "απροσδόκητο σφάλμα συστήματος"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "ανεπαρκή προνόμια"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "αδυναμία εύρεσης ή ανάγνωσης αρχείου"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "αδυναμία εύρεσης ή ανάγνωσης καταλόγου"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "εσφαλμένο ή NULL όρισμα"
+
+#, c-format
+msgid "library not initialized"
+msgstr "βιβλιοθήκη μη εκκινηθείσα"
+
+#, c-format
+msgid "library already initialized"
+msgstr "βιβλιοθήκη ήδη εκκινηθείσα"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "αδυναμία κλειδώματος βάσης"
+
+#, c-format
+msgid "could not open database"
+msgstr "αδυναμία ανάγνωσης βάσης"
+
+#, c-format
+msgid "could not create database"
+msgstr "αδυναμία δημιουργίας βάσης"
+
+#, c-format
+msgid "database not initialized"
+msgstr "βάση μη εκκινηθείσα"
+
+#, c-format
+msgid "database already registered"
+msgstr "βάση ήδη εκκινηθείσα"
+
+#, c-format
+msgid "could not find database"
+msgstr "αδυναμία εύρεσης βάσης"
+
+#, c-format
+msgid "could not update database"
+msgstr "αδυναμία ενημέρωσης βάσης"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "αδυναμία κατάργησης εγγραφής βάσης"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "άκυρη διεύθυνση διακομιστή"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "ακαθόριστοι διακομιστές αποθήκης"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "διεκπεραίωση ήδη εκκινηθείσα"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "διεκπεραίωση μη εκκινηθείσα"
+
+#, c-format
+msgid "duplicate target"
+msgstr "διπλότυπος στόχος"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "απροετοίμαστη διεκπεραίωση"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "ματαίωση διεκπεραίωσης"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "λειτουργία ασύμβατη με τον τύπο διεκπεραίωσης"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "προσπάθεια διεκπεραίωσης σε μη κλειδωμένη βάση"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "αδυναμία εύρεσης ή ανάγνωσης πακέτου"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "ακύρωση λειτουργίας λόγω ignorepkg"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "άκυρο ή κατεστραμμένο πακέτο"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "αδυναμία ανοίγματος πακέτου"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "αδυναμία διαγραφής όλων των αρχείων του πακέτου"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "μη έγκυρο όνομα πακέτου"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "μη έγκυρη αρχιτεκτονική πακέτου"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "αδυναμία εύρεσης αποθήκης για διεκπεραίωση"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "άκυρο ή κατεστραμμένο delta"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "αποτυχία μπάλωματος delta"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "αδυναμία επίλυσης εξαρτήσεων"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "διένεξη εξαρτήσεων"
+
+#, c-format
+msgid "conflicting files"
+msgstr "διένεξη αρχείων"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "αποτυχία λήψης κάποιων αρχείων"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "άκυρη κανονική έκφραση"
+
+#, c-format
+msgid "libarchive error"
+msgstr "σφάλμα libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "σφάλμα βιβλιοθήκης λήψης"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "σφάλμα κλήσης προγράμματος λήψης"
+
+#, c-format
+msgid "unexpected error"
+msgstr "απροσδόκητο σφάλμα"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "δεν βρέθηκε το %s στη βάση -- παράλειψη\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "αφαίρεση του %s από λίστα διεκπεραίωσης\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "αδυναμία διαγραφής αρχείου '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "αδυναμία διαγραφής εγγραφής βάσης %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "αδυναμία διαγραφής εγγραφής '%s' από κρύπτη\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: παράβλεψη αναβάθμισης πακέτου (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: παράβλεψη υποβάθμισης πακέτου (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: υποβάθμιση από έκδοση %s στην έκδοση %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: τοπικό (%s) νεότερο από του [%s] (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "παράβλεψη αντικαταστάτη πακέτου (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "αδυναμία αντικατάστασης του %s από το %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s ενημερωμένο -- παράλειψη\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s ενημερωμένο -- επανεγκατάσταση\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "υποβάθμιση πακέτου %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "εντοπισμός ανεπίλυτων διενέξεων πακέτων\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr ""
+"αφαίρεση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "αποτυχία λήψεως κάποιων αρχείων από %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "αδυναμία διεκπεραίωσης διαγραφής\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "αδυναμία διεκπεραίωσης\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "αδυναμία διαγραφής αρχείου κλειδώματος %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "αδυναμία δημιουργίας προσωρινού καταλόγου\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "αδυναμία αντιγραφής προσωρινού αρχείου στο %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "αδυναμία διαγραφής προσωρινού καταλόγου %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "αδυναμία μετάβασης στον κατάλογο %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "αποτυχία εκκίνησης νέας διεργασίας (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "αδυναμία αλλαγής ριζικού καταλόγου (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "αδυναμία αλλαγής καταλόγου σε / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "αποτυχία κλήσης popen (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "αποτυχία κλήσης waitpid (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "αποτυχία σωστής εκτέλεσης εντολής\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "δημιουργία κρύπτης %s...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "αδυναμία δημιουργίας κρύπτης πακέτων, χρήση /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "βρέθηκαν αντιτιθέμενα πακέτα στην λίστα διεκπεραίωσης\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "δεν επιτρέπεται η ταυτόχρονη εγκατάσταση δύο αντιτιθεμένων πακέτων\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "η αντικατάσταση πακέτων με όρισμα -U δεν υποστηρίζεται ακόμη\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "η αντικατάσταση πακέτων μπορεί να γίνει χειροκίνητα με -Rd and -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "ακαθόριστο πρωτόκολλο url, εικάζεται HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "αδυναμία εγγραφής στο '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "δεν υπάρχει τέτοια αποθήκη"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "δεν βρέθηκε αποθήκη'%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "αδυναμία διεκπεραίωσης κατάργησης\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "αδυναμία δημιουργίας διεκπεραίωσης\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "αδυναμία εκκίνησης κατάργησης\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "αδυναμία εκκίνησης διεκπεραίωσης\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "αδυναμία προετοιμασίας κατάργησης\n"

lib/libalpm/po/en_GB.po

@@ -1,16 +1,16 @@
 # English (British) translations for Pacman package manager package.
-# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the Pacman package manager package.
-# Jeff Bailes <thepizzaking@gmail.com>, 2007.
-#
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Jeff Bailes <thepizzaking@gmail.com>, 2007, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-01-16 10:40+1000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2009-10-04 17:08+0200\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,24 +21,8 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "replacing older version %s-%s by %s in target list\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "newer version %s-%s is in the target list -- skipping\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "conflicting packages were found in the target list\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "you cannot install two conflicting packages at the same time\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "replacing packages with -A and -U is not supported yet\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "you can replace packages manually using -Rd and -U\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "skipping %s-%s because newer version %s is in target list\n"
 
 #, c-format
 msgid ""
@@ -48,33 +32,29 @@ msgstr ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "extract: symlink %s does not point to dir\n"
-
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extract: not overwriting dir with file %s\n"
 
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extract: symlink %s does not point to dir\n"
+
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "could not extract %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "could not rename %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "could not copy tempfile to %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "could not rename %s to %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s saved as %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "could not install %s as %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "could not install %s as %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -104,26 +84,78 @@ msgstr "could not update database entry %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "could not add entry '%s' in cache\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "removing invalid database: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "could not open %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "could not remove database directory %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "could not remove database %s\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "invalid name for database entry '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplicated database entry '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "corrupted database entry '%s'\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "could not open file %s: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "could not remove database entry %s%s\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "%s database is inconsistent: name mismatch on package %s\n"
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "attempt to re-register the 'local' DB\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "%s database is inconsistent: version mismatch on package %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "could not create directory %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "could not parse package description file in %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "missing package name in %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "missing package version in %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "error while reading package %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "missing package metadata in %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
 msgstr "database path is undefined\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "attempt to re-register the 'local' DB\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dependency cycle detected:\n"
@@ -136,10 +168,50 @@ msgstr "%s will be removed after its %s dependency\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s will be installed before its %s dependency\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignoring package %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "provider package was selected (%s provides %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
 
+#, c-format
+msgid "disk"
+msgstr "disk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' is invalid\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "failed retrieving file '%s' from %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "resuming download of %s not possible; starting over\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "error writing to file '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "failed retrieving file '%s' from %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s appears to be truncated: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "failed to download %s\n"
+
 #, c-format
 msgid "out of memory!"
 msgstr "out of memory!"
@@ -209,8 +281,8 @@ msgid "invalid url for server"
 msgstr "invalid url for server"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "could not set parameter"
+msgid "no servers configured for repository"
+msgstr "no servers configured for repository"
 
 #, c-format
 msgid "transaction already initialized"
@@ -237,17 +309,17 @@ msgid "operation not compatible with the transaction type"
 msgstr "operation not compatible with the transaction type"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "could not commit transaction"
-
-#, c-format
-msgid "could not download all files"
-msgstr "could not download all files"
+msgid "transaction commit attempt when database is not locked"
+msgstr "transaction commit attempt when database is not locked"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "could not find or read package"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operation cancelled due to ignorepkg"
+
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "invalid or corrupted package"
@@ -256,46 +328,30 @@ msgstr "invalid or corrupted package"
 msgid "cannot open package file"
 msgstr "cannot open package file"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "cannot load package data"
-
-#, c-format
-msgid "package already installed"
-msgstr "package already installed"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "package not installed or lesser version"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "cannot remove all files for package"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "package name is not valid"
+msgid "package filename is not valid"
+msgstr "package filename is not valid"
 
 #, c-format
-msgid "corrupted package"
-msgstr "corrupted package"
+msgid "package architecture is not valid"
+msgstr "package architecture is not valid"
 
 #, c-format
-msgid "no such repository"
-msgstr "no such repository"
+msgid "could not find repository for target"
+msgstr "could not find repository for target"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "corrupted delta"
+msgid "invalid or corrupted delta"
+msgstr "invalid or corrupted delta"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "delta patch failed"
 
-#, c-format
-msgid "group not found"
-msgstr "group not found"
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "could not satisfy dependencies"
@@ -309,77 +365,37 @@ msgid "conflicting files"
 msgstr "conflicting files"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "user aborted the operation"
-
-#, c-format
-msgid "internal error"
-msgstr "internal error"
-
-#, c-format
-msgid "libarchive error"
-msgstr "libarchive error"
-
-#, c-format
-msgid "not confirmed"
-msgstr "not confirmed"
+msgid "failed to retrieve some files"
+msgstr "failed to retrieve some files"
 
 #, c-format
 msgid "invalid regular expression"
 msgstr "invalid regular expression"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "connection to remote host failed"
+msgid "libarchive error"
+msgstr "libarchive error"
+
+#, c-format
+msgid "download library error"
+msgstr "download library error"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "error invoking external downloader"
 
 #, c-format
 msgid "unexpected error"
 msgstr "unexpected error"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "could not get md5sum for package %s-%s\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "md5sums do not match for package %s-%s\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forcing upgrade to version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) is newer than %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "error extracting package description file to %s\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "could not parse package description file in %s\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "missing package name in %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "missing package version in %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "error while reading package %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "missing package metadata in %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "removing %s from target list\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "cannot remove file '%s': %s\n"
@@ -392,65 +408,29 @@ msgstr "could not remove database entry %s-%s\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "could not remove entry '%s' from cache\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "URL '%s' is invalid, ignoring\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "URL scheme not specified, assuming http\n"
-
-#, c-format
-msgid "disk"
-msgstr "disk"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "failed retrieving file '%s' from %s : %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "cannot resume download, starting over\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "cannot write to file '%s'\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "error downloading '%s': %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "error writing to file '%s': %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "could not chdir to %s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "running XferCommand: fork failed!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "URL does not contain a file for download\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "failed to download %s\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoring package upgrade (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "repository '%s' not found\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignoring package downgrade (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: downgrading from version %s to version %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) is newer than %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignoring package replacement (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "cannot replace %s by %s\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -460,58 +440,26 @@ msgstr "%s-%s is up to date -- skipping\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s is up to date -- reinstalling\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "downgrading package %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc failure: could not allocate %zd bytes\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "command: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "can't get md5 checksum for file %s\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "file %s was corrupted (bad MD5 checksum)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "removing '%s' from target list because it conflicts with '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "failed to retrieve some files from %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "could not create removal transaction\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "could not initialise the removal transaction\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "could not prepare removal transaction\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "could not commit removal transaction\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "could not create transaction\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "could not initialise transaction\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "could not prepare transaction\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "could not commit transaction\n"
@@ -520,14 +468,18 @@ msgstr "could not commit transaction\n"
 msgid "could not remove lock file %s\n"
 msgstr "could not remove lock file %s\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "No /bin/sh in parent environment, aborting scriptlet\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "could not create temp directory\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "could not copy tempfile to %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "could not remove tmpdir %s\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"
@@ -545,28 +497,16 @@ msgid "could not change directory to / (%s)\n"
 msgstr "could not change directory to / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "call to popen failed (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "scriptlet failed to execute correctly\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "could not remove tmpdir %s\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "failed to make path '%s' : %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "could not open %s: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "command failed to execute correctly\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -575,11 +515,3 @@ msgstr "no %s cache exists, creating...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: %s can't be opened\n"
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: %s can't be read\n"

lib/libalpm/po/es.po

@@ -1,48 +1,35 @@
-# translation of es.po to
-# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2008.
+# Juan Pablo González Tognarelli <jotapesan@gmail.com>, 2008, 2009.
+# Juan Pablo González Tognarelli <juan.gonzalez.tognarelli@gmail.com>, 2009.
+# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-01-16 16:04-0300\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-13 10:49-0400\n"
 "Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
-"Language-Team:  <es@li.org>\n"
+"Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: CHILE\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 "reemplazando la versión antigua  %s-%s por %s en la lista de objetivos\n"
 
+# , c-format
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
-"una nueva versión  %s-%s esta en la lista de objetivos list -- saltándola\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "paquetes con conflictos fueron encontrados en la lista\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"usted no puede instalar simultáneamente dos paquetes que poseen conflictos "
-"entre si\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "el reemplazo de paquetes con -A y -U aún no esta soportado\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
+"saltando %s-%s debido a la nueva versión de %s esta en la lista de "
+"objetivos\n"
 
 #, c-format
 msgid ""
@@ -52,33 +39,29 @@ msgstr ""
 "los permisos de directorio difieren en %s\n"
 "sistema de archivos: %o paquete: %o\n"
 
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "extract: el link simbólico %s no apunta al directorio\n"
-
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extract: no sobrescribiendo el dir. con el archivo %s\n"
 
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extract: el link simbólico %s no apunta al directorio\n"
+
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "no se pudo extraer %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "no se pudo renombrar %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "no se pudo copiar el archivo temporal a %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "no se pudo renombrar %s a %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s guardado como %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "no se pudo instalar %s como %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "no se pudo instalar %s como %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -108,45 +91,142 @@ msgstr "no se pudo actualizar en la base de datos la entrada %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "no se pudo agregar '%s' en la cache\n"
 
+# , c-format
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "quitando la base de datos inválida: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "no se pudo abrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "no se pudo quitar el directorio de la base de datos %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "no se pudo quitar la base de datos %s\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nombre invalido para la entrada de la base de datos '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada duplicada en la base de datos '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "entrada corrupta en la base de datos '%s'\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "no se pudo abrir el archivo %s: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "no se pudo quitar la entrada %s%s en la base de datos\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr ""
+"la base de datos %s es inconsistente: nombre mal emparejado en el paquete "
+"%s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr ""
+"la base de datos %s es inconsistente: versión mal emparejada en el paquete "
+"%s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "no se pudo crear el directorio %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "no se pudo interpretar el archivo de descripción en %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "falta el nombre de paquete en %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "falta la versión del paquete en %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "error mientras se leía el paquete %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "faltan los metadatos del paquete en %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "la ruta para la base de datos no está definida\n"
 
 #, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "intento para re-registrar la base de datos 'local'\n"
 
-#, c-format
-msgid "database path is undefined\n"
-msgstr "ruta para la base de datos no es definido\n"
-
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "ciclo de dependencias detectado:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%s será quitado tras su dependencia %s\n"
+msgstr "%s será quitado luego de su dependencia %s\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s será instalado antes de su dependencia %s\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignorando el paquete %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "El paquete proveedor fue seleccionado (%s provee %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "no se pudo resolver \"%s\", una dependencia para \"%s\"\n"
 
+#, c-format
+msgid "disk"
+msgstr "disco"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "la url %s no es válida\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "falló al obtener archivo '%s' desde %s: %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "no es posible continuar la descarga de %s; empezando de nuevo\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "no se pudo escribir al archivo '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "falló al obtener archivo '%s' desde %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s parece estar truncado: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "no se pudo descargar %s\n"
+
 #, c-format
 msgid "out of memory!"
-msgstr "no hay memoria!"
+msgstr "memoria insuficiente!"
 
 #, c-format
 msgid "unexpected system error"
@@ -166,15 +246,15 @@ msgstr "no se pudo leer el directorio"
 
 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr "argumento erroneo o NULO"
+msgstr "se pasó un argumento erróneo o NULO"
 
 #, c-format
 msgid "library not initialized"
-msgstr "librería no inicializada"
+msgstr "biblioteca no inicializada"
 
 #, c-format
 msgid "library already initialized"
-msgstr "la librería ya fue inicializada"
+msgstr "la biblioteca ya fue inicializada"
 
 #, c-format
 msgid "unable to lock database"
@@ -213,8 +293,8 @@ msgid "invalid url for server"
 msgstr "dirección inválida para el servidor"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "no se pudo fijar el parámetro"
+msgid "no servers configured for repository"
+msgstr "no hay servidores configurados para el repositorio"
 
 #, c-format
 msgid "transaction already initialized"
@@ -241,17 +321,18 @@ msgid "operation not compatible with the transaction type"
 msgstr "la operación no es compatible con el tipo de transacción"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "no se pudo hacer la transacción"
-
-#, c-format
-msgid "could not download all files"
-msgstr "no se pudo descargar todos los archivos"
+msgid "transaction commit attempt when database is not locked"
+msgstr ""
+"intento de envío de la transación cuando la base de datos no esta bloqueada"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "no se pudo encontrar o leer el paquete"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operación cancelada debido a ignorepkg"
+
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "paquete invalido o corrupto"
@@ -260,45 +341,29 @@ msgstr "paquete invalido o corrupto"
 msgid "cannot open package file"
 msgstr "no se pudo abrir el archivo de paquetes"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "no se pudo cargar la información del paquete"
-
-#, c-format
-msgid "package already installed"
-msgstr "el paquete ya está instalado"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "el paquete no está instalado o es una versión menor"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "no se pudo quitar todos los archivos del paquete"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "el nombre del paquete no es válido"
+msgid "package filename is not valid"
+msgstr "el nombre de archivo del paquete no es válido"
 
 #, c-format
-msgid "corrupted package"
-msgstr "paquete corrupto"
+msgid "package architecture is not valid"
+msgstr "no es válida la arquitectura del paquete"
 
 #, c-format
-msgid "no such repository"
-msgstr "no existe el repositorio"
+msgid "could not find repository for target"
+msgstr "no pudo encontrarse un repositorio para el objetivo"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "delta corrupto"
+msgid "invalid or corrupted delta"
+msgstr "invalido o diferencial corrupto"
 
 #, c-format
 msgid "delta patch failed"
-msgstr "parche delta fallado"
-
-#, c-format
-msgid "group not found"
-msgstr "grupo no encontrado"
+msgstr "parche diferencial fallado"
 
 #, c-format
 msgid "could not satisfy dependencies"
@@ -313,77 +378,38 @@ msgid "conflicting files"
 msgstr "archivos en conflicto"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "el usuario abortó la operación"
-
-#, c-format
-msgid "internal error"
-msgstr "error interno"
-
-#, c-format
-msgid "libarchive error"
-msgstr "error de libarchive"
-
-#, c-format
-msgid "not confirmed"
-msgstr "no confirmado"
+msgid "failed to retrieve some files"
+msgstr "falló al descargar algunos archivos"
 
 #, c-format
 msgid "invalid regular expression"
 msgstr "expresión regular inválida"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "falló la conexión con el host remoto"
+msgid "libarchive error"
+msgstr "error de libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "error de descarga de biblioteca"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "error invocando el descargador externo"
 
 #, c-format
 msgid "unexpected error"
 msgstr "error inesperado"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "no se pudo obtener la verificación md5 para %s-%s\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "la verificación md5 para el paquete %s-%s no concuerda\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: forzando la actualización a la versión %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "error descomprimiendo el paquete de descripción a %s\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "no se pudo interpretar el archivo de descripción en %s\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "nombre de paquete perdido en %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "versión de paquete perdida en %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "error mientras se leía el paquete %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "faltan los metadatos del paquete en %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "no se pudo encontrar %s en la base de datos -- saltando\n"
 
+# , c-format
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "quitando %s de la lista de objetivos\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "no se pudo quitar el archivo '%s': %s\n"
@@ -396,67 +422,29 @@ msgstr "no se pudo quitar de la base de datos %s-%s\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "no se pudo quitar la entrada '%s' de la cache\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "la url %s no es válida, ignorando\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "no fue especificado el esquema de url, asumiendo http\n"
-
-#, c-format
-msgid "disk"
-msgstr "disco"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "fallo al obtener archivo '%s' desde %s: %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "no se puede resumir la descarga, empezando de nuevo\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "no se pudo escribir al archivo '%s'\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "error descargando %s: %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "no se pudo escribir al archivo '%s': %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "no se pudo cambiar el directorio a %s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "ejecutando XferCommand: fallo en el fork\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "la URL no contiene un archivo para descargar\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "no se pudo descargar %s\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
-"%s-%s: ignorando la actualización del paquete (para ser reemplazado por %s-%"
-"s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando la actualización del paquete (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositorio '%s' no encontrado\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignorando la degradación del paquete (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: degradando desde la versión %s a la versión %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignorando el reemplazo del paquete (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "no se pudo reemplazar el archivo %s por %s\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -466,58 +454,28 @@ msgstr "%s-%s esta al día -- saltando\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s esta al día -- re-instalando\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "decrementando la versión del paquete %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "se han detectado paquetes con conflictos no resueltos\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "falla en malloc: no se pudo alocar %zd bytes\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "comando: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "no se pudo verificar md5 para el paquete %s\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "el archivo %s estaba corrupto (no coincidió la verificación MD5)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr ""
+"quitando '%s' de la lista de objetivos debido a que posee conflictos con "
+"'%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "fallo al descargar algunos archivos desde %s\n"
-
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "no se pudo crear la operación de eliminación\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "no se pudo iniciar la operación de eliminación\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "no se pudo preparar la operación de eliminación\n"
+msgstr "falló al descargar algunos archivos desde %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "no se pudo enviar la operación de eliminación\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "no se pudo crear la operación\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "no se pudo iniciar la operación\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "no se pudo preparar la transacción\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "no se pudo asignar la transacción\n"
@@ -526,14 +484,18 @@ msgstr "no se pudo asignar la transacción\n"
 msgid "could not remove lock file %s\n"
 msgstr "no se pudo eliminar el archivo de bloqueo %s\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "No existe /bin/sh en el ambiente padre, abortando los scripts\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "no se puede crear el directorio temporal\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "no se pudo copiar el archivo temporal a %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "no se pudo eliminar el directorio temporal %s\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "no se pudo cambiar el directorio a %s (%s)\n"
@@ -550,29 +512,18 @@ msgstr "no se pudo cambiar el directorio raíz (%s)\n"
 msgid "could not change directory to / (%s)\n"
 msgstr "no se pudo cambiar el directorio a / (%s)\n"
 
+# , c-format
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "llamada a popen fallida (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "falló la llamada a popen (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "llamada a waitpid fallida (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "scriplet falló en ejecutarse correctamente\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "no se pudo eliminar el directorio temporal %s\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "fallo al crear la ruta '%s' : %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "no se pudo abrir %s: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "el comando falló al ejecutarse\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -582,10 +533,44 @@ msgstr "no existe la cache %s, creando...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
 
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: no se puede abrir %s\n"
+# , c-format
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "se encontraron paquetes con conflictos en la lista de objetivos\n"
 
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: no se puede leer %s\n"
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "usted no puede instalar simultáneamente dos paquetes que poseen "
+#~ "conflictos entre si\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "reemplazar paquetes con -U aún no esta soportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "no fue especificado el esquema de url, asumiendo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "no se puede escribir en el archivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no existe el repositorio"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositorio '%s' no encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "no se pudo crear la operación de eliminación\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "no se pudo crear la operación\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "no se pudo iniciar la operación de eliminación\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "no se pudo iniciar la operación\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "no se pudo preparar la operación de eliminación\n"

lib/libalpm/po/fr.po

@@ -1,14 +1,15 @@
 # French translations for Pacman package manager package.
-# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.0.1\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2007-12-22 22:29+0100\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-06 20:26+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,27 +22,10 @@ msgstr ""
 "remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
-"une version plus récente %s-%s est dans la liste des cibles -- paquet "
-"ignoré\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "Des paquets en conflit ont été trouvés dans la liste des cibles\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "vous ne pouvez pas installer deux paquets en conflit en même temps\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "remplacer un paquet avec -A ou -U n'est pas encore possible\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-"vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
+"ignore le paquet %s-%s car une version plus récente %s est dans la liste des "
+"cibles\n"
 
 #, c-format
 msgid ""
@@ -51,33 +35,29 @@ msgstr ""
 "Les permissions pour le répertoire %s sont différentes\n"
 "système de fichier: %o paquet : %o\n"
 
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "extraction: le lien %s ne pointe pas vers un répertoire\n"
-
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extraction: n'écrase pas le répertoire par le fichier %s\n"
 
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extraction: le lien %s ne pointe pas vers un répertoire\n"
+
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "l'extraction de %s a échoué (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "renommer %s a échoué (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "la copie du fichier temporaire vers %s a échoué (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "impossible de renommer %s en %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s enregistré en tant que %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "l'installation de %s en tant que %s a échoué:  (%s)\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "l'installation de %s en tant que %s a échoué (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -108,26 +88,78 @@ msgstr "la mise à jour l'entrée de base de données %s-%s a échoué\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "suppression d'une base de données invalide: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "l'ouverture de %s: %s a échoué\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "la suppression de la base de données %s a échoué\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "la suppression de la base de données %s a échoué\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nom invalide pour l'entrée de base de données '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "l'entrée '%s' de la base de données est dupliquée\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "l'entrée '%s' de la base de données est corrompue\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "l'ouverture du fichier %s a échoué: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "la suppression de l'entrée de base de données %s%s a échoué\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "Le dépôt %s est inconsistant: noms différents pour le paquet %s\n"
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentative de ré-enregistrer la base de données locale\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "Le dépôt %s est inconsistant: versions différentes pour le paquet %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "la création du répertoire %s a échoué: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "l'analyse du fichier de description a échoué dans %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "nom de paquet manquant dans %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "version de paquet manquante dans %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "erreur lors de la lecture du paquet %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "méta-données du paquet manquantes dans %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
 msgstr "base de données non initialisée\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentative de ré-enregistrer la base de données locale\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "cycle de dépendances détecté:\n"
@@ -140,10 +172,50 @@ msgstr "%s sera supprimé après sa dépendance %s\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s sera installé avant sa dépendance %s\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignore le paquet %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "Une provision a été sélectionnée (%s fournit %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
 
+#, c-format
+msgid "disk"
+msgstr "disque"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' est invalide\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "le téléchargement de %s ne peut pas être continué, reprise au début\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "écriture dans le fichier '%s' impossible: %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "échec de récupération du fichier '%s' depuis %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s est apparemment tronqué: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "le fichier %s n'a pas pu être téléchargé\n"
+
 #, c-format
 msgid "out of memory!"
 msgstr "dépassement de mémoire!"
@@ -213,8 +285,8 @@ msgid "invalid url for server"
 msgstr "URL invalide pour le serveur"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "définir le paramètre a échoué"
+msgid "no servers configured for repository"
+msgstr "aucun serveur configuré pour le dépôt"
 
 #, c-format
 msgid "transaction already initialized"
@@ -241,16 +313,18 @@ msgid "operation not compatible with the transaction type"
 msgstr "opération incompatible avec le type de transaction"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "appliquer la transaction a échoué"
-
-#, c-format
-msgid "could not download all files"
-msgstr "tous les fichiers n'ont pas pu être téléchargés"
+msgid "transaction commit attempt when database is not locked"
+msgstr ""
+"tentative de réalisation d'une transaction alors que le dépôt n'est pas "
+"verrouillé"
 
 #, c-format
 msgid "could not find or read package"
-msgstr "trouver ou de lire le paquet a échoué"
+msgstr "impossible de trouver ou de lire le paquet"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "opération annulée à cause d'un paquet à ignorer (IgnorePkg)"
 
 #, c-format
 msgid "invalid or corrupted package"
@@ -260,46 +334,30 @@ msgstr "paquet invalide ou corrompu"
 msgid "cannot open package file"
 msgstr "ouverture du fichier paquet impossible"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "chargement des données du paquet impossible"
-
-#, c-format
-msgid "package already installed"
-msgstr "paquet déjà installé"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "paquet non installé ou version plus ancienne"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "suppression de certains fichiers du paquet impossible"
 
 #, c-format
-msgid "package name is not valid"
+msgid "package filename is not valid"
 msgstr "nom de paquet invalide"
 
 #, c-format
-msgid "corrupted package"
-msgstr "paquet corrompu"
+msgid "package architecture is not valid"
+msgstr "architecture invalide"
 
 #, c-format
-msgid "no such repository"
-msgstr "ce dépôt n'existe pas"
+msgid "could not find repository for target"
+msgstr "impossible de trouver le dépôt pour la cible"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "delta corrompu"
+msgid "invalid or corrupted delta"
+msgstr "delta invalide ou corrompu"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "l'application du delta a échoué"
 
-#, c-format
-msgid "group not found"
-msgstr "groupe non trouvé"
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "la satisfaction des dépendances a échoué"
@@ -313,77 +371,37 @@ msgid "conflicting files"
 msgstr "conflit de fichiers"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "opération annulée par l'utilisateur"
-
-#, c-format
-msgid "internal error"
-msgstr "erreur interne"
-
-#, c-format
-msgid "libarchive error"
-msgstr "erreur de libarchive"
-
-#, c-format
-msgid "not confirmed"
-msgstr "non confirmé"
+msgid "failed to retrieve some files"
+msgstr "échec de récupération de certains fichiers"
 
 #, c-format
 msgid "invalid regular expression"
 msgstr "expression régulière incorrecte"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "échec de connexion à l'hôte distant "
+msgid "libarchive error"
+msgstr "erreur de libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "erreur de la bibliothèque de téléchargement"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "erreur en invoquant le client externe de téléchargement"
 
 #, c-format
 msgid "unexpected error"
 msgstr "erreur non prévue"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "l'obtention du hache md5 pour le paquet %s-%s a échoué\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "les 'haches' md5 ne correspondent pas pour le paquet %s-%s\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: force la mise à jour à la version %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "l'extraction du fichier de description vers %s a échoué\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "l'analyse du fichier de description a échoué dans %s\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "nom de paquet manquant dans %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "version de paquet manquante dans %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "erreur lors de la lecture du paquet %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "méta-données du paquet manquantes dans %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "trouver %s dans la base de données a échoué -- ignoré\n"
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "supprime %s de la liste de cible\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "suppression du fichier '%s' impossible: %s\n"
@@ -396,65 +414,29 @@ msgstr "la suppression de l'entrée de base de données %s-%s a échoué\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "la suppression du cache de l'entrée '%s' a échoué\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "l'url '%s' est invalide, ignorée\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "Le protocole n'a pas été spécifié dans l'url, assume http\n"
-
-#, c-format
-msgid "disk"
-msgstr "disque"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "le téléchargement ne peut pas être repris, relance\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "écriture dans le fichier '%s' impossible\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "erreur lors du téléchargement de '%s': %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "écriture dans le fichier '%s' impossible: %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "changer de répertoire vers %s a échoué\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "lancement de XferCommand: le fork a échoué!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "l'URL ne contient pas un fichier à télécharger\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "le fichier %s n'a pas pu être téléchargé\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "dépôt '%s' non trouvé\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignore le retour à la version antérieure (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: retourne à la version antérieure (%s => %s)\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignore le remplacement du paquet (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "le remplacement de %s par %s est impossible\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -464,58 +446,26 @@ msgstr "%s-%s est à jour -- ignoré\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s est à jour -- réinstalle\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "retourne à la version antérieure du paquet %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "erreur malloc: n'a pas pu allouer %zd bytes\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "commande: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "ne peut obtenir le 'hach' md5 pour le paquet %s\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "l'archive %s était corrompue (mauvaise somme MD5)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "supprime '%s' de la liste de cible car il est en conflit avec '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "échec de récupération de certains fichiers depuis %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "la création de la transaction de suppression a échoué\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "l'initialisation de la transaction de suppression a échoué\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "la préparation de la transaction de suppression a échoué\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "appliquer la transaction de suppression a échoué\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "la création de la transaction a échoué\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "l'initialisation de la transaction a échoué\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "la préparation de la transaction a échoué\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "appliquer la transaction a échoué\n"
@@ -524,15 +474,18 @@ msgstr "appliquer la transaction a échoué\n"
 msgid "could not remove lock file %s\n"
 msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr ""
-"Pas de /bin/sh dans l'environnement parent, interruption du scriptlet\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "la création du répertoire temporaire a échoué\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "la copie du fichier temporaire vers %s a échoué (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "la suppression du répertoire temporaire %s a échoué\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "changer de répertoire vers %s a échoué (%s)\n"
@@ -550,28 +503,16 @@ msgid "could not change directory to / (%s)\n"
 msgstr "changer de répertoire vers / a échoué (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "l'appel de popen a échoué (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "call to waitpid failed (%s)\n"
+msgstr "l'appel de waitpid a échoué (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "le scriptlet n'a pas pu être exécuté correctement\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "la suppression du répertoire temporaire %s a échoué\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "échec de la création du chemin '%s' : %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "l'ouverture de %s: %s a échoué\n"
+msgid "command failed to execute correctly\n"
+msgstr "la commande n'a pas pu être exécutée correctement\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -580,11 +521,3 @@ msgstr "le cache %s n'existe pas, création...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: l'ouverture de %s a échoué\n"
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: la lecture de %s a échoué\n"

lib/libalpm/po/hu.po

@@ -1,16 +1,17 @@
 # Hungarian translations for libalpm package.
-# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the libalpm library.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
 # Miklos Vajna <vmiklos@frugalware.org>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hu\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2007-03-14 13:45+0100\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2009-10-04 17:08+0200\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team:  <hu@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,27 +20,11 @@ msgstr ""
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a cél listában\n"
+msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a célok listájában\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "újabb verzió (%s-%s) már megtalálható a cél listában -- kihagyás\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "ütköző csomagokat találtam a cél listában\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nem telepíthető két ütköző csomag egyszerre\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "csomagok lecserélése még nem támogatott -A és -U esetén\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "a -Rd és -U használatával elvégezhető a csere\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "%s-%s kihagyása, mert újabb verzió (%s) van a célok között\n"
 
 #, c-format
 msgid ""
@@ -49,33 +34,29 @@ msgstr ""
 "eltérő könyvtár-jogosultságok: %s\n"
 "fájlrendszer: %o  csomag: %o\n"
 
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "kicsomagolás: %s szimbolikus link nem könyvtárra mutat\n"
-
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "kicsomagolás: nem írok felül könyvtárat a %s fájllal\n"
 
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "kicsomagolás: %s szimbolikus link nem könyvtárra mutat\n"
+
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nem sikerült kicsomagolni: %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "nem sikerült átnevezni: %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "nem sikerült az ideiglenes fájlt ide másolni: %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "nem sikerült az átnevezés: %s -> %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s elmentve %s néven\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "nem sikerült %s telepítése %s néven: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "nem sikerült %s telepítése %s néven (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -105,26 +86,78 @@ msgstr "nem sikerült a(z) %s-%s adatbázisbejegyzés frissítése\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "hibás adatbázis eltávolítása: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nem sikerült eltávolítani a(z) %s adatbázis-könyvtárat\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "sikertelen a(z) %s adatbázis eltávolítása\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "érvénytelen név a '%s' adatbázis-bejegyzés számára\n"
+msgstr "hibás név a '%s' adatbázis-bejegyzés számára\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplikált adatbázis-bejegyzés: '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "sérült adatbázis-bejegyzés: '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "sikertelen a %s%s adatbázis-bejegyzés eltávolítása\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "a(z) %s adatbázis inkonzisztens: eltérő nevek a(z) %s csomagnál\n"
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "a(z) %s adatbázis inkonzisztens: eltérő verziók a(z) %s csomagnál\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "nem sikerült létrehozni a %s könyvtárat: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "nem sikerült értelmezni a(z) %s csomagleíró fájlját\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "hiányzó csomagnév itt: %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "hiányzó csomagverzió itt: %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "hiba a(z) %s csomag olvasása közben: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "hiányzó csomaginformációs fájl itt: %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
 msgstr "az adatbázis-útvonal nincs megadva\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "körkörös függőséget észleltem:\n"
@@ -137,9 +170,49 @@ msgstr "a(z) %s csomag saját %s függősége után lesz eltávolítva\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "%s-%s csomag kihagyása\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "közvetett csomagválasztás (%s szolgáltatja %s-t)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n"
+msgstr "nem sikerült a(z) \"%2$s\" csomag \"%1$s\" függőségét feloldani\n"
+
+#, c-format
+msgid "disk"
+msgstr "diszk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "a '%s' URL hibás\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nem tudom folytatni a(z) %s letöltését; újrakezdem\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "hiba a(z) '%s' fájl írása során: %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "úgy tűnik, hogy %s csonka: %jd/%jd bájt\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "nem sikerült a(z) %s letöltése\n"
 
 #, c-format
 msgid "out of memory!"
@@ -207,11 +280,11 @@ msgstr "nem sikerült eltávolítani az adatbázis-bejegyzést"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "érvénytelen szerver-URL"
+msgstr "hibás szerver-URL"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "nem sikerült beállítani a paramétert"
+msgid "no servers configured for repository"
+msgstr "a repóhoz nincs szerver beállítva"
 
 #, c-format
 msgid "transaction already initialized"
@@ -238,65 +311,49 @@ msgid "operation not compatible with the transaction type"
 msgstr "a művelet nem egyeztethető össze a jelenlegi tranzakciótípussal"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "nem sikerült végrahajtani a tranzakciót"
-
-#, c-format
-msgid "could not download all files"
-msgstr "nem sikerült letölteni az összes fájlt"
+msgid "transaction commit attempt when database is not locked"
+msgstr "tranzakció végrehajtási kísérlet nem zárolt adatbázis mellett"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "nem található vagy nem olvasható a csomag"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "művelet megszakítva ignorepkg miatt"
+
 #, c-format
 msgid "invalid or corrupted package"
-msgstr "nem érvényes vagy sérült csomag"
+msgstr "hibás vagy sérült csomag"
 
 #, c-format
 msgid "cannot open package file"
 msgstr "nem sikerült megnyitni a csomagfájlt"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "nem sikerült betölteni a csomagadatokat"
-
-#, c-format
-msgid "package already installed"
-msgstr "a csomag már telepítve van"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "a csomag nincs telepítve vagy kisebb verziójú"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "nem sikerült eltávolítani a csomag összes fájlját"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "nem érvényes a csomagnév"
+msgid "package filename is not valid"
+msgstr "érvénytelen csomagnév"
 
 #, c-format
-msgid "corrupted package"
-msgstr "sérült csomag"
+msgid "package architecture is not valid"
+msgstr "érvénytelen csomag-architektúra"
 
 #, c-format
-msgid "no such repository"
-msgstr "nincs ilyen repó"
+msgid "could not find repository for target"
+msgstr "nem található repó a célcsomaghoz"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "sérült delta"
+msgid "invalid or corrupted delta"
+msgstr "hibás vagy sérült delta"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "delta patchelés sikertelen"
 
-#, c-format
-msgid "group not found"
-msgstr "a csoport nem található"
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "nem sikerült kielégíteni a függőségeket"
@@ -310,77 +367,37 @@ msgid "conflicting files"
 msgstr "ütköző fájlok"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "felhasználói megszakítás"
+msgid "failed to retrieve some files"
+msgstr "nem sikerült néhány fájlt letölteni"
 
 #, c-format
-msgid "internal error"
-msgstr "belső hiba"
+msgid "invalid regular expression"
+msgstr "hibás reguláris kifejezés"
 
 #, c-format
 msgid "libarchive error"
 msgstr "libarchive hiba"
 
 #, c-format
-msgid "not confirmed"
-msgstr "nem megerősített"
+msgid "download library error"
+msgstr "letöltőkönyvtár hiba"
 
 #, c-format
-msgid "invalid regular expression"
-msgstr "érvénytelen reguláris kifejezés"
-
-#, c-format
-msgid "connection to remote host failed"
-msgstr "nem sikerült csatlakozni a távoli géphez"
+msgid "error invoking external downloader"
+msgstr "hiba a külső letöltő meghívásakor"
 
 #, c-format
 msgid "unexpected error"
 msgstr "nemvárt hiba"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "nem sikerült meghatározni a(z) %s-%s csomag md5 ellenőrző összegét\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "a(z) %s-%s csomag md5 ellenőrző összegei nem egyeznek meg\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: erőltetett frissítés a %s verzióra\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "nem sikerült kicsomagolni a csomagleíró fájlt %s-ként\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "nem sikerült értelmezni a(z) %s csomagleíró fájlját\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "hiányzó csomagnév itt: %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "hiányzó csomagverzió itt: %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "hiba a(z) %s csomag olvasása közben: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "hiányzó csomaginformációs fájl itt: %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "%s eltávolítása a cél listából\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nem sikerült eltávolítani a '%s' fájlt : %s\n"
@@ -393,65 +410,29 @@ msgstr "nem sikerült eltávolítani a(z) %s-%s adatbázis-bejegyzést\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nem sikerült eltávolítani a(z) '%s' bejegyzést a gyorsítótárból\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "a '%s' URL érvénytelen, figyelmen kívül hagyom\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "az URL séma nem definiált, http feltételezése\n"
-
-#, c-format
-msgid "disk"
-msgstr "diszk"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nem tudom folytatni a letöltést, újrakezdem\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nem sikerült a(z) '%s' fájlba írni\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "hiba '%s' letöltése közben: %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "hiba a(z) '%s' fájl írása során: %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "nem sikerült a könyvtárváltás ide: %s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "XferCommand futtatása: sikertelen fork!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "az URL nem tartalmaz letöltendő fájlt\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "nem sikerült a(z) %s letöltése\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: csomagfrissítés kihagyása (a(z) %s-%s le fogja cserélni)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "a(z) '%s' repó nem található\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: csomag downgrade kihagyása (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: visszatérés a %s verióról a régebbi %s verzióhoz\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "csomag-lecserélés kihagyása (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "nem lehet lecserélni a(z) %s csomagot a(z) %s csomaggal\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -461,58 +442,26 @@ msgstr "a(z) %s-%s naprakész -- kihagyás\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "a(z) %s-%s naprakész -- újratelepítés\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "feloldhatatlan csomagütközéseket találtam\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc hiba: nem sikerült lefoglalni %zd byte-ot\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "parancs: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "nem sikerült meghatározni a(z) %s fájl md5 ellenőrző összegét\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "a(z) %s fájl sérült volt (rossz MD5 összeg)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "'%s' kihagyása, mert ütközik a következővel: '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "nem sikerült néhány fájlt letölteni innen: %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nem sikerült létrehozni az eltávolító tranzakciót\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nem sikerült inicializálni az eltávolító tranzakciót\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nem sikerült előkészíteni az eltávolító tranzakciót\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nem sikerült végrehajtani az eltávolító tranzakciót\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nem sikerült létrehozni a tranzakciót\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nem sikerült inicializálni a tranzakciót\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "nem sikerült előkészíteni a tranzakciót\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "nem sikerült végrehajtani a tranzakciót\n"
@@ -521,14 +470,18 @@ msgstr "nem sikerült végrehajtani a tranzakciót\n"
 msgid "could not remove lock file %s\n"
 msgstr "nem sikerült a zároló fájl (%s) eltávolítása\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Nincs /bin/sh a szülő környezetben, szkript megszakítása\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "nem sikerült létrehozni az ideiglenes könyvtárat\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "nem sikerült az ideiglenes fájlt ide másolni: %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nem sikerült a könyvtárváltás ide: %s (%s)\n"
@@ -546,28 +499,16 @@ msgid "could not change directory to / (%s)\n"
 msgstr "nem sikerült a könyvtárat a /-re váltani (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "popen hívás sikertelen (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "popen hívás sikertelen (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "waitpid hívás sikertelen (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "a szkript hibásan futott\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "nem sikerült a '%s' útvonal létrehozása: %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "a parancs nem futott le sikeresen\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -576,11 +517,3 @@ msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n"
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: nem sikerült megnyitni a következőt: %s\n"
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: nem sikerült olvasni a következőt: %s\n"

lib/libalpm/po/it.po

@@ -1,46 +1,33 @@
 # Italian translation of libalpm.
-# Copyright (C) 2007 THE libalpm'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the libalpm package.
-# Giovanni 'voidnull' Scafora <linuxmania@gmail.com>, 2007.
-# Alessio 'mOLOk' Bolognino <themolok@gmail.com>, 2007.
-# Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>, 2007.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Giovanni 'voidnull' Scafora <giovanni@archlinux.org>, 2007, 2008, 2009, 2010
+# Andrea 'bash' Scarpino <bash.lnx@gmail.com>, 2008
+# Alessio 'mOLOk' Bolognino <themolok@gmail.com>, 2007
+# Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libalpm VERSION\n"
+"Project-Id-Version: Pacman package manager 3.4.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2007-12-18 23:30+0100\n"
-"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
-"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-05 18:00+0200\n"
+"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
+"Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=(n != 1);\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "la versione di %s-%s è più recente e sarà ignorata\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "sono stati individuati dei pacchetti che vanno in conflitto\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "impossibile installare due pacchetti che vanno in conflitto\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "la sostituzione dei pacchetti con -A e -U non è ancora supportata\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
-"è possibile sostituire manualmente i pacchetti, usando le opzioni -Rd e -U\n"
+"ignoro %s-%s perché la nuova versione %s è presente nella lista dei "
+"pacchetti\n"
 
 #, c-format
 msgid ""
@@ -51,32 +38,28 @@ msgstr ""
 "filesystem: %o pacchetto: %o\n"
 
 #, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "estrazione: il link simbolico %s non punta alla directory\n"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "estrazione: non posso sovrascrivere la directory con il file %s\n"
 
 #, c-format
-msgid "extract: not overwriting dir with file %s\n"
-msgstr "estrazione: non sovrascrivere la directory con il file %s\n"
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "estrazione: il link simbolico %s non punta alla directory\n"
 
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "impossibile estrarre %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "impossibile rinominare %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "impossibile rinominare %s in %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s salvato come %s\n"
+msgstr "%s è stato salvato come %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "impossibile installare %s come %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "impossibile installare %s come %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -88,7 +71,7 @@ msgstr "estrazione di %s come %s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr "impossibile ottenere la directory corrente\n"
+msgstr "impossibile determinare la directory corrente\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -106,25 +89,80 @@ msgstr "impossibile aggiornare la voce %s-%s nel database\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "impossible includere la voce '%s' nella cache\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "rimozione del database: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "impossibile aprire %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "impossibile rimuovere la directory %s del database\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "impossibile rimuovere il database %s\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome non valido per la voce del database '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "la voce nel database '%s' è duplicata\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "la voce nel database '%s' è corrotta\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "impossibile aprire il file %s: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "impossibile rimuovere la voce %s%s dal database\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr ""
+"il database %s è inconsistente: il nome del pacchetto %s non corrisponde\n"
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentativo in corso di registrare di nuovo il database 'locale'\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr ""
+"il database %s è inconsistente: la versione del pacchetto %s non "
+"corrisponde\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "impossibile creare la directory %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "impossibile analizzare il file di descrizione del pacchetto in %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "manca il nome del pacchetto in %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "manca la versione del pacchetto in %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "manca il metadata del pacchetto in %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
-msgstr "il percorso del database non è definito\n"
+msgstr "il percorso del database non è stato definito\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentativo in corso di registrare di nuovo il DB 'locale'\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
@@ -138,10 +176,50 @@ msgstr "%s sarà rimosso dopo la sua dipendenza %s\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s sarà installato prima della sua dipendenza %s\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "sto ignorando il pacchetto %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "il pacchetto è già stato selezionato (%s dipende da %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
 
+#, c-format
+msgid "disk"
+msgstr "disco"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' non è esatto\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "impossibile scaricare il pacchetto '%s' da %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "impossibile riprendere il download di %s\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "si è verificato un errore durante la scrittura nel file '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "impossibile scaricare il pacchetto '%s' da %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s sembra essere incompleto: %jd/%jd byte\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "impossibile scaricare %s\n"
+
 #, c-format
 msgid "out of memory!"
 msgstr "memoria insufficiente!"
@@ -168,11 +246,11 @@ msgstr "è stato passato un argomento sbagliato o NULL"
 
 #, c-format
 msgid "library not initialized"
-msgstr "libreria non inizializzata"
+msgstr "la libreria non è stata inizializzata"
 
 #, c-format
 msgid "library already initialized"
-msgstr "libreria già inizializzata"
+msgstr "la libreria è già stata inizializzata"
 
 #, c-format
 msgid "unable to lock database"
@@ -188,11 +266,11 @@ msgstr "impossibile creare il database"
 
 #, c-format
 msgid "database not initialized"
-msgstr "database non inizializzato"
+msgstr "il database non è stato inizializzato"
 
 #, c-format
 msgid "database already registered"
-msgstr "il database è già registrato"
+msgstr "il database è già stato registrato"
 
 #, c-format
 msgid "could not find database"
@@ -211,93 +289,77 @@ msgid "invalid url for server"
 msgstr "url non valido per il server"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "impossibile impostare il parametro"
+msgid "no servers configured for repository"
+msgstr "nessun server è stato configurato per il repository"
 
 #, c-format
 msgid "transaction already initialized"
-msgstr "operazione già inizializzata"
+msgstr "l'operazione è già stata inizializzata"
 
 #, c-format
 msgid "transaction not initialized"
-msgstr "operazione non inizializzata"
+msgstr "l'operazione non è stata inizializzata"
 
 #, c-format
 msgid "duplicate target"
-msgstr "pacchetto doppio"
+msgstr "pacchetto duplicato"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr "operazione non preparata"
+msgstr "l'operazione non è stata preparata"
 
 #, c-format
 msgid "transaction aborted"
-msgstr "operazione annullata"
+msgstr "l'operazione è stata annullata"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
-msgstr "operazione incompatibile con il tipo di transazione"
+msgstr "l'operazione è incompatibile con il tipo di transazione"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "impossibile eseguire l'operazione"
-
-#, c-format
-msgid "could not download all files"
-msgstr "impossibile prelevare tutti i file"
+msgid "transaction commit attempt when database is not locked"
+msgstr "prova il commit dell'operazione quando il database non è bloccato"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "impossibile trovare o leggere il pacchetto"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "l'operazione è stata ignorata a causa di ignorepkg"
+
 #, c-format
 msgid "invalid or corrupted package"
-msgstr "pacchetto non valido o corrotto"
+msgstr "il pacchetto non è valido oppure è corrotto"
 
 #, c-format
 msgid "cannot open package file"
 msgstr "impossibile aprire il pacchetto"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "impossibile caricare i dati del pacchetto"
-
-#, c-format
-msgid "package already installed"
-msgstr "pacchetto già installato"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "pacchetto non installato o una versione precedente"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "impossibile rimuovere tutti i file del pacchetto"
 
 #, c-format
-msgid "package name is not valid"
+msgid "package filename is not valid"
 msgstr "il nome del pacchetto non è valido"
 
 #, c-format
-msgid "corrupted package"
-msgstr "pacchetto corrotto"
+msgid "package architecture is not valid"
+msgstr "l'architettura del pacchetto non è valida"
 
 #, c-format
-msgid "no such repository"
-msgstr "nessun repository corrispondente"
+msgid "could not find repository for target"
+msgstr "impossibile trovare un repository contenente questo pacchetto"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "il delta è corrotto"
+msgid "invalid or corrupted delta"
+msgstr "il delta non è valido oppure è corrotto"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "si sono verificati degli errori con la patch di delta"
 
-#, c-format
-msgid "group not found"
-msgstr "gruppo non trovato"
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr "impossibile soddisfare le dipendenze"
@@ -311,78 +373,37 @@ msgid "conflicting files"
 msgstr "file in conflitto"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "operazione annullata"
+msgid "failed to retrieve some files"
+msgstr "impossibile scaricare alcuni file"
 
 #, c-format
-msgid "internal error"
-msgstr "errore interno"
+msgid "invalid regular expression"
+msgstr "l'espressione regolare non è valida"
 
 #, c-format
 msgid "libarchive error"
 msgstr "errore di libarchive"
 
 #, c-format
-msgid "not confirmed"
-msgstr "non confermato"
+msgid "download library error"
+msgstr "si è verificato un errore della libreria di download"
 
 #, c-format
-msgid "invalid regular expression"
-msgstr "espressione regolare non valida"
-
-#, c-format
-msgid "connection to remote host failed"
-msgstr "impossibile stabilire una connessione con l'host remoto"
+msgid "error invoking external downloader"
+msgstr "si è verificato un errore lanciando il downloader esterno"
 
 #, c-format
 msgid "unexpected error"
 msgstr "errore inaspettato"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "impossibile recuperare la somma md5 del pacchetto %s-%s\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "la somma md5 del pacchetto %s-%s non corrisponde\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: aggiornamento forzato alla versione %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "impossibile estrarre il file di descrizione del pacchetto in %s\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "impossibile analizzare il file di descrizione del pacchetto in %s\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "manca il nome del pacchetto in %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "manca la versione del pacchetto in %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "manca il metadata del pacchetto in %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "impossibile trovare %s nel database, sarà ignorato\n"
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "rimozione di %s dalla lista dei pacchetti\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "impossibile rimuovere il file '%s': %s\n"
@@ -395,67 +416,30 @@ msgstr "impossibile rimuovere la voce %s-%s dal database\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "impossibile rimuovere la voce '%s' dalla cache\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "l'url '%s' non è corretto, sarà ignorato\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "il protocollo dell'url non è specificato, sarà usato http\n"
-
-#, c-format
-msgid "disk"
-msgstr "disco"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "impossibile recuperare il file '%s' da %s : %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "impossibile riprendere il download\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "impossibile scrivere nel file '%s'\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "si è verificato un errore durante il download di '%s': %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "si è verificato un errore durante la scrittura nel file '%s': %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "impossibile spostarsi nella directory %s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "avvio di XferCommand: processo non riuscito!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "URL non contiene nessun file da scaricare\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "impossibile scaricare %s\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
-"%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%"
-"s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n"
+msgstr "%s: l'aggiornamento del pacchetto è stato ignorato (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "impossibile trovare il repository '%s'\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: il downgrade del pacchetto è stato ignorato (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: downgrade in corso dalla versione %s alla versione %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "sto ignorando la sostituzione del pacchetto (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "impossibile sostituire %s con %s\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -465,58 +449,29 @@ msgstr "%s-%s è aggiornato, sarà ignorato\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s è aggiornato, sarà reinstallato\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+"installazione in corso di una versione meno recente del pacchetto %s (%s => "
+"%s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc failure: impossibile allocare %zd byte\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "comando: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "impossibile recuperare il checksum md5 del file %s\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "il file %s è corrotto (MD5 errato)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr ""
+"rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "impossibile recuperare alcuni file da %s\n"
-
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "impossibile avviare l'operazione di rimozione\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "impossibile inizializzare l'operazione di rimozione\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "impossibile preparare l'operazione di rimozione\n"
+msgstr "impossibile scaricare alcuni file da %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "impossibile eseguire l'operazione di rimozione\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "impossibile avviare l'operazione\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "impossibile inizializzare l'operazione\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "impossibile preparare l'operazione\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "impossibile eseguire l'operazione\n"
@@ -525,14 +480,18 @@ msgstr "impossibile eseguire l'operazione\n"
 msgid "could not remove lock file %s\n"
 msgstr "impossibile rimuovere il file di lock %s\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "/bin/sh non è presente nell'ambiente, lo scriptlet sarà interrotto\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "impossibile creare la directory temporanea\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "impossibile rimuovere la directory temporanea %s\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile spostarsi nella directory %s (%s)\n"
@@ -550,28 +509,16 @@ msgid "could not change directory to / (%s)\n"
 msgstr "impossibile spostarsi nella directory / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "chiamata a popen non riuscita (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "chiamata a popen non riuscita (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "chiamata a waitpid non riuscita (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "L'esecuzione dello scriptlet non è riuscita correttamente\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "impossibile rimuovere la directory temporanea %s\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "impossibile seguire il percorso '%s' : %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "impossibile aprire %s: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "l'esecuzione del comando non è riuscita correttamente\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -581,29 +528,3 @@ msgstr "la cache di %s non esiste, creazione in corso...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n"
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: impossibile aprire %s\n"
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: impossibile leggere %s\n"
-
-#~ msgid "loading package data for %s : level=%d\n"
-#~ msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d\n"
-
-#~ msgid "adding '%s' to package cache for db '%s'\n"
-#~ msgstr "aggiunta di '%s' alla cache del pacchetto per il database '%s'\n"
-
-#~ msgid "could not remove tempfile %s\n"
-#~ msgstr "impossibile rimuovere il file temporaneo %s\n"
-
-#~ msgid "please remove '%s' first, using -Rd\n"
-#~ msgstr "Si consiglia di rimuovere prima '%s', usando l'opzione -Rd\n"
-
-#~ msgid "cannot resolve dependencies for \"%s\"\n"
-#~ msgstr "impossibile risolvere le dipendenze per \"%s\"\n"
-
-#~ msgid "could not update new database entry %s-%s\n"
-#~ msgstr "impossibile aggiornare la nuova voce del database %s-%s\n"

lib/libalpm/po/kk.po

@@ -0,0 +1,606 @@
+# Kazakh translations for Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com> 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-07 09:22+0600\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
+"Language-Team: Kazakh\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr ""
+"мақсаттар тізімінде ескірген %s-%s нұсқасы жаңа %s нұсқасымен алмастырылады\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"%s-%s өткізіледі, өйткені жаңа %s нұсқасы мақсаттар тізімінде бар болып тұр\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"%s бумасының қатынау рұқсаттары әр түрлі\n"
+"файлдық жүйе: %o  десте: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "тарқату: бума %s файлымен ауыстырылмайды\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "тарқату: %s символдық сілтемесі бумаға көрсетіп тұрған жоқ\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "%s тарқату қатесі (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "%s атын жаңа %s атына ауыстыру мүмкін емес (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s қазір %s деп сақталды\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "%s қазір %s ретінде орнату мүмкін емес: %s\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s қазір %s ретінде орнатылды\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "%s қазір %s.pacnew ретінде сақталды\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "ағымдағы жұмыс бумасын анықтау мүмкін емес\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "%s жаңарту кезінде қате кетті\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "%s орнату кезінде қате кетті\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "дерекқорда жазбаны жаңарту мүмкін емес %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "кэш ішіне '%s' жазбасын қосу мүмкін емес\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "қате дерекқорды өшіру: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "%s ашу мүмкін емес: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "дерекқор %s бумасын өшіру мүмкін емес\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "%s дерекқорын өшіру мүмкін емес\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "дерекқордағы '%s' жазбасының аты қате\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "деркқордағы '%s' жазбасы қайталанып жатыр\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "дерекқордағы '%s' жазбасы зақымдалған\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "%s файлын ашу мүмкін емес: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "дерекқордағы қате ақпарат %s: %s дестесінің аты сәйкес келмейді\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "дерекқордағы қате ақпарат %s: %s дестесінің нұсқасы сәйкес келмейді\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "%s бумасын жасау мүмкін емес: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "%s ішіндегі анықтама файлын зерттеу мүмкін емес\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "%s ішінде десте аты жоқ\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "%s ішінде десте нұсқасы жоқ\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "%s дестесін оқу қатесі: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "%s ішінде дестенің мета мәліметтері жоқ\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "дерекқорға жол анықталмаған\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "дерекқорды қайта тіркеу талабы\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "циклдік тәуелділік табылды:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s қазір тәуелділік ретінде %s кейін өшіріледі\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s қазір тәуелділік ретінде %s алдынан орнатылады\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "дестені елемеу %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "тандалған %s дестесі %s ұсынады\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "\"%s\" шешу мүмкін емес, ол \"%s\" тәуелділігі болып тұр\n"
+
+#, c-format
+msgid "disk"
+msgstr "дискі"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "'%s' сілтемесі қате\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "'%s' файлын  %s адресінен алу қатемен аяқталды : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "%s жүктемесін жалғастыру мүмкін емес; басынан басталады\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "'%s' файлына жазу қатесі: %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "'%s' файлын  %s адресінен алу қатемен аяқталды\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s қысқартылады: %jd/%jd байт\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "%s жүктеп алу мүмкін емес\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "жады жеткіліксіз!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "күтпеген қате"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "құқықтар жеткіліксіз"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "файлды табу не оқу мүмкін емес"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "буманы табу не оқу мүмкін емес"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "аргумент қате не нөлдік болып тұр"
+
+#, c-format
+msgid "library not initialized"
+msgstr "library іске қосылмады"
+
+#, c-format
+msgid "library already initialized"
+msgstr "library іске қосылған болып тұр"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "дерекқорды оқшаулау мүмкін емес"
+
+#, c-format
+msgid "could not open database"
+msgstr "дерекқорды ашу мүмкін емес"
+
+#, c-format
+msgid "could not create database"
+msgstr "дерекқорды құру мүмкін емес"
+
+#, c-format
+msgid "database not initialized"
+msgstr "дерекқор іске қосылмады"
+
+#, c-format
+msgid "database already registered"
+msgstr "дерекқор тіркелген болып тұр"
+
+#, c-format
+msgid "could not find database"
+msgstr "дерекқорды табу мүмкін емес"
+
+#, c-format
+msgid "could not update database"
+msgstr "дерекқорды жаңарту мүмкін емес"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "дерекқордан жазбаны өшіру мүмкін емес"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "сервер адресі қате"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "репозиторий үшін серверлер бапталмаған"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "сұраным іске қосылған болып тұр"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "сұраным іске қосылмады"
+
+#, c-format
+msgid "duplicate target"
+msgstr "мақсаттардың қайталануы"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "сұраным дайындалмады"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "сұраным тоқтатылды"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "әрекет сұранымның түрімен үйлеспейді"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "оқшауланбаған дерекқорға жазу талабы"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "дестені табу не оқу мүмкін емес"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "әрекет ignorepkg салдарынан тоқтатылды"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "десте қате не зақымдалған"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "десте файлын ашу мүмкін емес"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "дестенің барлық файлдарын өшіру мүмкін емес"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "десте файлдың аты қате"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "десте файлдың архитектурасы қате"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "көрсетілген мақсат үшін репозиторийді табу мүмкін емес"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "дельта файлы қате не зақымдалған"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "дельта патчті қолдану қатемен аяқталды"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "тәуелділіктерді шешу мүмкін емес"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "ерегісетін тәуелділіктер"
+
+#, c-format
+msgid "conflicting files"
+msgstr "ерегісетін файлдар"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "кейбір файлдарды алу сәтсіз аяқталды"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "тұрақты өрнек дұрыс емес"
+
+#, c-format
+msgid "libarchive error"
+msgstr "libarchive қатесі орын алды"
+
+#, c-format
+msgid "download library error"
+msgstr "download library қатесі орын алды"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "сыртқы жүктемелер менеджерін шақыру қатемен аяқталды"
+
+#, c-format
+msgid "unexpected error"
+msgstr "күтпеген қате кетті"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "дерекқор ішінде %s табылмады --  өткізіп жібереміз\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "мақсаттар тізімінен '%s' өшіріру\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr " '%s' файлын өшіру мүмкін емес: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "дерекқордан %s-%s жазбасын өшіру мүмкін емес\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "кэш ішінен '%s' жазбасын өшіру мүмкін емес\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: дестені жаңартуды елемеу (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: десте нұсқасын төмендетуді елемеу (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: қазіргі %s нұсқасынан %s нұсқасына дейін төмендету\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: орнатылған нұсқа (%s), %s (%s) ішіндегісінен жаңа болып тұр\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "дестені алмастыруды елемеу (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "%s жаңа %s нұсқасымен алмастыру мүмкін емес\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s ескірмеді --  өткізіледі\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s ескірмеді --  қайта орнатылады\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "дестенің нұсқасын төмендету %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "шешілмейтін дестелер ерегісі табылды\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr ""
+"мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "%s адресінен кейбір файлдарды алу мүмкін емес\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "өшіруге сұранымды орындау мүмкін емес\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "сұранымды аяқтау мүмкін емес\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "%s оқшау файлын өшіру мүмкін емес\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "уақытша буманы құру мүмкін емес\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "уақытша файлды %s ішіне көшіру мүмкін емес (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "tmpdir %s өшіру мүмкін емес\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "%s бумасына ауысу мүмкін емес (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "жаңа үрдісті құру мүмкін емес (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "түбірлік буманы ауыстыру мүмкін емес (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "/ бумасына ауысу мүмкін емес (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "popen шақыру сәтсіз аяқталды (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "waitpid шақыру қатемен аяқталды(%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "команда дұрыс орындалмады\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "%s кэші жоқ болып тұр, құрылады...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "дестелер кэшін құру мүмкін емес, оның орнына /tmp қолданылады\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "сіз екі екі ерегісетін дестені орната алмайсыз\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "дестелерді -A мен -U опцияларын қолданып алмастыру әлі жасалмаған\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "сіз дестелерді қолмен алмастыра аласыз, ол үшін -Rd мен -U қолданыңыз\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "сілтеменің түрі анықталмады, HTTP деп саналады\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "'%s' файлына жазу мүмкін емес\n"
+
+#~ msgid "no such repository"
+#~ msgstr "мұндай репозиторий жоқ"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "'%s' репозиторийі табылмады\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "өшіруге сұранымды құру мүмкін емес\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "сұранымды жасау мүмкін емес\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "өшіруге сұранымды іске қосу мүмкін емес\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "сұранымды іске қосу мүмкін емес\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "өшіруге сұранымды дайындау мүмкін емес\n"
+
+#~ msgid "error downloading '%s': %s\n"
+#~ msgstr "'%s' жүктеп алу қатесі: %s\n"
+
+#~ msgid "could not chdir to %s\n"
+#~ msgstr "%s бумасына ауысу мүмкін емес\n"
+
+#~ msgid "running XferCommand: fork failed!\n"
+#~ msgstr "XferCommand қосу: сәтсіз аяқталды\n"
+
+#~ msgid "could not commit transaction"
+#~ msgstr "сұранымды аяқтау мүмкін емес"
+
+#~ msgid "could not download all files"
+#~ msgstr "барлық файлдарды жүктеп алу мүмкін емес"
+
+#~ msgid "cannot load package data"
+#~ msgstr "дестенің мәліметтерін жүктеу мүмкін емес"
+
+#~ msgid "package not installed or lesser version"
+#~ msgstr "десте орнатылмаған, не оның нұсқасы ескі"
+
+#~ msgid "group not found"
+#~ msgstr "топ табылмады"
+
+#~ msgid "user aborted the operation"
+#~ msgstr "әрекетті пайдаланушы тоқтатты"
+
+#~ msgid "internal error"
+#~ msgstr "ішкі қате орын алды"
+
+#~ msgid "not confirmed"
+#~ msgstr "расталмады"
+
+#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+#~ msgstr ""
+#~ "%s-%s: дестені жаңартуды елемеу (ол %s-%s нұсқасымен ауыстырылады)\n"
+
+#~ msgid "command: %s\n"
+#~ msgstr "командасы: %s\n"
+
+#~ msgid "could not prepare transaction\n"
+#~ msgstr "сұранымды дайындау мүмкін емес\n"
+
+#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+#~ msgstr "Бастапқы ортада /bin/sh жоқ, скрипт орындалмайды\n"

lib/libalpm/po/libalpm.pot

@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
+# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,23 +22,7 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr ""
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr ""
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr ""
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 
 #, c-format
@@ -47,11 +32,11 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "extract: symlink %s does not point to dir\n"
+msgid "extract: not overwriting dir with file %s\n"
 msgstr ""
 
 #, c-format
-msgid "extract: not overwriting dir with file %s\n"
+msgid "extract: symlink %s does not point to dir\n"
 msgstr ""
 
 #, c-format
@@ -59,11 +44,7 @@ msgid "could not extract %s (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
 msgstr ""
 
 #, c-format
@@ -71,7 +52,7 @@ msgid "%s saved as %s\n"
 msgstr ""
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
 msgstr ""
 
 #, c-format
@@ -102,26 +83,78 @@ msgstr ""
 msgid "could not add entry '%s' in cache\n"
 msgstr ""
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr ""
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr ""
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr ""
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr ""
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr ""
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr ""
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr ""
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr ""
+
+#, c-format
+msgid "missing package metadata in %s\n"
 msgstr ""
 
 #, c-format
 msgid "database path is undefined\n"
 msgstr ""
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr ""
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr ""
@@ -134,10 +167,50 @@ msgstr ""
 msgid "%s will be installed before its %s dependency\n"
 msgstr ""
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr ""
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr ""
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr ""
 
+#, c-format
+msgid "disk"
+msgstr ""
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr ""
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr ""
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr ""
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr ""
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr ""
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr ""
+
 #, c-format
 msgid "out of memory!"
 msgstr ""
@@ -207,7 +280,7 @@ msgid "invalid url for server"
 msgstr ""
 
 #, c-format
-msgid "could not set parameter"
+msgid "no servers configured for repository"
 msgstr ""
 
 #, c-format
@@ -235,17 +308,17 @@ msgid "operation not compatible with the transaction type"
 msgstr ""
 
 #, c-format
-msgid "could not commit transaction"
-msgstr ""
-
-#, c-format
-msgid "could not download all files"
+msgid "transaction commit attempt when database is not locked"
 msgstr ""
 
 #, c-format
 msgid "could not find or read package"
 msgstr ""
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr ""
+
 #, c-format
 msgid "invalid or corrupted package"
 msgstr ""
@@ -254,46 +327,30 @@ msgstr ""
 msgid "cannot open package file"
 msgstr ""
 
-#, c-format
-msgid "cannot load package data"
-msgstr ""
-
-#, c-format
-msgid "package already installed"
-msgstr ""
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr ""
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr ""
 
 #, c-format
-msgid "package name is not valid"
+msgid "package filename is not valid"
 msgstr ""
 
 #, c-format
-msgid "corrupted package"
+msgid "package architecture is not valid"
 msgstr ""
 
 #, c-format
-msgid "no such repository"
+msgid "could not find repository for target"
 msgstr ""
 
 #, c-format
-msgid "corrupted delta"
+msgid "invalid or corrupted delta"
 msgstr ""
 
 #, c-format
 msgid "delta patch failed"
 msgstr ""
 
-#, c-format
-msgid "group not found"
-msgstr ""
-
 #, c-format
 msgid "could not satisfy dependencies"
 msgstr ""
@@ -307,19 +364,7 @@ msgid "conflicting files"
 msgstr ""
 
 #, c-format
-msgid "user aborted the operation"
-msgstr ""
-
-#, c-format
-msgid "internal error"
-msgstr ""
-
-#, c-format
-msgid "libarchive error"
-msgstr ""
-
-#, c-format
-msgid "not confirmed"
+msgid "failed to retrieve some files"
 msgstr ""
 
 #, c-format
@@ -327,57 +372,29 @@ msgid "invalid regular expression"
 msgstr ""
 
 #, c-format
-msgid "connection to remote host failed"
+msgid "libarchive error"
+msgstr ""
+
+#, c-format
+msgid "download library error"
+msgstr ""
+
+#, c-format
+msgid "error invoking external downloader"
 msgstr ""
 
 #, c-format
 msgid "unexpected error"
 msgstr ""
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr ""
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr ""
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr ""
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr ""
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr ""
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr ""
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
@@ -390,64 +407,28 @@ msgstr ""
 msgid "could not remove entry '%s' from cache\n"
 msgstr ""
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr ""
-
-#, c-format
-msgid "disk"
-msgstr ""
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr ""
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr ""
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr ""
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr ""
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr ""
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr ""
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr ""
 
 #, c-format
-msgid "repository '%s' not found\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr ""
+
+#, c-format
+msgid "cannot replace %s by %s\n"
 msgstr ""
 
 #, c-format
@@ -458,58 +439,26 @@ msgstr ""
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr ""
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr ""
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr ""
-
-#, c-format
-msgid "command: %s\n"
-msgstr ""
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr ""
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr ""
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr ""
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr ""
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr ""
@@ -519,11 +468,15 @@ msgid "could not remove lock file %s\n"
 msgstr ""
 
 #, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgid "could not create temp directory\n"
 msgstr ""
 
 #, c-format
-msgid "could not create temp directory\n"
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr ""
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
 msgstr ""
 
 #, c-format
@@ -543,7 +496,7 @@ msgid "could not change directory to / (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
 msgstr ""
 
 #, c-format
@@ -551,19 +504,7 @@ msgid "call to waitpid failed (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr ""
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr ""
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not open %s: %s\n"
+msgid "command failed to execute correctly\n"
 msgstr ""
 
 #, c-format
@@ -573,11 +514,3 @@ msgstr ""
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr ""
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr ""

lib/libalpm/po/nb.po

@@ -0,0 +1,556 @@
+# Language libalpm translations for PACKAGE package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+#  <maister@archlinux.us>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2009-10-04 17:09+0200\n"
+"Last-Translator:  <maister@archlinux.us>\n"
+"Language-Team: Language libalpm\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "bytter ut eldre versjon %s-%s med %s i liste\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "hopper over %s-%s siden nyere versjon %s finnes i liste\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"mapperettigheter er forskjellige i %s\n"
+"filsystem: %o  pakke: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "utpakking: skriver ikke over mappe med fil %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "utpakking: symlink %s viser ikke til mappe\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "kunne ikke pakke ut %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "kunne ikke døpe om %s til %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s lagret som %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "kunne ikke installere %s som %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s installert som %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "pakker ut %s som %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "kunne ikke motta nåværende mappe\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "problem oppstod under oppgradering av %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "problem oppstod under installasjon av %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "kunne ikke oppdatere databaseelement %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "kunne ikke legge til '%s' i cache\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "fjerner ugyldig database: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "kunne ikke åpne %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "kunne ikke fjerne databaseelement %s-%s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "kunne ikke fjerne database %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "ugyldig navn for databaseelement '%s'\n"
+
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "korrupt databaseelement '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "korrupt databaseelement '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "kunne ikke åpne fil %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "%s database er ukonsistent: navn samsvarer ikke med pakke %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "%s database er ukonsistent: versjon samsvarer ikke med pakke %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "kunne ikke opprette mappe %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "kunne ikke analysere pakkebeskrivelse i fil %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "mangler pakkenavn i %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "mangler pakkeversjon i %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "feil oppstod under lesing av pakke: %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "mangler metadata i %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "databaseplassering er udefinert\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "forsøker å re-registrere den lokale databasen\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "avhengighetssyklus oppdaget\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s vil fjernes etter dens avhengighet %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s vil bli installert før dens avhengighet %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignorerer pakke %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "tilføringspakke ble valgt (%s tilfører %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "kan ikke avgjøre \"%s\", en avhengighet av \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' er ugyldig\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "mottakelse av fil '%s' fra %s : %s feilet\n"
+
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "kan ikke fortsette nedlasting, starter på nytt\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "skriving til fil '%s': %s feilet\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "mottakelse av fil '%s' fra %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s ser ut til å være trunkert: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "nedlasting av %s feilet\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "ikke mer minne!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "uventet systemfeil"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "ikke nok rettigheter"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "kunne ikke finne eller lese fil"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "kunne ikke finne eller lese mappe"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "feil eller NULL-argument gitt"
+
+#, c-format
+msgid "library not initialized"
+msgstr "bibliotek ikke initialisert"
+
+#, c-format
+msgid "library already initialized"
+msgstr "bibliotek allerede initialisert"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "kunne ikke låse database"
+
+#, c-format
+msgid "could not open database"
+msgstr "kunne ikke åpne database"
+
+#, c-format
+msgid "could not create database"
+msgstr "kunne ikke opprette database"
+
+#, c-format
+msgid "database not initialized"
+msgstr "database ikke initialisert"
+
+#, c-format
+msgid "database already registered"
+msgstr "database allerede registret"
+
+#, c-format
+msgid "could not find database"
+msgstr "kunne ikke finne database"
+
+#, c-format
+msgid "could not update database"
+msgstr "kunne ikke oppdatere database"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "kunne ikke fjerne databaseelement"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "ugyldig url for server"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "ingen servere konfigurert for pakkebrønn"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "transaksjon allerede initialisert"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "transaksjon ikke initialisert"
+
+#, c-format
+msgid "duplicate target"
+msgstr "klonet mål"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "transaksjon ikke forberedt"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "transaksjon avsluttet"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "operasjon ikke kompatibel med transaksjonstypen"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "førsøk på utføring av transaksjon mens databasen ikke er lukket"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "kunne ikke finne eller lese pakke"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operasjon avsluttet grunnet ignorepkg"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "invalid eller korrupt pakke"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "kan ikke åpne pakkefil"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "kan ikke fjerne alle filer for pakke"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "pakkens filnavn er ikke gyldig"
+
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "pakkens filnavn er ikke gyldig"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "kunne ikke finne eller lese pakke"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "invalid"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "delta-patch feilet"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "kunne ikke tilfredstille avhengigheter"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "modstridige avhengigheter"
+
+#, c-format
+msgid "conflicting files"
+msgstr "modstridige filer"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "mottagelsen av noen filer feilet"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "ugyldig uttrykk"
+
+#, c-format
+msgid "libarchive error"
+msgstr "feil i libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "feil i nedlastingsbibliotek"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "påkalling av ekstern nedlaster feilet"
+
+#, c-format
+msgid "unexpected error"
+msgstr "uforventet feil"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "kunne ikke finne %s i database -- hopper over\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "fjerner %s fra målliste\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "kan ikke fjerne fil '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "kunne ikke fjerne databaseelement %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "kunne ikke fjerne element '%s' fra cache\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: ignorerer pakkeoppgradering (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignorerer pakkenedgradering (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: nedgradering fra versjon %s til versjon %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokal (%s) er nyere enn %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignorerer utbytting av pakke (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "kan ikke bytte ut %s med %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s er allerede oppdatert -- hopper over\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s er allerede oppdatert -- installerer på nytt\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "nedgraderer pakke %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "uløselige pakkekonflikter oppdaget\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "fjerner '%s' fra mållisten fordi den strider mot '%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "feilet å motta noen filer fra %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "kunne ikke begå fjerningstransaksjon\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "kunne ikke begå transaksjon\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "kunne ikke fjerne låsingsfil %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "kunne ikke opprette midlertidig mappe\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "kunne ikke kopiere midertidig fil til %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "kunne ikke fjerne midlertidig mappe %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "kunne ikke endre mappe til %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "kunne ikke skille ut en ny prosess (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "kunne ikke endre root-mappe (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "kunne ikke endre mappe til / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "kall på popen feilet (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "kall på waitpid feilet (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "kommando feilet å kjøre korrekt\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "ingen %s cache eksisterer, lager en ...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "kunne ikke danne pakke-cache, bruker /tmp istedenfor\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "motstridige pakker ble funnet i målliste\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "du kan ikke installere to motstridige pakker samtidig\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "å bytte ut pakker med -U er ikke støttet enda\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "du kan bytte ut pakker manuelt ved å bruke -Rd og -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url-protokoll ikke gitt, bruker HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "kan ikke skrive til fil '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "ingen slik pakkebrønn"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "pakkebrønn '%s' ikke funnet\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kunne ikke opprette fjerningstransaksjon\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "kunne ikke opprette transaksjon\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kunne ikke initialisere fjerningstransaksjonen\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "kunne ikke initialisere transaksjon\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kunne ikke forberede fjerningstransaksjon\n"

lib/libalpm/po/pl.po

@@ -1,18 +1,19 @@
 # Polish translations for Pacman package manager package
 # Polskie tłumaczenia dla pakietu Pacman package manager.
-# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
-# This file is distributed under the same license as the Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
 # Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
-# Mateusz Herych <heniekk@gmail.com>, 2008.
+# Mateusz Herych <heniekk@gmail.com>, 2008-2009.
 # #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.0.1\n"
+"Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-02-25 22:16+0100\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2009-10-04 17:09+0200\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,27 +25,8 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "nowsza wersja %s-%s znajduje się w liście celów -- pomijam\n"
-
-#, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr ""
-"konfliktujące pakiety znalazły się na liście pakietów do zainstalowania\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w tym "
-"samym czasie\n"
-
-#, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "zastępowanie pakietów za pomocą -A i -U nie jest jeszcze wspierane\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "pomijam %s-%s ponieważ nowsza wersja %s jest na liście celów\n"
 
 #, c-format
 msgid ""
@@ -54,33 +36,29 @@ msgstr ""
 "Różne prawa dla %s\n"
 "system plików: %o pakiet: %o\n"
 
-#, c-format
-msgid "extract: symlink %s does not point to dir\n"
-msgstr "rozpakowywanie: dowiązanie symboliczne %s nie kieruje do katalogu\n"
-
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "rozpakowywanie: nie nadpisuję katalogu plikiem %s\n"
 
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "rozpakowywanie: dowiązanie symboliczne %s nie kieruje do katalogu\n"
+
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nie udało się rozpakować %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "nie udało się zmienić nazwy %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "nie udało się zmienić nazwy %s na %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s zachowane jako %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "nie udało się zainstalować %s jako %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "nie udało się zainstalować %s jako %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -110,26 +88,78 @@ msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s\n"
 msgid "could not add entry '%s' in cache\n"
 msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym\n"
 
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "usuwanie niepoprawnej bazy danych: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nie udało się otworzyć %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nie udało się usunąć wpisu %s-%s z bazy danych\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "nie można usunąć bazy danych %s\n"
+
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'\n"
 
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "zepsuty wpis w bazie danych '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "zepsuty wpis w bazie danych '%s'\n"
+
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nie udało się otworzyć pliku %s: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "nie udało się usunąć wpisu %s%s z bazy danych\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "baza danych %s jest sprzeczna: niedopasowana nazwa w pakiecie %s\n"
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "baza danych %s jest sprzeczna: niedopasowana wersja w pakiecie %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "nie można stworzyć katalogu %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "nie udało się przeczytać opisu pliku w %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "brak nazwy pakietu w %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "brak wersji pakietu w %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "błąd odczytywania pakietu: %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "brak metadanych pakietu w %s\n"
 
 #, c-format
 msgid "database path is undefined\n"
 msgstr "ścieżka bazy danych jest niezdefiniowana\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "wykryto cykl zależności:\n"
@@ -142,10 +172,50 @@ msgstr "%s zostanie usunięta po zależniościach %s\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s zostanie zainstalowane przed zależnościami %s\n"
 
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignorowanie pakietu %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "dostawca pakietu został wybrany (%s dostarcza %s)\n"
+
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nie można rozwiązać \"%s\", zależności od \"%s\"\n"
 
+#, c-format
+msgid "disk"
+msgstr "dysk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' jest błędny\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
+
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "Błąd podczas zapisywania do pliku '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "nie udało się pobrać pliku '%s' z %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s wygląda, jakby został obcięty %jd/%jd bajtów\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "nie udało się pobrać %s\n"
+
 #, c-format
 msgid "out of memory!"
 msgstr "brak pamięci!"
@@ -215,8 +285,8 @@ msgid "invalid url for server"
 msgstr "nieprawidłowy url dla serwera"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "nie udało się ustawić parametru"
+msgid "no servers configured for repository"
+msgstr "brak serwerów skonfigurowanych dla repozytorium"
 
 #, c-format
 msgid "transaction already initialized"
@@ -243,17 +313,17 @@ msgid "operation not compatible with the transaction type"
 msgstr "operacja niekompatybilna z typem tranzakcji"
 
 #, c-format
-msgid "could not commit transaction"
-msgstr "nie udało się wykonać tranzakcji"
-
-#, c-format
-msgid "could not download all files"
-msgstr "nie udało się pobrać wszystkich plików"
+msgid "transaction commit attempt when database is not locked"
+msgstr "zmiana tranzakcji następuje, kiedy baza danych nie jest zablokowana"
 
 #, c-format
 msgid "could not find or read package"
 msgstr "nie udało się znaleźć bądź odczytać pakietu"
 
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operacja anulowana przez ignorepkg"
+
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "nieprawidłowy bądź uszkodzony pakiet"
@@ -262,49 +332,33 @@ msgstr "nieprawidłowy bądź uszkodzony pakiet"
 msgid "cannot open package file"
 msgstr "nie udało się otworzyć pliku pakietu"
 
-#, c-format
-msgid "cannot load package data"
-msgstr "nie udało się załadować danych pakietu"
-
-#, c-format
-msgid "package already installed"
-msgstr "pakiet został już zainstalowany"
-
-#, c-format
-msgid "package not installed or lesser version"
-msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
-
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "nie udało się usunąć wszystkich plików pakietu"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "nieprawidłowa nazwa pakietu"
+msgid "package filename is not valid"
+msgstr "nazwa pakietu jest nieprawidłowa"
+
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "nazwa pakietu jest nieprawidłowa"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "nie udało się znaleźć bądź odczytać pakietu"
 
 #, c-format
-msgid "corrupted package"
-msgstr "uszkodzony pakiet"
-
-#, c-format
-msgid "no such repository"
-msgstr "nie ma takiego repozytorium"
-
-#, c-format
-msgid "corrupted delta"
-msgstr "Pakiet przyrostowy jest uszkodzony"
+msgid "invalid or corrupted delta"
+msgstr "nieprawidłowy bądź uszkodzony pakiet przyrostowy"
 
 #, c-format
 msgid "delta patch failed"
 msgstr "Łatanie pakietem przyrostowym nie powiodło się"
 
-#, c-format
-msgid "group not found"
-msgstr "grupa nie została odnaleziona"
-
 #, c-format
 msgid "could not satisfy dependencies"
-msgstr "nie udało się usatysfakcjonować zależności"
+msgstr "nie udało się rozwiązać zależności"
 
 #, c-format
 msgid "conflicting dependencies"
@@ -315,77 +369,38 @@ msgid "conflicting files"
 msgstr "konfliktujące pliki"
 
 #, c-format
-msgid "user aborted the operation"
-msgstr "użytkownik zaniechał operacji"
-
-#, c-format
-msgid "internal error"
-msgstr "błąd wewnętrzny"
-
-#, c-format
-msgid "libarchive error"
-msgstr "błąd libarchive"
-
-#, c-format
-msgid "not confirmed"
-msgstr "nie potwierdzono"
+msgid "failed to retrieve some files"
+msgstr "nie udało się odzyskać niektórych plików"
 
 #, c-format
 msgid "invalid regular expression"
 msgstr "nieprawidłowe wyrażenie regularne"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "połączenie ze zdalnym hostem nieudane"
+msgid "libarchive error"
+msgstr "błąd libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "błąd pobierania biblioteki"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr ""
+"wystąpił błąd podczas odwoływania się do zewnętrznego programu pobierającego"
 
 #, c-format
 msgid "unexpected error"
 msgstr "niespodziewany błąd"
 
-#, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s\n"
-
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się\n"
-
-#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: wymuszanie aktualizacji do wersji %s\n"
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "nie udało się przeczytać opisu do %s\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "nie udało się przeczytać opisu pliku w %s\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "brak nazwy pakietu w %s\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "brak wersji pakietu w %s\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "błąd odczytywania pakietu: %s: %s\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "brak metadanych pakietu w %s\n"
-
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n"
 
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "usuwanie %s z listy celów\n"
+
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nie udało się usunąć pliku '%s': %s\n"
@@ -398,66 +413,29 @@ msgstr "nie udało się usunąć wpisu %s-%s z bazy danych\n"
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej\n"
 
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "url '%s' jest błędny, ignoruję\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "schemat url nie został sprecyzowany, wybieranie http\n"
-
-#, c-format
-msgid "disk"
-msgstr "dysk"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nie można zapisywać do pliku '%s'\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "błąd podczas pobierania '%s': %s\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "Błąd podczas zapisywania do pliku '%s': %s\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "nie udało się zmienić katalogu na / %s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "uruchamianie XferCommand: klonowanie nieudane!\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "URL nie wskazuje na plik do pobrania\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "nie udało się pobrać %s\n"
-
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
-"%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n"
-
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n"
 
 #, c-format
-msgid "repository '%s' not found\n"
-msgstr "repozytorium '%s' nie zostało znalezione\n"
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignorowanie dezaktualizacji pakietu (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: dezaktualizowanie z wersji %s do wersji %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignorowanie zastępowania pakietu (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "nie udało się zastąpić %s przez %s\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
@@ -467,58 +445,26 @@ msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n"
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n"
 
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "dezaktualizowanie pakietu %s (%s => %s)\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "odkryto nierozwiązywalne konflikty pakietów\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "błąd malloc: nie udało się zaalokować %zd bajtów\n"
-
-#, c-format
-msgid "command: %s\n"
-msgstr "komenda: %s\n"
-
-#, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "nie udało się otrzymać sum kontrolnych md5 dla pliku %s\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "plik %s był uszkodzony (błąd sumy kontrolnej MD5)\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "usuwanie '%s' z listy celów ponieważ konfliktuje z '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "nie udało się pobrać niektórych plików z %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nie udało się utworzyć tranzakcji usuwania\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nie udało się zainicjować tranzakcji usuwania\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nie udało się przygotować tranzakcji usuwania\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nie udało się wykonać tranzakcji usuwania\n"
 
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nie udało się stworzyć tranzakcji\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nie udało się zainicjować tranzakcji\n"
-
-#, c-format
-msgid "could not prepare transaction\n"
-msgstr "nie udało się przygotować tranzakcji\n"
-
 #, c-format
 msgid "could not commit transaction\n"
 msgstr "nie udało się wykonać tranzakcji\n"
@@ -527,14 +473,18 @@ msgstr "nie udało się wykonać tranzakcji\n"
 msgid "could not remove lock file %s\n"
 msgstr "nie udało się usunąć pliku blokującego %s\n"
 
-#, c-format
-msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Brak /bin/sh w środowisku,  przerywanie wykonywania skryptu\n"
-
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "nie udało się stworzyć katalogu tymczasowego\n"
 
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
+
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nie udało się zmienić katalogu na %s (%s)\n"
@@ -552,28 +502,16 @@ msgid "could not change directory to / (%s)\n"
 msgstr "nie udało się zmienić katalogu na / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "zawołanie do popen nieudane (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "zawołanie do popen nieudane (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "zawołanie do waitpid nieudane (%s)\n"
 
 #, c-format
-msgid "scriptlet failed to execute correctly\n"
-msgstr "skrypt nie mógł zostać poprawnie wykonany\n"
-
-#, c-format
-msgid "could not remove tmpdir %s\n"
-msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
-
-#, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "nie udało się stworzyć ścieżki '%s' : %s\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nie udało się otworzyć %s: %s\n"
+msgid "command failed to execute correctly\n"
+msgstr "komenda nie wykonała się poprawnie\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -584,56 +522,90 @@ msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
 
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: %s nie może zostać otwarte\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "konfliktujące pakiety zostały znalezione na liście celów\n"
 
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5: %s nie może zostać przeczytane\n"
-
-#, fuzzy
-#~ msgid "loading package data for %s : level=%d\n"
-#~ msgstr "ładowanie danych pakietu dla %s : poziom=%d"
-
-#, fuzzy
-#~ msgid "adding '%s' to package cache for db '%s'\n"
-#~ msgstr "dodawanie '%s' do pamięci podręcznej pakietów dla bd '%s'"
-
-#, fuzzy
-#~ msgid "could not remove tempfile %s\n"
-#~ msgstr "nie udało się usunąć pliku tymczasowego %s"
-
-#~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "proszę usunąć pierw '%s', korzystając z -Rd"
-
-#~ msgid "could not extract %s (%s)"
-#~ msgstr "nie udało się rozpakować %s (%s)"
-
-#~ msgid "could not update provision '%s' from '%s'"
-#~ msgstr "nie udało się zaktualizować zasobu '%s' z '%s'"
-
-#, fuzzy
-#~ msgid "%s: description file is missing"
-#~ msgstr "%s: błąd składni w pliku opisu linia %d"
-
-#~ msgid "malloc failed: could not allocate %d bytes"
-#~ msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
-
-#~ msgid ""
-#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgid "you cannot install two conflicting packages at the same time\n"
 #~ msgstr ""
-#~ "nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w "
-#~ "zbiorze pakietów)"
+#~ "nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w "
+#~ "tym samym czasie\n"
 
-#~ msgid "cannot canonicalize specified root path '%s'"
-#~ msgstr "nie udało się skanonizować podanej ścieżki docelowej '%s'"
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "zastępowanie pakietów za pomocą -U nie jest już wspierane\n"
 
-#~ msgid "cannot remove file %s: %s"
-#~ msgstr "nie udało się usunąć pliku %s: %s"
+# hmm
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
 
-#~ msgid "sha1: %s can't be opened\n"
-#~ msgstr "sha1: %s nie może zostać otwarty\n"
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schemat url nie został sprecyzowany, wybieranie HTTP\n"
 
-#~ msgid "could not update new database entry %s-%s"
-#~ msgstr "nie udało się zaktualizować nowego wpisu %s-%s w bazie danych"
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nie można zapisywać do pliku '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "nie ma takiego repozytorium"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repozytorium '%s' nie zostało znalezione\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nie udało się utworzyć tranzakcji usuwania\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nie udało się stworzyć tranzakcji\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nie udało się zainicjować tranzakcji usuwania\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nie udało się zainicjować tranzakcji\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nie udało się przygotować tranzakcji usuwania\n"
+
+#~ msgid "error downloading '%s': %s\n"
+#~ msgstr "błąd podczas pobierania '%s': %s\n"
+
+#~ msgid "could not chdir to %s\n"
+#~ msgstr "nie udało się zmienić katalogu na / %s\n"
+
+#~ msgid "running XferCommand: fork failed!\n"
+#~ msgstr "uruchamianie XferCommand: klonowanie nieudane!\n"
+
+#~ msgid "could not commit transaction"
+#~ msgstr "nie udało się wykonać tranzakcji"
+
+#~ msgid "could not download all files"
+#~ msgstr "nie udało się pobrać wszystkich plików"
+
+#~ msgid "cannot load package data"
+#~ msgstr "nie udało się załadować danych pakietu"
+
+#~ msgid "package not installed or lesser version"
+#~ msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
+
+#~ msgid "group not found"
+#~ msgstr "grupa nie została odnaleziona"
+
+#~ msgid "user aborted the operation"
+#~ msgstr "użytkownik zaniechał operacji"
+
+#~ msgid "internal error"
+#~ msgstr "błąd wewnętrzny"
+
+#~ msgid "not confirmed"
+#~ msgstr "nie potwierdzono"
+
+#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+#~ msgstr ""
+#~ "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n"
+
+#~ msgid "command: %s\n"
+#~ msgstr "komenda: %s\n"
+
+#~ msgid "could not prepare transaction\n"
+#~ msgstr "nie udało się przygotować tranzakcji\n"
+
+#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+#~ msgstr "Brak /bin/sh w środowisku,  przerywanie wykonywania skryptu\n"