Merge branch 'maint'

Conflicts:
	lib/libalpm/be_sync.c
	lib/libalpm/db.c
	src/pacman/util.c

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 69c2b852..59a1283b 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -124,6 +124,10 @@ static alpm_list_t *_pkg_get_deltas(pmpkg_t *pkg)     { return pkg->deltas; }
 static alpm_list_t *_pkg_get_files(pmpkg_t *pkg)      { return pkg->files; }
 static alpm_list_t *_pkg_get_backup(pmpkg_t *pkg)     { return pkg->backup; }
 
+static void *_pkg_changelog_open(pmpkg_t *pkg)        { return NULL; }
+static size_t _pkg_changelog_read(void *ptr, size_t size, const pmpkg_t *pkg, const void *fp) { return 0; }
+static int _pkg_changelog_close(const pmpkg_t *pkg, void *fp) { return EOF; }
+
 /** The standard package operations struct. Get fields directly from the
  * struct itself with no abstraction layer or any type of lazy loading.
  */
@@ -142,6 +146,7 @@ struct pkg_operations default_pkg_ops = {
 	.get_isize       = _pkg_get_isize,
 	.get_reason      = _pkg_get_reason,
 	.has_scriptlet   = _pkg_has_scriptlet,
+
 	.get_licenses    = _pkg_get_licenses,
 	.get_groups      = _pkg_get_groups,
 	.get_depends     = _pkg_get_depends,
@@ -152,6 +157,10 @@ struct pkg_operations default_pkg_ops = {
 	.get_deltas      = _pkg_get_deltas,
 	.get_files       = _pkg_get_files,
 	.get_backup      = _pkg_get_backup,
+
+	.changelog_open  = _pkg_changelog_open,
+	.changelog_read  = _pkg_changelog_read,
+	.changelog_close = _pkg_changelog_close,
 };
 
 /* Public functions for getting package information. These functions