f337969 pkg create always create packages with the same HASH — HardenedBSD-pkg

HardenedBSD Package Manager

pkg create always create packages with the same HASH

Baptiste Daroussin committed 14 years ago

commit f3379691e172acc4baf31bdf5bfdb36745f544b7
parent 7e7bc69c1d7845deaac1cab04350320d555f2b3f

2 files changed +6 -2

modified libpkg/packing.c

@@ -167,6 +167,11 @@ packing_append_file_attr(struct packing *pack, const char *filepath, const char

 	if (perm != 0)
 		archive_entry_set_perm(entry, perm);
 	archive_entry_unset_atime(entry);
 	archive_entry_unset_ctime(entry);
 	archive_entry_unset_mtime(entry);
 	archive_entry_unset_birthtime(entry);
 	archive_entry_linkify(pack->resolver, &entry, &sparse_entry);
 	if (sparse_entry != NULL && entry == NULL)

modified libpkg/private/pkg.h

@@ -43,8 +43,7 @@

 #define PKG_NUM_FIELDS 18
 #define EXTRACT_ARCHIVE_FLAGS  (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \
 		ARCHIVE_EXTRACT_TIME  |ARCHIVE_EXTRACT_ACL | \
 		ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR)
 		ARCHIVE_EXTRACT_ACL | ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR)
 #define LIST_FREE(head, data, free_func) do { \
 	while (!STAILQ_EMPTY(head)) { \