Just wanted to update one of my servers (6.1-stable) with erata 30
xrstor
# signify -Vep /etc/signify/openbsd-61-base.pub -x 030_xrstor.patch.sig
\
-m - | (cd /usr/src && patch -p0)
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Signature Verified
|
|OpenBSD 6.1 errata 030, October 4th, 2017:
|
|Correctly handle exceptions when restoring an invalid FPU context.
|
|Apply by doing:
| signify -Vep /etc/signify/openbsd-61-base.pub -x
030_xrstor.patch.sig \
| -m - | (cd /usr/src && patch -p0)
|
|And then rebuild and install a new kernel:
| KK=`sysctl -n kern.osversion | cut -d# -f1`
| cd /usr/src/sys/arch/`machine`/compile/$KK
| make obj
| make config
| make
| make install
|
|Index: sys/arch/amd64/amd64/fpu.c
|===================================================================
|RCS file: /cvs/src/sys/arch/amd64/amd64/fpu.c,v
|retrieving revision 1.35
|diff -u -p -u -r1.35 fpu.c
|--- sys/arch/amd64/amd64/fpu.c 29 May 2017 14:19:49 -0000 1.35
|+++ sys/arch/amd64/amd64/fpu.c 3 Oct 2017 04:38:35 -0000
--------------------------
Patching file sys/arch/amd64/amd64/fpu.c using Plan A...
Hunk #1 succeeded at 56 (offset 1 line).
Hunk #2 succeeded at 256 (offset 1 line).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/amd64/amd64/locore.S
|===================================================================
|RCS file: /cvs/src/sys/arch/amd64/amd64/locore.S,v
|retrieving revision 1.87
|diff -u -p -u -r1.87 locore.S
|--- sys/arch/amd64/amd64/locore.S 6 Jul 2017 06:17:04 -0000
1.87
|+++ sys/arch/amd64/amd64/locore.S 3 Oct 2017 04:38:35 -0000
--------------------------
Patching file sys/arch/amd64/amd64/locore.S using Plan A...
Hunk #1 succeeded at 1203 (offset 512 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/amd64/amd64/trap.c
|===================================================================
|RCS file: /cvs/src/sys/arch/amd64/amd64/trap.c,v
|retrieving revision 1.58
|diff -u -p -u -r1.58 trap.c
|--- sys/arch/amd64/amd64/trap.c 16 Sep 2017 02:03:40 -0000
1.58
|+++ sys/arch/amd64/amd64/trap.c 3 Oct 2017 04:38:35 -0000
--------------------------
Patching file sys/arch/amd64/amd64/trap.c using Plan A...
Hunk #1 succeeded at 148 (offset 4 lines).
Hunk #2 succeeded at 218 (offset 14 lines).
Hunk #3 succeeded at 246 (offset 6 lines).
done
# KK=`sysctl -n kern.osversion | cut -d# -f1`
# cd /usr/src/sys/arch/`machine`/compile/$KK
# make obj
# make config
make: don't know how to make config
Stop in /usr/src/sys/arch/amd64/compile/GENERIC.MP
# KK=`sysctl -n kern.osversion | cut -d# -f1`
# cd /usr/src/sys/arch/`machine`/compile/$KK
# make obj
# make config
make: don't know how to make config
Stop in /usr/src/sys/arch/amd64/compile/GENERIC.MP
# make
cc -D_LOCORE -x assembler-with-cpp -Werror -Wall
-Wimplicit-function-declaration -Wno-uninitialized -Wno-pointer-sign
-Wframe-larger-than=2047 -mcmodel=kernel -mno-red-zone -mno-sse2
-mno-sse -mno-3dnow -mno-mmx -msoft-float -fno-omit-frame-pointer
-ffreestanding -fno-pie -nostdinc -I/usr/src/sys
-I/usr/src/sys/arch/amd64/compile/GENERIC.MP/obj -I/usr/src/sys/arch
-DDDB -DDIAGNOSTIC -DKTRACE -DACCOUNTING -DKMEMSTATS -DPTRACE -DCRYPTO
-DSYSVMSG -DSYSVSEM -DSYSVSHM -DUVM_SWAP_ENCRYPT -DFFS -DFFS2
-DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DNFSCLIENT
-DNFSSERVER -DCD9660 -DUDF -DMSDOSFS -DFIFO -DFUSE -DSOCKET_SPLICE
-DTCP_SACK -DTCP_ECN -DTCP_SIGNATURE -DART -DINET6 -DIPSEC -DPPP_BSDCOMP
-DPPP_DEFLATE -DPIPEX -DMROUTING -DMPLS -DBOOT_CONFIG -DUSER_PCICONF
-DAPERTURE -DMTRR -DNTFS -DHIBERNATE -DPCIVERBOSE -DUSBVERBOSE
-DWSDISPLAY_COMPAT_USL -DWSDISPLAY_COMPAT_RAWKBD
-DWSDISPLAY_DEFAULTSCREENS="6" -DX86EMU -DONEWIREVERBOSE
-DMULTIPROCESSOR -DMAXUSERS=80 -D_KERNEL -MD -MP -c
/usr/src/sys/arch/amd64/amd64/locore.S
/usr/src/sys/arch/amd64/amd64/locore.S: Assembler messages:
/usr/src/sys/arch/amd64/amd64/locore.S:441: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:441: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:441: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:441: Error: undefined symbol
`NDML3_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:441: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:446: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:446: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:469: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:469: Error: undefined symbol
`PG_KR' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:479: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:479: Error: undefined symbol
`PG_KR' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:489: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:489: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:501: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:501: Error: undefined symbol
`PG_KR' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:514: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:514: Error: undefined symbol
`PG_KR' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:520: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:520: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:521: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:521: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:521: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:521: Error: undefined symbol
`NDML3_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:521: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:526: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:526: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:531: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:532: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:532: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:533: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:533: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:548: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:549: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:549: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:565: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:565: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:570: Error: undefined symbol
`L4_SLOT_KERNBASE' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:572: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:572: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:584: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:584: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:584: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:584: Error: undefined symbol
`NDML3_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:586: Error: undefined symbol
`NDML2_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:586: Error: undefined symbol
`NPDPG' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:587: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:587: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:587: Error: undefined symbol
`PG_PS' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:587: Error: undefined symbol
`PG_G' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:592: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:603: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:603: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:603: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:604: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:604: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:604: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:604: Error: undefined symbol
`NDML3_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:605: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:605: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:609: Error: undefined symbol
`PDIR_SLOT_DIRECT' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:610: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:610: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:610: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:611: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:611: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:616: Error: undefined symbol
`PDIR_SLOT_PTE' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:618: Error: undefined symbol
`PG_V' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:618: Error: undefined symbol
`PG_KW' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:726: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:726: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:726: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:726: Error: undefined symbol
`NDML3_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:726: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:746: Error: undefined symbol
`NKL4_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:746: Error: undefined symbol
`NKL3_KIMG_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:746: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:746: Error: undefined symbol
`NDML3_ENTRIES' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:746: Error: undefined symbol `L0'
in operation
/usr/src/sys/arch/amd64/amd64/locore.S:1055: Error: undefined symbol
`MDP_IRET' in operation
/usr/src/sys/arch/amd64/amd64/locore.S:1246: Error: attempt to get value
of unresolved symbol `L0'
/usr/src/sys/arch/amd64/amd64/locore.S:1246: Error: attempt to get value
of unresolved symbol `L0'
/usr/src/sys/arch/amd64/amd64/locore.S:1246: Error: attempt to get value
of unresolved symbol `L0'
/usr/src/sys/arch/amd64/amd64/locore.S:1246: Error: attempt to get value
of unresolved symbol `L0'
/usr/src/sys/arch/amd64/amd64/locore.S:737: Error: can't resolve `L0'
{*ABS* section} - `FRAMESIZE' {*UND* section}
/usr/src/sys/arch/amd64/amd64/locore.S:1044: Error: can't resolve
`TF_RSP' {*UND* section} - `TF_TRAPNO' {*UND* section}
*** Error 1 in /usr/src/sys/arch/amd64/compile/GENERIC.MP (Makefile:953
'locore.o')
#
