diff options
author | Theo Buehler <tb@cvs.openbsd.org> | 2018-10-08 20:38:33 +0000 |
---|---|---|
committer | Theo Buehler <tb@cvs.openbsd.org> | 2018-10-08 20:38:33 +0000 |
commit | a7e242ff57672cc6a89cff116d794aa479df931a (patch) | |
tree | 8b139ef37630f852b8207dbfdf36636a81106c0b /distrib/syspatch | |
parent | 5cc9ced2658a5655768c3de87751eb55e96d1ce9 (diff) |
Split the ${ERRATA}/${ERRATA}.patch target up into two: one for
moving the signed patch to the proper location and one for
verifying its signature and applying it.
ok ajacoutot, robert
Diffstat (limited to 'distrib/syspatch')
-rw-r--r-- | distrib/syspatch/bsd.syspatch.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/distrib/syspatch/bsd.syspatch.mk b/distrib/syspatch/bsd.syspatch.mk index 0ab27f59af6..1d43892c462 100644 --- a/distrib/syspatch/bsd.syspatch.mk +++ b/distrib/syspatch/bsd.syspatch.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.syspatch.mk,v 1.21 2018/06/25 16:29:00 deraadt Exp $ +# $OpenBSD: bsd.syspatch.mk,v 1.22 2018/10/08 20:38:32 tb Exp $ # # Copyright (c) 2016-2017 Robert Nagy <robert@openbsd.org> # @@ -110,14 +110,15 @@ ${_FAKE_COOKIE}: @su ${BUILDUSER} -c 'touch $@' .endif -${ERRATA}/${ERRATA}.patch: +${ERRATA}/${ERRATA}.patch.sig: @su ${BUILDUSER} -c '${INSTALL} -d -m 755 ${ERRATA}' && \ - echo '>> Fetching & Verifying ${MIRROR}/${.TARGET:T}.sig'; \ - if su ${BUILDUSER} -c '${FETCH} -o ${ERRATA}/${.TARGET:T}.sig \ - ${MIRROR}/${.TARGET:T}.sig'; then \ - su ${BUILDUSER} -c '/usr/bin/signify -Vep ${SIGNIFY_KEY} -x \ - ${ERRATA}/${.TARGET:T}.sig -m ${.TARGET}' && exit 0; \ - fi; exit 1 + echo '>> Fetching & Verifying ${MIRROR}/${.TARGET:T}'; \ + su ${BUILDUSER} -c '${FETCH} -o ${ERRATA}/${.TARGET:T} \ + ${MIRROR}/${.TARGET:T}' + +${ERRATA}/${ERRATA}.patch: ${ERRATA}/${ERRATA}.patch.sig + @su ${BUILDUSER} -c '/usr/bin/signify -Vep ${SIGNIFY_KEY} -x \ + ${ERRATA}/${.TARGET:T}.sig -m ${.TARGET}' ${_PATCH_COOKIE}: ${ERRATA}/${ERRATA}.patch @echo '>> Applying ${ERRATA}.patch'; \ |