summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-01-27 18:32:20 +0000
committerjlam <jlam@pkgsrc.org>2005-01-27 18:32:20 +0000
commitce33cd0c704a63801206a3879a183fea23444f97 (patch)
tree1acab501d75487cfdd0d4e5a7d37352421d44c29 /mk
parentb6aec517bc480a4cbeb4ef119f5aaa90507116ec (diff)
downloadpkgsrc-ce33cd0c704a63801206a3879a183fea23444f97.tar.gz
Move the creation of ${PKG_DB_TMPDIR} to when we create ${WRKDIR}.
This ensures that it's always created with the same user/group/mode as ${WRKDIR}, so if a non-root user thinks he has permissions to remove ${WRKDIR}, then that expectation will remain true for ${PKG_DB_TMPDIR}.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 15d70c361bd..c099c93e5a1 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1576 2005/01/27 11:21:46 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1577 2005/01/27 18:32:20 jlam Exp $
#
# This file is in the public domain.
#
@@ -1882,6 +1882,7 @@ ${WRKDIR}:
. endif
.endif
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR}
.ifdef WRKOBJDIR
. if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
. if !exists(${LOCKFILE})
@@ -1895,6 +1896,7 @@ ${WRKDIR}:
fi
.endif # WRKOBJDIR
+
_EXTRACT_SUFFIXES= .tar.gz .tgz .tar.bz2 .tbz .tar.Z .tar _tar.gz
_EXTRACT_SUFFIXES+= .shar.gz .shar.bz2 .shar.Z .shar
_EXTRACT_SUFFIXES+= .zip
@@ -3381,7 +3383,6 @@ do-su-install:
${MAKE} clean && ${MAKE} build ;; \
esac
@${ECHO_MSG} "${_PKGSRC_IN}> Installing for ${PKGNAME}"
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR}
${_PKG_SILENT}${_PKG_DEBUG} \
realtarget="real-su-install"; \
action="install"; \