Fri Feb 22 13:35:27 2013 UTC ()
Allow to overwrite commnand of privilege check as _IS_ROOT_CMD.


(obache)
diff -r1.1986 -r1.1987 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.1986 -r1.1987 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2013/02/21 13:33:10 1.1986
+++ pkgsrc/mk/bsd.pkg.mk 2013/02/22 13:35:27 1.1987
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.1986 2013/02/21 13:33:10 obache Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.1987 2013/02/22 13:35:27 obache Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -89,26 +89,27 @@ COMMENT?= (no description) @@ -89,26 +89,27 @@ COMMENT?= (no description)
89DEPENDS?= # empty 89DEPENDS?= # empty
90DESCR_SRC?= ${PKGDIR}/DESCR 90DESCR_SRC?= ${PKGDIR}/DESCR
91INTERACTIVE_STAGE?= none 91INTERACTIVE_STAGE?= none
92.if defined(OWNER) 92.if defined(OWNER)
93MAINTAINER=${OWNER} 93MAINTAINER=${OWNER}
94.else 94.else
95MAINTAINER?= pkgsrc-users@NetBSD.org 95MAINTAINER?= pkgsrc-users@NetBSD.org
96.endif 96.endif
97PKGWILDCARD?= ${PKGBASE}-[0-9]* 97PKGWILDCARD?= ${PKGBASE}-[0-9]*
98SVR4_PKGNAME?= ${PKGNAME} 98SVR4_PKGNAME?= ${PKGNAME}
99WRKSRC?= ${WRKDIR}/${DISTNAME} 99WRKSRC?= ${WRKDIR}/${DISTNAME}
100 100
101# Override for SU_CMD user check 101# Override for SU_CMD user check
 102_IS_ROOT_CMD?= ${TEST} `${ID} -u` = `${ID} -u ${_SU_ROOT_USER}`
102_SU_ROOT_USER?= ${ROOT_USER} 103_SU_ROOT_USER?= ${ROOT_USER}
103REAL_ROOT_USER?= ${ROOT_USER} 104REAL_ROOT_USER?= ${ROOT_USER}
104REAL_ROOT_GROUP?= ${ROOT_GROUP} 105REAL_ROOT_GROUP?= ${ROOT_GROUP}
105 106
106.if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS) 107.if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS)
107_INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk) 108_INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk)
108.endif 109.endif
109 110
110##### Transform USE_* into dependencies 111##### Transform USE_* into dependencies
111 112
112.include "bsd.pkg.use.mk" 113.include "bsd.pkg.use.mk"
113 114
114############################################################################ 115############################################################################
@@ -606,27 +607,27 @@ _ROOT_CMD= cd ${.CURDIR} && \ @@ -606,27 +607,27 @@ _ROOT_CMD= cd ${.CURDIR} && \
606 ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \ 607 ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \
607 PATH=${_PATH_ORIG:Q}:${SU_CMD_PATH_APPEND:Q} \ 608 PATH=${_PATH_ORIG:Q}:${SU_CMD_PATH_APPEND:Q} \
608 ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes \ 609 ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes \
609 PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL:Q} \ 610 PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL:Q} \
610 su-${.TARGET} ${MAKEFLAGS.su-${.TARGET}} 611 su-${.TARGET} ${MAKEFLAGS.su-${.TARGET}}
611 612
612.PHONY: su-target 613.PHONY: su-target
613su-target: .USE 614su-target: .USE
614 ${RUN} \ 615 ${RUN} \
615 case ${PRE_CMD.su-${.TARGET}:Q}"" in \ 616 case ${PRE_CMD.su-${.TARGET}:Q}"" in \
616 "") ;; \ 617 "") ;; \
617 *) ${PRE_CMD.su-${.TARGET}} ;; \ 618 *) ${PRE_CMD.su-${.TARGET}} ;; \
618 esac; \ 619 esac; \
619 if ${TEST} `${ID} -u` = `${ID} -u ${_SU_ROOT_USER} 2>/dev/null || ${ECHO} ${_SU_ROOT_USER}`; then \ 620 if ${_IS_ROOT_CMD}; then \
620 ${_ROOT_CMD}; \ 621 ${_ROOT_CMD}; \
621 else \ 622 else \
622 case ${PRE_ROOT_CMD:Q}"" in \ 623 case ${PRE_ROOT_CMD:Q}"" in \
623 ${TRUE:Q}"") ;; \ 624 ${TRUE:Q}"") ;; \
624 *) ${WARNING_MSG} "Running: "${PRE_ROOT_CMD:Q} ;; \ 625 *) ${WARNING_MSG} "Running: "${PRE_ROOT_CMD:Q} ;; \
625 esac; \ 626 esac; \
626 ${PRE_ROOT_CMD}; \ 627 ${PRE_ROOT_CMD}; \
627 ${STEP_MSG} "Becoming \`\`${_SU_ROOT_USER}'' to make su-${.TARGET} (`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'`)"; \ 628 ${STEP_MSG} "Becoming \`\`${_SU_ROOT_USER}'' to make su-${.TARGET} (`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'`)"; \
628 ${SU_CMD} ${_ROOT_CMD:Q}; \ 629 ${SU_CMD} ${_ROOT_CMD:Q}; \
629 ${STEP_MSG} "Dropping \`\`${_SU_ROOT_USER}'' privileges."; \ 630 ${STEP_MSG} "Dropping \`\`${_SU_ROOT_USER}'' privileges."; \
630 fi 631 fi
631 632
632################################################################ 633################################################################