libopkg: remove GPG support

[oweals/opkg-lede.git] / libopkg / opkg.c

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 351983d562cdd3d1e26e57ba3d134112b8af9fe1..99e8c6de08d4d3308341b3fec1f4ea1cd5a6c64b 100644 (file)
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -15,8 +15,6 @@
    General Public License for more details.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <fnmatch.h>
@@ -122,7 +120,7 @@ int opkg_new()
        if (opkg_conf_load())
                goto err0;
 
-       if (pkg_hash_load_feeds())
+       if (pkg_hash_load_feeds(0))
                goto err1;
 
        if (pkg_hash_load_status_files())
@@ -239,12 +237,13 @@ opkg_install_package(const char *package_name,
                     void *user_data)
 {
        int err;
-       char *stripped_filename;
+       char *stripped_filename, *local_filename;
        opkg_progress_data_t pdata;
        pkg_t *old, *new;
        pkg_vec_t *deps, *all;
        int i, ndepends;
        char **unresolved = NULL;
+       const char *filename;
 
        opkg_assert(package_name != NULL);
 
@@ -302,7 +301,7 @@ opkg_install_package(const char *package_name,
                char *url;
 
                pkg = deps->pkgs[i];
-               if (pkg->local_filename)
+               if (pkg_get_string(pkg, PKG_LOCAL_FILENAME))
                        continue;
 
                pdata.pkg = pkg;
@@ -314,16 +313,20 @@ opkg_install_package(const char *package_name,
                        return -1;
                }
 
-               sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+               filename = pkg_get_string(pkg, PKG_FILENAME);
+
+               sprintf_alloc(&url, "%s/%s", pkg->src->value, filename);
 
                /* Get the filename part, without any directory */
-               stripped_filename = strrchr(pkg->filename, '/');
+               stripped_filename = strrchr(filename, '/');
                if (!stripped_filename)
-                       stripped_filename = pkg->filename;
+                       stripped_filename = (char *)filename;
 
-               sprintf_alloc(&pkg->local_filename, "%s/%s", conf->tmp_dir,
+               sprintf_alloc(&local_filename, "%s/%s", conf->tmp_dir,
                              stripped_filename);
 
+               pkg_set_string(pkg, PKG_LOCAL_FILENAME, local_filename);
+
                cb_data.cb = progress_callback;
                cb_data.progress_data = &pdata;
                cb_data.user_data = user_data;
@@ -331,7 +334,7 @@ opkg_install_package(const char *package_name,
                cb_data.start_range = 75 * i / deps->len;
                cb_data.finish_range = 75 * (i + 1) / deps->len;
 
-               err = opkg_download(url, pkg->local_filename,
+               err = opkg_download(url, local_filename,
                                    (curl_progress_func) curl_progress_cb,
                                    &cb_data, 0);
                free(url);
@@ -588,7 +591,7 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
                }
                free(url);
 
-#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
+#if defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
                if (conf->check_signature) {
                        char *sig_file_name;
                        /* download detached signitures to verify the package lists */
@@ -702,7 +705,7 @@ opkg_list_upgradable_packages(opkg_package_callback_t callback, void *user_data)
        head = prepare_upgrade_list();
        for (node = active_list_next(head, head); node;
             node = active_list_next(head, node)) {
-               old = list_entry(node, pkg_t, list);
+               old = node->pkg;
                new =
                    pkg_hash_fetch_best_installation_candidate_by_name(old->
                                                                       name);
@@ -744,7 +747,7 @@ pkg_t *opkg_find_package(const char *name, const char *ver, const char *arch,
 
                /* check architecture */
                if (arch) {
-                       if (sstrcmp(pkg->architecture, arch))
+                       if (sstrcmp(pkg_get_architecture(pkg), arch))
                                continue;
                }