packages feed

libarchive 3.0.2.0 → 3.0.2.1

raw patch · 10 files changed

+72/−36 lines, 10 files

Files

CHANGELOG.md view
@@ -1,5 +1,9 @@ # libarchive +# 3.0.2.1++  * Upgrade bundled `libarchive` to 3.5.1+ # 3.0.2.0    * Upgrade bundled `libarchive` to 3.5.0
c/archive.h view
@@ -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 3005000+#define	ARCHIVE_VERSION_NUMBER 3005001  #include <sys/stat.h> #include <stddef.h>  /* for wchar_t */@@ -155,7 +155,7 @@ /*  * Textual name/version of the library, useful for version displays.  */-#define	ARCHIVE_VERSION_ONLY_STRING "3.5.0"+#define	ARCHIVE_VERSION_ONLY_STRING "3.5.1" #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char *	archive_version_string(void);
c/archive_entry.h view
@@ -30,7 +30,7 @@ #define	ARCHIVE_ENTRY_H_INCLUDED  /* Note: Compiler will complain if this does not match archive.h! */-#define	ARCHIVE_VERSION_NUMBER 3005000+#define	ARCHIVE_VERSION_NUMBER 3005001  /*  * Note: archive_entry.h is for use outside of libarchive; the
c/archive_read_support_format_mtree.c view
@@ -136,6 +136,9 @@ static int	read_header(struct archive_read *, 		    struct archive_entry *); static int64_t	mtree_atol(char **, int base);+#ifndef HAVE_STRNLEN+static size_t	mtree_strnlen(const char *, size_t);+#endif  /*  * There's no standard for TIME_T_MAX/TIME_T_MIN.  So we compute them@@ -187,6 +190,24 @@ #endif } +#ifdef HAVE_STRNLEN+#define mtree_strnlen(a,b) strnlen(a,b)+#else+static size_t+mtree_strnlen(const char *p, size_t maxlen)+{+	size_t i;++	for (i = 0; i <= maxlen; i++) {+		if (p[i] == 0)+			break;+	}+	if (i > maxlen)+		return (-1);/* invalid */+	return (i);+}+#endif+ static int archive_read_format_mtree_options(struct archive_read *a,     const char *key, const char *val)@@ -1540,7 +1561,7 @@  	len *= 2; -	if (strnlen(digest, len+1) != len) {+	if (mtree_strnlen(digest, len+1) != len) { 		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, 				  "incorrect digest length, ignoring"); 		return ARCHIVE_WARN;
c/archive_read_support_format_warc.c view
@@ -127,7 +127,7 @@ static int _warc_rdhdr(struct archive_read *a, struct archive_entry *e);  /* private routines */-static unsigned int _warc_rdver(const char buf[10], size_t bsz);+static unsigned int _warc_rdver(const char *buf, size_t bsz); static unsigned int _warc_rdtyp(const char *buf, size_t bsz); static warc_string_t _warc_rduri(const char *buf, size_t bsz); static ssize_t _warc_rdlen(const char *buf, size_t bsz);@@ -443,7 +443,7 @@ static void* deconst(const void *c) {-	return (char *)0x1 + (((const char *)c) - (const char *)0x1);+	return (void *)(uintptr_t)c; }  static char*
c/autoconf-darwin/config.h view
@@ -170,13 +170,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.0"+#define BSDCAT_VERSION_STRING "3.5.1"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.0"+#define BSDCPIO_VERSION_STRING "3.5.1"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.0"+#define BSDTAR_VERSION_STRING "3.5.1"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -985,6 +985,9 @@ /* Define to 1 if you have the `strncpy_s' function. */ /* #undef HAVE_STRNCPY_S */ +/* Define to 1 if you have the `strnlen' function. */+#define HAVE_STRNLEN 1+ /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 @@ -1236,10 +1239,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005000"+#define LIBARCHIVE_VERSION_NUMBER "3005001"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.0"+#define LIBARCHIVE_VERSION_STRING "3.5.1"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1269,7 +1272,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.0"+#define PACKAGE_STRING "libarchive 3.5.1"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1278,7 +1281,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.0"+#define PACKAGE_VERSION "3.5.1"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1318,7 +1321,7 @@   /* Version number of package */-#define VERSION "3.5.0"+#define VERSION "3.5.1"  /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */
c/autoconf-freebsd/config.h view
@@ -165,13 +165,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.0"+#define BSDCAT_VERSION_STRING "3.5.1"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.0"+#define BSDCPIO_VERSION_STRING "3.5.1"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.0"+#define BSDTAR_VERSION_STRING "3.5.1"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -974,6 +974,9 @@ /* Define to 1 if you have the `strncpy_s' function. */ /* #undef HAVE_STRNCPY_S */ +/* Define to 1 if you have the `strnlen' function. */+#define HAVE_STRNLEN 1+ /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 @@ -1225,10 +1228,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005000"+#define LIBARCHIVE_VERSION_NUMBER "3005001"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.0"+#define LIBARCHIVE_VERSION_STRING "3.5.1"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1258,7 +1261,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.0"+#define PACKAGE_STRING "libarchive 3.5.1"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1267,7 +1270,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.0"+#define PACKAGE_VERSION "3.5.1"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1307,7 +1310,7 @@   /* Version number of package */-#define VERSION "3.5.0"+#define VERSION "3.5.1"  /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */
c/autoconf-linux/config.h view
@@ -170,13 +170,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.0"+#define BSDCAT_VERSION_STRING "3.5.1"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.0"+#define BSDCPIO_VERSION_STRING "3.5.1"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.0"+#define BSDTAR_VERSION_STRING "3.5.1"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -453,6 +453,7 @@ /* #undef HAVE_EXPAT_H */  /* Define to 1 if you have the <ext2fs/ext2_fs.h> header file. */+/* #undef HAVE_EXT2FS_EXT2_FS_H */  /* Define to 1 if you have the `extattr_get_fd' function. */ /* #undef HAVE_EXTATTR_GET_FD */@@ -984,6 +985,9 @@ /* Define to 1 if you have the `strncpy_s' function. */ /* #undef HAVE_STRNCPY_S */ +/* Define to 1 if you have the `strnlen' function. */+#define HAVE_STRNLEN 1+ /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 @@ -1027,7 +1031,7 @@ /* #undef HAVE_STRUCT_STAT_ST_UMTIME */  /* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */-/* #undef HAVE_STRUCT_TM_TM_GMTOFF 1 */+#define HAVE_STRUCT_TM_TM_GMTOFF 1  /* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */ /* #undef HAVE_STRUCT_TM___TM_GMTOFF */@@ -1045,7 +1049,7 @@ /* #undef HAVE_SYS_ACL_H */  /* Define to 1 if you have the <sys/cdefs.h> header file. */-/* #undef HAVE_SYS_CDEFS_H */+#define HAVE_SYS_CDEFS_H 1  /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.    */@@ -1236,10 +1240,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005000"+#define LIBARCHIVE_VERSION_NUMBER "3005001"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.0"+#define LIBARCHIVE_VERSION_STRING "3.5.1"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1254,7 +1258,7 @@  /* Define to 1 if `major', `minor', and `makedev' are declared in    <sysmacros.h>. */-#define MAJOR_IN_SYSMACROS 1+/* #undef MAJOR_IN_SYSMACROS */  /* Define to '0x05020000' for Windows Server 2003 APIs. */ /* #undef NTDDI_VERSION */@@ -1269,7 +1273,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.0"+#define PACKAGE_STRING "libarchive 3.5.1"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1278,7 +1282,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.0"+#define PACKAGE_VERSION "3.5.1"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1290,7 +1294,7 @@ #define STDC_HEADERS 1  /* Define to 1 if strerror_r returns char *. */-/* #undef STRERROR_R_CHAR_P */+#define STRERROR_R_CHAR_P 1  /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #define TIME_WITH_SYS_TIME 1@@ -1318,7 +1322,7 @@   /* Version number of package */-#define VERSION "3.5.0"+#define VERSION "3.5.1"  /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */
c/config_freebsd.h view
@@ -184,6 +184,7 @@ #define HAVE_STRFTIME 1 #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1+#define HAVE_STRNLEN 1 #define HAVE_STRRCHR 1 #define HAVE_STRUCT_STATFS_F_NAMEMAX 1 #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
libarchive.cabal view
@@ -1,12 +1,12 @@ cabal-version:   3.0 name:            libarchive-version:         3.0.2.0+version:         3.0.2.1 license:         BSD-3-Clause license-file:    LICENSE copyright:       Copyright: (c) 2018-2020 Vanessa McHale maintainer:      vamchale@gmail.com author:          Vanessa McHale-tested-with:     ghc ==7.10.3 ghc ==8.0.2 ghc == 8.2.2 ghc ==8.4.4 ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.2+tested-with:     ghc ==7.10.3 ghc ==8.0.2 ghc == 8.2.2 ghc ==8.4.4 ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.3 bug-reports:     https://github.com/vmchale/libarchive/issues synopsis:        Haskell interface to libarchive description: