CVS commit: pkgsrc/archivers/libarchive/files/libarchive

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.9        Sun Mar 12 06:52:23 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c    Thu Apr 27 15:08:08 2017
@@ -842,7 +842,9 @@ static const struct {
        {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 */

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.7   Sun Mar 12 06:51:23 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c       Thu Apr 27 15:08:08 2017
@@ -222,7 +222,9 @@ static const struct {
        {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 */