X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libopkg%2Fopkg_conf.h;h=7496ff4aee0ae1365f80ecc8da93fd8c31018425;hb=6dc8a5d00f1f5244d7c3732dbc21b3763e9066b6;hp=b44a7613ed93e365ff5cbf2a21db4f6ef3e18de0;hpb=69bae440fd21376d2a717575b1418c962396bd21;p=project%2Fopkg-lede.git

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index b44a761..7496ff4 100644
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -1,4 +1,4 @@
-/* opkg_conf.h - the itsy package management system
+/* opkg_conf.h - the opkg package management system
 
    Carl D. Worth
 
@@ -19,11 +19,13 @@
 #define OPKG_CONF_H
 
 typedef struct opkg_conf opkg_conf_t;
+extern opkg_conf_t *conf;
+
+#include "config.h"
+
+#include <stdarg.h>
 
 #include "hash_table.h"
-#include "args.h"
-#include "pkg.h"
-#include "pkg_hash.h"
 #include "pkg_src_list.h"
 #include "pkg_dest_list.h"
 #include "nv_pair_list.h"
@@ -31,7 +33,8 @@ typedef struct opkg_conf opkg_conf_t;
 #define OPKG_CONF_DEFAULT_TMP_DIR_BASE "/tmp"
 #define OPKG_CONF_TMP_DIR_SUFFIX "opkg-XXXXXX"
 #define OPKG_CONF_LISTS_DIR  OPKG_STATE_DIR_PREFIX "/lists"
-#define OPKG_CONF_PENDING_DIR OPKG_STATE_DIR_PREFIX "/pending"
+
+#define OPKG_CONF_DEFAULT_CONF_FILE_DIR OPKGETCDIR"/opkg"
 
 /* In case the config file defines no dest */
 #define OPKG_CONF_DEFAULT_DEST_NAME "root"
@@ -47,30 +50,57 @@ struct opkg_conf
 
      int restrict_to_default_dest;
      pkg_dest_t *default_dest;
+     char *dest_str;
+
+     char *conf_file;
 
      char *tmp_dir;
-     const char *lists_dir;
-     const char *pending_dir;
+     char *lists_dir;
+
+     unsigned int pfm; /* package field mask */
+
+     /* For libopkg users to capture messages. */
+     void (*opkg_vmessage)(int, const char *fmt, va_list ap);
 
      /* options */
      int autoremove;
      int force_depends;
      int force_defaults;
+     int force_maintainer;
      int force_overwrite;
      int force_downgrade;
      int force_reinstall;
      int force_space;
      int force_removal_of_dependent_packages;
      int force_removal_of_essential_packages;
-     int nodeps; /* do not follow dependences */
-     int verbose_wget;
-     int multiple_providers;
+     int force_postinstall;
+     int check_signature;
+     int nodeps; /* do not follow dependencies */
      char *offline_root;
-     char *offline_root_pre_script_cmd;
-     char *offline_root_post_script_cmd;
      int query_all;
      int verbosity;
      int noaction;
+     int download_only;
+     char *cache;
+
+#ifdef HAVE_SSLCURL
+     /* some options could be used by
+      * wget if curl support isn't builtin
+      * If someone want to try...
+      */
+     char *ssl_engine;
+     char *ssl_cert;
+     char *ssl_cert_type;
+     char *ssl_key;
+     char *ssl_key_type;
+     char *ssl_key_passwd;
+     char *ssl_ca_file;
+     char *ssl_ca_path;
+     int ssl_dont_verify_peer;
+#endif
+#ifdef HAVE_PATHFINDER
+     int check_x509_path;
+#endif
 
      /* proxy options */
      char *http_proxy;
@@ -79,6 +109,9 @@ struct opkg_conf
      char *proxy_user;
      char *proxy_passwd;
 
+     char *signature_ca_file;
+     char *signature_ca_path;
+
      hash_table_t pkg_hash;
      hash_table_t file_hash;
      hash_table_t obs_file_hash;
@@ -95,13 +128,13 @@ typedef struct opkg_option opkg_option_t;
 struct opkg_option {
      const char *name;
      const opkg_option_type_t type;
-     const void *value;
+     void * const value;
 };
 
-int opkg_conf_init(opkg_conf_t *conf, const args_t *args);
-void opkg_conf_deinit(opkg_conf_t *conf);
+int opkg_conf_init(void);
+void opkg_conf_deinit(void);
 
-int opkg_conf_write_status_files(opkg_conf_t *conf);
-char *root_filename_alloc(opkg_conf_t *conf, char *filename);
+int opkg_conf_write_status_files(void);
+char *root_filename_alloc(char *filename);
 
 #endif