1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
#!/bin/ksh
#
# $OpenBSD: syspatch.sh,v 1.19 2016/11/01 14:45:46 ajacoutot Exp $
#
# Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
set -e
sp_err()
{
echo "${@}" 1>&2 && return 1
}
usage()
{
sp_err "usage: ${0##*/} [-c | -l | -r]"
}
needs_root()
{
[[ $(id -u) -ne 0 ]] && sp_err "${0##*/}: need root privileges"
}
apply_patch()
{
local _explodir _file _files _patch=$1
[[ -n ${_patch} ]]
local _explodir=${_TMP}/${_patch}
mkdir -p ${_explodir}
_files="$(tar xvzphf ${_TMP}/${_patch}.tgz -C ${_explodir})"
create_rollback ${_patch} "${_files}"
for _file in ${_files}; do
if [[ ${_file} == @(bsd|bsd.mp) ]]; then
if ! install_kernel ${_explodir}/${_file}; then
rollback_patch
sp_err "Failed to apply ${_patch} (/${_file})"
fi
else
if ! install_file ${_explodir}/${_file} /${_file}; then
rollback_patch
sp_err "Failed to apply ${_patch} (/${_file})"
fi
fi
done
}
apply_patches()
{
needs_root
# XXX cleanup old rollback patches and sig (installer should as well)
local _m _patch _patches="$(ls_missing)"
[[ -n ${_patches} ]] || return 0 # nothing to do
for _patch in ${_patches}; do
fetch_and_verify "${_patch}"
apply_patch "${_patch}"
done
# non-fatal: the syspatch tarball should have correct permissions
for _m in 4.4BSD BSD.x11; do
mtree -qdef /etc/mtree/${_m}.dist -p / -U >/dev/null || true
done
}
create_rollback()
{
local _file _patch=$1 _rbfiles
[[ -n ${_patch} ]]
shift
local _files="${@}"
[[ -n ${_files} ]]
[[ -d ${_PDIR}/${_REL} ]] || install -d ${_PDIR}/${_REL}
for _file in ${_files}; do
[[ -f /${_file} ]] || continue
_rbfiles="${_rbfiles} ${_file}"
done
if ! (cd / &&
# GENERIC.MP: substitute bsd.mp->bsd and bsd.sp->bsd
if ${_BSDMP} &&
tar -tzf ${_TMP}/${_patch}.tgz bsd >/dev/null 2>&1; then
tar -czf ${_PDIR}/${_REL}/rollback-${_patch}.tgz \
-s '/^bsd.mp$//' -s '/^bsd$/bsd.mp/' \
-s '/^bsd.sp$/bsd/' bsd.sp ${_rbfiles}
else
tar -czf ${_PDIR}/${_REL}/rollback-${_patch}.tgz \
${_rbfiles}
fi
); then
rm ${_PDIR}/${_REL}/rollback-${_patch}.tgz
sp_err "Failed to create rollback for ${_patch}"
fi
}
fetch_and_verify()
{
# XXX privsep ala installer
local _patch=$1
[[ -n ${_patch} ]]
local _key="/etc/signify/openbsd-${_RELINT}-syspatch.pub" _p
# XXX handle bogus PATCH_PATH (ftp(1) interactive mode)
${_FETCH} -o "${_TMP}/SHA256.sig" "${PATCH_PATH}/SHA256.sig"
# XXX see above
${_FETCH} -mD "Applying" -o "${_TMP}/${_patch}.tgz" \
"${PATCH_PATH}/${_patch}.tgz"
(cd ${_TMP} &&
/usr/bin/signify -qC -p ${_key} -x SHA256.sig ${_patch}.tgz)
}
install_file()
{
# XXX handle sym/hardlinks?
# XXX handle dir becoming file and vice-versa?
local _src=$1 _dst=$2
[[ -f ${_src} && -f ${_dst} ]]
local _fmode _fown _fgrp
eval $(stat -f "_fmode=%OMp%OLp _fown=%Su _fgrp=%Sg" ${_src})
install -DFS -m ${_fmode} -o ${_fown} -g ${_fgrp} ${_src} ${_dst}
}
install_kernel()
{
local _bsd=/bsd _kern=$1
[[ -n ${_kern} ]]
# we only save the original release kernel once
[[ -f /bsd.rollback${_RELINT} ]] ||
install -FSp /bsd /bsd.rollback${_RELINT}
if ${_BSDMP}; then
[[ ${_kern##*/} == bsd ]] && _bsd=/bsd.sp
fi
if [[ -n ${_bsd} ]]; then
install -FS ${_kern} ${_bsd}
fi
}
ls_avail()
{
${_FETCH} -o - "${PATCH_PATH}/index.txt" |
sed 's/^.* //;s/^M//;s/.tgz$//' |
grep "^syspatch-${_RELINT}-.*$" | sort -V
}
ls_installed()
{
local _p
# no _REL dir = no installed patch
cd ${_PDIR}/${_REL} 2>/dev/null && set -- * || return 0
for _p; do
[[ ${_p} = rollback-syspatch-${_RELINT}-*.tgz ]] &&
_p=${_p#rollback-} && echo ${_p%.tgz}
done | sort -V
}
ls_missing()
{
local _a _installed
_installed="$(ls_installed)"
for _a in $(ls_avail); do
if [[ -n ${_installed} ]]; then
echo ${_a} | grep -qw -- "${_installed}" || echo ${_a}
else
echo ${_a}
fi
done
}
rollback_patch()
{
needs_root
local _explodir _file _files _patch
_patch="$(ls_installed | sort -V | tail -1)"
[[ -n ${_patch} ]]
_explodir=${_TMP}/rollback-${_patch}
mkdir -p ${_explodir}
_files="$(tar xvzphf ${_PDIR}/${_REL}/rollback-${_patch}.tgz -C \
${_explodir})"
for _file in ${_files}; do
if [[ ${_file} == @(bsd|bsd.mp) ]]; then
install_kernel ${_explodir}/${_file} ||
sp_err "Failed to rollback ${_patch} (/${_file})"
else
install_file ${_explodir}/${_file} /${_file} ||
sp_err "Failed to rollback ${_patch} (/${_file})"
fi
done
rm ${_PDIR}/${_REL}/rollback-${_patch}.tgz \
${_PDIR}/${_REL}/${_patch#syspatch-${_RELINT}-}.patch.sig
}
# only run on release (not -current nor -stable)
set -A _KERNV -- $(sysctl -n kern.version |
sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q')
[[ -z ${_KERNV[1]} ]]
# check args
[[ $@ == @(|-[[:alpha:]]) ]] || usage
# XXX to be discussed
[[ -n ${PATCH_PATH} ]]
[[ -d ${PATCH_PATH} ]] && PATCH_PATH="file://$(readlink -f ${PATCH_PATH})"
# XXX hw.ncpufound ?
[[ $(sysctl -n hw.ncpu) -gt 1 ]] && _BSDMP=true || _BSDMP=false
_FETCH="/usr/bin/ftp -MV -k ${FTP_KEEPALIVE-0}"
_PDIR="/var/syspatch"
_REL=${_KERNV[0]}
_RELINT=${_REL%\.*}${_REL#*\.}
_TMP=$(mktemp -d -p /tmp syspatch.XXXXXXXXXX)
readonly _BSDMP _FETCH _PDIR _REL _RELINT _TMP
trap "rm -rf ${_TMP}; exit 1" 2 3 9 13 15 ERR
while getopts clr arg; do
case ${arg} in
c) ls_missing;;
l) ls_installed;;
r) rollback_patch;;
*) usage;;
esac
done
shift $(( OPTIND -1 ))
[[ $# -ne 0 ]] && usage
[[ ${OPTIND} != 1 ]] || apply_patches
rm -rf ${_TMP}
|
