From owner-p4-projects@FreeBSD.ORG Sun May 9 00:37:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DFF3106566B; Sun, 9 May 2010 00:37:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12BAD1065673 for ; Sun, 9 May 2010 00:37:38 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 00DDD8FC0C for ; Sun, 9 May 2010 00:37:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o490bbZA087466 for ; Sun, 9 May 2010 00:37:37 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o490bbUn087464 for perforce@freebsd.org; Sun, 9 May 2010 00:37:37 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 9 May 2010 00:37:37 GMT Message-Id: <201005090037.o490bbUn087464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 May 2010 00:37:38 -0000 http://p4web.freebsd.org/@@177987?ac=10 Change 177987 by gcooper@gcooper-bayonetta on 2010/05/09 00:36:39 1. Add a comment about missing acl / xattr support. 2. Pass in appropriate flags to open(2) for following paths for all pkg_install control files. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#7 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#7 (text+ko) ==== @@ -347,7 +347,8 @@ make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist) { -#define ADD_FILE(src_file, dest_file) \ + /* XXX (gcooper): add acl and xattr support? */ +#define ADD_FILE(src_file, dest_file, archive_entry_open_flags) \ if (error == NULL) { \ if ((archive_entry_fd = open(src_file, \ archive_entry_fd)) == -1 || \ @@ -476,24 +477,34 @@ printf("Creating %sed tar ball in '%s'\n", cname, tball); - ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME); - ADD_FILE(COMMENT_FNAME, COMMENT_FNAME); - ADD_FILE(DESC_FNAME, DESC_FNAME); + ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(COMMENT_FNAME, COMMENT_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(DESC_FNAME, DESC_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Install) - ADD_FILE(INSTALL_FNAME, INSTALL_FNAME); + ADD_FILE(INSTALL_FNAME, INSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (PostInstall) - ADD_FILE(POST_INSTALL_FNAME, POST_INSTALL_FNAME); + ADD_FILE(POST_INSTALL_FNAME, POST_INSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (DeInstall) - ADD_FILE(DEINSTALL_FNAME, DEINSTALL_FNAME); + ADD_FILE(DEINSTALL_FNAME, DEINSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (PostDeInstall) - ADD_FILE(POST_DEINSTALL_FNAME, POST_DEINSTALL_FNAME); + ADD_FILE(POST_DEINSTALL_FNAME, POST_DEINSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Require) - ADD_FILE(REQUIRE_FNAME, REQUIRE_FNAME); + ADD_FILE(REQUIRE_FNAME, REQUIRE_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Display) - ADD_FILE(DISPLAY_FNAME, DISPLAY_FNAME); + ADD_FILE(DISPLAY_FNAME, DISPLAY_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Mtree) - ADD_FILE(MTREE_FNAME, MTREE_FNAME); + ADD_FILE(MTREE_FNAME, MTREE_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); passed = TRUE;