convert from uthash to pkghash
modified libpkg/pkg_ports.c
@@ -503,16 +503,17 @@ populate_keywords(struct plist *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -884,15 +885,18 @@ static int
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1054,7 +1058,11 @@ plist_free(struct plist *p)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkg_repo.c
@@ -61,7 +61,6 @@ struct sig_cert {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -128,15 +127,15 @@ pkg_repo_file_has_ext(const char *path, const char *ext)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -148,13 +147,19 @@ pkg_repo_check_fingerprint(struct pkg_repo *repo, struct sig_cert *sc, bool fata
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -175,8 +180,7 @@ pkg_repo_check_fingerprint(struct pkg_repo *repo, struct sig_cert *sc, bool fata
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -185,12 +189,11 @@ pkg_repo_check_fingerprint(struct pkg_repo *repo, struct sig_cert *sc, bool fata
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -204,17 +207,22 @@ pkg_repo_check_fingerprint(struct pkg_repo *repo, struct sig_cert *sc, bool fata
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -396,7 +404,7 @@ pkg_repo_meta_extract_signature_fingerprints(int fd, void *ud)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -412,6 +420,7 @@ pkg_repo_parse_sigkeys(const char *in, int inlen, struct sig_cert **sc)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -450,8 +459,10 @@ pkg_repo_parse_sigkeys(const char *in, int inlen, struct sig_cert **sc)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -459,6 +470,7 @@ pkg_repo_parse_sigkeys(const char *in, int inlen, struct sig_cert **sc)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -505,7 +517,7 @@ pkg_repo_parse_sigkeys(const char *in, int inlen, struct sig_cert **sc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -517,9 +529,10 @@ pkg_repo_parse_sigkeys(const char *in, int inlen, struct sig_cert **sc)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -544,7 +557,7 @@ pkg_repo_archive_extract_archive(int fd, const char *file,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -596,7 +609,9 @@ static int
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -618,6 +633,9 @@ pkg_repo_archive_extract_check_archive(int fd, const char *file,
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -626,7 +644,7 @@ pkg_repo_archive_extract_check_archive(int fd, const char *file,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -636,7 +654,9 @@ pkg_repo_archive_extract_check_archive(int fd, const char *file,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -781,9 +801,11 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -864,7 +886,9 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -884,7 +908,9 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1015,7 +1041,7 @@ pkg_repo_load_fingerprint(const char *dir, const char *filename)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1032,7 +1058,7 @@ pkg_repo_load_fingerprints_from_path(const char *path, struct fingerprint **f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1052,7 +1078,7 @@ pkg_repo_load_fingerprints(struct pkg_repo *repo)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_repo_create.c
@@ -78,7 +78,6 @@ struct pkg_conflict_bulk {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -581,7 +580,8 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -591,6 +591,7 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -828,13 +829,15 @@ cleanup:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
|
|
|
|
| + | |
|
|
|
|
|
modified libpkg/pkg_repo_meta.c
@@ -69,7 +69,8 @@ pkg_repo_meta_set_default(struct pkg_repo_meta *meta)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -88,13 +89,15 @@ pkg_repo_meta_free(struct pkg_repo_meta *meta)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -290,7 +293,7 @@ pkg_repo_meta_parse(ucl_object_t *top, struct pkg_repo_meta **target, int versio
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_solve.c
@@ -80,7 +80,6 @@ struct pkg_solve_variable {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -100,7 +99,7 @@ struct pkg_solve_rule {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -172,15 +171,11 @@ pkg_solve_rule_free(struct pkg_solve_rule *rule)
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -289,6 +284,7 @@ pkg_solve_handle_provide (struct pkg_solve_problem *problem,
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -297,7 +293,11 @@ pkg_solve_handle_provide (struct pkg_solve_problem *problem,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -377,7 +377,10 @@ pkg_solve_add_depend_rule(struct pkg_solve_problem *problem,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -428,7 +431,10 @@ pkg_solve_add_conflict_rule(struct pkg_solve_problem *problem,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -590,7 +596,10 @@ pkg_solve_add_request_rule(struct pkg_solve_problem *problem,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -821,8 +830,7 @@ pkg_solve_add_variable(struct pkg_job_universe_item *un,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -868,9 +876,10 @@ pkg_solve_jobs_to_sat(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1421,9 +1430,11 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/private/pkg.h
@@ -413,7 +413,6 @@ struct pkg_repo_meta_key {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -451,7 +450,7 @@ struct pkg_repo_meta {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -534,8 +533,8 @@ struct pkg_repo {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -558,10 +557,8 @@ struct pkg_repo {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
| - | |
|
|
|
|
|
@@ -588,7 +585,7 @@ struct plist {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -673,7 +670,6 @@ typedef enum {
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified tests/frontend/conflicts-multirepo.sh
@@ -159,8 +159,8 @@ Updating database digests format: done
|
|
|
|
|
|
| - | |
|
|
| + | |
|
|
|
|
|
@@ -171,10 +171,10 @@ Installed packages to be UPGRADED:
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| + | |
| + | |
|
|
|
|
|
modified tests/frontend/conflicts.sh
@@ -132,8 +132,8 @@ All repositories are up to date.
|
|
|
|
|
|
| - | |
|
|
| + | |
|
|
|
|
|
@@ -311,8 +311,8 @@ All repositories are up to date.
|
|
|
|
|
|
| - | |
|
|
| + | |
|
|
|
|
|