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
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
|
#!/bin/sh -
#
# $OpenBSD: sysmerge.sh,v 1.1 2008/04/22 20:53:16 ajacoutot Exp $
#
# This script is based on the FreeBSD mergemaster script which is
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
#
# Some ideas came from the NetBSD etcupdate script, written by
# Martti Kuparinen <martti@NetBSD.org>
#
# Copyright (c) 2008 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.
#
umask 0022
PATH="/bin:/usr/bin:/sbin:/usr/sbin"
PAGER="${PAGER:=/usr/bin/more}"
SWIDTH=`stty size | awk '{w=$2}END{if(w==0){w=80}print w}'`
usage() {
cat << EOF
usage: ${0##*/} [-a] [-s src | etcXX.tgz]
EOF
}
yesno() {
echo -n "${*}? (y|[n]) "
read ANSWER
case "${ANSWER}" in
y|Y)
echo ""
return 0
;;
*)
return 1
;;
esac
}
do_pre() {
if [ `id -u` -ne 0 ]; then
echo " *** ERROR: Need root privilege to run this script"
exit 1
fi
WRKDIR=`mktemp -d -p /var/tmp sysmerge.XXXXX` || exit 1
TEMPROOT="${WRKDIR}/temproot"
BKPDIR="${WRKDIR}/backups"
trap "rm -rf ${WRKDIR}; exit 1" 1 2 3 13 15
if [ -z "${SRCMODE}" -a -z "${TGZMODE}" ]; then
SRCMODE=1
SRCDIR=/usr/src
fi
echo "\n===> Running ${0##*/} with the following settings:\n"
if [ "${AUTOMODE}" ]; then
echo " auto-mode: yes"
fi
echo " source: ${SRCDIR}${TGZ}"
echo " base work directory: ${WRKDIR}"
echo " temp root directory: ${TEMPROOT}"
echo " backup directory: ${BKPDIR}"
echo ""
if yesno "Continue"; then
echo -n ""
else
rmdir ${WRKDIR} 2> /dev/null
exit 1
fi
}
do_populate() {
if [ "${SRCMODE}" -o "${TGZMODE}" ]; then
echo "===> Creating and populating temporary root under ${TEMPROOT}"
mkdir -p ${TEMPROOT}
if [ "${SRCMODE}" ]; then
cd ${SRCDIR}/etc
make DESTDIR=${TEMPROOT} distribution-etc-root-var 2>&1 1> /dev/null \
| tee | grep -v "WARNING\: World writable directory"
fi
if [ "${TGZMODE}" ]; then
for i in ${TGZ}; do tar -xzphf ${i} -C ${TEMPROOT}; done
fi
# files we don't want/need to deal with
IGNORE_FILES="/etc/*.db /etc/mail/*.db /etc/passwd /etc/motd /etc/myname /var/mail/root"
CF_FILES="/etc/mail/localhost.cf /etc/mail/sendmail.cf /etc/mail/submit.cf"
for cf in ${CF_FILES}; do
CF_DIFF=`diff -u -I "##### built by .* on" ${TEMPROOT}/${cf} ${DESTDIR}/${cf}`
if [ -z "${CF_DIFF}" ]; then
IGNORE_FILES="${IGNORE_FILES} ${cf}"
fi
done
for i in ${IGNORE_FILES}; do rm -f ${TEMPROOT}/${i}; done
fi
}
do_install_and_rm() {
if [ -f "${5}/${4##*/}" ]; then
mkdir -p ${BKPDIR}/${4%/*}
cp ${5}/${4##*/} ${BKPDIR}/${4%/*}
fi
install -m "${1}" -o "${2}" -g "${3}" "${4}" "${5}"
rm -f "${4}"
}
mm_install() {
local INSTDIR
INSTDIR=${1#.}
INSTDIR=${INSTDIR%/*}
if [ -z "${INSTDIR}" ]; then INSTDIR=/; fi
DIR_OWN=`stat -f "%OMp%OLp" "${TEMPROOT}/${INSTDIR}"`
eval `stat -f "FILE_MODE=%OMp%OLp FILE_OWN=%Su FILE_GRP=%Sg" ${1}`
if [ -n "${DESTDIR}${INSTDIR}" -a ! -d "${DESTDIR}${INSTDIR}" ]; then
install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTDIR}"
fi
do_install_and_rm "${FILE_MODE}" "${FILE_OWN}" "${FILE_GRP}" "${1}" "${DESTDIR}${INSTDIR}"
case "${1#.}" in
/dev/MAKEDEV)
NEED_MAKEDEV=1
;;
/etc/login.conf)
if [ -f ${DESTDIR}/etc/login.conf.db ]; then NEED_CAP_MKDB=1; fi
;;
/etc/mail/aliases)
NEED_NEWALIASES=1
;;
/etc/master.passwd)
NEED_PWD_MKDB=1
;;
esac
}
merge_loop() {
echo "===> Type h at the sdiff prompt (%) to get usage help\n"
MERGE_AGAIN=1
while [ "${MERGE_AGAIN}" ]; do
cp -p "${COMPFILE}" "${COMPFILE}.merged"
sdiff -as -o "${COMPFILE}.merged" -w ${SWIDTH} \
"${DESTDIR}${COMPFILE#.}" "${COMPFILE}"
INSTALL_MERGED=v
while [ "${INSTALL_MERGED}" = "v" ]; do
echo ""
echo " Use 'i' to install merged file"
echo " Use 'r' to re-do the merge"
echo " Use 'v' to view the merged file"
echo " Default is to leave the temporary file to deal with by hand"
echo ""
echo -n "===> How should I deal with the merged file? [Leave it for later] "
read INSTALL_MERGED
case "${INSTALL_MERGED}" in
[iI])
mv "${COMPFILE}.merged" "${COMPFILE}"
echo ""
if mm_install "${COMPFILE}"; then
echo "===> Merged version of ${COMPFILE} installed successfully"
else
echo " *** WARNING: Problem installing ${COMPFILE}, it will remain to merge by hand"
fi
unset MERGE_AGAIN
;;
[rR])
rm "${COMPFILE}.merged"
;;
[vV])
${PAGER} "${COMPFILE}.merged"
;;
'')
echo "===> ${COMPFILE} will remain for your consideration"
unset MERGE_AGAIN
;;
*)
echo "invalid choice: ${INSTALL_MERGED}"
INSTALL_MERGED=v
;;
esac
done
done
}
diff_loop() {
HANDLE_COMPFILE=v
while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "todo" ]; do
if [ "${HANDLE_COMPFILE}" = "v" ]; then
echo "\n========================================================================\n"
fi
if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
if [ "${HANDLE_COMPFILE}" = "v" ]; then
(
echo "===> Displaying differences between ${COMPFILE} and installed version:"
echo ""
diff -u "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"
) | ${PAGER}
echo ""
fi
else
echo "===> ${COMPFILE} was not found on the target system\n"
if [ -z "${AUTOMODE}" ]; then
NO_INSTALLED=1
else
if mm_install "${COMPFILE}"; then
AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES}${DESTDIR}${COMPFILE#.}\n"
else
echo " *** WARNING: Problem installing ${COMPFILE}, it will remain to merge by hand"
fi
return
fi
fi
echo " Use 'd' to delete the temporary ${COMPFILE}"
echo " Use 'i' to install the temporary ${COMPFILE}"
if [ -z "${NO_INSTALLED}" ]; then
echo " Use 'm' to merge the temporary and installed versions"
echo " Use 'v' to view the diff results again"
fi
echo ""
echo " Default is to leave the temporary file to deal with by hand"
echo ""
echo -n "How should I deal with this? [Leave it for later] "
read HANDLE_COMPFILE
case "${HANDLE_COMPFILE}" in
[dD])
rm "${COMPFILE}"
echo "\n===> Deleting ${COMPFILE}"
;;
[iI])
echo ""
if mm_install "${COMPFILE}"; then
echo "===> ${COMPFILE} installed successfully"
else
echo " *** WARNING: Problem installing ${COMPFILE}, it will remain to merge by hand"
fi
;;
[mM])
if [ -z "${NO_INSTALLED}" ]; then
merge_loop
else
HANDLE_COMPFILE="todo"
fi
;;
[vV])
HANDLE_COMPFILE="v"
continue
;;
'')
echo "\n===> ${COMPFILE} will remain for your consideration"
;;
*)
echo "invalid choice: ${HANDLE_COMPFILE}\n"
HANDLE_COMPFILE="todo"
continue
;;
esac
done
unset NO_INSTALLED
}
do_compare() {
echo "===> Starting comparison"
if [ ! -d "${TEMPROOT}" ]; then
echo " *** ERROR: ${TEMPROOT} does not exist!"
exit 1
fi
cd ${TEMPROOT}
# use -size +0 to avoid comparing empty log files and device nodes
for COMPFILE in `find . -type f -size +0`; do
if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then
diff_loop
continue
fi
# compare CVS $Id's first so if the file hasn't been modified,
# it will be deleted from temproot and ignored from comparison
if [ "${AUTOMODE}" ]; then
CVSID1=`grep "[$]OpenBSD:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
CVSID2=`grep "[$]OpenBSD:" ${COMPFILE} 2>/dev/null` || CVSID2=none
if [ "${CVSID2}" = "${CVSID1}" ]; then rm "${COMPFILE}"; fi
fi
if [ -f "${COMPFILE}" ]; then
# make sure files are different; if not, delete the one in temproot
if diff -q "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > /dev/null 2>&1; then
rm "${COMPFILE}"
else
diff_loop
fi
fi
done
echo "\n===> Comparison complete"
}
do_post() {
if [ "${AUTO_INSTALLED_FILES}" ]; then
echo "${AUTO_INSTALLED_FILES}" > ${WRKDIR}/auto_installed_files
fi
if [ "${NEED_CAP_MKDB}" ]; then
echo -n "===> You installed a new ${DESTDIR}/etc/login.conf file, "
if [ "${AUTOMODE}" ]; then
echo "running cap_mkdb"
/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf
else
echo "\n rebuild your login.conf database by running the following command as root:"
echo " '/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf'"
fi
fi
if [ "${NEED_PWD_MKDB}" ]; then
echo -n "===> A new ${DESTDIR}/etc/master.passwd file was installed, "
if [ "${AUTOMODE}" ]; then
echo "running pwd_mkdb"
/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd
else
echo "\n rebuild your password files by running the following command as root:"
echo " '/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'"
fi
fi
if [ "${NEED_MAKEDEV}" ]; then
echo -n "===> A new ${DESTDIR}/dev/MAKEDEV script was installed, "
if [ "${AUTOMODE}" ]; then
echo "running MAKEDEV"
cd ${DESTDIR}/dev && /bin/sh MAKEDEV all
else
echo "\n rebuild your device nodes by running the following command as root:"
echo " 'cd ${DESTDIR}/dev && /bin/sh MAKEDEV all'"
fi
fi
if [ "${NEED_NEWALIASES}" ]; then
echo -n "===> A new ${DESTDIR}/etc/mail/aliases file was installed, "
if [ "${DESTDIR}" ]; then
echo "\n but the newaliases command is limited to the directories configured"
echo " in sendmail.cf. Make sure to create your aliases database by"
echo " hand when your sendmail configuration is done."
elif [ "${AUTOMODE}" ]; then
echo "running newaliases"
/usr/bin/newaliases
else
echo "\n rebuild your aliases database by running the following command as root:"
echo " '/usr/bin/newaliases'"
fi
fi
echo "===> Making sure your directory hierarchy has correct perms, running mtree"
/usr/sbin/mtree -qdef ${DESTDIR}/etc/mtree/4.4BSD.dist -p ${DESTDIR:=/} -U 1> /dev/null
FILES_IN_WRKDIR=`find ${WRKDIR} -type f -size +0 2>/dev/null`
if [ "${FILES_IN_WRKDIR}" ]; then
FILES_IN_TEMPROOT=`find ${TEMPROOT} -type f -size +0 2>/dev/null`
FILES_IN_BKPDIR=`find ${BKPDIR} -type f -size +0 2>/dev/null`
if [ "${AUTO_INSTALLED_FILES}" ]; then
echo "===> Automatically installed file(s) listed in"
echo " ${WRKDIR}/auto_installed_files"
fi
if [ "${FILES_IN_TEMPROOT}" ]; then
echo "===> File(s) remaining for you to merge by hand:"
find "${TEMPROOT}" -type f -size +0 -exec echo " {}" \;
fi
if [ "${FILES_IN_BKPDIR}" ]; then
echo "===> Backup of replaced file(s) can be found under ${BKPDIR}"
fi
echo "===> When done, ${WRKDIR} and its sub-directories should be removed"
else
echo "===> Removing ${WRKDIR}"
rm -rf "${WRKDIR}"
fi
}
ARGS=`getopt as: $*`
if [ $? -ne 0 ]; then
usage
exit 1
fi
set -- ${ARGS}
while [ $# -ne 0 ]
do
case "$1" in
-a)
AUTOMODE=1
shift;;
-s)
WHERE="${2}"
shift 2
if [ -d "${WHERE}" ]; then
SRCMODE=1
SRCDIR=${WHERE}
elif [ -f "${WHERE}" ]; then
TGZMODE=1
TGZ=${WHERE}
else
echo " *** ERROR: ${WHERE} is not a path to src nor etcXX.tgz"
exit 1
fi
;;
--)
shift; break;;
esac
done
do_pre
do_populate
do_compare
do_post
|