Bump version to 4.0.0

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

.gitignore

@@ -1,30 +1,21 @@
-Makefile
+*~
-Makefile.in
+*.o
-mkinstalldirs
 aclocal.m4
 autom4te.cache
-config.guess
 config.h
 config.h.in
 config.log
 config.status
 config.status.lineno
-config.rpath
-config.sub
 configure
 configure.lineno
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-
-*.o
-*~
-root
-tags
-cscope.out
 cscope.in.out
+cscope.out
 cscope.po.out
+libtool
+Makefile
+Makefile.in
 pacman-*.tar.gz
+root
+stamp-h1
+tags

.mailmap

@@ -6,10 +6,12 @@ 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>
+Daenyth Blank <Daenyth+arch@gmail.com> <Daenyth+git@gmail.com>
+Dave Reisner <dreisner@archlinux.org> <d@falconindy.com>
 甘露(Gan Lu) <rhythm.gan@gmail.com>
 Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com>
 Jaroslaw Swierczynski <swiergot@gmail.com> <swiergot@juvepoland.com>
+Jonathan Conder <j@skurvy.no-ip.org> <jonno.conder@gmail.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>

.tx/config

@@ -0,0 +1,18 @@
+[main]
+host = https://www.transifex.net
+
+[archlinux-pacman.libalpm-pot]
+file_filter = lib/libalpm/po/<lang>.po
+source_file = lib/libalpm/po/libalpm.pot
+source_lang = en
+
+[archlinux-pacman.pacman-pot]
+file_filter = src/pacman/po/<lang>.po
+source_file = src/pacman/po/pacman.pot
+source_lang = en
+
+[archlinux-pacman.pacman-scripts-pot]
+file_filter = scripts/po/<lang>.po
+source_file = scripts/po/pacman-scripts.pot
+source_lang = en
+

AUTHORS

@@ -1,16 +1 @@
-Judd Vinet <jvinet@zeroflux.org>
+Use `git shortlog -s` for a list of contributors.
-Aurelien Foret <aurelien@archlinux.org>
-Aaron Griffin <aaron@archlinux.org>
-Dan McGee <dan@archlinux.org>
-
-Miklós Vajna <vmiklos@frugalware.org>
-Christian Hamar <krics@linuxforum.hu>
-Josh Wheeler <deltalima@gmail.com>
-David Kimpe <DNAku@frugalware.org>
-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@bibl.u-szeged.hu>
-Nathan Jones <nathanj@insightbb.com>
-Allan McRae <mcrae_allan@hotmail.com>

HACKING

@@ -35,7 +35,7 @@ while(it) {
   if(fn) {
     fn(it->data);
   } else {
-    return(1);
+    return 1;
   }
   free(it);
   it = ptr;
@@ -67,11 +67,11 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
        NOT
     // This is a comment
 
-5.  Return statements should be written like a function call.
+5.  Return statements should *not* be written like function calls.
 
-    return(0);
-       NOT
     return 0;
+       NOT
+    return(0);
 
 6.  The sizeof() operator should accept a type, not a value. (TODO: in certain
     cases, it may be better- should this be a set guideline? Read "The Practice
@@ -147,5 +147,5 @@ For example, to run valgrind:
     valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu
 
 /////
-vim: set ts=2 sw=2 syntax=asciidoc et:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////

INSTALL

@@ -16,8 +16,8 @@ properly build pacman.
 libarchive
 http://code.google.com/p/libarchive/
 
-libfetch
+libcurl
-ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/net/libfetch/README.html
+http://curl.haxx.se/libcurl/
 
 Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following

Makefile.am

@@ -1,8 +1,10 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts etc po test/pacman test/util contrib
+SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util contrib
 if WANT_DOC
 SUBDIRS += doc
 endif
 
+ACLOCAL_AMFLAGS = -I m4 --install
+
 # Make sure we test and build manpages when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version
 
@@ -12,14 +14,19 @@ EXTRA_DIST = HACKING
 
 # Sample makepkg prototype files
 pkgdatadir = ${datadir}/${PACKAGE}
-dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto
+dist_pkgdata_DATA = \
+	proto/PKGBUILD.proto \
+	proto/PKGBUILD-split.proto \
+	proto/proto.install \
+	proto/ChangeLog.proto
 
 # 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 \
+	LC_ALL=C $(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/pacsorttest.sh \
+		$(top_builddir)/src/util/pacsort
 	$(SH) $(top_srcdir)/test/util/vercmptest.sh \
 		$(top_builddir)/src/util/vercmp
 
@@ -29,4 +36,9 @@ install-data-local:
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 
+update-po:
+	$(MAKE) -C lib/libalpm/po update-po
+	$(MAKE) -C scripts/po update-po
+	$(MAKE) -C src/pacman/po update-po
+
 # vim:set ts=2 sw=2 noet:

NEWS

@@ -1,5 +1,167 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+4.0.0         - well-integrated and powerful signed packages and databases
+                support in pacman, the library, and scripts (FS#5331)
+              - over 800 commits to pacman.git since 3.5.4 release
+              - many code cleanup commits across library/binaries/scripts
+              - many performance improvement commits across library/binaries
+              - add new -S --recursive operation to upgrade a full dep chain
+              - report upgrade size on sync operations (FS#12566)
+              - early terminal input is flushed before question prompts
+              - remove duplicate code shared in sync and upgrade operations
+              - remove ShowSize; replaced with VerbosePkgLists (FS#15772)
+              - print callback (warning, error) messages to stderr (FS#25099)
+              - download progress callback has more room for filenames
+              - fix selection entry for long values (FS#25253)
+              - make config parsing two-pass process, enhance error messages
+              - print helpful tips on -Qi <filename> or -S <filename>
+              - replace libfetch with libcurl for backend download library
+                - timeout when mirror is not responding (FS#15369)
+                - full HTTPS protocol support (FS#22435)
+                - support of non-traditional/redirected URLs (FS#22645)
+                - ensure downloads are only resumed if appropriate (FS#23803)
+              - only remove empty directories if no remaining owner (FS#25141)
+              - better cache directory choosing and honor $TMPDIR (FS#25435)
+              - replaces are parsed as dependency-style strings (FS#23410)
+              - split package verification and load stages
+              - sync database reading refactor for performance
+              - use a larger buffer for package checksum validation
+              - filelists now have a dedicated type with metadata
+              - diskspace check no longer requires iterating package archives
+              - update and add checksum routines from PolarSSL
+              - validate sync database sha256sum if available
+              - correctly parse sizes in database > 2GiB
+              - API: several type renames from pm* to alpm_* prefix
+              - API: several enum constant renames from PM to ALPM_* prefix
+              - API: several types are now public exposed structs
+              - API: handle is no longer a single global variable
+              - API: more changes than can be mentioned here, see README
+              - much improved API documentation for use by Doxygen
+              - pactest: several performance/checking improvements
+              - scripts:
+                - refactor some common components into shared bash library
+                - split translations into pacman-scripts catalog (FS#15148)
+              - makepkg:
+                - allow signing packages after creation
+                - allow verifying source file signatures (FS#20448)
+                - support UPX compression of executables (FS#17213)
+                - allow usage of an alternate build directory (FS#22308)
+                - cleancache option has been removed; use shell instead
+                - improved variable sanity checking (FS#16004)
+                - better handling of package extensions (.tar.Z or invalid)
+                - allow PKGEXT/SRCEXT environment overrides (FS#19860)
+                - only check for writable PKGDEST if necessary (FS#24735)
+                - check_software function exits early if missing req'd binaries
+                - do source packaging in fakeroot (FS#24330)
+                - be more POSIX-compatible in use of `ln` (FS#24893)
+                - handle spaces with filenames in noextract (FS#25100)
+                - allow epoch-versioned optdepends
+              - pacman-key: new keyring management tool for signed data
+              - pacsort: new utility, sort version numbers as pacman does
+              - pactree: support sync databases with -s option
+              - pkgdelta: add a manpage
+              - repo-add:
+                - handle and include package signatures in databases
+                - verify database signature before modification
+                - sign database after creation/modification
+                - general script cleanup and bash-ification
+                - add sha256sums to database (FS#23103)
+              - contrib/bacman: code cleanups and small bug fixes
+              - contrib/bash_completion: updates for new options/commands
+              - contrib/paccache: new, pacman cache cleanup script
+              - contrib/paclist: rewrite using bash
+              - contrib/paclog-pkglist: new, recover from missing local DB
+              - documentation: extensive updates to all manpages
+              - translations: extensive updates, new languages: lt, zh_TW
+3.5.4         - fix display of lists on non-TTYs and other output fixes
+              - fix group selection entry for large inputs (FS#24253)
+              - fix divide by zero when downloading zero length files
+              - flush terminal input before reading response (FS#20538)
+              - allow files to be replaced by directories (FS#24904)
+              - makepkg: fix filenames with spaces and noextract (FS#25100)
+              - scripts: remove ln -f option for POSIX compliance (FS#24893)
+              - various small documentation updates
+              - minor translation updates: de, fi
+3.5.3         - segfault when creating lock in non-existent dir (FS#24292)
+              - segfault when uninstalling broken backed-up symlink (FS#24230)
+              - --print should not enable --noconfirm (FS#24287)
+              - fix default path substitution in documentation
+              - makepkg: quote variables that may contain spaces (FS#24002)
+              - makepkg: fix creation of source package with -p (FS#24567)
+              - repo-add: include dotfiles in filelists (FS#24534)
+              - minor translation updates: de, fi, fr, sk, zh_CN
+3.5.2         - ensure we show correct missing dependency info (FS#23424)
+              - pacman usage/--help updates (FS#23433, FS#23369)
+              - ensure stdout/stderr are flushed before prompts (FS#23492)
+              - compile/portability fixes for FreeBSD platform
+              - extensive documentation updates for alpm.h interfaces
+              - fix several missing pm_errno error code returns
+              - makepkg:
+                - simplify log redirection and remove sync (FS#23378)
+                - improve parsing for sanity checks (FS#23524)
+                - avoid use of `tr` to avoid locale and other issues
+                - fix GNU-ism in `su` invocation
+              - bacman: update for new local database format (FS#23641)
+              - extensive translation updates and fixes
+3.5.1         - don't error on unknown pacman.conf directives (FS#23055)
+              - only read arguments from stdin if '-' is provided as target
+              - fix case with ignore handling in argument list (FS#23342)
+              - don't show group selection prompt with -Sp (FS#23340)
+              - restore old --debug/--verbose behavior (FS#23370)
+              - ensure repo DBs are saved with sane umask (FS#23343)
+              - fix segfault when a repo includes deltas entries (FS#23314)
+              - fix potential data corruption issue on sync DB read
+              - get zsh completion in a working state (FS#23322)
+              - makepkg: improve optdepends extraction (FS#23307)
+              - translations:
+                - de: fix makepkg fatal error (FS#23315)
+                - sr, sr@latin: new Serbian translation
+                - various other translation updates
+              - build system: ensure libtool respects LDFLAGS (FS#23325)
+3.5.0         - sync DBs read directly from the database tarball
+                (FS#8586, FS#20233)
+              - local DB "depends" file has been merged into the "desc" file
+                - pacman-db-upgrade script provided to update the local
+                  database format
+              - sync database extension is .db (without compression suffix)
+                - requires repo-add from pacman-3.4+
+              - package versions can have an 'epoch' value defined that will
+                overrule any version comparison
+                - this replaces the use of the "force" option in allowing for
+                  package updates with versions that do not conform to the
+                  default version comparison operations
+                - package versions have the format [epoch:]pkgver-pkgrel
+              - check available disk space before installing packages (FS#11639)
+                - enabled by the "CheckSpace" option in pacman.conf
+                - attempt to stop install if we hit an extraction issue
+                  (FS#7692, FS#22034)
+              - improved interactive selection for groups/provides
+                (FS#19704, FS#19853)
+              - finer grained control of ignoring dependency resolution
+                - -Sd to ignore dependency versions only
+                - -Sdd to ignore all dependency information
+              - clean-up of --help output (FS#19526)
+              - CleanMethod for package cache cleaning can use both
+                KeepInstalled and KeepCurrent simultaneously
+              - various speed-ups:
+                - improved internal storage of the package cache
+                - faster pkgname/depends searches
+              - use OpenSSL crypto functions if available
+              - makepkg:
+                - add support for running testsuites in a check() function
+                  (FS#15145)
+                  - controlled by BUILDENV option 'check' in makepkg.conf
+                    which may be overridden by --check/--nocheck on the
+                    command-line
+                - extract any file bsdtar recognizes
+                - STRIP_DIRS has been removed in favor of stripping all
+                  recognized files
+                - improve $srcdir/$pkgdir check to reduce false positives
+                - $pkgname can be used in split package() functions (FS#22174)
+                - added '!buildflags' option to allow unsetting of CFLAGS,
+                  CXXFLAGS and LDFLAGS
+              - repo-add: added -f/--files to create files database (FS#11302)
+              - pactree: rewritten in C using libalpm
 3.4.3         - fix attempted double remove of all files issue during upgrades
               - respect IgnorePkg/IgnoreGroup for group members (FS#19854)
               - back out epoch changes; 3.5.X will handle them differently

README

@@ -73,8 +73,8 @@ 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
+* localdb: A alpm_db_t structure for the local (installed) database
-* syncdbs: A list of pmdb_t structures to which pacman can sync from.
+* syncdbs: A list of alpm_db_t structures to which pacman can sync from.
 
 The following options are write-only, having ONLY alpm_option_set_* functions:
 
@@ -192,8 +192,8 @@ remove.c and sync.c).
 
 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
+control the output like totaldownload, or the behavior with cleanmethod and
-cleanmethod and syncfirst).  The rest is used to configure the library.
+syncfirst).  The rest is used to configure the library.
 
 
 [UPGRADE/REMOVE/SYNC]
@@ -328,3 +328,120 @@ API CHANGES BETWEEN 3.3 AND 3.4
 - alpm_pkg_unused_deltas()
 - alpm_conflict_get_reason()
 - error code: PM_ERR_PKG_INVALID_ARCH
+
+
+API CHANGES BETWEEN 3.4 AND 3.5
+===============================
+
+[REMOVED]
+- alpm_db_register_local()
+- alpm_pkg_has_force()
+- alpm_depcmp()
+
+[CHANGED]
+- alpm_trans_cb_progress type had some types changed from int to size_t
+- alpm_cb_log format string is now const char *
+- the interface to add/remove targets:
+  - functions take pmpkg_t * rather than char *.
+  - alpm_sync_target() and alpm_sync_dbtarget() are replaced by alpm_add_pkg()
+  - alpm_add_target() is replaced by alpm_add_pkg()
+  - alpm_remove_target() is replaced by alpm_remove_pkg()
+  - packages can come from:
+     - alpm_db_get_pkg() for normal targets
+     - alpm_find_dbs_satisfier() for versioned provisions
+     - alpm_find_grp_pkgs() for groups
+- alpm_deptest() is replaced by the more flexibile alpm_find_satisfier()
+- size_t used for alpm_list_t sizes
+  - return type for alpm_list_count()
+  - parameter type in alpm_list_msort() and alpm_list_nth()
+
+[ADDED]
+- alpm_option_get_checkspace(), alpm_option_set_checkspace()
+- alpm_find_grp_pkgs()
+- alpm_trans_get_flags()
+- error codes:
+   PM_ERR_DISK_SPACE, PM_ERR_WRITE
+- flags
+   PM_TRANS_FLAG_NODEPVERSION, PM_TRANS_EVT_DISKSPACE_START,
+   PM_TRANS_EVT_DISKSPACE_DONE, PM_TRANS_CONV_SELECT_PROVIDER,
+   PM_TRANS_PROGRESS_DISKSPACE_START, PM_TRANS_PROGRESS_INTEGRITY_START
+
+API CHANGES BETWEEN 3.5 AND 4.0
+===============================
+
+[REMOVED]
+- error codes:
+    PM_ERR_LIBFETCH, PM_ERR_WRITE
+- alpm_option_set_root(), alpm_option_set_dbpath()
+- alpm_list_first()
+- alpm_grp_get_name(), alpm_grp_get_pkgs()
+- alpm_delta_get_from(), alpm_delta_get_to(), alpm_delta_get_filename(),
+    alpm_delta_get_md5sum(), alpm_delta_get_size()
+- alpm_miss_get_target(), alpm_miss_get_dep(), alpm_miss_get_causingpkg()
+- alpm_dep_get_mod(), alpm_dep_get_name(), alpm_dep_get_version()
+- alpm_conflict_get_package1(), alpm_conflict_get_package2(),
+    alpm_conflict_get_reason()
+- alpm_fileconflict_get_target(), alpm_fileconflict_get_type(),
+    alpm_fileconflict_get_file(), alpm_fileconflict_get_ctarget()
+- alpm_db_get_url()
+
+[CHANGED]
+- PM_ prefixes for enum values are now ALPM_
+- pm prefixes for structs and enums are now alpm_
+- alpm_initialize now has parameters: char *root, char *dbpath,
+    _alpm_errno_t *err and returns an alpm_handle_t struct.
+- alpm_release now takes an alpm_handle_t *.
+- alpm_db_register_sync() now requires a extra parameter of a alpm_siglevel_t.
+- alpm_pkg_load() now requires an extra parameter of an alpm_siglevel_t
+- alpm_db_setserver() replaced by alpm_db_set_servers(), alpm_db_add_server(),
+    alpm_db_remove_server()
+- alpm_trans_init() no longer takes callbacks, set those using
+    alpm_option_set_*cb() functions
+- many functions now require a first parameter of an alpm_handle_t *:
+  - alpm_option_get_*
+  - alpm_option_set_*
+  - alpm_option_add_*
+  - alpm_option_remove_*
+  - alpm_trans_*
+  - alpm_add_pkg
+  - alpm_checkconflicts
+  - alpm_checkdeps
+  - alpm_db_register_sync
+  - alpm_db_set_pkgreason
+  - alpm_db_unregister_all
+  - alpm_fetch_pkgurl
+  - alpm_find_dbs_satisfier
+  - alpm_logaction
+  - alpm_pkg_load
+  - alpm_release
+  - alpm_remove_pkg
+  - alpm_sync_sysupgrade
+- several structs are no longer opaque
+  - alpm_conflict_t
+  - alpm_delta_t
+  - alpm_depend_t
+  - alpm_depmissing_t
+  - alpm_depmod_t
+  - alpm_fileconflict_t
+  - alpm_group_t
+  - alpm_pkg_reason_t
+
+[ADDED]
+- option functions:
+    alpm_{get,set}_eventcb(), alpm_option_{get,set}_convcb(),
+	alpm_option_{get,set}_progresscb()
+- package signing functions:
+    alpm_option_get_default_siglevel(), alpm_option_set_default_siglevel(),
+    alpm_option_get_gpgdir(), alpm_option_set_gpgdir(), alpm_db_get_siglevel(),
+    alpm_siglist_cleanup(), alpm_db_check_pgp_signature(), alpm_pkg_check_pgp_signature(),
+    alpm_pkg_get_origin(), alpm_pkg_get_sha256sum(), alpm_pkg_get_base64_sig()
+- list functions:
+    alpm_list_to_array(), alpm_list_previous()
+- structs:
+    alpm_backup_t, alpm_file_t, alpm_filelist_t
+- enums:
+    alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t, alpm_pkgfrom_t
+- error codes:
+    ALPM_ERR_DB_INVALID, ALPM_ERR_DB_INVALID_SIG, ALPM_ERR_GPGME,
+    ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, ALPM_ERR_SIG_INVALID,
+    ALPM_ERR_SIG_MISSING

TODO.aaron

@@ -1,57 +0,0 @@
-== This is my custom TODO file ==
-
-* transaction object should contain two package list (install and remove)
-  instead of a single list of syncpkgs - this should allow us to get rid of that
-  type.  This also requires seperate functionality to return a list of
-  "replaces" packages to the front end, so the frontend can handle the QUESTION()
-  stuff in that case
-
-* libalpm -> front end communication needs a work-up.  Both progress functions
-  can be combined into one callback, IFF we adjust it to accept a prefix string
-  for the progress bars, and format it at the lib side.  Question functions
-  should also do the same - create the string at the library side, and simply
-  call some sort of int yes_no = ask_question("Do foo with bar?");
-
-* move logging (alpm_logaction) out of the library.  log files should be
-  written by the app, not the library.  Adding a PM_LOG_* constant that
-  frontends can recognize and send to a file is probably a good idea.
-
-* clear up list allocation/deallocation - some lists need to be free'd, some
-  do not and there is no clear indication WHEN this should happen.
-
-* remove DB entries (directories) on a read error?
-
-* Add a pm_errstr error string, which will allow us to do things like:
-    pm_errno = PM_ERR_LIBARCHIVE;
-    pm_errstr = archive_error_string(archive);
-  or:
-    pm_errno = PM_ERR_LIBDOWNLOAD;
-    pm_errstr = downloadLastErrString;
-  This way we don't break abstraction when returning specific errors in
-  cases like the above.
-
-* pacman: A LOT of functions are way too long.  There should be an upper limit of
-  100-200 lines.  _alpm_add_commit is around 600 lines, and is far too complex.
-
-* pacman: fixup doxygen documentation for public interface
-
-* feature for 3.1: package file hooks *
-  I've been planning on this one for some time.  Here's a simple rundown:
-  in /etc/pacman.d/hooks:
-     Hook /usr/include/* : /usr/bin/ctags -R /usr/include/*.h -f /usr/include/systags
-  This will allow us to make "global hooks" to simplify a lot of repetitive
-  install files (scrollkeeper, depmod, etc).  This also allows us to move
-  ldconfig out of pacman entirely.
-  possible: /etc/pacman.hooks/* files for hooks, so packages can add them too
-
-* feature for 3.1: multiple search/match types
-  option: MatchType regex (current way)
-          MatchType fnmatch (use fnmatch to match things like 'pacman -S gnome*')
-          MatchType plain (no matching.  expect plain text).
-
-* feature for 3.1: revamp the autotools system.  I'd LOVE to use a manual system
-  like wmii and friends do.  It'd be real nice if we could just do away with
-  autotools altogether.
-
-**** BUGS ****
-* Removal of conflicts on -A and -U (INCOMPLETE)

TODO.dan

@@ -1,101 +0,0 @@
-TODO.dan
-========
-
-This is my personal TODO list. No guarantees if it is out of date and things no
-longer apply. If you want to help out with any of it, send me an email.
-
-Pacman 3.1:
------------
-
-Downgrade feature - allow users to see cached packages and downgrade to
-(previous or any?) available options.
-
-Installed size and download size in -Si/Qi output should scale with package
-size- KB to MB to GB. We should also get consistancy of K/KB, M/MB, etc.
-
-Extreme similarity between some of the sync and add code...we have to be able
-to abstract more away from sync actions and add actions to just 'actions'
-(example: sync,c, add.c, and deptest.c all contain a switch on PM_DEP_MOD_*).
-Merge update, add, and sync code when possible, so we reduce duplication.
-
-Review progress/transaction event subsystem. (from TODO)
-
-Add Doxygen comments to every function in libalpm including private functions.
-Ensure functions are doing exactly their purpose and nothing more. Find
-functions that perform duplicate behavior and merge them. Combine and refactor
-others. Delete unnecessary functions. Stop keeping everything clustered in
-little add/sync/remove parts, allow transactions to share code.
-
-Go through options list. Decide if namings are good, all options are still
-relevant, etc. Ideas for -Re (#6273), changing meaning of -c (has two meanings,
-another FS bug), etc. Remove the -A flag and possibly -D, -T, and -Y (-Y is
-killed now in favor of vercmp binary) if they can be done by other actions.
-Possible switch of -U --> -I (#5571).
-
-Review display and logging functions. There seems to be an abundance of them.
-Make it extensible to use color, review what verbose/debug means. Perhaps
-separate logging functionality- Pacman has its normal log, and alpm backend
-keeps a very simple log file - listing only adds (including syncs) and removes.
-This way a consistency list can be kept of what is currently installed and what
-isn't, without all the logging junk from the front end.
-
-Profile the code. Find the functions that are being called a lot, and see what
-can be done about it. Find out if all these calls are necessary (e.g. excessive
-alpm_list_count calls), and maybe think about changing data structures to speed
-operations up (e.g. a 'count' field). NOTE: already found two huge issues with
-quick profiling- excessive setlocale calls, and extremely excessive strcmp
-calls.
-
-Fix other localized issues- use non-printf when necessary. We may need to use
-some wchar_t output on the progress bar as char/byte counts differ here. Sizes
-of packages (e.g. 10,400.23 MB) should all be localized with correct
-seperators.
-
-Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should
-allow us to do this. Make universal message functions for systemwide use,
-including all pacman utilites- abs, pacman-optimize, etc.
-
-Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?,
-6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571
-
-Update doxygen comments, they may need some work. Try to document all of the
-private internal functions too- it helps a ton for people just getting a
-start on pacman hacking.
-
-Other smaller things:
----------------------
-
-unsigned int vs. unsigned- determine a standard and stick with it
-
-FS #4185 - move where message is logged, perhaps?
-
-Update copyrights (2007)
-
-Update pacman website, and add/finish pacman coding style page
-
-Refine makepkg error codes. Each kind of failure could have its own code:
-  --package already built
-  --failed integ checks
-  --failed build
-  --etc.
-
-Add utility function to either frontend or backend to convert sizes: e.g. bytes
-to KB, MB, GB.
-
-Revamp the downloadprog function a bit. Seems kind of messy.
-
---print-uri option to sync should not require saying yes or no to up to date
-
-Build a replacement for this, or at least standardize its use. We shouldn't
-always need to pass handle->root around, it is constant. Something like char*
-buildpath(file).
-	/* build the new entryname relative to handle->root */
-	snprintf(filename, PATH_MAX, "%s%s", handle->root, entryname);
-
-Random ideas:
--------------
-
-Possibly split utilities/extras from pacman package
-
-Make .indent.pro file for GNU indent (started, but didn't finish)
-

TRANSLATORS

@@ -1,14 +1,13 @@
-Thanks to all of those who have helped translate pacman, both in the past
+Thanks to all of those who have helped translate pacman, both in the past and
-and currently. Here are some of the current translators (past translators
+currently. Our translations are currently maintained in Transifex; please read
-can be found by looking in the GIT history).
+doc/translation-help.txt for more details.
 
-If your language is listed here and you are interested in helping translate,
+Below is a list of past translators before we switched to Transifex; more can
-contact either the pacman mailing list at pacman-dev@archlinux.org, or one
+be found by looking in the GIT history.
-of the translators listed above.
 
-If your language is not listed here and you wish it was, let the pacman mailing
+If your language is not already in the various po/ subdirectories and you wish
-list know you are interested in making a translation. We will be happy to add
+it was, set up a team in Transifex for your language and we will be happy to
-your language to the mix.
+add your language to the mix.
 
 Catalan (ca):
 	Manuel Tortosa <manutortosa@chakra-project.org>

autoclean.sh

@@ -26,12 +26,7 @@ rm -f test/pacman/*.pyc
 rm -f doc/html/*.html
 rm -f doc/man3/*.3
 
-rm -f po/{Makefile.in,Makefile}
+rm -f {lib/libalpm,scripts,src/pacman}/po/{Makefile.in,Makefile}
-rm -f po/POTFILES
+rm -f {lib/libalpm,scripts,src/pacman}/po/POTFILES
-rm -f po/stamp-po
+rm -f {lib/libalpm,scripts,src/pacman}/po/stamp-po
-rm -f po/*.gmo
+rm -f {lib/libalpm,scripts,src/pacman}/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

autogen.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -xu
 
-aclocal
+aclocal -I m4 --install
 autoheader
 automake --foreign
 autoconf

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, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2010-08-21'
 
 # 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
@@ -27,16 +27,16 @@ timestamp='2008-01-23'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
+# Originally written by Per Bothner.  Please send patches (context
-# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# diff and a properly formatted ChangeLog entry.
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
+# You can get the latest version of this script from:
-# don't specify an explicit build system type.
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -91,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -105,7 +106,7 @@ trap 'exit 1' 1 2 15
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -324,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -532,7 +552,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	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
@@ -640,7 +660,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -791,12 +811,12 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -806,6 +826,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -835,6 +858,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -857,6 +894,17 @@ EOF
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -866,74 +914,33 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
+	#undef ${UNAME_MACHINE}
-	#undef mipsel
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
+    padre:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo sparc-unknown-linux-gnu
 	exit ;;
-    ppc64:Linux:*:*)
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo hppa64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
@@ -943,8 +950,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+    ppc64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -958,6 +968,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -965,71 +978,8 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1058,7 +1008,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1102,8 +1052,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
+        # the processor, so we play safe by assuming i586.
-	echo i386-pc-msdosdjgpp
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1141,6 +1094,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1153,7 +1116,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1216,6 +1179,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1243,6 +1209,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1324,6 +1300,9 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

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, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2010-09-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2008-01-16'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ 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,
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -120,8 +124,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -148,10 +154,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -249,13 +258,16 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,28 +280,41 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -320,7 +345,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -329,14 +354,17 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -351,27 +379,30 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -439,6 +470,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -455,10 +490,27 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +578,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -699,6 +755,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -803,6 +862,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+        neo-tandem)
+		basic_machine=neo-tandem
+		;;
+        nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1037,17 +1102,10 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
+        # This must be matched before tile*.
-		basic_machine=tic54x-unknown
+        tilegx*)
-		os=-coff
+		basic_machine=tilegx-unknown
-		;;
+		os=-linux-gnu
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1128,6 +1186,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1166,7 +1228,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1216,6 +1278,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1236,10 +1301,11 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,9 +1314,10 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1258,7 +1325,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1388,6 +1455,11 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1428,6 +1500,15 @@ case $basic_machine in
         c4x-* | tic4x-*)
         	os=-coff
 		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1585,7 +1666,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)

configure.ac

@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 # Minimum version of autoconf required
-AC_PREREQ(2.60)
+AC_PREREQ(2.62)
 
 # UPDATING VERSION NUMBERS FOR RELEASES
 #
@@ -41,13 +41,13 @@ AC_PREREQ(2.60)
 #   Bugfix releases:
 #     pacman_version_micro += 1
 
-m4_define([lib_current], [5])
+m4_define([lib_current], [7])
-m4_define([lib_revision], [3])
+m4_define([lib_revision], [0])
 m4_define([lib_age], [0])
 
-m4_define([pacman_version_major], [3])
+m4_define([pacman_version_major], [4])
-m4_define([pacman_version_minor], [4])
+m4_define([pacman_version_minor], [0])
-m4_define([pacman_version_micro], [3])
+m4_define([pacman_version_micro], [0])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -70,7 +70,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION], ["$LIB_VERSION"], [libalpm version number])
 
 # Help line for root directory
 AC_ARG_WITH(root-dir,
-	AS_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 the root operating directory]),
 	[ROOTDIR=$withval], [ROOTDIR=/])
 
 # Help line for package extension
@@ -83,20 +83,23 @@ AC_ARG_WITH(src-ext,
 	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,
-	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
+# Help line for using OpenSSL
-AC_ARG_ENABLE(internal-download,
+AC_ARG_WITH(openssl,
-	AS_HELP_STRING([--disable-internal-download], [do not build with libfetch support]),
+	AS_HELP_STRING([--with-openssl], [use OpenSSL crypto implementations instead of internal routines]),
-	[internaldownload=$enableval], [internaldownload=yes])
+	[], [with_openssl=check])
+
+# Help line for using gpgme
+AC_ARG_WITH(gpgme,
+	AS_HELP_STRING([--with-gpgme], [use GPGME for PGP signature verification]),
+	[], [with_gpgme=check])
+
+# Check for useable libcurl
+LIBCURL_CHECK_CONFIG([yes], [7.19.4], [with_libcurl=yes], [with_libcurl=no])
 
 # Help line for documentation
 AC_ARG_ENABLE(doc,
@@ -122,58 +125,88 @@ AC_ARG_ENABLE(git-version,
 # Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC_C99
+AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false])
+AC_PATH_PROGS([BASH_SHELL], [bash bash4 bash3], [false])
 
 # find installed gettext
-AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.13.1)
 
+AC_CHECK_LIB([m], [fabs], ,
+	AC_MSG_ERROR([libm is needed to compile pacman!]))
+
 # Check for libarchive
 AC_CHECK_LIB([archive], [archive_read_data], ,
 	AC_MSG_ERROR([libarchive is needed to compile pacman!]))
 
-# Enable or disable usage of libfetch
+# Check for OpenSSL
-AC_MSG_CHECKING(whether to link with libfetch)
+AC_MSG_CHECKING(whether to link with libssl)
-if test "x$internaldownload" = "xyes" ; then
+AS_IF([test "x$with_openssl" != "xno"],
-	AC_MSG_RESULT(yes)
+	[AC_MSG_RESULT(yes)
-	AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library])
+	AC_CHECK_LIB([ssl], [MD5_Final], ,
-	# Check for a download library if it was actually requested
+	[if test "x$with_openssl" != "xcheck"; then
-	AC_CHECK_LIB([fetch], [fetchParseURL], ,
+		AC_MSG_FAILURE([--with-openssl was given, but -lssl was not found])
-		AC_MSG_ERROR([libfetch is needed to compile with internal download support]), [-lcrypto -ldl] )
+	fi],
-	# Check if libfetch supports conditional GET
+	[-lcrypto])
-	# (version >=2.21, struct url has member last_modified)
+	with_openssl=$ac_cv_lib_ssl_MD5_Final],
-	AC_CHECK_MEMBER(struct url.last_modified, ,
+	AC_MSG_RESULT(no))
-		AC_MSG_ERROR([libfetch must be version 2.21 or greater]),
+AM_CONDITIONAL([HAVE_LIBSSL], [test "x$with_openssl" = "xyes"])
-		[#include <fetch.h>] )
+
-else
+# Check for gpgme
-	AC_MSG_RESULT(no)
+AC_MSG_CHECKING(whether to link with libgpgme)
-fi
+AS_IF([test "x$with_gpgme" != "xno"],
-AM_CONDITIONAL(INTERNAL_DOWNLOAD, test "x$internaldownload" = "xyes")
+	[AC_MSG_RESULT(yes)
+	AC_CHECK_LIB([gpgme], [gpgme_check_version], ,
+	[if test "x$with_gpgme" != "xcheck"; then
+		AC_MSG_FAILURE([--with-ggpme was given, but -lgpgme was not found])
+	fi],
+	[-lgpgme])
+	with_gpgme=$ac_cv_lib_gpgme_gpgme_check_version],
+	AC_MSG_RESULT(no))
+AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"])
 
 # Checks for header files.
-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])
+AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \
+                  mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \
+                  sys/param.h sys/statvfs.h sys/time.h sys/types.h \
+                  sys/ucred.h syslog.h termios.h wchar.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
+AC_TYPE_INT64_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
 AC_STRUCT_TM
 AC_TYPE_UID_T
+AC_STRUCT_DIRENT_D_TYPE
+PATH_MAX_DEFINED
 
 # Checks for library functions.
 AC_FUNC_FORK
+AC_FUNC_GETMNTENT
 AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
 AC_FUNC_MKTIME
-AC_TYPE_SIGNAL
+AC_FUNC_STRCOLL
-AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \
+AC_CHECK_FUNCS([dup2 getcwd geteuid getmntinfo gettimeofday memmove memset \
-                strndup strrchr strsep swprintf \
+                mkdir realpath regcomp rmdir setenv setlocale strcasecmp \
-                wcwidth uname])
+                strchr strcspn strdup strerror strndup strrchr strsep strstr \
+                strtol swprintf tcflush wcwidth uname])
+
+# For the diskspace code
+FS_STATS_TYPE
+AC_CHECK_MEMBERS([struct statvfs.f_flag],,,[[#include <sys/statvfs.h>]])
+AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h>
+                  #include <sys/mount.h>]])
 
 # Enable large file support if available
 AC_SYS_LARGEFILE
@@ -192,7 +225,7 @@ STRIP_STATIC="--strip-debug"
 case "${host_os}" in
 	*bsd*)
 		SIZECMD="stat -L -f %z"
-		SEDINPLACE="sed -i ''"
+		SEDINPLACE="sed -i \"\""
 		;;
 	cygwin*)
 		host_os_cygwin=yes
@@ -217,48 +250,10 @@ AC_SUBST(STRIP_BINARIES)
 AC_SUBST(STRIP_SHARED)
 AC_SUBST(STRIP_STATIC)
 
-# Check for architecture, used in default makepkg.conf
+# Variables plugged into makepkg.conf
-# (Note single space left after CARCHFLAGS)
+CARCH="${host%%-*}"
-case "${host}" in
-	i686-*)
-		CARCH="i686"
-		CARCHFLAGS="-march=i686 "
-		;;
-	x86_64-*)
-		CARCH="x86_64"
-		CARCHFLAGS="-march=x86-64 "
-		;;
-	ia64-*)
-		CARCH="ia64"
-		CARCHFLAGS="-march=ia64 "
-		;;
-	sparc-*)
-		CARCH="sparc"
-		CARCHFLAGS="-mcpu=v9 "
-		;;
-	ppc-* | powerpc-*)
-		CARCH="ppc"
-		CARCHFLAGS="-mcpu=750 "
-		;;
-	i386-*)
-		CARCH="i386"
-		CARCHFLAGS="-march=i386 "
-		;;
-	arm-*)
-		CARCH="arm"
-		CARCHFLAGS="-march=armv4 "
-		;;
-	*)
-		AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]])
-		CARCH="unknown"
-		CARCHFLAGS=""
-		;;
-esac
-
-# Now do some things common to all architectures
 CHOST="${host}"
 AC_SUBST(CARCH)
-AC_SUBST(CARCHFLAGS)
 AC_SUBST(CHOST)
 
 # Check for documentation support and status
@@ -305,6 +300,7 @@ if test "x$debug" = "xyes" ; then
 	# Check for -fstack-protector availability
 	GCC_STACK_PROTECT_LIB
 	GCC_STACK_PROTECT_CC
+	GCC_FORTIFY_SOURCE_CC
 	CFLAGS="$CFLAGS -g -Wall -Werror"
 else
 	AC_MSG_RESULT(no)
@@ -338,9 +334,6 @@ AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packa
 # Set source package file extension
 AC_SUBST(SRCEXT)
 AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman source packages])
-# 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])
@@ -350,11 +343,12 @@ AC_CONFIG_FILES([
 lib/libalpm/Makefile
 lib/libalpm/po/Makefile.in
 src/pacman/Makefile
+src/pacman/po/Makefile.in
 src/util/Makefile
 scripts/Makefile
+scripts/po/Makefile.in
 doc/Makefile
 etc/Makefile
-po/Makefile.in
 test/pacman/Makefile
 test/pacman/tests/Makefile
 test/util/Makefile
@@ -374,12 +368,15 @@ ${PACKAGE_NAME}:
     localstatedir          : $(eval echo ${localstatedir})
        database dir        : $(eval echo ${localstatedir})/lib/pacman/
        cache dir           : $(eval echo ${localstatedir})/cache/pacman/pkg/
+
     compiler               : ${CC}
+    preprocessor flags     : ${CPPFLAGS}
     compiler flags         : ${CFLAGS}
     defines                : ${DEFS}
+    library flags          : ${LIBS}
+    linker flags           : ${LDFLAGS}
 
     Architecture           : ${CARCH}
-    Architecture flags     : ${CARCHFLAGS}
     Host Type              : ${CHOST}
     Filesize command       : ${SIZECMD}
     In-place sed command   : ${SEDINPLACE}
@@ -393,12 +390,13 @@ ${PACKAGE_NAME}:
     root working directory : ${ROOTDIR}
     package extension      : ${PKGEXT}
     source pkg extension   : ${SRCEXT}
-    database extension     : ${DBEXT}
     build script name      : ${BUILDSCRIPT}
 
   Compilation options:
+    Use libcurl            : ${with_libcurl}
+    Use GPGME              : ${with_gpgme}
+    Use OpenSSL            : ${with_openssl}
     Run make in doc/ dir   : ${wantdoc} ${asciidoc}
-    Use download library   : ${internaldownload}
     Doxygen support        : ${usedoxygen}
     debug support          : ${debug}
 "

contrib/.gitignore

@@ -0,0 +1,10 @@
+bacman
+bash_completion
+paccache
+pacdiff
+paclist
+paclog-pkglist
+pacscripts
+pacsearch
+wget-xdelta.sh
+zsh_completion

contrib/Makefile.am

@@ -1,15 +1,65 @@
-EXTRA_DIST = \
+OURSCRIPTS = \
-	PKGBUILD.vim \
 	bacman \
-	bash_completion \
+	paccache \
 	pacdiff \
 	paclist \
+	paclog-pkglist \
 	pacscripts \
-	pacsearch \
+	pacsearch
-	pactree \
+
+OURFILES = \
+	bash_completion \
+	zsh_completion
+
+EXTRA_DIST = \
+	PKGBUILD.vim \
+	bacman.in \
+	bash_completion.in \
+	paccache.in \
+	paclog-pkglist.in \
+	pacdiff.in \
+	paclist.in \
+	pacscripts.in \
+	pacsearch.in \
 	vimprojects \
-	wget-xdelta.sh \
+	zsh_completion.in \
-	zsh_completion \
 	README
 
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp
+
+edit = sed \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
+	-e '1s|!/bin/bash|!$(BASH_SHELL)|g'
+
+$(OURSCRIPTS): Makefile
+	@echo '    ' GEN $@;
+	@$(RM) $@ $@.tmp
+	@$(edit) $(srcdir)/$@.in >$@.tmp
+	@chmod +x $@.tmp
+	@chmod a-w $@.tmp
+	@mv $@.tmp $@
+
+$(OURFILES): Makefile
+	@echo '    ' GEN $@;
+	@$(RM) $@ $@.tmp
+	@$(edit) $(srcdir)/$@.in >$@.tmp
+	@chmod a-w $@.tmp
+	@mv $@.tmp $@
+
+all-am: $(OURSCRIPTS) $(OURFILES)
+
+bacman: $(srcdir)/bacman.in
+bash_completion: $(srcdir)/bash_completion.in
+paccache: $(srcdir)/paccache.in
+pacdiff: $(srcdir)/pacdiff.in
+paclist: $(srcdir)/paclist.in
+paclog-pkglist: $(srcdir)/paclog-pkglist.in
+pacscripts: $(srcdir)/pacscripts.in
+pacsearch: $(srcdir)/pacsearch.in
+pactree: $(srcdir)/pactree.in
+zsh_completion: $(srcdir)/zsh_completion.in
+
 # vim:set ts=2 sw=2 noet:

contrib/PKGBUILD.vim

@@ -13,6 +13,7 @@ elseif exists("b:current_syntax")
 endif
 
 let b:main_syntax = "sh"
+let b:is_bash = 1
 runtime! syntax/sh.vim
 
 " case on
@@ -40,7 +41,7 @@ syn match pbPkgverGroup /^pkgver=.*/ contains=pbIllegalPkgver,pbValidPkgver,pb_k
 
 " pkgrel
 syn keyword pb_k_pkgrel pkgrel contained
-syn match pbValidPkgrel /[[:digit:]]*/ contained contains=pbIllegalPkgver
+syn match pbValidPkgrel /[[:digit:]]*/ contained contains=pbIllegalPkgrel
 syn match pbIllegalPkgrel /[^[:digit:]=]\|=.*=/ contained
 syn match pbPkgrelGroup /^pkgrel=.*/ contains=pbIllegalPkgrel,pbValidPkgrel,pb_k_pkgrel,shDoubleQuote,shSingleQuote
 
@@ -52,6 +53,12 @@ syn match pbValidPkgdesc /[^='"]\.\{,80}/ contained contains=pbIllegalPkgdesc
 syn match pbPkgdescGroup /^pkgdesc=.*/ contains=pbIllegalPkgdesc,pb_k_desc,pbValidPkgdesc,shDoubleQuote,shSingleQuote
 syn match pbPkgdescSign /[='"]/ contained
 
+" epoch
+syn keyword pb_k_epoch epoch contained
+syn match pbValidEpoch /[[:digit:]]*/ contained contains=pbIllegalEpoch
+syn match pbIllegalEpoch /[^[:digit:]=]\|=.*=/ contained
+syn match pbEpochGroup /^epoch=.*/ contains=pbIllegalEpoch,pbValidEpoch,pb_k_epoch,shDoubleQuote,shSingleQuote
+
 " url
 syn keyword pb_k_url url contained
 syn match pbValidUrl /['"]*\(https\|http\|ftp\)\:\/.*\.\+.*/ contained
@@ -100,6 +107,11 @@ syn keyword pb_k_optdepends optdepends contained
 syn match pbValidOptdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
 syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote
 
+" checkdepends
+syn keyword pb_k_ckdepends ckdepends contained
+syn match pbValidCkdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbCkdependsGroup start=/^checkdepends=(/ end=/)/ contains=pb_k_ckdepends,pbValidCkdepends,shDoubleQuote,shSingleQuote
+
 " conflicts
 syn keyword pb_k_conflicts conflicts contained
 syn match pbValidConflicts /\([[:alnum:]]\|+\|-\|_\)*/ contained
@@ -166,7 +178,7 @@ hi def link pbValidSha1sums  Number
 
 " options
 syn keyword pb_k_options options contained
-syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|force\)/ contained
+syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags\)/ 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
@@ -208,6 +220,9 @@ hi def link pb_k_pkgrel pbKeywords
 hi def link pbIllegalPkgdesc Error
 hi def link pb_k_desc pbKeywords
 
+hi def link pbIllegalEpoch Error
+hi def link pb_k_epoch pbKeywords
+
 hi def link pbIllegalUrl Error
 hi def link pb_k_url pbKeywords
 
@@ -222,6 +237,7 @@ hi def link pbIllegalArch Error
 hi def link pb_k_groups pbKeywords
 hi def link pb_k_makedepends pbKeywords
 hi def link pb_k_optdepends pbKeywords
+hi def link pb_k_ckdepends pbKeywords
 hi def link pb_k_depends pbKeywords
 hi def link pb_k_replaces pbKeywords
 hi def link pb_k_conflicts pbKeywords

contrib/README

@@ -23,14 +23,8 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed
 packages are easily identified with a *** and local-only packages are also
 listed.
 
-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.
 
 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.
-This should cut download sizes for some package upgrades significantly.

contrib/bacman

@@ -1,310 +0,0 @@
-#!/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_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}')
-
-#
-# .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
-
-comp_files=".PKGINFO"
-
-if [ -f "$pkg_dir/install" ] ; then
-    cp "$pkg_dir/install" "$work_dir/.INSTALL"
-    comp_files+=" .INSTALL"
-fi
-if  [ -f $pkg_dir/changelog ] ; then
-    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
-    comp_files+=" .CHANGELOG"
-fi
-
-#
-# 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..."
-
-case "$PKGEXT" in
-	*tar.gz)  EXT=${PKGEXT%.gz} ;;
-	*tar.bz2) EXT=${PKGEXT%.bz2} ;;
-	*tar.xz)  EXT=${PKGEXT%.xz} ;;
-	*tar)     EXT=${PKGEXT} ;;
-	*) echo "WARNING: '%s' is not a valid archive extension." \
-	"$PKGEXT" ; EXT=$PKGEXT ;;
-esac
-
-pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
-ret=0
-
-# when fileglobbing, we want * in an empty directory to expand to
-# the null string rather than itself
-shopt -s nullglob
-# TODO: Maybe this can be set globally for robustness
-shopt -s -o pipefail
-bsdtar -cf - $comp_files * |
-case "$PKGEXT" in
-    *tar.gz)  gzip -c -f -n ;;
-    *tar.bz2) bzip2 -c -f ;;
-    *tar.xz)  xz -c -z - ;;
-    *tar)     cat ;;
-esac > ${pkg_file} || 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/bacman.in

@@ -0,0 +1,306 @@
+#!/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/>.
+#
+
+shopt -s extglob
+shopt -s nullglob
+
+readonly progname="bacman"
+readonly progver="0.2.1"
+
+#
+# User Friendliness
+#
+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 (( $# != 1 )); then
+	usage
+	exit 1
+fi
+
+if [[ $1 == "--help" || $1 == "-h" ]]; then
+	usage
+	exit 0
+fi
+
+if [[ $1 == "--version" || $1 == "-v" ]]; then
+	echo "$progname version $progver"
+	echo "Copyright (C) 2008 locci"
+	exit 0
+fi
+
+#
+# Fakeroot support
+#
+if (( EUID )); then
+	if [[ -f /usr/bin/fakeroot ]]; then
+		echo "Entering fakeroot environment"
+		export INFAKEROOT="1"
+		/usr/bin/fakeroot -u -- "$0" "$@"
+		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 @sysconfdir@/pacman.conf ]]; then
+	echo "ERROR: unable to read @sysconfdir@/pacman.conf"
+	exit 1
+fi
+
+eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf)
+pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local"
+
+if [[ ! -r @sysconfdir@/makepkg.conf ]]; then
+	echo "ERROR: unable to read @sysconfdir@/makepkg.conf"
+	exit 1
+fi
+
+source "@sysconfdir@/makepkg.conf"
+if [[ -r ~/.makepkg.conf ]]; then
+	source ~/.makepkg.conf
+fi
+
+pkg_arch=${CARCH:-'unknown'}
+pkg_dest="${PKGDEST:-$PWD}"
+pkg_pkger=${PACKAGER:-'Unknown Packager'}
+
+pkg_name="$1"
+pkg_dir=("$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 (( ${#pkg_dir[@]} != 1 )); then
+	printf "ERROR: %d entries for package %s found in pacman database\n" \
+		${#pkg_dir[@]} "${pkg_name}"
+	printf "%s\n" "${pkg_dir[@]}"
+	exit 1
+fi
+
+if [[ ! -d $pkg_dir ]]; then
+	printf "ERROR: package %s is found in pacman database,\n" "${pkg_name}"
+	printf "       but \`%s' is not a directory\n" "${pkg_dir}"
+	exit 1
+fi
+
+#
+# Begin
+#
+echo "Package: ${pkg_namver}"
+work_dir=$(mktemp -d --tmpdir bacman.XXXXXXXXXX)
+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 || -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 )); then
+	rm -rf "$work_dir"
+	exit 1
+fi
+
+pkg_size=$(du -sk | awk '{print $1 * 1024}')
+
+#
+# .PKGINFO stuff
+# TODO adopt makepkg's write_pkginfo() into this or scripts/library
+#
+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} |
+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
+			;;
+		%DEPENDS%)
+			echo "depend = $i"   >> .PKGINFO
+			;;
+		%OPTDEPENDS%)
+			echo "optdepend = $i" >> .PKGINFO
+			;;
+		%CONFLICTS%)
+			echo "conflict = $i" >> .PKGINFO
+			;;
+		%PROVIDES%)
+			echo "provides = $i"  >> .PKGINFO
+			;;
+
+		# files
+		%BACKUP%)
+			# strip the md5sum after the tab
+			echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
+			;;
+	esac
+done
+
+comp_files=".PKGINFO"
+
+if [[ -f $pkg_dir/install ]]; then
+	cp "$pkg_dir/install" "$work_dir/.INSTALL"
+	comp_files+=" .INSTALL"
+fi
+if [[ -f $pkg_dir/changelog ]]; then
+	cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
+	comp_files+=" .CHANGELOG"
+fi
+
+#
+# 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..."
+
+pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
+ret=0
+
+# TODO: Maybe this can be set globally for robustness
+shopt -s -o pipefail
+bsdtar -cf - $comp_files * |
+case "$PKGEXT" in
+	*tar.gz)  gzip -c -f -n ;;
+	*tar.bz2) bzip2 -c -f ;;
+	*tar.xz)  xz -c -z - ;;
+	*tar.Z)   compress -c -f ;;
+	*tar)     cat ;;
+	*) echo "WARNING: '%s' is not a valid archive extension." \
+	"$PKGEXT" >&2; cat ;;
+esac > "${pkg_file}"; ret=$?
+
+if (( ret )); 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.in

@@ -27,16 +27,30 @@ _arch_incomp() {
   local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]]
 }
 
+_pacman_key() {
+  local cur opts prev
+  COMPREPLY=()
+  _get_comp_words_by_ref cur prev
+  if [[ $cur = -* &&
+      $prev != -@(a|-add|c|-config|g|-gpgdir|h|-help|import?(-trustdb)) ]]; then
+    opts=('add delete export finger help list-keys recv-keys updatedb verify version
+           config edit-key gpgdir import import-trustdb init keyserver list-sigs
+           lsign-key populate refresh-keys'
+          'a d e f h l r u v V')
+    _arch_ptr2comp opts
+  fi
+  true
+}
+
 _makepkg() {
   local cur opts prev
   COMPREPLY=()
-  cur=$(_get_cword)
+  _get_comp_words_by_ref cur prev
-  prev=${COMP_WORDS[COMP_CWORD-1]}
+  if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then
-  if [[ $cur = -* && ! $prev =~ ^-(-(cleancache|config|help)$|\w*[Chp]) ]]; then
+    opts=('allsource asroot check clean config force geninteg help holdver ignorearch
-    opts=('allsource asroot clean cleancache config force geninteg help holdver
+           install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar
-           ignorearch install log nobuild nocolor noconfirm nodeps noextract
+           nosign pkg repackage rmdeps sign skipinteg source syncdeps'
-           noprogressbar pkg repackage rmdeps skipinteg source syncdeps'
+          'A L R S c d e f g h i m o p r s')
-          'A C L R c d e f g h i m o p r s')
     _arch_ptr2comp opts
   fi
   true
@@ -55,16 +69,15 @@ _pacman_pkg() {
 _pacman() {
   local common core cur database prev query remove sync upgrade o
   COMPREPLY=()
-  cur=$(_get_cword)
+  _get_comp_words_by_ref cur prev
-  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')
+  remove=('cascade dbonly nodeps nosave print recursive unneeded' 'c n p s u')
-  sync=('asdeps asexplicit clean downloadonly force groups ignore ignoregroup
+  sync=('asdeps asexplicit clean dbonly downloadonly force groups ignore ignoregroup
-         info list needed nodeps print refresh search sysupgrade'
+         info list needed nodeps print refresh recursive search sysupgrade'
         'c f g i l p s u w y')
-  upgrade=('asdeps asexplicit force nodeps print' 'f p')
+  upgrade=('asdeps asexplicit force needed nodeps print recursive' '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')
@@ -111,5 +124,6 @@ else
 fi
 
 complete -F _makepkg -o default makepkg
+complete -F _pacman_key -o default pacman-key
 
 # ex:et ts=2 sw=2 ft=sh

contrib/paccache.in

@@ -0,0 +1,300 @@
+#!/bin/bash
+#
+# pacache - flexible pacman cache cleaning
+#
+# Copyright (C) 2011 Dave Reisner <dreisner@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/>.
+
+
+shopt -s extglob
+
+declare -a candidates=() cmdopts=() whitelist=() blacklist=()
+declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0
+declare    cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch=
+
+msg() {
+	local mesg=$1; shift
+	printf "==> $mesg\n" "$@"
+} >&2
+
+error() {
+	local mesg=$1; shift
+	printf "==> ERROR: $mesg\n" "$@"
+} >&2
+
+die() {
+	error "$@"
+	exit 1
+}
+
+# reads a list of files on stdin and prints out deletion candidates
+pkgfilter() {
+	# there's whitelist and blacklist parameters passed to this
+	# script after the block of awk.
+
+	awk -v keep="$1" -v scanarch="$2" '
+	function parse_filename(filename,     parts, count, i, pkgname, arch) {
+
+		count = split(filename, parts, "-")
+
+		i = 1
+		pkgname = parts[i++]
+		while (i <= count - 3) {
+			pkgname = pkgname "-" parts[i++]
+		}
+
+		arch = substr(parts[count], 1, index(parts[count], ".") - 1)
+
+		# filter on whitelist or blacklist
+		if (wlen && !whitelist[pkgname]) return
+		if (blen && blacklist[pkgname]) return
+
+		if ("" == packages[pkgname,arch]) {
+			packages[pkgname,arch] = filename
+		} else {
+			packages[pkgname,arch] = packages[pkgname,arch] SUBSEP filename
+		}
+	}
+
+	BEGIN {
+		# create whitelist
+		wlen = ARGV[1]; delete ARGV[1]
+		for (i = 2; i < 2 + wlen; i++) {
+			whitelist[ARGV[i]] = 1
+			delete ARGV[i]
+		}
+
+		# create blacklist
+		blen = ARGV[i]; delete ARGV[i]
+		while (i++ < ARGC) {
+			blacklist[ARGV[i]] = 1
+			delete ARGV[i]
+		}
+
+		# read package filenames
+		while (getline < "/dev/stdin") {
+			parse_filename($0)
+		}
+
+		for (pkglist in packages) {
+			# idx[1,2] = idx[pkgname,arch]
+			split(pkglist, idx, SUBSEP)
+
+			# enforce architecture match if specified
+			if (!scanarch || scanarch == idx[2]) {
+				count = split(packages[idx[1], idx[2]], pkgs, SUBSEP)
+				for(i = 1; i <= count - keep; i++) {
+					print pkgs[i]
+				}
+			}
+		}
+	}' "${@:3}"
+}
+
+size_to_human() {
+	awk -v size="$1" '
+	BEGIN {
+		suffix[1] = "B"
+		suffix[2] = "KiB"
+		suffix[3] = "MiB"
+		suffix[4] = "GiB"
+		suffix[5] = "TiB"
+		count = 1
+
+		while (size > 1024) {
+			size /= 1024
+			count++
+		}
+
+		sizestr = sprintf("%.2f", size)
+		sub(/\.?0+$/, "", sizestr)
+		printf("%s %s", sizestr, suffix[count])
+	}'
+}
+
+runcmd() {
+	if (( needsroot )); then
+		msg "Privilege escalation required"
+		if sudo -v &>/dev/null && sudo -l &>/dev/null; then
+			sudo "$@"
+		else
+			printf '%s ' 'root'
+			su -c "$(printf '%q ' "$@")"
+		fi
+	else
+		"$@"
+	fi
+}
+
+summarize() {
+	local -i filecount=$1; shift
+	local seenarch= seen= arch= name=
+	local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*'
+
+	if (( delete )); then
+		printf -v output 'finished: %d packages removed' "$filecount"
+	elif (( move )); then
+		printf -v output "finished: %d packages moved to \`%s'" "$filecount" "$movedir"
+	elif (( dryrun )); then
+		if (( verbose )); then
+			msg "Candidate packages:"
+			while read -r pkg; do
+				if (( verbose >= 3 )); then
+					[[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]}
+					if [[ -z $seen || $seenarch != "$arch" || $seen != "$name" ]]; then
+						printf '%s (%s):\n' "$name" "$arch"
+					fi
+					printf '  %s\n' "$pkg"
+				elif (( verbose >= 2 )); then
+					printf "$PWD/%s$delim" "$pkg"
+				else
+					printf "%s$delim" "$pkg"
+				fi
+			done < <(printf '%s\n' "$@" | pacsort)
+		fi
+		printf -v output 'finished dry run: %d candidates' "$filecount"
+	fi
+
+	printf '\n' >&2
+	msg "$output (diskspace saved: %s)" "$(size_to_human "$totalsaved")"
+}
+
+usage() {
+	cat <<EOF
+usage: ${0##*/} <operation> [options] [targets...]
+
+${0##*/} is a flexible pacman cache cleaning utility, which has numerous
+options to help control how much, and what, is deleted from any directory
+containing pacman package tarballs.
+
+  Operations:
+    -d               perform a dry run, only finding candidate packages.
+    -m  <movedir>    move candidate packages to 'movedir'.
+    -r               remove candidate packages.
+
+  Options:
+    -a  <arch>       scan for 'arch' (default: all architectures).
+    -c  <cachedir>   scan 'cachedir' for packages (default: @localstatedir@/cache/pacman/pkg).
+    -f               apply force to mv(1) and rm(1) operations.
+    -h               display this help message.
+    -i  <pkgs>       ignore 'pkgs', which is a comma separated. Alternatively,
+                     specify '-' to read package names from stdin, newline delimited.
+    -k  <num>        keep 'num' of each package in 'cachedir' (default: 3).
+    -u               target uninstalled packages.
+    -v               increase verbosity. specify up to 3 times.
+    -z               use null delimiters for candidate names (only with -v and -vv)
+
+EOF
+}
+
+if (( ! UID )); then
+	error "Do not run this script as root. You will be prompted for privilege escalation."
+	exit 42
+fi
+
+while getopts ':a:c:dfhi:k:m:rsuvz' opt; do
+	case $opt in
+		a) scanarch=$OPTARG ;;
+		c) cachedir=$OPTARG ;;
+		d) dryrun=1 ;;
+		f) cmdopts=(-f) ;;
+		h) usage
+			exit 0 ;;
+		i) if [[ $OPTARG = '-' ]]; then
+				 [[ ! -t 0 ]] && IFS=$'\n' read -r -d '' -a ign
+			 else
+				 IFS=',' read -r -a ign <<< "$OPTARG"
+			 fi
+			 blacklist+=("${ign[@]}")
+			unset i ign ;;
+		k) keep=$OPTARG
+			if [[ -z $keep || -n ${keep//[0-9]/} ]]; then
+				die 'argument to option -k must be a non-negative integer'
+			else
+				keep=$(( 10#$keep ))
+			fi ;;
+		m) move=1 movedir=$OPTARG ;;
+		r) delete=1 ;;
+		u) IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq)
+			 blacklist+=("${ign[@]}")
+			 unset ign ;;
+		v) (( ++verbose )) ;;
+		z) delim='\0' ;;
+		:) die "option '--%s' requires an argument" "$OPTARG" ;;
+		?) die "invalid option -- '%s'" "$OPTARG" ;;
+	esac
+done
+shift $(( OPTIND - 1 ))
+
+# remaining args are a whitelist
+whitelist=("$@")
+
+# sanity checks
+case $(( dryrun+delete+move )) in
+	0) die "no operation specified (use -h for help)" ;;
+	[^1]) die "only one operation may be used at a time" ;;
+esac
+
+[[ -d $cachedir ]] ||
+	die "cachedir \`%s' does not exist or is not a directory" "$cachedir"
+
+[[ $movedir && ! -d $movedir ]] &&
+	die "move-to directory \`%s' does not exist or is not a directory" "$movedir"
+
+if (( move || delete )); then
+	# make it an absolute path since we're about to chdir
+	[[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir
+	[[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1
+fi
+
+# unlikely that this will fail, but better make sure
+cd "$cachedir" || die "failed to chdir to \`%s'" "$cachedir"
+
+# note that these results are returned in an arbitrary order from awk, but
+# they'll be resorted (in summarize) iff we have a verbosity level set.
+IFS=$'\n' read -r -d '' -a candidates < \
+	<(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort |
+		pkgfilter "$keep" "$scanarch" \
+			"${#whitelist[*]}" "${whitelist[@]}" \
+			"${#blacklist[*]}" "${blacklist[@]}")
+
+if (( ! ${#candidates[*]} )); then
+	msg 'no candidate packages found for pruning'
+	exit 1
+fi
+
+# grab this prior to signature scavenging
+pkgcount=${#candidates[*]}
+
+# copy the list, merging in any found sigs
+for cand in "${candidates[@]}"; do
+  candtemp+=("$cand")
+  [[ -f $cand.sig ]] && candtemp+=("$cand.sig")
+done
+candidates=("${candtemp[@]}")
+unset candtemp
+
+# do this before we destroy anything
+totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum }')
+
+# crush. kill. destroy.
+(( verbose )) && cmdopts+=(-v)
+if (( delete )); then
+	runcmd rm "${cmdopts[@]}" "${candidates[@]}"
+elif (( move )); then
+	runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir"
+fi
+
+summarize "$pkgcount" "${candidates[@]}"

contrib/paclist

@@ -1,88 +0,0 @@
-#!/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/paclist.in

@@ -0,0 +1,43 @@
+#!/bin/bash
+# paclist - List all packages installed from a given repo
+#
+# Copyright (C) 2008 Dan McGee <dpmcgee@gmail.com>
+# Copyright (C) 2011 Dave Reisner <dreisner@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/>.
+
+export TEXTDOMAIN='pacman'
+export TEXTDOMAINDIR='/usr/share/locale'
+
+# determine whether we have gettext; make it a no-op if we do not
+if ! type gettext &>/dev/null; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
+if [[ -z $1 ]]; then
+	printf '%s - List all packages installed from a given repo\n' "${0##*/}"
+	printf 'Usage:   %s <repo>\n' "${0##*/}"
+	printf 'Example: %s testing\n' "${0##*/}"
+	exit 1
+fi
+
+printf -v installed '[%s]' "$(gettext installed)"
+pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2,$3 }'
+
+# exit with pacman's return value, not awk's
+exit ${PIPESTATUS[0]}
+
+# vim: set ts=2 sw=2 noet:

contrib/paclog-pkglist.in

@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# paclog-pkglist - Parse a log file into a list of currently installed packages
+#
+# Copyright (C) 2011 Dave Reisner <dave@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/>.
+
+export TEXTDOMAIN='pacman'
+export TEXTDOMAINDIR='/usr/share/locale'
+declare logfile=${1:-@localstatedir@/log/pacman.log}
+
+if [[ $1 ]]; then
+	if [[ $1 = -@(h|-help) ]]; then
+		printf 'usage:   %s [pacman log]\n' "${0##*/}"
+		printf 'example: %s @localstatedir@/log/pacman.log\n' "${0##*/}"
+		printf '\ndefaults to: @localstatedir@/log/pacman.log\n'
+		exit 0
+	elif [[ ! -e $logfile ]]; then
+		printf $"target not found: %s\n" "$1"
+		exit 1
+	fi
+fi
+
+<"$logfile" awk '
+{
+	action  = $3
+	pkgname = $4
+	pkgver  = $5
+	upgver  = $7
+}
+
+NF == 5 && action == "installed" {
+	gsub(/[()]/, "", pkgver)
+	pkg[pkgname] = pkgver
+	next
+}
+
+NF == 7 && action == "upgraded" {
+	sub(/\)/, "", upgver)
+	pkg[pkgname] = upgver
+	next
+}
+
+NF == 5 && action == "removed" {
+	pkg[pkgname] = -1
+}
+
+END {
+	for (i in pkg) {
+		if (pkg[i] != -1) {
+			printf "%s %s\n",i,pkg[i]
+		}
+	}
+}' | sort
+
+# vim: set ts=2 sw=2 noet:

contrib/pacscripts.in

@@ -27,7 +27,7 @@ set -o errexit
 progname=$(basename $0)
 progver="0.4"
 
-conf="/etc/pacman.conf"
+conf="@sysconfdir@/pacman.conf"
 
 if [ ! -r "$conf" ]; then
 	echo "ERROR: unable to read $conf"
@@ -36,8 +36,8 @@ 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_db="${DBPath:-@localstatedir@/lib/pacman}/local"
-pac_cache="${CacheDir:-/var/cache/pacman/pkg}"
+pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}"
 
 error() {
 	local mesg=$1; shift
@@ -61,7 +61,7 @@ spacman() {
 	if [ $EUID -eq 0 ]; then
 		pacman "$@"
 	else
-		if [ ! "$(type -p sudo)" ]; then
+		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

contrib/pacsearch.in

@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 # pacsearch - Adds color and install information to a 'pacman -Ss' search
 #
-# Copyright (C) 2008, 2010 Dan McGee <dpmcgee@gmail.com>
+# Copyright (C) 2008-2011 Dan McGee <dan@archlinux.org>
 #
 # Based off original shell script version:
-# Copyright (C) 2006-2007 Dan McGee <dpmcgee@gmail.com>
+# Copyright (C) 2006-2007 Dan McGee <dan@archlinux.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") {
 
 if ($ARGV[0] eq "--version" || $ARGV[0] eq "-v") {
 	print "$progname version $version\n";
-	print "Copyright (C) 2006-2010 Dan McGee\n";
+	print "Copyright (C) 2006-2011 Dan McGee\n";
 	exit 0;
 }
 
@@ -65,6 +65,7 @@ sub to_color {
 	$line =~ s/(^community\/.*)/$CLR3$1$BASE/;
 	$line =~ s/(^testing\/.*)/$CLR4$1$BASE/;
 	$line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/;
+	$line =~ s/(^multilib\/.*)/$CLR6$1$BASE/;
 	$line =~ s/(^local\/.*)/$CLR7$1$BASE/;
 	# any other unknown repository
 	$line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/;
@@ -86,6 +87,11 @@ my $cnt = 0;
 foreach $_ (@syncpkgs) {
 	# we grab 4 fields here: repo, name/ver, installed, and desc
 	my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
+	if(not @pkgfields) {
+		# skip any non-matching line and just print it for the user
+		print $_, "\n";
+		next;
+	}
 	# 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
@@ -105,6 +111,8 @@ if ($#querypkgs >= 0) {
 foreach $_ (@querypkgs) {
 	# we grab 4 fields here: repo, name/ver, installed, and desc
 	my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
+	# skip any non-matching line
+	next if not defined $pkgfields[1];
 	# 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

contrib/pactree

@@ -1,321 +0,0 @@
-#!/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/wget-xdelta.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-if [ -r "/etc/makepkg.conf" ]; then
-	source /etc/makepkg.conf
-else
-	echo "wget-xdelta: Unable to find makepkg.conf"
-	exit 1
-fi
-
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
-out_file=$(basename $1)
-file_url=$2
-
-if ! [[ "$out_file" =~ "pkg.tar.gz" ]]; then
-	# If it's not a package file download as normal and exit.
-	#wget --passive-ftp -c -O "$out_file" "$file_url"
-	exit $?
-fi
-
-
-# Get the package name and version
-[[ "$out_file" =~ "$CARCH" ]] && arch="-$CARCH" || arch=""
-pkg_data=$(echo $out_file | \
-	sed "s|^\(.*\)-\([[:alnum:]_\.]*-[[:alnum:]_\.]*\)${arch}${PKGEXT}.part|\1 \2|")
-pkgname=$(echo $pkg_data | cut -d ' ' -f 1)
-new_version=$(echo $pkg_data | cut -d ' ' -f 2)
-base_url=${file_url%/*}
-
-# Look for the last version
-for file in $(ls -r /var/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do
-	[[ "$file" =~ "$CARCH" ]] && arch="-$CARCH" || arch=""
-	check_version=$(echo $file | \
-		sed "s|^.*/${pkgname}-\([[:alnum:]_\.]*-[[:alnum:]_\.]*\)${arch}$PKGEXT$|\1|" | \
-		grep -v "^/var/cache/pacman/pkg")
-
-	[ "$check_version" = "" ] && continue
-
-	vercmp=$(vercmp "$check_version" "$old_version")
-	if [ "$check_version" != "$new_version" -a $vercmp -gt 0 ]; then
-		old_version=$check_version
-		old_file=$file
-	fi
-done
-
-if [ "$old_version" != "" -a "$old_version" != "$new_version" ]; then
-	# Great, we have a cached file, now calculate a patch name from it
-	delta_name="$pkgname-${old_version}_to_${new_version}-${CARCH}.delta"
-
-	echo "wget-xdelta: Attempting to download delta $delta_name..." >&2
-	if wget --passive-ftp -c "$base_url/$delta_name"; then
-		echo "wget-xdelta: Applying delta..."
-		if xdelta patch "$delta_name" "$old_file" "$out_file"; then
-			echo "wget-xdelta: Delta applied successfully!"
-			rm "$delta_name"
-			exit 0
-		else
-			echo "wget-xdelta: Failed to apply delta!"
-			rm $delta_name
-		fi
-	fi
- fi
-
-echo "wget-xdelta: Downloading new package..."
-wget --passive-ftp -c -O "$out_file" "$file_url"
-exit $?
-
-# vim:set ts=4 sw=4 noet:

contrib/zsh_completion.in

@@ -33,6 +33,9 @@ _pacman_opts_common=(
 _pacman_opts_pkgfile=(
 	'-d[Skip dependency checks]'
 	'-f[Overwrite conflicting files]'
+	'--dbonly[Only remove database entry, do not remove files]'
+	'--needed[Do not reinstall up to date packages]'
+	'--recursive[Reinstall all dependencies of target packages]'
 	'*:package file:_files -g "*.pkg.tar.*(.)"'
 )
 
@@ -62,9 +65,9 @@ _pacman_opts_query_modifiers=(
 _pacman_opts_remove=(
 	'-c[Remove all dependent packages]'
 	'-d[Skip dependency checks]'
-	'-k[Only remove database entry, do not remove files]'
 	'-n[Remove protected configuration files]'
 	'-s[Remove dependencies not required by other packages]'
+	'--dbonly[Only remove database entry, do not remove files]'
 	'*:installed package:_pacman_completions_installed_packages'
 )
 
@@ -74,6 +77,9 @@ _pacman_opts_sync_actions=(
 	'*-cc[Remove all packages from cache]:*:clean:->sync_clean'
 	'-g[View all members of a package group]:*:package groups:->sync_group'
 	'-s[Search package names and descriptions]:*:search text:->sync_search'
+	'--dbonly[Only remove database entry, do not remove files]'
+	'--needed[Do not reinstall up to date packages]'
+	'--recursive[Reinstall all dependencies of target packages]'
 )
 
 # options for passing to _arguments: options for --sync command
@@ -214,6 +220,7 @@ _pacman_completions_all_groups() {
 	local -a cmd groups
 	_pacman_get_command
 	groups=( $(_call_program groups $cmd[@] -Sg) )
+	typeset -U groups
 	compadd "$@" -a groups
 }
 
@@ -221,23 +228,20 @@ _pacman_completions_all_groups() {
 # these can be specified as either 'package' or 'repository/package'
 _pacman_completions_all_packages() {
 	local -a cmd packages repositories packages_long
+	_pacman_get_command
 
-	repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+	if compset -P1 '*/*'; then
-	typeset -U repositories
+		packages=( $(_call_program packages $cmd[@] -Sql ${words[CURRENT]%/*}) )
-	packages_long=(/var/lib/pacman/sync/${^repositories}/*(/))
-	packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} )
-	typeset -U packages
-	_wanted packages expl "packages" compadd - "${(@)packages}"
-	if [[ $PREFIX != */* ]] ; then
-		repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
-		typeset -U repositories
-		_wanted repo_packages expl "repository/package" compadd -S "/" $repositories
-	else
-		compset -P '*/'
-		packages_long=(/var/lib/pacman/sync/$IPREFIX*(/))
-		packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} )
 		typeset -U packages
 		_wanted repo_packages expl "repository/package" compadd ${(@)packages}
+	else
+		packages=( $(_call_program packages $cmd[@] -Sql) )
+		typeset -U packages
+		_wanted packages expl "packages" compadd - "${(@)packages}"
+
+		repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+		typeset -U repositories
+		_wanted repo_packages expl "repository/package" compadd -S "/" $repositories
 	fi
 }
 
@@ -245,7 +249,7 @@ _pacman_completions_all_packages() {
 _pacman_completions_installed_groups() {
 	local -a cmd groups
 	_pacman_get_command
-	groups=(${(o)${(f)"$(pacman -Qg)"}% *})
+	groups=(${(o)${(f)"$(_call_program groups $cmd[@] -Qg)"}% *})
 	typeset -U groups
 	compadd "$@" -a groups
 }
@@ -253,15 +257,15 @@ _pacman_completions_installed_groups() {
 # provides completions for installed packages
 _pacman_completions_installed_packages() {
 	local -a cmd packages packages_long
-	packages_long=(/var/lib/pacman/local/*(/))
+	packages_long=(@localstatedir@/lib/pacman/local/*(/))
-	packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} )
+	packages=( ${${packages_long#@localstatedir@/lib/pacman/local/}%-*-*} )
 	compadd "$@" -a packages
 }
 
 # provides completions for repository names
 _pacman_completions_repositories() {
 	local -a cmd repositories
-	repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+	repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
 	# Uniq the array
 	typeset -U repositories
 	compadd "$@" -a repositories

depcomp

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Foundation, Inc.
+# Software Foundation, Inc.
 
 # 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,9 +17,7 @@ scriptversion=2006-10-15.18
 # 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, write to the Free Software
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
    depmode=dashmstdout
 fi
 
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -192,14 +199,14 @@ sgi)
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
+' ' ' >> "$depfile"
-    echo >> $depfile
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
     tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -215,34 +222,39 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  tmpdepfile="$stripped.u"
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -323,7 +335,12 @@ hp2)
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
     echo "#dummy" > "$depfile"
   fi
@@ -399,7 +416,7 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -450,32 +467,39 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
+  cleared=no eat=no
-  for arg in "$@"; do
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -495,7 +519,7 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -533,13 +557,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout.
-  # because we must use -o when running libtool.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@@ -552,16 +590,23 @@ msvisualcpp)
 	;;
     esac
   done
-  "$@" -E |
+  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -580,5 +625,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

doc/.gitignore

@@ -3,9 +3,12 @@ libalpm.3
 makepkg.8
 makepkg.conf.5
 pacman.8
+pacman-key.8
 pacman.conf.5
+pkgdelta.8
 repo-add.8
 repo-remove.8
+vercmp.8
 *.css
 *.html
 *.xml

doc/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.5.5
+# Doxyfile 1.7.5.1
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -6,6 +6,8 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = libalpm
 PROJECT_NUMBER         =
+PROJECT_BRIEF          = "Arch Linux Package Manager Library"
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ./
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -31,7 +33,6 @@ SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 4
@@ -40,12 +41,17 @@ OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
+EXTENSION_MAPPING      =
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = NO
+SYMBOL_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -63,11 +69,14 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = YES
+FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
@@ -76,7 +85,11 @@ ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = NO
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
 FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -105,6 +118,7 @@ IMAGE_PATH             =
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -131,21 +145,48 @@ HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            =
 HTML_STYLESHEET        =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = YES
 HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
+HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 DOCSET_BUNDLE_ID       = org.doxygen.Project
-HTML_DYNAMIC_SECTIONS  = NO
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
 CHM_FILE               =
 HHC_LOCATION           =
 GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
+USE_INLINE_TREES       = NO
 TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+MATHJAX_EXTENSIONS     =
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -154,13 +195,16 @@ LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = letter
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
+LATEX_FOOTER           =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -207,7 +251,10 @@ INCLUDE_PATH           = ../..
 INCLUDE_FILE_PATTERNS  = *.h
 PREDEFINED             = HAVE_CONFIG_H= \
                          SYMHIDDEN= \
-                         SYMEXPORT=
+                         SYMEXPORT= \
+                         HAVE_LIBARCHIVE \
+                         HAVE_LIBCURL \
+                         HAVE_LIBGPGME
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
@@ -225,6 +272,10 @@ CLASS_DIAGRAMS         = NO
 MSCGEN_PATH            =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
@@ -237,15 +288,13 @@ CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
 DOT_PATH               =
 DOTFILE_DIRS           =
+MSCFILE_DIRS           =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 3
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

doc/Makefile.am

@@ -7,6 +7,9 @@ ASCIIDOC_MANS = \
 	pacman.8 \
 	makepkg.8 \
 	repo-add.8 \
+	vercmp.8 \
+	pkgdelta.8 \
+	pacman-key.8 \
 	PKGBUILD.5 \
 	makepkg.conf.5 \
 	pacman.conf.5 \
@@ -18,6 +21,9 @@ HTML_MANPAGES = \
 	pacman.8.html \
 	makepkg.8.html \
 	repo-add.8.html \
+	vercmp.8.html \
+	pkgdelta.8.html \
+	pacman-key.8.html \
 	PKGBUILD.5.html \
 	makepkg.conf.5.html \
 	pacman.conf.5.html \
@@ -38,6 +44,9 @@ EXTRA_DIST = \
 	pacman.8.txt \
 	makepkg.8.txt \
 	repo-add.8.txt \
+	vercmp.8.txt \
+	pkgdelta.8.txt \
+	pacman-key.8.txt \
 	PKGBUILD.5.txt \
 	PKGBUILD-example.txt \
 	makepkg.conf.5.txt \
@@ -60,14 +69,14 @@ dist-hook:
 	$(MAKE) $(AM_MAKEFLAGS) all
 
 if USE_GIT_VERSION
-GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty
+GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')
 REAL_PACKAGE_VERSION = $(GIT_VERSION)
 else
 REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
 endif
 
 man_MANS =
-dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8
+dist_man_MANS = $(ASCIIDOC_MANS)
 
 if USE_DOXYGEN
 man_MANS += $(DOXYGEN_MANS)
@@ -83,30 +92,32 @@ html: $(HTML_DOCS)
 website: html
 	bsdtar czf website.tar.gz $(HTML_DOCS) \
 		-C /etc/asciidoc/stylesheets/ \
-		xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
+		asciidoc.css asciidoc-manpage.css \
 		-C /etc/asciidoc/javascripts/ \
-		asciidoc-xhtml11.js \
+		asciidoc.js \
 		-C /etc/asciidoc/ \
 		images
 
 pkgdatadir = ${datadir}/${PACKAGE}
 
 ASCIIDOC_OPTS = \
-	-f asciidoc.conf \
+	-f $(srcdir)/asciidoc.conf \
 	-a pacman_version="$(REAL_PACKAGE_VERSION)" \
 	-a pacman_date="`date +%Y-%m-%d`" \
 	-a pkgdatadir=$(pkgdatadir) \
+	-a localstatedir=$(localstatedir) \
 	-a sysconfdir=$(sysconfdir)
 
 A2X_OPTS = \
 	--no-xmllint \
 	-d manpage \
 	-f manpage \
-	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
+	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' \
+	--destination-dir='./'
 
 # These rules are due to the includes and files of the asciidoc text
 $(ASCIIDOC_MANS): asciidoc.conf footer.txt
-	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
+	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt
 
 %.html: %.txt
 	asciidoc $(ASCIIDOC_OPTS) $*.txt
@@ -128,13 +139,26 @@ $(HTML_OTHER): asciidoc.conf
 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
+vercmp.8 vercmp.8.html: vercmp.8.txt
+pkgdelta.8 pkgdelta.8.html: pkgdelta.8.txt
+pacman-key.8 pacman-key.8.html: pacman-key.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
-	rm -f repo-remove.8
+	$(RM) repo-remove.8
 	$(LN_S) repo-add.8 repo-remove.8
 
+install-data-hook:
+	cd $(DESTDIR)$(mandir)/man8 && \
+		$(RM) repo-remove.8 && \
+		( $(LN_S) repo-add.8 repo-remove.8 || \
+		ln repo-add.8 repo-remove.8 || \
+		cp repo-add.8 repo-remove.8 )
+
+uninstall-hook:
+	$(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8
+
 # vim:set ts=2 sw=2 noet:

doc/PKGBUILD-example.txt

@@ -13,8 +13,12 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
-  make prefix=$pkgdir/usr install
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make prefix="$pkgdir"/usr install
 }

doc/PKGBUILD.5.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 PKGBUILD(5)
 ===========
@@ -16,12 +16,12 @@ PKGBUILD
 
 Description
 -----------
-This manual page is meant to describe general rules about PKGBUILDs. Once a
+This manual page describes general rules about PKGBUILDs. Once a
 PKGBUILD is written, the actual package is built using makepkg and installed
 with pacman.
 
-NOTE: An example PKGBUILD, useful for reference, is located in '{pkgdatadir}'.
+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
+along with 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.
 
@@ -30,86 +30,98 @@ 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.
+of them 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.
+recommended to prefix their name with an '_' (underscore).
 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 (array)*::
-	The name of the package. This has be a unix-friendly name as it will be
+	Either the name of the package or an array of names for split packages.
-	used in the package filename. Members of the array are not allowed to start
+	Because it will be used in the package filename, this has to be unix-friendly.
-	with hyphens.
+	Members of the array are not allowed to start with hyphens.
 
 *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').
-	The variable is not allowed to contain hyphens.
+	The variable is not allowed to contain colons or hyphens.
 
 *pkgrel*::
 	This is the release number specific to the Arch Linux release. This
 	allows package maintainers to make updates to the package's configure
-	flags, for example. A pkgrel of 1 is typically used for each upstream
+	flags, for example. This is typically set to '1' for each new upstream
-	software release and is incremented for intermediate PKGBUILD updates. The
+	software release and incremented for intermediate PKGBUILD updates. The
 	variable is not allowed to contain hyphens.
 
 *pkgdesc*::
 	This should be a brief description of the package and its functionality.
-	Try to keep the description to one line of text.
+	Try to keep the description to one line of text and not use the package's name.
+
+*epoch*::
+	Used to force the package to be seen as newer than any previous versions
+	with a lower epoch, even if the version number would normally not trigger
+	such an upgrade. This value is required to be a positive integer; the
+	default value if left unspecified is '0'. This is useful when the version
+	numbering scheme of a package changes (or is alphanumeric), breaking normal
+	version comparison logic. See linkman:pacman[8] for more information on
+	version comparisons.
 
 *url*::
 	This field contains a URL that is associated with the software being
-	packaged. This is typically the project's website.
+	packaged. Typically the project's website.
 
 *license (array)*::
 	This field specifies the license(s) that apply to the package.
-	Commonly-used licenses are found in '/usr/share/licenses/common'. If you
+	Commonly used licenses can be 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
+	available in '/usr/share/licenses/common', then you should include it
 	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
+	'$pkgdir/usr/share/licenses/$pkgname/' when building the package. If
-	multiple licenses are applicable for a package, list all of them:
+	multiple licenses are applicable, list all of them:
 	`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`).
+	in the source array (e.g., `changelog=$pkgname.changelog`).
 
 *source (array)*::
 	An array of source files required to build the package. Source files
-	must either reside in the same directory as the PKGBUILD file, or be a
+	must either reside in the same directory as the PKGBUILD, or be a
-	fully-qualified URL that makepkg will use to download the file. In order
+	fully-qualified URL that makepkg can use to download the file.
-	to make the PKGBUILD as useful as possible, use the $pkgname and $pkgver
+	To make the PKGBUILD as useful as possible, use the `$pkgname` and `$pkgver`
-	variables if possible when specifying the download location. Any files
+	variables if possible when specifying the download location. Compressed files
-	that are compressed will automatically be extracted, unless found in
+	will be extracted automatically unless found in
-	the noextract array listed below.
+	the noextract array described below.
 +
-It is also possible to specify an optional filename, which is helpful
+It is also possible to change the name of the downloaded file, which is helpful
 with weird URLs and for handling multiple source files with the same
 name. The syntax is: `source=('filename::url')`.
++
+Files in the source array with extensions `.sig` or `.asc` are recognized by
+makepkg as PGP signatures and will be automatically used to verify the integrity
+of the corresponding source file.
 
 *noextract (array)*::
 	An array of filenames corresponding to those from the source array. Files
 	listed here will not be extracted with the rest of the source files. This
-	is useful for packages which use compressed data which is downloaded but
+	is useful for packages that use compressed data directly.
-	not necessary to uncompress.
 
 *md5sums (array)*::
 	This array contains an MD5 hash for every source file specified in the
 	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
+	`makepkg -g >> PKGBUILD`. If desired, move the md5sums line to an
 	appropriate location.
 
 *sha1sums, sha256sums, sha384sums, sha512sums (arrays)*::
@@ -124,29 +136,40 @@ name. The syntax is: `source=('filename::url')`.
 	example, one could install all KDE packages by installing the 'kde' group.
 
 *arch (array)*::
-	Defines on which architectures the given package is available (e.g.
+	Defines on which architectures the given package is available (e.g.,
 	`arch=('i686' 'x86_64')`). Packages that contain no architecture specific
-	files may use arch=('any').
+	files should use `arch=('any')`.
 
 *backup (array)*::
-	A space-delimited array of filenames, without preceding slashes, that
+	An array of filenames, without preceding slashes, that
 	should be backed up if the package is removed or upgraded. This is
 	commonly used for packages placing configuration files in /etc. See
 	Handling Config Files in linkman:pacman[8] for more information.
 
 *depends (array)*::
-	An array of packages that this package depends on to run. Packages in
+	An array of packages this package depends on to run. Entries in
 	this list should be surrounded with single quotes and contain at least
 	the package name. Entries can also include a version requirement of the
-	form 'name<>version', where <> is one of five comparisons: >= (greater
+	form 'name<>version', where `<>` is one of five comparisons: `>=` (greater
-	than or equal to), <= (less than or equal to), = (equal to), > (greater
+	than or equal to), `<=` (less than or equal to), `=` (equal to), `>`
-	than), or < (less than).
+	(greater than), or `<` (less than).
++
+If the dependency name appears to be a library (ends with .so), makepkg will
+try to find a binary that depends on the library in the built package and
+append the version needed by the binary. Appending the version yourself
+disables auto detection.
 
 *makedepends (array)*::
-	An array of packages that this package depends on to build, but are not
+	An array of packages this package depends on to build but are not
 	needed at runtime. Packages in this list follow the same format as
 	depends.
 
+*checkdepends (array)*::
+	An array of packages this package depends on to run its test suite
+	but are not needed at runtime. Packages in this list follow the same
+	format as depends. These dependencies are only considered when the
+	check() function is present and is to be run by makepkg.
+
 *optdepends (array)*::
 	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
@@ -159,26 +182,33 @@ name. The syntax is: `source=('filename::url')`.
 *conflicts (array)*::
 	An array of packages that will conflict with this package (i.e. they
 	cannot both be installed at the same time). This directive follows the
-	same format as depends. Versioned conflicts are also supported.
+	same format as depends. Versioned conflicts are supported using the
+	operators as described in `depends`.
 
 *provides (array)*::
-	An array of ``virtual provisions'' that this package provides. This allows
+	An array of ``virtual provisions'' this package provides. This allows
 	a package to provide dependencies other than its own package name. For
 	example, the dcron package can provide 'cron', which allows packages to
 	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'
+Versioned provisions are also possible, in the 'name=version' format. For
-	dependency of other packages. Provisions involving the '>' and '<'
+example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' dependency of
-	operators are invalid as only specific versions of a package may be
+other packages. Provisions involving the `>` and `<` operators are invalid as
-	provided.
+only specific versions of a package may be provided.
++
+If the provision name appears to be a library (ends with .so), makepkg will
+try to find the library in the built package and append the correct
+version. Appending the version yourself disables auto detection.
 
 *replaces (array)*::
-	An array of packages that this package should replace, and can be used
+	An array of packages this package should replace. This can be used
 	to handle renamed/combined packages. For example, if the 'j2re' package
 	is renamed to 'jre', this directive allows future upgrades to continue
-	as expected even though the package has moved. Sysupgrade is currently
+	as expected even though the package has moved. Versioned replaces are
-	the only pacman operation that utilizes this field, a normal sync will
+	supported using the operators as described in `depends`.
-	not use its value.
++
+Sysupgrade is currently the only pacman operation that utilizes this field.
+A normal sync or upgrade will not use its value.
 
 *options (array)*::
 	This array allows you to override some of makepkg's default behavior
@@ -186,8 +216,8 @@ name. The syntax is: `source=('filename::url')`.
 	in the options array. To reverse the default behavior, place an ``!'' at
 	the front of the option. Only specify the options you specifically want
 	to override, the rest will be taken from linkman:makepkg.conf[5].
-	*NOTE:* 'force' is a special option only used in a linkman:PKGBUILD[5],
+	*NOTE:* 'force' is a now-removed option in favor of the top level 'epoch'
-	do not use it unless you know what you are doing.
+	variable.
 
 	*strip*;;
 		Strip symbols from binaries and libraries. If you frequently
@@ -208,6 +238,9 @@ name. The syntax is: `source=('filename::url')`.
 	*zipman*;;
 		Compress man and info pages with gzip.
 
+	*upx*;;
+		Compress binary executable files using UPX.
+
 	*ccache*;;
 		Allow the use of ccache during build. More useful in its negative
 		form `!ccache` with select packages that have problems building
@@ -218,53 +251,61 @@ name. The syntax is: `source=('filename::url')`.
 		form `!distcc` with select packages that have problems building
 		with distcc.
 
+	*buildflags*;;
+		Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS)
+		during build as specified in linkman:makepkg.conf[5]. More useful in
+		its negative form `!buildflags` with select packages that have problems
+		building with custom buildflags.
+
 	*makeflags*;;
 		Allow the use of user-specific makeflags during build as specified
 		in linkman:makepkg.conf[5]. More useful in its negative form
 		`!makeflags` with select packages that have problems building with
 		custom makeflags such as `-j2` (or higher).
 
-	*force*;;
-		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). See linkman:pacman[8] for
-		more information on version comparisons.
-
 
 build() Function
 ----------------
-In addition to the above directives, the optional build() bash function usually
+In addition to the above directives, the optional build() 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. The function is run in `bash -e` mode, meaning any command that exits
 with a non-zero status will cause the function to exit. Be sure any exotic
 commands used are covered by `makedepends`.
 
-All of the above variables such as `pkgname` and `pkgver` are available for use
+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
+in the build function. In addition, makepkg defines the following three
-use during the build and install process. These three variables are as follows:
+variables for use during the build and install process:
 
 *startdir*::
-	This contains the absolute path to the directory where the PKGBUILD was
+	This contains the absolute path to the directory where the PKGBUILD is
 	located, which is usually the output of `$(pwd)` when makepkg is started.
+	Use of this variable is deprecated and strongly discouraged.
 
 *srcdir*::
-	This points to the directory where makepkg extracts or copies all source
+	This contains the directory where makepkg extracts, or copies, all source
 	files.
 
 *pkgdir*::
-	This points to the directory where makepkg bundles the installed package
+	This contains 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.
 
+check() Function
+----------------
+An optional check() function can be specified in which a packages test-suite
+may be run. This function is run between the build() and package() functions.
+The function is run in `bash -e` mode, meaning any command that exits with a
+non-zero status will cause the function to exit. Be sure any exotic commands
+used are covered by `checkdepends`.
+
 package() Function
 ------------------
 An optional package() function can be specified in addition to the build()
-function. This function is run immediately after the build() function. The
+function. This function is run after the build() and check() functions. The
 function is run in `bash -e` mode, meaning any command that exits with a
 non-zero status will cause the function to exit. When specified in combination
 with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage
@@ -279,9 +320,9 @@ 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
+given in the PKGBUILD. Nevertheless, the following ones can be overridden within
-split package's packaging function. The following variables can be overridden:
+each split package's packaging function:
-`pkgver`, `pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`,
+`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `license`, `groups`, `depends`,
 `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`,
 `install` and `changelog`.
 
@@ -299,31 +340,37 @@ Pacman has the ability to store and execute a package-specific script when it
 installs, removes, or upgrades a package. This allows a package to configure
 itself after installation and perform an opposite action upon removal.
 
-The exact time the script is run varies with each operation:
+The exact time the script is run varies with each operation, and should be
+self-explanatory. Note that during an upgrade operation, none of the install
+or remove scripts will be called.
+
+Scripts are passed either one or two ``full version strings'', where a full
+version string is either 'pkgver-pkgrel' or 'epoch:pkgver-pkgrel' if epoch is
+non-zero.
 
 *pre_install*::
-	script is run right before files are extracted. One argument is passed:
+	Run right before files are extracted. One argument is passed:
-	new package version.
+	new package full version string.
 
 *post_install*::
-	script is run right after files are extracted. One argument is passed:
+	Run right after files are extracted. One argument is passed:
-	new package version.
+	new package full version string.
 
 *pre_upgrade*::
-	script is run right before files are extracted. Two arguments are passed
+	Run right before files are extracted. Two arguments are passed in this
-	in the following order: new package version, old package version.
+	order: new package full version string, old package full version string.
 
 *post_upgrade*::
-	script is run after files are extracted. Two arguments are passed
+	Run after files are extracted. Two arguments are passed in this order:
-	in the following order: new package version, old package version.
+	new package full version string, old package full version string.
 
 *pre_remove*::
-	script is run right before files are removed. One argument is passed:
+	Run right before files are removed. One argument is passed:
-	old package version.
+	old package full version string.
 
 *post_remove*::
-	script is run right after files are removed. One argument is passed:
+	Run right after files are removed. One argument is passed:
-	old package version.
+	old package full version string.
 
 To use this feature, create a file such as 'pkgname.install' and put it in the
 same directory as the PKGBUILD script. Then use the install directive:
@@ -341,7 +388,7 @@ makepkg supports building development versions of packages without having to
 manually update the pkgver in the PKGBUILD. This was formerly done using the
 separate utility 'versionpkg'. In order to utilize this functionality, your
 PKGBUILD must use correct variable names depending on the SCM being fetched
-from.
+from (e.g., 'makepkg-git', 'mplayer-svn').
 
 *CVS*::
 	The generated pkgver will be the date the package is built.
@@ -362,8 +409,7 @@ from.
 		The SVN module to fetch.
 
 *Git*::
-	The generated pkgver will be one formatted by the 'git-describe'
+	The generated pkgver will be the date the package is built.
-	command, with '-' characters converted to '_' characters.
 
 	*_gitroot*;;
 		The URL (all protocols supported) to the GIT repository.

doc/asciidoc.conf

@@ -17,7 +17,11 @@ plus=+
 caret=^
 startsb=[
 endsb=]
+backslash=\
 tilde=~
+apostrophe='
+backtick=`
+litdd=--
 
 ifdef::backend-docbook[]
 [linkman-inlinemacro]

doc/footer.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 
 See the pacman website at http://www.archlinux.org/pacman/[] for current
@@ -18,13 +18,17 @@ Authors
 
 Current maintainers:
 
+* Allan McRae <allan@archlinux.org>
 * Dan McGee <dan@archlinux.org>
-* Xavier Chantry <shiningxc@gmail.com>
+* Dave Reisner <dreisner@archlinux.org>
-* Aaron Griffin <aaron@archlinux.org>
 
-Past contributors:
+Past major contributors:
 
 * Judd Vinet <jvinet@zeroflux.org>
 * Aurelien Foret <aurelien@archlinux.org>
+* Aaron Griffin <aaron@archlinux.org>
+* Xavier Chantry <shiningxc@gmail.com>
+* Nagy Gabor <ngaba@bibl.u-szeged.hu>
 
-See the 'AUTHORS' file for additional contributors.
+For additional contributors, use `git shortlog -s` on the pacman.git
+repository.

doc/index.txt

@@ -16,10 +16,10 @@ automatically and can download packages from a remote server.
 
 History
 ~~~~~~~
-Version 2.0 of pacman introduced the ability to sync packages (the `--sync`
+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
+this, packages would have to be installed manually using the '\--add' and
-`--upgrade` operations.
+'\--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.
@@ -41,8 +41,11 @@ configuration files dealing with pacman.
 * linkman:makepkg[8]
 * linkman:makepkg.conf[5]
 * linkman:pacman[8]
+* linkman:pacman-key[8]
 * linkman:pacman.conf[5]
+* linkman:pkgdelta[8]
 * linkman:repo-add[8]
+* linkman:vercmp[8]
 
 Changelog
 ~~~~~~~~~
@@ -62,6 +65,11 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2011-08-10   v3.5.4
+2011-06-07   v3.5.3
+2011-04-18   v3.5.2
+2011-03-23   v3.5.1
+2011-03-16   v3.5.0
 2011-01-22   v3.4.3
 2010-12-29   v3.4.2
 2010-09-03   v3.4.1
@@ -101,9 +109,9 @@ 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
+	$ ./configure
-    $ make
+	$ make
-    # make install
+	# 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.
@@ -126,7 +134,7 @@ these trees).
 
 The current development tree can be fetched with the following command:
 
-    git clone git://projects.archlinux.org/pacman.git pacman
+	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
@@ -194,11 +202,11 @@ Pacman/libalpm frontends:
 
 Copyright
 ---------
-pacman is Copyright (C) 2006-2010 Pacman Development Team
+pacman is Copyright (C) 2006-2011 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:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////

doc/libalpm.3.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 libalpm(3)
 ==========

doc/makepkg.8.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 makepkg(8)
 ==========
@@ -11,24 +11,24 @@ makepkg - package build utility
 
 Synopsis
 --------
-makepkg [options]
+'makepkg' [options]
 
 
 Description
 -----------
-makepkg is a script to automate the building of packages. The requirements for
+'makepkg' is a script to automate the building of packages. The requirements for
 using the script are a build-capable \*nix platform and a custom build script
 for each package you wish to build (known as a PKGBUILD). See
 linkman:PKGBUILD[5] for details on creating your own build scripts.
 
 The advantage to a script-based build is that the work is only done once. Once
-you have the build script for a package, makepkg will do the rest: download and
+you have the build script for a package, 'makepkg' will do the rest: download and
 validate source files, check dependencies, configure the build-time settings,
 build the package, install the package into a temporary root, make
 customizations, generate meta-info, and package the whole thing up for pacman
 to use.
 
-NOTE: makepkg uses your current locale by default and does not unset it when
+NOTE: 'makepkg' uses your current locale by default and does not unset it when
 building packages. If you wish to share your build output with others when
 seeking help or for other purposes, you may wish to run "`LC_ALL=C makepkg`" so
 your logs and output are not localized.
@@ -48,12 +48,9 @@ Options
 *-c, \--clean*::
 	Clean up leftover work files and directories after a successful build.
 
-*-C, \--cleancache*::
+*\--config* <file>::
-	Removes all cached source files from the directory specified in `SRCDEST`
+	Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+
-	in linkman:makepkg.conf[5].
+	default.
-
-*--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
@@ -88,7 +85,13 @@ Options
 	using "`makepkg -g >> PKGBUILD`".
 
 *--skipinteg*::
-	Do not perform any integrity checks, just print a warning instead.
+	Do not perform any integrity checks (checksum and PGP) on source files.
+
+*\--skipchecksums*::
+	Do not verify checksums of source files.
+
+*\--skippgpcheck*::
+	Do not verify PGP signatures of source files.
 
 *-h, \--help*::
 	Output syntax and command line options.
@@ -114,10 +117,10 @@ Options
 
 *-o, \--nobuild*::
 	Download and extract files only, but do not build them. Useful with the
-	`\--noextract` option if you wish to tweak the files in src/ before
+	'\--noextract' option if you wish to tweak the files in src/ before
 	building.
 
-*-p* <`buildscript`>::
+*-p* <buildscript>::
 	Read the package script `buildscript` instead of the `PKGBUILD` default;
 	see linkman:PKGBUILD[5].
 
@@ -135,6 +138,13 @@ Options
 	dependencies are not found, pacman will try to resolve them. If
 	successful, the missing packages will be downloaded and installed.
 
+*-S, \--source*::
+	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.
+
 *\--allsource*::
 	Do not actually build the package, but build a source-only tarball that
 	includes all sources, including those that are normally download via
@@ -142,16 +152,27 @@ Options
 	such as a chroot or remote builder. It will also satisfy requirements of
 	the GPL when distributing binary packages.
 
-*\--source*::
+*\--pkg <list>*::
-	Do not actually build the package, but build a source-only tarball that
+	Only build listed packages from a split package.
-	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`>*::
+*\--check*::
-	Only build listed packages from a split package. The use of quotes is
+	Run the check() function in the PKGBUILD, overriding the setting in
-	necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"`
+	linkman:makepkg.conf[5].
+
+*\--nocheck*::
+	Do not run the check() function in the PKGBUILD or handle the checkdepends.
+
+*\--sign*::
+	Sign the resulting package with gpg, overriding the setting in
+	linkman:makepkg.conf[5].
+
+*\--nosign*::
+	Do not create a signature for the built package.
+
+*\--key* <key>::
+	Specify a key to use when signing packages, overriding the GPGKEY setting
+	in linkman:makepkg.conf[5]. If not specified in either location, the
+	default key from the keyring will be used.
 
 *\--noconfirm*::
 	(Passed to pacman) Prevent pacman from waiting for user input before
@@ -186,6 +207,9 @@ Environment Variables
 	Folder where the downloaded sources will be stored. Overrides the
 	corresponding value defined in linkman:makepkg.conf[5].
 
+**BUILDDIR=**"/path/to/folder"::
+	Folder where the package will be built. Overrides the corresponding
+	value defined in linkman:makepkg.conf[5].
 
 Configuration
 -------------

doc/makepkg.conf.5.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 makepkg.conf(5)
 ===============
@@ -70,7 +70,7 @@ Options
 	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**)**::
+**BUILDENV=(**fakeroot !distcc color !ccache check !sign**)**::
 	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
@@ -93,12 +93,36 @@ Options
 		be disabled for individual packages by placing `!ccache` in the
 		PKGBUILD options array.
 
+	*check*;;
+		Run the check() function if present in the PKGBUILD. This can be
+		enabled or disabled for individual packages through the use of
+		makepkg's '\--check' and '\--nocheck' options respectively.
+
+	*sign*;;
+		Generate a PGP signature file using GnuPG. This will execute `gpg
+		--detach-sign --use-agent` on the built package to generate a detached
+		signature file, using the GPG agent if it is available. The signature
+		file will be the entire filename of the package with a ``.sig''
+		extension.
+
 **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 zipman**)**::
+**BUILDDIR=**"/path/to/folder"::
+	If this value is not set, packages will by default be built in
+	subdirectories of the directory that makepkg is called from.  This
+	option allows setting the build location to another folder.
+	Incorrect use of `$startdir` in a PKGBUILD may cause building with
+	this option to fail.
+
+
+**GPGKEY=**""::
+	Specify a key to use for gpg signing instead of the default key in the
+	keyring. Can be overridden with makepkg's '\--key' option.
+
+**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**::
 	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
@@ -130,6 +154,10 @@ Options
 		Remove files specified by the `PURGE_TARGETS` variable from the
 		package.
 
+	*upx*;;
+		Compress binary executable files using UPX.  Additional options
+		can be passed to UPX by specifying the `UPXFLAGS` variable.
+
 **INTEGRITY_CHECK=(**check1 ...**)**::
 	File integrity checks to use. Multiple checks may be specified; this
 	affects both generation and checking. The current valid options are:
@@ -160,13 +188,6 @@ Options
 	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
@@ -185,17 +206,19 @@ Options
 
 **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
+	in the current directory. Many people like to keep all source package files
-	a central location for easy cleanup, so this path can be set here.
+	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.
 
-*PKGEXT*, *SRCEXT*::
+**PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz"::
+	Sets the compression used when making compiled or source packages. The
+	current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and
+	`.tar.Z`.
 	Do not touch these unless you know what you are doing.
 
-
 See Also
 --------
 linkman:makepkg[8], linkman:pacman[8], linkman:PKGBUILD[5]

doc/pacman-key.8.txt

@@ -0,0 +1,142 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
+/////
+pacman-key(8)
+=============
+
+
+Name
+----
+pacman-key - manage pacman's list of trusted keys
+
+
+Synopsis
+--------
+'pacman-key' [options]
+
+
+Description
+-----------
+'pacman-key' is a wrapper script for GnuPG used to manage pacman's keyring, which
+is the collection of PGP keys used to check signed packages and databases. It
+provides the ability to import and export keys, fetch keys from keyservers and
+update the key trust database.
+
+More complex keyring management can be achieved using GnuPG directly combined with
+the '\--homedir' option pointing at the pacman keyring (located in
++{sysconfdir}/pacman.d/gnupg+ by default).
+
+
+Options
+-------
+*-a, \--add* [file(s)]::
+	Add the key(s) contained in the specified file or files to pacman's
+	keyring. If a key already exists, update it.
+
+*\--config* <file>::
+	Use an alternate config file instead of the +{sysconfdir}/pacman.conf+
+	default.
+
+*-d, \--delete* <keyid(s)>::
+	Remove the key(s) identified by the specified keyid(s) from pacman's
+	keyring.
+
+*-e, \--export* [keyid(s)]::
+	Export key(s) identified by the specified keyid(s) to 'stdout'. If no keyid
+	is specified, all keys will be exported.
+
+*\--edit-key* <keyid(s)>::
+	Present a menu for key management task on the specified keyid(s). Useful
+	for adjusting a keys trust level.
+
+*-f, \--finger* [keyid(s)]::
+	List a fingerprint for each specified keyid, or for all known keys if no
+	keyids are specified.
+
+*\--gpgdir* <dir>::
+	Set an alternate home directory for GnuPG. If unspecified, the value is
+	read from +{sysconfdir}/pacman.conf+.
+
+*-h, \--help*::
+	Output syntax and command line options.
+
+*\--import* <dir(s)>::
+	Imports keys from `pubring.gpg` into the public keyring from the specified
+	directories.
+
+*\--import-trustdb* <dir(s)> ::
+	Imports ownertrust values from `trustdb.gpg` into the shared trust database
+	from the specified directories.
+
+*\--init*::
+	Ensure the keyring is properly initialized and has the required access
+	permissions.
+
+*\--keyserver* <keyserver>::
+	Use the specified keyserver if the operation requires one. This will take
+	precedence over any keyserver option specified in a `gpg.conf`
+	configuration file. Running '\--init' with this option will set the default
+	keyserver if one was not already configured.
+
+*-l, \--list-keys* [keyid(s)]::
+	Lists all or specified keys from the public keyring.
+
+*\--list-sigs* [keyid(s)]::
+	Same as '\--list-keys', but the signatures are listed too.
+
+*\--lsign-key* <keyid>::
+	Locally sign the given key. This is primarily used to root the web of trust
+	in the local private key generated by '\--init'.
+
+*-r, \--recv-keys* <keyid(s)>::
+	Equivalent to '\--recv-keys' in GnuPG.
+
+*\--refresh-keys* [keyid(s)]::
+	Equivalent to '\--refresh-keys' in GnuPG.
+
+*\--populate* [keyring(s)]::
+	Reload the default keys from the (optionally provided) keyrings in
+	+{pkgdatadir}/keyrings+. For more information, see
+	<<SC,Providing a Keyring for Import>> below.
+
+*-u, \--updatedb*::
+	Equivalent to '\--check-trustdb' in GnuPG.
+
+*-v, \--verify* <signature>::
+	Verify the given signature file.
+
+*-V, \--version*::
+	Displays the program version.
+
+
+Providing a Keyring for Import
+------------------------------
+A distribution or other repository provided may want to provide a set of
+PGP keys used in the signing of its packages and repository databases that can
+be readily imported into the pacman keyring. This is achieved by providing a
+PGP keyring file `foo.gpg` that contains the keys for the foo keyring in the
+directory +{pkgdatadir}/keyrings+.
+
+Optionally, the file `foo-trusted` can be provided containing a list of trusted
+key IDs for that keyring. This is a file in a format compatible with 'gpg
+\--export-ownertrust' output. This file will inform the user which keys a user
+needs to verify and sign to build a local web of trust, in addition to
+assigning provided owner trust values.
+
+Also optionally, the file `foo-revoked` can be provided containing a list of
+revoked key IDs for that keyring. Revoked is defined as "no longer valid for
+any signing", so should be used with prudence. A key being marked as revoked
+will be disabled in the keyring and no longer treated as valid, so this always
+takes priority over it's trusted state in any other keyring.
+
+All files are required to be signed (detached) by a trusted PGP key that the
+user must manually import to the pacman keyring. This prevents a potentially
+malicious repository adding keys to the pacman keyring without the users
+knowledge.
+
+
+See Also
+--------
+linkman:pacman[8], linkman:pacman.conf[5]
+
+include::footer.txt[]

doc/pacman.8.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 pacman(8)
 =========
@@ -11,8 +11,7 @@ pacman - package manager utility
 
 Synopsis
 --------
-'pacman' <operation> [options] [packages]
+'pacman' <operation> [options] [targets]
-
 
 Description
 -----------
@@ -25,11 +24,17 @@ 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).
 
+Invoking pacman involves specifying an operation with any potential options and
+targets to operate on. A 'target' is usually a package name, filename, URL, or
+a search string. Targets can be provided as command line arguments.
+Additionally, if a single dash (-) is passed as an argument, targets will be
+read from stdin.
+
 
 Operations
 ----------
 *-D, \--database*::
-	Modify the package database. This options allows you to modify certain
+	Modify the package database. This operation 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.
@@ -49,7 +54,7 @@ Operations
 	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
-	with a `.pacsave` extension unless the '\--nosave' option is used.
+	with a '.pacsave' extension unless the '\--nosave' option is used.
 	See <<RO,Remove Options>> below.
 
 *-S, \--sync*::
@@ -63,27 +68,37 @@ Operations
 	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
+gnome is a defined package group, then `pacman -S gnome` will provide a
-package in the gnome group, as well as the dependencies of those packages.
+prompt allowing you to select which packages to install from a numbered list.
+The package selection is specified using a space separated list of package
+numbers. Sequential packages may be selected by specifying the first and last
+package numbers separated by a hyphen (`-`). Excluding packages is achieved by
+prefixing a number or range of numbers with a caret (`^`).
 +
-Packages which provide other packages are also handled. For example, `pacman -S
+Packages that provide other packages are also handled. For example, `pacman -S
-foo` will first look for a foo package. If foo is not found, packages which
+foo` will first look for a foo package. If foo is not found, packages that
 provide the same functionality as foo will be searched for. If any package is
-found, it will be installed.
+found, it will be installed. A selection prompt is provided if multiple packages
+providing foo are found.
 +
 You can also use `pacman -Su` to upgrade all packages that are out of date. See
 <<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
+    1.0a < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 < 1.0.a < 1.0.1
   Numeric:
     1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0
++
+Additionally, version strings can have an 'epoch' value defined that will
+overrule any version comparison (unless the epoch values are equal). This is
+specified in an `epoch:version-rel` format. For example, `2:1.0-1` is always
+greater than `1:3.6-1`.
 
 *-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.
+	return a list of dependencies that are not currently satisfied on the system.
 	This operation accepts no other options. Example usage: `pacman -T qt
 	"bash>=3.2"`.
 
@@ -104,6 +119,94 @@ to determine which packages need upgrading. This behavior operates as follows:
 
 Options
 -------
+*-b, \--dbpath* <path>::
+	Specify an alternative database location (a typical default is
+	+{localstatedir}/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.
+
+*-r, \--root* <path>::
+	Specify an alternative installation root (default is `/`). This should
+	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 that is "owned" by another system.
+	*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*::
+	Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
+
+*\--arch* <arch>::
+	Specify an alternate architecture.
+
+*\--cachedir* <dir>::
+	Specify an alternative package cache location (a typical default is
+	+{localstatedir}/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.
+
+*\--config* <file>::
+	Specify an alternate configuration file.
+
+*\--debug*::
+	Display debug messages. When reporting bugs, this option is recommended
+	to be used.
+
+*\--gpgdir* <dir>::
+	Specify a directory of files used by GnuPG to verify package signatures (a
+	typical default is +{sysconfdir}/pacman.d/gnupg+). This directory should contain
+	two files: `pubring.gpg` and `trustdb.gpg`. `pubring.gpg` holds the public keys
+	of all packagers. `trustdb.gpg` contains a so-called trust database, which
+	specifies that the keys are authentic and trusted. *NOTE*: this is an absolute
+	path, the root path is not automatically prepended.
+
+*\--logfile* <file>::
+	Specify an alternate log file. This is an absolute path, regardless of
+	the installation root setting.
+
+*\--noconfirm*::
+	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.
+
+Transaction Options (apply to '-S', '-R' and '-U')
+--------------------------------------------------
+*-d, \--nodeps*::
+	Skips dependency version checks. Package names are still checked. Normally,
+	pacman will always check a package's dependency fields to ensure that all
+	dependencies are installed and there are no package conflicts in the
+	system. Specify this option twice to skip all dependency checks.
+
+*\--dbonly*::
+	Adds/Removes the database entry only, leaves all files in place.
+
+*\--noprogressbar*::
+	Do not show a progress bar when downloading files. This can be useful
+	for scripts that call pacman and capture the output.
+
+*\--noscriptlet*::
+	If an install scriptlet exists, do not execute it. Do not use this
+	unless you know what you are doing.
+
+*-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 URLs with
+	'-S', filenames 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 attributes are: %n for pkgname, %v for pkgver,
+	%l for location, %r for repo and %s for size.
+
+Upgrade Options (apply to '-S' and '-U')[[UO]]
+--------------------------------------------
+*-f, \--force*::
+	Bypass file conflict checks and overwrite conflicting files. If the
+	package that is about to be installed contains files that are already
+	installed, this option will cause all those files to be overwritten.
+	This option should be used with care, ideally not at all.
+
 *\--asdeps*::
 	Install packages non-explicitly; in other words, fake their install reason
 	to be installed as a dependency. This is useful for makepkg and other
@@ -116,96 +219,42 @@ Options
 	as explicitly installed so it will not be removed by the '\--recursive'
 	remove operation.
 
-*-b, \--dbpath* <'path'>::
+*\--ignore* <package>::
-	Specify an alternative database location (a typical default is
+	Directs pacman to ignore upgrades of package even if there is one
-	``/var/lib/pacman'').  This should not be used unless you know what you are
+	available. Multiple packages can be specified by separating them
-	doing. *NOTE*: if specified, this is an absolute path and the root path is
+	with a comma.
-	not automatically prepended.
 
-*-d, \--nodeps*::
+*\--ignoregroup* <group>::
-	Skips all dependency checks. Normally, pacman will always check a
+	Directs pacman to ignore upgrades of all packages in 'group' even if
-	package's dependency fields to ensure that all dependencies are
+	there is one available. Multiple groups can be specified by
-	installed and there are no package conflicts in the system.
+	separating them with a comma.
 
-*-f, \--force*::
+*\--needed*::
-	Bypass file conflict checks and overwrite conflicting files. If the
+	Do not reinstall the targets that are already up to date.
-	package that is about to be installed contains files that are already
-	installed, this option will cause all those files to be overwritten.
-	This option should be used with care, ideally not at all.
 
-*-r, \--root* <'path'>::
+*\--recursive*::
-	Specify an alternative installation root (default is ``/''). This should
+	Recursively reinstall all dependencies of the targets. This forces upgrades
-	not be used as a way to install software into ``/usr/local'' instead of
+	or reinstalls of all dependencies without requiring explicit version
-	``/usr''. This option is used if you want to install a package on a
+	requirements. This is most useful in combination with the '\--needed' flag,
-	temporary mounted partition which is "owned" by another system.
+	which will induce a deep dependency upgrade without any unnecessary
-	*NOTE*: if database path or logfile are not specified on either the
+	reinstalls.
-	command line or in linkman:pacman.conf[5], their default location will
-	be inside this root path.
 
-*-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.
-
-*\--config* <'file'>::
-	Specify an alternate configuration file.
-
-*\--logfile* <'file'>::
-	Specify an alternate log file. This is an absolute path, regardless of
-	the installation root setting.
-
-*\--noconfirm*::
-	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*::
-	Do not show a progress bar when downloading files. This can be useful
-	for scripts that call pacman and capture the output.
-
-*\--noscriptlet*::
-	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]]
 -------------------
 *-c, \--changelog*::
-	View the ChangeLog of a package. Not every package will provide one but
+	View the ChangeLog of a package if it exists.
-	it will be shown if available.
 
 *-d, \--deps*::
 	Restrict or filter output to packages installed as dependencies. This
-	option can be combined with '-t' for listing real orphans- packages that
+	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'
+	installed package.
-	option.)
 
 *-e, \--explicit*::
-	Restrict or filter output to packages explicitly installed. This option
+	Restrict or filter output to explicitly installed packages. This option
-	can be combined with '-t' to list top-level packages- those packages
+	can be combined with '-t' to list explicitly installed packages that
-	that were explicitly installed but are not required by any other
+	are not required by any other package.
-	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
@@ -231,9 +280,9 @@ Query Options[[QO]]
 	database(s).  Typically these are packages that were downloaded manually
 	and installed with '\--upgrade'.
 
-*-o, \--owns* <'file'>::
+*-o, \--owns* <file>::
-	Search for the package that owns file. The path can be relative or
+	Search for packages that own the specified file(s). The path can be
-	absolute.
+	relative or absolute and one or more files can be specified.
 
 *-p, \--file*::
 	Signifies that the package supplied on the command line is a file and
@@ -250,11 +299,10 @@ Query Options[[QO]]
 	and missing files; a bare query will only show package names
 	rather than names and versions.
 
-*-s, \--search* <'regexp'>::
+*-s, \--search* <regexp>::
-	This will search each locally-installed package for names or
+	Search each locally-installed package for names or descriptions that
-	descriptions that match `regexp`. When you include multiple search
+	match `regexp`. When including multiple search terms, only packages
-	terms, only packages with descriptions matching ALL of those terms will
+	with descriptions matching ALL of those terms are returned.
-	be returned.
 
 *-t, \--unrequired*::
 	Restrict or filter output to packages not required by any currently
@@ -274,13 +322,10 @@ 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, \--dbonly*::
-	Removes the database entry only. Leaves all files in place.
-
 *-n, \--nosave*::
 	Instructs pacman to ignore file backup designations. Normally, when a
 	file is removed from the system the database is checked to see if the
-	file should be renamed with a ``.pacsave'' extension.
+	file should be renamed with a '.pacsave' extension.
 
 *-s, \--recursive*::
 	Remove each target specified including all of their dependencies, provided
@@ -290,7 +335,7 @@ Remove Options[[RO]]
 	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.
+	Removes 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.
 
@@ -332,7 +377,7 @@ linkman:pacman.conf[5].
 	will only show package names and omit databases and versions; group will
 	only show package names and omit group names.
 
-*-s, \--search* <'regexp'>::
+*-s, \--search* <regexp>::
 	This will search each package in the sync databases for names or
 	descriptions that match `regexp`. When you include multiple search
 	terms, only packages with descriptions matching ALL of those terms will
@@ -344,44 +389,34 @@ linkman:pacman.conf[5].
 	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. Pass this option twice to enable package downgrade; in this
+	necessary.
-	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
+Pass this option twice to enable package downgrade; in this case pacman will
-	repo to a stable one. Additional targets can also be specified manually, so
+select sync packages whose version does not match with the local version.  This
-	that '-Su foo' will do a system upgrade and install/upgrade the foo package in
+can be useful when the user switches from a testing repo to a stable one.
-	the same operation.
++
+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
+	Retrieve all packages from the server, but do not install/upgrade anything.
-	anything.
 
 *-y, \--refresh*::
 	Download a fresh copy of the master package list from the server(s)
 	defined in linkman:pacman.conf[5]. This should typically be used each time
 	you use	'\--sysupgrade' or '-u'. Passing two '\--refresh' or '-y' flags
-	will force a refresh of all package lists even if they are thought to be up
+	will force a refresh of all package lists even if they appear to be up
 	to date.
 
 *\--needed*::
-	Don't reinstall the targets that are already up-to-date.
+	Do not reinstall the targets that are already up to date.
 
-*\--ignore* <'package'>::
+*\--recursive*::
-	Directs pacman to ignore upgrades of package even if there is one
+	Recursively reinstall all dependencies of the targets. This forces upgrades
-	available. Multiple packages can be specified by separating them
+	or reinstalls of all dependencies without requiring explicit version
-	with a comma.
+	requirements. This is most useful in combination with the '\--needed' flag,
-
+	which will induce a deep dependency upgrade without any unnecessary
-*\--ignoregroup* <'group'>::
+	reinstalls.
-	Directs pacman to ignore upgrades of all packages in 'group' even if
-	there is one available. Multiple groups can be specified by
-	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]]
@@ -394,7 +429,7 @@ actual file existing on the filesystem. After comparing these 3 hashes, the
 follow scenarios can result:
 
 original=X, current=X, new=X::
-	All three files are the same, so overwrites are not an issue Install the
+	All three files are the same, so overwrites are not an issue. Install the
 	new file.
 
 original=X, current=X, new=Y::
@@ -415,6 +450,25 @@ original=X, current=Y, new=Z::
 	necessary changes into the original file.
 
 
+Examples
+--------
+
+pacman -Ss ne.hack::
+	Search for regexp "ne.hack" in package database.
+
+pacman -S gpm::
+	Download and install gpm including dependencies.
+
+pacman -U /home/user/ceofhack-0.6-1-x86_64.pkg.tar.gz::
+	Install ceofhack-0.6-1 package from a local file.
+
+pacman -Syu::
+	Update package list and upgrade all packages afterwards.
+
+pacman -Syu gpm::
+	Update package list, upgrade all packages, and then install gpm if it
+	wasn't already installed.
+
 Configuration
 -------------
 See linkman:pacman.conf[5] for more details on configuring pacman using the

doc/pacman.conf.5.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 pacman.conf(5)
 ==============
@@ -57,22 +57,31 @@ Options
 
 *DBPath =* path/to/db/dir::
 	Overrides the default location of the toplevel database directory.  A
-	typical default is ``/var/lib/pacman/''. Most users will not need to set
+	typical default is +{localstatedir}/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.
 
 *CacheDir =* path/to/cache/dir::
 	Overrides the default location of the package cache directory. A typical
-	default is ``/var/cache/pacman/pkg/''. Multiple cache directories can be
+	default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be
 	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.
 
+*GPGDir =* path/to/gpg/dir::
+	Overrides the default location of the directory containing configuration
+	files for GnuPG. A typical default is +{sysconfdir}/pacman.d/gnupg/+.
+	This directory should contain two files: `pubring.gpg` and `trustdb.gpg`.
+	`pubring.gpg` holds the public keys of all packagers. `trustdb.gpg`
+	contains a so-called trust database, which specifies that the keys are
+	authentic and trusted.
+	*NOTE*: this is an absolute path, the root path is not automatically
+	prepended.
 
 *LogFile =* '/path/to/file'::
 	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 +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory
 	is not prepended.
 
 *HoldPkg =* package ...::
@@ -136,21 +145,24 @@ Options
 	These files refer to files in the package archive, so do not include the
 	leading slash (the RootDir) when specifying them.
 
-*CleanMethod =* KeepInstalled | KeepCurrent::
+*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.
+	sync databases in use could be the same. If both values are specified,
+	packages are only cleaned if not installed locally and not present in any
+	known sync database.
+
+*SigLevel =* ...::
+	Set the default signature verification level. For more information, see
+	<<SC,Package and Database Signature Checking>> below.
 
 *UseSyslog*::
 	Log action messages through syslog(). This will insert log entries into
-	``/var/log/messages'' or equivalent.
+	+{localstatedir}/log/messages+ or equivalent.
-
-*ShowSize*::
-	Display the size of individual packages for '\--sync' and '\--query' modes.
 
 *UseDelta*::
 	Download delta files instead of complete packages if possible.  Requires
@@ -162,6 +174,14 @@ Options
 	than the percent of each individual download target. The progress
 	bar is still based solely on the current file download.
 
+*CheckSpace*::
+	Performs an approximate check for adequate available disk space before
+	installing packages.
+
+*VerbosePkgLists*::
+	Displays name, version and size of target packages formatted
+	as a table for upgrade, sync and remove operations.
+
 Repository Sections
 -------------------
 Each repository section defines a section name and at least one location where
@@ -177,20 +197,10 @@ contain a file that lists the servers for that repository.
 
 --------
 [core]
-# use this repository first
+# use this server first
-Server = ftp://ftp.archlinux.org/core/os/arch
-# next use servers as defined in the mirrorlist below
-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. 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
+# next use servers as defined in the mirrorlist below
+Include = {sysconfdir}/pacman.d/mirrorlist
 --------
 
 The order of repositories in the configuration files matters; repositories
@@ -198,6 +208,88 @@ listed first will take precedence over those listed later in the file when
 packages in two repositories have identical names, regardless of version
 number.
 
+*Include =* path::
+	Include another config file. This file can include repositories or
+	general configuration options. Wildcards in the specified paths will get
+	expanded based on linkman:glob[7] rules.
+
+*Server =* url::
+	A full URL to a location where the database, packages, and signatures (if
+	available) for this repository can be found.
++
+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. pacman also defines
+the `$arch` variable to the value of `Architecture`, so the same mirrorfile can
+even be used for different architectures.
+
+*SigLevel =* ...::
+	Set the signature verification level for this repository. For more
+	information, see <<SC,Package and Database Signature Checking>> below.
+
+Package and Database Signature Checking
+---------------------------------------
+The 'SigLevel' directive is valid in both the `[options]` and repository
+sections. If used in `[options]`, it sets a default value for any repository
+that does not provide the setting.
+
+* If set to *Never*, no signature checking will take place.
+* If set to *Optional* , signatures will be checked when present, but unsigned
+  databases and packages will also be accepted.
+* If set to *Required*, signatures will be required on all packages and
+  databases.
+
+Alternatively, you can get more fine-grained control by combining some of
+the options and prefixes described below. All options in a config file are
+processed in top-to-bottom, left-to-right fashion, where later options override
+and/or supplement earlier ones. If 'SigLevel' is specified in a repository
+section, the starting value is that from the `[options]` section, or the
+built-in system default as shown below if not specified.
+
+The options are split into two main groups, described below. Terms used such as
+``marginally trusted'' are terms used by GnuPG, for more information please
+consult linkman:gpg[1].
+
+When to Check::
+	These options control if and when signature checks should take place.
+
+	*Never*;;
+		All signature checking is suppressed, even if signatures are present.
+
+	*Optional* (default);;
+		Signatures are checked if present; absence of a signature is not an
+		error. An invalid signature is a fatal error, as is a signature from a
+		key not in the keyring.
+
+	*Required*;;
+		Signatures are required; absence of a signature or an invalid signature
+		is a fatal error, as is a signature from a key not in the keyring.
+
+What is Allowed::
+	These options control what signatures are viewed as permissible. Note that
+	neither of these options allows acceptance of invalid or expired
+	signatures, or those from revoked keys.
+
+	*TrustedOnly* (default);;
+		If a signature is checked, it must be in the keyring and fully trusted;
+		marginal trust does not meet this criteria.
+
+	*TrustAll*;;
+		If a signature is checked, it must be in the keyring, but is not
+		required to be assigned a trust level (e.g., unknown or marginal
+		trust).
+
+Options in both groups can additionally be prefixed with either *Package* or
+*Database*, which will cause it to only take effect on the specified object
+type. For example, `PackageTrustAll` would allow marginal and unknown trust
+level signatures for packages.
+
+The built-in default is the following:
+
+--------
+SigLevel = Optional TrustedOnly
+--------
+
 Using Your Own Repository
 -------------------------
 If you have numerous custom packages of your own, it is often easier to generate
@@ -209,11 +301,12 @@ directory with these packages so pacman can find it when run with '\--refresh'.
 
 The above command will generate a compressed database named
 '/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form
-'{treename}.db.tar.gz', where '{treename}' is the name of the section defined in
+'\{treename\}.db.tar.{ext}', where '\{treename\}' is the name of the section
-the configuration file. That's it! Now configure your custom section in the
+defined in the configuration file and '\{ext\}' is a valid compression type as
-configuration file as shown in the config example above. Pacman will now use your
+documented in linkman:repo-add[8]. That's it! Now configure your custom section
-package repository. If you add new packages to the repository, remember to
+in the configuration file as shown in the config example above. Pacman will now
-re-generate the database and use pacman's '\--refresh' option.
+use your package repository. If you add new packages to the repository,
+remember to re-generate the database and use pacman's '\--refresh' option.
 
 For more information on the repo-add command, see ``repo-add \--help'' or
 linkman:repo-add[8].

doc/pkgdelta.8.txt

@@ -0,0 +1,42 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
+/////
+pkgdelta(8)
+=========
+
+Name
+----
+pkgdelta - package delta generation utility
+
+
+Synopsis
+--------
+'pkgdelta' [-q] <package1> <package2>
+
+
+Description
+-----------
+'pkgdelta' is used to create package delta files between two versions of the
+same package. These files are essentially binary patches. linkman:pacman[8] can
+download deltas instead of full package upgrades, and use them with the
+previous versions of packages (in the package cache) to synthesize the upgraded
+version of the packages. This likely reduces download sizes for upgrades
+significantly.
+
+'pkgdelta' requires linkman:xdelta3[1] to do its job.
+
+Options
+-------
+*-q, \--quiet*::
+	Be quiet. Do not output anything but warnings and errors.
+
+Examples
+--------
+
+  $ pkgdelta libreoffice-3.3.2-1-x86_64.pkg.tar.xz libreoffice-3.3.2-2-x86_64.pkg.tar.xz
+
+See Also
+--------
+linkman:pacman[8], linkman:xdelta3[1]
+
+include::footer.txt[]

doc/repo-add.8.txt

@@ -1,5 +1,5 @@
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////
 repo-add(8)
 ==========
@@ -10,33 +10,66 @@ repo-add - package database maintenance utility
 
 Synopsis
 --------
-repo-add [-q] <path-to-db> <package1> [<package2> ...]
+'repo-add' [options] <path-to-db> <package|delta> [<package|delta> ...]
 
-repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...]
+'repo-remove' [options] <path-to-db> <packagename|delta> [<packagename|delta> ...]
 
 
 Description
 -----------
-repo-add and repo-remove are two scripts to help build a package database for
+'repo-add' and 'repo-remove' are two scripts to help build a package database for
 packages built with linkman:makepkg[8] and installed with linkman:pacman[8].
+They also handle package deltas produced by linkman:pkgdelta[8].
 
-repo-add will update a package database by reading a built package file.
+'repo-add' will update a package database by reading a built package or package
-Multiple packages to add can be specified on the command line.
+delta file. Multiple packages and/or deltas to add can be specified on the
+command line.
 
-repo-remove will update a package database by removing the package name
+'repo-remove' will update a package database by removing the package name or
-specified on the command line. Multiple packages to remove can be specified
+delta specified on the command line. Multiple packages and/or delta to remove
-on the command line.
+can be specified on the command line.
+
+A package database is a tar file, optionally compressed. Valid extensions are
+``.db'' or ``.files'' followed by an archive extension of ``.tar'',
+``.tar.gz'', ``.tar.bz2'', ``.tar.xz'', or ``.tar.Z''. The file does not need
+to exist, but all parent directories must exist.
 
 
-Options
+Common Options
--------
+--------------
 *-q, \--quiet*::
 	Force this program to keep quiet and run silent except for warning and
 	error messages.
 
+*-s, \--sign*::
+	Generate a PGP signature file using GnuPG. This will execute `gpg
+	--detach-sign --use-agent` on the generated database to generate a detached
+	signature file, using the GPG agent if it is available. The signature file
+	will be the entire filename of the database with a ``.sig'' extension.
+
+*-k, \--key* <key>::
+	Specify a key to use when signing packages. Can also be specified using
+	the GPGKEY environmental variable. If not specified in either location, the
+	default key from the keyring will be used.
+
+*-v, \--verify*::
+	Verify the PGP signature of the database before updating the database.
+	If the signature is invalid, an error is produced and the update does not
+	proceed.
+
+repo-add Options
+----------------
+*-d, \--delta*::
+	Automatically generate and add a delta file between the old entry and the
+	new one, if the old package file is found next to the new one.
+
+*-f, \--files*::
+	Tells repo-add also to create and include a list of the files in the
+	specified packages. This is useful for creating databases listing all files
+	in a given sync repository for tools that may use this information.
 
 See Also
 --------
-linkman:makepkg[8], linkman:pacman[8]
+linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8]
 
 include::footer.txt[]

doc/submitting-patches.txt

@@ -20,7 +20,7 @@ started with GIT if you have not worked with it before.
 
 The pacman code can be fetched using the following command:
 
-    git clone git://projects.archlinux.org/pacman.git
+	git clone git://projects.archlinux.org/pacman.git
 
 
 Creating your patch
@@ -32,7 +32,7 @@ Creating your patch
 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>
+	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.
@@ -94,5 +94,5 @@ aren't their own.
 --
 
 /////
-vim: set ts=2 sw=2 syntax=asciidoc et:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////

doc/translation-help.txt

@@ -4,13 +4,17 @@ Pacman - Translating
 This document is here to guide you in helping translate pacman messages,
 libalpm messages, and the manpages for the entire pacman package.
 
-A quick note- the gettext website is a very useful guide to read before
+We are currently using http://www.transifex.net/[Transifex] as the translation
-embarking on translation work, as it describes many of the commands in more
+platform for pacman and libalpm. You will need to sign up for an account there
-detail than I will here:
+and then register with a translation team on the
-http://www.gnu.org/software/gettext/manual/html_node/gettext.html[]
+http://www.transifex.net/projects/p/archlinux-pacman/[pacman project page].
 
-In addition, this site presents a small tutorial that I found useful:
+NOTE: This may be old information due to our switch to Transifex, but the
-http://oriya.sarovar.org/docs/gettext/[]
+gettext website is a very useful guide to read before embarking on translation
+work, as it describes many of the commands in more detail than I will here:
+http://www.gnu.org/software/gettext/manual/html_node/gettext.html[].  In
+addition, this site presents a small tutorial that I found useful:
+http://oriya.sarovar.org/docs/gettext/[].
 
 
 Translating Messages
@@ -28,35 +32,46 @@ original message and the corresponding translation. These po files can then
 either be hand edited, or modified with a tool such as poedit, gtranslator or
 kbabel. Using a translation tool tends to make the job easier.
 
+Please read up on Transifex usage using the
+http://help.transifex.net/[Transifex Help] if you are not familiar.
+
+Here is an example set of commands if you have a source code checkout and are
+not worried about any local translations being overwritten. The .tx/ directory
+is checked into the git repository so is preconfigured with the two project
+resources (See `tx status` output for a quick overview).
+
+	tx pull -f
+	poedit po/<mylang>.po
+	poedit lib/libalpm/po/<mylang>.po
+	tx push -t -l <mylang>
+
+Or to just push one of the two available resources:
+
+	tx push -r archlinux-pacman.pacman-pot -t -l fi
+	tx push -r archlinux-pacman.libalpm-pot -t -l fi
+
 See the <<Notes,Notes>> section for additional hints on translating.
 
 Pre-release Updates
 ~~~~~~~~~~~~~~~~~~~
 
 A week or two before each release, the codebase will go into a string freeze
-and an email will be sent by the 'translation lieutenant' to the
+and an email will be sent to the mailto:pacman-dev@archlinux.org[pacman-dev]
-mailto:pacman-dev@archlinux.org[pacman-dev] mailing list asking for
+mailing list asking for translations. This email will have a prefix of
-translations. This email will have a prefix of *[translation]* for anyone
+*[translation]* for anyone looking to set up an email filter.
-looking to set up an email filter.
 
-At this time, the `.po` language files will be made available at a URL
+At this time, the latest `.po` language files will be made available at the
-specified in the email. Each language will have two files available (backend
+Transifex project page.  Each language will have two files available (backend
-and frontend). Translators interested in helping are encouraged to send a
+and frontend). Translators interested in helping are encouraged to use the
-follow-up message to the mailing list stating exactly what they intend to
+features of Transifex to let others know they are currently translating their
-translate so efforts are not duplicated on the same language.
+language.
 
 Once a translator has completed the translation (*OR* realizes they do not have
-time to finish), please email the `.po` files back to the list with a subject
+time to finish), please upload your progress back to the Transifex site.
-such as '[translation] Updated German translation'. At this point, the
-'translation lieutenant' will gather the translations together for inclusion in
-the upcoming release.
 
-NOTE: Please email your translations back to the list as soon as possible- this
+NOTE: Please upload your translations as soon as possible- this will give other
-will give other speakers of your language time to review your translations and
+speakers of your language time to review your translations and update them as
-update them as necessary.
+necessary.
-
-For those familiar with GIT, you may wish to follow the procedure outlined
-below as another alternative.
 
 Incremental Updates
 ~~~~~~~~~~~~~~~~~~~
@@ -64,7 +79,7 @@ Incremental Updates
 If you have more advanced needs you will have to get a copy of the pacman
 repository.
 
-    git clone git://projects.archlinux.org/pacman.git pacman
+	git clone git://projects.archlinux.org/pacman.git pacman
 
 Next, you will need to run `./autogen.sh` and `./configure` in the base
 directory to generate the correct Makefiles. At this point, all necessary
@@ -76,11 +91,11 @@ We need to first update the main message catalog file. Navigate into either the
 work on first, and execute the following command.  If you are working in the
 `po/` tree, replace 'libalpm.pot' with 'pacman.pot':
 
-    make libalpm.pot-update
+	make libalpm.pot-update
 
 Next, update your specific language's translation file:
 
-    make <po file>-update
+	make <po file>-update
 
 At this point, you can do the translation. To submit your changes, either email
 the new `.po` file to the mailing-list with *[translation]* in the subject, or
@@ -89,7 +104,7 @@ submit a GIT-formatted patch (please do not include any `.pot` file changes).
 As a shortcut, all translation files (including `.pot` files) can be updated
 with the following command:
 
-    make update-po
+	make update-po
 
 Adding a New Language
 ~~~~~~~~~~~~~~~~~~~~~
@@ -118,16 +133,16 @@ msgid and msgstr 'variables' can be on as many lines as necessary. Line breaks
 are ignored- if you need a literal line break, use an `\n` in your string. The
 following two translations are equivalent:
 
-    msgstr "This is a test translation"
+	msgstr "This is a test translation"
 
-    msgstr ""
+	msgstr ""
-    "This is a test translation"
+	"This is a test translation"
 
 If you want to test the translation (for example, the frontend one):
 
-    rm *.gmo stamp-po
+	rm *.gmo stamp-po
-    make
+	make
-    cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo
+	cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo
 
 
 Translating Manpages
@@ -145,5 +160,5 @@ check there first before undergoing a translation effort to ensure you are not
 duplicating efforts.
 
 /////
-vim: set ts=2 sw=2 syntax=asciidoc et:
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
 /////

doc/vercmp.8.txt

@@ -0,0 +1,71 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
+/////
+vercmp(8)
+=========
+
+Name
+----
+vercmp - version comparsion utility
+
+
+Synopsis
+--------
+'vercmp' <version1> <version2>
+
+
+Description
+-----------
+'vercmp' is used to determine the relationship between two given version
+numbers. It outputs values as follows:
+
+*  < 0 : if ver1 < ver2
+*  = 0 : if ver1 == ver2
+*  > 0 : if ver1 > ver2
+
+Version comparsion operates as follows:
+
+  Alphanumeric:
+    1.0a < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 < 1.0.a < 1.0.1
+  Numeric:
+    1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0
+
+Additionally, version strings can have an 'epoch' value defined that will
+overrule any version comparison (unless the epoch values are equal). This is
+specified in an `epoch:version-rel` format. For example, `2:1.0-1` is always
+greater than `1:3.6-1`.
+
+
+Options
+-------
+*-h, \--help*::
+	Display syntax for the given operation. If no operation was supplied
+	then the general syntax is shown.
+
+Examples
+--------
+
+  $ vercmp 1 2
+  -1
+
+  $ vercmp 2 1
+  1
+
+  $ vercmp 2.0-1 1.7-6
+  1
+
+  $ vercmp 2.0 2.0-13
+  0
+
+  $ vercmp 4.34 1:001
+  -1
+
+Configuration
+-------------
+There is none.
+
+See Also
+--------
+linkman:pacman[8], linkman:makepkg[8], linkman:libalpm[3]
+
+include::footer.txt[]

etc/Makefile.am

@@ -19,12 +19,11 @@ edit = sed \
 	-e 's|@CARCH[@]|$(CARCH)|g' \
 	-e 's|@CHOST[@]|$(CHOST)|g' \
 	-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
-	-e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g' \
 	-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
 
 $(dist_sysconf_DATA): Makefile
 	@echo '    ' GEN $@;
-	@rm -f $@ $@.tmp
+	@$(RM) $@ $@.tmp
 	@$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
 	@mv $@.tmp $@
 

etc/makepkg.conf.in

@@ -8,16 +8,16 @@
 #
 #-- 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 -O %o %u'
+DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
 # /usr/bin/snarf
 # /usr/bin/lftpget -c
-# /usr/bin/curl
+# /usr/bin/wget
 
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
@@ -26,11 +26,9 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
 CARCH="@CARCH@"
 CHOST="@CHOST@"
 
-#-- Exclusive: will only run on @CARCH@
+#-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
+#CFLAGS="-O2 -pipe"
-# -mtune optimizes for an architecture, but builds for whole processor family
+#CXXFLAGS="-O2 -pipe"
-CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
 #LDFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
@@ -39,36 +37,42 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #  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
+#-- check:    Run the check() function if present in the PKGBUILD
+#-- sign:     Generate PGP signature file
 #
-BUILDENV=(fakeroot !distcc color !ccache)
+BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.
 #DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
 
 #########################################################################
 # GLOBAL PACKAGE OPTIONS
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
 #  A negated option will do the opposite of the comments below.
 #
-#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS
+#-- strip:     Strip symbols from binaries/libraries
 #-- 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
+#-- upx:       Compress binary executable files using UPX
 #
-OPTIONS=(strip docs libtool emptydirs zipman purge)
+OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -82,8 +86,6 @@ STRIP_STATIC="@STRIP_STATIC@"
 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)
 
@@ -101,6 +103,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #SRCPKGDEST=/home/srcpackages
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
 
 #########################################################################
 # EXTENSION DEFAULTS

etc/pacman.conf.in

@@ -13,11 +13,12 @@
 #DBPath      = @localstatedir@/lib/pacman/
 #CacheDir    = @localstatedir@/cache/pacman/pkg/
 #LogFile     = @localstatedir@/log/pacman.log
+#GPGDir      = @sysconfdir@/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -28,11 +29,15 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+#SigLevel = Optional
 
 #
 # REPOSITORIES
@@ -58,6 +63,7 @@ Architecture = auto
 # servers immediately after the header and they will be used before the
 # default mirrors.
 #[core]
+#SigLevel = Required
 #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
@@ -65,5 +71,6 @@ Architecture = auto
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
+#SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 

install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-10-14.15
+scriptversion=2010-02-06.18; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,34 +58,49 @@ fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
-mvprog="${MVPROG-mv}"
+chgrpprog=${CHGRPPROG-chgrp}
-cpprog="${CPPROG-cp}"
+chmodprog=${CHMODPROG-chmod}
-chmodprog="${CHMODPROG-chmod}"
+chownprog=${CHOWNPROG-chown}
-chownprog="${CHOWNPROG-chown}"
+cmpprog=${CMPPROG-cmp}
-chgrpprog="${CHGRPPROG-chgrp}"
+cpprog=${CPPROG-cp}
-stripprog="${STRIPPROG-strip}"
+mkdirprog=${MKDIRPROG-mkdir}
-rmprog="${RMPROG-rm}"
+mvprog=${MVPROG-mv}
-mkdirprog="${MKDIRPROG-mkdir}"
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-posix_glob=
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
+mvcmd=$mvprog
-stripcmd=
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
+     --help     display this help and exit.
--d         create directories instead of installing files.
+     --version  display version info and exit.
--g GROUP   $chgrpprog installed files to GROUP.
+
--m MODE    $chmodprog installed files to MODE.
+  -c            (ignored)
--o USER    $chownprog installed files to USER.
+  -C            install only if different (preserve the last data modification time)
--s         $stripprog installed files.
+  -d            create directories instead of installing files.
--t DIRECTORY  install into DIRECTORY.
+  -g GROUP      $chgrpprog installed files to GROUP.
--T         report an error if DSTFILE is a directory.
+  -m MODE       $chmodprog installed files to MODE.
---help     display this help and exit.
+  -o USER       $chownprog installed files to USER.
---version  display version info and exit.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
-    -c) shift
+    -c) ;;
-        continue;;
 
-    -d) dir_arg=true
+    -C) copy_on_change=true;;
-        shift
+
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
+	shift;;
-        shift
-        continue;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        shift
-        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
-        continue;;
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
+	shift;;
-        shift
-        continue;;
 
-    -s) stripcmd=$stripprog
+    -s) stripcmd=$stripprog;;
-        shift
-        continue;;
 
-    -t) dstarg=$2
+    -t) dst_arg=$2
-	shift
+	shift;;
-	shift
-	continue;;
 
-    -T) no_target_directory=true
+    -T) no_target_directory=true;;
-	shift
-	continue;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -165,21 +170,22 @@ while test $# -ne 0; do
 
     *)  break;;
   esac
+  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
   # Otherwise, the last argument is the destination.  Remove it from $@.
   for arg
   do
-    if test -n "$dstarg"; then
+    if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
+      set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
-    dstarg=$arg
+    dst_arg=$arg
   done
 fi
 
@@ -194,7 +200,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -224,7 +234,7 @@ for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -242,22 +252,22 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
       dstdir=$dst
@@ -378,26 +388,19 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix=/ ;;
+	/*) prefix='/';;
-	-*) prefix=./ ;;
+	-*) prefix='./';;
-	*)  prefix= ;;
+	*)  prefix='';;
       esac
 
-      case $posix_glob in
+      eval "$initialize_posix_glob"
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
 
       oIFS=$IFS
       IFS=/
-      $posix_glob && set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      $posix_glob && set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
@@ -459,41 +462,54 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
-    # Now rename the file to the real destination.
+    # If -C, don't bother to copy if it wouldn't change the file.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+    if $copy_on_change &&
-      || {
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-	   # The rename failed, perhaps because mv can't rename something else
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
 
-	   # Now remove or move aside any old file at destination location.
+       eval "$initialize_posix_glob" &&
-	   # We try this two ways since rm can't unlink itself on some
+       $posix_glob set -f &&
-	   # systems and the destination file might be busy for other
+       set X $old && old=:$2:$4:$5:$6 &&
-	   # reasons.  In this case, the final cleanup might fail but the new
+       set X $new && new=:$2:$4:$5:$6 &&
-	   # file should still install successfully.
+       $posix_glob set +f &&
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
 
-	   # Now rename the file to the real destination.
+       test "$old" = "$new" &&
-	   $doit $mvcmd "$dsttmp" "$dst"
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-	 }
+    then
-    } || exit 1
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
 
     trap '' 0
   fi
@@ -503,5 +519,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

lib/libalpm/Makefile.am

@@ -25,28 +25,42 @@ libalpm_la_SOURCES = \
 	alpm.h alpm.c \
 	alpm_list.h alpm_list.c \
 	backup.h backup.c \
-	be_files.c \
+	be_local.c \
 	be_package.c \
-	cache.h cache.c \
+	be_sync.c \
 	conflict.h conflict.c \
 	db.h db.c \
 	delta.h delta.c \
 	deps.h deps.c \
+	diskspace.h diskspace.c \
 	dload.h dload.c \
 	error.c \
-	graph.h \
+	graph.h graph.c \
 	group.h group.c \
 	handle.h handle.c \
 	log.h log.c \
-	md5.h md5.c \
 	package.h package.c \
+	pkghash.h pkghash.c \
+	rawstr.c \
 	remove.h remove.c \
+	signing.c signing.h \
 	sync.h sync.c \
 	trans.h trans.c \
 	util.h util.c \
 	version.c
 
-libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
+if !HAVE_LIBSSL
+libalpm_la_SOURCES += \
+	md5.h md5.c \
+	sha2.h sha2.c
+endif
+
+if HAVE_LIBGPGME
+libalpm_la_SOURCES += \
+	base64.h base64.c
+endif
+
+libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) @LIBCURL@
 libalpm_la_LIBADD = $(LTLIBINTL)
 
 # vim:set ts=2 sw=2 noet:

lib/libalpm/add.c

@@ -1,7 +1,7 @@
 /*
  *  add.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -25,6 +25,7 @@
 #include <time.h>
 #include <string.h>
 #include <limits.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -37,92 +38,109 @@
 
 /* libalpm */
 #include "add.h"
+#include "alpm.h"
 #include "alpm_list.h"
+#include "handle.h"
 #include "trans.h"
 #include "util.h"
-#include "cache.h"
 #include "log.h"
 #include "backup.h"
 #include "package.h"
 #include "db.h"
-#include "conflict.h"
-#include "deps.h"
 #include "remove.h"
 #include "handle.h"
 
-/** Add a file target to the transaction.
+/** Add a package to the transaction. */
- * @param target the name of the file target to add
+int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg)
- * @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;
+	alpm_trans_t *trans;
-	pmtrans_t *trans;
+	alpm_pkg_t *local;
-
-	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
-	ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	CHECK_HANDLE(handle, return -1);
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
+	ASSERT(handle == pkg->handle, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
 	trans = handle->trans;
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1));
-	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+	ASSERT(trans->state == STATE_INITIALIZED,
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+			RET_ERR(handle, ALPM_ERR_TRANS_NOT_INITIALIZED, -1));
 
-	_alpm_log(PM_LOG_DEBUG, "loading target '%s'\n", target);
+	pkgname = pkg->name;
+	pkgver = pkg->version;
 
-	if(alpm_pkg_load(target, 1, &pkg) != 0) {
+	_alpm_log(handle, ALPM_LOG_DEBUG, "adding package '%s'\n", pkgname);
-		goto error;
+
+	if(_alpm_pkg_find(trans->add, pkgname)) {
+		RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1);
 	}
-	pkgname = alpm_pkg_get_name(pkg);
-	pkgver = alpm_pkg_get_version(pkg);
 
-	/* check if an older version of said package is already in transaction
+	local = _alpm_db_get_pkgfromcache(handle->db_local, pkgname);
-	 * packages.  if so, replace it in the list */
+	if(local) {
-	for(i = trans->add; i; i = i->next) {
+		const char *localpkgname = local->name;
-		pmpkg_t *transpkg = i->data;
+		const char *localpkgver = local->version;
-		if(strcmp(transpkg->name, pkgname) == 0) {
+		int cmp = _alpm_pkg_compare_versions(pkg, local);
-			if(alpm_pkg_vercmp(transpkg->version, pkgver) < 0) {
+
-				_alpm_log(PM_LOG_WARNING,
+		if(cmp == 0) {
-						_("replacing older version %s-%s by %s in target list\n"),
+			if(trans->flags & ALPM_TRANS_FLAG_NEEDED) {
-						transpkg->name, transpkg->version, pkgver);
+				/* with the NEEDED flag, packages up to date are not reinstalled */
-				_alpm_pkg_free(i->data);
+				_alpm_log(handle, ALPM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"),
-				i->data = pkg;
+						localpkgname, localpkgver);
-			} else {
+				return 0;
-				_alpm_log(PM_LOG_WARNING,
+			} else if(!(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) {
-						_("skipping %s-%s because newer version %s is in target list\n"),
+				_alpm_log(handle, ALPM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
-						pkgname, pkgver, transpkg->version);
+						localpkgname, localpkgver);
-				_alpm_pkg_free(pkg);
 			}
-			return(0);
+		} else if(cmp < 0) {
+			/* local version is newer */
+			_alpm_log(handle, ALPM_LOG_WARNING, _("downgrading package %s (%s => %s)\n"),
+					localpkgname, localpkgver, pkgver);
 		}
 	}
 
 	/* add the package to the transaction */
+	pkg->reason = ALPM_PKG_REASON_EXPLICIT;
+	_alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s to the transaction add list\n",
+						pkgname, pkgver);
 	trans->add = alpm_list_add(trans->add, pkg);
 
-	return(0);
+	return 0;
-
-error:
-	_alpm_pkg_free(pkg);
-	return(-1);
 }
 
-static int extract_single_file(struct archive *archive,
+static int perform_extraction(alpm_handle_t *handle, struct archive *archive,
-		struct archive_entry *entry, pmpkg_t *newpkg, pmpkg_t *oldpkg,
+		struct archive_entry *entry, const char *filename, const char *origname)
-		pmtrans_t *trans, pmdb_t *db)
+{
+	int ret;
+	const int archive_flags = ARCHIVE_EXTRACT_OWNER |
+	                          ARCHIVE_EXTRACT_PERM |
+	                          ARCHIVE_EXTRACT_TIME;
+
+	archive_entry_set_pathname(entry, filename);
+
+	ret = archive_read_extract(archive, entry, archive_flags);
+	if(ret == ARCHIVE_WARN && archive_errno(archive) != ENOSPC) {
+		/* operation succeeded but a "non-critical" error was encountered */
+		_alpm_log(handle, ALPM_LOG_WARNING, _("warning given when extracting %s (%s)\n"),
+				origname, archive_error_string(archive));
+	} else if(ret != ARCHIVE_OK) {
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not extract %s (%s)\n"),
+				origname, archive_error_string(archive));
+		alpm_logaction(handle, "error: could not extract %s (%s)\n",
+				origname, archive_error_string(archive));
+		return 1;
+	}
+	return 0;
+}
+
+static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
+		struct archive_entry *entry, alpm_pkg_t *newpkg, alpm_pkg_t *oldpkg)
 {
 	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;
+	const char *hash_orig = NULL;
 	char *entryname_orig = NULL;
-	const int archive_flags = ARCHIVE_EXTRACT_OWNER |
-	                          ARCHIVE_EXTRACT_PERM |
-	                          ARCHIVE_EXTRACT_TIME;
 	int errors = 0;
 
 	entryname = archive_entry_pathname(entry);
@@ -133,19 +151,19 @@ 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",
-				_alpm_db_path(db), newpkg->name, newpkg->version);
+				_alpm_db_path(handle->db_local), 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",
-				_alpm_db_path(db), newpkg->name, newpkg->version);
+				_alpm_db_path(handle->db_local), 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) */
-		_alpm_log(PM_LOG_DEBUG, "skipping extraction of '%s'\n", entryname);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "skipping extraction of '%s'\n", entryname);
 		archive_read_data_skip(archive);
-		return(0);
+		return 0;
 	} else {
 		/* build the new entryname relative to handle->root */
 		snprintf(filename, PATH_MAX, "%s%s", handle->root, entryname);
@@ -153,20 +171,12 @@ static int extract_single_file(struct archive *archive,
 
 	/* if a file is in NoExtract then we never extract it */
 	if(alpm_list_find_str(handle->noextract, entryname)) {
-		_alpm_log(PM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n",
+		_alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n",
 				entryname);
-		alpm_logaction("note: %s is in NoExtract, skipping extraction\n",
+		alpm_logaction(handle, "note: %s is in NoExtract, skipping extraction\n",
 				entryname);
 		archive_read_data_skip(archive);
-		return(0);
+		return 0;
-	}
-
-	/* 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);
-		archive_read_data_skip(archive);
-		return(0);
 	}
 
 	/* Check for file existence. This is one of the more crucial parts
@@ -200,42 +210,42 @@ static int extract_single_file(struct archive *archive,
 				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"
+					_alpm_log(handle, ALPM_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"
+					alpm_logaction(handle, "warning: directory permissions differ on %s\n"
 							"filesystem: %o  package: %o\n", entryname, lsbuf.st_mode & mask,
 							entrymode & mask);
 				}
-				_alpm_log(PM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
+				_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
 						entryname);
 				archive_read_data_skip(archive);
-				return(0);
+				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"),
+				_alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"),
 						entryname);
 				archive_read_data_skip(archive);
-				return(1);
+				return 1;
 			}
 		} else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(entrymode)) {
 			/* case 9: existing symlink, dir in package */
 			if(S_ISDIR(sbuf.st_mode)) {
 				/* the symlink on FS is to a directory, so we'll use it */
-				_alpm_log(PM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n",
+				_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n",
 						entryname);
 				archive_read_data_skip(archive);
-				return(0);
+				return 0;
 			} else {
 				/* this is BAD. symlink was not to a directory */
-				_alpm_log(PM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"),
+				_alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"),
 						entryname);
 				archive_read_data_skip(archive);
-				return(1);
+				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",
+			_alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n",
 					entryname);
 		} else if(S_ISREG(entrymode)) {
 			/* case 4,7: */
@@ -243,24 +253,24 @@ static int extract_single_file(struct archive *archive,
 			if(alpm_list_find_str(handle->noupgrade, entryname)) {
 				notouch = 1;
 			} else {
+				alpm_backup_t *backup;
 				/* go to the backup array and see if our conflict is there */
 				/* check newpkg first, so that adding backup files is retroactive */
-				if(alpm_list_find_str(alpm_pkg_get_backup(newpkg), entryname) != NULL) {
+				backup = _alpm_needbackup(entryname, newpkg);
+				if(backup) {
+					/* if we force hash_orig to be non-NULL retroactive backup works */
+					hash_orig = "";
 					needbackup = 1;
 				}
 
 				/* check oldpkg for a backup entry, store the hash if available */
 				if(oldpkg) {
-					hash_orig = _alpm_needbackup(entryname, alpm_pkg_get_backup(oldpkg));
+					backup = _alpm_needbackup(entryname, oldpkg);
-					if(hash_orig) {
+					if(backup) {
+						hash_orig = backup->hash;
 						needbackup = 1;
 					}
 				}
-
-				/* if we force hash_orig to be non-NULL retroactive backup works */
-				if(needbackup && !hash_orig) {
-					STRDUP(hash_orig, "", RET_ERR(PM_ERR_MEMORY, -1));
-				}
 			}
 		}
 		/* else if(S_ISLNK(entrymode)) */
@@ -269,7 +279,7 @@ static int extract_single_file(struct archive *archive,
 
 	/* 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));
+	STRDUP(entryname_orig, entryname, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
 
 	if(needbackup) {
 		char checkfile[PATH_MAX];
@@ -277,53 +287,37 @@ static int extract_single_file(struct archive *archive,
 		int ret;
 
 		snprintf(checkfile, PATH_MAX, "%s.paccheck", filename);
-		archive_entry_set_pathname(entry, checkfile);
 
-		ret = archive_read_extract(archive, entry, archive_flags);
+		ret = perform_extraction(handle, archive, entry, checkfile, entryname_orig);
-		if(ret == ARCHIVE_WARN) {
+		if(ret == 1) {
-			/* operation succeeded but a non-critical error was encountered */
+			/* error */
-			_alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n",
-					entryname_orig, archive_error_string(archive));
-		} else if(ret != ARCHIVE_OK) {
-			_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"),
-					entryname_orig, archive_error_string(archive));
-			alpm_logaction("error: could not extract %s (%s)\n",
-					entryname_orig, archive_error_string(archive));
-			FREE(hash_orig);
 			FREE(entryname_orig);
-			return(1);
+			return 1;
 		}
 
 		hash_local = alpm_compute_md5sum(filename);
 		hash_pkg = alpm_compute_md5sum(checkfile);
 
-		/* append the new md5 hash to it's respective entry
+		/* update the md5 hash in newpkg's backup (it will be the new orginal) */
-		 * in newpkg's backup (it will be the new orginal) */
+		alpm_list_t *i;
-		alpm_list_t *backups;
+		for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) {
-		for(backups = alpm_pkg_get_backup(newpkg); backups;
+			alpm_backup_t *backup = i->data;
-				backups = alpm_list_next(backups)) {
+			char *newhash;
-			char *oldbackup = alpm_list_getdata(backups);
+			if(!backup->name || strcmp(backup->name, entryname_orig) != 0) {
-			if(!oldbackup || strcmp(oldbackup, entryname_orig) != 0) {
 				continue;
 			}
-			char *backup = NULL;
+			STRDUP(newhash, hash_pkg, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
-			/* length is tab char, null byte and MD5 (32 char) */
+			FREE(backup->hash);
-			size_t backup_len = strlen(oldbackup) + 34;
+			backup->hash = newhash;
-			MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1));
-
-			sprintf(backup, "%s\t%s", oldbackup, hash_pkg);
-			backup[backup_len-1] = '\0';
-			FREE(oldbackup);
-			backups->data = backup;
 		}
 
-		_alpm_log(PM_LOG_DEBUG, "checking hashes for %s\n", entryname_orig);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "checking hashes for %s\n", entryname_orig);
-		_alpm_log(PM_LOG_DEBUG, "current:  %s\n", hash_local);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "current:  %s\n", hash_local);
-		_alpm_log(PM_LOG_DEBUG, "new:      %s\n", hash_pkg);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "new:      %s\n", hash_pkg);
-		_alpm_log(PM_LOG_DEBUG, "original: %s\n", hash_orig);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "original: %s\n", hash_orig);
 
 		if(!oldpkg) {
-			if(strcmp(hash_local, hash_pkg) != 0) {
+			if(hash_local && hash_pkg && 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];
@@ -331,22 +325,22 @@ static int extract_single_file(struct archive *archive,
 
 				/* move the existing file to the "pacorig" */
 				if(rename(filename, newpath)) {
-					_alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
+					_alpm_log(handle, ALPM_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",
+					alpm_logaction(handle, "error: could not rename %s to %s (%s)\n",
 							filename, newpath, strerror(errno));
 					errors++;
 				} else {
 					/* 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"),
+						_alpm_log(handle, ALPM_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",
+						alpm_logaction(handle, "error: could not rename %s to %s (%s)\n",
 								checkfile, filename, strerror(errno));
 						errors++;
 					} else {
-						_alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath);
+						_alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath);
-						alpm_logaction("warning: %s saved as %s\n", filename, newpath);
+						alpm_logaction(handle, "warning: %s saved as %s\n", filename, newpath);
 					}
 				}
 			} else {
@@ -356,51 +350,51 @@ static int extract_single_file(struct archive *archive,
 		} else if(hash_orig) {
 			/* the fun part */
 
-			if(strcmp(hash_orig, hash_local) == 0) {
+			if(hash_local && strcmp(hash_orig, hash_local) == 0) {
 				/* installed file has NOT been changed by user */
-				if(strcmp(hash_orig, hash_pkg) != 0) {
+				if(hash_pkg && strcmp(hash_orig, hash_pkg) != 0) {
-					_alpm_log(PM_LOG_DEBUG, "action: installing new file: %s\n",
+					_alpm_log(handle, ALPM_LOG_DEBUG, "action: installing new file: %s\n",
 							entryname_orig);
 
 					if(rename(checkfile, filename)) {
-						_alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
+						_alpm_log(handle, ALPM_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",
+						alpm_logaction(handle, "error: could not rename %s to %s (%s)\n",
 								checkfile, filename, strerror(errno));
 						errors++;
 					}
 				} else {
-					/* there's no sense in installing the same file twice, install
+					/* no sense in installing the same file twice, install
-					 * ONLY is the original and package hashes differ */
+					 * ONLY if the original and package hashes differ */
-					_alpm_log(PM_LOG_DEBUG, "action: leaving existing file in place\n");
+					_alpm_log(handle, ALPM_LOG_DEBUG, "action: leaving existing file in place\n");
 					unlink(checkfile);
 				}
-			} else if(strcmp(hash_orig, hash_pkg) == 0) {
+			} else if(hash_pkg && 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");
+				_alpm_log(handle, ALPM_LOG_DEBUG, "action: leaving existing file in place\n");
 				unlink(checkfile);
-			} else if(strcmp(hash_local, hash_pkg) == 0) {
+			} else if(hash_local && hash_pkg && 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");
+				_alpm_log(handle, ALPM_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"
+				_alpm_log(handle, ALPM_LOG_DEBUG, "action: keeping current file and installing"
 						" new one with .pacnew ending\n");
 				snprintf(newpath, PATH_MAX, "%s.pacnew", filename);
 				if(rename(checkfile, newpath)) {
-					_alpm_log(PM_LOG_ERROR, _("could not install %s as %s (%s)\n"),
+					_alpm_log(handle, ALPM_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",
+					alpm_logaction(handle, "error: could not install %s as %s (%s)\n",
 							filename, newpath, strerror(errno));
 				} else {
-					_alpm_log(PM_LOG_WARNING, _("%s installed as %s\n"),
+					_alpm_log(handle, ALPM_LOG_WARNING, _("%s installed as %s\n"),
 							filename, newpath);
-					alpm_logaction("warning: %s installed as %s\n",
+					alpm_logaction(handle, "warning: %s installed as %s\n",
 							filename, newpath);
 				}
 			}
@@ -408,135 +402,104 @@ static int extract_single_file(struct archive *archive,
 
 		FREE(hash_local);
 		FREE(hash_pkg);
-		FREE(hash_orig);
 	} else {
 		int ret;
 
 		/* we didn't need a backup */
 		if(notouch) {
 			/* change the path to a .pacnew extension */
-			_alpm_log(PM_LOG_DEBUG, "%s is in NoUpgrade -- skipping\n", filename);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoUpgrade -- skipping\n", filename);
-			_alpm_log(PM_LOG_WARNING, _("extracting %s as %s.pacnew\n"), filename, filename);
+			_alpm_log(handle, ALPM_LOG_WARNING, _("extracting %s as %s.pacnew\n"), filename, filename);
-			alpm_logaction("warning: extracting %s as %s.pacnew\n", filename, filename);
+			alpm_logaction(handle, "warning: extracting %s as %s.pacnew\n", filename, filename);
 			strncat(filename, ".pacnew", PATH_MAX - strlen(filename));
 		} else {
-			_alpm_log(PM_LOG_DEBUG, "extracting %s\n", filename);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "extracting %s\n", filename);
 		}
 
-		if(trans->flags & PM_TRANS_FLAG_FORCE) {
+		if(handle->trans->flags & ALPM_TRANS_FLAG_FORCE) {
 			/* if FORCE was used, unlink() each file (whether it's there
 			 * or not) before extracting. This prevents the old "Text file busy"
 			 * error that crops up if forcing a glibc or pacman upgrade. */
 			unlink(filename);
 		}
 
-		archive_entry_set_pathname(entry, filename);
+		ret = perform_extraction(handle, archive, entry, filename, entryname_orig);
-
+		if(ret == 1) {
-		ret = archive_read_extract(archive, entry, archive_flags);
+			/* error */
-		if(ret == ARCHIVE_WARN) {
-			/* operation succeeded but a non-critical error was encountered */
-			_alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n",
-					entryname_orig, archive_error_string(archive));
-		} else if(ret != ARCHIVE_OK) {
-			_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"),
-					entryname_orig, archive_error_string(archive));
-			alpm_logaction("error: could not extract %s (%s)\n",
-					entryname_orig, archive_error_string(archive));
 			FREE(entryname_orig);
-			return(1);
+			return 1;
 		}
 
 		/* calculate an hash if this is in newpkg's backup */
-		alpm_list_t *b;
+		alpm_list_t *i;
-		for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) {
+		for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) {
-			char *backup = NULL, *hash = NULL;
+			alpm_backup_t *backup = i->data;
-			char *oldbackup = alpm_list_getdata(b);
+			char *newhash;
-			/* length is tab char, null byte and MD5 (32 char) */
+			if(!backup->name || strcmp(backup->name, entryname_orig) != 0) {
-			size_t backup_len = strlen(oldbackup) + 34;
-
-			if(!oldbackup || strcmp(oldbackup, entryname_orig) != 0) {
 				continue;
 			}
-			_alpm_log(PM_LOG_DEBUG, "appending backup entry for %s\n", filename);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "appending backup entry for %s\n", entryname_orig);
-
+			newhash = alpm_compute_md5sum(filename);
-			hash = alpm_compute_md5sum(filename);
+			FREE(backup->hash);
-			MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1));
+			backup->hash = newhash;
-
-			sprintf(backup, "%s\t%s", oldbackup, hash);
-			backup[backup_len-1] = '\0';
-			FREE(hash);
-			FREE(oldbackup);
-			b->data = backup;
 		}
 	}
 	FREE(entryname_orig);
-	return(errors);
+	return errors;
 }
 
-static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
+static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
-		pmtrans_t *trans, pmdb_t *db)
+		size_t pkg_current, size_t pkg_count)
 {
 	int i, ret = 0, errors = 0;
-	char scriptlet[PATH_MAX+1];
+	int is_upgrade;
-	int is_upgrade = 0;
+	alpm_pkg_t *oldpkg = NULL;
-	pmpkg_t *oldpkg = NULL;
+	alpm_db_t *db = handle->db_local;
+	alpm_trans_t *trans = handle->trans;
 
-	ALPM_LOG_FUNC;
+	ASSERT(trans != NULL, return -1);
-
-	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);
+	alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name);
 	if(local) {
 		is_upgrade = 1;
 
 		/* we'll need to save some record for backup checks later */
-		oldpkg = _alpm_pkg_dup(local);
+		if(_alpm_pkg_dup(local, &oldpkg) == -1) {
-		/* make sure all infos are loaded because the database entry
+			ret = -1;
-		 * will be removed soon */
+			goto cleanup;
-		_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);
 
 		/* copy over the install reason */
-		newpkg->reason = alpm_pkg_get_reason(oldpkg);
+		newpkg->reason = alpm_pkg_get_reason(local);
 
-		/* pre_upgrade scriptlet */
+		EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local);
-		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
-			_alpm_runscriptlet(handle->root, newpkg->origin_data.file,
-					"pre_upgrade", newpkg->version, oldpkg->version, trans);
-		}
 	} else {
 		is_upgrade = 0;
+		EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL);
+	}
 
-		EVENT(trans, PM_TRANS_EVT_ADD_START, newpkg, NULL);
+	_alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n",
-		_alpm_log(PM_LOG_DEBUG, "adding package %s-%s\n",
+			is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version);
-				newpkg->name, newpkg->version);
+		/* pre_install/pre_upgrade scriptlet */
-
+	if(alpm_pkg_has_scriptlet(newpkg) &&
-		/* pre_install scriptlet */
+			!(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
+		const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
-			_alpm_runscriptlet(handle->root, newpkg->origin_data.file,
+		_alpm_runscriptlet(handle, newpkg->origin_data.file,
-					"pre_install", newpkg->version, NULL, trans);
+				scriptlet_name, newpkg->version, NULL, 1);
-		}
 	}
 
 	/* we override any pre-set reason if we have alldeps or allexplicit set */
-	if(trans->flags & PM_TRANS_FLAG_ALLDEPS) {
+	if(trans->flags & ALPM_TRANS_FLAG_ALLDEPS) {
-		newpkg->reason = PM_PKG_REASON_DEPEND;
+		newpkg->reason = ALPM_PKG_REASON_DEPEND;
-	} else if(trans->flags & PM_TRANS_FLAG_ALLEXPLICIT) {
+	} else if(trans->flags & ALPM_TRANS_FLAG_ALLEXPLICIT) {
-		newpkg->reason = PM_PKG_REASON_EXPLICIT;
+		newpkg->reason = ALPM_PKG_REASON_EXPLICIT;
 	}
 
 	if(oldpkg) {
 		/* set up fake remove transaction */
-		if(_alpm_upgraderemove_package(oldpkg, newpkg, trans) == -1) {
+		if(_alpm_remove_single_package(handle, oldpkg, newpkg, 0, 0) == -1) {
-			pm_errno = PM_ERR_TRANS_ABORT;
+			handle->pm_errno = ALPM_ERR_TRANS_ABORT;
 			ret = -1;
 			goto cleanup;
 		}
@@ -544,23 +507,23 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 
 	/* prepare directory for database entries so permission are correct after
 	   changelog/install script installation (FS#12263) */
-	if(_alpm_db_prepare(db, newpkg)) {
+	if(_alpm_local_db_prepare(db, newpkg)) {
-		alpm_logaction("error: could not create database entry %s-%s\n",
+		alpm_logaction(handle, "error: could not create database entry %s-%s\n",
-				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+				newpkg->name, newpkg->version);
-		pm_errno = PM_ERR_DB_WRITE;
+		handle->pm_errno = ALPM_ERR_DB_WRITE;
 		ret = -1;
 		goto cleanup;
 	}
 
-	if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
+	if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) {
 		struct archive *archive;
 		struct archive_entry *entry;
-		char cwd[PATH_MAX] = "";
+		int cwdfd;
 
-		_alpm_log(PM_LOG_DEBUG, "extracting files\n");
+		_alpm_log(handle, ALPM_LOG_DEBUG, "extracting files\n");
 
-		if ((archive = archive_read_new()) == NULL) {
+		if((archive = archive_read_new()) == NULL) {
-			pm_errno = PM_ERR_LIBARCHIVE;
+			handle->pm_errno = ALPM_ERR_LIBARCHIVE;
 			ret = -1;
 			goto cleanup;
 		}
@@ -568,83 +531,88 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 		archive_read_support_compression_all(archive);
 		archive_read_support_format_all(archive);
 
-		_alpm_log(PM_LOG_DEBUG, "archive: %s\n", newpkg->origin_data.file);
+		_alpm_log(handle, ALPM_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) {
-			pm_errno = PM_ERR_PKG_OPEN;
+			handle->pm_errno = ALPM_ERR_PKG_OPEN;
 			ret = -1;
 			goto cleanup;
 		}
 
 		/* save the cwd so we can restore it later */
-		if(getcwd(cwd, PATH_MAX) == NULL) {
+		do {
-			_alpm_log(PM_LOG_ERROR, _("could not get current working directory\n"));
+			cwdfd = open(".", O_RDONLY);
-			cwd[0] = 0;
+		} while(cwdfd == -1 && errno == EINTR);
+		if(cwdfd < 0) {
+			_alpm_log(handle, ALPM_LOG_ERROR, _("could not get current working directory\n"));
 		}
 
 		/* libarchive requires this for extracting hard links */
-		chdir(handle->root);
+		if(chdir(handle->root) != 0) {
+			_alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"),
+					handle->root, strerror(errno));
+			ret = -1;
+			goto cleanup;
+		}
 
 		/* call PROGRESS once with 0 percent, as we sort-of skip that here */
 		if(is_upgrade) {
-			PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START,
+			PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START,
-					alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current);
+					newpkg->name, 0, pkg_count, pkg_current);
 		} else {
-			PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
+			PROGRESS(handle, ALPM_PROGRESS_ADD_START,
-					alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current);
+					newpkg->name, 0, pkg_count, pkg_current);
 		}
 
 		for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) {
-			double percent;
+			int 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) */
 				int64_t pos = archive_position_compressed(archive);
-				percent = (double)pos / (double)newpkg->size;
+				percent = (pos * 100) / newpkg->size;
-				_alpm_log(PM_LOG_DEBUG, "decompression progress: "
+				if(percent >= 100) {
-						"%f%% (%"PRId64" / %jd)\n",
+					percent = 100;
-						percent*100.0, pos, (intmax_t)newpkg->size);
-				if(percent >= 1.0) {
-					percent = 1.0;
 				}
 			} else {
-				percent = 0.0;
+				percent = 0;
 			}
 
 			if(is_upgrade) {
-				PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START,
+				PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START,
-						alpm_pkg_get_name(newpkg), (int)(percent * 100), pkg_count,
+						newpkg->name, percent, pkg_count, pkg_current);
-						pkg_current);
 			} else {
-				PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
+				PROGRESS(handle, ALPM_PROGRESS_ADD_START,
-						alpm_pkg_get_name(newpkg), (int)(percent * 100), pkg_count,
+						newpkg->name, percent, pkg_count, pkg_current);
-						pkg_current);
 			}
 
 			/* extract the next file from the archive */
-			errors += extract_single_file(archive, entry, newpkg, oldpkg,
+			errors += extract_single_file(handle, archive, entry, newpkg, oldpkg);
-					trans, db);
 		}
 		archive_read_finish(archive);
 
-		/* restore the old cwd is we have it */
+		/* restore the old cwd if we have it */
-		if(strlen(cwd)) {
+		if(cwdfd >= 0) {
-			chdir(cwd);
+			if(fchdir(cwdfd) != 0) {
+				_alpm_log(handle, ALPM_LOG_ERROR,
+						_("could not restore working directory (%s)\n"), strerror(errno));
+			}
+			close(cwdfd);
 		}
 
 		if(errors) {
 			ret = -1;
 			if(is_upgrade) {
-				_alpm_log(PM_LOG_ERROR, _("problem occurred while upgrading %s\n"),
+				_alpm_log(handle, ALPM_LOG_ERROR, _("problem occurred while upgrading %s\n"),
 						newpkg->name);
-				alpm_logaction("error: problem occurred while upgrading %s\n",
+				alpm_logaction(handle, "error: problem occurred while upgrading %s\n",
 						newpkg->name);
 			} else {
-				_alpm_log(PM_LOG_ERROR, _("problem occurred while installing %s\n"),
+				_alpm_log(handle, ALPM_LOG_ERROR, _("problem occurred while installing %s\n"),
 						newpkg->name);
-				alpm_logaction("error: problem occurred while installing %s\n",
+				alpm_logaction(handle, "error: problem occurred while installing %s\n",
 						newpkg->name);
 			}
 		}
@@ -653,68 +621,63 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 	/* make an install date (in UTC) */
 	newpkg->installdate = time(NULL);
 
-	_alpm_log(PM_LOG_DEBUG, "updating database\n");
+	_alpm_log(handle, ALPM_LOG_DEBUG, "updating database\n");
-	_alpm_log(PM_LOG_DEBUG, "adding database entry '%s'\n", newpkg->name);
+	_alpm_log(handle, ALPM_LOG_DEBUG, "adding database entry '%s'\n", newpkg->name);
 
-	if(_alpm_db_write(db, newpkg, INFRQ_ALL)) {
+	if(_alpm_local_db_write(db, newpkg, INFRQ_ALL)) {
-		_alpm_log(PM_LOG_ERROR, _("could not update database entry %s-%s\n"),
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not update database entry %s-%s\n"),
-				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+				newpkg->name, newpkg->version);
-		alpm_logaction("error: could not update database entry %s-%s\n",
+		alpm_logaction(handle, "error: could not update database entry %s-%s\n",
-				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+				newpkg->name, newpkg->version);
-		pm_errno = PM_ERR_DB_WRITE;
+		handle->pm_errno = ALPM_ERR_DB_WRITE;
 		ret = -1;
 		goto cleanup;
 	}
 
 	if(_alpm_db_add_pkgincache(db, newpkg) == -1) {
-		_alpm_log(PM_LOG_ERROR, _("could not add entry '%s' in cache\n"),
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not add entry '%s' in cache\n"),
-				alpm_pkg_get_name(newpkg));
+				newpkg->name);
 	}
 
 	if(is_upgrade) {
-		PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START,
+		PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START,
-				alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
+				newpkg->name, 100, pkg_count, pkg_current);
 	} else {
-		PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
+		PROGRESS(handle, ALPM_PROGRESS_ADD_START,
-				alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
+				newpkg->name, 100, pkg_count, pkg_current);
 	}
 
 	/* run the post-install script if it exists  */
 	if(alpm_pkg_has_scriptlet(newpkg)
-			&& !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
+			&& !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
-		if(is_upgrade) {
+		char *scriptlet = _alpm_local_db_pkgpath(db, newpkg, "install");
-			_alpm_runscriptlet(handle->root, scriptlet, "post_upgrade",
+		const char *scriptlet_name = is_upgrade ? "post_upgrade" : "post_install";
-					alpm_pkg_get_version(newpkg),
+
-					oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans);
+		_alpm_runscriptlet(handle, scriptlet, scriptlet_name,
-		} else {
+				newpkg->version, oldpkg ? oldpkg->version : NULL, 0);
-			_alpm_runscriptlet(handle->root, scriptlet, "post_install",
+		free(scriptlet);
-					alpm_pkg_get_version(newpkg), NULL, trans);
-		}
 	}
 
 	if(is_upgrade) {
-		EVENT(trans, PM_TRANS_EVT_UPGRADE_DONE, newpkg, oldpkg);
+		EVENT(handle, ALPM_EVENT_UPGRADE_DONE, newpkg, oldpkg);
 	} else {
-		EVENT(trans, PM_TRANS_EVT_ADD_DONE, newpkg, oldpkg);
+		EVENT(handle, ALPM_EVENT_ADD_DONE, newpkg, oldpkg);
 	}
 
 cleanup:
 	_alpm_pkg_free(oldpkg);
-	return(ret);
+	return ret;
 }
 
-int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db)
+int _alpm_upgrade_packages(alpm_handle_t *handle)
 {
-	int pkg_count, pkg_current;
+	size_t pkg_count, pkg_current;
+	int skip_ldconfig = 0, ret = 0;
 	alpm_list_t *targ;
-
+	alpm_trans_t *trans = handle->trans;
-	ALPM_LOG_FUNC;
-
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
 	if(trans->add == NULL) {
-		return(0);
+		return 0;
 	}
 
 	pkg_count = alpm_list_count(trans->add);
@@ -722,19 +685,30 @@ int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db)
 
 	/* loop through our package list adding/upgrading one at a time */
 	for(targ = trans->add; targ; targ = targ->next) {
+		alpm_pkg_t *newpkg = targ->data;
+
 		if(handle->trans->state == STATE_INTERRUPTED) {
-			return(0);
+			return ret;
+		}
+
+		if(commit_single_pkg(handle, newpkg, pkg_current, pkg_count)) {
+			/* something screwed up on the commit, abort the trans */
+			trans->state = STATE_INTERRUPTED;
+			handle->pm_errno = ALPM_ERR_TRANS_ABORT;
+			/* running ldconfig at this point could possibly screw system */
+			skip_ldconfig = 1;
+			ret = -1;
 		}
 
-		pmpkg_t *newpkg = (pmpkg_t *)targ->data;
-		commit_single_pkg(newpkg, pkg_current, pkg_count, trans, db);
 		pkg_current++;
 	}
 
-	/* run ldconfig if it exists */
+	if(!skip_ldconfig) {
-	_alpm_ldconfig(handle->root);
+		/* run ldconfig if it exists */
+		_alpm_ldconfig(handle);
+	}
 
-	return(0);
+	return ret;
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/add.h

@@ -1,7 +1,7 @@
 /*
  *  add.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -24,7 +24,7 @@
 #include "alpm_list.h"
 #include "trans.h"
 
-int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db);
+int _alpm_upgrade_packages(alpm_handle_t *handle);
 
 #endif /* _ALPM_ADD_H */
 

lib/libalpm/alpm.c

@@ -1,7 +1,7 @@
 /*
  *  alpm.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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>
@@ -23,15 +23,17 @@
 
 #include "config.h"
 
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#endif
+
 /* libalpm */
 #include "alpm.h"
 #include "alpm_list.h"
 #include "handle.h"
+#include "log.h"
 #include "util.h"
 
-/* Globals */
-enum _pmerrno_t pm_errno SYMEXPORT;
-
 /** \addtogroup alpm_interface Interface Functions
  * @brief Functions to initialize and release libalpm
  * @{
@@ -39,41 +41,85 @@ enum _pmerrno_t pm_errno SYMEXPORT;
 
 /** Initializes the library.  This must be called before any other
  * functions are called.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ * @param root the root path for all filesystem operations
+ * @param dbpath the absolute path to the libalpm database
+ * @param err an optional variable to hold any error return codes
+ * @return a context handle on success, NULL on error, err will be set if provided
  */
-int SYMEXPORT alpm_initialize(void)
+alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
+		enum _alpm_errno_t *err)
 {
-	ASSERT(handle == NULL, RET_ERR(PM_ERR_HANDLE_NOT_NULL, -1));
+	enum _alpm_errno_t myerr;
+	const char *lf = "db.lck";
+	size_t lockfilelen;
+	alpm_handle_t *myhandle = _alpm_handle_new();
 
-	handle = _alpm_handle_new();
+	if(myhandle == NULL) {
-	if(handle == NULL) {
+		myerr = ALPM_ERR_MEMORY;
-		RET_ERR(PM_ERR_MEMORY, -1);
+		goto cleanup;
+	}
+	if((myerr = _alpm_set_directory_option(root, &(myhandle->root), 1))) {
+		goto cleanup;
+	}
+	if((myerr = _alpm_set_directory_option(dbpath, &(myhandle->dbpath), 1))) {
+		goto cleanup;
+	}
+
+	lockfilelen = strlen(myhandle->dbpath) + strlen(lf) + 1;
+	myhandle->lockfile = calloc(lockfilelen, sizeof(char));
+	snprintf(myhandle->lockfile, lockfilelen, "%s%s", myhandle->dbpath, lf);
+
+	if(_alpm_db_register_local(myhandle) == NULL) {
+		myerr = myhandle->pm_errno;
+		goto cleanup;
 	}
 
 #ifdef ENABLE_NLS
 	bindtextdomain("libalpm", LOCALEDIR);
 #endif
 
-	return(0);
+	return myhandle;
+
+cleanup:
+	_alpm_handle_free(myhandle);
+	if(err && myerr) {
+		*err = myerr;
+	}
+	return NULL;
 }
 
 /** Release the library.  This should be the last alpm call you make.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ * After this returns, handle should be considered invalid and cannot be reused
+ * in any way.
+ * @param myhandle the context handle
+ * @return 0 on success, -1 on error
  */
-int SYMEXPORT alpm_release(void)
+int SYMEXPORT alpm_release(alpm_handle_t *myhandle)
 {
-	ALPM_LOG_FUNC;
+	int ret = 0;
+	alpm_db_t *db;
 
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	CHECK_HANDLE(myhandle, return -1);
 
-	if(alpm_db_unregister_all() == -1) {
+	/* close local database */
-		return(-1);
+	db = myhandle->db_local;
+	if(db) {
+		db->ops->unregister(db);
+		myhandle->db_local = NULL;
 	}
 
-	_alpm_handle_free(handle);
+	if(alpm_db_unregister_all(myhandle) == -1) {
-	handle = NULL;
+		ret = -1;
+	}
 
-	return(0);
+	_alpm_handle_unlock(myhandle);
+	_alpm_handle_free(myhandle);
+
+#ifdef HAVE_LIBCURL
+	curl_global_cleanup();
+#endif
+
+	return ret;
 }
 
 /** @} */
@@ -82,9 +128,30 @@ int SYMEXPORT alpm_release(void)
  * @brief Various libalpm functions
  */
 
-/* Get the version of library */
+/** Get the version of library.
-const char SYMEXPORT *alpm_version(void) {
+ * @return the library version, e.g. "6.0.4"
-	return(LIB_VERSION);
+ * */
+const char SYMEXPORT *alpm_version(void)
+{
+	return LIB_VERSION;
+}
+
+/** Get the capabilities of the library.
+ * @return a bitmask of the capabilities
+ * */
+enum alpm_caps SYMEXPORT alpm_capabilities(void)
+{
+	return 0
+#ifdef ENABLE_NLS
+		| ALPM_CAPABILITY_NLS
+#endif
+#ifdef HAVE_LIBCURL
+		| ALPM_CAPABILITY_DOWNLOADER
+#endif
+#ifdef HAVE_LIBGPGME
+		| ALPM_CAPABILITY_SIGNATURES
+#endif
+		| 0;
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/alpm_list.c

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 /* libalpm */
 #include "alpm_list.h"
@@ -90,9 +89,9 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
 {
 	alpm_list_t *ptr, *lp;
 
-	ptr = calloc(1, sizeof(alpm_list_t));
+	ptr = malloc(sizeof(alpm_list_t));
 	if(ptr == NULL) {
-		return(list);
+		return list;
 	}
 
 	ptr->data = data;
@@ -101,7 +100,7 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
 	/* Special case: the input list is empty */
 	if(list == NULL) {
 		ptr->prev = ptr;
-		return(ptr);
+		return ptr;
 	}
 
 	lp = alpm_list_last(list);
@@ -109,7 +108,7 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
 	ptr->prev = lp;
 	list->prev = ptr;
 
-	return(list);
+	return list;
 }
 
 /**
@@ -124,13 +123,13 @@ 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 || !list) {
-		return(alpm_list_add(list, data));
+		return alpm_list_add(list, data);
 	} else {
 		alpm_list_t *add = NULL, *prev = NULL, *next = list;
 
-		add = calloc(1, sizeof(alpm_list_t));
+		add = malloc(sizeof(alpm_list_t));
 		if(add == NULL) {
-			return(list);
+			return list;
 		}
 		add->data = data;
 
@@ -146,19 +145,19 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_
 			add->prev = list->prev; /* list != NULL */
 			add->next = list;
 			list->prev = add;
-			return(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);
+			return list;
 		} else {
 			add->prev = prev;
 			add->next = next;
 			next->prev = add;
 			prev->next = add;
-			return(list);
+			return list;
 		}
 	}
 }
@@ -178,11 +177,11 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
 {
 	alpm_list_t *tmp;
 
-	if (first == NULL) {
+	if(first == NULL) {
-		return(second);
+		return second;
 	}
-	if (second == NULL) {
+	if(second == NULL) {
-		return(first);
+		return first;
 	}
 	/* tmp is the last element of the first list */
 	tmp = first->prev;
@@ -193,7 +192,7 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
 	/* set the back reference to the tail */
 	second->prev = tmp;
 
-	return(first);
+	return first;
 }
 
 /**
@@ -207,14 +206,20 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
  */
 alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn)
 {
-	alpm_list_t *newlist, *lp;
+	alpm_list_t *newlist, *lp, *tail_ptr, *left_tail_ptr, *right_tail_ptr;
 
-	if (left == NULL)
+	if(left == NULL) {
 		return right;
-	if (right == NULL)
+	}
+	if(right == NULL) {
 		return left;
+	}
 
-	if (fn(left->data, right->data) <= 0) {
+	/* Save tail node pointers for future use */
+	left_tail_ptr = left->prev;
+	right_tail_ptr = right->prev;
+
+	if(fn(left->data, right->data) <= 0) {
 		newlist = left;
 		left = left->next;
 	}
@@ -226,8 +231,8 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a
 	newlist->next = NULL;
 	lp = newlist;
 
-	while ((left != NULL) && (right != NULL)) {
+	while((left != NULL) && (right != NULL)) {
-		if (fn(left->data, right->data) <= 0) {
+		if(fn(left->data, right->data) <= 0) {
 			lp->next = left;
 			left->prev = lp;
 			left = left->next;
@@ -240,24 +245,23 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a
 		lp = lp->next;
 		lp->next = NULL;
 	}
-	if (left != NULL) {
+	if(left != NULL) {
 		lp->next = left;
 		left->prev = lp;
+		tail_ptr = left_tail_ptr;
 	}
-	else if (right != NULL) {
+	else if(right != NULL) {
 		lp->next = right;
 		right->prev = lp;
+		tail_ptr = right_tail_ptr;
+	}
+	else {
+		tail_ptr = lp;
 	}
 
-	/* Find our tail pointer
+	newlist->prev = tail_ptr;
-	 * TODO maintain this in the algorithm itself */
-	lp = newlist;
-	while(lp && lp->next) {
-		lp = lp->next;
-	}
-	newlist->prev = lp;
 
-	return(newlist);
+	return newlist;
 }
 
 /**
@@ -269,9 +273,9 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a
  *
  * @return the resultant list
  */
-alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn)
+alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn)
 {
-	if (n > 1) {
+	if(n > 1) {
 		alpm_list_t *left = list;
 		alpm_list_t *lastleft = alpm_list_nth(list, n/2 - 1);
 		alpm_list_t *right = lastleft->next;
@@ -282,9 +286,56 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cm
 		right = alpm_list_msort(right, n - (n/2), fn);
 		list = alpm_list_mmerge(left, right, fn);
 	}
-	return(list);
+	return list;
 }
 
+/**
+ * @brief Remove an item from the list.
+ * item is not freed; this is the responsibility of the caller.
+ *
+ * @param haystack the list to remove the item from
+ * @param item the item to remove from the list
+ *
+ * @return the resultant list
+ */
+alpm_list_t SYMEXPORT *alpm_list_remove_item(alpm_list_t *haystack,
+		alpm_list_t *item)
+{
+	if(haystack == NULL || item == NULL) {
+		return haystack;
+	}
+
+	if(item == haystack) {
+		/* Special case: removing the head node which has a back reference to
+		 * the tail node */
+		haystack = item->next;
+		if(haystack) {
+			haystack->prev = item->prev;
+		}
+		item->prev = NULL;
+	} else if(item == haystack->prev) {
+		/* Special case: removing the tail node, so we need to fix the back
+		 * reference on the head node. We also know tail != head. */
+		if(item->prev) {
+			/* i->next should always be null */
+			item->prev->next = item->next;
+			haystack->prev = item->prev;
+			item->prev = NULL;
+		}
+	} else {
+		/* Normal case, non-head and non-tail node */
+		if(item->next) {
+			item->next->prev = item->prev;
+		}
+		if(item->prev) {
+			item->prev->next = item->next;
+		}
+	}
+
+	return haystack;
+}
+
+
 /**
  * @brief Remove an item from the list.
  *
@@ -295,16 +346,17 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cm
  *
  * @return the resultant list
  */
-alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn, void **data)
+alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack,
+		const void *needle, alpm_list_fn_cmp fn, void **data)
 {
-	alpm_list_t *i = haystack, *tmp = NULL;
+	alpm_list_t *i = haystack;
 
 	if(data) {
 		*data = NULL;
 	}
 
 	if(needle == NULL) {
-		return(haystack);
+		return haystack;
 	}
 
 	while(i) {
@@ -312,48 +364,20 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl
 			i = i->next;
 			continue;
 		}
-		tmp = i->next;
 		if(fn(i->data, needle) == 0) {
-			/* we found a matching item */
+			haystack = alpm_list_remove_item(haystack, i);
-			if(i == haystack) {
-				/* Special case: removing the head node which has a back reference to
-				 * the tail node */
-				haystack = i->next;
-				if(haystack) {
-					haystack->prev = i->prev;
-				}
-				i->prev = NULL;
-			} else if(i == haystack->prev) {
-				/* Special case: removing the tail node, so we need to fix the back
-				 * reference on the head node. We also know tail != head. */
-				if(i->prev) {
-					/* i->next should always be null */
-					i->prev->next = i->next;
-					haystack->prev = i->prev;
-					i->prev = NULL;
-				}
-			} else {
-				/* Normal case, non-head and non-tail node */
-				if(i->next) {
-					i->next->prev = i->prev;
-				}
-				if(i->prev) {
-					i->prev->next = i->next;
-				}
-			}
 
 			if(data) {
 				*data = i->data;
 			}
-			i->data = NULL;
 			free(i);
-			i = NULL;
+			break;
 		} else {
-			i = tmp;
+			i = i->next;
 		}
 	}
 
-	return(haystack);
+	return haystack;
 }
 
 /**
@@ -368,8 +392,8 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl
 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,
+	return alpm_list_remove(haystack, (const void *)needle,
-				(alpm_list_fn_cmp)strcmp, (void **)data));
+			(alpm_list_fn_cmp)strcmp, (void **)data);
 }
 
 /**
@@ -391,7 +415,7 @@ alpm_list_t SYMEXPORT *alpm_list_remove_dupes(const alpm_list_t *list)
 		}
 		lp = lp->next;
 	}
-	return(newlist);
+	return newlist;
 }
 
 /**
@@ -409,7 +433,7 @@ alpm_list_t SYMEXPORT *alpm_list_strdup(const alpm_list_t *list)
 		newlist = alpm_list_add(newlist, strdup(lp->data));
 		lp = lp->next;
 	}
-	return(newlist);
+	return newlist;
 }
 
 /**
@@ -427,7 +451,7 @@ alpm_list_t SYMEXPORT *alpm_list_copy(const alpm_list_t *list)
 		newlist = alpm_list_add(newlist, lp->data);
 		lp = lp->next;
 	}
-	return(newlist);
+	return newlist;
 }
 
 /**
@@ -446,14 +470,14 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list,
 	const alpm_list_t *lp = list;
 	alpm_list_t *newlist = NULL;
 	while(lp) {
-		void *newdata = calloc(1, size);
+		void *newdata = malloc(size);
 		if(newdata) {
 			memcpy(newdata, lp->data, size);
 			newlist = alpm_list_add(newlist, newdata);
 			lp = lp->next;
 		}
 	}
-	return(newlist);
+	return newlist;
 }
 
 /**
@@ -469,7 +493,7 @@ alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list)
 	alpm_list_t *newlist = NULL, *backup;
 
 	if(list == NULL) {
-		return(NULL);
+		return NULL;
 	}
 
 	lp = alpm_list_last(list);
@@ -482,27 +506,11 @@ alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list)
 		lp = lp->prev;
 	}
 	list->prev = backup; /* restore tail pointer */
-	return(newlist);
+	return newlist;
 }
 
 /* Accessors */
 
-/**
- * @brief Get the first element of a list.
- *
- * @param list the list
- *
- * @return the first element in the list
- */
-inline alpm_list_t SYMEXPORT *alpm_list_first(const alpm_list_t *list)
-{
-	if(list) {
-		return((alpm_list_t*)list);
-	} else {
-		return(NULL);
-	}
-}
-
 /**
  * @brief Return nth element from list (starting from 0).
  *
@@ -511,13 +519,13 @@ inline alpm_list_t SYMEXPORT *alpm_list_first(const alpm_list_t *list)
  *
  * @return an alpm_list_t node for index `n`
  */
-alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, int n)
+alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, size_t n)
 {
 	const alpm_list_t *i = list;
 	while(n--) {
 		i = i->next;
 	}
-	return((alpm_list_t*)i);
+	return (alpm_list_t *)i;
 }
 
 /**
@@ -530,9 +538,25 @@ 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)
 {
 	if(node) {
-		return(node->next);
+		return node->next;
 	} else {
-		return(NULL);
+		return NULL;
+	}
+}
+
+/**
+ * @brief Get the previous element of a list.
+ *
+ * @param list the list head
+ *
+ * @return the previous element, or NULL when no previous element exist
+ */
+inline alpm_list_t SYMEXPORT *alpm_list_previous(const alpm_list_t *list)
+{
+	if(list && list->prev->next) {
+		return list->prev;
+	} else {
+		return NULL;
 	}
 }
 
@@ -546,9 +570,9 @@ inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node)
 alpm_list_t SYMEXPORT *alpm_list_last(const alpm_list_t *list)
 {
 	if(list) {
-		return(list->prev);
+		return list->prev;
 	} else {
-		return(NULL);
+		return NULL;
 	}
 }
 
@@ -561,8 +585,8 @@ alpm_list_t SYMEXPORT *alpm_list_last(const alpm_list_t *list)
  */
 void SYMEXPORT *alpm_list_getdata(const alpm_list_t *node)
 {
-	if(node == NULL) return(NULL);
+	if(node == NULL) return NULL;
-	return(node->data);
+	return node->data;
 }
 
 /* Misc */
@@ -574,15 +598,15 @@ void SYMEXPORT *alpm_list_getdata(const alpm_list_t *node)
  *
  * @return the number of list items
  */
-int SYMEXPORT alpm_list_count(const alpm_list_t *list)
+size_t SYMEXPORT alpm_list_count(const alpm_list_t *list)
 {
-	unsigned int i = 0;
+	size_t i = 0;
 	const alpm_list_t *lp = list;
 	while(lp) {
 		++i;
 		lp = lp->next;
 	}
-	return(i);
+	return i;
 }
 
 /**
@@ -600,17 +624,17 @@ void SYMEXPORT *alpm_list_find(const alpm_list_t *haystack, const void *needle,
 	const alpm_list_t *lp = haystack;
 	while(lp) {
 		if(lp->data && fn(lp->data, needle) == 0) {
-			return(lp->data);
+			return lp->data;
 		}
 		lp = lp->next;
 	}
-	return(NULL);
+	return NULL;
 }
 
 /* trivial helper function for alpm_list_find_ptr */
 static int ptr_cmp(const void *p, const void *q)
 {
-	return(p != q);
+	return (p != q);
 }
 
 /**
@@ -623,9 +647,10 @@ static int ptr_cmp(const void *p, const void *q)
  *
  * @return `needle` if found, NULL otherwise
  */
-void SYMEXPORT *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle)
+void SYMEXPORT *alpm_list_find_ptr(const alpm_list_t *haystack,
+		const void *needle)
 {
-	return(alpm_list_find(haystack, needle, ptr_cmp));
+	return alpm_list_find(haystack, needle, ptr_cmp);
 }
 
 /**
@@ -639,8 +664,8 @@ void SYMEXPORT *alpm_list_find_ptr(const alpm_list_t *haystack, const void *need
 char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack,
 		const char *needle)
 {
-	return((char *)alpm_list_find(haystack, (const void*)needle,
+	return (char *)alpm_list_find(haystack, (const void *)needle,
-				(alpm_list_fn_cmp)strcmp));
+			(alpm_list_fn_cmp)strcmp);
 }
 
 /**
@@ -668,7 +693,7 @@ void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left,
 		return;
 	}
 
-	while (l != NULL && r != NULL) {
+	while(l != NULL && r != NULL) {
 		int cmp = fn(l->data, r->data);
 		if(cmp < 0) {
 			if(onlyleft) {
@@ -686,13 +711,13 @@ void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left,
 			r = r->next;
 		}
 	}
-	while (l != NULL) {
+	while(l != NULL) {
 		if(onlyleft) {
 			*onlyleft = alpm_list_add(*onlyleft, l->data);
 		}
 		l = l->next;
 	}
-	while (r != NULL) {
+	while(r != NULL) {
 		if(onlyright) {
 			*onlyright = alpm_list_add(*onlyright, r->data);
 		}
@@ -725,7 +750,39 @@ alpm_list_t SYMEXPORT *alpm_list_diff(const alpm_list_t *lhs,
 
 	alpm_list_free(left);
 	alpm_list_free(right);
-	return(ret);
+	return ret;
+}
+
+/**
+ * @brief Copy a list and data into a standard C array of fixed length.
+ * Note that the data elements are shallow copied so any contained pointers
+ * will point to the original data.
+ *
+ * @param list the list to copy
+ * @param n    the size of the list
+ * @param size the size of each data element
+ *
+ * @return an array version of the original list, data copied as well
+ */
+void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n,
+		size_t size)
+{
+	size_t i;
+	const alpm_list_t *item;
+	char *array;
+
+	if(n == 0) {
+		return NULL;
+	}
+
+	array = malloc(n * size);
+	if(array == NULL) {
+		return NULL;
+	}
+	for(i = 0, item = list; i < n && item; i++, item = item->next) {
+		memcpy(array + i * size, item->data, size);
+	}
+	return array;
 }
 
 /** @} */

lib/libalpm/alpm_list.h

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -56,7 +56,8 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data);
 alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn);
 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_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn);
+alpm_list_t *alpm_list_remove_item(alpm_list_t *haystack, alpm_list_t *item);
 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);
@@ -66,20 +67,21 @@ alpm_list_t *alpm_list_copy_data(const alpm_list_t *list, size_t size);
 alpm_list_t *alpm_list_reverse(alpm_list_t *list);
 
 /* item accessors */
-alpm_list_t *alpm_list_first(const alpm_list_t *list);
+alpm_list_t *alpm_list_nth(const alpm_list_t *list, size_t n);
-alpm_list_t *alpm_list_nth(const alpm_list_t *list, int n);
 alpm_list_t *alpm_list_next(const alpm_list_t *list);
+alpm_list_t *alpm_list_previous(const alpm_list_t *list);
 alpm_list_t *alpm_list_last(const alpm_list_t *list);
 void *alpm_list_getdata(const alpm_list_t *entry);
 
 /* misc */
-int alpm_list_count(const alpm_list_t *list);
+size_t alpm_list_count(const alpm_list_t *list);
 void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn);
 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);
+void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size);
 
 #ifdef __cplusplus
 }

lib/libalpm/backup.c

@@ -1,7 +1,7 @@
 /*
  *  backup.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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,82 +32,67 @@
 #include "log.h"
 #include "util.h"
 
-/* split a backup string "file\thash" into two strings : file and hash */
+/* split a backup string "file\thash" into the relevant components */
-static int backup_split(const char *string, char **file, char **hash)
+int _alpm_split_backup(const char *string, alpm_backup_t **backup)
 {
-	char *str = strdup(string);
+	char *str, *ptr;
-	char *ptr;
+
+	STRDUP(str, string, return -1);
 
 	/* tab delimiter */
-	ptr = strchr(str, '\t');
+	ptr = str ? strchr(str, '\t') : NULL;
 	if(ptr == NULL) {
-		if(file) {
+		(*backup)->name = str;
-			*file = str;
+		(*backup)->hash = NULL;
-		} else {
+		return 0;
-			/* don't need our dup as the fname wasn't requested, so free it */
-			FREE(str);
-		}
-		return(0);
 	}
 	*ptr = '\0';
 	ptr++;
 	/* now str points to the filename and ptr points to the hash */
-	if(file) {
+	STRDUP((*backup)->name, str, return -1);
-		*file = strdup(str);
+	STRDUP((*backup)->hash, ptr, return -1);
-	}
-	if(hash) {
-		*hash = strdup(ptr);
-	}
 	FREE(str);
-	return(1);
+	return 0;
 }
 
-char *_alpm_backup_file(const char *string)
+/* Look for a filename in a alpm_pkg_t.backup list. If we find it,
-{
+ * then we return the full backup entry.
-	char *file = NULL;
-	backup_split(string, &file, NULL);
-	return(file);
-}
-
-char *_alpm_backup_hash(const char *string)
-{
-	char *hash = NULL;
-	backup_split(string, NULL, &hash);
-	return(hash);
-}
-
-/* Look for a filename in a pmpkg_t.backup list.  If we find it,
- * then we return the md5 hash (parsed from the same line)
  */
-char *_alpm_needbackup(const char *file, const alpm_list_t *backup)
+alpm_backup_t *_alpm_needbackup(const char *file, alpm_pkg_t *pkg)
 {
 	const alpm_list_t *lp;
 
-	ALPM_LOG_FUNC;
+	if(file == NULL || pkg == NULL) {
-
+		return NULL;
-	if(file == NULL || backup == NULL) {
-		return(NULL);
 	}
 
-	/* run through the backup list and parse out the hash for our file */
+	for(lp = alpm_pkg_get_backup(pkg); lp; lp = lp->next) {
-	for(lp = backup; lp; lp = lp->next) {
+		alpm_backup_t *backup = lp->data;
-		char *filename = NULL;
-		char *hash = NULL;
 
-		/* no hash found */
+		if(strcmp(file, backup->name) == 0) {
-		if(!backup_split((char *)lp->data, &filename, &hash)) {
+			return backup;
-			FREE(filename);
-			continue;
 		}
-		if(strcmp(file, filename) == 0) {
-			FREE(filename);
-			return(hash);
-		}
-		FREE(filename);
-		FREE(hash);
 	}
 
-	return(NULL);
+	return NULL;
+}
+
+void _alpm_backup_free(alpm_backup_t *backup)
+{
+	free(backup->name);
+	free(backup->hash);
+	free(backup);
+}
+
+alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup)
+{
+	alpm_backup_t *newbackup;
+	CALLOC(newbackup, 1, sizeof(alpm_backup_t), return NULL);
+
+	STRDUP(newbackup->name, backup->name, return NULL);
+	STRDUP(newbackup->hash, backup->hash, return NULL);
+
+	return newbackup;
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/backup.h

@@ -1,7 +1,7 @@
 /*
  *  backup.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -21,10 +21,12 @@
 #define _ALPM_BACKUP_H
 
 #include "alpm_list.h"
+#include "alpm.h"
 
-char *_alpm_backup_file(const char *string);
+int _alpm_split_backup(const char *string, alpm_backup_t **backup);
-char *_alpm_backup_hash(const char *string);
+alpm_backup_t *_alpm_needbackup(const char *file, alpm_pkg_t *pkg);
-char *_alpm_needbackup(const char *file, const alpm_list_t *backup);
+void _alpm_backup_free(alpm_backup_t *backup);
+alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup);
 
 #endif /* _ALPM_BACKUP_H */
 

lib/libalpm/base64.c

@@ -0,0 +1,190 @@
+/*
+ *  RFC 1521 base64 encoding/decoding
+ *
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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/>.
+ */
+/*
+ *  Pacman Notes:
+ *
+ *  Taken from the PolarSSL project at www.polarssl.org under terms of the
+ *  GPL. This is from version 0.14.2 of the library, and has been modified
+ *  as following, which may be helpful for future updates:
+ *  * remove "polarssl/config.h" include
+ *  * change include from "polarssl/base64.h" to "base64.h"
+ *  * removal of SELF_TEST code
+ */
+
+#include "base64.h"
+
+static const unsigned char base64_enc_map[64] =
+{
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+    'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+    'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+    'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+    'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', '+', '/'
+};
+
+static const unsigned char base64_dec_map[128] =
+{
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127,  62, 127, 127, 127,  63,  52,  53,
+     54,  55,  56,  57,  58,  59,  60,  61, 127, 127,
+    127,  64, 127, 127, 127,   0,   1,   2,   3,   4,
+      5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
+     25, 127, 127, 127, 127, 127, 127,  26,  27,  28,
+     29,  30,  31,  32,  33,  34,  35,  36,  37,  38,
+     39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
+     49,  50,  51, 127, 127, 127, 127, 127
+};
+
+/*
+ * Encode a buffer into base64 format
+ */
+int base64_encode( unsigned char *dst, size_t *dlen,
+                   const unsigned char *src, size_t slen )
+{
+    size_t i, n;
+    int C1, C2, C3;
+    unsigned char *p;
+
+    if( slen == 0 )
+        return( 0 );
+
+    n = (slen << 3) / 6;
+
+    switch( (slen << 3) - (n * 6) )
+    {
+        case  2: n += 3; break;
+        case  4: n += 2; break;
+        default: break;
+    }
+
+    if( *dlen < n + 1 )
+    {
+        *dlen = n + 1;
+        return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
+    }
+
+    n = (slen / 3) * 3;
+
+    for( i = 0, p = dst; i < n; i += 3 )
+    {
+        C1 = *src++;
+        C2 = *src++;
+        C3 = *src++;
+
+        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+        *p++ = base64_enc_map[(((C1 &  3) << 4) + (C2 >> 4)) & 0x3F];
+        *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
+        *p++ = base64_enc_map[C3 & 0x3F];
+    }
+
+    if( i < slen )
+    {
+        C1 = *src++;
+        C2 = ((i + 1) < slen) ? *src++ : 0;
+
+        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+        *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
+
+        if( (i + 1) < slen )
+             *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
+        else *p++ = '=';
+
+        *p++ = '=';
+    }
+
+    *dlen = p - dst;
+    *p = 0;
+
+    return( 0 );
+}
+
+/*
+ * Decode a base64-formatted buffer
+ */
+int base64_decode( unsigned char *dst, size_t *dlen,
+                   const unsigned char *src, size_t slen )
+{
+    size_t i, j, n;
+    unsigned long x;
+    unsigned char *p;
+
+    for( i = j = n = 0; i < slen; i++ )
+    {
+        if( ( slen - i ) >= 2 &&
+            src[i] == '\r' && src[i + 1] == '\n' )
+            continue;
+
+        if( src[i] == '\n' )
+            continue;
+
+        if( src[i] == '=' && ++j > 2 )
+            return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
+
+        if( src[i] > 127 || base64_dec_map[src[i]] == 127 )
+            return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
+
+        if( base64_dec_map[src[i]] < 64 && j != 0 )
+            return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
+
+        n++;
+    }
+
+    if( n == 0 )
+        return( 0 );
+
+    n = ((n * 6) + 7) >> 3;
+
+    if( *dlen < n )
+    {
+        *dlen = n;
+        return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
+    }
+
+   for( j = 3, n = x = 0, p = dst; i > 0; i--, src++ )
+   {
+        if( *src == '\r' || *src == '\n' )
+            continue;
+
+        j -= ( base64_dec_map[*src] == 64 );
+        x  = (x << 6) | ( base64_dec_map[*src] & 0x3F );
+
+        if( ++n == 4 )
+        {
+            n = 0;
+            if( j > 0 ) *p++ = (unsigned char)( x >> 16 );
+            if( j > 1 ) *p++ = (unsigned char)( x >>  8 );
+            if( j > 2 ) *p++ = (unsigned char)( x       );
+        }
+    }
+
+    *dlen = p - dst;
+
+    return( 0 );
+}

lib/libalpm/base64.h

@@ -0,0 +1,70 @@
+/**
+ * \file base64.h
+ *
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BASE64_H
+#define _BASE64_H
+
+#include <string.h>
+
+#define POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL               -0x0010  /**< Output buffer too small. */
+#define POLARSSL_ERR_BASE64_INVALID_CHARACTER              -0x0012  /**< Invalid character in input. */
+
+/**
+ * \brief          Encode a buffer into base64 format
+ *
+ * \param dst      destination buffer
+ * \param dlen     size of the buffer
+ * \param src      source buffer
+ * \param slen     amount of data to be encoded
+ *
+ * \return         0 if successful, or POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL.
+ *                 *dlen is always updated to reflect the amount
+ *                 of data that has (or would have) been written.
+ *
+ * \note           Call this function with *dlen = 0 to obtain the
+ *                 required buffer size in *dlen
+ */
+int base64_encode( unsigned char *dst, size_t *dlen,
+                   const unsigned char *src, size_t slen );
+
+/**
+ * \brief          Decode a base64-formatted buffer
+ *
+ * \param dst      destination buffer
+ * \param dlen     size of the buffer
+ * \param src      source buffer
+ * \param slen     amount of data to be decoded
+ *
+ * \return         0 if successful, POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL, or
+ *                 POLARSSL_ERR_BASE64_INVALID_DATA if the input data is not
+ *                 correct. *dlen is always updated to reflect the amount
+ *                 of data that has (or would have) been written.
+ *
+ * \note           Call this function with *dlen = 0 to obtain the
+ *                 required buffer size in *dlen
+ */
+int base64_decode( unsigned char *dst, size_t *dlen,
+                   const unsigned char *src, size_t slen );
+
+#endif /* base64.h */

lib/libalpm/be_files.c

@@ -1,977 +0,0 @@
-/*
- *  be_files.c
- *
- *  Copyright (c) 2006 by Christian Hamar <krics@linuxforum.hu>
- *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.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 <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h> /* intmax_t */
-#include <sys/stat.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <time.h>
-#include <limits.h> /* PATH_MAX */
-#include <locale.h> /* setlocale */
-
-/* libarchive */
-#include <archive.h>
-#include <archive_entry.h>
-
-/* libalpm */
-#include "db.h"
-#include "alpm_list.h"
-#include "cache.h"
-#include "log.h"
-#include "util.h"
-#include "alpm.h"
-#include "handle.h"
-#include "package.h"
-#include "delta.h"
-#include "deps.h"
-#include "dload.h"
-
-
-static int checkdbdir(pmdb_t *db)
-{
-	struct stat buf;
-	const char *path = _alpm_db_path(db);
-
-	if(stat(path, &buf) != 0) {
-		_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, -1);
-		}
-	} else if(!S_ISDIR(buf.st_mode)) {
-		_alpm_log(PM_LOG_WARNING, _("removing invalid database: %s\n"), path);
-		if(unlink(path) != 0 || _alpm_makepath(path) != 0) {
-			RET_ERR(PM_ERR_SYSTEM, -1);
-		}
-	}
-	return(0);
-}
-
-/* create list of directories in db */
-static int dirlist_from_tar(const char *archive, alpm_list_t **dirlist)
-{
-	struct archive *_archive;
-	struct archive_entry *entry;
-
-	if((_archive = archive_read_new()) == NULL)
-		RET_ERR(PM_ERR_LIBARCHIVE, -1);
-
-	archive_read_support_compression_all(_archive);
-	archive_read_support_format_all(_archive);
-
-	if(archive_read_open_filename(_archive, archive,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		_alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive,
-				archive_error_string(_archive));
-		RET_ERR(PM_ERR_PKG_OPEN, -1);
-	}
-
-	while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) {
-		const struct stat *st;
-		const char *entryname; /* the name of the file in the archive */
-
-		st = archive_entry_stat(entry);
-		entryname = archive_entry_pathname(entry);
-
-		if(S_ISDIR(st->st_mode)) {
-			char *name = strdup(entryname);
-			*dirlist = alpm_list_add(*dirlist, name);
-		}
-	}
-	archive_read_finish(_archive);
-
-	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
-	return(0);
-}
-
-/* create list of directories in db */
-static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist)
-{
-	DIR *dbdir;
-	struct dirent *ent = NULL;
-	struct stat sbuf;
-	char path[PATH_MAX];
-
-	dbdir = opendir(syncdbpath);
-	if (dbdir != NULL) {
-		while((ent = readdir(dbdir)) != NULL) {
-			char *name = ent->d_name;
-			size_t len;
-			char *entry;
-
-			if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
-				continue;
-			}
-
-			/* stat the entry, make sure it's a directory */
-			snprintf(path, PATH_MAX, "%s%s", syncdbpath, name);
-			if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) {
-				continue;
-			}
-
-			len = strlen(name);
-			MALLOC(entry, len + 2, RET_ERR(PM_ERR_MEMORY, -1));
-			strcpy(entry, name);
-			entry[len] = '/';
-			entry[len+1] = '\0';
-			*dirlist = alpm_list_add(*dirlist, entry);
-		}
-		closedir(dbdir);
-	}
-
-	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
-	return(0);
-}
-
-/* remove old directories from dbdir */
-static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist)
-{
-	alpm_list_t *i;
-	for (i = dirlist; i; i = i->next) {
-		const char *name = i->data;
-		char *dbdir;
-		size_t len = strlen(syncdbpath) + strlen(name) + 2;
-		MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1));
-		snprintf(dbdir, len, "%s%s", syncdbpath, name);
-		_alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir);
-		if(_alpm_rmrf(dbdir) != 0) {
-			_alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir);
-			free(dbdir);
-			RET_ERR(PM_ERR_DB_REMOVE, -1);
-		}
-		free(dbdir);
-	}
-	return(0);
-}
-
-/** Update a package database
- *
- * An update of the package database \a db will be attempted. Unless
- * \a force is true, the update will only be performed if the remote
- * database was modified since the last update.
- *
- * A transaction is necessary for this operation, in order to obtain a
- * database lock. During this transaction the front-end will be informed
- * of the download progress of the database via the download callback.
- *
- * Example:
- * @code
- * pmdb_t *db;
- * int result;
- * db = alpm_list_getdata(alpm_option_get_syncdbs());
- * if(alpm_trans_init(0, NULL, NULL, NULL) == 0) {
- *     result = alpm_db_update(0, db);
- *     alpm_trans_release();
- *
- *     if(result > 0) {
- *	       printf("Unable to update database: %s\n", alpm_strerrorlast());
- *     } else if(result < 0) {
- *         printf("Database already up to date\n");
- *     } else {
- *         printf("Database updated\n");
- *     }
- * }
- * @endcode
- *
- * @ingroup alpm_databases
- * @note After a successful update, the \link alpm_db_get_pkgcache()
- * package cache \endlink will be invalidated
- * @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)
-{
-	char *dbfile, *dbfilepath;
-	const char *dbpath, *syncdbpath;
-	alpm_list_t *newdirlist = NULL, *olddirlist = NULL;
-	alpm_list_t *onlynew = NULL, *onlyold = NULL;
-	size_t len;
-	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));
-
-	if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
-	}
-
-	len = strlen(db->treename) + strlen(DBEXT) + 1;
-	MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(dbfile, "%s" DBEXT, db->treename);
-
-	dbpath = alpm_option_get_dbpath();
-
-	ret = _alpm_download_single_file(dbfile, db->servers, dbpath, force);
-	free(dbfile);
-
-	if(ret == 1) {
-		/* files match, do nothing */
-		pm_errno = 0;
-		return(1);
-	} else if(ret == -1) {
-		/* pm_errno was set by the download code */
-		_alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast());
-		return(-1);
-	}
-
-	syncdbpath = _alpm_db_path(db);
-
-	/* form the path to the db location */
-	len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1;
-	MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename);
-
-	if(force) {
-		/* if forcing update, remove the old dir and extract the db */
-		if(_alpm_rmrf(syncdbpath) != 0) {
-			_alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename);
-			RET_ERR(PM_ERR_DB_REMOVE, -1);
-		} else {
-			_alpm_log(PM_LOG_DEBUG, "database dir %s removed\n", _alpm_db_path(db));
-		}
-	} else {
-		/* if not forcing, only remove and extract what is necessary */
-		ret = dirlist_from_tar(dbfilepath, &newdirlist);
-		if(ret) {
-			goto cleanup;
-		}
-		ret = dirlist_from_fs(syncdbpath, &olddirlist);
-		if(ret) {
-			goto cleanup;
-		}
-
-		alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew);
-
-		ret = remove_olddir(syncdbpath, onlyold);
-		if(ret) {
-			goto cleanup;
-		}
-	}
-
-	/* Cache needs to be rebuilt */
-	_alpm_db_free_pkgcache(db);
-
-	checkdbdir(db);
-	ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0);
-
-cleanup:
-	FREELIST(newdirlist);
-	FREELIST(olddirlist);
-	alpm_list_free(onlynew);
-	alpm_list_free(onlyold);
-
-	free(dbfilepath);
-
-	if(ret) {
-		RET_ERR(PM_ERR_SYSTEM, -1);
-	}
-
-	return(0);
-}
-
-
-static int splitname(const char *target, pmpkg_t *pkg)
-{
-	/* the format of a db entry is as follows:
-	 *    package-version-rel/
-	 * package name can contain hyphens, so parse from the back- go back
-	 * two hyphens and we have split the version from the name.
-	 */
-	char *tmp, *p, *q;
-
-	if(target == NULL || pkg == NULL) {
-		return(-1);
-	}
-	STRDUP(tmp, target, RET_ERR(PM_ERR_MEMORY, -1));
-	p = tmp + strlen(tmp);
-
-	/* do the magic parsing- find the beginning of the version string
-	 * by doing two iterations of same loop to lop off two hyphens */
-	for(q = --p; *q && *q != '-'; q--);
-	for(p = --q; *p && *p != '-'; p--);
-	if(*p != '-' || p == tmp) {
-		return(-1);
-	}
-
-	/* copy into fields and return */
-	if(pkg->version) {
-		FREE(pkg->version);
-	}
-	STRDUP(pkg->version, p+1, RET_ERR(PM_ERR_MEMORY, -1));
-	/* insert a terminator at the end of the name (on hyphen)- then copy it */
-	*p = '\0';
-	if(pkg->name) {
-		FREE(pkg->name);
-	}
-	STRDUP(pkg->name, tmp, RET_ERR(PM_ERR_MEMORY, -1));
-
-	free(tmp);
-	return(0);
-}
-
-int _alpm_db_populate(pmdb_t *db)
-{
-	int count = 0;
-	struct dirent *ent = NULL;
-	struct stat sbuf;
-	char path[PATH_MAX];
-	const char *dbpath;
-	DIR *dbdir;
-
-	ALPM_LOG_FUNC;
-
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-
-	dbpath = _alpm_db_path(db);
-	dbdir = opendir(dbpath);
-	if(dbdir == NULL) {
-		return(0);
-	}
-	while((ent = readdir(dbdir)) != NULL) {
-		const char *name = ent->d_name;
-		pmpkg_t *pkg;
-
-		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
-			continue;
-		}
-		/* stat the entry, make sure it's a directory */
-		snprintf(path, PATH_MAX, "%s%s", dbpath, name);
-		if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) {
-			continue;
-		}
-
-		pkg = _alpm_pkg_new();
-		if(pkg == NULL) {
-			closedir(dbdir);
-			return(-1);
-		}
-		/* split the db entry name */
-		if(splitname(name, pkg) != 0) {
-			_alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'\n"),
-					name);
-			_alpm_pkg_free(pkg);
-			continue;
-		}
-
-		/* duplicated database entries are not allowed */
-		if(_alpm_pkg_find(db->pkgcache, pkg->name)) {
-			_alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name);
-			_alpm_pkg_free(pkg);
-			continue;
-		}
-
-		pkg->origin = PKG_FROM_CACHE;
-		pkg->origin_data.db = db;
-
-		/* explicitly read with only 'BASE' data, accessors will handle the rest */
-		if(_alpm_db_read(db, pkg, INFRQ_BASE) == -1) {
-			_alpm_log(PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name);
-			_alpm_pkg_free(pkg);
-			continue;
-		}
-
-		/* add to the collection */
-		_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
-				pkg->name, db->treename);
-		db->pkgcache = alpm_list_add(db->pkgcache, pkg);
-		count++;
-	}
-
-	closedir(dbdir);
-	db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp);
-	return(count);
-}
-
-/* Note: the return value must be freed by the caller */
-static char *get_pkgpath(pmdb_t *db, pmpkg_t *info)
-{
-	size_t len;
-	char *pkgpath;
-	const char *dbpath;
-
-	dbpath = _alpm_db_path(db);
-	len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3;
-	MALLOC(pkgpath, len, RET_ERR(PM_ERR_MEMORY, NULL));
-	sprintf(pkgpath, "%s%s-%s/", dbpath, info->name, info->version);
-	return(pkgpath);
-}
-
-int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
-{
-	FILE *fp = NULL;
-	char path[PATH_MAX];
-	char line[513];
-	int	sline = sizeof(line)-1;
-	char *pkgpath = NULL;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_NULL, -1);
-	}
-
-	if(info == NULL || info->name == NULL || info->version == NULL) {
-		_alpm_log(PM_LOG_DEBUG, "invalid package entry provided to _alpm_db_read, skipping\n");
-		return(-1);
-	}
-
-	if(info->origin == PKG_FROM_FILE) {
-		_alpm_log(PM_LOG_DEBUG, "request to read database info for a file-based package '%s', skipping...\n", info->name);
-		return(-1);
-	}
-
-	/* bitmask logic here:
-	 * infolevel: 00001111
-	 * inforeq:   00010100
-	 * & result:  00000100
-	 * == to inforeq? nope, we need to load more info. */
-	if((info->infolevel & inforeq) == inforeq) {
-		/* already loaded all of this info, do nothing */
-		return(0);
-	}
-	_alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n",
-			info->name, inforeq);
-
-	/* clear out 'line', to be certain - and to make valgrind happy */
-	memset(line, 0, sline+1);
-
-	pkgpath = get_pkgpath(db, info);
-
-	if(access(pkgpath, F_OK)) {
-		/* directory doesn't exist or can't be opened */
-		_alpm_log(PM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n",
-				info->name, info->version, db->treename);
-		goto error;
-	}
-
-	/* DESC */
-	if(inforeq & INFRQ_DESC && !(info->infolevel & INFRQ_DESC)) {
-		snprintf(path, PATH_MAX, "%sdesc", pkgpath);
-		if((fp = fopen(path, "r")) == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
-			goto error;
-		}
-		while(!feof(fp)) {
-			if(fgets(line, 256, fp) == NULL) {
-				break;
-			}
-			_alpm_strtrim(line);
-			if(strcmp(line, "%NAME%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				if(strcmp(_alpm_strtrim(line), info->name) != 0) {
-					_alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name "
-								"mismatch on package %s\n"), db->treename, info->name);
-				}
-			} else if(strcmp(line, "%VERSION%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				if(strcmp(_alpm_strtrim(line), info->version) != 0) {
-					_alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version "
-								"mismatch on package %s\n"), db->treename, info->name);
-				}
-			} else if(strcmp(line, "%FILENAME%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				STRDUP(info->filename, _alpm_strtrim(line), goto error);
-			} else if(strcmp(line, "%DESC%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				STRDUP(info->desc, _alpm_strtrim(line), goto error);
-			} else if(strcmp(line, "%GROUPS%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->groups = alpm_list_add(info->groups, linedup);
-				}
-			} else if(strcmp(line, "%URL%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				STRDUP(info->url, _alpm_strtrim(line), goto error);
-			} else if(strcmp(line, "%LICENSE%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->licenses = alpm_list_add(info->licenses, linedup);
-				}
-			} else if(strcmp(line, "%ARCH%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				STRDUP(info->arch, _alpm_strtrim(line), goto error);
-			} else if(strcmp(line, "%BUILDDATE%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				_alpm_strtrim(line);
-
-				char first = tolower((unsigned char)line[0]);
-				if(first > 'a' && first < 'z') {
-					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
-					setlocale(LC_TIME, "C");
-					strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm);
-					info->builddate = mktime(&tmp_tm);
-					setlocale(LC_TIME, "");
-				} else {
-					info->builddate = atol(line);
-				}
-			} else if(strcmp(line, "%INSTALLDATE%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				_alpm_strtrim(line);
-
-				char first = tolower((unsigned char)line[0]);
-				if(first > 'a' && first < 'z') {
-					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
-					setlocale(LC_TIME, "C");
-					strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm);
-					info->installdate = mktime(&tmp_tm);
-					setlocale(LC_TIME, "");
-				} else {
-					info->installdate = atol(line);
-				}
-			} else if(strcmp(line, "%PACKAGER%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				STRDUP(info->packager, _alpm_strtrim(line), goto error);
-			} else if(strcmp(line, "%REASON%") == 0) {
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line));
-			} else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) {
-				/* NOTE: the CSIZE and SIZE fields both share the "size" field
-				 *       in the pkginfo_t struct.  This can be done b/c CSIZE
-				 *       is currently only used in sync databases, and SIZE is
-				 *       only used in local databases.
-				 */
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				info->size = atol(_alpm_strtrim(line));
-				/* also store this value to isize if isize is unset */
-				if(info->isize == 0) {
-					info->isize = info->size;
-				}
-			} else if(strcmp(line, "%ISIZE%") == 0) {
-				/* ISIZE (installed size) tag only appears in sync repositories,
-				 * not the local one. */
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				info->isize = atol(_alpm_strtrim(line));
-			} else if(strcmp(line, "%MD5SUM%") == 0) {
-				/* MD5SUM tag only appears in sync repositories,
-				 * not the local one. */
-				if(fgets(line, sline, fp) == NULL) {
-					goto error;
-				}
-				STRDUP(info->md5sum, _alpm_strtrim(line), goto error);
-			} else if(strcmp(line, "%REPLACES%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->replaces = alpm_list_add(info->replaces, linedup);
-				}
-			} else if(strcmp(line, "%FORCE%") == 0) {
-				info->force = 1;
-			}
-		}
-		fclose(fp);
-		fp = NULL;
-	}
-
-	/* FILES */
-	if(inforeq & INFRQ_FILES && !(info->infolevel & INFRQ_FILES)) {
-		snprintf(path, PATH_MAX, "%sfiles", pkgpath);
-		if((fp = fopen(path, "r")) == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
-			goto error;
-		}
-		while(fgets(line, 256, fp)) {
-			_alpm_strtrim(line);
-			if(strcmp(line, "%FILES%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->files = alpm_list_add(info->files, linedup);
-				}
-			} else if(strcmp(line, "%BACKUP%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->backup = alpm_list_add(info->backup, linedup);
-				}
-			}
-		}
-		fclose(fp);
-		fp = NULL;
-	}
-
-	/* DEPENDS */
-	if(inforeq & INFRQ_DEPENDS && !(info->infolevel & INFRQ_DEPENDS)) {
-		snprintf(path, PATH_MAX, "%sdepends", pkgpath);
-		if((fp = fopen(path, "r")) == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
-			goto error;
-		}
-		while(!feof(fp)) {
-			fgets(line, 255, fp);
-			_alpm_strtrim(line);
-			if(strcmp(line, "%DEPENDS%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line));
-					info->depends = alpm_list_add(info->depends, dep);
-				}
-			} else if(strcmp(line, "%OPTDEPENDS%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->optdepends = alpm_list_add(info->optdepends, linedup);
-				}
-			} else if(strcmp(line, "%CONFLICTS%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->conflicts = alpm_list_add(info->conflicts, linedup);
-				}
-			} else if(strcmp(line, "%PROVIDES%") == 0) {
-				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-					char *linedup;
-					STRDUP(linedup, _alpm_strtrim(line), goto error);
-					info->provides = alpm_list_add(info->provides, linedup);
-				}
-			}
-		}
-		fclose(fp);
-		fp = NULL;
-	}
-
-	/* DELTAS */
-	if(inforeq & INFRQ_DELTAS && !(info->infolevel & INFRQ_DELTAS)) {
-		snprintf(path, PATH_MAX, "%sdeltas", pkgpath);
-		if((fp = fopen(path, "r"))) {
-			while(!feof(fp)) {
-				fgets(line, 255, fp);
-				_alpm_strtrim(line);
-				if(strcmp(line, "%DELTAS%") == 0) {
-					while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
-						pmdelta_t *delta = _alpm_delta_parse(line);
-						if(delta) {
-							info->deltas = alpm_list_add(info->deltas, delta);
-						}
-					}
-				}
-			}
-			fclose(fp);
-			fp = NULL;
-		}
-	}
-
-	/* INSTALL */
-	if(inforeq & INFRQ_SCRIPTLET && !(info->infolevel & INFRQ_SCRIPTLET)) {
-		snprintf(path, PATH_MAX, "%sinstall", pkgpath);
-		if(access(path, F_OK) == 0) {
-			info->scriptlet = 1;
-		}
-	}
-
-	/* internal */
-	info->infolevel |= inforeq;
-
-	free(pkgpath);
-	return(0);
-
-error:
-	free(pkgpath);
-	if(fp) {
-		fclose(fp);
-	}
-	return(-1);
-}
-
-int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info)
-{
-	mode_t oldmask;
-	int retval = 0;
-	char *pkgpath = NULL;
-
-	if(checkdbdir(db) != 0) {
-		return(-1);
-	}
-
-	oldmask = umask(0000);
-	pkgpath = get_pkgpath(db, info);
-
-	if((retval = mkdir(pkgpath, 0755)) != 0) {
-		_alpm_log(PM_LOG_ERROR, _("could not create directory %s: %s\n"),
-				pkgpath, strerror(errno));
-	}
-
-	free(pkgpath);
-	umask(oldmask);
-
-	return(retval);
-}
-
-int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
-{
-	FILE *fp = NULL;
-	char path[PATH_MAX];
-	mode_t oldmask;
-	alpm_list_t *lp = NULL;
-	int retval = 0;
-	int local = 0;
-	char *pkgpath = NULL;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || info == NULL) {
-		return(-1);
-	}
-
-	pkgpath = get_pkgpath(db, info);
-
-	/* make sure we have a sane umask */
-	oldmask = umask(0022);
-
-	if(strcmp(db->treename, "local") == 0) {
-		local = 1;
-	}
-
-	/* DESC */
-	if(inforeq & INFRQ_DESC) {
-		_alpm_log(PM_LOG_DEBUG, "writing %s-%s DESC information back to db\n",
-				info->name, info->version);
-		snprintf(path, PATH_MAX, "%sdesc", pkgpath);
-		if((fp = fopen(path, "w")) == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
-			retval = -1;
-			goto cleanup;
-		}
-		fprintf(fp, "%%NAME%%\n%s\n\n"
-						"%%VERSION%%\n%s\n\n", info->name, info->version);
-		if(info->desc) {
-			fprintf(fp, "%%DESC%%\n"
-							"%s\n\n", info->desc);
-		}
-		if(info->groups) {
-			fputs("%GROUPS%\n", fp);
-			for(lp = info->groups; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		if(info->replaces) {
-			fputs("%REPLACES%\n", fp);
-			for(lp = info->replaces; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		if(local) {
-			if(info->url) {
-				fprintf(fp, "%%URL%%\n"
-								"%s\n\n", info->url);
-			}
-			if(info->licenses) {
-				fputs("%LICENSE%\n", fp);
-				for(lp = info->licenses; lp; lp = lp->next) {
-					fprintf(fp, "%s\n", (char *)lp->data);
-				}
-				fprintf(fp, "\n");
-			}
-			if(info->arch) {
-				fprintf(fp, "%%ARCH%%\n"
-								"%s\n\n", info->arch);
-			}
-			if(info->builddate) {
-				fprintf(fp, "%%BUILDDATE%%\n"
-								"%ld\n\n", info->builddate);
-			}
-			if(info->installdate) {
-				fprintf(fp, "%%INSTALLDATE%%\n"
-								"%ld\n\n", info->installdate);
-			}
-			if(info->packager) {
-				fprintf(fp, "%%PACKAGER%%\n"
-								"%s\n\n", info->packager);
-			}
-			if(info->isize) {
-				/* only write installed size, csize is irrelevant once installed */
-				fprintf(fp, "%%SIZE%%\n"
-								"%jd\n\n", (intmax_t)info->isize);
-			}
-			if(info->reason) {
-				fprintf(fp, "%%REASON%%\n"
-								"%u\n\n", info->reason);
-			}
-		} else {
-			if(info->size) {
-				fprintf(fp, "%%CSIZE%%\n"
-								"%jd\n\n", (intmax_t)info->size);
-			}
-			if(info->isize) {
-				fprintf(fp, "%%ISIZE%%\n"
-								"%jd\n\n", (intmax_t)info->isize);
-			}
-			if(info->md5sum) {
-				fprintf(fp, "%%MD5SUM%%\n"
-								"%s\n\n", info->md5sum);
-			}
-		}
-		fclose(fp);
-		fp = NULL;
-	}
-
-	/* FILES */
-	if(local && (inforeq & INFRQ_FILES)) {
-		_alpm_log(PM_LOG_DEBUG, "writing %s-%s FILES information back to db\n",
-				info->name, info->version);
-		snprintf(path, PATH_MAX, "%sfiles", pkgpath);
-		if((fp = fopen(path, "w")) == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
-			retval = -1;
-			goto cleanup;
-		}
-		if(info->files) {
-			fprintf(fp, "%%FILES%%\n");
-			for(lp = info->files; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		if(info->backup) {
-			fprintf(fp, "%%BACKUP%%\n");
-			for(lp = info->backup; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		fclose(fp);
-		fp = NULL;
-	}
-
-	/* DEPENDS */
-	if(inforeq & INFRQ_DEPENDS) {
-		_alpm_log(PM_LOG_DEBUG, "writing %s-%s DEPENDS information back to db\n",
-			info->name, info->version);
-		snprintf(path, PATH_MAX, "%sdepends", pkgpath);
-		if((fp = fopen(path, "w")) == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
-			retval = -1;
-			goto cleanup;
-		}
-		if(info->depends) {
-			fputs("%DEPENDS%\n", fp);
-			for(lp = info->depends; lp; lp = lp->next) {
-				char *depstring = alpm_dep_compute_string(lp->data);
-				fprintf(fp, "%s\n", depstring);
-				free(depstring);
-			}
-			fprintf(fp, "\n");
-		}
-		if(info->optdepends) {
-			fputs("%OPTDEPENDS%\n", fp);
-			for(lp = info->optdepends; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		if(info->conflicts) {
-			fputs("%CONFLICTS%\n", fp);
-			for(lp = info->conflicts; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		if(info->provides) {
-			fputs("%PROVIDES%\n", fp);
-			for(lp = info->provides; lp; lp = lp->next) {
-				fprintf(fp, "%s\n", (char *)lp->data);
-			}
-			fprintf(fp, "\n");
-		}
-		fclose(fp);
-		fp = NULL;
-	}
-
-	/* INSTALL */
-	/* nothing needed here (script is automatically extracted) */
-
-cleanup:
-	umask(oldmask);
-	free(pkgpath);
-
-	if(fp) {
-		fclose(fp);
-	}
-
-	return(retval);
-}
-
-int _alpm_db_remove(pmdb_t *db, pmpkg_t *info)
-{
-	int ret = 0;
-	char *pkgpath = NULL;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || info == NULL) {
-		RET_ERR(PM_ERR_DB_NULL, -1);
-	}
-
-	pkgpath = get_pkgpath(db, info);
-
-	ret = _alpm_rmrf(pkgpath);
-	free(pkgpath);
-	if(ret != 0) {
-		ret = -1;
-	}
-	return(ret);
-}
-
-/* vim: set ts=2 sw=2 noet: */

lib/libalpm/be_local.c

@@ -0,0 +1,947 @@
+/*
+ *  be_local.c : backend for the local database
+ *
+ *  Copyright (c) 2006-2011 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 <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <stdint.h> /* intmax_t */
+#include <sys/stat.h>
+#include <dirent.h>
+#include <time.h>
+#include <limits.h> /* PATH_MAX */
+
+/* libalpm */
+#include "db.h"
+#include "alpm_list.h"
+#include "log.h"
+#include "util.h"
+#include "alpm.h"
+#include "handle.h"
+#include "package.h"
+#include "deps.h"
+
+static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq);
+
+#define LAZY_LOAD(info, errret) \
+	do { \
+		if(!(pkg->infolevel & info)) { \
+			local_db_read(pkg, info); \
+		} \
+	} while(0)
+
+
+/* Cache-specific accessor functions. These implementations allow for lazy
+ * loading by the files backend when a data member is actually needed
+ * rather than loading all pieces of information when the package is first
+ * initialized.
+ */
+
+static const char *_cache_get_desc(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->desc;
+}
+
+static const char *_cache_get_url(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->url;
+}
+
+static time_t _cache_get_builddate(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, 0);
+	return pkg->builddate;
+}
+
+static time_t _cache_get_installdate(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, 0);
+	return pkg->installdate;
+}
+
+static const char *_cache_get_packager(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->packager;
+}
+
+static const char *_cache_get_arch(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->arch;
+}
+
+static off_t _cache_get_isize(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, -1);
+	return pkg->isize;
+}
+
+static alpm_pkgreason_t _cache_get_reason(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, -1);
+	return pkg->reason;
+}
+
+static alpm_list_t *_cache_get_licenses(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->licenses;
+}
+
+static alpm_list_t *_cache_get_groups(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->groups;
+}
+
+static int _cache_has_scriptlet(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_SCRIPTLET, NULL);
+	return pkg->scriptlet;
+}
+
+static alpm_list_t *_cache_get_depends(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->depends;
+}
+
+static alpm_list_t *_cache_get_optdepends(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->optdepends;
+}
+
+static alpm_list_t *_cache_get_conflicts(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->conflicts;
+}
+
+static alpm_list_t *_cache_get_provides(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->provides;
+}
+
+static alpm_list_t *_cache_get_replaces(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->replaces;
+}
+
+static alpm_filelist_t *_cache_get_files(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_FILES, NULL);
+	return &(pkg->files);
+}
+
+static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_FILES, NULL);
+	return pkg->backup;
+}
+
+/**
+ * Open a package changelog for reading. Similar to fopen in functionality,
+ * except that the returned 'file stream' is from the database.
+ * @param pkg the package (from db) to read the changelog
+ * @return a 'file stream' to the package changelog
+ */
+static void *_cache_changelog_open(alpm_pkg_t *pkg)
+{
+	alpm_db_t *db = alpm_pkg_get_db(pkg);
+	char *clfile = _alpm_local_db_pkgpath(db, pkg, "changelog");
+	FILE *f = fopen(clfile, "r");
+	free(clfile);
+	return f;
+}
+
+/**
+ * Read data from an open changelog 'file stream'. Similar to fread in
+ * functionality, this function takes a buffer and amount of data to read.
+ * @param ptr a buffer to fill with raw changelog data
+ * @param size the size of the buffer
+ * @param pkg the package that the changelog is being read from
+ * @param fp a 'file stream' to the package changelog
+ * @return the number of characters read, or 0 if there is no more data
+ */
+static size_t _cache_changelog_read(void *ptr, size_t size,
+		const alpm_pkg_t UNUSED *pkg, void *fp)
+{
+	return fread(ptr, 1, size, (FILE *)fp);
+}
+
+/**
+ * Close a package changelog for reading. Similar to fclose in functionality,
+ * except that the 'file stream' is from the database.
+ * @param pkg the package that the changelog was read from
+ * @param fp a 'file stream' to the package changelog
+ * @return whether closing the package changelog stream was successful
+ */
+static int _cache_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp)
+{
+	return fclose((FILE *)fp);
+}
+
+static int _cache_force_load(alpm_pkg_t *pkg)
+{
+	return local_db_read(pkg, INFRQ_ALL);
+}
+
+
+/** The local database operations struct. Get package fields through
+ * lazy accessor methods that handle any backend loading and caching
+ * logic.
+ */
+static struct pkg_operations local_pkg_ops = {
+	.get_desc        = _cache_get_desc,
+	.get_url         = _cache_get_url,
+	.get_builddate   = _cache_get_builddate,
+	.get_installdate = _cache_get_installdate,
+	.get_packager    = _cache_get_packager,
+	.get_arch        = _cache_get_arch,
+	.get_isize       = _cache_get_isize,
+	.get_reason      = _cache_get_reason,
+	.has_scriptlet   = _cache_has_scriptlet,
+	.get_licenses    = _cache_get_licenses,
+	.get_groups      = _cache_get_groups,
+	.get_depends     = _cache_get_depends,
+	.get_optdepends  = _cache_get_optdepends,
+	.get_conflicts   = _cache_get_conflicts,
+	.get_provides    = _cache_get_provides,
+	.get_replaces    = _cache_get_replaces,
+	.get_files       = _cache_get_files,
+	.get_backup      = _cache_get_backup,
+
+	.changelog_open  = _cache_changelog_open,
+	.changelog_read  = _cache_changelog_read,
+	.changelog_close = _cache_changelog_close,
+
+	.force_load      = _cache_force_load,
+};
+
+static int checkdbdir(alpm_db_t *db)
+{
+	struct stat buf;
+	const char *path = _alpm_db_path(db);
+
+	if(stat(path, &buf) != 0) {
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
+				path);
+		if(_alpm_makepath(path) != 0) {
+			RET_ERR(db->handle, ALPM_ERR_SYSTEM, -1);
+		}
+	} else if(!S_ISDIR(buf.st_mode)) {
+		_alpm_log(db->handle, ALPM_LOG_WARNING, _("removing invalid database: %s\n"), path);
+		if(unlink(path) != 0 || _alpm_makepath(path) != 0) {
+			RET_ERR(db->handle, ALPM_ERR_SYSTEM, -1);
+		}
+	}
+	return 0;
+}
+
+static int is_dir(const char *path, struct dirent *entry)
+{
+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
+	if(entry->d_type != DT_UNKNOWN) {
+		return (entry->d_type == DT_DIR);
+	}
+#endif
+	{
+		char buffer[PATH_MAX];
+		struct stat sbuf;
+
+		snprintf(buffer, PATH_MAX, "%s/%s", path, entry->d_name);
+
+		if(!stat(buffer, &sbuf)) {
+			return S_ISDIR(sbuf.st_mode);
+		}
+	}
+
+	return 0;
+}
+
+static int local_db_validate(alpm_db_t *db)
+{
+	struct dirent *ent = NULL;
+	const char *dbpath;
+	DIR *dbdir;
+	int ret = -1;
+
+	if(db->status & DB_STATUS_VALID) {
+		return 0;
+	}
+	if(db->status & DB_STATUS_INVALID) {
+		return -1;
+	}
+
+	dbpath = _alpm_db_path(db);
+	if(dbpath == NULL) {
+		RET_ERR(db->handle, ALPM_ERR_DB_OPEN, -1);
+	}
+	dbdir = opendir(dbpath);
+	if(dbdir == NULL) {
+		if(errno == ENOENT) {
+			/* database dir doesn't exist yet */
+			db->status |= DB_STATUS_VALID;
+			db->status &= ~DB_STATUS_INVALID;
+			db->status &= ~DB_STATUS_EXISTS;
+			db->status |= DB_STATUS_MISSING;
+			return 0;
+		} else {
+			RET_ERR(db->handle, ALPM_ERR_DB_OPEN, -1);
+		}
+	}
+	db->status |= DB_STATUS_EXISTS;
+	db->status &= ~DB_STATUS_MISSING;
+
+	while((ent = readdir(dbdir)) != NULL) {
+		const char *name = ent->d_name;
+		char path[PATH_MAX];
+
+		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+			continue;
+		}
+		if(!is_dir(dbpath, ent)) {
+			continue;
+		}
+
+		snprintf(path, PATH_MAX, "%s%s/depends", dbpath, name);
+		if(access(path, F_OK) == 0) {
+			/* we found a depends file- bail */
+			db->status &= ~DB_STATUS_VALID;
+			db->status |= DB_STATUS_INVALID;
+			db->handle->pm_errno = ALPM_ERR_DB_VERSION;
+			goto done;
+		}
+	}
+	/* we found no depends file after full scan */
+	db->status |= DB_STATUS_VALID;
+	db->status &= ~DB_STATUS_INVALID;
+	ret = 0;
+
+done:
+	if(dbdir) {
+		closedir(dbdir);
+	}
+
+	return ret;
+}
+
+static int local_db_populate(alpm_db_t *db)
+{
+	size_t est_count;
+	int count = 0;
+	struct stat buf;
+	struct dirent *ent = NULL;
+	const char *dbpath;
+	DIR *dbdir;
+
+	if(db->status & DB_STATUS_INVALID) {
+		RET_ERR(db->handle, ALPM_ERR_DB_INVALID, -1);
+	}
+	/* note: DB_STATUS_MISSING is not fatal for local database */
+
+	dbpath = _alpm_db_path(db);
+	if(dbpath == NULL) {
+		/* pm_errno set in _alpm_db_path() */
+		return -1;
+	}
+
+	dbdir = opendir(dbpath);
+	if(dbdir == NULL) {
+		if(errno == ENOENT) {
+			/* no database existing yet is not an error */
+			db->status &= ~DB_STATUS_EXISTS;
+			db->status |= DB_STATUS_MISSING;
+			return 0;
+		}
+		RET_ERR(db->handle, ALPM_ERR_DB_OPEN, -1);
+	}
+	if(fstat(dirfd(dbdir), &buf) != 0) {
+		RET_ERR(db->handle, ALPM_ERR_DB_OPEN, -1);
+	}
+	db->status |= DB_STATUS_EXISTS;
+	db->status &= ~DB_STATUS_MISSING;
+	if(buf.st_nlink >= 2) {
+		est_count = buf.st_nlink;
+	} else {
+		/* Some filesystems don't subscribe to the two-implicit links school of
+		 * thought, e.g. BTRFS, HFS+. See
+		 * http://kerneltrap.org/mailarchive/linux-btrfs/2010/1/23/6723483/thread
+		 */
+		est_count = 0;
+		while(readdir(dbdir) != NULL) {
+			est_count++;
+		}
+		rewinddir(dbdir);
+	}
+	if(est_count >= 2) {
+		/* subtract the two extra pointers to get # of children */
+		est_count -= 2;
+	}
+
+	/* initialize hash at 50% full */
+	db->pkgcache = _alpm_pkghash_create(est_count * 2);
+	if(db->pkgcache == NULL){
+		closedir(dbdir);
+		RET_ERR(db->handle, ALPM_ERR_MEMORY, -1);
+	}
+
+	while((ent = readdir(dbdir)) != NULL) {
+		const char *name = ent->d_name;
+
+		alpm_pkg_t *pkg;
+
+		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+			continue;
+		}
+		if(!is_dir(dbpath, ent)) {
+			continue;
+		}
+
+		pkg = _alpm_pkg_new();
+		if(pkg == NULL) {
+			closedir(dbdir);
+			RET_ERR(db->handle, ALPM_ERR_MEMORY, -1);
+		}
+		/* split the db entry name */
+		if(_alpm_splitname(name, &(pkg->name), &(pkg->version),
+					&(pkg->name_hash)) != 0) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("invalid name for database entry '%s'\n"),
+					name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
+		/* duplicated database entries are not allowed */
+		if(_alpm_pkghash_find(db->pkgcache, pkg->name)) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
+		pkg->origin = PKG_FROM_LOCALDB;
+		pkg->origin_data.db = db;
+		pkg->ops = &local_pkg_ops;
+		pkg->handle = db->handle;
+
+		/* explicitly read with only 'BASE' data, accessors will handle the rest */
+		if(local_db_read(pkg, INFRQ_BASE) == -1) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("corrupted database entry '%s'\n"), name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
+		/* add to the collection */
+		_alpm_log(db->handle, ALPM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
+				pkg->name, db->treename);
+		db->pkgcache = _alpm_pkghash_add(db->pkgcache, pkg);
+		count++;
+	}
+
+	closedir(dbdir);
+	if(count > 0) {
+		db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp);
+	}
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n",
+			count, db->treename);
+
+	return count;
+}
+
+/* Note: the return value must be freed by the caller */
+char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info, const char *filename)
+{
+	size_t len;
+	char *pkgpath;
+	const char *dbpath;
+
+	dbpath = _alpm_db_path(db);
+	len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3;
+	len += filename ? strlen(filename) : 0;
+	MALLOC(pkgpath, len, RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL));
+	sprintf(pkgpath, "%s%s-%s/%s", dbpath, info->name, info->version,
+			filename ? filename : "");
+	return pkgpath;
+}
+
+#define READ_NEXT() do { \
+	if(fgets(line, sizeof(line), fp) == NULL && !feof(fp)) goto error; \
+	_alpm_strip_newline(line); \
+} while(0)
+
+#define READ_AND_STORE(f) do { \
+	READ_NEXT(); \
+	STRDUP(f, line, goto error); \
+} while(0)
+
+#define READ_AND_STORE_ALL(f) do { \
+	char *linedup; \
+	if(fgets(line, sizeof(line), fp) == NULL) {\
+		if(!feof(fp)) goto error; else break; \
+	} \
+	if(_alpm_strip_newline(line) == 0) break; \
+	STRDUP(linedup, line, goto error); \
+	f = alpm_list_add(f, linedup); \
+} while(1) /* note the while(1) and not (0) */
+
+#define READ_AND_SPLITDEP(f) do { \
+	if(fgets(line, sizeof(line), fp) == NULL) {\
+		if(!feof(fp)) goto error; else break; \
+	} \
+	if(_alpm_strip_newline(line) == 0) break; \
+	f = alpm_list_add(f, _alpm_splitdep(line)); \
+} while(1) /* note the while(1) and not (0) */
+
+static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
+{
+	FILE *fp = NULL;
+	char line[1024];
+	char *pkgpath;
+	alpm_db_t *db = info->origin_data.db;
+
+	/* bitmask logic here:
+	 * infolevel: 00001111
+	 * inforeq:   00010100
+	 * & result:  00000100
+	 * == to inforeq? nope, we need to load more info. */
+	if((info->infolevel & inforeq) == inforeq) {
+		/* already loaded all of this info, do nothing */
+		return 0;
+	}
+
+	if(info->infolevel & INFRQ_ERROR) {
+		/* We've encountered an error loading this package before. Don't attempt
+		 * repeated reloads, just give up. */
+		return -1;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n",
+			info->name, inforeq);
+
+	pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
+	if(!pkgpath || access(pkgpath, F_OK)) {
+		/* directory doesn't exist or can't be opened */
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n",
+				info->name, info->version, db->treename);
+		goto error;
+	}
+	free(pkgpath);
+
+	/* clear out 'line', to be certain - and to make valgrind happy */
+	memset(line, 0, sizeof(line));
+
+	/* DESC */
+	if(inforeq & INFRQ_DESC && !(info->infolevel & INFRQ_DESC)) {
+		char *path = _alpm_local_db_pkgpath(db, info, "desc");
+		if(!path || (fp = fopen(path, "r")) == NULL) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
+			free(path);
+			goto error;
+		}
+		free(path);
+		while(!feof(fp)) {
+			if(fgets(line, sizeof(line), fp) == NULL && !feof(fp)) {
+				goto error;
+			}
+			if(_alpm_strip_newline(line) == 0) {
+				/* length of stripped line was zero */
+				continue;
+			}
+			if(strcmp(line, "%NAME%") == 0) {
+				READ_NEXT();
+				if(strcmp(line, info->name) != 0) {
+					_alpm_log(db->handle, ALPM_LOG_ERROR, _("%s database is inconsistent: name "
+								"mismatch on package %s\n"), db->treename, info->name);
+				}
+			} else if(strcmp(line, "%VERSION%") == 0) {
+				READ_NEXT();
+				if(strcmp(line, info->version) != 0) {
+					_alpm_log(db->handle, ALPM_LOG_ERROR, _("%s database is inconsistent: version "
+								"mismatch on package %s\n"), db->treename, info->name);
+				}
+			} else if(strcmp(line, "%DESC%") == 0) {
+				READ_AND_STORE(info->desc);
+			} else if(strcmp(line, "%GROUPS%") == 0) {
+				READ_AND_STORE_ALL(info->groups);
+			} else if(strcmp(line, "%URL%") == 0) {
+				READ_AND_STORE(info->url);
+			} else if(strcmp(line, "%LICENSE%") == 0) {
+				READ_AND_STORE_ALL(info->licenses);
+			} else if(strcmp(line, "%ARCH%") == 0) {
+				READ_AND_STORE(info->arch);
+			} else if(strcmp(line, "%BUILDDATE%") == 0) {
+				READ_NEXT();
+				info->builddate = _alpm_parsedate(line);
+			} else if(strcmp(line, "%INSTALLDATE%") == 0) {
+				READ_NEXT();
+				info->installdate = _alpm_parsedate(line);
+			} else if(strcmp(line, "%PACKAGER%") == 0) {
+				READ_AND_STORE(info->packager);
+			} else if(strcmp(line, "%REASON%") == 0) {
+				READ_NEXT();
+				info->reason = (alpm_pkgreason_t)atoi(line);
+			} else if(strcmp(line, "%SIZE%") == 0) {
+				READ_NEXT();
+				info->isize = _alpm_strtoofft(line);
+			} else if(strcmp(line, "%REPLACES%") == 0) {
+				READ_AND_SPLITDEP(info->replaces);
+			} else if(strcmp(line, "%DEPENDS%") == 0) {
+				READ_AND_SPLITDEP(info->depends);
+			} else if(strcmp(line, "%OPTDEPENDS%") == 0) {
+				READ_AND_STORE_ALL(info->optdepends);
+			} else if(strcmp(line, "%CONFLICTS%") == 0) {
+				READ_AND_SPLITDEP(info->conflicts);
+			} else if(strcmp(line, "%PROVIDES%") == 0) {
+				READ_AND_SPLITDEP(info->provides);
+			}
+		}
+		fclose(fp);
+		fp = NULL;
+		info->infolevel |= INFRQ_DESC;
+	}
+
+	/* FILES */
+	if(inforeq & INFRQ_FILES && !(info->infolevel & INFRQ_FILES)) {
+		char *path = _alpm_local_db_pkgpath(db, info, "files");
+		if(!path || (fp = fopen(path, "r")) == NULL) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
+			free(path);
+			goto error;
+		}
+		free(path);
+		while(fgets(line, sizeof(line), fp)) {
+			_alpm_strip_newline(line);
+			if(strcmp(line, "%FILES%") == 0) {
+				size_t files_count = 0, files_size = 0;
+				alpm_file_t *files = NULL;
+
+				while(fgets(line, sizeof(line), fp) && _alpm_strip_newline(line)) {
+					if(files_count >= files_size) {
+						size_t old_size = files_size;
+						if(files_size == 0) {
+							files_size = 8;
+						} else {
+							files_size *= 2;
+						}
+						files = realloc(files, sizeof(alpm_file_t) * files_size);
+						if(!files) {
+							ALLOC_FAIL(sizeof(alpm_file_t) * files_size);
+							goto error;
+						}
+						/* ensure all new memory is zeroed out, in both the initial
+						 * allocation and later reallocs */
+						memset(files + old_size, 0,
+								sizeof(alpm_file_t) * (files_size - old_size));
+					}
+					STRDUP(files[files_count].name, line, goto error);
+					/* TODO: lstat file, get mode/size */
+					files_count++;
+				}
+				/* attempt to hand back any memory we don't need */
+				files = realloc(files, sizeof(alpm_file_t) * files_count);
+				info->files.count = files_count;
+				info->files.files = files;
+			} else if(strcmp(line, "%BACKUP%") == 0) {
+				while(fgets(line, sizeof(line), fp) && _alpm_strip_newline(line)) {
+					alpm_backup_t *backup;
+					CALLOC(backup, 1, sizeof(alpm_backup_t), goto error);
+					if(_alpm_split_backup(line, &backup)) {
+						goto error;
+					}
+					info->backup = alpm_list_add(info->backup, backup);
+				}
+			}
+		}
+		fclose(fp);
+		fp = NULL;
+		info->infolevel |= INFRQ_FILES;
+	}
+
+	/* INSTALL */
+	if(inforeq & INFRQ_SCRIPTLET && !(info->infolevel & INFRQ_SCRIPTLET)) {
+		char *path = _alpm_local_db_pkgpath(db, info, "install");
+		if(access(path, F_OK) == 0) {
+			info->scriptlet = 1;
+		}
+		free(path);
+		info->infolevel |= INFRQ_SCRIPTLET;
+	}
+
+	return 0;
+
+error:
+	info->infolevel |= INFRQ_ERROR;
+	if(fp) {
+		fclose(fp);
+	}
+	return -1;
+}
+
+int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info)
+{
+	mode_t oldmask;
+	int retval = 0;
+	char *pkgpath;
+
+	if(checkdbdir(db) != 0) {
+		return -1;
+	}
+
+	oldmask = umask(0000);
+	pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
+
+	if((retval = mkdir(pkgpath, 0755)) != 0) {
+		_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not create directory %s: %s\n"),
+				pkgpath, strerror(errno));
+	}
+
+	free(pkgpath);
+	umask(oldmask);
+
+	return retval;
+}
+
+int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
+{
+	FILE *fp = NULL;
+	mode_t oldmask;
+	alpm_list_t *lp;
+	int retval = 0;
+
+	if(db == NULL || info == NULL || !(db->status & DB_STATUS_LOCAL)) {
+		return -1;
+	}
+
+	/* make sure we have a sane umask */
+	oldmask = umask(0022);
+
+	/* DESC */
+	if(inforeq & INFRQ_DESC) {
+		char *path;
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "writing %s-%s DESC information back to db\n",
+				info->name, info->version);
+		path = _alpm_local_db_pkgpath(db, info, "desc");
+		if(!path || (fp = fopen(path, "w")) == NULL) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"),
+					path, strerror(errno));
+			retval = -1;
+			free(path);
+			goto cleanup;
+		}
+		free(path);
+		fprintf(fp, "%%NAME%%\n%s\n\n"
+						"%%VERSION%%\n%s\n\n", info->name, info->version);
+		if(info->desc) {
+			fprintf(fp, "%%DESC%%\n"
+							"%s\n\n", info->desc);
+		}
+		if(info->groups) {
+			fputs("%GROUPS%\n", fp);
+			for(lp = info->groups; lp; lp = lp->next) {
+				fprintf(fp, "%s\n", (char *)lp->data);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->replaces) {
+			fputs("%REPLACES%\n", fp);
+			for(lp = info->replaces; lp; lp = lp->next) {
+				char *depstring = alpm_dep_compute_string(lp->data);
+				fprintf(fp, "%s\n", depstring);
+				free(depstring);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->url) {
+			fprintf(fp, "%%URL%%\n"
+							"%s\n\n", info->url);
+		}
+		if(info->licenses) {
+			fputs("%LICENSE%\n", fp);
+			for(lp = info->licenses; lp; lp = lp->next) {
+				fprintf(fp, "%s\n", (char *)lp->data);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->arch) {
+			fprintf(fp, "%%ARCH%%\n"
+							"%s\n\n", info->arch);
+		}
+		if(info->builddate) {
+			fprintf(fp, "%%BUILDDATE%%\n"
+							"%ld\n\n", info->builddate);
+		}
+		if(info->installdate) {
+			fprintf(fp, "%%INSTALLDATE%%\n"
+							"%ld\n\n", info->installdate);
+		}
+		if(info->packager) {
+			fprintf(fp, "%%PACKAGER%%\n"
+							"%s\n\n", info->packager);
+		}
+		if(info->isize) {
+			/* only write installed size, csize is irrelevant once installed */
+			fprintf(fp, "%%SIZE%%\n"
+							"%jd\n\n", (intmax_t)info->isize);
+		}
+		if(info->reason) {
+			fprintf(fp, "%%REASON%%\n"
+							"%u\n\n", info->reason);
+		}
+		if(info->depends) {
+			fputs("%DEPENDS%\n", fp);
+			for(lp = info->depends; lp; lp = lp->next) {
+				char *depstring = alpm_dep_compute_string(lp->data);
+				fprintf(fp, "%s\n", depstring);
+				free(depstring);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->optdepends) {
+			fputs("%OPTDEPENDS%\n", fp);
+			for(lp = info->optdepends; lp; lp = lp->next) {
+				fprintf(fp, "%s\n", (char *)lp->data);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->conflicts) {
+			fputs("%CONFLICTS%\n", fp);
+			for(lp = info->conflicts; lp; lp = lp->next) {
+				char *depstring = alpm_dep_compute_string(lp->data);
+				fprintf(fp, "%s\n", depstring);
+				free(depstring);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->provides) {
+			fputs("%PROVIDES%\n", fp);
+			for(lp = info->provides; lp; lp = lp->next) {
+				char *depstring = alpm_dep_compute_string(lp->data);
+				fprintf(fp, "%s\n", depstring);
+				free(depstring);
+			}
+			fprintf(fp, "\n");
+		}
+
+		fclose(fp);
+		fp = NULL;
+	}
+
+	/* FILES */
+	if(inforeq & INFRQ_FILES) {
+		char *path;
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "writing %s-%s FILES information back to db\n",
+				info->name, info->version);
+		path = _alpm_local_db_pkgpath(db, info, "files");
+		if(!path || (fp = fopen(path, "w")) == NULL) {
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"),
+					path, strerror(errno));
+			retval = -1;
+			free(path);
+			goto cleanup;
+		}
+		free(path);
+		if(info->files.count) {
+			size_t i;
+			fprintf(fp, "%%FILES%%\n");
+			for(i = 0; i < info->files.count; i++) {
+				const alpm_file_t *file = info->files.files + i;
+				fprintf(fp, "%s\n", file->name);
+			}
+			fprintf(fp, "\n");
+		}
+		if(info->backup) {
+			fprintf(fp, "%%BACKUP%%\n");
+			for(lp = info->backup; lp; lp = lp->next) {
+				const alpm_backup_t *backup = lp->data;
+				fprintf(fp, "%s\t%s\n", backup->name, backup->hash);
+			}
+			fprintf(fp, "\n");
+		}
+		fclose(fp);
+		fp = NULL;
+	}
+
+	/* INSTALL */
+	/* nothing needed here (script is automatically extracted) */
+
+cleanup:
+	umask(oldmask);
+
+	if(fp) {
+		fclose(fp);
+	}
+
+	return retval;
+}
+
+int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info)
+{
+	int ret = 0;
+	char *pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
+
+	/* TODO explicit file removes and then an rmdir? */
+	ret = _alpm_rmrf(pkgpath);
+	free(pkgpath);
+	if(ret != 0) {
+		ret = -1;
+	}
+	return ret;
+}
+
+struct db_operations local_db_ops = {
+	.validate         = local_db_validate,
+	.populate         = local_db_populate,
+	.unregister       = _alpm_db_unregister,
+};
+
+alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle)
+{
+	alpm_db_t *db;
+
+	_alpm_log(handle, ALPM_LOG_DEBUG, "registering local database\n");
+
+	db = _alpm_db_new("local", 1);
+	if(db == NULL) {
+		handle->pm_errno = ALPM_ERR_DB_CREATE;
+		return NULL;
+	}
+	db->ops = &local_db_ops;
+	db->handle = handle;
+
+	if(local_db_validate(db)) {
+		/* pm_errno set in local_db_validate() */
+		_alpm_db_free(db);
+		return NULL;
+	}
+
+	handle->db_local = db;
+	return db;
+}
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/be_package.c

@@ -1,7 +1,7 @@
 /*
- *  be_package.c
+ *  be_package.c : backend for packages
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -20,12 +20,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
+#include <errno.h>
-#include <ctype.h>
-#include <locale.h> /* setlocale */
 
 /* libarchive */
 #include <archive.h>
@@ -33,146 +30,372 @@
 
 /* libalpm */
 #include "alpm_list.h"
+#include "alpm.h"
 #include "util.h"
 #include "log.h"
+#include "handle.h"
 #include "package.h"
 #include "deps.h" /* _alpm_splitdep */
 
 /**
- * Parses the package description file for a package into a pmpkg_t struct.
+ * Open a package changelog for reading. Similar to fopen in functionality,
- * @param archive the archive to read from, pointed at the .PKGINFO entry
+ * except that the returned 'file stream' is from an archive.
- * @param newpkg an empty pmpkg_t struct to fill with package info
+ * @param pkg the package (file) to read the changelog
- *
+ * @return a 'file stream' to the package changelog
- * @return 0 on success, 1 on error
  */
-static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
+static void *_package_changelog_open(alpm_pkg_t *pkg)
 {
-	char line[PATH_MAX];
+	ASSERT(pkg != NULL, return NULL);
-	char *ptr = NULL;
-	char *key = NULL;
-	int linenum = 0;
 
-	ALPM_LOG_FUNC;
+	struct archive *archive = NULL;
-
-	/* 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, "force")) {
-				newpkg->force = 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;
+	const char *pkgfile = pkg->origin_data.file;
-	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);
+		RET_ERR(pkg->handle, ALPM_ERR_LIBARCHIVE, NULL);
 	}
 
 	archive_read_support_compression_all(archive);
 	archive_read_support_format_all(archive);
 
-	if (archive_read_open_filename(archive, pkgfile,
+	if(archive_read_open_filename(archive, pkgfile,
 				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		RET_ERR(PM_ERR_PKG_OPEN, NULL);
+		RET_ERR(pkg->handle, ALPM_ERR_PKG_OPEN, NULL);
 	}
 
-	newpkg = _alpm_pkg_new();
+	while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
-	if(newpkg == NULL) {
+		const char *entry_name = archive_entry_pathname(entry);
-		archive_read_finish(archive);
+
-		RET_ERR(PM_ERR_MEMORY, NULL);
+		if(strcmp(entry_name, ".CHANGELOG") == 0) {
+			return archive;
+		}
+	}
+	/* we didn't find a changelog */
+	archive_read_finish(archive);
+	errno = ENOENT;
+
+	return NULL;
+}
+
+/**
+ * Read data from an open changelog 'file stream'. Similar to fread in
+ * functionality, this function takes a buffer and amount of data to read.
+ * @param ptr a buffer to fill with raw changelog data
+ * @param size the size of the buffer
+ * @param pkg the package that the changelog is being read from
+ * @param fp a 'file stream' to the package changelog
+ * @return the number of characters read, or 0 if there is no more data
+ */
+static size_t _package_changelog_read(void *ptr, size_t size,
+		const alpm_pkg_t UNUSED *pkg, void *fp)
+{
+	ssize_t sret = archive_read_data((struct archive *)fp, ptr, size);
+	/* Report error (negative values) */
+	if(sret < 0) {
+		RET_ERR(pkg->handle, ALPM_ERR_LIBARCHIVE, 0);
+	} else {
+		return (size_t)sret;
+	}
+}
+
+/**
+ * Close a package changelog for reading. Similar to fclose in functionality,
+ * except that the 'file stream' is from an archive.
+ * @param pkg the package (file) that the changelog was read from
+ * @param fp a 'file stream' to the package changelog
+ * @return whether closing the package changelog stream was successful
+ */
+static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp)
+{
+	return archive_read_finish((struct archive *)fp);
+}
+
+/** Package file operations struct accessor. We implement this as a method
+ * rather than a static struct as in be_files because we want to reuse the
+ * majority of the default_pkg_ops struct and add only a few operations of
+ * our own on top.
+ */
+static struct pkg_operations *get_file_pkg_ops(void)
+{
+	static struct pkg_operations file_pkg_ops;
+	static int file_pkg_ops_initialized = 0;
+	if(!file_pkg_ops_initialized) {
+		file_pkg_ops = default_pkg_ops;
+		file_pkg_ops.changelog_open  = _package_changelog_open;
+		file_pkg_ops.changelog_read  = _package_changelog_read;
+		file_pkg_ops.changelog_close = _package_changelog_close;
+		file_pkg_ops_initialized = 1;
+	}
+	return &file_pkg_ops;
+}
+
+/**
+ * Parses the package description file for a package into a alpm_pkg_t struct.
+ * @param archive the archive to read from, pointed at the .PKGINFO entry
+ * @param newpkg an empty alpm_pkg_t struct to fill with package info
+ *
+ * @return 0 on success, -1 on error
+ */
+static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t *newpkg)
+{
+	char *ptr = NULL;
+	char *key = NULL;
+	int ret, linenum = 0;
+	struct archive_read_buffer buf;
+
+	memset(&buf, 0, sizeof(buf));
+	/* 512K for a line length seems reasonable */
+	buf.max_line_size = 512 * 1024;
+
+	/* loop until we reach EOF or other error */
+	while((ret = _alpm_archive_fgets(a, &buf)) == ARCHIVE_OK) {
+		size_t len = _alpm_strip_newline(buf.line);
+
+		linenum++;
+		if(len == 0 || buf.line[0] == '#') {
+			continue;
+		}
+		ptr = buf.line;
+		key = strsep(&ptr, "=");
+		if(key == NULL || ptr == NULL) {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "%s: syntax error in description file line %d\n",
+								newpkg->name ? newpkg->name : "error", linenum);
+		} else {
+			key = _alpm_strtrim(key);
+			while(*ptr == ' ') ptr++;
+			ptr = _alpm_strtrim(ptr);
+			if(strcmp(key, "pkgname") == 0) {
+				STRDUP(newpkg->name, ptr, return -1);
+				newpkg->name_hash = _alpm_hash_sdbm(newpkg->name);
+			} else if(strcmp(key, "pkgbase") == 0) {
+				/* not used atm */
+			} else if(strcmp(key, "pkgver") == 0) {
+				STRDUP(newpkg->version, ptr, return -1);
+			} else if(strcmp(key, "pkgdesc") == 0) {
+				STRDUP(newpkg->desc, ptr, return -1);
+			} else if(strcmp(key, "group") == 0) {
+				newpkg->groups = alpm_list_add(newpkg->groups, strdup(ptr));
+			} else if(strcmp(key, "url") == 0) {
+				STRDUP(newpkg->url, ptr, return -1);
+			} else if(strcmp(key, "license") == 0) {
+				newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr));
+			} else if(strcmp(key, "builddate") == 0) {
+				newpkg->builddate = _alpm_parsedate(ptr);
+			} else if(strcmp(key, "packager") == 0) {
+				STRDUP(newpkg->packager, ptr, return -1);
+			} else if(strcmp(key, "arch") == 0) {
+				STRDUP(newpkg->arch, ptr, return -1);
+			} else if(strcmp(key, "size") == 0) {
+				/* size in the raw package is uncompressed (installed) size */
+				newpkg->isize = _alpm_strtoofft(ptr);
+			} else if(strcmp(key, "depend") == 0) {
+				alpm_depend_t *dep = _alpm_splitdep(ptr);
+				newpkg->depends = alpm_list_add(newpkg->depends, dep);
+			} else if(strcmp(key, "optdepend") == 0) {
+				newpkg->optdepends = alpm_list_add(newpkg->optdepends, strdup(ptr));
+			} else if(strcmp(key, "conflict") == 0) {
+				alpm_depend_t *conflict = _alpm_splitdep(ptr);
+				newpkg->conflicts = alpm_list_add(newpkg->conflicts, conflict);
+			} else if(strcmp(key, "replaces") == 0) {
+				alpm_depend_t *replace = _alpm_splitdep(ptr);
+				newpkg->replaces = alpm_list_add(newpkg->replaces, replace);
+			} else if(strcmp(key, "provides") == 0) {
+				alpm_depend_t *provide = _alpm_splitdep(ptr);
+				newpkg->provides = alpm_list_add(newpkg->provides, provide);
+			} else if(strcmp(key, "backup") == 0) {
+				alpm_backup_t *backup;
+				CALLOC(backup, 1, sizeof(alpm_backup_t), return -1);
+				STRDUP(backup->name, ptr, return -1);
+				newpkg->backup = alpm_list_add(newpkg->backup, backup);
+			} else if(strcmp(key, "force") == 0) {
+				/* deprecated, skip it */
+			} else if(strcmp(key, "makepkgopt") == 0) {
+				/* not used atm */
+			} else {
+				_alpm_log(handle, ALPM_LOG_DEBUG, "%s: unknown key '%s' in description file line %d\n",
+									newpkg->name ? newpkg->name : "error", key, linenum);
+			}
+		}
+	}
+	if(ret != ARCHIVE_EOF) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "error parsing package descfile\n");
+		return -1;
 	}
 
-	newpkg->filename = strdup(pkgfile);
+	return 0;
-	newpkg->size = st.st_size;
+}
+
+static void files_merge(alpm_file_t a[], alpm_file_t b[], alpm_file_t c[],
+		size_t m, size_t n)
+{
+	size_t i = 0, j = 0, k = 0;
+	while(i < m && j < n) {
+		if(strcmp(a[i].name, b[j].name) < 0) {
+			c[k++] = a[i++];
+		} else {
+			c[k++] = b[j++];
+		}
+	}
+	while(i < m) {
+		c[k++] = a[i++];
+	}
+	while(j < n) {
+		c[k++] = b[j++];
+	}
+}
+
+static alpm_file_t *files_msort(alpm_file_t *files, size_t n)
+{
+	alpm_file_t *work;
+	size_t blocksize = 1;
+
+	CALLOC(work, n, sizeof(alpm_file_t), return NULL);
+
+	for(blocksize = 1; blocksize < n; blocksize *= 2) {
+		size_t i, max_extent = 0;
+		for(i = 0; i < n - blocksize; i += 2 * blocksize) {
+			/* this limits our actual merge to the length of the array, since we will
+			 * not likely be a perfect power of two. */
+			size_t right_blocksize = blocksize;
+			if(i + blocksize * 2 > n) {
+				right_blocksize = n - i - blocksize;
+			}
+			files_merge(files + i, files + i + blocksize, work + i,
+					blocksize, right_blocksize);
+			max_extent = i + blocksize + right_blocksize;
+		}
+		/* ensure we only copy what we actually touched on this merge pass,
+		 * no more, no less */
+		memcpy(files, work, max_extent * sizeof(alpm_file_t));
+	}
+	free(work);
+	return files;
+}
+
+/**
+ * Validate a package.
+ * @param handle the context handle
+ * @param pkgfile path to the package file
+ * @param syncpkg package object to load verification data from (md5sum,
+ * sha256sum, and/or base64 signature)
+ * @param level the required level of signature verification
+ * @param sigdata signature data from the package to pass back
+ * @return 0 if package is fully valid, -1 and pm_errno otherwise
+ */
+int _alpm_pkg_validate_internal(alpm_handle_t *handle,
+		const char *pkgfile, alpm_pkg_t *syncpkg, alpm_siglevel_t level,
+		alpm_siglist_t **sigdata)
+{
+	int has_sig;
+	handle->pm_errno = 0;
+
+	if(pkgfile == NULL || strlen(pkgfile) == 0) {
+		RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1);
+	}
+
+	/* attempt to access the package file, ensure it exists */
+	if(access(pkgfile, R_OK) != 0) {
+		RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, -1);
+	}
+
+	/* can we get away with skipping checksums? */
+	has_sig = 0;
+	if(level & ALPM_SIG_PACKAGE) {
+		if(syncpkg && syncpkg->base64_sig) {
+			has_sig = 1;
+		} else {
+			char *sigpath = _alpm_sigpath(handle, pkgfile);
+			if(sigpath && !_alpm_access(handle, NULL, sigpath, R_OK)) {
+				has_sig = 1;
+			}
+			free(sigpath);
+		}
+	}
+
+	if(syncpkg && !has_sig) {
+		if(syncpkg->md5sum && !syncpkg->sha256sum) {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "md5sum: %s\n", syncpkg->md5sum);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "checking md5sum for %s\n", pkgfile);
+			if(_alpm_test_checksum(pkgfile, syncpkg->md5sum, ALPM_CSUM_MD5) != 0) {
+				RET_ERR(handle, ALPM_ERR_PKG_INVALID_CHECKSUM, -1);
+			}
+		}
+
+		if(syncpkg->sha256sum) {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "sha256sum: %s\n", syncpkg->sha256sum);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "checking sha256sum for %s\n", pkgfile);
+			if(_alpm_test_checksum(pkgfile, syncpkg->sha256sum, ALPM_CSUM_SHA256) != 0) {
+				RET_ERR(handle, ALPM_ERR_PKG_INVALID_CHECKSUM, -1);
+			}
+		}
+	}
+
+	/* even if we don't have a sig, run the check code if level tells us to */
+	if(has_sig || level & ALPM_SIG_PACKAGE) {
+		const char *sig = syncpkg ? syncpkg->base64_sig : NULL;
+		_alpm_log(handle, ALPM_LOG_DEBUG, "sig data: %s\n", sig ? sig : "<from .sig>");
+		if(_alpm_check_pgp_helper(handle, pkgfile, sig,
+					level & ALPM_SIG_PACKAGE_OPTIONAL, level & ALPM_SIG_PACKAGE_MARGINAL_OK,
+					level & ALPM_SIG_PACKAGE_UNKNOWN_OK, sigdata)) {
+			handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG;
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * Load a package and create the corresponding alpm_pkg_t struct.
+ * @param handle the context handle
+ * @param pkgfile path to the package file
+ * @param full whether to stop the load after metadata is read or continue
+ * through the full archive
+ */
+alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
+		const char *pkgfile, int full)
+{
+	int ret, config = 0;
+	struct archive *archive;
+	struct archive_entry *entry;
+	alpm_pkg_t *newpkg = NULL;
+	struct stat st;
+	size_t files_count = 0, files_size = 0;
+	alpm_file_t *files = NULL;
+
+	if(pkgfile == NULL || strlen(pkgfile) == 0) {
+		RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL);
+	}
+
+	/* attempt to stat the package file, ensure it exists */
+	if(stat(pkgfile, &st) == 0) {
+		newpkg = _alpm_pkg_new();
+		if(newpkg == NULL) {
+			RET_ERR(handle, ALPM_ERR_MEMORY, NULL);
+		}
+		newpkg->filename = strdup(pkgfile);
+		newpkg->size = st.st_size;
+	} else {
+		/* couldn't stat the pkgfile, return an error */
+		RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, NULL);
+	}
+
+	/* try to create an archive object to read in the package */
+	if((archive = archive_read_new()) == NULL) {
+		alpm_pkg_free(newpkg);
+		RET_ERR(handle, ALPM_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) {
+		alpm_pkg_free(newpkg);
+		RET_ERR(handle, ALPM_ERR_PKG_OPEN, NULL);
+	}
+
+	_alpm_log(handle, ALPM_LOG_DEBUG, "starting package load for %s\n", pkgfile);
 
 	/* 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
@@ -182,17 +405,17 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
 
 		if(strcmp(entry_name, ".PKGINFO") == 0) {
 			/* parse the info file */
-			if(parse_descfile(archive, newpkg) != 0) {
+			if(parse_descfile(handle, archive, newpkg) != 0) {
-				_alpm_log(PM_LOG_ERROR, _("could not parse package description file in %s\n"),
+				_alpm_log(handle, ALPM_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);
+				_alpm_log(handle, ALPM_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);
+				_alpm_log(handle, ALPM_LOG_ERROR, _("missing package version in %s\n"), pkgfile);
 				goto pkg_invalid;
 			}
 			config = 1;
@@ -202,15 +425,35 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
 		} else if(*entry_name == '.') {
 			/* for now, ignore all files starting with '.' that haven't
 			 * already been handled (for future possibilities) */
-		} else {
+		} else if(full) {
 			/* Keep track of all files for filelist generation */
-			newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name));
+			if(files_count >= files_size) {
+				size_t old_size = files_size;
+				if(files_size == 0) {
+					files_size = 4;
+				} else {
+					files_size *= 2;
+				}
+				files = realloc(files, sizeof(alpm_file_t) * files_size);
+				if(!files) {
+					ALLOC_FAIL(sizeof(alpm_file_t) * files_size);
+					goto error;
+				}
+				/* ensure all new memory is zeroed out, in both the initial
+				 * allocation and later reallocs */
+				memset(files + old_size, 0,
+						sizeof(alpm_file_t) * (files_size - old_size));
+			}
+			STRDUP(files[files_count].name, entry_name, goto error);
+			files[files_count].size = archive_entry_size(entry);
+			files[files_count].mode = archive_entry_mode(entry);
+			files_count++;
 		}
 
 		if(archive_read_data_skip(archive)) {
-			_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
+			_alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"),
 					pkgfile, archive_error_string(archive));
-			pm_errno = PM_ERR_LIBARCHIVE;
+			handle->pm_errno = ALPM_ERR_LIBARCHIVE;
 			goto error;
 		}
 
@@ -221,72 +464,65 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
 	}
 
 	if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occured */
-		_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
+		_alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"),
 				pkgfile, archive_error_string(archive));
-		pm_errno = PM_ERR_LIBARCHIVE;
+		handle->pm_errno = ALPM_ERR_LIBARCHIVE;
 		goto error;
 	}
 
 	if(!config) {
-		_alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile);
+		_alpm_log(handle, ALPM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile);
 		goto pkg_invalid;
 	}
 
-  archive_read_finish(archive);
+	archive_read_finish(archive);
 
 	/* internal fields for package struct */
 	newpkg->origin = PKG_FROM_FILE;
 	newpkg->origin_data.file = strdup(pkgfile);
+	newpkg->ops = get_file_pkg_ops();
+	newpkg->handle = handle;
 
 	if(full) {
+		/* attempt to hand back any memory we don't need */
+		files = realloc(files, sizeof(alpm_file_t) * files_count);
 		/* "checking for conflicts" requires a sorted list, ensure that here */
-		_alpm_log(PM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile);
-		newpkg->files = alpm_list_msort(newpkg->files, alpm_list_count(newpkg->files),
+		newpkg->files.files = files_msort(files, files_count);
-				_alpm_str_cmp);
+		newpkg->files.count = files_count;
-		newpkg->infolevel = INFRQ_ALL;
+		newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES | INFRQ_SCRIPTLET;
 	} else {
-		/* get rid of any partial filelist we may have collected, it is invalid */
+		newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET;
-		FREELIST(newpkg->files);
-		newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_DEPENDS;
 	}
 
-	return(newpkg);
+	return newpkg;
 
 pkg_invalid:
-	pm_errno = PM_ERR_PKG_INVALID;
+	handle->pm_errno = ALPM_ERR_PKG_INVALID;
 error:
 	_alpm_pkg_free(newpkg);
 	archive_read_finish(archive);
 
-	return(NULL);
+	return NULL;
 }
 
-/** Create a package from a file.
+int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int full,
- * If full is false, the archive is read only until all necessary
+		alpm_siglevel_t level, alpm_pkg_t **pkg)
- * 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;
+	CHECK_HANDLE(handle, return -1);
+	ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
 
-	/* Sanity checks */
+	if(_alpm_pkg_validate_internal(handle, filename, NULL, level, NULL) == -1) {
-	ASSERT(filename != NULL && strlen(filename) != 0,
+		/* pm_errno is set by pkg_validate */
-			RET_ERR(PM_ERR_WRONG_ARGS, -1));
+		return -1;
-	ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	}
-
+	*pkg = _alpm_pkg_load_internal(handle, filename, full);
-	*pkg = pkg_load(filename, full);
 	if(*pkg == NULL) {
 		/* pm_errno is set by pkg_load */
-		return(-1);
+		return -1;
 	}
 
-	return(0);
+	return 0;
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/be_sync.c

@@ -0,0 +1,663 @@
+/*
+ *  be_sync.c : backend for sync databases
+ *
+ *  Copyright (c) 2006-2011 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 <errno.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/* libarchive */
+#include <archive.h>
+#include <archive_entry.h>
+
+/* libalpm */
+#include "util.h"
+#include "log.h"
+#include "alpm.h"
+#include "alpm_list.h"
+#include "package.h"
+#include "handle.h"
+#include "delta.h"
+#include "deps.h"
+#include "dload.h"
+
+static char *get_sync_dir(alpm_handle_t *handle)
+{
+	size_t len = strlen(handle->dbpath) + 6;
+	char *syncpath;
+	struct stat buf;
+
+	MALLOC(syncpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+	sprintf(syncpath, "%s%s", handle->dbpath, "sync/");
+
+	if(stat(syncpath, &buf) != 0) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
+				syncpath);
+		if(_alpm_makepath(syncpath) != 0) {
+			free(syncpath);
+			RET_ERR(handle, ALPM_ERR_SYSTEM, NULL);
+		}
+	} else if(!S_ISDIR(buf.st_mode)) {
+		_alpm_log(handle, ALPM_LOG_WARNING, _("removing invalid file: %s\n"), syncpath);
+		if(unlink(syncpath) != 0 || _alpm_makepath(syncpath) != 0) {
+			free(syncpath);
+			RET_ERR(handle, ALPM_ERR_SYSTEM, NULL);
+		}
+	}
+
+	return syncpath;
+}
+
+static int sync_db_validate(alpm_db_t *db)
+{
+	alpm_siglevel_t level;
+	const char *dbpath;
+
+	if(db->status & DB_STATUS_VALID || db->status & DB_STATUS_MISSING) {
+		return 0;
+	}
+	if(db->status & DB_STATUS_INVALID) {
+		db->handle->pm_errno = ALPM_ERR_DB_INVALID_SIG;
+		return -1;
+	}
+
+	dbpath = _alpm_db_path(db);
+	if(!dbpath) {
+		/* pm_errno set in _alpm_db_path() */
+		return -1;
+	}
+
+	/* we can skip any validation if the database doesn't exist */
+	if(access(dbpath, R_OK) != 0 && errno == ENOENT) {
+		db->status &= ~DB_STATUS_EXISTS;
+		db->status |= DB_STATUS_MISSING;
+		_alpm_log(db->handle, ALPM_LOG_WARNING,
+				"database file for '%s' does not exist\n", db->treename);
+		goto valid;
+	}
+	db->status |= DB_STATUS_EXISTS;
+	db->status &= ~DB_STATUS_MISSING;
+
+	/* this takes into account the default verification level if UNKNOWN
+	 * was assigned to this db */
+	level = alpm_db_get_siglevel(db);
+
+	if(level & ALPM_SIG_DATABASE) {
+		int retry, ret;
+		do {
+			retry = 0;
+			alpm_siglist_t *siglist;
+			ret = _alpm_check_pgp_helper(db->handle, dbpath, NULL,
+					level & ALPM_SIG_DATABASE_OPTIONAL, level & ALPM_SIG_DATABASE_MARGINAL_OK,
+					level & ALPM_SIG_DATABASE_UNKNOWN_OK, &siglist);
+			if(ret) {
+				retry = _alpm_process_siglist(db->handle, db->treename, siglist,
+						level & ALPM_SIG_DATABASE_OPTIONAL, level & ALPM_SIG_DATABASE_MARGINAL_OK,
+						level & ALPM_SIG_DATABASE_UNKNOWN_OK);
+			}
+			alpm_siglist_cleanup(siglist);
+			free(siglist);
+		} while(retry);
+
+		if(ret) {
+			db->status &= ~DB_STATUS_VALID;
+			db->status |= DB_STATUS_INVALID;
+			db->handle->pm_errno = ALPM_ERR_DB_INVALID_SIG;
+			return 1;
+		}
+	}
+
+valid:
+	db->status |= DB_STATUS_VALID;
+	db->status &= ~DB_STATUS_INVALID;
+	return 0;
+}
+
+/** Update a package database
+ *
+ * An update of the package database \a db will be attempted. Unless
+ * \a force is true, the update will only be performed if the remote
+ * database was modified since the last update.
+ *
+ * This operation requires a database lock, and will return an applicable error
+ * if the lock could not be obtained.
+ *
+ * Example:
+ * @code
+ * alpm_list_t *syncs = alpm_option_get_syncdbs();
+ * for(i = syncs; i; i = alpm_list_next(i)) {
+ *     alpm_db_t *db = alpm_list_getdata(i);
+ *     result = alpm_db_update(0, db);
+ *
+ *     if(result < 0) {
+ *	       printf("Unable to update database: %s\n", alpm_strerrorlast());
+ *     } else if(result == 1) {
+ *         printf("Database already up to date\n");
+ *     } else {
+ *         printf("Database updated\n");
+ *     }
+ * }
+ * @endcode
+ *
+ * @ingroup alpm_databases
+ * @note After a successful update, the \link alpm_db_get_pkgcache()
+ * package cache \endlink will be invalidated
+ * @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, -1 on error (pm_errno is set accordingly), 1 if up to
+ * to date
+ */
+int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
+{
+	char *syncpath;
+	alpm_list_t *i;
+	int ret = -1;
+	mode_t oldmask;
+	alpm_handle_t *handle;
+	alpm_siglevel_t level;
+
+	/* Sanity checks */
+	ASSERT(db != NULL, return -1);
+	handle = db->handle;
+	handle->pm_errno = 0;
+	ASSERT(db != handle->db_local, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
+	ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1));
+
+	syncpath = get_sync_dir(handle);
+	if(!syncpath) {
+		return -1;
+	}
+
+	/* make sure we have a sane umask */
+	oldmask = umask(0022);
+
+	level = alpm_db_get_siglevel(db);
+
+	/* attempt to grab a lock */
+	if(_alpm_handle_lock(handle)) {
+		free(syncpath);
+		umask(oldmask);
+		RET_ERR(handle, ALPM_ERR_HANDLE_LOCK, -1);
+	}
+
+	for(i = db->servers; i; i = i->next) {
+		const char *server = i->data;
+		struct dload_payload payload;
+		size_t len;
+		int sig_ret = 0;
+
+		memset(&payload, 0, sizeof(struct dload_payload));
+
+		/* set hard upper limit of 25MiB */
+		payload.max_size = 25 * 1024 * 1024;
+
+		/* print server + filename into a buffer */
+		len = strlen(server) + strlen(db->treename) + 5;
+		MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+		snprintf(payload.fileurl, len, "%s/%s.db", server, db->treename);
+		payload.handle = handle;
+		payload.force = force;
+		payload.unlink_on_fail = 1;
+
+		ret = _alpm_download(&payload, syncpath, NULL);
+		_alpm_dload_payload_reset(&payload);
+
+		if(ret == 0 && (level & ALPM_SIG_DATABASE)) {
+			/* an existing sig file is no good at this point */
+			char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db));
+			if(!sigpath) {
+				ret = -1;
+				break;
+			}
+			unlink(sigpath);
+			free(sigpath);
+
+			/* if we downloaded a DB, we want the .sig from the same server */
+			/* print server + filename into a buffer (leave space for .sig) */
+			len = strlen(server) + strlen(db->treename) + 9;
+			MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+			snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename);
+			payload.handle = handle;
+			payload.force = 1;
+			payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL);
+
+			/* set hard upper limit of 16KiB */
+			payload.max_size = 16 * 1024;
+
+			sig_ret = _alpm_download(&payload, syncpath, NULL);
+			/* errors_ok suppresses error messages, but not the return code */
+			sig_ret = payload.errors_ok ? 0 : sig_ret;
+			_alpm_dload_payload_reset(&payload);
+		}
+
+		if(ret != -1 && sig_ret != -1) {
+			break;
+		}
+	}
+
+	if(ret == 1) {
+		/* files match, do nothing */
+		handle->pm_errno = 0;
+		goto cleanup;
+	} else if(ret == -1) {
+		/* pm_errno was set by the download code */
+		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
+				alpm_strerror(handle->pm_errno));
+		goto cleanup;
+	}
+
+	/* Cache needs to be rebuilt */
+	_alpm_db_free_pkgcache(db);
+
+	/* clear all status flags regarding validity/existence */
+	db->status &= ~DB_STATUS_VALID;
+	db->status &= ~DB_STATUS_INVALID;
+	db->status &= ~DB_STATUS_EXISTS;
+	db->status &= ~DB_STATUS_MISSING;
+
+	if(sync_db_validate(db)) {
+		/* pm_errno should be set */
+		ret = -1;
+	}
+
+cleanup:
+
+	if(_alpm_handle_unlock(handle)) {
+		_alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"),
+				handle->lockfile);
+	}
+	free(syncpath);
+	umask(oldmask);
+	return ret;
+}
+
+/* Forward decl so I don't reorganize the whole file right now */
+static int sync_db_read(alpm_db_t *db, struct archive *archive,
+		struct archive_entry *entry, alpm_pkg_t **likely_pkg);
+
+static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname,
+		const char **entry_filename, alpm_pkg_t *likely_pkg)
+{
+	char *pkgname = NULL, *pkgver = NULL;
+	unsigned long pkgname_hash;
+	alpm_pkg_t *pkg;
+
+	/* get package and db file names */
+	if(entry_filename) {
+		char *fname = strrchr(entryname, '/');
+		if(fname) {
+			*entry_filename = fname + 1;
+		} else {
+			*entry_filename = NULL;
+		}
+	}
+	if(_alpm_splitname(entryname, &pkgname, &pkgver, &pkgname_hash) != 0) {
+		_alpm_log(db->handle, ALPM_LOG_ERROR,
+				_("invalid name for database entry '%s'\n"), entryname);
+		return NULL;
+	}
+
+	if(likely_pkg && strcmp(likely_pkg->name, pkgname) == 0) {
+		pkg = likely_pkg;
+	} else {
+		pkg = _alpm_pkghash_find(db->pkgcache, pkgname);
+	}
+	if(pkg == NULL) {
+		pkg = _alpm_pkg_new();
+		if(pkg == NULL) {
+			RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL);
+		}
+
+		pkg->name = pkgname;
+		pkg->version = pkgver;
+		pkg->name_hash = pkgname_hash;
+
+		pkg->origin = PKG_FROM_SYNCDB;
+		pkg->origin_data.db = db;
+		pkg->ops = &default_pkg_ops;
+		pkg->handle = db->handle;
+
+		/* add to the collection */
+		_alpm_log(db->handle, ALPM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
+				pkg->name, db->treename);
+		db->pkgcache = _alpm_pkghash_add(db->pkgcache, pkg);
+	} else {
+		free(pkgname);
+		free(pkgver);
+	}
+
+	return pkg;
+}
+
+/*
+ * This is the data table used to generate the estimating function below.
+ * "Weighted Avg" means averaging the bottom table values; thus each repo, big
+ * or small, will have equal influence.  "Unweighted Avg" means averaging the
+ * sums of the top table columns, thus each package has equal influence.  The
+ * final values are calculated by (surprise) averaging the averages, because
+ * why the hell not.
+ *
+ * Database   Pkgs  tar      bz2     gz      xz
+ * community  2096  5294080  256391  421227  301296
+ * core        180   460800   25257   36850   29356
+ * extra      2606  6635520  294647  470818  339392
+ * multilib    126   327680   16120   23261   18732
+ * testing      76   204800   10902   14348   12100
+ *
+ * Bytes Per Package
+ * community  2096  2525.80  122.32  200.97  143.75
+ * core        180  2560.00  140.32  204.72  163.09
+ * extra      2606  2546.25  113.06  180.67  130.23
+ * multilib    126  2600.63  127.94  184.61  148.67
+ * testing      76  2694.74  143.45  188.79  159.21
+
+ * Weighted Avg     2585.48  129.42  191.95  148.99
+ * Unweighted Avg   2543.39  118.74  190.16  137.93
+ * Average of Avgs  2564.44  124.08  191.06  143.46
+ */
+static size_t estimate_package_count(struct stat *st, struct archive *archive)
+{
+	unsigned int per_package;
+
+	switch(archive_compression(archive)) {
+		case ARCHIVE_COMPRESSION_NONE:
+			per_package = 2564;
+			break;
+		case ARCHIVE_COMPRESSION_GZIP:
+			per_package = 191;
+			break;
+		case ARCHIVE_COMPRESSION_BZIP2:
+			per_package = 124;
+			break;
+		case ARCHIVE_COMPRESSION_COMPRESS:
+			per_package = 193;
+			break;
+		case ARCHIVE_COMPRESSION_LZMA:
+		case ARCHIVE_COMPRESSION_XZ:
+			per_package = 143;
+			break;
+#ifdef ARCHIVE_COMPRESSION_UU
+		case ARCHIVE_COMPRESSION_UU:
+			per_package = 3543;
+			break;
+#endif
+		default:
+			/* assume it is at least somewhat compressed */
+			per_package = 200;
+	}
+	return (size_t)((st->st_size / per_package) + 1);
+}
+
+static int sync_db_populate(alpm_db_t *db)
+{
+	const char *dbpath;
+	size_t est_count;
+	int count = 0;
+	struct stat buf;
+	struct archive *archive;
+	struct archive_entry *entry;
+	alpm_pkg_t *pkg = NULL;
+
+	if(db->status & DB_STATUS_INVALID) {
+		RET_ERR(db->handle, ALPM_ERR_DB_INVALID, -1);
+	}
+	if(db->status & DB_STATUS_MISSING) {
+		RET_ERR(db->handle, ALPM_ERR_DB_NOT_FOUND, -1);
+	}
+
+	if((archive = archive_read_new()) == NULL) {
+		RET_ERR(db->handle, ALPM_ERR_LIBARCHIVE, -1);
+	}
+
+	archive_read_support_compression_all(archive);
+	archive_read_support_format_all(archive);
+
+	dbpath = _alpm_db_path(db);
+	if(!dbpath) {
+		/* pm_errno set in _alpm_db_path() */
+		return -1;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "opening database archive %s\n", dbpath);
+
+	if(archive_read_open_filename(archive, dbpath,
+				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+		_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
+				archive_error_string(archive));
+		archive_read_finish(archive);
+		RET_ERR(db->handle, ALPM_ERR_DB_OPEN, -1);
+	}
+	if(stat(dbpath, &buf) != 0) {
+		RET_ERR(db->handle, ALPM_ERR_DB_OPEN, -1);
+	}
+	est_count = estimate_package_count(&buf, archive);
+
+	/* initialize hash at 66% full */
+	db->pkgcache = _alpm_pkghash_create(est_count * 3 / 2);
+	if(db->pkgcache == NULL) {
+		RET_ERR(db->handle, ALPM_ERR_MEMORY, -1);
+	}
+
+	while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
+		mode_t mode = archive_entry_mode(entry);
+		if(S_ISDIR(mode)) {
+			continue;
+		} else {
+			/* we have desc, depends or deltas - parse it */
+			if(sync_db_read(db, archive, entry, &pkg) != 0) {
+				_alpm_log(db->handle, ALPM_LOG_ERROR,
+						_("could not parse package description file '%s' from db '%s'\n"),
+						archive_entry_pathname(entry), db->treename);
+				continue;
+			}
+		}
+	}
+
+	count = alpm_list_count(db->pkgcache->list);
+
+	if(count > 0) {
+		db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp);
+	}
+	archive_read_finish(archive);
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n",
+			count, db->treename);
+
+	return count;
+}
+
+#define READ_NEXT() do { \
+	if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) goto error; \
+	line = buf.line; \
+	_alpm_strip_newline(line); \
+} while(0)
+
+#define READ_AND_STORE(f) do { \
+	READ_NEXT(); \
+	STRDUP(f, line, goto error); \
+} while(0)
+
+#define READ_AND_STORE_ALL(f) do { \
+	char *linedup; \
+	if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) goto error; \
+	if(_alpm_strip_newline(buf.line) == 0) break; \
+	STRDUP(linedup, buf.line, goto error); \
+	f = alpm_list_add(f, linedup); \
+} while(1) /* note the while(1) and not (0) */
+
+#define READ_AND_SPLITDEP(f) do { \
+	if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) goto error; \
+	if(_alpm_strip_newline(buf.line) == 0) break; \
+	f = alpm_list_add(f, _alpm_splitdep(line)); \
+} while(1) /* note the while(1) and not (0) */
+
+static int sync_db_read(alpm_db_t *db, struct archive *archive,
+		struct archive_entry *entry, alpm_pkg_t **likely_pkg)
+{
+	const char *entryname, *filename;
+	alpm_pkg_t *pkg;
+	struct archive_read_buffer buf;
+
+	entryname = archive_entry_pathname(entry);
+	if(entryname == NULL) {
+		_alpm_log(db->handle, ALPM_LOG_DEBUG,
+				"invalid archive entry provided to _alpm_sync_db_read, skipping\n");
+		return -1;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data from archive entry %s\n",
+			entryname);
+
+	memset(&buf, 0, sizeof(buf));
+	/* 512K for a line length seems reasonable */
+	buf.max_line_size = 512 * 1024;
+
+	pkg = load_pkg_for_entry(db, entryname, &filename, *likely_pkg);
+
+	if(pkg == NULL) {
+		_alpm_log(db->handle, ALPM_LOG_DEBUG,
+				"entry %s could not be loaded into %s sync database",
+				entryname, db->treename);
+		return -1;
+	}
+
+	if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0
+			|| strcmp(filename, "deltas") == 0) {
+		int ret;
+		while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) {
+			char *line = buf.line;
+			if(_alpm_strip_newline(line) == 0) {
+				/* length of stripped line was zero */
+				continue;
+			}
+
+			if(strcmp(line, "%NAME%") == 0) {
+				READ_NEXT();
+				if(strcmp(line, pkg->name) != 0) {
+					_alpm_log(db->handle, ALPM_LOG_ERROR, _("%s database is inconsistent: name "
+								"mismatch on package %s\n"), db->treename, pkg->name);
+				}
+			} else if(strcmp(line, "%VERSION%") == 0) {
+				READ_NEXT();
+				if(strcmp(line, pkg->version) != 0) {
+					_alpm_log(db->handle, ALPM_LOG_ERROR, _("%s database is inconsistent: version "
+								"mismatch on package %s\n"), db->treename, pkg->name);
+				}
+			} else if(strcmp(line, "%FILENAME%") == 0) {
+				READ_AND_STORE(pkg->filename);
+			} else if(strcmp(line, "%DESC%") == 0) {
+				READ_AND_STORE(pkg->desc);
+			} else if(strcmp(line, "%GROUPS%") == 0) {
+				READ_AND_STORE_ALL(pkg->groups);
+			} else if(strcmp(line, "%URL%") == 0) {
+				READ_AND_STORE(pkg->url);
+			} else if(strcmp(line, "%LICENSE%") == 0) {
+				READ_AND_STORE_ALL(pkg->licenses);
+			} else if(strcmp(line, "%ARCH%") == 0) {
+				READ_AND_STORE(pkg->arch);
+			} else if(strcmp(line, "%BUILDDATE%") == 0) {
+				READ_NEXT();
+				pkg->builddate = _alpm_parsedate(line);
+			} else if(strcmp(line, "%PACKAGER%") == 0) {
+				READ_AND_STORE(pkg->packager);
+			} else if(strcmp(line, "%CSIZE%") == 0) {
+				READ_NEXT();
+				pkg->size = _alpm_strtoofft(line);
+			} else if(strcmp(line, "%ISIZE%") == 0) {
+				READ_NEXT();
+				pkg->isize = _alpm_strtoofft(line);
+			} else if(strcmp(line, "%MD5SUM%") == 0) {
+				READ_AND_STORE(pkg->md5sum);
+			} else if(strcmp(line, "%SHA256SUM%") == 0) {
+				READ_AND_STORE(pkg->sha256sum);
+			} else if(strcmp(line, "%PGPSIG%") == 0) {
+				READ_AND_STORE(pkg->base64_sig);
+			} else if(strcmp(line, "%REPLACES%") == 0) {
+				READ_AND_SPLITDEP(pkg->replaces);
+			} else if(strcmp(line, "%DEPENDS%") == 0) {
+				READ_AND_SPLITDEP(pkg->depends);
+			} else if(strcmp(line, "%OPTDEPENDS%") == 0) {
+				READ_AND_STORE_ALL(pkg->optdepends);
+			} else if(strcmp(line, "%CONFLICTS%") == 0) {
+				READ_AND_SPLITDEP(pkg->conflicts);
+			} else if(strcmp(line, "%PROVIDES%") == 0) {
+				READ_AND_SPLITDEP(pkg->provides);
+			} else if(strcmp(line, "%DELTAS%") == 0) {
+				/* Different than the rest because of the _alpm_delta_parse call. */
+				while(1) {
+					READ_NEXT();
+					if(strlen(line) == 0) break;
+					pkg->deltas = alpm_list_add(pkg->deltas, _alpm_delta_parse(line));
+				}
+			}
+		}
+		if(ret != ARCHIVE_EOF) {
+			goto error;
+		}
+		*likely_pkg = pkg;
+	} else if(strcmp(filename, "files") == 0) {
+		/* currently do nothing with this file */
+	} else {
+		/* unknown database file */
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "unknown database file: %s\n", filename);
+	}
+
+	return 0;
+
+error:
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "error parsing database file: %s\n", filename);
+	return -1;
+}
+
+struct db_operations sync_db_ops = {
+	.validate         = sync_db_validate,
+	.populate         = sync_db_populate,
+	.unregister       = _alpm_db_unregister,
+};
+
+alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
+		alpm_siglevel_t level)
+{
+	alpm_db_t *db;
+
+	_alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename);
+
+#ifndef HAVE_LIBGPGME
+	if(level != 0 && level != ALPM_SIG_USE_DEFAULT) {
+		RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL);
+	}
+#endif
+
+	db = _alpm_db_new(treename, 0);
+	if(db == NULL) {
+		RET_ERR(handle, ALPM_ERR_DB_CREATE, NULL);
+	}
+	db->ops = &sync_db_ops;
+	db->handle = handle;
+	db->siglevel = level;
+
+	sync_db_validate(db);
+
+	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
+	return db;
+}
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/cache.c

@@ -1,291 +0,0 @@
-/*
- *  cache.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 <errno.h>
-#include <string.h>
-
-/* libalpm */
-#include "cache.h"
-#include "alpm_list.h"
-#include "log.h"
-#include "alpm.h"
-#include "util.h"
-#include "package.h"
-#include "group.h"
-#include "db.h"
-
-/* Returns a new package cache from db.
- * It frees the cache if it already exists.
- */
-int _alpm_db_load_pkgcache(pmdb_t *db)
-{
-	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);
-	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_loaded = 1;
-	return(0);
-}
-
-void _alpm_db_free_pkgcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->pkgcache_loaded) {
-		return;
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'\n",
-	                        db->treename);
-
-	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;
-
-	_alpm_db_free_grpcache(db);
-}
-
-alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(NULL);
-	}
-
-	if(!db->pkgcache_loaded) {
-		_alpm_db_load_pkgcache(db);
-	}
-
-	/* hmmm, still NULL ?*/
-	if(!db->pkgcache) {
-		_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 || !db->pkgcache_loaded || pkg == NULL) {
-		return(-1);
-	}
-
-	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);
-
-	_alpm_db_free_grpcache(db);
-
-	return(0);
-}
-
-int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
-{
-	void *vdata;
-	pmpkg_t *data;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
-		return(-1);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n",
-						alpm_pkg_get_name(pkg), db->treename);
-
-	db->pkgcache = alpm_list_remove(db->pkgcache, pkg, _alpm_pkg_cmp, &vdata);
-	data = vdata;
-	if(data == NULL) {
-		/* package not found */
-		_alpm_log(PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n",
-							alpm_pkg_get_name(pkg), db->treename);
-		return(-1);
-	}
-
-	_alpm_pkg_free(data);
-
-	_alpm_db_free_grpcache(db);
-
-	return(0);
-}
-
-pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(NULL);
-	}
-
-	alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db);
-	if(!pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n",
-				target);
-		return(NULL);
-	}
-
-	return(_alpm_pkg_find(pkgcache, target));
-}
-
-/* Returns a new group cache from db.
- */
-int _alpm_db_load_grpcache(pmdb_t *db)
-{
-	alpm_list_t *lp;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(-1);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n",
-			db->treename);
-
-	for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
-		const alpm_list_t *i;
-		pmpkg_t *pkg = lp->data;
-
-		for(i = alpm_pkg_get_groups(pkg); i; i = i->next) {
-			const char *grpname = i->data;
-			alpm_list_t *j;
-			pmgrp_t *grp = NULL;
-			int found = 0;
-
-			/* first look through the group cache for a group with this name */
-			for(j = db->grpcache; j; j = j->next) {
-				grp = j->data;
-
-				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);
-}
-
-void _alpm_db_free_grpcache(pmdb_t *db)
-{
-	alpm_list_t *lg;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->grpcache_loaded) {
-		return;
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "freeing group cache for repository '%s'\n",
-	                        db->treename);
-
-	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)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(NULL);
-	}
-
-	if(!db->grpcache_loaded) {
-		_alpm_db_load_grpcache(db);
-	}
-
-	return(db->grpcache);
-}
-
-pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target)
-{
-	alpm_list_t *i;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || target == NULL || strlen(target) == 0) {
-		return(NULL);
-	}
-
-	for(i = _alpm_db_get_grpcache(db); i; i = i->next) {
-		pmgrp_t *info = i->data;
-
-		if(strcmp(info->name, target) == 0) {
-			return(info);
-		}
-	}
-
-	return(NULL);
-}
-
-/* vim: set ts=2 sw=2 noet: */

lib/libalpm/cache.h

@@ -1,44 +0,0 @@
-/*
- *  cache.h
- *
- *  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/>.
- */
-#ifndef _ALPM_CACHE_H
-#define _ALPM_CACHE_H
-
-#include "db.h"
-#include "alpm_list.h"
-#include "group.h"
-#include "package.h"
-
-/* packages */
-int _alpm_db_load_pkgcache(pmdb_t *db);
-void _alpm_db_free_pkgcache(pmdb_t *db);
-int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg);
-int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg);
-alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db);
-int _alpm_db_ensure_pkgcache(pmdb_t *db, pmdbinfrq_t infolevel);
-pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target);
-/* groups */
-int _alpm_db_load_grpcache(pmdb_t *db);
-void _alpm_db_free_grpcache(pmdb_t *db);
-alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db);
-pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target);
-
-#endif /* _ALPM_CACHE_H */
-
-/* vim: set ts=2 sw=2 noet: */

lib/libalpm/conflict.c

@@ -1,7 +1,7 @@
 /*
  *  conflict.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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>
@@ -34,105 +34,90 @@
 /* libalpm */
 #include "conflict.h"
 #include "alpm_list.h"
+#include "alpm.h"
 #include "handle.h"
 #include "trans.h"
 #include "util.h"
 #include "log.h"
-#include "cache.h"
 #include "deps.h"
 
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason)
+static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2,
+		alpm_depend_t *reason)
 {
-	pmconflict_t *conflict;
+	alpm_conflict_t *conflict;
 
-	ALPM_LOG_FUNC;
+	MALLOC(conflict, sizeof(alpm_conflict_t), return NULL);
 
-	MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	conflict->package1_hash = pkg1->name_hash;
+	conflict->package2_hash = pkg2->name_hash;
+	STRDUP(conflict->package1, pkg1->name, return NULL);
+	STRDUP(conflict->package2, pkg2->name, return NULL);
+	conflict->reason = reason;
 
-	STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL));
+	return conflict;
-	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)
+void _alpm_conflict_free(alpm_conflict_t *conflict)
 {
 	FREE(conflict->package2);
 	FREE(conflict->package1);
-	FREE(conflict->reason);
 	FREE(conflict);
 }
 
-pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict)
+alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict)
 {
-	pmconflict_t *newconflict;
+	alpm_conflict_t *newconflict;
-	CALLOC(newconflict, 1, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL);
 
-	STRDUP(newconflict->package1, conflict->package1, RET_ERR(PM_ERR_MEMORY, NULL));
+	newconflict->package1_hash = conflict->package1_hash;
-	STRDUP(newconflict->package2, conflict->package2, RET_ERR(PM_ERR_MEMORY, NULL));
+	newconflict->package2_hash = conflict->package2_hash;
-	STRDUP(newconflict->reason, conflict->reason, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newconflict->package1, conflict->package1, return NULL);
+	STRDUP(newconflict->package2, conflict->package2, return NULL);
+	newconflict->reason = conflict->reason;
 
-	return(newconflict);
+	return newconflict;
 }
 
-int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack)
+static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack)
 {
 	alpm_list_t *i;
-
-	ALPM_LOG_FUNC;
-
 	for(i = haystack; i; i = i->next) {
-		pmconflict_t *conflict = i->data;
+		alpm_conflict_t *conflict = i->data;
-		char *cpkg1 = conflict->package1;
+		if(needle->package1_hash == conflict->package1_hash
-		char *cpkg2 = conflict->package2;
+				&& needle->package2_hash == conflict->package2_hash
-		char *npkg1 = needle->package1;
+				&& strcmp(needle->package1, conflict->package1) == 0
-		char *npkg2 = needle->package2;
+				&& strcmp(needle->package2, conflict->package2) == 0) {
-		if((!strcmp(cpkg1, npkg1)  && !strcmp(cpkg2, npkg2))
+			return 1;
-				|| (!strcmp(cpkg1, npkg2) && !strcmp(cpkg2, npkg1))) {
-			return(1);
 		}
 	}
 
-	return(0);
+	return 0;
 }
 
-/** Check if pkg1 conflicts with pkg2
+/** Adds the pkg1/pkg2 conflict to the baddeps list.
- * @param pkg1 package we are looking at
+ * @param handle the context handle
- * @param conflict name of the possible conflict
+ * @param baddeps list to add conflict to
- * @param pkg2 package to check
- * @return 0 for no conflict, non-zero otherwise
- */
-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);
-	int match = 0;
-
-	match = alpm_depcmp(pkg2, conf);
-	if(match) {
-		_alpm_log(PM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n",
-				pkg1name, pkg2name, conflict);
-	}
-	_alpm_dep_free(conf);
-	return(match);
-}
-
-/** Adds the pkg1/pkg2 conflict to the baddeps list
- * @param *baddeps list to add conflict to
  * @param pkg1 first package
  * @param pkg2 package causing conflict
+ * @param reason reason for this conflict
  */
-static void add_conflict(alpm_list_t **baddeps, const char *pkg1,
+static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps,
-		const char *pkg2, const char *reason)
+		alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, alpm_depend_t *reason)
 {
-	pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2, reason);
+	alpm_conflict_t *conflict = conflict_new(pkg1, pkg2, reason);
-	if(conflict && !_alpm_conflict_isin(conflict, *baddeps)) {
+	if(!conflict) {
+		return -1;
+	}
+	if(!conflict_isin(conflict, *baddeps)) {
+		char *conflict_str = alpm_dep_compute_string(reason);
 		*baddeps = alpm_list_add(*baddeps, conflict);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n",
+				pkg1->name, pkg2->name, conflict_str);
+		free(conflict_str);
 	} else {
 		_alpm_conflict_free(conflict);
 	}
+	return 0;
 }
 
 /** Check if packages from list1 conflict with packages from list2.
@@ -141,39 +126,42 @@ static void add_conflict(alpm_list_t **baddeps, const char *pkg1,
  * If a conflict (pkg1, pkg2) is found, it is added to the baddeps list
  * in this order if order >= 0, or reverse order (pkg2,pkg1) otherwise.
  *
+ * @param handle the context handle
  * @param list1 first list of packages
  * @param list2 second list of packages
- * @param *baddeps list to store conflicts
+ * @param baddeps list to store conflicts
  * @param order if >= 0 the conflict order is preserved, if < 0 it's reversed
  */
-static void check_conflict(alpm_list_t *list1, alpm_list_t *list2,
+static void check_conflict(alpm_handle_t *handle,
+		alpm_list_t *list1, alpm_list_t *list2,
 		alpm_list_t **baddeps, int order) {
-	alpm_list_t *i, *j, *k;
+	alpm_list_t *i;
 
 	if(!baddeps) {
 		return;
 	}
 	for(i = list1; i; i = i->next) {
-		pmpkg_t *pkg1 = i->data;
+		alpm_pkg_t *pkg1 = i->data;
-		const char *pkg1name = alpm_pkg_get_name(pkg1);
+		alpm_list_t *j;
 
 		for(j = alpm_pkg_get_conflicts(pkg1); j; j = j->next) {
-			const char *conflict = j->data;
+			alpm_depend_t *conflict = j->data;
+			alpm_list_t *k;
 
 			for(k = list2; k; k = k->next) {
-				pmpkg_t *pkg2 = k->data;
+				alpm_pkg_t *pkg2 = k->data;
-				const char *pkg2name = alpm_pkg_get_name(pkg2);
 
-				if(strcmp(pkg1name, pkg2name) == 0) {
+				if(pkg1->name_hash == pkg2->name_hash
+						&& strcmp(pkg1->name, pkg2->name) == 0) {
 					/* skip the package we're currently processing */
 					continue;
 				}
 
-				if(does_conflict(pkg1, conflict, pkg2)) {
+				if(_alpm_depcmp(pkg2, conflict)) {
 					if(order >= 0) {
-						add_conflict(baddeps, pkg1name, pkg2name, conflict);
+						add_conflict(handle, baddeps, pkg1, pkg2, conflict);
 					} else {
-						add_conflict(baddeps, pkg2name, pkg1name, conflict);
+						add_conflict(handle, baddeps, pkg2, pkg1, conflict);
 					}
 				}
 			}
@@ -182,189 +170,179 @@ static void check_conflict(alpm_list_t *list1, alpm_list_t *list2,
 }
 
 /* Check for inter-conflicts */
-alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages)
+alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages)
 {
 	alpm_list_t *baddeps = NULL;
 
-	ALPM_LOG_FUNC;
+	_alpm_log(handle, ALPM_LOG_DEBUG, "check targets vs targets\n");
+	check_conflict(handle, packages, packages, &baddeps, 0);
 
-	_alpm_log(PM_LOG_DEBUG, "check targets vs targets\n");
+	return baddeps;
-	check_conflict(packages, packages, &baddeps, 0);
-
-	return(baddeps);
 }
 
-/* Check for target vs (db - target) conflicts
+/* Check for target vs (db - target) conflicts */
- * In case of conflict the package1 field of pmdepconflict_t contains
+alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages)
- * the target package, package2 field contains the local package
- */
-alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages)
 {
 	alpm_list_t *baddeps = NULL;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
-		return(NULL);
+		return NULL;
 	}
 
-	alpm_list_t *dblist = alpm_list_diff(_alpm_db_get_pkgcache(db), packages,
+	alpm_list_t *dblist = alpm_list_diff(_alpm_db_get_pkgcache(db),
-			_alpm_pkg_cmp);
+			packages, _alpm_pkg_cmp);
 
 	/* two checks to be done here for conflicts */
-	_alpm_log(PM_LOG_DEBUG, "check targets vs db\n");
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "check targets vs db\n");
-	check_conflict(packages, dblist, &baddeps, 1);
+	check_conflict(db->handle, packages, dblist, &baddeps, 1);
-	_alpm_log(PM_LOG_DEBUG, "check db vs targets\n");
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "check db vs targets\n");
-	check_conflict(dblist, packages, &baddeps, -1);
+	check_conflict(db->handle, dblist, packages, &baddeps, -1);
 
 	alpm_list_free(dblist);
-	return(baddeps);
+	return baddeps;
 }
 
 /** Check the package conflicts in a database
  *
+ * @param handle the context handle
  * @param pkglist the list of packages to check
- * @return an alpm_list_t of pmconflict_t
+ * @return an alpm_list_t of alpm_conflict_t
  */
-alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_list_t *pkglist) {
+alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_handle_t *handle,
-	return(_alpm_innerconflicts(pkglist));
+		alpm_list_t *pkglist)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return _alpm_innerconflicts(handle, pkglist);
 }
 
-/* Returns a alpm_list_t* of file conflicts.
+static const int DIFFERENCE = 0;
- *  Hooray for set-intersects!
+static const int INTERSECT = 1;
- *  Pre-condition: both lists are sorted!
+/* Returns a set operation on the provided two lists of files.
+ * Pre-condition: both lists are sorted!
+ * When done, free the list but NOT the contained data.
+ *
+ * Operations:
+ *   DIFFERENCE - a difference operation is performed. filesA - filesB.
+ *   INTERSECT - an intersection operation is performed. filesA & filesB.
  */
-static alpm_list_t *chk_fileconflicts(alpm_list_t *filesA, alpm_list_t *filesB)
+static alpm_list_t *filelist_operation(alpm_filelist_t *filesA,
+		alpm_filelist_t *filesB, int operation)
 {
 	alpm_list_t *ret = NULL;
-	alpm_list_t *pA = filesA, *pB = filesB;
+	size_t ctrA = 0, ctrB = 0;
 
-	while(pA && pB) {
+	while(ctrA < filesA->count && ctrB < filesB->count) {
-		const char *strA = pA->data;
+		alpm_file_t *fileA = filesA->files + ctrA;
-		const char *strB = pB->data;
+		alpm_file_t *fileB = filesB->files + ctrB;
-		/* skip directories, we don't care about dir conflicts */
+		const char *strA = fileA->name;
+		const char *strB = fileB->name;
+		/* skip directories, we don't care about them */
 		if(strA[strlen(strA)-1] == '/') {
-			pA = pA->next;
+			ctrA++;
 		} else if(strB[strlen(strB)-1] == '/') {
-			pB = pB->next;
+			ctrB++;
 		} else {
 			int cmp = strcmp(strA, strB);
 			if(cmp < 0) {
-				/* item only in filesA, ignore it */
+				if(operation == DIFFERENCE) {
-				pA = pA->next;
+					/* item only in filesA, qualifies as a difference */
+					ret = alpm_list_add(ret, fileA);
+				}
+				ctrA++;
 			} else if(cmp > 0) {
-				/* item only in filesB, ignore it */
+				ctrB++;
-				pB = pB->next;
 			} else {
-				/* item in both, record it */
+				if(operation == INTERSECT) {
-				ret = alpm_list_add(ret, strdup(strA));
+					/* item in both, qualifies as an intersect */
-				pA = pA->next;
+					ret = alpm_list_add(ret, fileA);
-				pB = pB->next;
+				}
+				ctrA++;
+				ctrB++;
 			}
 	  }
 	}
 
-	return(ret);
+	/* if doing a difference, ensure we have completely emptied pA */
-}
+	while(operation == DIFFERENCE && ctrA < filesA->count) {
-
+		alpm_file_t *fileA = filesA->files + ctrA;
-/* Returns a alpm_list_t* of files that are in filesA but *NOT* in filesB
+		const char *strA = fileA->name;
- *  This is an 'A minus B' set operation
- *  Pre-condition: both lists are sorted!
- */
-static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
-{
-	alpm_list_t *ret = NULL;
-	alpm_list_t *pA = filesA, *pB = filesB;
-
-	/* if both filesA and filesB have entries, do this loop */
-	while(pA && pB) {
-		const char *strA = pA->data;
-		const char *strB = pB->data;
-		/* skip directories, we don't care about dir conflicts */
-		if(strA[strlen(strA)-1] == '/') {
-			pA = pA->next;
-		} else if(strB[strlen(strB)-1] == '/') {
-			pB = pB->next;
-		} else {
-			int cmp = strcmp(strA, strB);
-			if(cmp < 0) {
-				/* item only in filesA, record it */
-				ret = alpm_list_add(ret, strdup(strA));
-				pA = pA->next;
-			} else if(cmp > 0) {
-				/* item only in fileB, but this means nothing */
-				pB = pB->next;
-			} else {
-				/* item in both, ignore it */
-				pA = pA->next;
-				pB = pB->next;
-			}
-	  }
-	}
-	/* ensure we have completely emptied pA */
-	while(pA) {
-		const char *strA = pA->data;
 		/* skip directories */
 		if(strA[strlen(strA)-1] != '/') {
-			ret = alpm_list_add(ret, strdup(strA));
+			ret = alpm_list_add(ret, fileA);
 		}
-		pA = pA->next;
+		ctrA++;
 	}
 
-	return(ret);
+	return ret;
 }
 
-/* Adds pmfileconflict_t to a conflicts list. Pass the conflicts list, type (either
+/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the
- * PM_FILECONFLICT_TARGET or PM_FILECONFLICT_FILESYSTEM), a file string, and either
+ * conflicting file path, and either two packages or one package and NULL.
- * two package names or one package name and NULL. This is a wrapper for former
- * functionality that was done inline.
  */
-static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
+static alpm_list_t *add_fileconflict(alpm_handle_t *handle,
-                    pmfileconflicttype_t type, const char *filestr,
+		alpm_list_t *conflicts, const char *filestr,
-										const char* name1, const char* name2)
+		alpm_pkg_t *pkg1, alpm_pkg_t *pkg2)
 {
-	pmfileconflict_t *conflict;
+	alpm_fileconflict_t *conflict;
-	MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error);
 
-	conflict->type = type;
+	STRDUP(conflict->target, pkg1->name, goto error);
-	STRDUP(conflict->target, name1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->file, filestr, goto error);
-	STRDUP(conflict->file, filestr, RET_ERR(PM_ERR_MEMORY, NULL));
+	if(pkg2) {
-	if(name2) {
+		conflict->type = ALPM_FILECONFLICT_TARGET;
-		STRDUP(conflict->ctarget, name2, RET_ERR(PM_ERR_MEMORY, NULL));
+		STRDUP(conflict->ctarget, pkg2->name, goto error);
 	} else {
-		conflict->ctarget = "";
+		conflict->type = ALPM_FILECONFLICT_FILESYSTEM;
+		STRDUP(conflict->ctarget, "", goto error);
 	}
 
 	conflicts = alpm_list_add(conflicts, conflict);
-	_alpm_log(PM_LOG_DEBUG, "found file conflict %s, packages %s and %s\n",
+	_alpm_log(handle, ALPM_LOG_DEBUG, "found file conflict %s, packages %s and %s\n",
-	          filestr, name1, name2 ? name2 : "(filesystem)");
+	          filestr, pkg1->name, pkg2 ? pkg2->name : "(filesystem)");
 
-	return(conflicts);
+	return conflicts;
+
+error:
+	RET_ERR(handle, ALPM_ERR_MEMORY, conflicts);
 }
 
-void _alpm_fileconflict_free(pmfileconflict_t *conflict)
+void _alpm_fileconflict_free(alpm_fileconflict_t *conflict)
 {
-	if(strlen(conflict->ctarget) > 0) {
+	FREE(conflict->ctarget);
-		FREE(conflict->ctarget);
+	FREE(conflict->file);
-	}
-	FREE(conflict->file);;
 	FREE(conflict->target);
 	FREE(conflict);
 }
 
-static int dir_belongsto_pkg(char *dirpath, pmpkg_t *pkg)
+const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
+		const char *name)
+{
+	size_t i;
+	const alpm_file_t *file = filelist->files;
+	for(i = 0; i < filelist->count; i++) {
+		if(strcmp(file->name, name) == 0) {
+			return file;
+		}
+		file++;
+	}
+	return NULL;
+}
+
+static int dir_belongsto_pkg(const char *root, const char *dirpath,
+		alpm_pkg_t *pkg)
 {
-	struct dirent *ent = NULL;
 	struct stat sbuf;
 	char path[PATH_MAX];
 	char abspath[PATH_MAX];
+	struct dirent *ent = NULL;
 	DIR *dir;
 
-	snprintf(abspath, PATH_MAX, "%s%s", handle->root, dirpath);
+	snprintf(abspath, PATH_MAX, "%s%s", root, dirpath);
 	dir = opendir(abspath);
 	if(dir == NULL) {
-		return(1);
+		return 1;
 	}
+
 	while((ent = readdir(dir)) != NULL) {
 		const char *name = ent->d_name;
 
@@ -372,105 +350,117 @@ static int dir_belongsto_pkg(char *dirpath, pmpkg_t *pkg)
 			continue;
 		}
 		snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
-		snprintf(abspath, PATH_MAX, "%s%s", handle->root, path);
+		snprintf(abspath, PATH_MAX, "%s%s", root, path);
 		if(stat(abspath, &sbuf) != 0) {
 			continue;
 		}
 		if(S_ISDIR(sbuf.st_mode)) {
-			if(dir_belongsto_pkg(path, pkg)) {
+			if(dir_belongsto_pkg(root, path, pkg)) {
 				continue;
 			} else {
 				closedir(dir);
-				return(0);
+				return 0;
 			}
 		} else {
-			if(alpm_list_find_str(alpm_pkg_get_files(pkg),path)) {
+			if(_alpm_filelist_contains(alpm_pkg_get_files(pkg), path)) {
 				continue;
 			} else {
 				closedir(dir);
-				return(0);
+				return 0;
 			}
 		}
 	}
 	closedir(dir);
-	return(1);
+	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,
+alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 		alpm_list_t *upgrade, alpm_list_t *remove)
 {
-	alpm_list_t *i, *j, *conflicts = NULL;
+	alpm_list_t *i, *conflicts = NULL;
-	int numtargs = alpm_list_count(upgrade);
+	size_t numtargs = alpm_list_count(upgrade);
-	int current;
+	size_t current;
 
-	ALPM_LOG_FUNC;
+	if(!upgrade) {
-
+		return NULL;
-	if(db == NULL || upgrade == NULL || trans == NULL) {
-		return(NULL);
 	}
 
 	/* TODO this whole function needs a huge change, which hopefully will
 	 * 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 = upgrade; i; i = i->next, current++) {
+	for(current = 0, i = upgrade; i; i = i->next, current++) {
-		alpm_list_t *k, *tmpfiles = NULL;
+		alpm_pkg_t *p1 = i->data;
-		pmpkg_t *p1, *p2, *dbpkg;
+		alpm_list_t *j;
-		char path[PATH_MAX+1];
+		alpm_filelist_t tmpfiles;
+		alpm_pkg_t *dbpkg;
+		size_t filenum;
 
-		p1 = i->data;
+		int percent = (current * 100) / numtargs;
-		if(!p1) {
+		PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", percent,
-			continue;
-		}
-
-		double percent = (double)current / numtargs;
-		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_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n",
-								alpm_pkg_get_name(p1));
+				p1->name);
 		for(j = i->next; j; j = j->next) {
-			p2 = j->data;
+			alpm_list_t *common_files;
-			if(!p2) {
+			alpm_pkg_t *p2 = j->data;
-				continue;
+			common_files = filelist_operation(alpm_pkg_get_files(p1),
-			}
+					alpm_pkg_get_files(p2), INTERSECT);
-			tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2));
 
-			if(tmpfiles) {
+			if(common_files) {
-				for(k = tmpfiles; k; k = k->next) {
+				alpm_list_t *k;
-					snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data);
+				char path[PATH_MAX];
-					conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_TARGET, path,
+				for(k = common_files; k; k = k->next) {
-							alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
+					alpm_file_t *file = k->data;
+					snprintf(path, PATH_MAX, "%s%s", handle->root, file->name);
+					conflicts = add_fileconflict(handle, conflicts, path, p1, p2);
+					if(handle->pm_errno == ALPM_ERR_MEMORY) {
+						FREELIST(conflicts);
+						FREELIST(common_files);
+						return NULL;
+					}
 				}
-				FREELIST(tmpfiles);
+				alpm_list_free(common_files);
 			}
 		}
 
-		/* declarations for second check */
-		struct stat lsbuf, sbuf;
-		char *filestr = NULL;
-
 		/* CHECK 2: check every target against the filesystem */
-		_alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", p1->name);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "searching for filesystem conflicts: %s\n",
-		dbpkg = _alpm_db_get_pkgfromcache(db, p1->name);
+				p1->name);
+		dbpkg = _alpm_db_get_pkgfromcache(handle->db_local, p1->name);
 
 		/* 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 */
+		 * is not currently installed, then simply stat the whole filelist. Note
+		 * that the former list needs to be freed while the latter list should NOT
+		 * be freed. */
 		if(dbpkg) {
+			alpm_list_t *difference;
 			/* older ver of package currently installed */
-			tmpfiles = chk_filedifference(alpm_pkg_get_files(p1),
+			difference = filelist_operation(alpm_pkg_get_files(p1),
-					alpm_pkg_get_files(dbpkg));
+					alpm_pkg_get_files(dbpkg), DIFFERENCE);
+			tmpfiles.count = alpm_list_count(difference);
+			tmpfiles.files = alpm_list_to_array(difference, tmpfiles.count,
+					sizeof(alpm_file_t));
+			alpm_list_free(difference);
 		} else {
 			/* no version of package currently installed */
-			tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1));
+			tmpfiles = *alpm_pkg_get_files(p1);
 		}
 
-		for(j = tmpfiles; j; j = j->next) {
+		for(filenum = 0; filenum < tmpfiles.count; filenum++) {
-			filestr = j->data;
+			alpm_file_t *file = tmpfiles.files + filenum;
+			const char *filestr = file->name;
+			const char *relative_path;
+			alpm_list_t *k;
+			/* have we acted on this conflict? */
+			int resolved_conflict = 0;
+			struct stat lsbuf;
+			char path[PATH_MAX];
 
 			snprintf(path, PATH_MAX, "%s%s", handle->root, filestr);
 
@@ -478,46 +468,56 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 			if(_alpm_lstat(path, &lsbuf) != 0) {
 				continue;
 			}
-			stat(path, &sbuf);
 
-			if(path[strlen(path)-1] == '/') {
+			if(S_ISDIR(file->mode)) {
+				struct stat sbuf;
 				if(S_ISDIR(lsbuf.st_mode)) {
-					_alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path);
+					_alpm_log(handle, ALPM_LOG_DEBUG, "%s is a directory, not a conflict\n", path);
 					continue;
-				} else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) {
+				}
-					_alpm_log(PM_LOG_DEBUG,
+				stat(path, &sbuf);
+				if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) {
+					_alpm_log(handle, ALPM_LOG_DEBUG,
 							"%s is a symlink to a dir, hopefully not a conflict\n", path);
 					continue;
 				}
+				/* if we made it to here, we want all subsequent path comparisons to
+				 * not include the trailing slash. This allows things like file ->
+				 * directory replacements. */
+				path[strlen(path) - 1] = '\0';
 			}
-			_alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path);
 
-			int resolved_conflict = 0; /* have we acted on this conflict? */
+			_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);
+			relative_path = path + strlen(handle->root);
 
 			/* Check remove list (will we remove the conflicting local file?) */
 			for(k = remove; k && !resolved_conflict; k = k->next) {
-				pmpkg_t *rempkg = k->data;
+				alpm_pkg_t *rempkg = k->data;
-				if(rempkg && alpm_list_find_str(alpm_pkg_get_files(rempkg), filestr)) {
+				if(rempkg && _alpm_filelist_contains(alpm_pkg_get_files(rempkg),
-					_alpm_log(PM_LOG_DEBUG, "local file will be removed, not a conflict: %s\n", filestr);
+							relative_path)) {
+					_alpm_log(handle, ALPM_LOG_DEBUG,
+							"local file will be removed, not a conflict: %s\n", path);
 					resolved_conflict = 1;
 				}
 			}
 
 			/* Look at all the targets to see if file has changed hands */
 			for(k = upgrade; k && !resolved_conflict; k = k->next) {
-				p2 = k->data;
+				alpm_pkg_t *p2 = k->data;
 				if(!p2 || strcmp(p1->name, p2->name) == 0) {
 					continue;
 				}
-				pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name);
+				alpm_pkg_t *localp2 = _alpm_db_get_pkgfromcache(handle->db_local, 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)) {
+				if(localp2 && _alpm_filelist_contains(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));
+					handle->trans->skip_remove =
-					_alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr);
+						alpm_list_add(handle->trans->skip_remove, strdup(filestr));
+					_alpm_log(handle, ALPM_LOG_DEBUG,
+							"file changed packages, adding to remove skiplist: %s\n", path);
 					resolved_conflict = 1;
 				}
 			}
@@ -526,113 +526,66 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 			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)) {
+				if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
-					_alpm_log(PM_LOG_DEBUG, "check if all files in %s belongs to %s\n",
+					_alpm_log(handle, ALPM_LOG_DEBUG,
+							"check if all files in %s belongs to %s\n",
 							dir, dbpkg->name);
-					resolved_conflict = dir_belongsto_pkg(filestr, dbpkg);
+					resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg);
 				}
 				free(dir);
 			}
 
 			if(!resolved_conflict && dbpkg) {
-				char *rpath = calloc(PATH_MAX+1, sizeof(char));
+				char *rpath = calloc(PATH_MAX, sizeof(char));
+				const char *relative_rpath;
 				if(!realpath(path, rpath)) {
-					FREE(rpath);
+					free(rpath);
 					continue;
 				}
-				char *filestr = rpath + strlen(handle->root);
+				relative_rpath = rpath + strlen(handle->root);
-				if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) {
+				if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_rpath)) {
 					resolved_conflict = 1;
 				}
 				free(rpath);
 			}
 
+			/* is the file unowned and in the backup list of the new package? */
+			if(!resolved_conflict && _alpm_needbackup(filestr, p1)) {
+				alpm_list_t *local_pkgs = _alpm_db_get_pkgcache(handle->db_local);
+				int found = 0;
+				for(k = local_pkgs; k && !found; k = k->next) {
+					if(_alpm_filelist_contains(alpm_pkg_get_files(k->data), filestr)) {
+							found = 1;
+					}
+				}
+				if(!found) {
+					_alpm_log(handle, ALPM_LOG_DEBUG,
+							"file was unowned but in new backup list: %s\n", path);
+					resolved_conflict = 1;
+				}
+			}
+
 			if(!resolved_conflict) {
-				_alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path);
+				conflicts = add_fileconflict(handle, conflicts, path, p1, NULL);
-				conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM,
+				if(handle->pm_errno == ALPM_ERR_MEMORY) {
-						path, p1->name, NULL);
+					FREELIST(conflicts);
+					if(dbpkg) {
+						/* only freed if it was generated from filelist_operation() */
+						free(tmpfiles.files);
+					}
+					return NULL;
+				}
 			}
 		}
-		FREELIST(tmpfiles);
+		if(dbpkg) {
+			/* only freed if it was generated from filelist_operation() */
+			free(tmpfiles.files);
+		}
 	}
+	PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", 100,
+			numtargs, current);
 
-	return(conflicts);
+	return conflicts;
 }
 
-const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(conflict != NULL, return(NULL));
-
-	return conflict->package1;
-}
-
-const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(conflict != NULL, return(NULL));
-
-	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;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(conflict != NULL, return(NULL));
-
-	return conflict->target;
-}
-
-pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conflict)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(-1));
-	ASSERT(conflict != NULL, return(-1));
-
-	return conflict->type;
-}
-
-const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(conflict != NULL, return(NULL));
-
-	return conflict->file;
-}
-
-const char SYMEXPORT *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(conflict != NULL, return(NULL));
-
-	return conflict->ctarget;
-}
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/conflict.h

@@ -1,7 +1,7 @@
 /*
  *  conflict.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -24,29 +24,17 @@
 #include "db.h"
 #include "package.h"
 
-struct __pmconflict_t {
+alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict);
-	char *package1;
+void _alpm_conflict_free(alpm_conflict_t *conflict);
-	char *package2;
+alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages);
-	char *reason;
+alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages);
-};
+alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
+		alpm_list_t *upgrade, alpm_list_t *remove);
 
-struct __pmfileconflict_t {
+void _alpm_fileconflict_free(alpm_fileconflict_t *conflict);
-	char *target;
-	pmfileconflicttype_t type;
-	char *file;
-	char *ctarget;
-};
 
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason);
+const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
-pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
+		const char *name);
-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_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,7 @@
 /*
  *  db.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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>
@@ -26,12 +26,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <dirent.h>
 #include <regex.h>
-#include <time.h>
 
 /* libalpm */
 #include "db.h"
@@ -39,100 +35,73 @@
 #include "log.h"
 #include "util.h"
 #include "handle.h"
-#include "cache.h"
 #include "alpm.h"
+#include "package.h"
+#include "group.h"
 
 /** \addtogroup alpm_databases Database Functions
  * @brief Functions to query and manipulate the database of libalpm
  * @{
  */
 
-/** Register a sync database of packages.
+/** Register a sync database of packages. */
- * @param treename the name of the sync repository
+alpm_db_t SYMEXPORT *alpm_db_register_sync(alpm_handle_t *handle,
- * @return a pmdb_t* on success (the value), NULL on error
+		const char *treename, alpm_siglevel_t level)
- */
-pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename)
 {
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL));
+	CHECK_HANDLE(handle, return NULL);
-	ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, NULL));
+	ASSERT(treename != NULL && strlen(treename) != 0,
+			RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL));
 	/* Do not register a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, NULL));
+	ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, NULL));
 
-	return(_alpm_db_register_sync(treename));
+	return _alpm_db_register_sync(handle, treename, level);
-}
-
-/** Register the local package database.
- * @return a pmdb_t* representing the local database, or NULL on error
- */
-pmdb_t SYMEXPORT *alpm_db_register_local(void)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL));
-	/* Do not register a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, NULL));
-
-	return(_alpm_db_register_local());
 }
 
 /* Helper function for alpm_db_unregister{_all} */
-static void _alpm_db_unregister(pmdb_t *db)
+void _alpm_db_unregister(alpm_db_t *db)
 {
 	if(db == NULL) {
 		return;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
 	_alpm_db_free(db);
 }
 
-/** Unregister all package databases
+/** Unregister all package databases. */
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
+int SYMEXPORT alpm_db_unregister_all(alpm_handle_t *handle)
- */
-int SYMEXPORT alpm_db_unregister_all(void)
 {
 	alpm_list_t *i;
-
+	alpm_db_t *db;
-	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	CHECK_HANDLE(handle, return -1);
 	/* Do not unregister a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
+	ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, -1));
 
-	/* close local database */
+	/* unregister all sync dbs */
-	_alpm_db_unregister(handle->db_local);
-	handle->db_local = NULL;
-
-	/* and also sync ones */
 	for(i = handle->dbs_sync; i; i = i->next) {
-		pmdb_t *db = i->data;
+		db = i->data;
-		_alpm_db_unregister(db);
+		db->ops->unregister(db);
 		i->data = NULL;
 	}
 	FREELIST(handle->dbs_sync);
-	return(0);
+	return 0;
 }
 
-/** Unregister a package database
+/** Unregister a package database. */
- * @param db pointer to the package database to unregister
+int SYMEXPORT alpm_db_unregister(alpm_db_t *db)
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
-int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 {
 	int found = 0;
-
+	alpm_handle_t *handle;
-	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(db != NULL, return -1);
-	ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
 	/* Do not unregister a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
+	handle = db->handle;
+	handle->pm_errno = 0;
+	ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, -1));
 
 	if(db == handle->db_local) {
 		handle->db_local = NULL;
@@ -151,233 +120,223 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 	}
 
 	if(!found) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
+		RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1);
 	}
 
-	_alpm_db_unregister(db);
+	db->ops->unregister(db);
-	return(0);
+	return 0;
 }
 
-/** Set the serverlist of a database.
+/** Get the serverlist of a database. */
+alpm_list_t SYMEXPORT *alpm_db_get_servers(const alpm_db_t *db)
+{
+	ASSERT(db != NULL, return NULL);
+	return db->servers;
+}
+
+/** Set the serverlist of a database. */
+int SYMEXPORT alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers)
+{
+	ASSERT(db != NULL, return -1);
+	if(db->servers) FREELIST(db->servers);
+	db->servers = servers;
+	return 0;
+}
+
+static char *sanitize_url(const char *url)
+{
+	char *newurl;
+	size_t len = strlen(url);
+
+	STRDUP(newurl, url, return NULL);
+	/* strip the trailing slash if one exists */
+	if(newurl[len - 1] == '/') {
+		newurl[len - 1] = '\0';
+	}
+	return newurl;
+}
+
+/** Add a download server to a database.
  * @param db database pointer
  * @param url url of the server
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
-int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url)
+int SYMEXPORT alpm_db_add_server(alpm_db_t *db, const char *url)
 {
-	alpm_list_t *i;
-	int found = 0;
 	char *newurl;
-	int len = 0;
-
-	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
+	ASSERT(db != NULL, return -1);
+	db->handle->pm_errno = 0;
+	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, -1));
 
-	for(i = handle->dbs_sync; i && !found; i = i->next) {
+	newurl = sanitize_url(url);
-		pmdb_t *sdb = i->data;
+	if(!newurl) {
-		if(strcmp(db->treename, sdb->treename) == 0) {
+		return -1;
-			found = 1;
-		}
-	}
-	if(!found) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
 	}
+	db->servers = alpm_list_add(db->servers, newurl);
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding new server URL to database '%s': %s\n",
+			db->treename, newurl);
 
-	if(url) {
+	return 0;
-		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, 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);
-	}
-
-	return(0);
 }
 
-/** Get the name of a package database
+/** Remove a download server from a database.
- * @param db pointer to the package database
+ * @param db database pointer
- * @return the name of the package database, NULL on error
+ * @param url url of the server
+ * @return 0 on success, 1 on server not present,
+ * -1 on error (pm_errno is set accordingly)
  */
-const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db)
+int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url)
 {
-	ALPM_LOG_FUNC;
+	char *newurl, *vdata = NULL;
 
 	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
+	ASSERT(db != NULL, return -1);
-	ASSERT(db != NULL, return(NULL));
+	db->handle->pm_errno = 0;
+	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, -1));
 
+	newurl = sanitize_url(url);
+	if(!newurl) {
+		return -1;
+	}
+	db->servers = alpm_list_remove_str(db->servers, newurl, &vdata);
+	free(newurl);
+	if(vdata) {
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "removed server URL from database '%s': %s\n",
+				db->treename, newurl);
+		free(vdata);
+		return 0;
+	}
+
+	return 1;
+}
+
+/** Get the name of a package database. */
+const char SYMEXPORT *alpm_db_get_name(const alpm_db_t *db)
+{
+	ASSERT(db != NULL, return NULL);
 	return db->treename;
 }
 
-/** Get a download URL for the package database
+/** Get the signature verification level for a database. */
- * @param db pointer to the package database
+alpm_siglevel_t SYMEXPORT alpm_db_get_siglevel(alpm_db_t *db)
- * @return a fully-specified download URL, NULL on error
- */
-const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
 {
-	char *url;
+	ASSERT(db != NULL, return -1);
-
+	if(db->siglevel & ALPM_SIG_USE_DEFAULT) {
-	ALPM_LOG_FUNC;
+		return db->handle->siglevel;
-
+	} else {
-	/* Sanity checks */
+		return db->siglevel;
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(db != NULL, return(NULL));
-	ASSERT(db->servers != NULL, return(NULL));
-
-	url = (char*)db->servers->data;
-
-	return(url);
-}
-
-
-/** Get a package entry from a package database
- * @param db pointer to the package database to get the package from
- * @param name of the package
- * @return the package entry on success, NULL on error
- */
-pmpkg_t SYMEXPORT *alpm_db_get_pkg(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_get_pkgfromcache(db, name));
-}
-
-/** Get the package cache of a package database
- * @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_get_pkgcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(db != NULL, return(NULL));
-
-	return(_alpm_db_get_pkgcache(db));
-}
-
-/** 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
- * @return the groups entry on success, NULL on error
- */
-pmgrp_t SYMEXPORT *alpm_db_readgrp(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_get_grpfromcache(db, name));
-}
-
-/** Get the group cache of a package database
- * @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_get_grpcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(db != NULL, return(NULL));
-
-	return(_alpm_db_get_grpcache(db));
-}
-
-/** Searches a database
- * @param db pointer to the package database to search in
- * @param needles the list of strings to search for
- * @return the list of packages on success, NULL on error
- */
-alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(db != NULL, return(NULL));
-
-	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);
+/** Check the validity of a database. */
-	/* read DESC */
+int SYMEXPORT alpm_db_get_valid(alpm_db_t *db)
-	if(_alpm_db_read(db, pkg, INFRQ_DESC)) {
+{
-		return(-1);
+	ASSERT(db != NULL, return -1);
+	db->handle->pm_errno = 0;
+	return db->ops->validate(db);
+}
+
+/** Get a package entry from a package database. */
+alpm_pkg_t SYMEXPORT *alpm_db_get_pkg(alpm_db_t *db, const char *name)
+{
+	alpm_pkg_t *pkg;
+	ASSERT(db != NULL, return NULL);
+	db->handle->pm_errno = 0;
+	ASSERT(name != NULL && strlen(name) != 0,
+			RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, NULL));
+
+	pkg = _alpm_db_get_pkgfromcache(db, name);
+	if(!pkg) {
+		RET_ERR(db->handle, ALPM_ERR_PKG_NOT_FOUND, NULL);
 	}
-	if(pkg->reason == reason) {
+	return pkg;
+}
+
+/** Get the package cache of a package database. */
+alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(alpm_db_t *db)
+{
+	ASSERT(db != NULL, return NULL);
+	db->handle->pm_errno = 0;
+	return _alpm_db_get_pkgcache(db);
+}
+
+/** Get a group entry from a package database. */
+alpm_group_t SYMEXPORT *alpm_db_readgroup(alpm_db_t *db, const char *name)
+{
+	ASSERT(db != NULL, return NULL);
+	db->handle->pm_errno = 0;
+	ASSERT(name != NULL && strlen(name) != 0,
+			RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, NULL));
+
+	return _alpm_db_get_groupfromcache(db, name);
+}
+
+/** Get the group cache of a package database. */
+alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db)
+{
+	ASSERT(db != NULL, return NULL);
+	db->handle->pm_errno = 0;
+
+	return _alpm_db_get_groupcache(db);
+}
+
+/** Searches a database. */
+alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t* needles)
+{
+	ASSERT(db != NULL, return NULL);
+	db->handle->pm_errno = 0;
+
+	return _alpm_db_search(db, needles);
+}
+
+/** Set install reason for a package in db. */
+int SYMEXPORT alpm_db_set_pkgreason(alpm_handle_t *handle, alpm_pkg_t *pkg,
+		alpm_pkgreason_t reason)
+{
+	CHECK_HANDLE(handle, return -1);
+	ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
+	ASSERT(pkg->origin == PKG_FROM_LOCALDB,
+			RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
+	ASSERT(pkg->origin_data.db == handle->db_local,
+			RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
+
+	_alpm_log(handle, ALPM_LOG_DEBUG,
+			"setting install reason %u for %s\n", reason, pkg->name);
+	if(alpm_pkg_get_reason(pkg) == reason) {
 		/* we are done */
-		return(0);
+		return 0;
 	}
 	/* set reason (in pkgcache) */
 	pkg->reason = reason;
 	/* write DESC */
-	if(_alpm_db_write(db, pkg, INFRQ_DESC)) {
+	if(_alpm_local_db_write(handle->db_local, pkg, INFRQ_DESC)) {
-		return(-1);
+		RET_ERR(handle, ALPM_ERR_DB_WRITE, -1);
 	}
 
-	return(0);
+	return 0;
 }
 
 /** @} */
 
-static pmdb_t *_alpm_db_new(const char *treename, int is_local)
+alpm_db_t *_alpm_db_new(const char *treename, int is_local)
 {
-	pmdb_t *db;
+	alpm_db_t *db;
 
-	ALPM_LOG_FUNC;
+	CALLOC(db, 1, sizeof(alpm_db_t), return NULL);
+	STRDUP(db->treename, treename, return NULL);
+	if(is_local) {
+		db->status |= DB_STATUS_LOCAL;
+	} else {
+		db->status &= ~DB_STATUS_LOCAL;
+	}
 
-	CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	return db;
-	STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL));
-	db->is_local = is_local;
-
-	return(db);
 }
 
-void _alpm_db_free(pmdb_t *db)
+void _alpm_db_free(alpm_db_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	/* cleanup pkgcache */
 	_alpm_db_free_pkgcache(db);
 	/* cleanup server list */
@@ -389,53 +348,51 @@ void _alpm_db_free(pmdb_t *db)
 	return;
 }
 
-const char *_alpm_db_path(pmdb_t *db)
+const char *_alpm_db_path(alpm_db_t *db)
 {
 	if(!db) {
-		return(NULL);
+		return NULL;
 	}
 	if(!db->_path) {
 		const char *dbpath;
 		size_t pathsize;
 
-		dbpath = alpm_option_get_dbpath();
+		dbpath = db->handle->dbpath;
 		if(!dbpath) {
-			_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
+			_alpm_log(db->handle, ALPM_LOG_ERROR, _("database path is undefined\n"));
-			RET_ERR(PM_ERR_DB_OPEN, NULL);
+			RET_ERR(db->handle, ALPM_ERR_DB_OPEN, NULL);
 		}
 
-		if(db->is_local) {
+		if(db->status & DB_STATUS_LOCAL) {
 			pathsize = strlen(dbpath) + strlen(db->treename) + 2;
-			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			CALLOC(db->_path, 1, pathsize, RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL));
 			sprintf(db->_path, "%s%s/", dbpath, db->treename);
 		} else {
-			pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 2;
+			pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 4;
-			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			CALLOC(db->_path, 1, pathsize, RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL));
 			/* all sync DBs now reside in the sync/ subdir of the dbpath */
-			sprintf(db->_path, "%ssync/%s/", dbpath, db->treename);
+			sprintf(db->_path, "%ssync/%s.db", dbpath, db->treename);
 		}
-		_alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n",
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "database path for tree %s set to %s\n",
 				db->treename, db->_path);
 	}
-	return(db->_path);
+	return db->_path;
 }
 
 int _alpm_db_cmp(const void *d1, const void *d2)
 {
-	pmdb_t *db1 = (pmdb_t *)d1;
+	const alpm_db_t *db1 = d1;
-	pmdb_t *db2 = (pmdb_t *)d2;
+	const alpm_db_t *db2 = d2;
-	return(strcmp(db1->treename, db2->treename));
+	return strcmp(db1->treename, db2->treename);
 }
 
-alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
+alpm_list_t *_alpm_db_search(alpm_db_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;
-
 	for(i = needles; i; i = i->next) {
 		char *targ;
 		regex_t reg;
@@ -445,16 +402,16 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 		}
 		ret = NULL;
 		targ = i->data;
-		_alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ);
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "searching for target '%s'\n", targ);
 
 		if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) {
-			RET_ERR(PM_ERR_INVALID_REGEX, NULL);
+			RET_ERR(db->handle, ALPM_ERR_INVALID_REGEX, NULL);
 		}
 
 		for(j = list; j; j = j->next) {
-			pmpkg_t *pkg = j->data;
+			alpm_pkg_t *pkg = j->data;
 			const char *matched = NULL;
-			const char *name = alpm_pkg_get_name(pkg);
+			const char *name = pkg->name;
 			const char *desc = alpm_pkg_get_desc(pkg);
 
 			/* check name as regex AND as plain text */
@@ -462,7 +419,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 				matched = name;
 			}
 			/* check desc */
-			else if (desc && regexec(&reg, desc, 0, 0, 0) == 0) {
+			else if(desc && regexec(&reg, desc, 0, 0, 0) == 0) {
 				matched = desc;
 			}
 			/* TODO: should we be doing this, and should we print something
@@ -470,7 +427,8 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 			if(!matched) {
 				/* check provides */
 				for(k = alpm_pkg_get_provides(pkg); k; k = k->next) {
-					if (regexec(&reg, k->data, 0, 0, 0) == 0) {
+					alpm_depend_t *provide = k->data;
+					if(regexec(&reg, provide->name, 0, 0, 0) == 0) {
 						matched = k->data;
 						break;
 					}
@@ -479,7 +437,7 @@ 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) {
+					if(regexec(&reg, k->data, 0, 0, 0) == 0) {
 						matched = k->data;
 						break;
 					}
@@ -487,7 +445,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 			}
 
 			if(matched != NULL) {
-				_alpm_log(PM_LOG_DEBUG, "    search target '%s' matched '%s'\n",
+				_alpm_log(db->handle, ALPM_LOG_DEBUG, "    search target '%s' matched '%s'\n",
 				          targ, matched);
 				ret = alpm_list_add(ret, pkg);
 			}
@@ -500,55 +458,242 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 		regfree(&reg);
 	}
 
-	return(ret);
+	return ret;
 }
 
-pmdb_t *_alpm_db_register_local(void)
+/* Returns a new package cache from db.
+ * It frees the cache if it already exists.
+ */
+static int load_pkgcache(alpm_db_t *db)
 {
-	pmdb_t *db;
+	_alpm_db_free_pkgcache(db);
 
-	ALPM_LOG_FUNC;
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "loading package cache for repository '%s'\n",
-
+			db->treename);
-	if(handle->db_local != NULL) {
+	if(db->ops->populate(db) == -1) {
-		_alpm_log(PM_LOG_WARNING, _("attempt to re-register the 'local' DB\n"));
+		_alpm_log(db->handle, ALPM_LOG_DEBUG,
-		RET_ERR(PM_ERR_DB_NOT_NULL, NULL);
+				"failed to load package cache for repository '%s'\n", db->treename);
+		return -1;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "registering local database\n");
+	db->status |= DB_STATUS_PKGCACHE;
+	return 0;
+}
 
-	db = _alpm_db_new("local", 1);
+static void free_groupcache(alpm_db_t *db)
+{
+	alpm_list_t *lg;
+
+	if(db == NULL || !(db->status & DB_STATUS_GRPCACHE)) {
+		return;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_DEBUG,
+			"freeing group cache for repository '%s'\n", db->treename);
+
+	for(lg = db->grpcache; lg; lg = lg->next) {
+		_alpm_group_free(lg->data);
+		lg->data = NULL;
+	}
+	FREELIST(db->grpcache);
+	db->status &= ~DB_STATUS_GRPCACHE;
+}
+
+void _alpm_db_free_pkgcache(alpm_db_t *db)
+{
+	if(db == NULL || !(db->status & DB_STATUS_PKGCACHE)) {
+		return;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_DEBUG,
+			"freeing package cache for repository '%s'\n", db->treename);
+
+	if(db->pkgcache) {
+		alpm_list_free_inner(db->pkgcache->list,
+				(alpm_list_fn_free)_alpm_pkg_free);
+		_alpm_pkghash_free(db->pkgcache);
+	}
+	db->status &= ~DB_STATUS_PKGCACHE;
+
+	free_groupcache(db);
+}
+
+alpm_pkghash_t *_alpm_db_get_pkgcache_hash(alpm_db_t *db)
+{
 	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_CREATE, NULL);
+		return NULL;
 	}
 
-	handle->db_local = db;
+	if(!(db->status & DB_STATUS_VALID)) {
-	return(db);
+		RET_ERR(db->handle, ALPM_ERR_DB_INVALID, NULL);
+	}
+
+	if(!(db->status & DB_STATUS_PKGCACHE)) {
+		load_pkgcache(db);
+	}
+
+	return db->pkgcache;
 }
 
-pmdb_t *_alpm_db_register_sync(const char *treename)
+alpm_list_t *_alpm_db_get_pkgcache(alpm_db_t *db)
 {
-	pmdb_t *db;
+	alpm_pkghash_t *hash = _alpm_db_get_pkgcache_hash(db);
-	alpm_list_t *i;
 
-	ALPM_LOG_FUNC;
+	if(hash == NULL) {
+		return NULL;
+	}
 
-	for(i = handle->dbs_sync; i; i = i->next) {
+	return hash->list;
-		pmdb_t *sdb = i->data;
+}
-		if(strcmp(treename, sdb->treename) == 0) {
+
-			_alpm_log(PM_LOG_DEBUG, "attempt to re-register the '%s' database, using existing\n", sdb->treename);
+/* "duplicate" pkg then add it to pkgcache */
-			return sdb;
+int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg)
+{
+	alpm_pkg_t *newpkg;
+
+	if(db == NULL || pkg == NULL || !(db->status & DB_STATUS_PKGCACHE)) {
+		return -1;
+	}
+
+	if(_alpm_pkg_dup(pkg, &newpkg)) {
+		return -1;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
+						newpkg->name, db->treename);
+	db->pkgcache = _alpm_pkghash_add_sorted(db->pkgcache, newpkg);
+
+	free_groupcache(db);
+
+	return 0;
+}
+
+int _alpm_db_remove_pkgfromcache(alpm_db_t *db, alpm_pkg_t *pkg)
+{
+	alpm_pkg_t *data = NULL;
+
+	if(db == NULL || pkg == NULL || !(db->status & DB_STATUS_PKGCACHE)) {
+		return -1;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n",
+						pkg->name, db->treename);
+
+	db->pkgcache = _alpm_pkghash_remove(db->pkgcache, pkg, &data);
+	if(data == NULL) {
+		/* package not found */
+		_alpm_log(db->handle, ALPM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n",
+							pkg->name, db->treename);
+		return -1;
+	}
+
+	_alpm_pkg_free(data);
+
+	free_groupcache(db);
+
+	return 0;
+}
+
+alpm_pkg_t *_alpm_db_get_pkgfromcache(alpm_db_t *db, const char *target)
+{
+	if(db == NULL) {
+		return NULL;
+	}
+
+	alpm_pkghash_t *pkgcache = _alpm_db_get_pkgcache_hash(db);
+	if(!pkgcache) {
+		return NULL;
+	}
+
+	return _alpm_pkghash_find(pkgcache, target);
+}
+
+/* Returns a new group cache from db.
+ */
+static int load_grpcache(alpm_db_t *db)
+{
+	alpm_list_t *lp;
+
+	if(db == NULL) {
+		return -1;
+	}
+
+	_alpm_log(db->handle, ALPM_LOG_DEBUG, "loading group cache for repository '%s'\n",
+			db->treename);
+
+	for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
+		const alpm_list_t *i;
+		alpm_pkg_t *pkg = lp->data;
+
+		for(i = alpm_pkg_get_groups(pkg); i; i = i->next) {
+			const char *grpname = i->data;
+			alpm_list_t *j;
+			alpm_group_t *grp = NULL;
+			int found = 0;
+
+			/* first look through the group cache for a group with this name */
+			for(j = db->grpcache; j; j = j->next) {
+				grp = j->data;
+
+				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_group_new(grpname);
+			if(!grp) {
+				free_groupcache(db);
+				return -1;
+			}
+			grp->packages = alpm_list_add(grp->packages, pkg);
+			db->grpcache = alpm_list_add(db->grpcache, grp);
 		}
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
+	db->status |= DB_STATUS_GRPCACHE;
+	return 0;
+}
 
-	db = _alpm_db_new(treename, 0);
+alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db)
+{
 	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_CREATE, NULL);
+		return NULL;
 	}
 
-	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
+	if(!(db->status & DB_STATUS_VALID)) {
-	return(db);
+		RET_ERR(db->handle, ALPM_ERR_DB_INVALID, NULL);
+	}
+
+	if(!(db->status & DB_STATUS_GRPCACHE)) {
+		load_grpcache(db);
+	}
+
+	return db->grpcache;
+}
+
+alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target)
+{
+	alpm_list_t *i;
+
+	if(db == NULL || target == NULL || strlen(target) == 0) {
+		return NULL;
+	}
+
+	for(i = _alpm_db_get_groupcache(db); i; i = i->next) {
+		alpm_group_t *info = i->data;
+
+		if(strcmp(info->name, target) == 0) {
+			return info;
+		}
+	}
+
+	return NULL;
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/db.h

@@ -1,7 +1,7 @@
 /*
  *  db.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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>
@@ -22,50 +22,90 @@
 #ifndef _ALPM_DB_H
 #define _ALPM_DB_H
 
-#include "alpm.h"
-#include <limits.h>
 #include <time.h>
 
+/* libarchive */
+#include <archive.h>
+#include <archive_entry.h>
+
+#include "alpm.h"
+#include "pkghash.h"
+#include "signing.h"
+
 /* Database entries */
-typedef enum _pmdbinfrq_t {
+typedef enum _alpm_dbinfrq_t {
 	INFRQ_BASE = 1,
 	INFRQ_DESC = (1 << 1),
-	INFRQ_DEPENDS = (1 << 2),
+	INFRQ_FILES = (1 << 2),
-	INFRQ_FILES = (1 << 3),
+	INFRQ_SCRIPTLET = (1 << 3),
-	INFRQ_SCRIPTLET = (1 << 4),
+	INFRQ_DSIZE = (1 << 4),
-	INFRQ_DELTAS = (1 << 5),
-	INFRQ_DSIZE = (1 << 6),
 	/* ALL should be info stored in the package or database */
-	INFRQ_ALL = 0x3F
+	INFRQ_ALL = 0x1F,
-} pmdbinfrq_t;
+	INFRQ_ERROR = (1 << 31)
+} alpm_dbinfrq_t;
+
+/** Database status. Bitflags. */
+enum _alpm_dbstatus_t {
+	DB_STATUS_VALID = (1 << 0),
+	DB_STATUS_INVALID = (1 << 1),
+	DB_STATUS_EXISTS = (1 << 2),
+	DB_STATUS_MISSING = (1 << 3),
+
+	DB_STATUS_LOCAL = (1 << 10),
+	DB_STATUS_PKGCACHE = (1 << 11),
+	DB_STATUS_GRPCACHE = (1 << 12)
+};
+
+struct db_operations {
+	int (*validate) (alpm_db_t *);
+	int (*populate) (alpm_db_t *);
+	void (*unregister) (alpm_db_t *);
+};
 
 /* Database */
-struct __pmdb_t {
+struct __alpm_db_t {
+	alpm_handle_t *handle;
 	char *treename;
 	/* do not access directly, use _alpm_db_path(db) for lazy access */
 	char *_path;
-	int pkgcache_loaded;
+	alpm_pkghash_t *pkgcache;
-	int grpcache_loaded;
-	int is_local;
-	alpm_list_t *pkgcache;
 	alpm_list_t *grpcache;
 	alpm_list_t *servers;
+	struct db_operations *ops;
+	/* flags determining validity, local, loaded caches, etc. */
+	enum _alpm_dbstatus_t status;
+	alpm_siglevel_t siglevel;
 };
 
-/* db.c, database general calls */
-void _alpm_db_free(pmdb_t *db);
-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);
 
-/* be.c, backend specific calls */
+/* db.c, database general calls */
-int _alpm_db_populate(pmdb_t *db);
+alpm_db_t *_alpm_db_new(const char *treename, int is_local);
-int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
+void _alpm_db_free(alpm_db_t *db);
-int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);
+const char *_alpm_db_path(alpm_db_t *db);
-int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
+int _alpm_db_cmp(const void *d1, const void *d2);
-int _alpm_db_remove(pmdb_t *db, pmpkg_t *info);
+alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles);
+alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle);
+alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
+		alpm_siglevel_t level);
+void _alpm_db_unregister(alpm_db_t *db);
+
+/* be_*.c, backend specific calls */
+int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info);
+int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq);
+int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info);
+char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info, const char *filename);
+
+/* cache bullshit */
+/* packages */
+void _alpm_db_free_pkgcache(alpm_db_t *db);
+int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg);
+int _alpm_db_remove_pkgfromcache(alpm_db_t *db, alpm_pkg_t *pkg);
+alpm_pkghash_t *_alpm_db_get_pkgcache_hash(alpm_db_t *db);
+alpm_list_t *_alpm_db_get_pkgcache(alpm_db_t *db);
+alpm_pkg_t *_alpm_db_get_pkgfromcache(alpm_db_t *db, const char *target);
+/* groups */
+alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db);
+alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target);
 
 #endif /* _ALPM_DB_H */
 

lib/libalpm/delta.c

@@ -1,7 +1,7 @@
 /*
  *  delta.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -34,51 +34,18 @@
 #include "log.h"
 #include "graph.h"
 
-/** \addtogroup alpm_deltas Delta Functions
- * @brief Functions to manipulate libalpm deltas
- * @{
- */
-
-const char SYMEXPORT *alpm_delta_get_from(pmdelta_t *delta)
-{
-	ASSERT(delta != NULL, return(NULL));
-	return(delta->from);
-}
-
-const char SYMEXPORT *alpm_delta_get_to(pmdelta_t *delta)
-{
-	ASSERT(delta != NULL, return(NULL));
-	return(delta->to);
-}
-
-const char SYMEXPORT *alpm_delta_get_filename(pmdelta_t *delta)
-{
-	ASSERT(delta != NULL, return(NULL));
-	return(delta->delta);
-}
-
-const char SYMEXPORT *alpm_delta_get_md5sum(pmdelta_t *delta)
-{
-	ASSERT(delta != NULL, return(NULL));
-	return(delta->delta_md5);
-}
-
-off_t SYMEXPORT alpm_delta_get_size(pmdelta_t *delta)
-{
-	ASSERT(delta != NULL, return(-1));
-	return(delta->delta_size);
-}
-
-/** @} */
-
 static alpm_list_t *graph_init(alpm_list_t *deltas, int reverse)
 {
 	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();
+		alpm_graph_t *v = _alpm_graph_new();
-		pmdelta_t *vdelta = i->data;
+		if(!v) {
+			alpm_list_free(vertices);
+			return NULL;
+		}
+		alpm_delta_t *vdelta = i->data;
 		vdelta->download_size = vdelta->delta_size;
 		v->weight = LONG_MAX;
 		v->data = vdelta;
@@ -87,12 +54,12 @@ static alpm_list_t *graph_init(alpm_list_t *deltas, int reverse)
 
 	/* compute the edges */
 	for(i = vertices; i; i = i->next) {
-		pmgraph_t *v_i = i->data;
+		alpm_graph_t *v_i = i->data;
-		pmdelta_t *d_i = v_i->data;
+		alpm_delta_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;
+			alpm_graph_t *v_j = j->data;
-			pmdelta_t *d_j = v_j->data;
+			alpm_delta_t *d_j = v_j->data;
 			/* We want to create a delta tree like the following:
 			 *          1_to_2
 			 *            |
@@ -108,29 +75,45 @@ static alpm_list_t *graph_init(alpm_list_t *deltas, int reverse)
 		}
 		v_i->childptr = v_i->children;
 	}
-	return(vertices);
+	return vertices;
 }
 
-static void graph_init_size(alpm_list_t *vertices)
+static void graph_init_size(alpm_handle_t *handle, alpm_list_t *vertices)
 {
 	alpm_list_t *i;
 
 	for(i = vertices; i; i = i->next) {
 		char *fpath, *md5sum;
-		pmgraph_t *v = i->data;
+		alpm_graph_t *v = i->data;
-		pmdelta_t *vdelta = v->data;
+		alpm_delta_t *vdelta = v->data;
 
 		/* determine whether the delta file already exists */
-		fpath = _alpm_filecache_find(vdelta->delta);
+		fpath = _alpm_filecache_find(handle, vdelta->delta);
-		md5sum = alpm_compute_md5sum(fpath);
+		if(fpath) {
-		if(fpath && md5sum && strcmp(md5sum, vdelta->delta_md5) == 0) {
+			md5sum = alpm_compute_md5sum(fpath);
-			vdelta->download_size = 0;
+			if(md5sum && strcmp(md5sum, vdelta->delta_md5) == 0) {
+				vdelta->download_size = 0;
+			}
+			FREE(md5sum);
+			FREE(fpath);
+		} else {
+			char *fnamepart;
+			CALLOC(fnamepart, strlen(vdelta->delta) + 6, sizeof(char), return);
+			sprintf(fnamepart, "%s.part", vdelta->delta);
+			fpath = _alpm_filecache_find(handle, fnamepart);
+			if(fpath) {
+				struct stat st;
+				if(stat(fpath, &st) == 0) {
+					vdelta->download_size = vdelta->delta_size - st.st_size;
+					vdelta->download_size = vdelta->download_size < 0 ? 0 : vdelta->download_size;
+				}
+				FREE(fpath);
+			}
+			FREE(fnamepart);
 		}
-		FREE(fpath);
-		FREE(md5sum);
 
 		/* determine whether a base 'from' file exists */
-		fpath = _alpm_filecache_find(vdelta->from);
+		fpath = _alpm_filecache_find(handle, vdelta->from);
 		if(fpath) {
 			v->weight = vdelta->download_size;
 		}
@@ -142,12 +125,12 @@ static void graph_init_size(alpm_list_t *vertices)
 static void dijkstra(alpm_list_t *vertices)
 {
 	alpm_list_t *i;
-	pmgraph_t *v;
+	alpm_graph_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;
+			alpm_graph_t *v_i = i->data;
 
 			if(v_i->state == -1) {
 				continue;
@@ -165,8 +148,8 @@ static void dijkstra(alpm_list_t *vertices)
 
 		v->childptr = v->children;
 		while(v->childptr) {
-			pmgraph_t *v_c = v->childptr->data;
+			alpm_graph_t *v_c = v->childptr->data;
-			pmdelta_t *d_c = v_c->data;
+			alpm_delta_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;
@@ -181,13 +164,13 @@ static void dijkstra(alpm_list_t *vertices)
 static off_t shortest_path(alpm_list_t *vertices, const char *to, alpm_list_t **path)
 {
 	alpm_list_t *i;
-	pmgraph_t *v = NULL;
+	alpm_graph_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;
+		alpm_graph_t *v_i = i->data;
-		pmdelta_t *d_i = v_i->data;
+		alpm_delta_t *d_i = v_i->data;
 
 		if(strcmp(d_i->to, to) == 0) {
 			if(v == NULL || v_i->weight < v->weight) {
@@ -198,54 +181,53 @@ static off_t shortest_path(alpm_list_t *vertices, const char *to, alpm_list_t **
 	}
 
 	while(v != NULL) {
-		pmdelta_t *vdelta = v->data;
+		alpm_delta_t *vdelta = v->data;
 		rpath = alpm_list_add(rpath, vdelta);
 		v = v->parent;
 	}
 	*path = alpm_list_reverse(rpath);
 	alpm_list_free(rpath);
 
-	return(bestsize);
+	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 file has
+ * @param handle the context handle
+ * @param deltas the list of alpm_delta_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
+ * @param path the pointer to a list location where alpm_delta_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
  */
-off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
+off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas,
 		const char *to, alpm_list_t **path)
 {
 	alpm_list_t *bestpath = NULL;
 	alpm_list_t *vertices;
 	off_t bestsize = LONG_MAX;
 
-	ALPM_LOG_FUNC;
-
 	if(deltas == NULL) {
 		*path = NULL;
-		return(bestsize);
+		return bestsize;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to);
+	_alpm_log(handle, ALPM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to);
 
 	vertices = graph_init(deltas, 0);
-	graph_init_size(vertices);
+	graph_init_size(handle, 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_log(handle, ALPM_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);
+	return bestsize;
 }
 
 static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota)
@@ -256,8 +238,8 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota
 	vertices = graph_init(deltas, 1);
 
 	for(i = vertices; i; i = i->next) {
-		pmgraph_t *v = i->data;
+		alpm_graph_t *v = i->data;
-		pmdelta_t *vdelta = v->data;
+		alpm_delta_t *vdelta = v->data;
 		if(strcmp(vdelta->to, to) == 0)
 		{
 			v->weight = vdelta->download_size;
@@ -265,39 +247,41 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota
 	}
 	dijkstra(vertices);
 	for(i = vertices; i; i = i->next) {
-		pmgraph_t *v = i->data;
+		alpm_graph_t *v = i->data;
-		pmdelta_t *vdelta = v->data;
+		alpm_delta_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);
+	return unused;
 }
 
-alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(pmpkg_t *pkg)
+/** \addtogroup alpm_deltas Delta Functions
+ * @brief Functions to manipulate libalpm deltas
+ * @{
+ */
+
+alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg)
 {
-	off_t pkgsize = alpm_pkg_get_size(pkg);
+	ASSERT(pkg != NULL, return NULL);
-	alpm_list_t *unused = find_unused(
+	return find_unused(pkg->deltas, pkg->filename, pkg->size * MAX_DELTA_RATIO);
-			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.
+/** Parses the string representation of a alpm_delta_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
+ * @return A pointer to the new alpm_delta_t object
  */
 /* TODO this does not really belong here, but in a parsing lib */
-pmdelta_t *_alpm_delta_parse(char *line)
+alpm_delta_t *_alpm_delta_parse(char *line)
 {
-	pmdelta_t *delta;
+	alpm_delta_t *delta;
 	char *tmp = line, *tmp2;
 	regex_t reg;
 
@@ -308,47 +292,59 @@ pmdelta_t *_alpm_delta_parse(char *line)
 	if(regexec(&reg, line, 0, 0, 0) != 0) {
 		/* delta line is invalid, return NULL */
 		regfree(&reg);
-		return(NULL);
+		return NULL;
 	}
 	regfree(&reg);
 
-	CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	CALLOC(delta, 1, sizeof(alpm_delta_t), return NULL);
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(delta->delta, tmp2, return NULL);
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(delta->delta_md5, tmp2, return NULL);
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	delta->delta_size = atol(tmp2);
+	delta->delta_size = _alpm_strtoofft(tmp2);
 
 	tmp2 = tmp;
 	tmp = strchr(tmp, ' ');
 	*(tmp++) = '\0';
-	STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(delta->from, tmp2, return NULL);
 
 	tmp2 = tmp;
-	STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(delta->to, tmp2, return NULL);
 
-	_alpm_log(PM_LOG_DEBUG, "delta : %s %s '%jd'\n", delta->from, delta->to, (intmax_t)delta->delta_size);
+	return delta;
-
-	return(delta);
 }
 
-void _alpm_delta_free(pmdelta_t *delta)
+void _alpm_delta_free(alpm_delta_t *delta)
 {
-	FREE(delta->from);
-	FREE(delta->to);
 	FREE(delta->delta);
 	FREE(delta->delta_md5);
+	FREE(delta->from);
+	FREE(delta->to);
 	FREE(delta);
 }
 
+alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta)
+{
+	alpm_delta_t *newdelta;
+	CALLOC(newdelta, 1, sizeof(alpm_delta_t), return NULL);
+	STRDUP(newdelta->delta, delta->delta, return NULL);
+	STRDUP(newdelta->delta_md5, delta->delta_md5, return NULL);
+	STRDUP(newdelta->from, delta->from, return NULL);
+	STRDUP(newdelta->to, delta->to, return NULL);
+	newdelta->delta_size = delta->delta_size;
+	newdelta->download_size = delta->download_size;
+
+	return newdelta;
+}
+
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/delta.h

@@ -1,7 +1,7 @@
 /*
  *  delta.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -20,30 +20,21 @@
 #ifndef _ALPM_DELTA_H
 #define _ALPM_DELTA_H
 
+#include "config.h" /* ensure off_t is correct length */
+
 #include <sys/types.h> /* off_t */
 
 #include "alpm.h"
 
-struct __pmdelta_t {
+alpm_delta_t *_alpm_delta_parse(char *line);
-	/** filename of the delta patch */
+void _alpm_delta_free(alpm_delta_t *delta);
-	char *delta;
+alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta);
-	/** md5sum of the delta file */
+off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas,
-	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;
-};
-
-pmdelta_t *_alpm_delta_parse(char *line);
-void _alpm_delta_free(pmdelta_t *delta);
-off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
 		const char *to, alpm_list_t **path);
 
+/* max percent of package size to download deltas */
+#define MAX_DELTA_RATIO 0.7
+
 #endif /* _ALPM_DELTA_H */
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/deps.h

@@ -1,7 +1,7 @@
 /*
  *  deps.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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,34 +27,17 @@
 #include "package.h"
 #include "alpm.h"
 
-/* Dependency */
+void _alpm_dep_free(alpm_depend_t *dep);
-struct __pmdepend_t {
+alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep);
-	pmdepmod_t mod;
+void _alpm_depmiss_free(alpm_depmissing_t *miss);
-	char *name;
+alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, int reverse);
-	char *version;
+int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit);
-};
+int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg,
-
-/* Missing dependency */
-struct __pmdepmissing_t {
-	char *target;
-	pmdepend_t *depend;
-	char *causingpkg; /* this is used in case of remove dependency error only */
-};
-
-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);
-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);
+alpm_depend_t *_alpm_splitdep(const char *depstring);
-pmdepend_t *_alpm_splitdep(const char *depstring);
+int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep);
-pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep);
+int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep);
 
 #endif /* _ALPM_DEPS_H */
 

lib/libalpm/diskspace.c

@@ -0,0 +1,337 @@
+/*
+ *  diskspace.c
+ *
+ *  Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#if defined(HAVE_MNTENT_H)
+#include <mntent.h>
+#endif
+#if defined(HAVE_SYS_STATVFS_H)
+#include <sys/statvfs.h>
+#endif
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
+#if defined(HAVE_SYS_MOUNT_H)
+#include <sys/mount.h>
+#endif
+#if defined(HAVE_SYS_UCRED_H)
+#include <sys/ucred.h>
+#endif
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+/* libalpm */
+#include "diskspace.h"
+#include "alpm_list.h"
+#include "util.h"
+#include "log.h"
+#include "trans.h"
+#include "handle.h"
+
+static int mount_point_cmp(const void *p1, const void *p2)
+{
+	const alpm_mountpoint_t *mp1 = p1;
+	const alpm_mountpoint_t *mp2 = p2;
+	/* the negation will sort all mountpoints before their parent */
+	return -strcmp(mp1->mount_dir, mp2->mount_dir);
+}
+
+static alpm_list_t *mount_point_list(alpm_handle_t *handle)
+{
+	alpm_list_t *mount_points = NULL, *ptr;
+	alpm_mountpoint_t *mp;
+
+#if defined HAVE_GETMNTENT
+	struct mntent *mnt;
+	FILE *fp;
+	struct statvfs fsp;
+
+	fp = setmntent(MOUNTED, "r");
+
+	if(fp == NULL) {
+		return NULL;
+	}
+
+	while((mnt = getmntent(fp))) {
+		if(!mnt) {
+			_alpm_log(handle, ALPM_LOG_WARNING, _("could not get filesystem information\n"));
+			continue;
+		}
+		if(statvfs(mnt->mnt_dir, &fsp) != 0) {
+			_alpm_log(handle, ALPM_LOG_WARNING,
+					_("could not get filesystem information for %s: %s\n"),
+					mnt->mnt_dir, strerror(errno));
+			continue;
+		}
+
+		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+		mp->mount_dir = strdup(mnt->mnt_dir);
+		mp->mount_dir_len = strlen(mp->mount_dir);
+		memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs));
+		mp->read_only = fsp.f_flag & ST_RDONLY;
+
+		mount_points = alpm_list_add(mount_points, mp);
+	}
+
+	endmntent(fp);
+#elif defined HAVE_GETMNTINFO
+	int entries;
+	FSSTATSTYPE *fsp;
+
+	entries = getmntinfo(&fsp, MNT_NOWAIT);
+
+	if(entries < 0) {
+		return NULL;
+	}
+
+	for(; entries-- > 0; fsp++) {
+		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+		mp->mount_dir = strdup(fsp->f_mntonname);
+		mp->mount_dir_len = strlen(mp->mount_dir);
+		memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE));
+#if defined(HAVE_GETMNTINFO_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_FLAG)
+		mp->read_only = fsp->f_flag & ST_RDONLY;
+#elif defined(HAVE_GETMNTINFO_STATFS) && defined(HAVE_STRUCT_STATFS_F_FLAGS)
+		mp->read_only = fsp->f_flags & MNT_RDONLY;
+#endif
+
+		mount_points = alpm_list_add(mount_points, mp);
+	}
+#endif
+
+	mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points),
+			mount_point_cmp);
+	for(ptr = mount_points; ptr != NULL; ptr = ptr->next) {
+		mp = ptr->data;
+		_alpm_log(handle, ALPM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir);
+	}
+	return mount_points;
+}
+
+static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points,
+		const char *real_path)
+{
+	const alpm_list_t *mp;
+
+	for(mp = mount_points; mp != NULL; mp = mp->next) {
+		alpm_mountpoint_t *data = mp->data;
+
+		if(strncmp(data->mount_dir, real_path, data->mount_dir_len) == 0) {
+			return data;
+		}
+	}
+
+	/* should not get here... */
+	return NULL;
+}
+
+static int calculate_removed_size(alpm_handle_t *handle,
+		const alpm_list_t *mount_points, alpm_pkg_t *pkg)
+{
+	size_t i;
+	alpm_filelist_t *filelist = alpm_pkg_get_files(pkg);
+
+	if(!filelist->count) {
+		return 0;
+	}
+
+	for(i = 0; i < filelist->count; i++) {
+		const alpm_file_t *file = filelist->files + i;
+		alpm_mountpoint_t *mp;
+		struct stat st;
+		char path[PATH_MAX];
+		const char *filename = file->name;
+
+		snprintf(path, PATH_MAX, "%s%s", handle->root, filename);
+		_alpm_lstat(path, &st);
+
+		/* skip directories and symlinks to be consistent with libarchive that
+		 * reports them to be zero size */
+		if(S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode)) {
+			continue;
+		}
+
+		mp = match_mount_point(mount_points, path);
+		if(mp == NULL) {
+			_alpm_log(handle, ALPM_LOG_WARNING,
+					_("could not determine mount point for file %s\n"), filename);
+			continue;
+		}
+
+		/* the addition of (divisor - 1) performs ceil() with integer division */
+		mp->blocks_needed -=
+			(st.st_size + mp->fsp.f_bsize - 1) / mp->fsp.f_bsize;
+		mp->used |= USED_REMOVE;
+	}
+
+	return 0;
+}
+
+static int calculate_installed_size(alpm_handle_t *handle,
+		const alpm_list_t *mount_points, alpm_pkg_t *pkg)
+{
+	size_t i;
+	alpm_filelist_t *filelist = alpm_pkg_get_files(pkg);
+
+	if(!filelist->count) {
+		return 0;
+	}
+
+	for(i = 0; i < filelist->count; i++) {
+		const alpm_file_t *file = filelist->files + i;
+		alpm_mountpoint_t *mp;
+		char path[PATH_MAX];
+		const char *filename = file->name;
+
+		/* libarchive reports these as zero size anyways */
+		/* NOTE: if we do start accounting for directory size, a dir matching a
+		 * mountpoint needs to be attributed to the parent, not the mountpoint. */
+		if(S_ISDIR(file->mode) || S_ISLNK(file->mode)) {
+			continue;
+		}
+
+		/* approximate space requirements for db entries */
+		if(filename[0] == '.') {
+			filename = handle->dbpath;
+		}
+
+		snprintf(path, PATH_MAX, "%s%s", handle->root, filename);
+
+		mp = match_mount_point(mount_points, path);
+		if(mp == NULL) {
+			_alpm_log(handle, ALPM_LOG_WARNING,
+					_("could not determine mount point for file %s\n"), filename);
+			continue;
+		}
+
+		/* the addition of (divisor - 1) performs ceil() with integer division */
+		mp->blocks_needed +=
+			(file->size + mp->fsp.f_bsize - 1) / mp->fsp.f_bsize;
+		mp->used |= USED_INSTALL;
+	}
+
+	return 0;
+}
+
+int _alpm_check_diskspace(alpm_handle_t *handle)
+{
+	alpm_list_t *mount_points, *i;
+	alpm_mountpoint_t *root_mp;
+	size_t replaces = 0, current = 0, numtargs;
+	int error = 0;
+	alpm_list_t *targ;
+	alpm_trans_t *trans = handle->trans;
+
+	numtargs = alpm_list_count(trans->add);
+	mount_points = mount_point_list(handle);
+	if(mount_points == NULL) {
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not determine filesystem mount points\n"));
+		return -1;
+	}
+	root_mp = match_mount_point(mount_points, handle->root);
+	if(root_mp == NULL) {
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not determine root mount point %s\n"),
+				handle->root);
+		error = 1;
+		goto finish;
+	}
+
+	replaces = alpm_list_count(trans->remove);
+	if(replaces) {
+		numtargs += replaces;
+		for(targ = trans->remove; targ; targ = targ->next, current++) {
+			alpm_pkg_t *local_pkg;
+			int percent = (current * 100) / numtargs;
+			PROGRESS(handle, ALPM_PROGRESS_DISKSPACE_START, "", percent,
+					numtargs, current);
+
+			local_pkg = targ->data;
+			calculate_removed_size(handle, mount_points, local_pkg);
+		}
+	}
+
+	for(targ = trans->add; targ; targ = targ->next, current++) {
+		alpm_pkg_t *pkg, *local_pkg;
+		int percent = (current * 100) / numtargs;
+		PROGRESS(handle, ALPM_PROGRESS_DISKSPACE_START, "", percent,
+				numtargs, current);
+
+		pkg = targ->data;
+		/* is this package already installed? */
+		local_pkg = _alpm_db_get_pkgfromcache(handle->db_local, pkg->name);
+		if(local_pkg) {
+			calculate_removed_size(handle, mount_points, local_pkg);
+		}
+		calculate_installed_size(handle, mount_points, pkg);
+
+		for(i = mount_points; i; i = i->next) {
+			alpm_mountpoint_t *data = i->data;
+			if(data->blocks_needed > data->max_blocks_needed) {
+				data->max_blocks_needed = data->blocks_needed;
+			}
+		}
+	}
+
+	PROGRESS(handle, ALPM_PROGRESS_DISKSPACE_START, "", 100,
+			numtargs, current);
+
+	for(i = mount_points; i; i = i->next) {
+		alpm_mountpoint_t *data = i->data;
+		if(data->used && data->read_only) {
+			_alpm_log(handle, ALPM_LOG_ERROR, _("Partition %s is mounted read only\n"),
+					data->mount_dir);
+			error = 1;
+		} else if(data->used & USED_INSTALL) {
+			/* cushion is roughly min(5% capacity, 20MiB) */
+			fsblkcnt_t fivepc = (data->fsp.f_blocks / 20) + 1;
+			fsblkcnt_t twentymb = (20 * 1024 * 1024 / data->fsp.f_bsize) + 1;
+			fsblkcnt_t cushion = fivepc < twentymb ? fivepc : twentymb;
+			blkcnt_t needed = data->max_blocks_needed + cushion;
+
+			_alpm_log(handle, ALPM_LOG_DEBUG,
+					"partition %s, needed %jd, cushion %ju, free %ju\n",
+					data->mount_dir, (intmax_t)data->max_blocks_needed,
+					(uintmax_t)cushion, (uintmax_t)data->fsp.f_bfree);
+			if(needed >= 0 && (fsblkcnt_t)needed > data->fsp.f_bfree) {
+				_alpm_log(handle, ALPM_LOG_ERROR,
+						_("Partition %s too full: %jd blocks needed, %jd blocks free\n"),
+						data->mount_dir, (intmax_t)needed, (uintmax_t)data->fsp.f_bfree);
+				error = 1;
+			}
+		}
+	}
+
+finish:
+	for(i = mount_points; i; i = i->next) {
+		alpm_mountpoint_t *data = i->data;
+		FREE(data->mount_dir);
+	}
+	FREELIST(mount_points);
+
+	if(error) {
+		RET_ERR(handle, ALPM_ERR_DISK_SPACE, -1);
+	}
+
+	return 0;
+}
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/diskspace.h

@@ -0,0 +1,56 @@
+/*
+ *  diskspace.h
+ *
+ *  Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ALPM_DISKSPACE_H
+#define _ALPM_DISKSPACE_H
+
+#if defined(HAVE_SYS_MOUNT_H)
+#include <sys/mount.h>
+#endif
+#if defined(HAVE_SYS_STATVFS_H)
+#include <sys/statvfs.h>
+#endif
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+#include "alpm.h"
+
+enum mount_used_level {
+	USED_REMOVE = 1,
+	USED_INSTALL = (1 << 1),
+};
+
+typedef struct __alpm_mountpoint_t {
+	/* mount point information */
+	char *mount_dir;
+	size_t mount_dir_len;
+	/* storage for additional disk usage calculations */
+	blkcnt_t blocks_needed;
+	blkcnt_t max_blocks_needed;
+	enum mount_used_level used;
+	int read_only;
+	FSSTATSTYPE fsp;
+} alpm_mountpoint_t;
+
+int _alpm_check_diskspace(alpm_handle_t *handle);
+
+#endif /* _ALPM_DISKSPACE_H */
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/dload.c

@@ -1,7 +1,7 @@
 /*
  *  download.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -29,17 +29,9 @@
 #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)
+#ifdef HAVE_LIBCURL
-#include <fetch.h>
+#include <curl/curl.h>
 #endif
 
 /* libalpm */
@@ -50,391 +42,574 @@
 #include "util.h"
 #include "handle.h"
 
-static char *get_filename(const char *url) {
+#ifdef HAVE_LIBCURL
+static const char *get_filename(const char *url)
+{
 	char *filename = strrchr(url, '/');
 	if(filename != NULL) {
 		filename++;
 	}
-	return(filename);
+	return filename;
 }
 
-#if defined(INTERNAL_DOWNLOAD)
+static char *get_fullpath(const char *path, const char *filename,
-static char *get_destfile(const char *path, const char *filename) {
+		const char *suffix)
-	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");
+	char *filepath;
-	if(strcmp(SCHEME_FILE, fileurl->scheme) != 0) {
+	/* len = localpath len + filename len + suffix len + null */
-		host = fileurl->host;
+	size_t len = strlen(path) + strlen(filename) + strlen(suffix) + 1;
-	}
+	MALLOC(filepath, len, return NULL);
-	return(host);
+	snprintf(filepath, len, "%s%s%s", path, filename, suffix);
+
+	return filepath;
 }
 
-int dload_interrupted;
+static CURL *get_libcurl_handle(alpm_handle_t *handle)
-static RETSIGTYPE inthandler(int signum)
 {
-	dload_interrupted = 1;
+	if(!handle->curl) {
+		curl_global_init(CURL_GLOBAL_SSL);
+		handle->curl = curl_easy_init();
+	}
+	return handle->curl;
 }
 
-#define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; }
+enum {
-enum sighandlers { OLD = 0, NEW = 1 };
+	ABORT_SIGINT = 1,
+	ABORT_OVER_MAXFILESIZE
+};
 
-static int download_internal(const char *url, const char *localpath,
+static int dload_interrupted;
-		int force) {
+static void inthandler(int UNUSED signum)
-	FILE *localf = NULL;
+{
-	struct stat st;
+	dload_interrupted = ABORT_SIGINT;
-	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;
+static int curl_progress(void *file, double dltotal, double dlnow,
-	time_t local_time = 0;
+		double UNUSED ultotal, double UNUSED ulnow)
+{
+	struct dload_payload *payload = (struct dload_payload *)file;
+	off_t current_size, total_size;
 
-	struct url *fileurl;
+	/* SIGINT sent, abort by alerting curl */
-	struct url_stat ust;
+	if(dload_interrupted) {
-	fetchIO *dlf = NULL;
+		return 1;
-
-	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);
+	current_size = payload->initial_size + (off_t)dlnow;
-	if(!fileurl) {
+
-		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
+	/* is our filesize still under any set limit? */
-		RET_ERR(PM_ERR_LIBFETCH, -1);
+	if(payload->max_size && current_size > payload->max_size) {
+		dload_interrupted = ABORT_OVER_MAXFILESIZE;
+		return 1;
 	}
 
-	destfile = get_destfile(localpath, filename);
+	/* none of what follows matters if the front end has no callback */
-	tempfile = get_tempfile(localpath, filename);
+	if(payload->handle->dlcb == NULL) {
+		return 0;
+	}
 
-	if(stat(tempfile, &st) == 0 && st.st_size > 0) {
+	total_size = payload->initial_size + (off_t)dltotal;
-		_alpm_log(PM_LOG_DEBUG, "tempfile found, attempting continuation\n");
+
-		local_time = fileurl->last_modified = st.st_mtime;
+	if(DOUBLE_EQ(dltotal, 0.0) || payload->prevprogress == total_size) {
-		local_size = fileurl->offset = (off_t)st.st_size;
+		return 0;
-		dl_thisfile = st.st_size;
+	}
-		localf = fopen(tempfile, "ab");
+
-	} else if(!force && stat(destfile, &st) == 0 && st.st_size > 0) {
+	/* initialize the progress bar here to avoid displaying it when
-		_alpm_log(PM_LOG_DEBUG, "destfile found, using mtime only\n");
+	 * a repo is up to date and nothing gets downloaded */
-		local_time = fileurl->last_modified = st.st_mtime;
+	if(payload->prevprogress == 0) {
-		local_size = /* no fu->off here */ (off_t)st.st_size;
+		payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal);
+	}
+
+	payload->handle->dlcb(payload->remote_name, current_size, total_size);
+
+	payload->prevprogress = current_size;
+
+	return 0;
+}
+
+static int curl_gethost(const char *url, char *buffer)
+{
+	size_t hostlen;
+	char *p, *q;
+
+	if(strncmp(url, "file://", 7) == 0) {
+		strcpy(buffer, _("disk"));
 	} else {
-		_alpm_log(PM_LOG_DEBUG, "no file found matching criteria, starting from scratch\n");
+		p = strstr(url, "//");
+		if(!p) {
+			return 1;
+		}
+		p += 2; /* jump over the found // */
+		hostlen = strcspn(p, "/");
+
+		/* there might be a user:pass@ on the URL. hide it. avoid using memrchr()
+		 * for portability concerns. */
+		q = p + hostlen;
+		while(--q > p) {
+			if(*q == '@') {
+				break;
+			}
+		}
+		if(*q == '@' && p != q) {
+			hostlen -= q - p + 1;
+			p = q + 1;
+		}
+
+		if(hostlen > 255) {
+			/* buffer overflow imminent */
+			return 1;
+		}
+		snprintf(buffer, hostlen + 1, "%s", p);
 	}
 
-	/* pass the raw filename for passing to the callback function */
+	return 0;
-	_alpm_log(PM_LOG_DEBUG, "using '%s' for download progress\n", filename);
+}
 
-	/* print proxy info for debug purposes */
+static int utimes_long(const char *path, long seconds)
-	_alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY"));
+{
-	_alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy"));
+	if(seconds != -1) {
-	_alpm_log(PM_LOG_DEBUG, "FTP_PROXY:  %s\n", getenv("FTP_PROXY"));
+		struct timeval tv[2];
-	_alpm_log(PM_LOG_DEBUG, "ftp_proxy:  %s\n", getenv("ftp_proxy"));
+		memset(&tv, 0, sizeof(tv));
+		tv[0].tv_sec = tv[1].tv_sec = seconds;
+		return utimes(path, tv);
+	}
+	return 0;
+}
 
-	/* 10s timeout */
+static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user)
-	fetchTimeout = 10;
+{
+	size_t realsize = size * nmemb;
+	const char *fptr, *endptr = NULL;
+	const char * const cd_header = "Content-Disposition:";
+	const char * const fn_key = "filename=";
+	struct dload_payload *payload = (struct dload_payload *)user;
+
+	if(_alpm_raw_ncmp(cd_header, ptr, strlen(cd_header)) == 0) {
+		if((fptr = strstr(ptr, fn_key))) {
+			fptr += strlen(fn_key);
+
+			/* find the end of the field, which is either a semi-colon, or the end of
+			 * the data. As per curl_easy_setopt(3), we cannot count on headers being
+			 * null terminated, so we look for the closing \r\n */
+			endptr = fptr + strcspn(fptr, ";\r\n") - 1;
+
+			/* remove quotes */
+			if(*fptr == '"' && *endptr == '"') {
+				fptr++;
+				endptr--;
+			}
+
+			STRNDUP(payload->content_disp_name, fptr, endptr - fptr + 1,
+					RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize));
+		}
+	}
+
+	return realsize;
+}
+
+static void curl_set_handle_opts(struct dload_payload *payload,
+		CURL *curl, char *error_buffer)
+{
+	alpm_handle_t *handle = payload->handle;
+	const char *useragent = getenv("HTTP_USER_AGENT");
+	struct stat st;
+
+	/* the curl_easy handle is initialized with the alpm handle, so we only need
+	 * to reset the handle's parameters for each time it's used. */
+	curl_easy_reset(curl);
+	curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl);
+	curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
+	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
+	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+	curl_easy_setopt(curl, CURLOPT_FILETIME, 1L);
+	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
+	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+	curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_progress);
+	curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload);
+	curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024L);
+	curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L);
+	curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_headers);
+	curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload);
+	curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
+
+	_alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl);
+
+	if(payload->max_size) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "maxsize: %jd\n",
+				(intmax_t)payload->max_size);
+		curl_easy_setopt(curl, CURLOPT_MAXFILESIZE_LARGE,
+				(curl_off_t)payload->max_size);
+	}
+
+	if(useragent != NULL) {
+		curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent);
+	}
+
+	if(!payload->allow_resume && !payload->force && payload->destfile_name &&
+			stat(payload->destfile_name, &st) == 0) {
+		/* start from scratch, but only download if our local is out of date. */
+		curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+		curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime);
+		_alpm_log(handle, ALPM_LOG_DEBUG,
+				"using time condition: %lu\n", (long)st.st_mtime);
+	} else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) {
+		/* a previous partial download exists, resume from end of file. */
+		payload->tempfile_openmode = "ab";
+		curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, (curl_off_t)st.st_size);
+		_alpm_log(handle, ALPM_LOG_DEBUG,
+				"tempfile found, attempting continuation from %jd bytes\n",
+				(intmax_t)st.st_size);
+		payload->initial_size = st.st_size;
+	}
+}
+
+static void mask_signal(int signal, void (*handler)(int),
+		struct sigaction *origaction)
+{
+	struct sigaction newaction;
+
+	newaction.sa_handler = handler;
+	sigemptyset(&newaction.sa_mask);
+	newaction.sa_flags = 0;
+
+	sigaction(signal, NULL, origaction);
+	sigaction(signal, &newaction, NULL);
+}
+
+static void unmask_signal(int signal, struct sigaction sa)
+{
+	sigaction(signal, &sa, NULL);
+}
+
+static FILE *create_tempfile(struct dload_payload *payload, const char *localpath)
+{
+	int fd;
+	FILE *fp;
+	char *randpath;
+	size_t len;
+
+	/* create a random filename, which is opened with O_EXCL */
+	len = strlen(localpath) + 14 + 1;
+	MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
+	snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath);
+	if((fd = mkstemp(randpath)) == -1 ||
+			!(fp = fdopen(fd, payload->tempfile_openmode))) {
+		unlink(randpath);
+		close(fd);
+		_alpm_log(payload->handle, ALPM_LOG_ERROR,
+				_("failed to create temporary file for download\n"));
+		return NULL;
+	}
+	/* fp now points to our alpmtmp.XXXXXX */
+	free(payload->tempfile_name);
+	payload->tempfile_name = randpath;
+	free(payload->remote_name);
+	STRDUP(payload->remote_name, strrchr(randpath, '/') + 1,
+			RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
+
+	return fp;
+}
+
+static int curl_download_internal(struct dload_payload *payload,
+		const char *localpath, char **final_file)
+{
+	int ret = -1;
+	FILE *localf = NULL;
+	char *effective_url;
+	/* RFC1123 states applications should support this length */
+	char hostname[256];
+	char error_buffer[CURL_ERROR_SIZE] = {0};
+	struct stat st;
+	long timecond, respcode = 0, remote_time = -1;
+	double remote_size, bytes_dl;
+	struct sigaction orig_sig_pipe, orig_sig_int;
+	/* shortcut to our handle within the payload */
+	alpm_handle_t *handle = payload->handle;
+	CURL *curl = get_libcurl_handle(handle);
+	handle->pm_errno = 0;
+
+	payload->tempfile_openmode = "wb";
+	if(!payload->remote_name) {
+		payload->remote_name = strdup(get_filename(payload->fileurl));
+	}
+	if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) {
+		_alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl);
+		RET_ERR(handle, ALPM_ERR_SERVER_BAD_URL, -1);
+	}
+
+	if(strlen(payload->remote_name) > 0 && strcmp(payload->remote_name, ".sig") != 0) {
+		payload->destfile_name = get_fullpath(localpath, payload->remote_name, "");
+		payload->tempfile_name = get_fullpath(localpath, payload->remote_name, ".part");
+		if(!payload->destfile_name || !payload->tempfile_name) {
+			goto cleanup;
+		}
+	} else {
+		/* URL doesn't contain a filename, so make a tempfile. We can't support
+		 * resuming this kind of download; partial transfers will be destroyed */
+		payload->unlink_on_fail = 1;
+
+		localf = create_tempfile(payload, localpath);
+		if(localf == NULL) {
+			goto cleanup;
+		}
+	}
+
+	curl_set_handle_opts(payload, curl, error_buffer);
+
+	if(localf == NULL) {
+		localf = fopen(payload->tempfile_name, payload->tempfile_openmode);
+		if(localf == NULL) {
+			goto cleanup;
+		}
+	}
+
+	_alpm_log(handle, ALPM_LOG_DEBUG,
+			"opened tempfile for download: %s (%s)\n", payload->tempfile_name,
+			payload->tempfile_openmode);
+
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, localf);
 
 	/* 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;
+	mask_signal(SIGPIPE, SIG_IGN, &orig_sig_pipe);
-	sigemptyset(&sig_pipe[NEW].sa_mask);
+	mask_signal(SIGINT, &inthandler, &orig_sig_int);
-	sig_pipe[NEW].sa_flags = 0;
-	sigaction(SIGPIPE, NULL, &sig_pipe[OLD]);
-	sigaction(SIGPIPE, &sig_pipe[NEW], NULL);
 
-	dload_interrupted = 0;
+	/* perform transfer */
-	sig_int[NEW].sa_handler = &inthandler;
+	payload->curlerr = curl_easy_perform(curl);
-	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
+	/* disconnect relationships from the curl handle for things that might go out
-	 * calls into the library */
+	 * of scope, but could still be touched on connection teardown.  This really
+	 * only applies to FTP transfers. See FS#26327 for an example. */
+	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
+	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL);
 
-	/* find out the remote size *and* mtime in one go. there is a lot of
+	/* was it a success? */
-	 * trouble in trying to do both size and "if-modified-since" logic in a
+	switch(payload->curlerr) {
-	 * non-stat request, so avoid it. */
+		case CURLE_OK:
-	fetchLastErrCode = 0;
+			/* get http/ftp response code */
-	if(fetchStat(fileurl, &ust, "") == -1) {
+			curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode);
-		pm_errno = PM_ERR_LIBFETCH;
+			if(respcode >= 400) {
-		_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
+				payload->unlink_on_fail = 1;
-				filename, gethost(fileurl), fetchLastErrString);
+				goto cleanup;
-		ret = -1;
+			}
-		goto cleanup;
+			break;
+		case CURLE_ABORTED_BY_CALLBACK:
+			/* handle the interrupt accordingly */
+			if(dload_interrupted == ABORT_OVER_MAXFILESIZE) {
+				payload->curlerr = CURLE_FILESIZE_EXCEEDED;
+				handle->pm_errno = ALPM_ERR_LIBCURL;
+				/* the hardcoded 'size exceeded' message is same as libcurl's normal */
+				_alpm_log(handle, ALPM_LOG_ERROR,
+						_("failed retrieving file '%s' from %s : %s\n"),
+						payload->remote_name, hostname, "Maximum file size exceeded");
+			}
+			goto cleanup;
+		default:
+			/* delete zero length downloads */
+			if(stat(payload->tempfile_name, &st) == 0 && st.st_size == 0) {
+				payload->unlink_on_fail = 1;
+			}
+			if(!payload->errors_ok) {
+				handle->pm_errno = ALPM_ERR_LIBCURL;
+				_alpm_log(handle, ALPM_LOG_ERROR,
+						_("failed retrieving file '%s' from %s : %s\n"),
+						payload->remote_name, hostname, error_buffer);
+			} else {
+				_alpm_log(handle, ALPM_LOG_DEBUG,
+						"failed retrieving file '%s' from %s : %s\n",
+						payload->remote_name, hostname, error_buffer);
+			}
+			goto cleanup;
 	}
-	check_stop();
 
-	_alpm_log(PM_LOG_DEBUG, "ust.mtime: %ld local_time: %ld compare: %ld\n",
+	/* retrieve info about the state of the transfer */
-			ust.mtime, local_time, local_time - ust.mtime);
+	curl_easy_getinfo(curl, CURLINFO_FILETIME, &remote_time);
-	_alpm_log(PM_LOG_DEBUG, "ust.size: %jd local_size: %jd compare: %jd\n",
+	curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size);
-			(intmax_t)ust.size, (intmax_t)local_size, (intmax_t)(local_size - ust.size));
+	curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl);
-	if(!force && ust.mtime && ust.mtime == local_time
+	curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &timecond);
-			&& ust.size && ust.size == local_size) {
+	curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
-		/* the remote time and size values agreed with what we have, so move on
+
-		 * because there is nothing more to do. */
+	/* time condition was met and we didn't download anything. we need to
-		_alpm_log(PM_LOG_DEBUG, "files are identical, skipping %s\n", filename);
+	 * clean up the 0 byte .part file that's left behind. */
+	if(timecond == 1 && DOUBLE_EQ(bytes_dl, 0)) {
+		_alpm_log(handle, ALPM_LOG_DEBUG, "file met time condition\n");
 		ret = 1;
+		unlink(payload->tempfile_name);
 		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);
+	/* remote_size isn't necessarily the full size of the file, just what the
-		fileurl->offset = 0;
+	 * server reported as remaining to download. compare it to what curl reported
+	 * as actually being transferred during curl_easy_perform() */
+	if(!DOUBLE_EQ(remote_size, -1) && !DOUBLE_EQ(bytes_dl, -1) &&
+			!DOUBLE_EQ(bytes_dl, remote_size)) {
+		handle->pm_errno = ALPM_ERR_RETRIEVE;
+		_alpm_log(handle, ALPM_LOG_ERROR, _("%s appears to be truncated: %jd/%jd bytes\n"),
+				payload->remote_name, (intmax_t)bytes_dl, (intmax_t)remote_size);
+		goto cleanup;
 	}
 
-	fetchLastErrCode = 0;
+	if(payload->content_disp_name) {
-	dlf = fetchGet(fileurl, "");
+		/* content-disposition header has a better name for our file */
-	check_stop();
+		free(payload->destfile_name);
-
+		payload->destfile_name = get_fullpath(localpath, payload->content_disp_name, "");
-	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);
+		const char *effective_filename = strrchr(effective_url, '/');
-	}
+		if(effective_filename && strlen(effective_filename) > 2) {
+			effective_filename++;
 
-	if(localf && fileurl->offset == 0) {
+			/* if destfile was never set, we wrote to a tempfile. even if destfile is
-		_alpm_log(PM_LOG_WARNING, _("resuming download of %s not possible; starting over\n"), filename);
+			 * set, we may have followed some redirects and the effective url may
-		fclose(localf);
+			 * have a better suggestion as to what to name our file. in either case,
-		localf = NULL;
+			 * refactor destfile to this newly derived name. */
-	} else if(fileurl->offset) {
+			if(!payload->destfile_name || strcmp(effective_filename,
-		_alpm_log(PM_LOG_DEBUG, "resuming download at position %jd\n", (intmax_t)fileurl->offset);
+						strrchr(payload->destfile_name, '/') + 1) != 0) {
-	}
+				free(payload->destfile_name);
-
+				payload->destfile_name = get_fullpath(localpath, effective_filename, "");
-
+			}
-	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);
+		utimes_long(payload->tempfile_name, remote_time);
 	}
-	if(dlf != NULL) {
+
-		fetchIO_close(dlf);
+	if(ret == 0) {
+		const char *realname = payload->tempfile_name;
+		if(payload->destfile_name) {
+			realname = payload->destfile_name;
+			if(rename(payload->tempfile_name, payload->destfile_name)) {
+				_alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"),
+						payload->tempfile_name, payload->destfile_name, strerror(errno));
+				ret = -1;
+			}
+		}
+		if(ret != -1 && final_file) {
+			STRDUP(*final_file, strrchr(realname, '/') + 1,
+					RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+		}
+	}
+
+	if((ret == -1 || dload_interrupted) && payload->unlink_on_fail &&
+			payload->tempfile_name) {
+		unlink(payload->tempfile_name);
 	}
-	fetchFreeURL(fileurl);
 
 	/* restore the old signal handlers */
-	sigaction(SIGINT, &sig_int[OLD], NULL);
+	unmask_signal(SIGINT, orig_sig_int);
-	sigaction(SIGPIPE, &sig_pipe[OLD], NULL);
+	unmask_signal(SIGPIPE, orig_sig_pipe);
 	/* if we were interrupted, trip the old handler */
 	if(dload_interrupted) {
 		raise(SIGINT);
 	}
 
-	return(ret);
+	return ret;
 }
 #endif
 
-static int download(const char *url, const char *localpath,
+/** Download a file given by a URL to a local directory.
-		int force) {
+ * Does not overwrite an existing file if the download fails.
+ * @param payload the payload context
+ * @param localpath the directory to save the file in
+ * @param final_file the real name of the downloaded file (may be NULL)
+ * @return 0 on success, -1 on error (pm_errno is set accordingly if errors_ok == 0)
+ */
+int _alpm_download(struct dload_payload *payload, const char *localpath,
+		char **final_file)
+{
+	alpm_handle_t *handle = payload->handle;
+
 	if(handle->fetchcb == NULL) {
-#if defined(INTERNAL_DOWNLOAD)
+#ifdef HAVE_LIBCURL
-		return(download_internal(url, localpath, force));
+		return curl_download_internal(payload, localpath, final_file);
 #else
-		RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
+		RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1);
 #endif
 	} else {
-		int ret = handle->fetchcb(url, localpath, force);
+		int ret = handle->fetchcb(payload->fileurl, localpath, payload->force);
-		if(ret == -1) {
+		if(ret == -1 && !payload->errors_ok) {
-			RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
+			RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1);
 		}
-		return(ret);
+		return ret;
 	}
 }
 
-/*
+/** Fetch a remote pkg. */
- * Download a single file
+char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
- *   - 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;
+	char *filepath;
-	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;
+	char *final_file = NULL;
+	struct dload_payload payload;
 	int ret;
 
-	ALPM_LOG_FUNC;
+	CHECK_HANDLE(handle, return NULL);
-
+	ASSERT(url, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL));
-	filename = get_filename(url);
 
 	/* find a valid cache dir to download to */
-	cachedir = _alpm_filecache_setup();
+	cachedir = _alpm_filecache_setup(handle);
+
+	memset(&payload, 0, sizeof(struct dload_payload));
+	payload.handle = handle;
+	STRDUP(payload.fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+	payload.allow_resume = 1;
 
 	/* download the file */
-	ret = download(url, cachedir, 0);
+	ret = _alpm_download(&payload, cachedir, &final_file);
+	_alpm_dload_payload_reset(&payload);
 	if(ret == -1) {
-		_alpm_log(PM_LOG_WARNING, _("failed to download %s\n"), url);
+		_alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url);
-		return(NULL);
+		free(final_file);
+		return NULL;
+	}
+	_alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url);
+
+	/* attempt to download the signature */
+	if(ret == 0 && (handle->siglevel & ALPM_SIG_PACKAGE)) {
+		char *sig_final_file = NULL;
+		size_t len;
+
+		len = strlen(url) + 5;
+		MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
+		snprintf(payload.fileurl, len, "%s.sig", url);
+		payload.handle = handle;
+		payload.force = 1;
+		payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL);
+
+		ret = _alpm_download(&payload, cachedir, &sig_final_file);
+		if(ret == -1 && !payload.errors_ok) {
+			_alpm_log(handle, ALPM_LOG_WARNING,
+					_("failed to download %s\n"), payload.fileurl);
+			/* Warn now, but don't return NULL. We will fail later during package
+			 * load time. */
+		} else if(ret == 0) {
+			_alpm_log(handle, ALPM_LOG_DEBUG,
+					"successfully downloaded %s\n", payload.fileurl);
+		}
+		FREE(sig_final_file);
+		_alpm_dload_payload_reset(&payload);
 	}
-	_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);
+	filepath = _alpm_filecache_find(handle, final_file);
-	return(filepath);
+	free(final_file);
+
+	return filepath;
+}
+
+void _alpm_dload_payload_reset(struct dload_payload *payload)
+{
+	ASSERT(payload, return);
+
+	FREE(payload->remote_name);
+	FREE(payload->tempfile_name);
+	FREE(payload->destfile_name);
+	FREE(payload->content_disp_name);
+	FREE(payload->fileurl);
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/dload.h

@@ -1,7 +1,7 @@
 /*
  *  dload.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -25,14 +25,28 @@
 
 #include <time.h>
 
-#define PM_DLBUF_LEN (1024 * 16)
+struct dload_payload {
+	alpm_handle_t *handle;
+	const char *tempfile_openmode;
+	char *remote_name;
+	char *tempfile_name;
+	char *destfile_name;
+	char *content_disp_name;
+	char *fileurl;
+	off_t initial_size;
+	off_t max_size;
+	off_t prevprogress;
+	int force;
+	int allow_resume;
+	int errors_ok;
+	int unlink_on_fail;
+	CURLcode curlerr;       /* last error produced by curl */
+};
 
-int _alpm_download_single_file(const char *filename,
+void _alpm_dload_payload_reset(struct dload_payload *payload);
-		alpm_list_t *servers, const char *localpath,
-		int force);
 
-int _alpm_download_files(alpm_list_t *files,
+int _alpm_download(struct dload_payload *payload, const char *localpath,
-		alpm_list_t *servers, const char *localpath);
+		char **final_file);
 
 #endif /* _ALPM_DLOAD_H */
 

lib/libalpm/error.c

@@ -1,7 +1,7 @@
 /*
  *  error.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -20,138 +20,142 @@
 
 #include "config.h"
 
-/* TODO: needed for the libfetch stuff, unfortunately- we should kill it */
+#ifdef HAVE_LIBCURL
-#include <stdio.h>
+#include <curl/curl.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 "util.h"
 #include "alpm.h"
+#include "handle.h"
 
-const char SYMEXPORT *alpm_strerrorlast(void)
+enum _alpm_errno_t SYMEXPORT alpm_errno(alpm_handle_t *handle)
 {
-	return alpm_strerror(pm_errno);
+	return handle->pm_errno;
 }
 
-const char SYMEXPORT *alpm_strerror(int err)
+const char SYMEXPORT *alpm_strerror(enum _alpm_errno_t err)
 {
 	switch(err) {
 		/* System */
-		case PM_ERR_MEMORY:
+		case ALPM_ERR_MEMORY:
 			return _("out of memory!");
-		case PM_ERR_SYSTEM:
+		case ALPM_ERR_SYSTEM:
 			return _("unexpected system error");
-		case PM_ERR_BADPERMS:
+		case ALPM_ERR_BADPERMS:
 			return _("insufficient privileges");
-		case PM_ERR_NOT_A_FILE:
+		case ALPM_ERR_NOT_A_FILE:
 			return _("could not find or read file");
-		case PM_ERR_NOT_A_DIR:
+		case ALPM_ERR_NOT_A_DIR:
 			return _("could not find or read directory");
-		case PM_ERR_WRONG_ARGS:
+		case ALPM_ERR_WRONG_ARGS:
 			return _("wrong or NULL argument passed");
+		case ALPM_ERR_DISK_SPACE:
+			return _("not enough free disk space");
 		/* Interface */
-		case PM_ERR_HANDLE_NULL:
+		case ALPM_ERR_HANDLE_NULL:
 			return _("library not initialized");
-		case PM_ERR_HANDLE_NOT_NULL:
+		case ALPM_ERR_HANDLE_NOT_NULL:
 			return _("library already initialized");
-		case PM_ERR_HANDLE_LOCK:
+		case ALPM_ERR_HANDLE_LOCK:
 			return _("unable to lock database");
 		/* Databases */
-		case PM_ERR_DB_OPEN:
+		case ALPM_ERR_DB_OPEN:
 			return _("could not open database");
-		case PM_ERR_DB_CREATE:
+		case ALPM_ERR_DB_CREATE:
 			return _("could not create database");
-		case PM_ERR_DB_NULL:
+		case ALPM_ERR_DB_NULL:
 			return _("database not initialized");
-		case PM_ERR_DB_NOT_NULL:
+		case ALPM_ERR_DB_NOT_NULL:
 			return _("database already registered");
-		case PM_ERR_DB_NOT_FOUND:
+		case ALPM_ERR_DB_NOT_FOUND:
 			return _("could not find database");
-		case PM_ERR_DB_WRITE:
+		case ALPM_ERR_DB_INVALID:
+			return _("invalid or corrupted database");
+		case ALPM_ERR_DB_INVALID_SIG:
+			return _("invalid or corrupted database (PGP signature)");
+		case ALPM_ERR_DB_VERSION:
+			return _("database is incorrect version");
+		case ALPM_ERR_DB_WRITE:
 			return _("could not update database");
-		case PM_ERR_DB_REMOVE:
+		case ALPM_ERR_DB_REMOVE:
 			return _("could not remove database entry");
 		/* Servers */
-		case PM_ERR_SERVER_BAD_URL:
+		case ALPM_ERR_SERVER_BAD_URL:
 			return _("invalid url for server");
-		case PM_ERR_SERVER_NONE:
+		case ALPM_ERR_SERVER_NONE:
 			return _("no servers configured for repository");
 		/* Transactions */
-		case PM_ERR_TRANS_NOT_NULL:
+		case ALPM_ERR_TRANS_NOT_NULL:
 			return _("transaction already initialized");
-		case PM_ERR_TRANS_NULL:
+		case ALPM_ERR_TRANS_NULL:
 			return _("transaction not initialized");
-		case PM_ERR_TRANS_DUP_TARGET:
+		case ALPM_ERR_TRANS_DUP_TARGET:
 			return _("duplicate target");
-		case PM_ERR_TRANS_NOT_INITIALIZED:
+		case ALPM_ERR_TRANS_NOT_INITIALIZED:
 			return _("transaction not initialized");
-		case PM_ERR_TRANS_NOT_PREPARED:
+		case ALPM_ERR_TRANS_NOT_PREPARED:
 			return _("transaction not prepared");
-		case PM_ERR_TRANS_ABORT:
+		case ALPM_ERR_TRANS_ABORT:
 			return _("transaction aborted");
-		case PM_ERR_TRANS_TYPE:
+		case ALPM_ERR_TRANS_TYPE:
 			return _("operation not compatible with the transaction type");
-		case PM_ERR_TRANS_NOT_LOCKED:
+		case ALPM_ERR_TRANS_NOT_LOCKED:
 			return _("transaction commit attempt when database is not locked");
 		/* Packages */
-		case PM_ERR_PKG_NOT_FOUND:
+		case ALPM_ERR_PKG_NOT_FOUND:
 			return _("could not find or read package");
-		case PM_ERR_PKG_IGNORED:
+		case ALPM_ERR_PKG_IGNORED:
 			return _("operation cancelled due to ignorepkg");
-		case PM_ERR_PKG_INVALID:
+		case ALPM_ERR_PKG_INVALID:
 			return _("invalid or corrupted package");
-		case PM_ERR_PKG_OPEN:
+		case ALPM_ERR_PKG_INVALID_CHECKSUM:
+			return _("invalid or corrupted package (checksum)");
+		case ALPM_ERR_PKG_INVALID_SIG:
+			return _("invalid or corrupted package (PGP signature)");
+		case ALPM_ERR_PKG_OPEN:
 			return _("cannot open package file");
-		case PM_ERR_PKG_CANT_REMOVE:
+		case ALPM_ERR_PKG_CANT_REMOVE:
 			return _("cannot remove all files for package");
-		case PM_ERR_PKG_INVALID_NAME:
+		case ALPM_ERR_PKG_INVALID_NAME:
 			return _("package filename is not valid");
-		case PM_ERR_PKG_INVALID_ARCH:
+		case ALPM_ERR_PKG_INVALID_ARCH:
 			return _("package architecture is not valid");
-		case PM_ERR_PKG_REPO_NOT_FOUND:
+		case ALPM_ERR_PKG_REPO_NOT_FOUND:
 			return _("could not find repository for target");
+		/* Signatures */
+		case ALPM_ERR_SIG_MISSING:
+			return _("missing PGP signature");
+		case ALPM_ERR_SIG_INVALID:
+			return _("invalid PGP signature");
 		/* Deltas */
-		case PM_ERR_DLT_INVALID:
+		case ALPM_ERR_DLT_INVALID:
 			return _("invalid or corrupted delta");
-		case PM_ERR_DLT_PATCHFAILED:
+		case ALPM_ERR_DLT_PATCHFAILED:
 			return _("delta patch failed");
 		/* Dependencies */
-		case PM_ERR_UNSATISFIED_DEPS:
+		case ALPM_ERR_UNSATISFIED_DEPS:
 			return _("could not satisfy dependencies");
-		case PM_ERR_CONFLICTING_DEPS:
+		case ALPM_ERR_CONFLICTING_DEPS:
 			return _("conflicting dependencies");
-		case PM_ERR_FILE_CONFLICTS:
+		case ALPM_ERR_FILE_CONFLICTS:
 			return _("conflicting files");
 		/* Miscellaenous */
-		case PM_ERR_RETRIEVE:
+		case ALPM_ERR_RETRIEVE:
 			return _("failed to retrieve some files");
-		case PM_ERR_INVALID_REGEX:
+		case ALPM_ERR_INVALID_REGEX:
 			return _("invalid regular expression");
 		/* Errors from external libraries- our own wrapper error */
-		case PM_ERR_LIBARCHIVE:
+		case ALPM_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:
+		case ALPM_ERR_LIBCURL:
-#if defined(INTERNAL_DOWNLOAD)
-			return fetchLastErrString;
-#else
-			/* obviously shouldn't get here... */
 			return _("download library error");
-#endif
+		case ALPM_ERR_GPGME:
-		case PM_ERR_EXTERNAL_DOWNLOAD:
+			return _("gpgme error");
+		case ALPM_ERR_EXTERNAL_DOWNLOAD:
 			return _("error invoking external downloader");
 		/* Unknown error! */
 		default:

lib/libalpm/graph.c

@@ -0,0 +1,41 @@
+/*
+ *  graph.c - helpful graph structure and setup/teardown methods
+ *
+ *  Copyright (c) 2007-2011 Pacman Development Team <pacman-dev@archlinux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "graph.h"
+#include "util.h"
+#include "log.h"
+
+alpm_graph_t *_alpm_graph_new(void)
+{
+	alpm_graph_t *graph = NULL;
+
+	CALLOC(graph, 1, sizeof(alpm_graph_t), return NULL);
+	return graph;
+}
+
+void _alpm_graph_free(void *data)
+{
+	alpm_graph_t *graph = data;
+	alpm_list_free(graph->children);
+	free(graph);
+}
+
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/graph.h

@@ -1,8 +1,7 @@
 /*
  *  graph.h - helpful graph structure and setup/teardown methods
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2007-2011 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,43 +16,27 @@
  *  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_GRAPH_H
+#define _ALPM_GRAPH_H
+
+#include "config.h" /* ensure off_t is correct length */
 
 #include <sys/types.h> /* off_t */
 
 #include "alpm_list.h"
-#include "util.h" /* MALLOC() */
-#include "alpm.h"
 
-struct __pmgraph_t {
+typedef struct __alpm_graph_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? */
+	void *data;
+	struct __alpm_graph_t *parent; /* where did we come from? */
 	alpm_list_t *children;
 	alpm_list_t *childptr; /* points to a child in children list */
-};
+} alpm_graph_t;
-typedef struct __pmgraph_t pmgraph_t;
 
-static pmgraph_t *_alpm_graph_new(void)
+alpm_graph_t *_alpm_graph_new(void);
-{
+void _alpm_graph_free(void *data);
-	pmgraph_t *graph = NULL;
 
-	MALLOC(graph, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
+#endif /* _ALPM_GRAPH_H */
-
-	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);
-}
 
+/* vim: set ts=2 sw=2 noet: */

lib/libalpm/group.c

@@ -1,7 +1,7 @@
 /*
  *  group.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 /* libalpm */
@@ -31,22 +30,18 @@
 #include "log.h"
 #include "alpm.h"
 
-pmgrp_t *_alpm_grp_new(const char *name)
+alpm_group_t *_alpm_group_new(const char *name)
 {
-	pmgrp_t* grp;
+	alpm_group_t* grp;
 
-	ALPM_LOG_FUNC;
+	CALLOC(grp, 1, sizeof(alpm_group_t), return NULL);
+	STRDUP(grp->name, name, free(grp); return NULL);
 
-	CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	return grp;
-	STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL));
-
-	return(grp);
 }
 
-void _alpm_grp_free(pmgrp_t *grp)
+void _alpm_group_free(alpm_group_t *grp)
 {
-	ALPM_LOG_FUNC;
-
 	if(grp == NULL) {
 		return;
 	}
@@ -57,23 +52,4 @@ void _alpm_grp_free(pmgrp_t *grp)
 	FREE(grp);
 }
 
-const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(grp != NULL, return(NULL));
-
-	return grp->name;
-}
-
-alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(grp != NULL, return(NULL));
-
-	return grp->packages;
-}
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/group.h

@@ -1,7 +1,7 @@
 /*
  *  group.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -22,15 +22,8 @@
 
 #include "alpm.h"
 
-struct __pmgrp_t {
+alpm_group_t *_alpm_group_new(const char *name);
-	/** group name */
+void _alpm_group_free(alpm_group_t *grp);
-	char *name;
-	/** list of pmpkg_t packages */
-	alpm_list_t *packages;
-};
-
-pmgrp_t *_alpm_grp_new(const char *name);
-void _alpm_grp_free(pmgrp_t *grp);
 
 #endif /* _ALPM_GROUP_H */
 

lib/libalpm/handle.c

@@ -1,7 +1,7 @@
 /*
  *  handle.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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>
@@ -22,14 +22,14 @@
 
 #include "config.h"
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <syslog.h>
-#include <time.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <fcntl.h>
 
 /* libalpm */
 #include "handle.h"
@@ -39,25 +39,17 @@
 #include "trans.h"
 #include "alpm.h"
 
-/* global var for handle (private to libalpm) */
+alpm_handle_t *_alpm_handle_new(void)
-pmhandle_t *handle = NULL;
-
-pmhandle_t *_alpm_handle_new()
 {
-	pmhandle_t *handle;
+	alpm_handle_t *handle;
 
-	ALPM_LOG_FUNC;
+	CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL);
 
-	CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
+	return handle;
-	handle->lckfd = -1;
-
-	return(handle);
 }
 
-void _alpm_handle_free(pmhandle_t *handle)
+void _alpm_handle_free(alpm_handle_t *handle)
 {
-	ALPM_LOG_FUNC;
-
 	if(handle == NULL) {
 		return;
 	}
@@ -72,6 +64,11 @@ void _alpm_handle_free(pmhandle_t *handle)
 		closelog();
 	}
 
+#ifdef HAVE_LIBCURL
+	/* release curl handle */
+	curl_easy_cleanup(handle->curl);
+#endif
+
 	/* free memory */
 	_alpm_trans_free(handle->trans);
 	FREE(handle->root);
@@ -80,355 +77,364 @@ void _alpm_handle_free(pmhandle_t *handle)
 	FREE(handle->logfile);
 	FREE(handle->lockfile);
 	FREE(handle->arch);
+	FREE(handle->gpgdir);
 	FREELIST(handle->dbs_sync);
 	FREELIST(handle->noupgrade);
 	FREELIST(handle->noextract);
 	FREELIST(handle->ignorepkg);
-	FREELIST(handle->ignoregrp);
+	FREELIST(handle->ignoregroup);
 	FREE(handle);
 }
 
-alpm_cb_log SYMEXPORT alpm_option_get_logcb()
+/** Lock the database */
+int _alpm_handle_lock(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	int fd;
-		pm_errno = PM_ERR_HANDLE_NULL;
+	char *dir, *ptr;
-		return NULL;
+
+	ASSERT(handle->lockfile != NULL, return -1);
+	ASSERT(handle->lckstream == NULL, return 0);
+
+	/* create the dir of the lockfile first */
+	dir = strdup(handle->lockfile);
+	ptr = strrchr(dir, '/');
+	if(ptr) {
+		*ptr = '\0';
 	}
+	if(_alpm_makepath(dir)) {
+		FREE(dir);
+		return -1;
+	}
+	FREE(dir);
+
+	do {
+		fd = open(handle->lockfile, O_WRONLY | O_CREAT | O_EXCL, 0000);
+	} while(fd == -1 && errno == EINTR);
+	if(fd >= 0) {
+		FILE *f = fdopen(fd, "w");
+		fprintf(f, "%ld\n", (long)getpid());
+		fflush(f);
+		fsync(fd);
+		handle->lckstream = f;
+		return 0;
+	}
+	return -1;
+}
+
+/** Remove a lock file */
+int _alpm_handle_unlock(alpm_handle_t *handle)
+{
+	ASSERT(handle->lockfile != NULL, return -1);
+	ASSERT(handle->lckstream != NULL, return 0);
+
+	fclose(handle->lckstream);
+	handle->lckstream = NULL;
+
+	if(unlink(handle->lockfile) && errno != ENOENT) {
+		return -1;
+	}
+	return 0;
+}
+
+
+alpm_cb_log SYMEXPORT alpm_option_get_logcb(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
 	return handle->logcb;
 }
 
-alpm_cb_download SYMEXPORT alpm_option_get_dlcb()
+alpm_cb_download SYMEXPORT alpm_option_get_dlcb(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->dlcb;
 }
 
-alpm_cb_fetch SYMEXPORT alpm_option_get_fetchcb()
+alpm_cb_fetch SYMEXPORT alpm_option_get_fetchcb(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->fetchcb;
 }
 
-alpm_cb_totaldl SYMEXPORT alpm_option_get_totaldlcb()
+alpm_cb_totaldl SYMEXPORT alpm_option_get_totaldlcb(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->totaldlcb;
 }
 
-const char SYMEXPORT *alpm_option_get_root()
+alpm_cb_event SYMEXPORT alpm_option_get_eventcb(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
+	return handle->eventcb;
-		return NULL;
+}
-	}
+
+alpm_cb_question SYMEXPORT alpm_option_get_questioncb(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->questioncb;
+}
+
+alpm_cb_progress SYMEXPORT alpm_option_get_progresscb(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->progresscb;
+}
+
+const char SYMEXPORT *alpm_option_get_root(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
 	return handle->root;
 }
 
-const char SYMEXPORT *alpm_option_get_dbpath()
+const char SYMEXPORT *alpm_option_get_dbpath(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->dbpath;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_cachedirs()
+alpm_list_t SYMEXPORT *alpm_option_get_cachedirs(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->cachedirs;
 }
 
-const char SYMEXPORT *alpm_option_get_logfile()
+const char SYMEXPORT *alpm_option_get_logfile(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->logfile;
 }
 
-const char SYMEXPORT *alpm_option_get_lockfile()
+const char SYMEXPORT *alpm_option_get_lockfile(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->lockfile;
 }
 
-int SYMEXPORT alpm_option_get_usesyslog()
+const char SYMEXPORT *alpm_option_get_gpgdir(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
+	return handle->gpgdir;
-		return -1;
+}
-	}
+
+int SYMEXPORT alpm_option_get_usesyslog(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return -1);
 	return handle->usesyslog;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_noupgrades()
+alpm_list_t SYMEXPORT *alpm_option_get_noupgrades(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->noupgrade;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_noextracts()
+alpm_list_t SYMEXPORT *alpm_option_get_noextracts(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->noextract;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs()
+alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->ignorepkg;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps()
+alpm_list_t SYMEXPORT *alpm_option_get_ignoregroups(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
+	return handle->ignoregroup;
-		return NULL;
-	}
-	return handle->ignoregrp;
 }
 
-const char SYMEXPORT *alpm_option_get_arch()
+const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->arch;
 }
 
-int SYMEXPORT alpm_option_get_usedelta()
+int SYMEXPORT alpm_option_get_usedelta(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return -1);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return -1;
-	}
 	return handle->usedelta;
 }
 
-pmdb_t SYMEXPORT *alpm_option_get_localdb()
+int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return -1);
-		pm_errno = PM_ERR_HANDLE_NULL;
+	return handle->checkspace;
-		return NULL;
+}
-	}
+
+alpm_db_t SYMEXPORT *alpm_option_get_localdb(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
 	return handle->db_local;
 }
 
-alpm_list_t SYMEXPORT *alpm_option_get_syncdbs()
+alpm_list_t SYMEXPORT *alpm_option_get_syncdbs(alpm_handle_t *handle)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return NULL);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return NULL;
-	}
 	return handle->dbs_sync;
 }
 
-void SYMEXPORT alpm_option_set_logcb(alpm_cb_log cb)
+int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return -1);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return;
-	}
 	handle->logcb = cb;
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb)
+int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return -1);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return;
-	}
 	handle->dlcb = cb;
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_fetchcb(alpm_cb_fetch cb)
+int SYMEXPORT alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return -1);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return;
-	}
 	handle->fetchcb = cb;
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb)
+int SYMEXPORT alpm_option_set_totaldlcb(alpm_handle_t *handle, alpm_cb_totaldl cb)
 {
-	if (handle == NULL) {
+	CHECK_HANDLE(handle, return -1);
-		pm_errno = PM_ERR_HANDLE_NULL;
-		return;
-	}
 	handle->totaldlcb = cb;
+	return 0;
 }
 
-int SYMEXPORT alpm_option_set_root(const char *root)
+int SYMEXPORT alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb)
 {
-	struct stat st;
+	CHECK_HANDLE(handle, return -1);
-	char *realroot;
+	handle->eventcb = cb;
-	size_t rootlen;
+	return 0;
-
-	ALPM_LOG_FUNC;
-
-	if(!root) {
-		pm_errno = PM_ERR_WRONG_ARGS;
-		return(-1);
-	}
-	if(stat(root, &st) == -1 || !S_ISDIR(st.st_mode)) {
-		pm_errno = PM_ERR_NOT_A_DIR;
-		return(-1);
-	}
-
-	realroot = calloc(PATH_MAX+1, sizeof(char));
-	if(!realpath(root, realroot)) {
-		FREE(realroot);
-		pm_errno = PM_ERR_NOT_A_DIR;
-		return(-1);
-	}
-
-	/* verify root ends in a '/' */
-	rootlen = strlen(realroot);
-	if(realroot[rootlen-1] != '/') {
-		rootlen += 1;
-	}
-	if(handle->root) {
-		FREE(handle->root);
-	}
-	handle->root = calloc(rootlen + 1, sizeof(char));
-	strncpy(handle->root, realroot, rootlen);
-	handle->root[rootlen-1] = '/';
-	FREE(realroot);
-	_alpm_log(PM_LOG_DEBUG, "option 'root' = %s\n", handle->root);
-	return(0);
 }
 
-int SYMEXPORT alpm_option_set_dbpath(const char *dbpath)
+int SYMEXPORT alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb)
 {
-	struct stat st;
+	CHECK_HANDLE(handle, return -1);
-	size_t dbpathlen, lockfilelen;
+	handle->questioncb = cb;
-	const char *lf = "db.lck";
+	return 0;
-
-	ALPM_LOG_FUNC;
-
-	if(!dbpath) {
-		pm_errno = PM_ERR_WRONG_ARGS;
-		return(-1);
-	}
-	if(stat(dbpath, &st) == -1 || !S_ISDIR(st.st_mode)) {
-		pm_errno = PM_ERR_NOT_A_DIR;
-		return(-1);
-	}
-	/* verify dbpath ends in a '/' */
-	dbpathlen = strlen(dbpath);
-	if(dbpath[dbpathlen-1] != '/') {
-		dbpathlen += 1;
-	}
-	if(handle->dbpath) {
-		FREE(handle->dbpath);
-	}
-	handle->dbpath = calloc(dbpathlen+1, sizeof(char));
-	strncpy(handle->dbpath, dbpath, dbpathlen);
-	handle->dbpath[dbpathlen-1] = '/';
-	_alpm_log(PM_LOG_DEBUG, "option 'dbpath' = %s\n", handle->dbpath);
-
-	if(handle->lockfile) {
-		FREE(handle->lockfile);
-	}
-	lockfilelen = strlen(handle->dbpath) + strlen(lf) + 1;
-	handle->lockfile = calloc(lockfilelen, sizeof(char));
-	snprintf(handle->lockfile, lockfilelen, "%s%s", handle->dbpath, lf);
-	_alpm_log(PM_LOG_DEBUG, "option 'lockfile' = %s\n", handle->lockfile);
-	return(0);
 }
 
-int SYMEXPORT alpm_option_add_cachedir(const char *cachedir)
+int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb)
+{
+	CHECK_HANDLE(handle, return -1);
+	handle->progresscb = cb;
+	return 0;
+}
+
+static char *canonicalize_path(const char *path) {
+	char *new_path;
+	size_t len;
+
+	/* verify path ends in a '/' */
+	len = strlen(path);
+	if(path[len - 1] != '/') {
+		len += 1;
+	}
+	CALLOC(new_path, len + 1, sizeof(char), return NULL);
+	strcpy(new_path, path);
+	new_path[len - 1] = '/';
+	return new_path;
+}
+
+enum _alpm_errno_t _alpm_set_directory_option(const char *value,
+		char **storage, int must_exist)
+ {
+	struct stat st;
+	char *real = NULL;
+	const char *path;
+
+	path = value;
+	if(!path) {
+		return ALPM_ERR_WRONG_ARGS;
+	}
+	if(must_exist) {
+		if(stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+			return ALPM_ERR_NOT_A_DIR;
+		}
+		CALLOC(real, PATH_MAX, sizeof(char), return ALPM_ERR_MEMORY);
+		if(!realpath(path, real)) {
+			free(real);
+			return ALPM_ERR_NOT_A_DIR;
+		}
+		path = real;
+	}
+
+	if(*storage) {
+		FREE(*storage);
+	}
+	*storage = canonicalize_path(path);
+	if(!*storage) {
+		return ALPM_ERR_MEMORY;
+	}
+	free(real);
+	return 0;
+}
+
+int SYMEXPORT alpm_option_add_cachedir(alpm_handle_t *handle, const char *cachedir)
 {
 	char *newcachedir;
-	size_t cachedirlen;
 
-	ALPM_LOG_FUNC;
+	CHECK_HANDLE(handle, return -1);
-
+	ASSERT(cachedir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
-	if(!cachedir) {
-		pm_errno = PM_ERR_WRONG_ARGS;
-		return(-1);
-	}
 	/* don't stat the cachedir yet, as it may not even be needed. we can
 	 * fail later if it is needed and the path is invalid. */
 
-	/* verify cachedir ends in a '/' */
+	newcachedir = canonicalize_path(cachedir);
-	cachedirlen = strlen(cachedir);
+	if(!newcachedir) {
-	if(cachedir[cachedirlen-1] != '/') {
+		RET_ERR(handle, ALPM_ERR_MEMORY, -1);
-		cachedirlen += 1;
 	}
-	newcachedir = calloc(cachedirlen + 1, sizeof(char));
-	strncpy(newcachedir, cachedir, cachedirlen);
-	newcachedir[cachedirlen-1] = '/';
 	handle->cachedirs = alpm_list_add(handle->cachedirs, newcachedir);
-	_alpm_log(PM_LOG_DEBUG, "option 'cachedir' = %s\n", newcachedir);
+	_alpm_log(handle, ALPM_LOG_DEBUG, "option 'cachedir' = %s\n", newcachedir);
-	return(0);
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs)
+int SYMEXPORT alpm_option_set_cachedirs(alpm_handle_t *handle, alpm_list_t *cachedirs)
 {
-	if(handle->cachedirs) FREELIST(handle->cachedirs);
+	alpm_list_t *i;
-	if(cachedirs) handle->cachedirs = cachedirs;
+	CHECK_HANDLE(handle, return -1);
+	if(handle->cachedirs) {
+		FREELIST(handle->cachedirs);
+	}
+	for(i = cachedirs; i; i = i->next) {
+		int ret = alpm_option_add_cachedir(handle, i->data);
+		if(ret) {
+			return ret;
+		}
+	}
+	return 0;
 }
 
-int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir)
+int SYMEXPORT alpm_option_remove_cachedir(alpm_handle_t *handle, const char *cachedir)
 {
 	char *vdata = NULL;
 	char *newcachedir;
-	size_t cachedirlen;
+	CHECK_HANDLE(handle, return -1);
-	/* verify cachedir ends in a '/' */
+	ASSERT(cachedir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
-	cachedirlen = strlen(cachedir);
+
-	if(cachedir[cachedirlen-1] != '/') {
+	newcachedir = canonicalize_path(cachedir);
-		cachedirlen += 1;
+	if(!newcachedir) {
+		RET_ERR(handle, ALPM_ERR_MEMORY, -1);
 	}
-	newcachedir = calloc(cachedirlen + 1, sizeof(char));
-	strncpy(newcachedir, cachedir, cachedirlen);
-	newcachedir[cachedirlen-1] = '/';
 	handle->cachedirs = alpm_list_remove_str(handle->cachedirs, newcachedir, &vdata);
 	FREE(newcachedir);
 	if(vdata != NULL) {
 		FREE(vdata);
-		return(1);
+		return 1;
 	}
-	return(0);
+	return 0;
 }
 
-int SYMEXPORT alpm_option_set_logfile(const char *logfile)
+int SYMEXPORT alpm_option_set_logfile(alpm_handle_t *handle, const char *logfile)
 {
 	char *oldlogfile = handle->logfile;
 
-	ALPM_LOG_FUNC;
+	CHECK_HANDLE(handle, return -1);
-
 	if(!logfile) {
-		pm_errno = PM_ERR_WRONG_ARGS;
+		handle->pm_errno = ALPM_ERR_WRONG_ARGS;
-		return(-1);
+		return -1;
 	}
 
 	handle->logfile = strdup(logfile);
@@ -442,112 +448,186 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
 		fclose(handle->logstream);
 		handle->logstream = NULL;
 	}
-	_alpm_log(PM_LOG_DEBUG, "option 'logfile' = %s\n", handle->logfile);
+	_alpm_log(handle, ALPM_LOG_DEBUG, "option 'logfile' = %s\n", handle->logfile);
-	return(0);
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_usesyslog(int usesyslog)
+int SYMEXPORT alpm_option_set_gpgdir(alpm_handle_t *handle, const char *gpgdir)
 {
+	CHECK_HANDLE(handle, return -1);
+	if(!gpgdir) {
+		handle->pm_errno = ALPM_ERR_WRONG_ARGS;
+		return -1;
+	}
+
+	if(handle->gpgdir) {
+		FREE(handle->gpgdir);
+	}
+	handle->gpgdir = strdup(gpgdir);
+
+	_alpm_log(handle, ALPM_LOG_DEBUG, "option 'gpgdir' = %s\n", handle->gpgdir);
+	return 0;
+}
+
+int SYMEXPORT alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog)
+{
+	CHECK_HANDLE(handle, return -1);
 	handle->usesyslog = usesyslog;
+	return 0;
 }
 
-void SYMEXPORT alpm_option_add_noupgrade(const char *pkg)
+int SYMEXPORT alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg)
 {
+	CHECK_HANDLE(handle, return -1);
 	handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg));
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade)
+int SYMEXPORT alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade)
 {
+	CHECK_HANDLE(handle, return -1);
 	if(handle->noupgrade) FREELIST(handle->noupgrade);
-	if(noupgrade) handle->noupgrade = noupgrade;
+	handle->noupgrade = alpm_list_strdup(noupgrade);
+	return 0;
 }
 
-int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg)
+int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg)
 {
 	char *vdata = NULL;
+	CHECK_HANDLE(handle, return -1);
 	handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
-		return(1);
+		return 1;
 	}
-	return(0);
+	return 0;
 }
 
-void SYMEXPORT alpm_option_add_noextract(const char *pkg)
+int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *pkg)
 {
+	CHECK_HANDLE(handle, return -1);
 	handle->noextract = alpm_list_add(handle->noextract, strdup(pkg));
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract)
+int SYMEXPORT alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract)
 {
+	CHECK_HANDLE(handle, return -1);
 	if(handle->noextract) FREELIST(handle->noextract);
-	if(noextract) handle->noextract = noextract;
+	handle->noextract = alpm_list_strdup(noextract);
+	return 0;
 }
 
-int SYMEXPORT alpm_option_remove_noextract(const char *pkg)
+int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *pkg)
 {
 	char *vdata = NULL;
+	CHECK_HANDLE(handle, return -1);
 	handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
-		return(1);
+		return 1;
 	}
-	return(0);
+	return 0;
 }
 
-void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg)
+int SYMEXPORT alpm_option_add_ignorepkg(alpm_handle_t *handle, const char *pkg)
 {
+	CHECK_HANDLE(handle, return -1);
 	handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg));
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
+int SYMEXPORT alpm_option_set_ignorepkgs(alpm_handle_t *handle, alpm_list_t *ignorepkgs)
 {
+	CHECK_HANDLE(handle, return -1);
 	if(handle->ignorepkg) FREELIST(handle->ignorepkg);
-	if(ignorepkgs) handle->ignorepkg = ignorepkgs;
+	handle->ignorepkg = alpm_list_strdup(ignorepkgs);
+	return 0;
 }
 
-int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg)
+int SYMEXPORT alpm_option_remove_ignorepkg(alpm_handle_t *handle, const char *pkg)
 {
 	char *vdata = NULL;
+	CHECK_HANDLE(handle, return -1);
 	handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
-		return(1);
+		return 1;
 	}
-	return(0);
+	return 0;
 }
 
-void SYMEXPORT alpm_option_add_ignoregrp(const char *grp)
+int SYMEXPORT alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp)
 {
-	handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp));
+	CHECK_HANDLE(handle, return -1);
+	handle->ignoregroup = alpm_list_add(handle->ignoregroup, strdup(grp));
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
+int SYMEXPORT alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps)
 {
-	if(handle->ignoregrp) FREELIST(handle->ignoregrp);
+	CHECK_HANDLE(handle, return -1);
-	if(ignoregrps) handle->ignoregrp = ignoregrps;
+	if(handle->ignoregroup) FREELIST(handle->ignoregroup);
+	handle->ignoregroup = alpm_list_strdup(ignoregrps);
+	return 0;
 }
 
-int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp)
+int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *grp)
 {
 	char *vdata = NULL;
-	handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata);
+	CHECK_HANDLE(handle, return -1);
+	handle->ignoregroup = alpm_list_remove_str(handle->ignoregroup, grp, &vdata);
 	if(vdata != NULL) {
 		FREE(vdata);
-		return(1);
+		return 1;
 	}
-	return(0);
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_arch(const char *arch)
+int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch)
 {
+	CHECK_HANDLE(handle, return -1);
 	if(handle->arch) FREE(handle->arch);
-	if(arch) handle->arch = strdup(arch);
+	if(arch) {
+		handle->arch = strdup(arch);
+	} else {
+		handle->arch = NULL;
+	}
+	return 0;
 }
 
-void SYMEXPORT alpm_option_set_usedelta(int usedelta)
+int SYMEXPORT alpm_option_set_usedelta(alpm_handle_t *handle, int usedelta)
 {
+	CHECK_HANDLE(handle, return -1);
 	handle->usedelta = usedelta;
+	return 0;
+}
+
+int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace)
+{
+	CHECK_HANDLE(handle, return -1);
+	handle->checkspace = checkspace;
+	return 0;
+}
+
+int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle,
+		alpm_siglevel_t level)
+{
+	CHECK_HANDLE(handle, return -1);
+#ifdef HAVE_LIBGPGME
+	handle->siglevel = level;
+#else
+	if(level != 0 && level != ALPM_SIG_USE_DEFAULT) {
+		RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1);
+	}
+#endif
+	return 0;
+}
+
+alpm_siglevel_t SYMEXPORT alpm_option_get_default_siglevel(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return -1);
+	return handle->siglevel;
 }
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/handle.h

@@ -1,7 +1,7 @@
 /*
  *  handle.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -24,49 +24,86 @@
 #include <sys/types.h>
 
 #include "alpm_list.h"
-#include "db.h"
-#include "log.h"
 #include "alpm.h"
-#include "trans.h"
 
-typedef struct _pmhandle_t {
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#endif
+
+#define EVENT(h, e, d1, d2) \
+do { \
+	if((h)->eventcb) { \
+		(h)->eventcb(e, d1, d2); \
+	} \
+} while(0)
+#define QUESTION(h, q, d1, d2, d3, r) \
+do { \
+	if((h)->questioncb) { \
+		(h)->questioncb(q, d1, d2, d3, r); \
+	} \
+} while(0)
+#define PROGRESS(h, e, p, per, n, r) \
+do { \
+	if((h)->progresscb) { \
+		(h)->progresscb(e, p, per, n, r); \
+	} \
+} while(0)
+
+struct __alpm_handle_t {
 	/* internal usage */
-	pmdb_t *db_local;       /* local db pointer */
+	alpm_db_t *db_local;       /* local db pointer */
-	alpm_list_t *dbs_sync;  /* List of (pmdb_t *) */
+	alpm_list_t *dbs_sync;  /* List of (alpm_db_t *) */
 	FILE *logstream;        /* log file stream pointer */
-	int lckfd;              /* lock file descriptor if one exists */
+	FILE *lckstream;        /* lock file stream pointer if one exists */
-	pmtrans_t *trans;
+	alpm_trans_t *trans;
+
+#ifdef HAVE_LIBCURL
+	/* libcurl handle */
+	CURL *curl;             /* reusable curl_easy handle */
+#endif
 
 	/* 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 */
+	alpm_cb_fetch fetchcb;  /* Download file callback function */
+	alpm_cb_event eventcb;
+	alpm_cb_question questioncb;
+	alpm_cb_progress progresscb;
 
 	/* filesystem paths */
 	char *root;              /* Root path, default '/' */
 	char *dbpath;            /* Base path to pacman's DBs */
 	char *logfile;           /* Name of the log file */
 	char *lockfile;          /* Name of the lock file */
+	char *gpgdir;            /* Directory where GnuPG files are stored */
 	alpm_list_t *cachedirs;  /* Paths to pacman cache directories */
 
 	/* package lists */
 	alpm_list_t *noupgrade;   /* List of packages NOT to be upgraded */
 	alpm_list_t *noextract;   /* List of files NOT to extract */
 	alpm_list_t *ignorepkg;   /* List of packages to ignore */
-	alpm_list_t *ignoregrp;   /* List of groups to ignore */
+	alpm_list_t *ignoregroup; /* List of groups to ignore */
 
 	/* options */
-	int usesyslog;    /* Use syslog instead of logfile? */ /* TODO move to frontend */
+	int usesyslog;           /* Use syslog instead of logfile? */ /* TODO move to frontend */
-	char *arch;       /* Architecture of packages we should allow */
+	char *arch;              /* Architecture of packages we should allow */
-	int usedelta;     /* Download deltas if possible */
+	int usedelta;            /* Download deltas if possible */
-} pmhandle_t;
+	int checkspace;          /* Check disk space before installing */
+	alpm_siglevel_t siglevel;   /* Default signature verification level */
 
-/* global handle variable */
+	/* error code */
-extern pmhandle_t *handle;
+	enum _alpm_errno_t pm_errno;
+};
 
-pmhandle_t *_alpm_handle_new();
+alpm_handle_t *_alpm_handle_new(void);
-void _alpm_handle_free(pmhandle_t *handle);
+void _alpm_handle_free(alpm_handle_t *handle);
+
+int _alpm_handle_lock(alpm_handle_t *handle);
+int _alpm_handle_unlock(alpm_handle_t *handle);
+
+enum _alpm_errno_t _alpm_set_directory_option(const char *value,
+		char **storage, int must_exist);
 
 #endif /* _ALPM_HANDLE_H */
 

lib/libalpm/log.c

@@ -1,7 +1,7 @@
 /*
  *  log.c
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -22,10 +22,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <time.h>
 
 /* libalpm */
 #include "log.h"
@@ -39,18 +36,16 @@
  */
 
 /** A printf-like function for logging.
+ * @param handle the context handle
  * @param fmt output format
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
-int SYMEXPORT alpm_logaction(char *fmt, ...)
+int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *fmt, ...)
 {
 	int ret;
 	va_list args;
 
-	ALPM_LOG_FUNC;
+	ASSERT(handle != NULL, return -1);
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 
 	/* check if the logstream is open already, opening it if needed */
 	if(handle->logstream == NULL) {
@@ -58,18 +53,18 @@ int SYMEXPORT alpm_logaction(char *fmt, ...)
 		/* if we couldn't open it, we have an issue */
 		if(handle->logstream == NULL) {
 			if(errno == EACCES) {
-				pm_errno = PM_ERR_BADPERMS;
+				handle->pm_errno = ALPM_ERR_BADPERMS;
 			} else if(errno == ENOENT) {
-				pm_errno = PM_ERR_NOT_A_DIR;
+				handle->pm_errno = ALPM_ERR_NOT_A_DIR;
 			} else {
-				pm_errno = PM_ERR_SYSTEM;
+				handle->pm_errno = ALPM_ERR_SYSTEM;
 			}
-		return(-1);
+			return -1;
 		}
 	}
 
 	va_start(args, fmt);
-	ret = _alpm_logaction(handle->usesyslog, handle->logstream, fmt, args);
+	ret = _alpm_logaction(handle, fmt, args);
 	va_end(args);
 
 	/* TODO	We should add a prefix to log strings depending on who called us.
@@ -83,22 +78,21 @@ int SYMEXPORT alpm_logaction(char *fmt, ...)
 	 *   kpacman: "KPACMAN"
 	 * This would allow us to share the log file between several frontends
 	 * and know who does what */
-	return(ret);
+	return ret;
 }
 
 /** @} */
 
-void _alpm_log(pmloglevel_t flag, char *fmt, ...)
+void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...)
 {
 	va_list args;
-	alpm_cb_log logcb = alpm_option_get_logcb();
 
-	if(logcb == NULL) {
+	if(handle == NULL || handle->logcb == NULL) {
 		return;
 	}
 
 	va_start(args, fmt);
-	logcb(flag, fmt, args);
+	handle->logcb(flag, fmt, args);
 	va_end(args);
 }
 

lib/libalpm/log.h

@@ -1,7 +1,7 @@
 /*
  *  log.h
  *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2011 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
@@ -22,14 +22,8 @@
 
 #include "alpm.h"
 
-#ifdef PACMAN_DEBUG
+void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag,
-/* Log funtion entry points if debugging is enabled */
+		const char *fmt, ...) __attribute__((format(printf,3,4)));
-#define ALPM_LOG_FUNC _alpm_log(PM_LOG_FUNCTION, "Enter %s\n", __func__)
-#else
-#define ALPM_LOG_FUNC
-#endif
-
-void _alpm_log(pmloglevel_t flag, char *fmt, ...) __attribute__((format(printf,2,3)));
 
 #endif /* _ALPM_LOG_H */
 

lib/libalpm/md5.c

@@ -1,7 +1,12 @@
 /*
  *  RFC 1321 compliant MD5 implementation
  *
- *  Copyright (C) 2006-2007  Christophe Devine
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,25 +29,18 @@
 /*
  *  Pacman Notes:
  *
- *  Taken from the XySSL project at www.xyssl.org under terms of the
+ *  Taken from the PolarSSL project at http://polarssl.org under terms of the
- *  GPL. This is from version 0.9 of the library, and has been modified
+ *  GPL. This is from version 1.0.0 of the library, and has been modified
  *  as following, which may be helpful for future updates:
- *  * remove "xyssl/config.h" include
+ *  * remove "polarssl/config.h" include
- *  * change include from "xyssl/md5.h" to "md5.h"
+ *  * change include from "polarssl/sha2.h" to "sha2.h"
  *  * removal of HMAC code
  *  * removal of SELF_TEST code
- *  * removal of ipad and opad from the md5_context struct in md5.h
+ *  * removal of ipad and opad from the md5_context struct in sha2.h
- *  * change of md5_file prototype from
+ *  * increase the size of buffer for performance reasons
- *        int md5_file( char *path, unsigned char *output )
+ *  * various static changes
- *      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.
  */
 
-#include <string.h>
 #include <stdio.h>
 
 #include "md5.h"
@@ -73,7 +71,7 @@
 /*
  * MD5 context setup
  */
-static inline void md5_starts( md5_context *ctx )
+static void md5_starts( md5_context *ctx )
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
@@ -84,7 +82,7 @@ static inline void md5_starts( md5_context *ctx )
     ctx->state[3] = 0x10325476;
 }
 
-static inline void md5_process( md5_context *ctx, unsigned char data[64] )
+static void md5_process( md5_context *ctx, const unsigned char data[64] )
 {
     unsigned long X[16], A, B, C, D;
 
@@ -210,9 +208,9 @@ static inline void md5_process( md5_context *ctx, unsigned char data[64] )
 /*
  * MD5 process buffer
  */
-static inline void md5_update( md5_context *ctx, unsigned char *input, int ilen )
+static void md5_update( md5_context *ctx, const unsigned char *input, size_t ilen )
 {
-    int fill;
+    size_t fill;
     unsigned long left;
 
     if( ilen <= 0 )
@@ -221,7 +219,7 @@ static inline void md5_update( md5_context *ctx, unsigned char *input, int ilen
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
 
-    ctx->total[0] += ilen;
+    ctx->total[0] += (unsigned long) ilen;
     ctx->total[0] &= 0xFFFFFFFF;
 
     if( ctx->total[0] < (unsigned long) ilen )
@@ -251,7 +249,7 @@ static inline void md5_update( md5_context *ctx, unsigned char *input, int ilen
     }
 }
 
-static unsigned char md5_padding[64] =
+static const unsigned char md5_padding[64] =
 {
  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -262,7 +260,7 @@ static unsigned char md5_padding[64] =
 /*
  * MD5 final digest
  */
-static inline void md5_finish( md5_context *ctx, unsigned char output[16] )
+static void md5_finish( md5_context *ctx, unsigned char output[16] )
 {
     unsigned long last, padn;
     unsigned long high, low;
@@ -290,7 +288,7 @@ static inline void md5_finish( md5_context *ctx, unsigned char output[16] )
 /*
  * output = MD5( input buffer )
  */
-void md5( unsigned char *input, int ilen, unsigned char output[16] )
+void md5( const unsigned char *input, size_t ilen, unsigned char output[16] )
 {
     md5_context ctx;
 
@@ -309,7 +307,7 @@ int md5_file( const char *path, unsigned char output[16] )
     FILE *f;
     size_t n;
     md5_context ctx;
-    unsigned char buf[1024];
+    unsigned char buf[4096];
 
     if( ( f = fopen( path, "rb" ) ) == NULL )
         return( 1 );
@@ -317,7 +315,7 @@ int md5_file( const char *path, unsigned char output[16] )
     md5_starts( &ctx );
 
     while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        md5_update( &ctx, buf, (int) n );
+        md5_update( &ctx, buf, n );
 
     md5_finish( &ctx, output );
 

lib/libalpm/md5.h

@@ -1,7 +1,12 @@
 /*
  *  RFC 1321 compliant MD5 implementation
  *
- *  Copyright (C) 2006-2007  Christophe Devine
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,10 +21,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #ifndef _MD5_H
 #define _MD5_H
 
+#include <string.h>
+
 /**
  * \brief          MD5 context structure
  */
@@ -38,7 +44,7 @@ md5_context;
  * \param ilen     length of the input data
  * \param output   MD5 checksum result
  */
-void md5( unsigned char *input, int ilen, unsigned char output[16] );
+void md5( const unsigned char *input, size_t ilen, unsigned char output[16] );
 
 /**
  * \brief          Output = MD5( file contents )