Mon May 1 09:30:55 2017 UTC ()

Pullup ticket #5380 - requested by sevan
archivers/libarchive: build fix for FreeBSD

Revisions pulled up:
- archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c 1.10
- archivers/libarchive/files/libarchive/archive_write_disk_acl.c 1.8

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Thu Apr 27 15:08:08 UTC 2017

   Modified Files:
           pkgsrc/archivers/libarchive/files/libarchive:
               archive_read_disk_entry_from_file.c archive_write_disk_acl.c

   Log Message:
   Fix bootstrap pkgsrc on FreeBSD/amd64 10. Fix --disable-xattr build


(bsiegert)

diff -r1.9 -r1.9.2.1 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
diff -r1.7 -r1.7.2.1 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c

--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c 2017/03/12 06:52:23 1.9
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c 2017/05/01 09:30:55 1.9.2.1

 @@ -832,27 +832,29 @@ static const struct {
 #elif HAVE_DARWIN_ACL	/* MacOS NFSv4 inheritance flags */
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED},
 	{ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_LIMIT_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_ONLY_INHERIT}
 #else	/* FreeBSD NFSv4 ACL inheritance flags */
 	{ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY},
 	{ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS},
 	{ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS},
 #ifdef ACE_INHERITED_ACE
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED}
 #endif
 #endif	/* !HAVE_SUN_NFS4_ACL && !HAVE_DARWIN_ACL */
 };
 #endif	/* HAVE_NFS4_ACL */
 #if HAVE_DARWIN_ACL
 static int translate_guid(struct archive *a, acl_entry_t acl_entry,
     int *ae_id, int *ae_tag, const char **ae_name)
+{
 	void *q;
 	uid_t ugid;
 	int r, idtype;
 	q = acl_get_qualifier(acl_entry);

--- pkgsrc/archivers/libarchive/files/libarchive/Attic/archive_write_disk_acl.c 2017/03/12 06:51:23 1.7
+++ pkgsrc/archivers/libarchive/files/libarchive/Attic/archive_write_disk_acl.c 2017/05/01 09:30:55 1.7.2.1

 @@ -212,27 +212,29 @@ static const struct {
 #elif HAVE_DARWIN_ACL	/* MacOS NFSv4 inheritance flags */
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED},
 	{ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_LIMIT_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_ONLY_INHERIT}
 #else	/* FreeBSD NFSv4 ACL inheritance flags */
 	{ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT},
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY},
 	{ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS},
 	{ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS},
 #ifdef ACE_INHERITED_ACE
 	{ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED}
 #endif
 #endif	/* !HAVE_SUN_NFS4_ACL && !HAVE_DARWIN_ACL */
 };
 #endif	/* HAVE_NFS4_ACL */
 static int
 set_acl(struct archive *a, int fd, const char *name,
     struct archive_acl *abstract_acl,
 #if !HAVE_SUN_ACL
     acl_type_t acl_type,
 #endif
     int ae_requested_type, const char *tname)
+{
 #if HAVE_SUN_ACL