Merge branch 'upstream-master'
modified .cirrus.yml
@@ -11,6 +11,9 @@ freebsd_task:
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -36,40 +39,40 @@ debian_task:
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified auto.def
@@ -359,3 +359,4 @@ foreach dir [list external/blake2 external/picosat \
|
|
|
|
|
|
| + | |
modified compat/Makefile.autosetup
@@ -8,7 +8,10 @@ SRCS= closefrom.c \
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified docs/Makefile.autosetup
@@ -46,18 +46,20 @@ MAN3GZ= $(MAN3:.3=.3.gz)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/blake2/Makefile.autosetup
@@ -3,4 +3,6 @@ LIB= blake2
|
|
|
|
|
|
| + | |
| + | |
|
modified external/libfetch/Makefile.autosetup
@@ -6,9 +6,12 @@ SRCS= common.c \
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
|
modified external/libucl/Makefile.autosetup
@@ -17,4 +17,6 @@ LOCAL_CFLAGS= -I$(top_srcdir)/external/libucl/include \
|
|
|
|
|
|
| + | |
| + | |
|
modified external/linenoise/Makefile.autosetup
@@ -1,5 +1,6 @@
|
|
|
|
|
|
| + | |
|
|
|
modified external/msgpuck/Makefile.autosetup
@@ -5,5 +5,7 @@ LIB= msgpuck
|
|
|
|
|
|
| + | |
| + | |
|
|
|
modified external/picosat/Makefile.autosetup
@@ -4,4 +4,7 @@ SRCS= picosat.c \
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
modified external/sqlite/Makefile.autosetup
@@ -4,6 +4,7 @@ SRCS= sqlite3.c \
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -39,4 +40,6 @@ LOCAL_CFLAGS= -I$(top_srcdir)/external/linenoise \
|
|
|
|
|
|
| + | |
| + | |
|
modified external/yxml/Makefile.autosetup
@@ -4,7 +4,9 @@ LIB= yxml
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/Makefile.autosetup
@@ -64,8 +64,11 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
|
|
|
|
|
|
| + | |
|
|
| + | |
|
|
| + | |
|
|
|
|
|
@@ -123,7 +126,7 @@ LOCAL_LDFLAGS+= -L$(top_builddir)/external/libmachista -lmachista_pic \
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -148,6 +151,8 @@ LOCAL_CFLAGS+= @PKG_LIBLDNS_CFLAGS@
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkg.h.in
@@ -1051,9 +1051,6 @@ int pkgdb_compact(struct pkgdb *db);
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
|
modified libpkg/pkg_add.c
@@ -973,7 +973,7 @@ cleanup:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1013,6 +1013,8 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -1054,7 +1056,7 @@ pkg_add_triggers(void)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1191,7 +1193,7 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1287,26 +1289,26 @@ int
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_config.c
@@ -617,7 +617,7 @@ add_repo(const ucl_object_t *obj, struct pkg_repo *r, const char *rname, pkg_ini
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -790,6 +790,7 @@ walk_repo_obj(const ucl_object_t *obj, const char *file, pkg_init_flags flags)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -799,9 +800,12 @@ walk_repo_obj(const ucl_object_t *obj, const char *file, pkg_init_flags flags)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkg_delete.c
@@ -54,7 +54,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -99,7 +99,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -324,7 +324,7 @@ pkg_delete_file(struct pkg *pkg, struct pkg_file *file, unsigned force)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -345,6 +345,7 @@ pkg_delete_files(struct pkg *pkg, unsigned force)
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified libpkg/pkg_jobs.c
@@ -102,6 +102,7 @@ pkg_jobs_new(struct pkg_jobs **j, pkg_jobs_t t, struct pkgdb *db)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -187,6 +188,14 @@ pkg_jobs_free(struct pkg_jobs *j)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -813,8 +822,7 @@ pkg_jobs_has_replacement(struct pkg_jobs *j, const char *uid)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -824,7 +832,6 @@ pkg_jobs_try_remote_candidate(struct pkg_jobs *j, const char *cond, const char *
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -835,28 +842,6 @@ pkg_jobs_try_remote_candidate(struct pkg_jobs *j, const char *cond, const char *
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -880,7 +865,7 @@ pkg_jobs_guess_upgrade_candidate(struct pkg_jobs *j, const char *pattern)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -903,12 +888,12 @@ pkg_jobs_guess_upgrade_candidate(struct pkg_jobs *j, const char *pattern)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2072,9 +2057,9 @@ pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j,
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2088,9 +2073,8 @@ pkg_jobs_execute(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2158,9 +2142,9 @@ pkg_jobs_execute(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2185,7 +2169,7 @@ pkg_jobs_execute(struct pkg_jobs *j)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_solve.c
@@ -299,7 +299,7 @@ pkg_solve_handle_provide (struct pkg_solve_problem *problem,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/private/pkg.h
@@ -1,5 +1,5 @@
|
|
| - | |
| + | |
|
|
|
|
|
@@ -268,6 +268,14 @@ struct trigger {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -605,7 +613,7 @@ int pkg_get_myarch_legacy(char *pkgarch, size_t sz);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -679,7 +687,7 @@ pkg_formats packing_format_from_string(const char *str);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -741,7 +749,10 @@ char *pkg_checksum_generate_fileat(int fd, const char *path,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -816,6 +827,8 @@ int pkg_archive_extattrs(int, struct archive_entry *);
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
modified libpkg/private/pkg_jobs.h
@@ -113,6 +113,7 @@ struct pkg_jobs {
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified libpkg/repo/binary/Makefile.autosetup
@@ -7,11 +7,15 @@ SRCS= binary.c \
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
modified libpkg/triggers.c
@@ -134,6 +134,7 @@ trigger_load(int dfd, const char *name, bool cleanup_only, ucl_object_t *schema)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -258,6 +259,30 @@ err:
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -502,32 +527,9 @@ int
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -564,11 +566,6 @@ triggers_execute(trigger_t *cleanup_triggers)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
modified libpkg/utils.c
@@ -971,12 +971,12 @@ hidden_tempfile(char *buf, int buflen, const char *path)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified scripts/Makefile.autosetup
@@ -20,6 +20,8 @@ PWEEKLY= periodic/400.status-pkg
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
modified src/Makefile.autosetup
@@ -41,6 +41,7 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -84,6 +85,7 @@ STATIC_ARG= -static
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -106,7 +108,7 @@ $(PROG): $(top_builddir)/libpkg/libpkg_flat.a
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified src/create.c
@@ -105,8 +105,8 @@ pkg_create_matches(int argc, char **argv, match_t match, struct pkg_create *pc)
|
|
|
|
|
|
| - | |
|
|
| + | |
|
|
|
|
|
modified src/main.c
@@ -294,13 +294,15 @@ show_plugin_info(void)
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/version.c
@@ -601,7 +601,7 @@ category_new(char *categorypath, const char *category)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -626,7 +626,7 @@ category_new(char *categorypath, const char *category)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|