From owner-svn-src-stable-9@FreeBSD.ORG Tue Sep 18 19:08:09 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BABD81065692; Tue, 18 Sep 2012 19:08:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 90C9F8FC0A; Tue, 18 Sep 2012 19:08:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8IJ88cX045976; Tue, 18 Sep 2012 19:08:08 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8IJ88U5045970; Tue, 18 Sep 2012 19:08:08 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201209181908.q8IJ88U5045970@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 18 Sep 2012 19:08:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240673 - in stable/9/usr.sbin/pkg_install: add lib X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2012 19:08:09 -0000 Author: jkim Date: Tue Sep 18 19:08:07 2012 New Revision: 240673 URL: http://svn.freebsd.org/changeset/base/240673 Log: MFC: r240476 Do not change owner, group, or mode when package database directory and its contents are created with pkg_add(1). It may happen when the packing list contains @owner, @group, or @mode. Approved by: portmgr (bapt) Modified: stable/9/usr.sbin/pkg_install/add/add.h stable/9/usr.sbin/pkg_install/add/extract.c stable/9/usr.sbin/pkg_install/add/futil.c stable/9/usr.sbin/pkg_install/add/perform.c stable/9/usr.sbin/pkg_install/lib/lib.h Directory Properties: stable/9/usr.sbin/pkg_install/ (props changed) stable/9/usr.sbin/pkg_install/add/ (props changed) Modified: stable/9/usr.sbin/pkg_install/add/add.h ============================================================================== --- stable/9/usr.sbin/pkg_install/add/add.h Tue Sep 18 18:23:21 2012 (r240672) +++ stable/9/usr.sbin/pkg_install/add/add.h Tue Sep 18 19:08:07 2012 (r240673) @@ -41,7 +41,7 @@ extern char *PkgAddCmd; extern char FirstPen[]; extern add_mode_t AddMode; -int make_hierarchy(char *); +int make_hierarchy(char *, Boolean); void extract_plist(const char *, Package *); void apply_perms(const char *, const char *); Modified: stable/9/usr.sbin/pkg_install/add/extract.c ============================================================================== --- stable/9/usr.sbin/pkg_install/add/extract.c Tue Sep 18 18:23:21 2012 (r240672) +++ stable/9/usr.sbin/pkg_install/add/extract.c Tue Sep 18 19:08:07 2012 (r240673) @@ -225,7 +225,7 @@ extract_plist(const char *home, Package printf("extract: CWD to %s\n", p->name); PUSHOUT(Directory); if (strcmp(p->name, ".")) { - if (!Fake && make_hierarchy(p->name) == FAIL) { + if (!Fake && make_hierarchy(p->name, TRUE) == FAIL) { cleanup(0); errx(2, "%s: unable to cwd to '%s'", __func__, p->name); } Modified: stable/9/usr.sbin/pkg_install/add/futil.c ============================================================================== --- stable/9/usr.sbin/pkg_install/add/futil.c Tue Sep 18 18:23:21 2012 (r240672) +++ stable/9/usr.sbin/pkg_install/add/futil.c Tue Sep 18 19:08:07 2012 (r240673) @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); */ int -make_hierarchy(char *dir) +make_hierarchy(char *dir, Boolean set_perm) { char *cp1, *cp2; @@ -55,7 +55,8 @@ make_hierarchy(char *dir) *cp2 = '/'; return FAIL; } - apply_perms(NULL, dir); + if (set_perm) + apply_perms(NULL, dir); } /* Put it back */ if (cp2) { Modified: stable/9/usr.sbin/pkg_install/add/perform.c ============================================================================== --- stable/9/usr.sbin/pkg_install/add/perform.c Tue Sep 18 18:23:21 2012 (r240672) +++ stable/9/usr.sbin/pkg_install/add/perform.c Tue Sep 18 19:08:07 2012 (r240673) @@ -511,7 +511,7 @@ pkg_do(char *pkg) zapLogDir = 1; if (Verbose) printf("Attempting to record package into %s..\n", LogDir); - if (make_hierarchy(LogDir)) { + if (make_hierarchy(LogDir, FALSE)) { warnx("can't record package into '%s', you're on your own!", LogDir); bzero(LogDir, FILENAME_MAX); Modified: stable/9/usr.sbin/pkg_install/lib/lib.h ============================================================================== --- stable/9/usr.sbin/pkg_install/lib/lib.h Tue Sep 18 18:23:21 2012 (r240672) +++ stable/9/usr.sbin/pkg_install/lib/lib.h Tue Sep 18 19:08:07 2012 (r240673) @@ -99,7 +99,7 @@ * Version of the package tools - increase whenever you make a change * in the code that is not cosmetic only. */ -#define PKG_INSTALL_VERSION 20120530 +#define PKG_INSTALL_VERSION 20120913 #define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf" #define main(argc, argv) real_main(argc, argv)