svn commit: r315635 - vendor/libarchive/dist/libarchive

[Martin Matuska]

Author: mm
Date: Mon Mar 20 11:55:03 2017
New Revision: 315635
URL: https://svnweb.freebsd.org/changeset/base/315635

Log:
  Update vendor/libarchive to git 3e37a9e051bb7674115ca1e262551a070a92283a
  
  Vendor changes:
    Fix type in archive_read_open(3)
    Always use extern keyword for shared constants in archive_acl_maps.h

Modified:
  vendor/libarchive/dist/libarchive/archive_acl_maps.h
  vendor/libarchive/dist/libarchive/archive_acl_maps_darwin.c
  vendor/libarchive/dist/libarchive/archive_acl_maps_freebsd.c
  vendor/libarchive/dist/libarchive/archive_acl_maps_linux.c
  vendor/libarchive/dist/libarchive/archive_acl_maps_sunos.c
  vendor/libarchive/dist/libarchive/archive_read_open.3

Modified: vendor/libarchive/dist/libarchive/archive_acl_maps.h
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_acl_maps.h	Mon Mar 20 11:29:40 2017	(r315634)
+++ vendor/libarchive/dist/libarchive/archive_acl_maps.h	Mon Mar 20 11:55:03 2017	(r315635)
@@ -37,7 +37,6 @@ typedef struct {
 	const int p_perm;	/* Platform permission or flag */
 } acl_perm_map_t;
 
-#ifndef _ARCHIVE_ACL_MAPS_DEFS
 #if ARCHIVE_ACL_POSIX1E
 extern const acl_perm_map_t acl_posix_perm_map[];
 extern const int acl_posix_perm_map_size;
@@ -48,5 +47,4 @@ extern const int acl_nfs4_perm_map_size;
 extern const acl_perm_map_t acl_nfs4_flag_map[];
 extern const int acl_nfs4_flag_map_size;
 #endif
-#endif /* !_ARCHIVE_ACL_MAPS_DEFS */
 #endif /* ARCHIVE_ACL_MAPS_H_INCLUDED */

Modified: vendor/libarchive/dist/libarchive/archive_acl_maps_darwin.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_acl_maps_darwin.c	Mon Mar 20 11:29:40 2017	(r315634)
+++ vendor/libarchive/dist/libarchive/archive_acl_maps_darwin.c	Mon Mar 20 11:55:03 2017	(r315635)
@@ -36,7 +36,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 const acl_perm_map_t acl_nfs4_perm_map[] = {

Modified: vendor/libarchive/dist/libarchive/archive_acl_maps_freebsd.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_acl_maps_freebsd.c	Mon Mar 20 11:29:40 2017	(r315634)
+++ vendor/libarchive/dist/libarchive/archive_acl_maps_freebsd.c	Mon Mar 20 11:55:03 2017	(r315635)
@@ -36,7 +36,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 const acl_perm_map_t acl_posix_perm_map[] = {

Modified: vendor/libarchive/dist/libarchive/archive_acl_maps_linux.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_acl_maps_linux.c	Mon Mar 20 11:29:40 2017	(r315634)
+++ vendor/libarchive/dist/libarchive/archive_acl_maps_linux.c	Mon Mar 20 11:55:03 2017	(r315635)
@@ -39,7 +39,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 #if ARCHIVE_ACL_LIBACL

Modified: vendor/libarchive/dist/libarchive/archive_acl_maps_sunos.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_acl_maps_sunos.c	Mon Mar 20 11:29:40 2017	(r315634)
+++ vendor/libarchive/dist/libarchive/archive_acl_maps_sunos.c	Mon Mar 20 11:55:03 2017	(r315635)
@@ -36,7 +36,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 const acl_perm_map_t acl_posix_perm_map[] = {

Modified: vendor/libarchive/dist/libarchive/archive_read_open.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_open.3	Mon Mar 20 11:29:40 2017	(r315634)
+++ vendor/libarchive/dist/libarchive/archive_read_open.3	Mon Mar 20 11:55:03 2017	(r315635)
@@ -67,7 +67,7 @@ Streaming Archive Library (libarchive, -
 .Fa "size_t block_size"
 .Fc
 .Ft int
-.Fn archive_read_open_memory "struct archive *" "void *buff" "size_t size"
+.Fn archive_read_open_memory "struct archive *" "const void *buff" "size_t size"
 .Sh DESCRIPTION
 .Bl -tag -compact -width indent
 .It Fn archive_read_open