Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 993d3b8
Drop support for libarchive older than 2.8.4
Baptiste Daroussin committed 12 years ago
commit 993d3b836764a7d7c1ce338e1f624688f0cb4d27
parent e607395
2 files changed +0 -6
modified libpkg/private/pkg.h
@@ -47,8 +47,6 @@
#define PKG_NUM_SCRIPTS 9



#if ARCHIVE_VERSION_NUMBER < 3000002
- 
#define archive_read_free(a) archive_read_finish(a)
- 
#define archive_write_free(a) archive_write_finish(a)

#define archive_write_add_filter_xz(a) archive_write_set_compression_xz(a)

#define archive_write_add_filter_bzip2(a) archive_write_set_compression_bzip2(a)

#define archive_write_add_filter_gzip(a) archive_write_set_compression_gzip(a)
modified pkg/audit.c
@@ -207,12 +207,8 @@ fetch_and_extract(const char *src, const char *dest, bool xml)
	cleanup:

	unlink(tmp);

	if (a != NULL)
- 
#if ARCHIVE_VERSION_NUMBER < 3000002
- 
		archive_read_finish(a);
- 
#else

		archive_read_close(a);

		archive_read_free(a);
- 
#endif

	if (fd >= 0)

		close(fd);