Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id E12727A494 for ; Tue, 21 Jun 2016 16:29:56 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 95F0985EAA; Tue, 21 Jun 2016 16:29:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2719985E99 for ; Tue, 21 Jun 2016 16:29:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ixw641_G2Aiv for ; Tue, 21 Jun 2016 16:29:55 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8B31984CED for ; Tue, 21 Jun 2016 16:29:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8664CFBB5; Tue, 21 Jun 2016 16:29:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146652659513580" MIME-Version: 1.0 Date: Tue, 21 Jun 2016 16:29:55 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/archivers/libarchive/files/libarchive To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20160621162955.8664CFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146652659513580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Jun 21 16:29:55 UTC 2016 Modified Files: pkgsrc/archivers/libarchive/files/libarchive: archive_write_disk_posix.c Log Message: >From upstream: Dummy out copy_acls if sys/acl.h is missing or ACL support is disabled. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146652659513580 Content-Disposition: inline Content-Length: 783 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.3 --- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.2 Mon Jun 20 17:24:57 2016 +++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c Tue Jun 21 16:29:55 2016 @@ -3487,6 +3487,9 @@ exit_xattr: static int copy_acls(struct archive_write_disk *a, int tmpfd, int dffd) { +#ifndef HAVE_SYS_ACL_H + return 0; +#else acl_t acl, dfacl = NULL; int acl_r, ret = ARCHIVE_OK; @@ -3514,6 +3517,7 @@ exit_acl: if (dfacl) acl_free(dfacl); return (ret); +#endif } static int --_----------=_146652659513580--