* Clone a pkg_t
*/
static opkg_package_t*
-pkg_clone (pkg_t *old)
+pkg_t_to_opkg_package_t (pkg_t *old)
{
opkg_package_t *new;
a->autoremove = c->autoremove;
a->force_depends = c->force_depends;
a->force_defaults = c->force_defaults;
+ a->force_maintainer = c->force_maintainer;
a->force_overwrite = c->force_overwrite;
a->force_downgrade = c->force_downgrade;
a->force_reinstall = c->force_reinstall;
new->state_flag |= SF_USER;
pdata.action = OPKG_INSTALL;
- pdata.package = pkg_clone (new);
+ pdata.package = pkg_t_to_opkg_package_t (new);
progress (pdata, 0);
continue;
opkg_package_free (pdata.package);
- pdata.package = pkg_clone (pkg);
+ pdata.package = pkg_t_to_opkg_package_t (pkg);
pdata.action = OPKG_DOWNLOAD;
if (pkg->src == NULL)
/* 75% of "install" progress is for downloading */
opkg_package_free (pdata.package);
- pdata.package = pkg_clone (new);
+ pdata.package = pkg_t_to_opkg_package_t (new);
pdata.action = OPKG_INSTALL;
progress (pdata, 75);
case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+ case OPKG_INSTALL_ERR_SHA256: return OPKG_SHA256_ERROR;
default: return OPKG_UNKNOWN_ERROR;
}
}
}
pdata.action = OPKG_REMOVE;
- pdata.package = pkg_clone (pkg);
+ pdata.package = pkg_t_to_opkg_package_t (pkg);
progress (pdata, 0);
}
pdata.action = OPKG_INSTALL;
- pdata.package = pkg_clone (pkg);
+ pdata.package = pkg_t_to_opkg_package_t (pkg);
progress (pdata, 0);
err = opkg_upgrade_pkg (opkg->conf, pkg);
case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+ case OPKG_INSTALL_ERR_SHA256: return OPKG_SHA256_ERROR;
default: return OPKG_UNKNOWN_ERROR;
}
}
{
pkg = installed->pkgs[i];
- pdata.package = pkg_clone (pkg);
+ pdata.package = pkg_t_to_opkg_package_t (pkg);
progress (pdata, 99 * i / installed->len);
opkg_package_free (pdata.package);
/* count the number of sources so we can give some progress updates */
sources_list_count = 0;
sources_done = 0;
- iter = opkg->conf->pkg_src_list.head;
- while (iter)
+ list_for_each_entry(iter, &opkg->conf->pkg_src_list.head, node)
{
sources_list_count++;
- iter = iter->next;
}
- for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
+ list_for_each_entry(iter, &opkg->conf->pkg_src_list.head, node)
{
char *url, *list_file_name = NULL;
- src = iter->data;
+ src = (pkg_src_t *)iter->data;
if (src->extra_data) /* debian style? */
sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
}
free (url);
-#ifdef HAVE_GPGME
- char *sig_file_name;
- /* download detached signitures to verify the package lists */
- /* get the url for the sig file */
- if (src->extra_data) /* debian style? */
- sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
- "Packages.sig");
- else
- sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
+#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL)
+ if ( opkg->conf->check_signature ) {
+ char *sig_file_name;
+ /* download detached signitures to verify the package lists */
+ /* get the url for the sig file */
+ if (src->extra_data) /* debian style? */
+ sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
+ "Packages.sig");
+ else
+ sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
- /* create filename for signature */
- sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
+ /* create filename for signature */
+ sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
- /* make sure there is no existing signature file */
- unlink (sig_file_name);
+ /* make sure there is no existing signature file */
+ unlink (sig_file_name);
- err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
- if (err)
- {
- /* XXX: Warning: Download failed */
- }
- else
- {
- int err;
- err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
- if (err == 0)
- {
- /* XXX: Notice: Signature check passed */
- }
- else
- {
- /* XXX: Warning: Signature check failed */
- }
+ err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
+ if (err)
+ {
+ /* XXX: Warning: Download failed */
+ }
+ else
+ {
+ int err;
+ err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
+ if (err == 0)
+ {
+ /* XXX: Notice: Signature check passed */
+ }
+ else
+ {
+ /* XXX: Warning: Signature check failed */
+ }
+ }
+ free (sig_file_name);
+ free (list_file_name);
+ free (url);
}
- free (sig_file_name);
- free (list_file_name);
- free (url);
#else
/* XXX: Note: Signature check for %s skipped because GPG support was not
* enabled in this build
pkg = all->pkgs[i];
- package = pkg_clone (pkg);
+ package = pkg_t_to_opkg_package_t (pkg);
callback (opkg, package, user_data);
opkg_package_free (package);
}
for (node=active_list_next(head, head); node; active_list_next(head,node)) {
old = list_entry(node, pkg_t, list);
new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name, NULL);
- package = pkg_clone (new);
+ package = pkg_t_to_opkg_package_t (new);
callback (opkg, package, user_data);
opkg_package_free (package);
}
}
/* match found */
- package = pkg_clone (pkg);
+ package = pkg_t_to_opkg_package_t (pkg);
break;
}
return package;
}
+#ifdef HAVE_CURL
#include <curl/curl.h>
+#endif
/**
* @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status.
* @param opkg The opkg_t
src = str_list_alloc();
- for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
+ list_for_each_entry(iter, &opkg->conf->pkg_src_list.head, node)
{
- if (strstr(iter->data->value, "://") &&
- index(strstr(iter->data->value, "://") + 3, '/'))
- stmp = strndup(iter->data->value,
- (index(strstr(iter->data->value, "://") + 3, '/') - iter->data->value)*sizeof(char));
+ if (strstr(((pkg_src_t *)iter->data)->value, "://") &&
+ index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/'))
+ stmp = strndup(((pkg_src_t *)iter->data)->value,
+ (index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/') - ((pkg_src_t *)iter->data)->value)*sizeof(char));
else
- stmp = strdup(iter->data->value);
+ stmp = strdup(((pkg_src_t *)iter->data)->value);
- for (iter1 = src->head; iter1; iter1 = iter1->next)
+ for (iter1 = str_list_first(src); iter1; iter1 = str_list_next(src, iter1))
{
if (strstr(iter1->data, stmp))
break;
free(stmp);
str_list_append(src, repo_ptr);
+ free(repo_ptr);
repositories++;
}
while (repositories > 0)
repositories--;
err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL);
+#ifdef HAVE_CURL
if (!(err == CURLE_OK ||
err == CURLE_HTTP_RETURNED_ERROR ||
err == CURLE_FILE_COULDNT_READ_FILE ||
err == CURLE_REMOTE_FILE_NOT_FOUND ||
err == CURLE_TFTP_NOTFOUND
)) {
+#else
+ if (!(err == 0)) {
+#endif
ret++;
}
str_list_elt_deinit(iter1);