diff options
| author | dholland <dholland> | 2010-06-15 04:14:26 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2010-06-15 04:14:26 +0000 |
| commit | d948bad7ea7f636227d43d20b2003172eb3863d6 (patch) | |
| tree | 97d61bc120c19aece3637fdbfed65e22785ad0b4 /mk | |
| parent | 5244c5e970eb2be08b695b3d39b398d855e18da1 (diff) | |
| download | pkgsrc-d948bad7ea7f636227d43d20b2003172eb3863d6.tar.gz | |
Apply my fix for PR 35091: do a check-vulnerable step first in "make
update", so if it's going to fail because of a known vulnerability it
does so before uninstalling anything. I've been carrying this patch
for some three years with no ill effects. Ok by agc@.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.update.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk index 01c4ce24859..41328ba47e5 100644 --- a/mk/bsd.pkg.update.mk +++ b/mk/bsd.pkg.update.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.update.mk,v 1.20 2010/02/25 02:08:33 joerg Exp $ +# $NetBSD: bsd.pkg.update.mk,v 1.21 2010/06/15 04:14:26 dholland Exp $ # # This Makefile fragment is included by bsd.pkg.mk and contains the targets # and variables for "make update". @@ -51,6 +51,7 @@ RESUMEUPDATE?= NO CLEAR_DIRLIST?= YES update: + ${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} check-vulnerable ${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} update-create-ddir . if ${UPDATE_TARGET} != "replace" ${RUN} if ${PKG_INFO} -qe ${PKGBASE}; then \ |