From: Peter Avalos Date: Sun, 21 Jun 2009 22:00:54 +0000 (-1000) Subject: Merge branch 'vendor/LIBARCHIVE' X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/bd260456080b7da1062003a838d5efb5cd46a761 Merge branch 'vendor/LIBARCHIVE' --- bd260456080b7da1062003a838d5efb5cd46a761 diff --cc contrib/libarchive/README.DELETED index fed87a8c0c,0000000000..fed87a8c0c mode 100644,000000..100644 --- a/contrib/libarchive/README.DELETED +++ b/contrib/libarchive/README.DELETED diff --cc contrib/libarchive/README.DRAGONFLY index 43120b7f93,0000000000..29fd02f6ac mode 100644,000000..100644 --- a/contrib/libarchive/README.DRAGONFLY +++ b/contrib/libarchive/README.DRAGONFLY @@@ -1,14 -1,0 +1,11 @@@ +Original source can be downloaded from: +http://people.freebsd.org/~kientzle/libarchive/src/ + - cvs import hint: - cvs import src/contrib/libarchive-2 LIBARCHIVE v2_?_? - +A list of deleted files is in README.DELETED. + +This source is used in: + lib/libarchive + usr.bin/cpio + usr.bin/tar + +Remember to update cpio's version string in config.h. diff --cc lib/libarchive/Makefile index 8174deff75,0000000000..c2b4aa31dc mode 100644,000000..100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@@ -1,234 -1,0 +1,234 @@@ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $ +# $DragonFly: src/lib/libarchive/Makefile,v 1.21 2008/06/18 06:28:21 hasso Exp $ + +LIB= archive + - CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive-2/libarchive ++CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/libarchive +.PATH: ${CONTRIBDIR} + +SHLIB_MAJOR= 5 +CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} -I${CONTRIBDIR} +WARNS?= 6 + +DPADD= ${LIBBZ2} ${LIBZ} +LDADD= -lbz2 -lz + +INCS= archive.h archive_entry.h + +SRCS= archive_check_magic.c \ + archive_entry.c \ + archive_entry_copy_stat.c \ + archive_entry_link_resolver.c \ + archive_entry_stat.c \ + archive_entry_strmode.c \ + archive_read.c \ + archive_read_data_into_fd.c \ + archive_read_extract.c \ + archive_read_open_fd.c \ + archive_read_open_file.c \ + archive_read_open_filename.c \ + archive_read_open_memory.c \ + archive_read_support_compression_all.c \ + archive_read_support_compression_bzip2.c \ + archive_read_support_compression_compress.c \ + archive_read_support_compression_gzip.c \ + archive_read_support_compression_none.c \ + archive_read_support_compression_program.c \ + archive_read_support_format_all.c \ + archive_read_support_format_ar.c \ + archive_read_support_format_cpio.c \ + archive_read_support_format_empty.c \ + archive_read_support_format_iso9660.c \ + archive_read_support_format_mtree.c \ + archive_read_support_format_tar.c \ + archive_read_support_format_zip.c \ + archive_string.c \ + archive_string_sprintf.c \ + archive_util.c \ + archive_virtual.c \ + archive_write.c \ + archive_write_disk.c \ + archive_write_disk_set_standard_lookup.c \ + archive_write_open_fd.c \ + archive_write_open_file.c \ + archive_write_open_filename.c \ + archive_write_open_memory.c \ + archive_write_set_compression_bzip2.c \ + archive_write_set_compression_compress.c \ + archive_write_set_compression_gzip.c \ + archive_write_set_compression_none.c \ + archive_write_set_compression_program.c \ + archive_write_set_format.c \ + archive_write_set_format_ar.c \ + archive_write_set_format_by_name.c \ + archive_write_set_format_cpio.c \ + archive_write_set_format_cpio_newc.c \ + archive_write_set_format_pax.c \ + archive_write_set_format_shar.c \ + archive_write_set_format_ustar.c \ + filter_fork.c + +MAN= archive_entry.3 \ + archive_read.3 \ + archive_util.3 \ + archive_write.3 \ + archive_write_disk.3 \ + cpio.5 \ + libarchive.3 \ + libarchive-formats.5 \ + libarchive_internals.3 \ + mtree.5 \ + tar.5 + +MLINKS+= archive_entry.3 archive_entry_acl_add_entry.3 +MLINKS+= archive_entry.3 archive_entry_acl_add_entry_w.3 +MLINKS+= archive_entry.3 archive_entry_acl_clear.3 +MLINKS+= archive_entry.3 archive_entry_acl_count.3 +MLINKS+= archive_entry.3 archive_entry_acl_next.3 +MLINKS+= archive_entry.3 archive_entry_acl_next_w.3 +MLINKS+= archive_entry.3 archive_entry_acl_reset.3 +MLINKS+= archive_entry.3 archive_entry_acl_text_w.3 +MLINKS+= archive_entry.3 archive_entry_atime.3 +MLINKS+= archive_entry.3 archive_entry_atime_nsec.3 +MLINKS+= archive_entry.3 archive_entry_clear.3 +MLINKS+= archive_entry.3 archive_entry_clone.3 +MLINKS+= archive_entry.3 archive_entry_copy_fflags_text.3 +MLINKS+= archive_entry.3 archive_entry_copy_fflags_text_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_gname.3 +MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_hardlink.3 +MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_link.3 +MLINKS+= archive_entry.3 archive_entry_copy_link_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_sourcepath.3 +MLINKS+= archive_entry.3 archive_entry_copy_stat.3 +MLINKS+= archive_entry.3 archive_entry_copy_symlink.3 +MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_uname.3 +MLINKS+= archive_entry.3 archive_entry_copy_uname_w.3 +MLINKS+= archive_entry.3 archive_entry_dev.3 +MLINKS+= archive_entry.3 archive_entry_devmajor.3 +MLINKS+= archive_entry.3 archive_entry_devminor.3 +MLINKS+= archive_entry.3 archive_entry_filetype.3 +MLINKS+= archive_entry.3 archive_entry_fflags.3 +MLINKS+= archive_entry.3 archive_entry_fflags_text.3 +MLINKS+= archive_entry.3 archive_entry_free.3 +MLINKS+= archive_entry.3 archive_entry_gid.3 +MLINKS+= archive_entry.3 archive_entry_gname.3 +MLINKS+= archive_entry.3 archive_entry_hardlink.3 +MLINKS+= archive_entry.3 archive_entry_ino.3 +MLINKS+= archive_entry.3 archive_entry_mode.3 +MLINKS+= archive_entry.3 archive_entry_mtime.3 +MLINKS+= archive_entry.3 archive_entry_mtime_nsec.3 +MLINKS+= archive_entry.3 archive_entry_new.3 +MLINKS+= archive_entry.3 archive_entry_nlink.3 +MLINKS+= archive_entry.3 archive_entry_pathname.3 +MLINKS+= archive_entry.3 archive_entry_pathname_w.3 +MLINKS+= archive_entry.3 archive_entry_rdev.3 +MLINKS+= archive_entry.3 archive_entry_rdevmajor.3 +MLINKS+= archive_entry.3 archive_entry_rdevminor.3 +MLINKS+= archive_entry.3 archive_entry_set_atime.3 +MLINKS+= archive_entry.3 archive_entry_set_ctime.3 +MLINKS+= archive_entry.3 archive_entry_set_dev.3 +MLINKS+= archive_entry.3 archive_entry_set_devmajor.3 +MLINKS+= archive_entry.3 archive_entry_set_devminor.3 +MLINKS+= archive_entry.3 archive_entry_set_filetype.3 +MLINKS+= archive_entry.3 archive_entry_set_fflags.3 +MLINKS+= archive_entry.3 archive_entry_set_gid.3 +MLINKS+= archive_entry.3 archive_entry_set_gname.3 +MLINKS+= archive_entry.3 archive_entry_set_hardlink.3 +MLINKS+= archive_entry.3 archive_entry_set_link.3 +MLINKS+= archive_entry.3 archive_entry_set_mode.3 +MLINKS+= archive_entry.3 archive_entry_set_mtime.3 +MLINKS+= archive_entry.3 archive_entry_set_pathname.3 +MLINKS+= archive_entry.3 archive_entry_set_rdevmajor.3 +MLINKS+= archive_entry.3 archive_entry_set_rdevminor.3 +MLINKS+= archive_entry.3 archive_entry_set_size.3 +MLINKS+= archive_entry.3 archive_entry_set_symlink.3 +MLINKS+= archive_entry.3 archive_entry_set_uid.3 +MLINKS+= archive_entry.3 archive_entry_set_uname.3 +MLINKS+= archive_entry.3 archive_entry_size.3 +MLINKS+= archive_entry.3 archive_entry_sourcepath.3 +MLINKS+= archive_entry.3 archive_entry_stat.3 +MLINKS+= archive_entry.3 archive_entry_symlink.3 +MLINKS+= archive_entry.3 archive_entry_uid.3 +MLINKS+= archive_entry.3 archive_entry_uname.3 +MLINKS+= archive_read.3 archive_read_close.3 +MLINKS+= archive_read.3 archive_read_data.3 +MLINKS+= archive_read.3 archive_read_data_block.3 +MLINKS+= archive_read.3 archive_read_data_into_buffer.3 +MLINKS+= archive_read.3 archive_read_data_into_fd.3 +MLINKS+= archive_read.3 archive_read_data_skip.3 +MLINKS+= archive_read.3 archive_read_extract.3 +MLINKS+= archive_read.3 archive_read_extract2.3 +MLINKS+= archive_read.3 archive_read_extract_set_progress_callback.3 +MLINKS+= archive_read.3 archive_read_finish.3 +MLINKS+= archive_read.3 archive_read_new.3 +MLINKS+= archive_read.3 archive_read_next_header.3 +MLINKS+= archive_read.3 archive_read_open.3 +MLINKS+= archive_read.3 archive_read_open2.3 +MLINKS+= archive_read.3 archive_read_open_FILE.3 +MLINKS+= archive_read.3 archive_read_open_fd.3 +MLINKS+= archive_read.3 archive_read_open_filename.3 +MLINKS+= archive_read.3 archive_read_open_memory.3 +MLINKS+= archive_read.3 archive_read_support_compression_all.3 +MLINKS+= archive_read.3 archive_read_support_compression_bzip2.3 +MLINKS+= archive_read.3 archive_read_support_compression_compress.3 +MLINKS+= archive_read.3 archive_read_support_compression_gzip.3 +MLINKS+= archive_read.3 archive_read_support_compression_none.3 +MLINKS+= archive_read.3 archive_read_support_compression_program.3 +MLINKS+= archive_read.3 archive_read_support_format_all.3 +MLINKS+= archive_read.3 archive_read_support_format_cpio.3 +MLINKS+= archive_read.3 archive_read_support_format_empty.3 +MLINKS+= archive_read.3 archive_read_support_format_iso9660.3 +MLINKS+= archive_read.3 archive_read_support_format_tar.3 +MLINKS+= archive_read.3 archive_read_support_format_zip.3 +MLINKS+= archive_util.3 archive_clear_error.3 +MLINKS+= archive_util.3 archive_compression.3 +MLINKS+= archive_util.3 archive_compression_name.3 +MLINKS+= archive_util.3 archive_errno.3 +MLINKS+= archive_util.3 archive_error_string.3 +MLINKS+= archive_util.3 archive_format.3 +MLINKS+= archive_util.3 archive_format_name.3 +MLINKS+= archive_util.3 archive_set_error.3 +MLINKS+= archive_write.3 archive_write_close.3 +MLINKS+= archive_write.3 archive_write_data.3 +MLINKS+= archive_write.3 archive_write_finish.3 +MLINKS+= archive_write.3 archive_write_finish_entry.3 +MLINKS+= archive_write.3 archive_write_get_bytes_per_block.3 +MLINKS+= archive_write.3 archive_write_header.3 +MLINKS+= archive_write.3 archive_write_new.3 +MLINKS+= archive_write.3 archive_write_open.3 +MLINKS+= archive_write.3 archive_write_open_FILE.3 +MLINKS+= archive_write.3 archive_write_open_fd.3 +MLINKS+= archive_write.3 archive_write_open_filename.3 +MLINKS+= archive_write.3 archive_write_open_memory.3 +MLINKS+= archive_write.3 archive_write_set_bytes_in_last_block.3 +MLINKS+= archive_write.3 archive_write_set_bytes_per_block.3 +MLINKS+= archive_write.3 archive_write_set_compression_bzip2.3 +MLINKS+= archive_write.3 archive_write_set_compression_compress.3 +MLINKS+= archive_write.3 archive_write_set_compression_gzip.3 +MLINKS+= archive_write.3 archive_write_set_compression_none.3 +MLINKS+= archive_write.3 archive_write_set_compression_program.3 +MLINKS+= archive_write.3 archive_write_set_format_cpio.3 +MLINKS+= archive_write.3 archive_write_set_format_pax.3 +MLINKS+= archive_write.3 archive_write_set_format_pax_restricted.3 +MLINKS+= archive_write.3 archive_write_set_format_shar.3 +MLINKS+= archive_write.3 archive_write_set_format_shar_binary.3 +MLINKS+= archive_write.3 archive_write_set_format_ustar.3 +MLINKS+= archive_write_disk.3 archive_write_disk_close.3 +MLINKS+= archive_write_disk.3 archive_write_disk_data.3 +MLINKS+= archive_write_disk.3 archive_write_disk_finish.3 +MLINKS+= archive_write_disk.3 archive_write_disk_finish_entry.3 +MLINKS+= archive_write_disk.3 archive_write_disk_header.3 +MLINKS+= archive_write_disk.3 archive_write_disk_new.3 +MLINKS+= archive_write_disk.3 archive_write_disk_set_group_lookup.3 +MLINKS+= archive_write_disk.3 archive_write_disk_set_options.3 +MLINKS+= archive_write_disk.3 archive_write_disk_set_skip_file.3 +MLINKS+= archive_write_disk.3 archive_write_disk_set_standard_lookup.3 +MLINKS+= archive_write_disk.3 archive_write_disk_set_user_lookup.3 +MLINKS+= libarchive.3 archive.3 + +.include diff --cc usr.bin/cpio/Makefile index 4afe259fad,0000000000..f10f5f685e mode 100644,000000..100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@@ -1,16 -1,0 +1,16 @@@ +# $DragonFly: src/usr.bin/cpio/Makefile,v 1.2 2008/07/26 16:25:31 pavalos Exp $ + +PROG= bsdcpio +SRCS= cmdline.c cpio.c err.c matching.c pathmatch.c +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} +LDADD= -larchive -lbz2 -lz + - CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive-2/cpio ++CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/cpio +.PATH: ${CONTRIBDIR} +CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} +CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" + +SYMLINKS= ${BINDIR}/bsdcpio ${BINDIR}/cpio +MLINKS= bsdcpio.1 cpio.1 + +.include diff --cc usr.bin/tar/Makefile index 316a6d617e,0000000000..c88f41440f mode 100644,000000..100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@@ -1,20 -1,0 +1,20 @@@ +# $DragonFly: src/usr.bin/tar/Makefile,v 1.16 2008/07/12 14:57:33 pavalos Exp $ + +PROG= bsdtar +SRCS= bsdtar.c getdate.y matching.c read.c siginfo.c subst.c \ + tree.c util.c write.c +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} +LDADD= -larchive -lbz2 -lz + - CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive-2/tar ++CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/tar +.PATH: ${CONTRIBDIR} +LIBARCHIVE_VERSION!= cat ${CONTRIBDIR}/../version +VERSION!= echo $$((${LIBARCHIVE_VERSION} / 1000000)).$$((${LIBARCHIVE_VERSION} / 1000 % 1000)).$$((${LIBARCHIVE_VERSION} % 1000)) +CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} +CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" +CFLAGS+= -DBSDTAR_VERSION_STRING=\"${VERSION}\" + +SYMLINKS= ${BINDIR}/bsdtar ${BINDIR}/tar +MLINKS= bsdtar.1 tar.1 + +.include