1 files changed, 13 insertions, 4 deletions

diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index b161d5f1..bc5b2671 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -24,11 +24,14 @@
 #ifndef _ALPM_PACKAGE_H
 #define _ALPM_PACKAGE_H
 
+#include "config.h" /* ensure off_t is correct length */
+
 #include <sys/types.h> /* off_t */
 #include <time.h> /* time_t */
 
 #include "alpm.h"
 #include "db.h"
+#include "signing.h"
 
 typedef enum _pmpkgfrom_t {
 	PKG_FROM_FILE = 1,
@@ -45,8 +48,6 @@ typedef enum _pmpkgfrom_t {
  */
 struct pkg_operations {
 	const char *(*get_filename) (pmpkg_t *);
-	const char *(*get_name) (pmpkg_t *);
-	const char *(*get_version) (pmpkg_t *);
 	const char *(*get_desc) (pmpkg_t *);
 	const char *(*get_url) (pmpkg_t *);
 	time_t (*get_builddate) (pmpkg_t *);
@@ -96,6 +97,7 @@ struct __pmpkg_t {
 	char *url;
 	char *packager;
 	char *md5sum;
+	char *base64_sig;
 	char *arch;
 
 	time_t builddate;
@@ -108,6 +110,7 @@ struct __pmpkg_t {
 	int scriptlet;
 
 	pmpkgreason_t reason;
+	pmdbinfrq_t infolevel;
 	pmpkgfrom_t origin;
 	/* origin == PKG_FROM_FILE, use pkg->origin_data.file
 	 * origin == PKG_FROM_*DB, use pkg->origin_data.db */
@@ -115,7 +118,7 @@ struct __pmpkg_t {
 		pmdb_t *db;
 		char *file;
 	} origin_data;
-	pmdbinfrq_t infolevel;
+	pmhandle_t *handle;
 
 	alpm_list_t *licenses;
 	alpm_list_t *replaces;
@@ -137,10 +140,16 @@ pmpkg_t* _alpm_pkg_new(void);
 pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg);
 void _alpm_pkg_free(pmpkg_t *pkg);
 void _alpm_pkg_free_trans(pmpkg_t *pkg);
+
+
+pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile,
+		int full, const char *md5sum, const char *base64_sig,
+		pgp_verify_t check_sig);
+
 int _alpm_pkg_cmp(const void *p1, const void *p2);
 int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg);
 pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle);
-int _alpm_pkg_should_ignore(pmpkg_t *pkg);
+int _alpm_pkg_should_ignore(pmhandle_t *handle, pmpkg_t *pkg);
 
 #endif /* _ALPM_PACKAGE_H */