0287b56 HBSD: Resolve merge conflicts — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflicts

Shawn Webb committed 3 years ago

commit 0287b5615c1ee37d4a072378ffde3d4559f3e808
parent 6c2ebb5

2 files changed +0 -8

modified libpkg/private/pkg.h

@@ -811,17 +811,12 @@ void backup_library(struct pkgdb *, struct pkg *, const char *);

 int suggest_arch(struct pkg *, bool);
 int set_attrsat(int fd, const char *path, mode_t perm, uid_t uid, gid_t gid, const struct timespec *ats, const struct timespec *mts);
 <<<<<<< HEAD
 /* Filesystem extended attribute support */
 int pkg_archive_extattrs(int, struct archive_entry *);
 struct trigger *triggers_load(bool cleanup_only);
 int triggers_execute(struct trigger *cleanup_triggers);
 =======
 trigger_t *triggers_load(bool cleanup_only);
 int triggers_execute(trigger_t *cleanup_triggers);
 void append_touched_dir(const char *path);
 >>>>>>> upstream-master
 void append_touched_file(const char *path);
 bool stringlist_contains(stringlist_t *l, const char *name);

modified tests/frontend/repo.sh

@@ -182,8 +182,6 @@ EOF

 	atf_check -o match:"Installing plop-1\.1" \
 		pkg -C ./pkg.conf install -y plop
 }
 <<<<<<< HEAD
 =======
 repo_symlinks_body() {
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1.0 "${TMPDIR}"

@@ -237,4 +235,3 @@ repo_content_body() {

 	nb=$(tar -xf packagesite.pkg -O - packagesite.yaml | wc -l)
 	[ $nb -eq 1 ] || atf_fail "packagesite has $nb entries instead of 1"
 }
 >>>>>>> upstream-master