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
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
#!/bin/ksh
#
# $OpenBSD: syspatch.sh,v 1.79 2016/12/31 15:52:36 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
umask 0022
sp_err()
{
echo "${1}" 1>&2 && return ${2:-1}
}
usage()
{
sp_err "usage: ${0##*/} [-c | -l | -r]"
}
apply_patch()
{
local _explodir _file _files _patch=$1 _ret=0
[[ -n ${_patch} ]]
_explodir=${_TMP}/${_patch}
echo "Applying patch ${_patch##${_OSrev}-}"
fetch_and_verify "syspatch${_patch}.tgz"
trap '' INT
install -d ${_explodir} ${_PDIR}/${_patch}
_files="$(tar xvzphf ${_TMP}/syspatch${_patch}.tgz -C ${_explodir})"
checkfs ${_files}
create_rollback ${_patch} "${_files}"
# create_rollback(): tar(1) was fed with an empty list of files; that is
# not an error but no tarball is created; this happens if no earlier
# version of the files contained in the syspatch exists on the system
[[ ! -f ${_PDIR}/${_patch}/rollback.tgz ]] && unset _files &&
echo "Missing set, skipping patch ${_patch##${_OSrev}-}"
for _file in ${_files}; do
((_ret == 0)) || break
if [[ ${_file} == @(bsd|bsd.mp) ]]; then
install_kernel ${_explodir}/${_file} || _ret=$?
else
install_file ${_explodir}/${_file} /${_file} || _ret=$?
fi
done
if ((_ret != 0)); then
sp_err "Failed to apply patch ${_patch##${_OSrev}-}" 0
rollback_patch; return ${_ret}
fi
trap exit INT
}
# quick-and-dirty size check:
# - assume old files are about the same size as new ones
# - ignore new (nonexistent) files
# - compute total size of all files per fs, simpler and less margin for error
# - if we install a kernel, double /bsd size (duplicate it in the list) when:
# - we are on an MP system (/bsd.mp does not exist there)
# - /bsd.syspatchXX is not present (create_rollback will copy it from /bsd)
checkfs()
{
local _d _df _dev _files="${@}" _sz
[[ -n ${_files} ]]
if echo "${_files}" | grep -qw bsd; then
${_BSDMP} || [[ ! -f /bsd.syspatch${_OSrev} ]] &&
_files="bsd ${_files}"
fi
eval $(cd / &&
stat -qf "_dev=\"\${_dev} %Sd\" %Sd=\"\${%Sd:+\${%Sd}\+}%Uz\"" \
${_files}) || true # ignore nonexistent files
for _d in $(printf '%s\n' ${_dev} | sort -u); do
mount | grep -v read-only | grep -q "^/dev/${_d} " ||
sp_err "Remote or read-only filesystem, aborting"
_df=$(df -Pk | grep "^/dev/${_d} " | tr -s ' ' | cut -d ' ' -f4)
_sz=$(($((_d))/1024))
((_df > _sz)) || sp_err "No space left on ${_d}, aborting"
done
}
create_rollback()
{
# XXX annotate new files so we can remove them if we rollback?
local _file _patch=$1 _rbfiles _ret=0
[[ -n ${_patch} ]]
shift
local _files="${@}"
[[ -n ${_files} ]]
for _file in ${_files}; do
[[ -f /${_file} ]] || continue
# only save the original release kernel once
if [[ ${_file} == bsd && ! -f /bsd.syspatch${_OSrev} ]]; then
install -FSp /bsd /bsd.syspatch${_OSrev}
fi
_rbfiles="${_rbfiles} ${_file}"
done
# GENERIC.MP: substitute bsd.mp->bsd and bsd.sp->bsd
if ${_BSDMP} &&
tar -tzf ${_TMP}/syspatch${_patch}.tgz bsd >/dev/null 2>&1; then
tar -C / -czf ${_PDIR}/${_patch}/rollback.tgz -s '/^bsd.mp$//' \
-s '/^bsd$/bsd.mp/' -s '/^bsd.sp$/bsd/' bsd.sp \
${_rbfiles} || _ret=$?
else
tar -C / -czf ${_PDIR}/${_patch}/rollback.tgz ${_rbfiles} ||
_ret=$?
fi
if ((_ret != 0)); then
sp_err "Failed to create rollback patch ${_patch##${_OSrev}-}" 0
rm -r ${_PDIR}/${_patch}; return ${_ret}
fi
}
fetch_and_verify()
{
local _sig=${_TMP}/SHA256.sig _tgz=$1
[[ -n ${_tgz} ]]
[[ -f ${_sig} ]] || \
unpriv -f "${_sig}" ${_FETCH} -o "${_sig}" "${_URL}/SHA256.sig"
unpriv -f "${_TMP}/${_tgz}" ${_FETCH} -mD "Get/Verify" -o \
"${_TMP}/${_tgz}" "${_URL}/${_tgz}"
(cd ${_TMP} && unpriv signify -qC -p \
/etc/signify/openbsd-${_OSrev}-syspatch.pub -x SHA256.sig \
${_tgz})
}
install_file()
{
# XXX handle symlinks, dir->file, file->dir?
local _dst=$2 _fgrp _fmode _fown _src=$1
[[ -f ${_src} && -f ${_dst} ]]
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 _kern=$1
[[ -n ${_kern} ]]
if ${_BSDMP}; then
[[ ${_kern##*/} == bsd ]] && _bsd=bsd.sp || _bsd=bsd
fi
install -FS ${_kern} /${_bsd:-${_kern##*/}}
}
ls_installed()
{
local _p
for _p in ${_PDIR}/${_OSrev}-+([[:digit:]])_+([[:alnum:]_]); do
[[ -f ${_p}/rollback.tgz ]] && echo ${_p##*/${_OSrev}-}
done | sort -V
}
ls_missing()
{
local _c _idx=${_TMP}/idx.txt _l="$(ls_installed)"
unpriv -f "${_idx}" ${_FETCH} -o "${_idx}" "${_URL}/index.txt"
grep -Eo "syspatch${_OSrev}-[[:digit:]]{3}_[[:alnum:]_]+" ${_idx} |
while read _c; do _c=${_c##syspatch${_OSrev}-} &&
[[ -n ${_l} ]] && echo ${_c} | grep -qw -- "${_l}" || echo ${_c}
done | sort -V
}
rollback_patch()
{
local _explodir _file _files _patch _ret=0
_patch="$(ls_installed | tail -1)"
[[ -n ${_patch} ]]
_explodir=${_TMP}/${_patch}-rollback
_patch=${_OSrev}-${_patch}
echo "Reverting patch ${_patch##${_OSrev}-}"
install -d ${_explodir}
_files="$(tar xvzphf ${_PDIR}/${_patch}/rollback.tgz -C ${_explodir})"
checkfs ${_files} ${_PDIR} # check for read-only /var/syspatch
for _file in ${_files}; do
((_ret == 0)) || break
if [[ ${_file} == @(bsd|bsd.mp) ]]; then
install_kernel ${_explodir}/${_file} || _ret=$?
# remove the backup kernel if all kernel syspatches have
# been reverted; non-fatal (`-f')
cmp -s /bsd /bsd.syspatch${_OSrev} &&
rm -f /bsd.syspatch${_OSrev}
else
install_file ${_explodir}/${_file} /${_file} || _ret=$?
fi
done
((_ret == 0)) && rm -r ${_PDIR}/${_patch} ||
sp_err "Failed to revert patch ${_patch##${_OSrev}-}" ${_ret}
}
sp_cleanup()
{
local _d _k _m
# remove non matching release /var/syspatch/ content
for _d in ${_PDIR}/*; do
[[ ${_d##*/} == ${_OSrev}-+([[:digit:]])_+([[:alnum:]]|_) ]] &&
[[ -f ${_d}/rollback.tgz ]] || rm -r ${_d}
done
# remove non matching release backup kernel
for _k in /bsd.syspatch+([[:digit:]]); do
[[ -f ${_k} ]] || continue
[[ ${_k} == /bsd.syspatch${_OSrev} ]] || rm ${_k}
done
# in case a patch added a new directory (install -D)
for _m in /etc/mtree/{4.4BSD,BSD.x11}.dist; do
[[ -f ${_m} ]] && mtree -qdef ${_m} -p / -U >/dev/null
done
}
unpriv()
{
# XXX use a dedicated user?
local _file=$2 _user=_pkgfetch
if [[ $1 == -f && -n ${_file} ]]; then
>${_file}
chown "${_user}" "${_file}"
chmod 0711 ${_TMP}
shift 2
fi
(($# >= 1))
eval su -s /bin/sh ${_user} -c "'$@'"
}
# XXX needs a way to match release <=> syspatch
# 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')
((${#_KERNV[*]} > 1)) && sp_err "Unsupported release ${_KERNV[*]}"
[[ $@ == @(|-[[:alpha:]]) ]] || usage; [[ $@ == @(|-(c|r)) ]] &&
(($(id -u) != 0)) && sp_err "${0##*/}: need root privileges"
(($(sysctl -n hw.ncpufound) > 1)) && _BSDMP=true || _BSDMP=false
_FETCH="ftp -MVk ${FTP_KEEPALIVE-0}"
_OSrev=${_KERNV[0]%\.*}${_KERNV[0]#*\.}
_PDIR="/var/syspatch"
_TMP=$(mktemp -d -p /tmp syspatch.XXXXXXXXXX)
# XXX to be discussed
_URL=https://syspatch.openbsd.org/pub/OpenBSD/${_KERNV[0]}/syspatch/$(machine)
readonly _BSDMP _FETCH _OSrev _PDIR _REL _TMP _URL
trap 'set +e; rm -rf "${_TMP}"' EXIT
trap exit HUP INT TERM
[[ -n ${_OSrev} ]]
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
if ((OPTIND == 1)); then
for _PATCH in $(ls_missing); do
apply_patch ${_OSrev}-${_PATCH}
done
sp_cleanup
fi
|