projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'grg' into HEAD
[oweals/opkg-lede.git]
/
libopkg
/
opkg_conf.h
diff --git
a/libopkg/opkg_conf.h
b/libopkg/opkg_conf.h
index 3c5dfe4f1bdbc18d526745f6ae07a3baac94f25e..a268bba9140c7c72530ce4ca611198b41ffcc2fe 100644
(file)
--- a/
libopkg/opkg_conf.h
+++ b/
libopkg/opkg_conf.h
@@
-19,6
+19,7
@@
#define OPKG_CONF_H
typedef struct opkg_conf opkg_conf_t;
#define OPKG_CONF_H
typedef struct opkg_conf opkg_conf_t;
+extern opkg_conf_t *conf;
#include "hash_table.h"
#include "args.h"
#include "hash_table.h"
#include "args.h"
@@
-31,7
+32,6
@@
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_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"
/* In case the config file defines no dest */
#define OPKG_CONF_DEFAULT_DEST_NAME "root"
/* In case the config file defines no dest */
#define OPKG_CONF_DEFAULT_DEST_NAME "root"
@@
-41,7
+41,6
@@
typedef struct opkg_conf opkg_conf_t;
struct opkg_conf
{
struct opkg_conf
{
- int lock_fd; /* file descriptor for the lock file */
pkg_src_list_t pkg_src_list;
pkg_dest_list_t pkg_dest_list;
nv_pair_list_t arch_list;
pkg_src_list_t pkg_src_list;
pkg_dest_list_t pkg_dest_list;
nv_pair_list_t arch_list;
@@
-51,25
+50,46
@@
struct opkg_conf
char *tmp_dir;
char *lists_dir;
char *tmp_dir;
char *lists_dir;
- char *pending_dir;
+
+ uint pfm; /* package field mask */
/* options */
int autoremove;
int force_depends;
int force_defaults;
/* 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 force_overwrite;
int force_downgrade;
int force_reinstall;
int force_space;
int force_removal_of_dependent_packages;
int force_removal_of_essential_packages;
+ int check_signature;
int nodeps; /* do not follow dependences */
char *offline_root;
int nodeps; /* do not follow dependences */
char *offline_root;
- char *offline_root_pre_script_cmd;
- char *offline_root_post_script_cmd;
int query_all;
int verbosity;
int noaction;
int query_all;
int verbosity;
int noaction;
+ 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;
/* proxy options */
char *http_proxy;
@@
-78,6
+98,9
@@
struct opkg_conf
char *proxy_user;
char *proxy_passwd;
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;
hash_table_t pkg_hash;
hash_table_t file_hash;
hash_table_t obs_file_hash;
@@
-94,16
+117,13
@@
typedef struct opkg_option opkg_option_t;
struct opkg_option {
const char *name;
const opkg_option_type_t type;
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_write_status_files(opkg_conf_t *conf);
-char *root_filename_alloc(opkg_conf_t *conf, char *filename);
-
+int opkg_conf_init(const args_t *args);
+void opkg_conf_deinit(void);
-int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options);
+int opkg_conf_write_status_files(void);
+char *root_filename_alloc(char *filename);
#endif
#endif