CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src
Committed By: christos
Date: Thu Jun 13 23:24:25 UTC 2024
Modified Files:
src/external/bsd/libarchive/dist/libarchive/test:
test_read_disk_directory_traversals.c
Log Message:
PR/58342: Martin Husemann: NetBSD does not really support O_SEARCH
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c:1.3 src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c:1.4
--- src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c:1.3 Sun Jun 9 15:47:56 2024
+++ src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c Thu Jun 13 19:24:25 2024
@@ -1607,8 +1607,9 @@ test_parent(void)
int file_count;
int match_count;
int r;
-#if defined(O_PATH) || defined(O_SEARCH) || \
+#if defined(O_PATH) || (defined(O_SEARCH) && !defined(__NetBSD__)) || \
(defined(__FreeBSD__) && defined(O_EXEC))
+#define IGNORE_TRAVERSALS_TEST4
const char *ignore_traversals_test4;
ignore_traversals_test4 = getenv("IGNORE_TRAVERSALS_TEST4");
@@ -1787,8 +1788,7 @@ test_parent(void)
archive_entry_clear(ae);
r = archive_read_next_header2(a, ae);
if (r == ARCHIVE_FAILED) {
-#if defined(O_PATH) || defined(O_SEARCH) || \
- (defined(__FreeBSD__) && defined(O_EXEC))
+#ifdef IGNORE_TRAVERSALS_TEST4
if (ignore_traversals_test4 == NULL)
assertEqualIntA(a, ARCHIVE_OK, r);
#endif
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src Committed By: christos Date: Thu Jun 13 23:24:25 UTC 2024 Modified Files: src/external/bsd/libarchive/dist/libarchive/test: test_read_disk_directory_traversals.c Log Message: PR/58342: Martin Husemann: NetBSD does not really support O_SEARCH To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src Committed By: riastradh Date: Sun Jun 9 23:58:23 UTC 2024 Modified Files: src/external/bsd/libarchive/dist/libarchive/test: test_write_disk_secure.c Log Message: libarchive test_write_disk_secure.c: Restore hunk of local change. This was part of a change added in revision 1.4 in order to avoid cluttering /tmp (PR 55612), and lost in the 3.7.4 merge: https://mail-index.netbsd.org/source-changes/2020/08/28/msg121149.html To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c diff -u src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c:1.5 src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c:1.6 --- src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c:1.5 Sun Jun 9 19:47:56 2024 +++ src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c Sun Jun 9 23:58:23 2024 @@ -39,6 +39,16 @@ DEFINE_TEST(test_write_disk_secure) struct archive *a; struct archive_entry *ae; struct stat st; + char tmp[2048]; + const char *tmpdir; + const char *lname = + "libarchive_test-test_write_disk_secure-absolute_symlink"; +#if 0 + const char *fname = + "libarchive_test-test_write_disk_secure-absolute_symlink_path.tmp"; +#endif + const char *pname = + "libarchive_test-test_write_disk_secure-absolute_path.tmp"; #if defined(HAVE_LCHMOD) && defined(HAVE_SYMLINK) && \ defined(S_IRUSR) && defined(S_IWUSR) && defined(S_IXUSR) int working_lchmod;
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src Committed By: riastradh Date: Sun Jun 9 23:58:23 UTC 2024 Modified Files: src/external/bsd/libarchive/dist/libarchive/test: test_write_disk_secure.c Log Message: libarchive test_write_disk_secure.c: Restore hunk of local change. This was part of a change added in revision 1.4 in order to avoid cluttering /tmp (PR 55612), and lost in the 3.7.4 merge: https://mail-index.netbsd.org/source-changes/2020/08/28/msg121149.html To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive
Module Name:src Committed By: christos Date: Sun Jun 9 19:47:56 UTC 2024 Modified Files: src/external/bsd/libarchive: prepare-import.sh src/external/bsd/libarchive/dist/cpio/test: test_basic.c test_format_newc.c src/external/bsd/libarchive/dist/libarchive: archive.h archive_check_magic.c archive_entry.3 archive_openssl_evp_private.h archive_openssl_hmac_private.h archive_pack_dev.c archive_pack_dev.h archive_private.h archive_read.3 archive_read.c archive_read_disk.3 archive_read_disk_entry_from_file.c archive_read_disk_posix.c archive_read_open_filename.c archive_read_support_format_iso9660.c archive_read_support_format_mtree.c archive_read_support_format_warc.c archive_read_support_format_xar.c archive_util.3 archive_util.c archive_write.3 archive_write_disk.3 archive_write_disk_posix.c archive_write_set_format_ar.c archive_write_set_format_shar.c archive_write_set_format_ustar.c libarchive-formats.5 libarchive.3 libarchive_internals.3 tar.5 src/external/bsd/libarchive/dist/libarchive/test: test_acl_platform_nfs4.c test_acl_platform_posix1e.c test_archive_write_set_format_filter_by_ext.c test_compat_zip.c test_fuzz.c test_read_disk_directory_traversals.c test_read_extract.c test_read_format_7zip.c test_read_format_gtar_sparse.c test_read_format_zip.c test_read_format_zip_7075_utf8_paths.c test_read_format_zip_comment_stored.c test_read_format_zip_high_compression.c test_read_format_zip_jar.c test_read_format_zip_mac_metadata.c test_read_format_zip_malformed.c test_read_format_zip_nested.c test_read_format_zip_nofiletype.c test_read_format_zip_padded.c test_read_format_zip_sfx.c test_read_format_zip_with_invalid_traditional_eocd.c test_read_format_zip_zip64.c test_read_pax_truncated.c test_read_truncated_filter.c test_sparse_basic.c test_write_disk.c test_write_disk_secure.c test_write_disk_secure744.c test_write_disk_secure746.c test_write_format_cpio_empty.c test_write_format_shar_empty.c test_write_format_tar.c test_write_format_tar_sparse.c test_write_format_zip_file.c test_write_format_zip_file_zip64.c src/external/bsd/libarchive/dist/libarchive_fe: err.c err.h src/external/bsd/libarchive/dist/tar: bsdtar.c write.c src/external/bsd/libarchive/dist/tar/test: test_basic.c test_copy.c test_option_C_upper.c test_option_U_upper.c test_option_s.c test_symlink_dir.c src/external/bsd/libarchive/dist/test_utils: test_common.h test_main.c test_utils.c test_utils.h src/external/bsd/libarchive/include: config_netbsd.h src/external/bsd/libarchive/lib/libarchive: Makefile shlib_version Removed Files: src/external/bsd/libarchive/dist: CONTRIBUTING.md src/external/bsd/libarchive/dist/libarchive/test: test_compat_pax_libarchive_2x.c test_compat_pax_libarchive_2x.tar.Z.uu test_read_pax_schily_xattr.c test_read_pax_schily_xattr.tar.uu Log Message: Merge conflicts from 3.4.0 to 3.7.4 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libarchive/prepare-import.sh cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libarchive/dist/CONTRIBUTING.md cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/cpio/test/test_basic.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/libarchive/dist/cpio/test/test_format_newc.c cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/libarchive/dist/libarchive/archive.h \ src/external/bsd/libarchive/dist/libarchive/archive_entry.3 \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3 \ src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3 cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c \ src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h \ src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.c \ src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.h \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c \ src/external/bsd/libarchive/dist/libarchive/archive_util.3 \ src/external/bsd/libarchive/dist/libarchive/libarchive-formats.5 \ src/external/bsd/libarchive/dist/libarchive/libarchive.3 \ src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3 \ src/external/bsd/libarchive/dist/libarchive/tar.5 cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h \ src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c \ src/ex
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src Committed By: mrg Date: Tue Aug 1 08:53:05 UTC 2023 Modified Files: src/external/bsd/libarchive/dist/libarchive/test: test_fuzz.c Log Message: don't assert() that realloc() worked inside a conditional. found by GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src
Committed By: mrg
Date: Tue Aug 1 08:53:05 UTC 2023
Modified Files:
src/external/bsd/libarchive/dist/libarchive/test: test_fuzz.c
Log Message:
don't assert() that realloc() worked inside a conditional.
found by GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c:1.2 src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c:1.3
--- src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c:1.2 Tue Jan 21 18:33:48 2020
+++ src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c Tue Aug 1 08:53:05 2023
@@ -122,7 +122,7 @@ test_fuzz(const struct files *filesets)
tmp = slurpfile(&size, "%s",
filesets[n].names[i]);
newraw = realloc(rawimage, oldsize + size);
-if (!assert(newraw != NULL))
+if (newraw == NULL)
{
free(rawimage);
rawimage = NULL;
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src
Committed By: lukem
Date: Sat Jun 10 12:46:32 UTC 2023
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read_disk_posix.c
Log Message:
libarchive: fail if name_max is 0
Add error handling to the USE_READDIR_R code paths that set name_max
from struct statfs or statvfs; if the determined name_max == 0
then return an error.
Avoids a crash in tree_dir_next_posix() when the calculation of
dirent_size from name_max is too small for the memory allocated
for struct dirent.
Submitted to upstream in pull request
https://github.com/libarchive/libarchive/pull/1903
Should fix PR bin/56080
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c:1.2 src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c:1.3
--- src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c:1.2 Mon Mar 29 15:31:46 2021
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c Sat Jun 10 12:46:32 2023
@@ -1653,6 +1653,11 @@ setup_current_filesystem(struct archive_
else
t->current_filesystem->name_max = nm;
#endif
+ if (t->current_filesystem->name_max == 0) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Cannot determine name_max");
+ return (ARCHIVE_FAILED);
+ }
#endif /* USE_READDIR_R */
return (ARCHIVE_OK);
}
@@ -1726,6 +1731,11 @@ setup_current_filesystem(struct archive_
/* Set maximum filename length. */
t->current_filesystem->name_max = sfs.f_namemax;
+ if (t->current_filesystem->name_max == 0) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Cannot determine name_max");
+ return (ARCHIVE_FAILED);
+ }
return (ARCHIVE_OK);
}
@@ -1858,6 +1868,11 @@ setup_current_filesystem(struct archive_
#if defined(USE_READDIR_R)
/* Set maximum filename length. */
t->current_filesystem->name_max = sfs.f_namelen;
+ if (t->current_filesystem->name_max == 0) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Cannot determine name_max");
+ return (ARCHIVE_FAILED);
+ }
#endif
return (ARCHIVE_OK);
}
@@ -1939,6 +1954,11 @@ setup_current_filesystem(struct archive_
#if defined(USE_READDIR_R)
/* Set maximum filename length. */
t->current_filesystem->name_max = sfs.f_namemax;
+ if (t->current_filesystem->name_max == 0) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Cannot determine name_max");
+ return (ARCHIVE_FAILED);
+ }
#endif
return (ARCHIVE_OK);
}
@@ -1993,6 +2013,11 @@ setup_current_filesystem(struct archive_
else
t->current_filesystem->name_max = nm;
# endif /* _PC_NAME_MAX */
+ if (t->current_filesystem->name_max == 0) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Cannot determine name_max");
+ return (ARCHIVE_FAILED);
+ }
#endif /* USE_READDIR_R */
return (ARCHIVE_OK);
}
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src Committed By: lukem Date: Sat Jun 10 12:46:32 UTC 2023 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive_read_disk_posix.c Log Message: libarchive: fail if name_max is 0 Add error handling to the USE_READDIR_R code paths that set name_max from struct statfs or statvfs; if the determined name_max == 0 then return an error. Avoids a crash in tree_dir_next_posix() when the calculation of dirent_size from name_max is too small for the memory allocated for struct dirent. Submitted to upstream in pull request https://github.com/libarchive/libarchive/pull/1903 Should fix PR bin/56080 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/lib/libarchive
Module Name:src
Committed By: christos
Date: Mon May 8 21:20:29 UTC 2023
Modified Files:
src/external/bsd/libarchive/lib/libarchive: Makefile
Log Message:
Elide OpenSSL-3 deprecation warning
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/bsd/libarchive/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.14 src/external/bsd/libarchive/lib/libarchive/Makefile:1.15
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.14 Fri Jul 22 11:43:37 2022
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Mon May 8 17:20:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/07/22 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2023/05/08 21:20:29 christos Exp $
.include
@@ -456,6 +456,7 @@ COPTS.archive_read_support_format_mtree.
COPTS.archive_read_support_format_rar5.c+= ${GCC_NO_MAYBE_UNINITIALIZED}
COPTS.target.c+=${GCC_NO_STRINGOP_TRUNCATION}
COPTS.archive_write_set_format_iso9660.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.archive_hmac.c+= -Wno-error=deprecated-declarations
FILES+=libarchive.pc
FILESOWN_libarchive.pc= ${BINOWN}
CVS commit: src/external/bsd/libarchive/lib/libarchive
Module Name:src Committed By: christos Date: Mon May 8 21:20:29 UTC 2023 Modified Files: src/external/bsd/libarchive/lib/libarchive: Makefile Log Message: Elide OpenSSL-3 deprecation warning To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/bsd/libarchive/lib/libarchive/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/bsd/libarchive/dist/libarchive
Earlier, I wrote: > > cvs rdiff -u -r1.1.1.4 -r1.2 \ > > src/external/bsd/libarchive/dist/libarchive/archive_read.c > > What kind of sorcery is this? Why is the diff not relative to 1.1? To answer my own question, "vendor branch sorcery". What confused me about this in the first place was that if you look at the history of this file in cvsweb, at http://cvsweb.netbsd.org/bsdweb.cgi/src/external/bsd/libarchive/dist/libarchive/archive_read.c?only_with_tag=MAIN it says "Diff to previous 1.1 (colored)", and if you click on that, you see a diff that's much larger than the upstream patch at https://github.com/libarchive/libarchive/commit/ec5b86b48e99c5501374b01606f1ccdae6a8a93e.patch Bug in cvsweb? -- Andreas Gustafsson, g...@gson.org
Re: CVS commit: src/external/bsd/libarchive/dist/libarchive
I repled to you and gson off-list. > On Feb 25, 2020, at 8:24 AM, Kamil Rytarowski wrote: > > On 25.02.2020 16:24, Andreas Gustafsson wrote: >> Kamil Rytarowski wrote: >>> To generate a diff of this commit: >>> cvs rdiff -u -r1.1.1.4 -r1.2 \ >>>src/external/bsd/libarchive/dist/libarchive/archive_read.c >> >> What kind of sorcery is this? Why is the diff not relative to 1.1? >> > > I don't know. I was on the HEAD branch. > -- thorpej
Re: CVS commit: src/external/bsd/libarchive/dist/libarchive
On 25.02.2020 16:24, Andreas Gustafsson wrote: > Kamil Rytarowski wrote: >> To generate a diff of this commit: >> cvs rdiff -u -r1.1.1.4 -r1.2 \ >> src/external/bsd/libarchive/dist/libarchive/archive_read.c > > What kind of sorcery is this? Why is the diff not relative to 1.1? > I don't know. I was on the HEAD branch. signature.asc Description: OpenPGP digital signature
Re: CVS commit: src/external/bsd/libarchive/dist/libarchive
Kamil Rytarowski wrote: > To generate a diff of this commit: > cvs rdiff -u -r1.1.1.4 -r1.2 \ > src/external/bsd/libarchive/dist/libarchive/archive_read.c What kind of sorcery is this? Why is the diff not relative to 1.1? -- Andreas Gustafsson, g...@gson.org
CVS commit: src/external/bsd/libarchive/bin
Module Name:src
Committed By: martin
Date: Tue Jul 30 08:05:22 UTC 2019
Modified Files:
src/external/bsd/libarchive/bin: Makefile.inc
Log Message:
Add libpthread to DPADD and LDADD, as libarchive now references it
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/bin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/bin/Makefile.inc
diff -u src/external/bsd/libarchive/bin/Makefile.inc:1.4 src/external/bsd/libarchive/bin/Makefile.inc:1.5
--- src/external/bsd/libarchive/bin/Makefile.inc:1.4 Thu Apr 20 13:11:04 2017
+++ src/external/bsd/libarchive/bin/Makefile.inc Tue Jul 30 08:05:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2017/04/20 13:11:04 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2019/07/30 08:05:22 martin Exp $
.include "../Makefile.inc"
@@ -8,6 +8,9 @@ BINDIR= /bin
LDSTATIC?= -static
.endif
-DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} ${LIBCRYPTO}
-LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lexpat -lbz2 -llzma -lz -lcrypto
+DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} \
+ ${LIBCRYPTO} ${LIBPTHREAD}
+LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lexpat -lbz2 -llzma -lz \
+ -lcrypto -lpthread
+
CPPFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe
CVS commit: src/external/bsd/libarchive/bin
Module Name:src Committed By: martin Date: Tue Jul 30 08:05:22 UTC 2019 Modified Files: src/external/bsd/libarchive/bin: Makefile.inc Log Message: Add libpthread to DPADD and LDADD, as libarchive now references it To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/bin/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src Committed By: joerg Date: Wed Jul 24 14:05:45 UTC 2019 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive_read_support_format_mtree.c Log Message: Avoid ctype warning due to missing cast. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 \ src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src
Committed By: joerg
Date: Wed Jul 24 14:05:45 UTC 2019
Modified Files:
src/external/bsd/libarchive/dist/libarchive:
archive_read_support_format_mtree.c
Log Message:
Avoid ctype warning due to missing cast.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c:1.1.1.5 src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c:1.1.1.5 Wed Jul 24 13:50:23 2019
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c Wed Jul 24 14:05:45 2019
@@ -1051,7 +1051,7 @@ read_mtree(struct archive_read *a, struc
continue;
/* Non-printable characters are not allowed */
for (s = p;s < p + len - 1; s++) {
- if (!isprint(*s)) {
+ if (!isprint((unsigned char)*s)) {
r = ARCHIVE_FATAL;
break;
}
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src Committed By: joerg Date: Wed Jul 24 14:03:57 UTC 2019 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive.h archive_openssl_hmac_private.h archive_pack_dev.c archive_pack_dev.h archive_read_disk_entry_from_file.c archive_read_support_format_iso9660.c archive_write.3 archive_write_set_format_ar.c archive_write_set_format_shar.c archive_write_set_format_ustar.c Log Message: Merge changes from libarchive 3.4.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/libarchive/dist/libarchive/archive.h \ src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h \ src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c \ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c \ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c \ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.c \ src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/libarchive/dist/libarchive/archive_write.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src Committed By: joerg Date: Wed Jul 24 14:03:57 UTC 2019 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive.h archive_openssl_hmac_private.h archive_pack_dev.c archive_pack_dev.h archive_read_disk_entry_from_file.c archive_read_support_format_iso9660.c archive_write.3 archive_write_set_format_ar.c archive_write_set_format_shar.c archive_write_set_format_ustar.c Log Message: Merge changes from libarchive 3.4.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/libarchive/dist/libarchive/archive.h \ src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h \ src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c \ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c \ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c \ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.c \ src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/libarchive/dist/libarchive/archive_write.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libarchive/dist/libarchive/archive.h diff -u src/external/bsd/libarchive/dist/libarchive/archive.h:1.3 src/external/bsd/libarchive/dist/libarchive/archive.h:1.4 --- src/external/bsd/libarchive/dist/libarchive/archive.h:1.3 Thu Apr 20 13:01:40 2017 +++ src/external/bsd/libarchive/dist/libarchive/archive.h Wed Jul 24 14:03:57 2019 @@ -36,7 +36,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3003002 +#define ARCHIVE_VERSION_NUMBER 3004000 #include #include /* for wchar_t */ @@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(vo /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.3.2dev" +#define ARCHIVE_VERSION_ONLY_STRING "3.4.0" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); @@ -177,6 +177,7 @@ __LA_DECL const char * archive_zlib_ver __LA_DECL const char * archive_liblzma_version(void); __LA_DECL const char * archive_bzlib_version(void); __LA_DECL const char * archive_liblz4_version(void); +__LA_DECL const char * archive_libzstd_version(void); /* Declare our basic types. */ struct archive; @@ -276,6 +277,7 @@ typedef const char *archive_passphrase_c #define ARCHIVE_FILTER_LZOP 11 #define ARCHIVE_FILTER_GRZIP 12 #define ARCHIVE_FILTER_LZ4 13 +#define ARCHIVE_FILTER_ZSTD 14 #if ARCHIVE_VERSION_NUMBER < 400 #define ARCHIVE_COMPRESSION_NONE ARCHIVE_FILTER_NONE @@ -338,6 +340,7 @@ typedef const char *archive_passphrase_c #define ARCHIVE_FORMAT_RAR 0xD #define ARCHIVE_FORMAT_7ZIP 0xE #define ARCHIVE_FORMAT_WARC 0xF +#define ARCHIVE_FORMAT_RAR_V5 0x10 /* * Codes returned by archive_read_format_capabilities(). @@ -433,6 +436,7 @@ __LA_DECL int archive_read_support_filte __LA_DECL int archive_read_support_filter_rpm(struct archive *); __LA_DECL int archive_read_support_filter_uu(struct archive *); __LA_DECL int archive_read_support_filter_xz(struct archive *); +__LA_DECL int archive_read_support_filter_zstd(struct archive *); __LA_DECL int archive_read_support_format_7zip(struct archive *); __LA_DECL int archive_read_support_format_all(struct archive *); @@ -446,6 +450,7 @@ __LA_DECL int archive_read_support_forma __LA_DECL int archive_read_support_format_lha(struct archive *); __LA_DECL int archive_read_support_format_mtree(struct archive *); __LA_DECL int archive_read_support_format_rar(struct archive *); +__LA_DECL int archive_read_support_format_rar5(struct archive *); __LA_DECL int archive_read_support_format_raw(struct archive *); __LA_DECL int archive_read_support_format_tar(struct archive *); __LA_DECL int archive_read_support_format_warc(struct archive *); @@ -778,6 +783,7 @@ __LA_DECL int archive_write_add_filter_p const char *cmd); __LA_DECL int archive_write_add_filter_uuencode(struct archive *); __LA_DECL int archive_write_add_filter_xz(struct archive *); +__LA_DECL int archive_write_add_filter_zstd(struct archive *); /* A convenience function to set the format based on the code or name. */ @@ -1089,6 +1095,8 @@ __LA_DECL int archive_match_excluded(str */ __LA_DECL int archive_match_path_excluded(struct archive *, struct archive_entry *); +/* Control recursive inclusion of
CVS commit: src/external/bsd/libarchive/lib/libarchive
Module Name:src Committed By: joerg Date: Sat Feb 20 22:49:22 UTC 2010 Modified Files: src/external/bsd/libarchive/lib/libarchive: Makefile Log Message: Remove a windows-only source file from the list. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libarchive/lib/libarchive/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src Committed By: joerg Date: Sat Feb 20 02:53:09 UTC 2010 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive_read_disk_entry_from_file.c Log Message: Do not leak setup_xattr into the public namespace. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist
Module Name:src Committed By: joerg Date: Sat Feb 20 02:51:33 UTC 2010 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive_read.3 archive_read_disk.3 archive_write.3 archive_write_disk.3 Removed Files: src/external/bsd/libarchive/dist/cpio: err.c matching.c matching.h pathmatch.c pathmatch.h src/external/bsd/libarchive/dist/cpio/test: test_option_B.c test_option_L.c test_option_ell.c src/external/bsd/libarchive/dist/libarchive: config_freebsd.h config_windows.h src/external/bsd/libarchive/dist/libarchive/test: test_compat_gtar_1.tgz.uu test_pax_filename_encoding.tar.gz.uu test_read_format_gtar_sparse_1_13.tgz.uu test_read_format_gtar_sparse_1_17.tgz.uu test_read_format_gtar_sparse_1_17_posix00.tgz.uu test_read_format_gtar_sparse_1_17_posix01.tgz.uu test_read_format_gtar_sparse_1_17_posix10.tgz.uu test_read_format_isorr_bz2.iso.bz2.uu src/external/bsd/libarchive/dist/tar: getdate.y matching.c siginfo.c src/external/bsd/libarchive/dist/tar/test: test_option_T.c Log Message: Merge changes To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libarchive/dist/cpio/err.c \ src/external/bsd/libarchive/dist/cpio/matching.c \ src/external/bsd/libarchive/dist/cpio/matching.h \ src/external/bsd/libarchive/dist/cpio/pathmatch.c \ src/external/bsd/libarchive/dist/cpio/pathmatch.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libarchive/dist/cpio/test/test_option_B.c \ src/external/bsd/libarchive/dist/cpio/test/test_option_L.c \ src/external/bsd/libarchive/dist/cpio/test/test_option_ell.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/libarchive/archive_read.3 \ src/external/bsd/libarchive/dist/libarchive/archive_write.3 \ src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3 cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3 cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libarchive/dist/libarchive/config_freebsd.h \ src/external/bsd/libarchive/dist/libarchive/config_windows.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libarchive/dist/libarchive/test/test_compat_gtar_1.tgz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_pax_filename_encoding.tar.gz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu \ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libarchive/dist/tar/getdate.y \ src/external/bsd/libarchive/dist/tar/matching.c \ src/external/bsd/libarchive/dist/tar/siginfo.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libarchive/dist/tar/test/test_option_T.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libarchive/dist
Module Name:src Committed By: joerg Date: Sat Feb 20 02:49:21 UTC 2010 Update of /cvsroot/src/external/bsd/libarchive/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21324 Log Message: Import libarchive 2.8.0: - Infrastructure: - Allow command line tools as fallback for missing compression libraries. If compiled without gzip for example, gunzip will be used automatically. - Improved support for a number of platforms like high-resolution timestamps and Extended Attributes on various Unix systems - New convience interface for creating archives based on disk content, complement of the archive_write_disk interface. - Frontends: - bsdcpio ready for public consumption - hand-written date parser replaces the yacc code - Filter system: - Simplified read filter chains - Option support for filters - LZMA, XZ, uudecode handled - Format support: - Write support for mtree files based on file system or archive content - Basic read support for Joliet - Write support for zip files - Write support for shar archives, both text-only and binary-safe Status: Vendor Tag: KIENTZLE Release Tags: libarchive-2-8-0 N src/external/bsd/libarchive/dist/README U src/external/bsd/libarchive/dist/COPYING U src/external/bsd/libarchive/dist/NEWS U src/external/bsd/libarchive/dist/cpio/cmdline.c U src/external/bsd/libarchive/dist/cpio/cpio.c U src/external/bsd/libarchive/dist/cpio/cpio.h U src/external/bsd/libarchive/dist/cpio/cpio_platform.h N src/external/bsd/libarchive/dist/cpio/cpio_windows.h N src/external/bsd/libarchive/dist/cpio/cpio_windows.c U src/external/bsd/libarchive/dist/cpio/bsdcpio.1 U src/external/bsd/libarchive/dist/cpio/test/main.c U src/external/bsd/libarchive/dist/cpio/test/test.h U src/external/bsd/libarchive/dist/cpio/test/test_0.c U src/external/bsd/libarchive/dist/cpio/test/test_basic.c N src/external/bsd/libarchive/dist/cpio/test/test_cmdline.c U src/external/bsd/libarchive/dist/cpio/test/test_format_newc.c U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat.c N src/external/bsd/libarchive/dist/cpio/test/test_option_B_upper.c N src/external/bsd/libarchive/dist/cpio/test/test_option_C_upper.c N src/external/bsd/libarchive/dist/cpio/test/test_option_J_upper.c N src/external/bsd/libarchive/dist/cpio/test/test_option_L_upper.c N src/external/bsd/libarchive/dist/cpio/test/test_option_Z_upper.c U src/external/bsd/libarchive/dist/cpio/test/test_option_a.c U src/external/bsd/libarchive/dist/cpio/test/test_option_c.c U src/external/bsd/libarchive/dist/cpio/test/test_option_d.c U src/external/bsd/libarchive/dist/cpio/test/test_option_f.c U src/external/bsd/libarchive/dist/cpio/test/test_option_help.c N src/external/bsd/libarchive/dist/cpio/test/test_option_l.c U src/external/bsd/libarchive/dist/cpio/test/test_option_m.c N src/external/bsd/libarchive/dist/cpio/test/test_option_lzma.c U src/external/bsd/libarchive/dist/cpio/test/test_option_t.c U src/external/bsd/libarchive/dist/cpio/test/test_option_u.c U src/external/bsd/libarchive/dist/cpio/test/test_option_version.c U src/external/bsd/libarchive/dist/cpio/test/test_option_y.c U src/external/bsd/libarchive/dist/cpio/test/test_option_z.c U src/external/bsd/libarchive/dist/cpio/test/test_owner_parse.c N src/external/bsd/libarchive/dist/cpio/test/test_passthrough_dotdot.c N src/external/bsd/libarchive/dist/cpio/test/test_passthrough_reverse.c U src/external/bsd/libarchive/dist/cpio/test/test_pathmatch.c U src/external/bsd/libarchive/dist/cpio/test/list.h U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.bin.uu U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.crc.uu U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.newc.uu U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.ustar.uu N src/external/bsd/libarchive/dist/cpio/test/CMakeLists.txt U src/external/bsd/libarchive/dist/cpio/test/test_option_f.cpio.uu U src/external/bsd/libarchive/dist/cpio/test/test_option_m.cpio.uu U src/external/bsd/libarchive/dist/cpio/test/test_option_t.cpio.uu U src/external/bsd/libarchive/dist/cpio/test/test_option_t.stdout.uu U src/external/bsd/libarchive/dist/cpio/test/test_option_tv.stdout.uu U src/external/bsd/libarchive/dist/libarchive/archive.h U src/external/bsd/libarchive/dist/libarchive/archive_entry.h U src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c U src/external/bsd/libarchive/dist/libarchive/archive_endian.h U src/external/bsd/libarchive/dist/libarchive/archive_entry.c U src/external/bsd/libarchive/dist/libarchive/archive_entry_copy_stat.c U src/external/bsd/libarchive/dist/libarchive/archive_entry_link_resolver.c U src/external/bsd/libarchive/dist/libarchive/archive_entry_private.h U src/external/bsd/libarchive/dist/libarchive/archive_entry_stat.c U src/external/bsd/libarchive/dist/libarchive/archive_entry_strmode.c N src/external/bsd/libarchive/dist/libarchive/archive_entry_xattr.c N src/external/bsd/l
