Skip to content

Instantly share code, notes, and snippets.

@zeszyt

zeszyt/etc-59-60.diff

Created September 1, 2016 09:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save zeszyt/11480a1d1b6c0e3fb84c965e562a60bf to your computer and use it in GitHub Desktop.
Save zeszyt/11480a1d1b6c0e3fb84c965e562a60bf to your computer and use it in GitHub Desktop.
Download ZIP
etc-59-60.diff
Raw
etc-59-60.diff
diff -ur -x moduli 59/etc/daily 60/etc/daily
--- 59/etc/daily 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/daily 2016-07-26 20:42:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $OpenBSD: daily,v 1.85 2016/01/28 15:45:34 schwarze Exp $
+# $OpenBSD: daily,v 1.88 2016/04/29 13:05:33 schwarze Exp $
# From: @(#)daily 8.2 (Berkeley) 1/25/94
#
# For local additions, create the file /etc/daily.local.
@@ -126,8 +126,8 @@
break
done
-next_part "Services that should run but don't:"
-rcctl ls faulty
+next_part "Services that should be running but aren't:"
+rcctl ls failed
next_part "Checking subsystem status:"
if [ "X$VERBOSESTATUS" != X0 ]; then
@@ -140,13 +140,6 @@
dump w | grep -vB1 ^Dump
fi
-# The first two regular expressions handle sendmail, the third postfix.
-# When the queue is empty, smtpd(8) and exim -bp keep silent.
-next_part "mail:"
-mailq | grep -v -e "^/var/spool/mqueue is empty$" \
- -e "^[[:blank:]]*Total requests: 0$" \
- -e "^Mail queue is empty$"
-
next_part "network:"
if [ "X$VERBOSESTATUS" != X0 ]; then
netstat -ivn
diff -ur -x moduli 59/etc/examples/bgpd.conf 60/etc/examples/bgpd.conf
--- 59/etc/examples/bgpd.conf 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/examples/bgpd.conf 2016-07-26 20:42:05.000000000 +0200
@@ -1,4 +1,4 @@
-# $OpenBSD: bgpd.conf,v 1.3 2015/09/11 18:59:00 sthen Exp $
+# $OpenBSD: bgpd.conf,v 1.4 2016/06/03 17:36:37 benno Exp $
# sample bgpd configuration file
# see bgpd.conf(5)
@@ -119,3 +119,14 @@
deny from any prefix fe80::/10 prefixlen >= 10 # link local unicast
deny from any prefix fec0::/10 prefixlen >= 10 # old site local unicast
deny from any prefix ff00::/8 prefixlen >= 8 # multicast
+
+# filter bogon AS numbers
+# http://www.iana.org/assignments/as-numbers/as-numbers.xhtml
+deny from any AS 23456 # AS_TRANS
+deny from any AS 64496 - 64511 # Reserved for use in docs and code RFC5398
+deny from any AS 64512 - 65534 # Reserved for Private Use RFC6996
+deny from any AS 65535 # Reserved RFC7300
+deny from any AS 65536 - 65551 # Reserved for use in docs and code RFC5398
+deny from any AS 65552 - 131071 # Reserved
+deny from any AS 4200000000 - 4294967294 # Reserved for Private Use RFC6996
+deny from any AS 4294967295 # Reserved RFC7300
diff -ur -x moduli 59/etc/examples/ldpd.conf 60/etc/examples/ldpd.conf
--- 59/etc/examples/ldpd.conf 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/examples/ldpd.conf 2016-07-26 20:42:05.000000000 +0200
@@ -1,21 +1,42 @@
-# $OpenBSD: ldpd.conf,v 1.1 2014/07/11 16:32:52 deraadt Exp $
+# $OpenBSD: ldpd.conf,v 1.2 2016/06/05 03:29:33 renato Exp $
# macros
-fast="2"
+password="secret"
# global configuration
# router-id 10.0.0.1
-# lfib-update no
+# fib-update no
+# transport-preference ipv4
-distribution independent
-retention liberal
-advertisement unsolicited
+address-family ipv4 {
+ # explicit-null yes
+ # keepalive 120
+ # targeted-hello-accept yes
+ # transport-address 10.0.0.1
-interface bge0
+ interface em0
+ interface vlan5 {
+ link-hello-holdtime 9
+ link-hello-interval 3
+ }
+ targeted-neighbor 172.16.1.10
+}
-interface vlan5 {
- hello-interval $fast
+neighbor 192.168.1.10 {
+ password $password
}
-interface vlan6 {
- passive
+
+l2vpn CUST_A type vpls {
+ bridge bridge0
+ interface em1
+ pseudowire mpw0 {
+ # control-word no
+ # status-tlv no
+ neighbor-id 10.0.1.5
+ pw-id 100
+ }
+ pseudowire mpw1 {
+ neighbor-id 10.0.2.8
+ pw-id 100
+ }
}
diff -ur -x moduli 59/etc/examples/pkg.conf 60/etc/examples/pkg.conf
--- 59/etc/examples/pkg.conf 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/examples/pkg.conf 2016-07-26 20:42:05.000000000 +0200
@@ -1,8 +1,11 @@
-# $OpenBSD: pkg.conf,v 1.6 2016/02/14 13:36:09 sthen Exp $
+# $OpenBSD: pkg.conf,v 1.16 2016/07/25 22:49:05 sthen Exp $
#
# Mirrors update at differing schedules. If using snapshots, sticking
# with one host will reduce risk of fetching out-of-sync packages.
+# Anycast CDN
+#installpath = mirrors.evowise.com
+
# Australia
#installpath = mirror.internode.on.net
#installpath = mirror.aarnet.edu.au
@@ -21,14 +24,13 @@
# Canada
#installpath = ftp.OpenBSD.org
-#installpath = athena.caslab.queensu.ca
#installpath = openbsd.cs.toronto.edu
+#installpath = openbsd.delfic.org
# Costa Rica
#installpath = http://mirrors.ucr.ac.cr/OpenBSD/%c/packages/%a/
# Denmark
-#installpath = ftp.openbsd.dk
#installpath = mirror.one.com
# Estonia
@@ -69,6 +71,9 @@
#installpath = ftp.jaist.ac.jp
#installpath = http://www.ftp.ne.jp/OpenBSD/%c/packages/%a/
+# Lithuania
+#installpath = mirror.litnet.lt
+
# The Netherlands
#installpath = mirror.meerval.net
#installpath = ftp.nluug.nl
@@ -88,23 +93,23 @@
# Slovenia
#installpath = www.obsd.si
-# Spain
-#installpath = mirror.codigo23.net
-
# Sweden
#installpath = ftp.eu.openbsd.org
# Switzerland
#installpath = http://mirror.switch.ch/ftp/pub/OpenBSD/%c/packages/%a/
+# Ukraine
+#installpath = mirror.eject.name
+
# United Kingdom
#installpath = www.mirrorservice.org
+#installpath = anorien.csc.warwick.ac.uk
#installpath = mirror.bytemark.co.uk
#installpath = mirror.ox.ac.uk
#installpath = mirror.exonetric.net
# CA, USA
-#installpath = ftp5.usa.openbsd.org
#installpath = mirrors.sonic.net
# CO, USA
@@ -115,15 +120,14 @@
# IL, USA
#installpath = mirrors.gigenet.com
-#installpath = mirror.team-cymru.org
# MA, USA
#installpath = mirrors.mit.edu
# NY, USA
-#installpath = filedump.se.rit.edu
+#installpath = ftp4.usa.openbsd.org
+#installpath = ftp5.usa.openbsd.org
#installpath = mirrors.nycbug.org
-#installpath = openbsd.mirror.frontiernet.net
# PA, USA
#installpath = http://openbsd.mirrors.hoobly.com/%c/packages/%a/
diff -ur -x moduli 59/etc/examples/printcap 60/etc/examples/printcap
--- 59/etc/examples/printcap 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/examples/printcap 2016-07-26 20:42:05.000000000 +0200
@@ -1,7 +1,7 @@
-# $OpenBSD: printcap,v 1.1 2014/07/12 03:52:39 deraadt Exp $
+# $OpenBSD: printcap,v 1.2 2016/03/05 16:24:56 ajacoutot Exp $
#lp|local line printer:\
-# :lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
+# :lp=/dev/lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
#rp|remote line printer:\
-# :lp=:rm=printhost:rp=lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
+# :lp=:rm=printhost:rp=lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
diff -ur -x moduli 59/etc/examples/remote 60/etc/examples/remote
--- 59/etc/examples/remote 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/examples/remote 2016-07-26 20:42:05.000000000 +0200
@@ -1,4 +1,4 @@
-# $OpenBSD: remote,v 1.2 2015/04/27 19:12:27 nicm Exp $
+# $OpenBSD: remote,v 1.3 2016/03/09 16:28:46 deraadt Exp $
#
# Remote host descriptions -- see cu(1), cgetcap(3), tty(4), remote(5)
#
@@ -10,7 +10,7 @@
unixhost:\
:br#9600:
-cua00|For i386,macppc,vax:\
+cua00|For i386,macppc:\
:dv=/dev/cua00:tc=unixhost:
cuaa|For sparc:\
diff -ur -x moduli 59/etc/examples/sysctl.conf 60/etc/examples/sysctl.conf
--- 59/etc/examples/sysctl.conf 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/examples/sysctl.conf 2016-07-26 20:42:05.000000000 +0200
@@ -38,6 +38,3 @@
#machdep.apmhalt=1 # 1=powerdown hack, try if halt -p doesn't work
#machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt
#machdep.lidsuspend=0 # do not suspend laptop upon lid closing
-#machdep.userldt=1 # allow userland programs to play with ldt,
- # required by some ports
-#kern.emul.linux=1 # enable running Linux binaries
diff -ur -x moduli 59/etc/magic 60/etc/magic
--- 59/etc/magic 2016-02-26 09:15:45.000000000 +0100
+++ 60/etc/magic 2016-07-26 20:43:08.000000000 +0200
@@ -1871,7 +1871,7 @@
>7 string SPREADSHEETS Spreadsheet
>7 string MACRO Macro
>7 string BUILDER Builder Object
-# $OpenBSD: archive,v 1.6 2009/04/24 18:54:34 chl Exp $
+# $OpenBSD: archive,v 1.7 2016/03/06 01:33:12 sthen Exp $
#------------------------------------------------------------------------------
# archive: file(1) magic for archive formats (see also "msdos" for self-
@@ -1886,6 +1886,11 @@
257 string ustar\040\040\0 GNU tar archive
!:mime application/x-tar # encoding: gnu
+# Incremental snapshot gnu-tar format from:
+# http://www.gnu.org/software/tar/manual/html_node/Snapshot-Files.html
+0 string GNU\ tar- GNU tar incremental snapshot data
+>&0 regex [0-9]\.[0-9]+-[0-9]+ version %s
+
# cpio archives
#
# Yes, the top two "cpio archive" formats *are* supposed to just be "short".
@@ -1905,12 +1910,66 @@
0 string 070701 ASCII cpio archive (SVR4 with no CRC)
0 string 070702 ASCII cpio archive (SVR4 with CRC)
-# Debian package (needs to go before regular portable archives)
+#
+# Various archive formats used by various versions of the "ar"
+# command.
+#
+
+#
+# Original UNIX archive formats.
+# They were written with binary values in host byte order, and
+# the magic number was a host "int", which might have been 16 bits
+# or 32 bits. We don't say "PDP-11" or "VAX", as there might have
+# been ports to little-endian 16-bit-int or 32-bit-int platforms
+# (x86?) using some of those formats; if none existed, feel free
+# to use "PDP-11" for little-endian 16-bit and "VAX" for little-endian
+# 32-bit. There might have been big-endian ports of that sort as
+# well.
+#
+0 leshort 0177555 very old 16-bit-int little-endian archive
+0 beshort 0177555 very old 16-bit-int big-endian archive
+0 lelong 0177555 very old 32-bit-int little-endian archive
+0 belong 0177555 very old 32-bit-int big-endian archive
+
+0 leshort 0177545 old 16-bit-int little-endian archive
+>2 string __.SYMDEF random library
+0 beshort 0177545 old 16-bit-int big-endian archive
+>2 string __.SYMDEF random library
+0 lelong 0177545 old 32-bit-int little-endian archive
+>4 string __.SYMDEF random library
+0 belong 0177545 old 32-bit-int big-endian archive
+>4 string __.SYMDEF random library
+
+#
+# From "pdp" (but why a 4-byte quantity?)
+#
+0 lelong 0x39bed PDP-11 old archive
+0 lelong 0x39bee PDP-11 4.0 archive
+
+#
+# XXX - what flavor of APL used this, and was it a variant of
+# some ar archive format? It's similar to, but not the same
+# as, the APL workspace magic numbers in pdp.
+#
+0 long 0100554 apl workspace
+
+#
+# System V Release 1 portable(?) archive format.
+#
+0 string =<ar> System V Release 1 ar archive
+!:mime application/x-archive
+
+#
+# Debian package; it's in the portable archive format, and needs to go
+# before the entry for regular portable archives, as it's recognized as
+# a portable archive whose first member has a name beginning with
+# "debian".
#
0 string =!<arch>\ndebian
-!:mime application/x-debian-package
>8 string debian-split part of multipart Debian package
+!:mime application/vnd.debian.binary-package
>8 string debian-binary Debian binary package
+!:mime application/vnd.debian.binary-package
>8 string !debian
>68 string >\0 (format %s)
# These next two lines do not work, because a bzip2 Debian archive
@@ -1922,18 +1981,14 @@
#>84 string gz \b, uses gzip compression
#>136 ledate x created: %s
-# other archives
-0 long 0177555 very old archive
-0 short 0177555 very old PDP-11 archive
-0 long 0177545 old archive
-0 short 0177545 old PDP-11 archive
-0 long 0100554 apl workspace
-0 string =<ar> archive
-!:mime application/x-archive
-
-# MIPS archive (needs to go before regular portable archives)
+#
+# MIPS archive; they're in the portable archive format, and need to go
+# before the entry for regular portable archives, as it's recognized as
+# a portable archive whose first member has a name beginning with
+# "__________E".
#
0 string =!<arch>\n__________E MIPS archive
+!:mime application/x-archive
>20 string U with MIPS Ucode members
>21 string L with MIPSEL members
>21 string B with MIPSEB members
@@ -1944,56 +1999,20 @@
0 search/1 -h- Software Tools format archive text
#
-# XXX - why are there multiple <ar> thingies? Note that 0x213c6172 is
-# "!<ar", so, for new-style (4.xBSD/SVR2andup) archives, we have:
-#
-# 0 string =!<arch> current ar archive
-# 0 long 0x213c6172 archive file
-#
-# and for SVR1 archives, we have:
-#
-# 0 string \<ar> System V Release 1 ar archive
-# 0 string =<ar> archive
-#
-# XXX - did Aegis really store shared libraries, breakpointed modules,
-# and absolute code program modules in the same format as new-style
-# "ar" archives?
+# BSD/SVR2-and-later portable archive formats.
#
0 string =!<arch> current ar archive
!:mime application/x-archive
>8 string __.SYMDEF random library
->0 belong =65538 - pre SR9.5
->0 belong =65539 - post SR9.5
->0 beshort 2 - object archive
->0 beshort 3 - shared library module
->0 beshort 4 - debug break-pointed module
->0 beshort 5 - absolute code program module
-0 string \<ar> System V Release 1 ar archive
-0 string =<ar> archive
-#
-# XXX - from "vax", which appears to collect a bunch of byte-swapped
-# thingies, to help you recognize VAX files on big-endian machines;
-# with "leshort", "lelong", and "string", that's no longer necessary....
-#
-0 belong 0x65ff0000 VAX 3.0 archive
-0 belong 0x3c61723e VAX 5.0 archive
-#
-0 long 0x213c6172 archive file
-0 lelong 0177555 very old VAX archive
-0 leshort 0177555 very old PDP-11 archive
-#
-# XXX - "pdp" claims that 0177545 can have an __.SYMDEF member and thus
-# be a random library (it said 0xff65 rather than 0177545).
-#
-0 lelong 0177545 old VAX archive
->8 string __.SYMDEF random library
-0 leshort 0177545 old PDP-11 archive
->8 string __.SYMDEF random library
+>68 string __.SYMDEF\ SORTED random library
+
#
-# From "pdp" (but why a 4-byte quantity?)
+# "Thin" archive, as can be produced by GNU ar.
#
-0 lelong 0x39bed PDP-11 old archive
-0 lelong 0x39bee PDP-11 4.0 archive
+0 string =!<thin>\n thin archive with
+>68 belong 0 no symbol entries
+>68 belong 1 %d symbol entry
+>68 belong >1 %d symbol entries
# ARC archiver, from Daniel Quinlan (quinlan@yggdrasil.com)
#
@@ -2053,11 +2072,14 @@
# SAR
3 string LH5 SAR archive data
# BSArc/BS2
-0 string \212\3SB \0 BSArc/BS2 archive data
+0 string \212\3SB\020\0 BSArc/BS2 archive data
+# Bethesda Softworks Archive (Oblivion)
+0 string BSA\0 BSArc archive data
+>4 lelong x version %d
# MAR
2 string =-ah MAR archive data
# ACB
-0 belong&0x00f800ff 0x00800000 ACB archive data
+#0 belong&0x00f800ff 0x00800000 ACB archive data
# CPZ
# TODO, this is what idarc says: 0 string \0\0\0 CPZ archive data
# JRC
@@ -2078,7 +2100,7 @@
# AMGC
0 string \xad6" AMGC archive data
# NuLIB
-0 string NõFélå NuLIB archive data
+0 string N\xc3\xb5F\xc3\xa9lx\xc3\xa5 NuLIB archive data
# PakLeo
0 string LEOLZW PAKLeo archive data
# ChArc
@@ -2090,7 +2112,7 @@
# Freeze
0 string \x1f\x9f\x4a\x10\x0a Freeze archive data
# KBoom
-0 string ¨MP¨ KBoom archive data
+0 string \xc2\xa8MP\xc2\xa8 KBoom archive data
# NSQ, must go after CDC Codec
0 string \x76\xff NSQ archive data
# DPA
@@ -2118,17 +2140,17 @@
# MS Compress
4 string \x88\xf0\x27 MS Compress archive data
# updated by Joerg Jenderek
->9 string \0
->>0 string KWAJ
+>9 string \0
+>>0 string KWAJ
>>>7 string \321\003 MS Compress archive data
->>>>14 ulong >0 \b, original size: %ld bytes
->>>>18 ubyte >0x65
->>>>>18 string x \b, was %.8s
->>>>>(10.b-4) string x \b.%.3s
+>>>>14 ulong >0 \b, original size: %d bytes
+>>>>18 ubyte >0x65
+>>>>>18 string x \b, was %.8s
+>>>>>(10.b-4) string x \b.%.3s
# MP3 (archiver, not lossy audio compression)
0 string MP3\x1a MP3-Archiver archive data
# ZET
-0 string OZÝ ZET archive data
+0 string OZ\xc3\x9d ZET archive data
# TSComp
0 string \x65\x5d\x13\x8c\x08\x01\x03\x00 TSComp archive data
# ARQ
@@ -2149,7 +2171,7 @@
# Splint
0 string \x93\xb9\x06 Splint archive data
# InstallShield
-0 string \x13\x5d\x65\x8c InstallShield Z archive Data
+0 string \x13\x5d\x65\x8c InstallShield Z archive Data
# Gather
1 string GTH Gather archive data
# BOA
@@ -2159,7 +2181,7 @@
# Xtreme
0 string ULEB\0 Xtreme archive data
# Pack Magic
-0 string @â\1\0 Pack Magic archive data
+0 string @\xc3\xa2\1\0 Pack Magic archive data
# BTS
0 belong&0xfeffffff 0x1a034465 BTS archive data
# ELI 5750
@@ -2286,16 +2308,34 @@
# AIN
0 string \x33\x18 AIN archive data
0 string \x33\x17 AIN archive data
-# XPA32
-0 string xpa\0\1 XPA32 archive data
+# XPA32 test moved and merged with XPA by Joerg Jenderek at Sep 2015
# SZip (TODO: doesn't catch all versions)
0 string SZ\x0a\4 SZip archive data
# XPack DiskImage
-0 string jm XPack DiskImage archive data
+# *.XDI updated by Joerg Jenderek Sep 2015
+# ftp://ftp.sac.sk/pub/sac/pack/0index.txt
+# GRR: this test is still too general as it catches also text files starting with jm
+0 string jm
+# only found examples with this additional characteristic 2 bytes
+>2 string \x2\x4 Xpack DiskImage archive data
+#!:ext xdi
# XPack Data
-0 string xpa XPack archive data
+# *.xpa updated by Joerg Jenderek Sep 2015
+# ftp://ftp.elf.stuba.sk/pub/pc/pack/
+0 string xpa XPA
+!:ext xpa
+# XPA32
+# ftp://ftp.elf.stuba.sk/pub/pc/pack/xpa32.zip
+# created by XPA32.EXE version 1.0.2 for Windows
+>0 string xpa\0\1 \b32 archive data
+# created by XPACK.COM version 1.67m or 1.67r with short 0x1800
+>3 ubeshort !0x0001 \bck archive data
# XPack Single Data
-0 string Í\ jm XPack single archive data
+# changed by Joerg Jenderek Sep 2015 back to like in version 5.12
+# letter 'I'+ acute accent is equivalent to \xcd
+0 string \xcd\ jm Xpack single archive data
+#!:mime application/x-xpa-compressed
+!:ext xpa
# TODO: missing due to unknown magic/magic at end of file:
#DWC
@@ -2350,7 +2390,7 @@
# This is a really bad format. A file containing HAWAII will match this...
#0 string HA HA archive data,
#>2 leshort =1 1 file,
-#>2 leshort >1 %u files,
+#>2 leshort >1 %hu files,
#>4 byte&0x0f =0 first is type CPY
#>4 byte&0x0f =1 first is type ASC
#>4 byte&0x0f =2 first is type HSC
@@ -2408,7 +2448,7 @@
>20 byte x - header level %d
# taken from idarc [JW]
2 string -lZ PUT archive data
-2 string -lz LZS archive data
+2 string -lz LZS archive data
2 string -sw1- Swag archive data
# RAR archiver (Greg Roelofs, newt@uchicago.edu)
@@ -2435,76 +2475,145 @@
# [JW] see exe section for self-extracting version
0 string UC2\x1a UC2 archive data
-# ZIP archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
-0 string PK\003\004
->4 byte 0x00 Zip archive data
+# PKZIP multi-volume archive
+0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
!:mime application/zip
->4 byte 0x09 Zip archive data, at least v0.9 to extract
-!:mime application/zip
->4 byte 0x0a Zip archive data, at least v1.0 to extract
-!:mime application/zip
->4 byte 0x0b Zip archive data, at least v1.1 to extract
-!:mime application/zip
->0x161 string WINZIP Zip archive data, WinZIP self-extracting
+
+# Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
+0 string PK\005\006 Zip archive data (empty)
+0 string PK\003\004
+
+# Specialised zip formats which start with a member named 'mimetype'
+# (stored uncompressed, with no 'extra field') containing the file's MIME type.
+# Check for have 8-byte name, 0-byte extra field, name "mimetype", and
+# contents starting with "application/":
+>26 string \x8\0\0\0mimetypeapplication/
+
+# KOffice / OpenOffice & StarOffice / OpenDocument formats
+# From: Abel Cheung <abel@oaka.org>
+
+# KOffice (1.2 or above) formats
+# (mimetype contains "application/vnd.kde.<SUBTYPE>")
+>>50 string vnd.kde. KOffice (>=1.2)
+>>>58 string karbon Karbon document
+>>>58 string kchart KChart document
+>>>58 string kformula KFormula document
+>>>58 string kivio Kivio document
+>>>58 string kontour Kontour document
+>>>58 string kpresenter KPresenter document
+>>>58 string kspread KSpread document
+>>>58 string kword KWord document
+
+# OpenOffice formats (for OpenOffice 1.x / StarOffice 6/7)
+# (mimetype contains "application/vnd.sun.xml.<SUBTYPE>")
+>>50 string vnd.sun.xml. OpenOffice.org 1.x
+>>>62 string writer Writer
+>>>>68 byte !0x2e document
+>>>>68 string .template template
+>>>>68 string .global global document
+>>>62 string calc Calc
+>>>>66 byte !0x2e spreadsheet
+>>>>66 string .template template
+>>>62 string draw Draw
+>>>>66 byte !0x2e document
+>>>>66 string .template template
+>>>62 string impress Impress
+>>>>69 byte !0x2e presentation
+>>>>69 string .template template
+>>>62 string math Math document
+>>>62 string base Database file
+
+# OpenDocument formats (for OpenOffice 2.x / StarOffice >= 8)
+# http://lists.oasis-open.org/archives/office/200505/msg00006.html
+# (mimetype contains "application/vnd.oasis.opendocument.<SUBTYPE>")
+>>50 string vnd.oasis.opendocument. OpenDocument
+>>>73 string text
+>>>>77 byte !0x2d Text
+!:mime application/vnd.oasis.opendocument.text
+>>>>77 string -template Text Template
+!:mime application/vnd.oasis.opendocument.text-template
+>>>>77 string -web HTML Document Template
+!:mime application/vnd.oasis.opendocument.text-web
+>>>>77 string -master Master Document
+!:mime application/vnd.oasis.opendocument.text-master
+>>>73 string graphics
+>>>>81 byte !0x2d Drawing
+!:mime application/vnd.oasis.opendocument.graphics
+>>>>81 string -template Template
+!:mime application/vnd.oasis.opendocument.graphics-template
+>>>73 string presentation
+>>>>85 byte !0x2d Presentation
+!:mime application/vnd.oasis.opendocument.presentation
+>>>>85 string -template Template
+!:mime application/vnd.oasis.opendocument.presentation-template
+>>>73 string spreadsheet
+>>>>84 byte !0x2d Spreadsheet
+!:mime application/vnd.oasis.opendocument.spreadsheet
+>>>>84 string -template Template
+!:mime application/vnd.oasis.opendocument.spreadsheet-template
+>>>73 string chart
+>>>>78 byte !0x2d Chart
+!:mime application/vnd.oasis.opendocument.chart
+>>>>78 string -template Template
+!:mime application/vnd.oasis.opendocument.chart-template
+>>>73 string formula
+>>>>80 byte !0x2d Formula
+!:mime application/vnd.oasis.opendocument.formula
+>>>>80 string -template Template
+!:mime application/vnd.oasis.opendocument.formula-template
+>>>73 string database Database
+!:mime application/vnd.oasis.opendocument.database
+>>>73 string image
+>>>>78 byte !0x2d Image
+!:mime application/vnd.oasis.opendocument.image
+>>>>78 string -template Template
+!:mime application/vnd.oasis.opendocument.image-template
+
+# EPUB (OEBPS) books using OCF (OEBPS Container Format)
+# http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
+# From: Ralf Brown <ralf.brown@gmail.com>
+>>50 string epub+zip EPUB document
+!:mime application/epub+zip
+
+# Catch other ZIP-with-mimetype formats
+# In a ZIP file, the bytes immediately after a member's contents are
+# always "PK". The 2 regex rules here print the "mimetype" member's
+# contents up to the first 'P'. Luckily, most MIME types don't contain
+# any capital 'P's. This is a kludge.
+# (mimetype contains "application/<OTHER>")
+>>50 string !epub+zip
+>>>50 string !vnd.oasis.opendocument.
+>>>>50 string !vnd.sun.xml.
+>>>>>50 string !vnd.kde.
+>>>>>>38 regex [!-OQ-~]+ Zip data (MIME type "%s"?)
!:mime application/zip
->4 byte 0x14
->>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract
+# (mimetype contents other than "application/*")
+>26 string \x8\0\0\0mimetype
+>>38 string !application/
+>>>38 regex [!-OQ-~]+ Zip data (MIME type "%s"?)
!:mime application/zip
-# OpenOffice.org / KOffice / StarOffice documents
-# From: Abel Cheung <abel@oaka.org>
-# Listed here because they are basically zip files
->>30 string mimetype
-
-# KOffice (1.2 or above) formats
->>>50 string vnd.kde. KOffice (>=1.2)
->>>>58 string karbon Karbon document
->>>>58 string kchart KChart document
->>>>58 string kformula KFormula document
->>>>58 string kivio Kivio document
->>>>58 string kontour Kontour document
->>>>58 string kpresenter KPresenter document
->>>>58 string kspread KSpread document
->>>>58 string kword KWord document
-
-# OpenOffice formats (for OpenOffice 1.x / StarOffice 6/7)
->>>50 string vnd.sun.xml. OpenOffice.org 1.x
->>>>62 string writer Writer
->>>>>68 byte !0x2e document
->>>>>68 string .template template
->>>>>68 string .global global document
->>>>62 string calc Calc
->>>>>66 byte !0x2e spreadsheet
->>>>>66 string .template template
->>>>62 string draw Draw
->>>>>66 byte !0x2e document
->>>>>66 string .template template
->>>>62 string impress Impress
->>>>>69 byte !0x2e presentation
->>>>>69 string .template template
->>>>62 string math Math document
-
-# OpenDocument formats (for OpenOffice 2.x / StarOffice >= 8)
-# http://lists.oasis-open.org/archives/office/200505/msg00006.html
->>>50 string vnd.oasis.opendocument. OpenDocument
->>>>73 string text
->>>>>77 byte !0x2d Text
-!:mime application/vnd.oasis.opendocument.text
->>>>>77 string -template Text Template
->>>>>77 string -web HTML Document Template
->>>>>77 string -master Master Document
->>>>73 string graphics Drawing
->>>>>81 string -template Template
->>>>73 string presentation Presentation
->>>>>85 string -template Template
->>>>73 string spreadsheet Spreadsheet
->>>>>84 string -template Template
->>>>73 string chart Chart
->>>>>78 string -template Template
->>>>73 string formula Formula
->>>>>80 string -template Template
->>>>73 string database Database
->>>>73 string image Image
+# Java Jar files
+>(26.s+30) leshort 0xcafe Java archive data (JAR)
+!:mime application/java-archive
+
+# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
+# Next line excludes specialized formats:
+>(26.s+30) leshort !0xcafe
+>>26 string !\x8\0\0\0mimetype Zip archive data
+!:mime application/zip
+>>>4 byte 0x09 \b, at least v0.9 to extract
+>>>4 byte 0x0a \b, at least v1.0 to extract
+>>>4 byte 0x0b \b, at least v1.1 to extract
+>>>4 byte 0x14 \b, at least v2.0 to extract
+>>>4 byte 0x2d \b, at least v4.5 to extract
+>>>0x161 string WINZIP \b, WinZIP self-extracting
+
+# StarView Metafile
+# From Pierre Ducroquet <pinaraf@pinaraf.info>
+0 string VCLMTF StarView MetaFile
+>6 beshort x \b, version %d
+>8 belong x \b, size %d
# Zoo archiver
20 lelong 0xfdc4a7dc Zoo archive data
@@ -2523,7 +2632,7 @@
!:mime application/octet-stream
#
-# LBR. NB: May conflict with the questionable
+# LBR. NB: May conflict with the questionable
# "binary Computer Graphics Metafile" format.
#
0 string \0\ \ \ \ \ \ \ \ \ \ \ \0\0 LBR archive data
@@ -2539,10 +2648,10 @@
# From Rafael Laboissiere <rafael@laboissiere.net>
# The Project Revision Control System (see
# http://prcs.sourceforge.net) generates a packaged project
-# file which is recognized by the following entry:
+# file which is recognized by the following entry:
0 leshort 0xeb81 PRCS packaged project
-# Microsoft cabinets
+# Microsoft cabinets
# by David Necas (Yeti) <yeti@physics.muni.cz>
#0 string MSCF\0\0\0\0 Microsoft cabinet file data,
#>25 byte x v%d
@@ -2550,7 +2659,7 @@
# MPi: All CABs have version 1.3, so this is pointless.
# Better magic in debian-additions.
-# GTKtalog catalogs
+# GTKtalog catalogs
# by David Necas (Yeti) <yeti@physics.muni.cz>
4 string gtktalog\ GTKtalog catalog data,
>13 string 3 version 3
@@ -2569,12 +2678,12 @@
!:mime application/x-bittorrent
# Atari MSA archive - Teemu Hukkanen <tjhukkan@iki.fi>
-0 beshort 0x0e0f Atari MSA archive data
->2 beshort x \b, %d sectors per track
->4 beshort 0 \b, 1 sided
->4 beshort 1 \b, 2 sided
->6 beshort x \b, starting track: %d
->8 beshort x \b, ending track: %d
+0 beshort 0x0e0f Atari MSA archive data
+>2 beshort x \b, %d sectors per track
+>4 beshort 0 \b, 1 sided
+>4 beshort 1 \b, 2 sided
+>6 beshort x \b, starting track: %d
+>8 beshort x \b, ending track: %d
# Alternate ZIP string (amc@arwen.cs.berkeley.edu)
0 string PK00PK\003\004 Zip archive data
@@ -2619,7 +2728,7 @@
# DR-DOS 7.03 Packed File *.??_
0 string Packed\ File\ Personal NetWare Packed File
->12 string x \b, was "%.12s"
+>12 string x \b, was "%.12s"
# EET archive
# From: Tilman Sauerbeck <tilman@code-monkey.de>
@@ -2651,16 +2760,13 @@
0 lelong 0x10201A7A Symbian installation file (Symbian OS 9.x)
!:mime x-epoc/x-sisx-app
-# Pack200 Java archives, http://jcp.org/en/jsr/detail?id=200
-0 belong 0xcafed00d Pack200 Java archive
-
# From "Nelson A. de Oliveira" <naoliv@gmail.com>
0 string MPQ\032 MoPaQ (MPQ) archive
# From: Dirk Jagdmann <doj@cubic.org>
# xar archive format: http://code.google.com/p/xar/
0 string xar! xar archive
->6 beshort x - version %ld
+>6 beshort x - version %d
# From: "Nelson A. de Oliveira" <naoliv@gmail.com>
# .kgb
@@ -2678,6 +2784,72 @@
>24 belong 1 SHA-1 checksum
>24 belong 2 MD5 checksum
+# Type: Parity Archive
+# From: Daniel van Eeden <daniel_e@dds.nl>
+0 string PAR2 Parity Archive Volume Set
+
+# Bacula volume format. (Volumes always start with a block header.)
+# URL: http://bacula.org/3.0.x-manuals/en/developers/developers/Block_Header.html
+# From: Adam Buchbinder <adam.buchbinder@gmail.com>
+12 string BB02 Bacula volume
+>20 bedate x \b, started %s
+
+# ePub is XHTML + XML inside a ZIP archive. The first member of the
+# archive must be an uncompressed file called 'mimetype' with contents
+# 'application/epub+zip'
+
+
+# From: "Michael Gorny" <mgorny@gentoo.org>
+# ZPAQ: http://mattmahoney.net/dc/zpaq.html
+0 string zPQ ZPAQ stream
+>3 byte x \b, level %d
+# From: Barry Carter <carter.barry@gmail.com>
+# http://encode.ru/threads/456-zpaq-updates/page32
+0 string 7kSt ZPAQ file
+
+# BBeB ebook, unencrypted (LRF format)
+# URL: http://www.sven.de/librie/Librie/LrfFormat
+# From: Adam Buchbinder <adam.buchbinder@gmail.com>
+0 string L\0R\0F\0\0\0 BBeB ebook data, unencrypted
+>8 beshort x \b, version %d
+>36 byte 1 \b, front-to-back
+>36 byte 16 \b, back-to-front
+>42 beshort x \b, (%dx,
+>44 beshort x %d)
+
+# Symantec GHOST image by Joerg Jenderek at May 2014
+# http://us.norton.com/ghost/
+# http://www.garykessler.net/library/file_sigs.html
+0 ubelong&0xFFFFf7f0 0xFEEF0100 Norton GHost image
+# *.GHO
+>2 ubyte&0x08 0x00 \b, first file
+# *.GHS or *.[0-9] with cns program option
+>2 ubyte&0x08 0x08 \b, split file
+# part of split index interesting for *.ghs
+>>4 ubyte x id=0x%x
+# compression tag minus one equals numeric compression command line switch z[1-9]
+>3 ubyte 0 \b, no compression
+>3 ubyte 2 \b, fast compression (Z1)
+>3 ubyte 3 \b, medium compression (Z2)
+>3 ubyte >3
+>>3 ubyte <11 \b, compression (Z%d-1)
+>2 ubyte&0x08 0x00
+# ~ 30 byte password field only for *.gho
+>>12 ubequad !0 \b, password protected
+>>44 ubyte !1
+# 1~Image All, sector-by-sector only for *.gho
+>>>10 ubyte 1 \b, sector copy
+# 1~Image Boot track only for *.gho
+>>>43 ubyte 1 \b, boot track
+# 1~Image Disc only for *.gho implies Image Boot track and sector copy
+>>44 ubyte 1 \b, disc sector copy
+# optional image description only *.gho
+>>0xff string >\0 "%-.254s"
+# look for DOS sector end sequence
+>0xE08 search/7776 \x55\xAA
+# XXX indirect not supported yet
+#>>&-512 indirect x \b; contains
+
# $OpenBSD: asterix,v 1.2 2004/06/03 03:14:19 tedu Exp $
#------------------------------------------------------------------------------
@@ -13208,7 +13380,7 @@
#>>16 belong x , table: %ld
#>>20 belong x , memory: %ld
-# $OpenBSD: sniffer,v 1.5 2008/05/08 01:40:57 chl Exp $
+# $OpenBSD: sniffer,v 1.6 2016/04/28 12:26:40 sthen Exp $
#------------------------------------------------------------------------------
# sniffer: file(1) magic for packet capture files
@@ -13227,6 +13399,7 @@
>6 leshort 2 (Token Ring)
>6 leshort 3 (FDDI)
>6 leshort 4 (ATM)
+>6 leshort >4 (type %d)
#
# Microsoft Network Monitor 2.x capture files.
@@ -13239,11 +13412,18 @@
>6 leshort 2 (Token Ring)
>6 leshort 3 (FDDI)
>6 leshort 4 (ATM)
+>6 leshort 5 (IP-over-IEEE 1394)
+>6 leshort 6 (802.11)
+>6 leshort 7 (Raw IP)
+>6 leshort 8 (Raw IP)
+>6 leshort 9 (Raw IP)
+>6 leshort >9 (type %d)
#
# Network General Sniffer capture files.
# Sorry, make that "Network Associates Sniffer capture files."
# Sorry, make that "Network General old DOS Sniffer capture files."
+# Sorry, make that "NetScout Sniffer capture files."
#
0 string TRSNIFF\ data\ \ \ \ \032 Sniffer capture file
>33 byte 2 (compressed)
@@ -13325,8 +13505,10 @@
>20 belong 127 (802.11 with radiotap header
>20 belong 129 (Linux ARCNET
>20 belong 138 (Apple IP over IEEE 1394
+>20 belong 139 (MTP2 with pseudo-header
>20 belong 140 (MTP2
>20 belong 141 (MTP3
+>20 belong 142 (SCCP
>20 belong 143 (DOCSIS
>20 belong 144 (IrDA
>20 belong 147 (Private use 0
@@ -13346,6 +13528,45 @@
>20 belong 161 (Private use 14
>20 belong 162 (Private use 15
>20 belong 163 (802.11 with AVS header
+>20 belong 165 (BACnet MS/TP
+>20 belong 166 (PPPD
+>20 belong 169 (GPRS LLC
+>20 belong 177 (Linux LAPD
+>20 belong 187 (Bluetooth HCI H4
+>20 belong 189 (Linux USB
+>20 belong 192 (PPI
+>20 belong 195 (802.15.4
+>20 belong 196 (SITA
+>20 belong 197 (Endace ERF
+>20 belong 201 (Bluetooth HCI H4 with pseudo-header
+>20 belong 202 (AX.25 with KISS header
+>20 belong 203 (LAPD
+>20 belong 204 (PPP with direction pseudo-header
+>20 belong 205 (Cisco HDLC with direction pseudo-header
+>20 belong 206 (Frame Relay with direction pseudo-header
+>20 belong 209 (Linux IPMB
+>20 belong 215 (802.15.4 with non-ASK PHY header
+>20 belong 220 (Memory-mapped Linux USB
+>20 belong 224 (Fibre Channel FC-2
+>20 belong 225 (Fibre Channel FC-2 with frame delimiters
+>20 belong 226 (Solaris IPNET
+>20 belong 227 (SocketCAN
+>20 belong 228 (Raw IPv4
+>20 belong 229 (Raw IPv6
+>20 belong 230 (802.15.4 without FCS
+>20 belong 231 (D-Bus messages
+>20 belong 235 (DVB-CI
+>20 belong 236 (MUX27010
+>20 belong 237 (STANAG 5066 D_PDUs
+>20 belong 239 (Linux netlink NFLOG messages
+>20 belong 240 (Hilscher netAnalyzer
+>20 belong 241 (Hilscher netAnalyzer with delimiters
+>20 belong 242 (IP-over-Infiniband
+>20 belong 243 (MPEG-2 Transport Stream packets
+>20 belong 244 (ng4t ng40
+>20 belong 245 (NFC LLCP
+>20 belong 247 (Infiniband
+>20 belong 248 (SCTP
>16 belong x \b, capture length %d)
0 ulelong 0xa1b2c3d4 tcpdump capture file (little-endian)
>4 leshort x - version %d
@@ -13389,8 +13610,10 @@
>20 lelong 127 (802.11 with radiotap header
>20 lelong 129 (Linux ARCNET
>20 lelong 138 (Apple IP over IEEE 1394
+>20 lelong 139 (MTP2 with pseudo-header
>20 lelong 140 (MTP2
>20 lelong 141 (MTP3
+>20 lelong 142 (SCCP
>20 lelong 143 (DOCSIS
>20 lelong 144 (IrDA
>20 lelong 147 (Private use 0
@@ -13410,6 +13633,45 @@
>20 lelong 161 (Private use 14
>20 lelong 162 (Private use 15
>20 lelong 163 (802.11 with AVS header
+>20 lelong 165 (BACnet MS/TP
+>20 lelong 166 (PPPD
+>20 lelong 169 (GPRS LLC
+>20 lelong 177 (Linux LAPD
+>20 lelong 187 (Bluetooth HCI H4
+>20 lelong 189 (Linux USB
+>20 lelong 192 (PPI
+>20 lelong 195 (802.15.4
+>20 lelong 196 (SITA
+>20 lelong 197 (Endace ERF
+>20 lelong 201 (Bluetooth HCI H4 with pseudo-header
+>20 lelong 202 (AX.25 with KISS header
+>20 lelong 203 (LAPD
+>20 lelong 204 (PPP with direction pseudo-header
+>20 lelong 205 (Cisco HDLC with direction pseudo-header
+>20 lelong 206 (Frame Relay with direction pseudo-header
+>20 lelong 209 (Linux IPMB
+>20 lelong 215 (802.15.4 with non-ASK PHY header
+>20 lelong 220 (Memory-mapped Linux USB
+>20 lelong 224 (Fibre Channel FC-2
+>20 lelong 225 (Fibre Channel FC-2 with frame delimiters
+>20 lelong 226 (Solaris IPNET
+>20 lelong 227 (SocketCAN
+>20 lelong 228 (Raw IPv4
+>20 lelong 229 (Raw IPv6
+>20 lelong 230 (802.15.4 without FCS
+>20 lelong 231 (D-Bus messages
+>20 lelong 235 (DVB-CI
+>20 lelong 236 (MUX27010
+>20 lelong 237 (STANAG 5066 D_PDUs
+>20 lelong 239 (Linux netlink NFLOG messages
+>20 lelong 240 (Hilscher netAnalyzer
+>20 lelong 241 (Hilscher netAnalyzer with delimiters
+>20 lelong 242 (IP-over-Infiniband
+>20 lelong 243 (MPEG-2 Transport Stream packets
+>20 lelong 244 (ng4t ng40
+>20 lelong 245 (NFC LLCP
+>20 lelong 247 (Infiniband
+>20 lelong 248 (SCTP
>16 lelong x \b, capture length %d)
#
@@ -13458,6 +13720,21 @@
>16 lelong x \b, capture length %d)
#
+# "pcap-ng" capture files.
+# http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html
+# Pcap-ng files can contain multiple sections. Printing the endianness,
+# snaplen, or other information from the first SHB may be misleading.
+#
+0 ubelong 0x0a0d0d0a
+>8 ubelong 0x1a2b3c4d pcap-ng capture file
+>>12 beshort x - version %d
+>>14 beshort x \b.%d
+0 ulelong 0x0a0d0d0a
+>8 ulelong 0x1a2b3c4d pcap-ng capture file
+>>12 leshort x - version %d
+>>14 leshort x \b.%d
+
+#
# AIX "iptrace" capture files.
#
0 string iptrace\ 1.0 "iptrace" capture file
@@ -13488,9 +13765,9 @@
>8 lelong x \b, %d stations found
#
-# EtherPeek/AiroPeek "version 9" capture files.
+# *Peek "version 9" capture files.
#
-0 string \177ver EtherPeek/AiroPeek capture file
+0 string \177ver EtherPeek/AiroPeek/OmniPeek capture file
#
# Visual Networks traffic capture files.
diff -ur -x moduli 59/etc/mtree/4.4BSD.dist 60/etc/mtree/4.4BSD.dist
--- 59/etc/mtree/4.4BSD.dist 2016-02-26 09:14:30.000000000 +0100
+++ 60/etc/mtree/4.4BSD.dist 2016-07-26 20:42:07.000000000 +0200
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.278 2016/01/06 23:28:47 deraadt Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.282 2016/05/11 21:52:48 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
@@ -111,9 +111,6 @@
..
..
- # ./etc/systrace
- systrace
- ..
..
# ./home
@@ -483,8 +480,6 @@
..
sgi
..
- vax
- ..
..
# ./usr/share/man/man3p
@@ -523,8 +518,6 @@
..
sparc64
..
- vax
- ..
zaurus
..
..
@@ -537,8 +530,6 @@
..
hppa
..
- hppa64
- ..
i386
..
landisk
@@ -569,8 +560,6 @@
..
hppa
..
- hppa64
- ..
i386
..
landisk
@@ -591,8 +580,6 @@
..
sparc64
..
- vax
- ..
zaurus
..
..
@@ -757,7 +744,9 @@
# ./var/spool/lock
lock uname=uucp gname=dialer mode=1775
..
- output gname=daemon mode=0775
+ output
+ lpd gname=daemon mode=0775
+ ..
..
# ./var/spool/smtpd
smtpd type=dir uname=root gname=wheel mode=0711
diff -ur -x moduli 59/etc/mtree/BSD.x11.dist 60/etc/mtree/BSD.x11.dist
--- 59/etc/mtree/BSD.x11.dist 2016-02-26 09:14:30.000000000 +0100
+++ 60/etc/mtree/BSD.x11.dist 2016-07-26 20:42:07.000000000 +0200
@@ -1,4 +1,4 @@
-# $OpenBSD: BSD.x11.dist,v 1.41 2015/10/19 07:55:31 dcoppa Exp $
+# $OpenBSD: BSD.x11.dist,v 1.42 2016/03/20 09:33:56 jsg Exp $
/set type=dir uname=root gname=wheel mode=0755
.
@@ -79,8 +79,12 @@
..
..
..
- libdrm
- ..
+ libdrm
+ nouveau
+ nvif
+ ..
+ ..
+ ..
pixman-1
..
xcb
diff -ur -x moduli 59/etc/mtree/special 60/etc/mtree/special
--- 59/etc/mtree/special 2016-02-26 09:14:30.000000000 +0100
+++ 60/etc/mtree/special 2016-07-26 20:42:07.000000000 +0200
@@ -1,4 +1,4 @@
-# $OpenBSD: special,v 1.116 2015/12/05 09:12:15 tedu Exp $
+# $OpenBSD: special,v 1.119 2016/04/25 20:38:11 tedu Exp $
#
# Hand-crafted mtree specification for the dangerous files.
#
@@ -73,7 +73,7 @@
ospf6d.conf type=file mode=0600 uname=root gname=wheel optional
passwd type=file mode=0644 uname=root gname=wheel
pf.conf type=file mode=0600 uname=root gname=wheel optional
-printcap type=file mode=0644 uname=root gname=wheel optional
+printcap mode=0644 uname=root gname=wheel optional
radiusd.conf type=file mode=0600 uname=root gname=wheel optional
rc type=file mode=0644 uname=root gname=wheel
rc.conf type=file mode=0644 uname=root gname=wheel
@@ -108,8 +108,6 @@
ssh_host_rsa_key.pub type=file mode=0644 uname=root gname=wheel optional
sshd_config type=file mode=0644 uname=root gname=wheel
.. #ssh
-systrace type=dir mode=0755 uname=root gname=wheel optional
-.. #systrace
syslog.conf type=file mode=0644 uname=root gname=wheel
ttys type=file mode=0644 uname=root gname=wheel
weekly type=file mode=0644 uname=root gname=wheel
@@ -208,7 +206,7 @@
pub type=dir mode=0555 uname=root gname=wheel optional ignore
.. #var/spool/ftp/pub
.. #var/spool/ftp
-output type=dir mode=0775 uname=root gname=daemon ignore
+output type=dir mode=0755 uname=root gname=wheel ignore
.. #var/spool/output
uucp type=dir mode=0755 uname=uucp gname=daemon ignore
.. #var/spool/uucp
diff -ur -x moduli 59/etc/netstart 60/etc/netstart
--- 59/etc/netstart 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/netstart 2016-07-26 20:42:05.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.167 2015/12/29 19:37:31 rpe Exp $
+# $OpenBSD: netstart,v 1.169 2016/07/19 08:03:01 mpi Exp $
# Turn off Strict Bourne shell mode.
set +o sh
@@ -245,7 +245,7 @@
# Configure all the non-loopback interfaces which we know about, but
# do not start interfaces which must be delayed. Refer to hostname.if(5)
-ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun tap bridge pflow"
+ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun bridge pflow"
# The trunk interfaces need to come up first in this list.
# The (s)vlan interfaces need to come up after trunk.
@@ -268,15 +268,16 @@
done
# Multicast routing.
-route -qn delete 224.0.0.0/4 >/dev/null 2>&1
-[[ $multicast != YES ]] &&
+if [[ $multicast != YES ]]; then
+ route -qn delete 224.0.0.0/4 >/dev/null 2>&1
route -qn add -net 224.0.0.0/4 -interface 127.0.0.1 -reject >/dev/null
+fi
# Configure PPPoE, GIF, GRE, TUN and PFLOW interfaces, delayed because they
# require routes to be set. TUN might depend on PPPoE, and GIF or GRE may
# depend on either of them. PFLOW might bind to ip addresses configured
# on either of them.
-ifmstart "pppoe tun tap gif gre bridge pflow"
+ifmstart "pppoe tun gif gre bridge pflow"
# Reject 127/8 other than 127.0.0.1.
route -qn add -net 127 127.0.0.1 -reject >/dev/null
diff -ur -x moduli 59/etc/rc 60/etc/rc
--- 59/etc/rc 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/rc 2016-07-26 20:42:05.000000000 +0200
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.474 2015/12/29 19:41:24 rpe Exp $
+# $OpenBSD: rc,v 1.486 2016/07/10 09:08:18 rpe Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -158,6 +158,77 @@
ssh-keygen -A
}
+# Re-link libraries, placing the objects in a random order.
+reorder_libs() {
+ local _l _liba _libas _tmpdir _remount=false _error=false
+ local _dkdev=$(df /usr/lib | sed '1d;s/ .*//')
+ local _mp=$(mount | grep "^$_dkdev")
+
+ # Skip if /usr/lib is on a nfs mounted filesystem.
+ [[ $_mp == *' type nfs '* ]] && return
+
+ echo -n 'reordering libraries:'
+
+ # Only choose the latest version of the libraries.
+ for _liba in /usr/lib/libc.so.*.a; do
+ _liba=$(ls ${_liba%%.[0-9]*}*.a | sort -V | tail -1)
+ for _l in $_libas; do
+ [[ $_l == $_liba ]] && continue 2
+ done
+ _libas="$_libas $_liba"
+ done
+
+ # Remount read-write, if /usr/lib is on a read-only ffs filesystem.
+ if [[ $_mp == *' type ffs '*'read-only'* ]]; then
+ if mount -u -w $_dkdev; then
+ _remount=true
+ else
+ echo ' failed.'
+ return
+ fi
+ fi
+
+ for _liba in $_libas; do
+ _tmpdir=$(mktemp -dq /tmp/_librebuild.XXXXXXXXXXXX) && (
+ set -o errexit
+ _lib=${_liba#/usr/lib/}
+ _lib=${_lib%.a}
+ cd $_tmpdir
+ ar x ${_liba}
+ cc -shared -o $_lib $(ls *.so | sort -R) $(cat .ldadd)
+ [[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'
+ LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 0}'
+ install -F -S -o root -g bin -m 0444 $_lib /usr/lib/$_lib
+ ) || { _error=true; break; }
+ done
+
+ rm -rf /tmp/_librebuild.*
+
+ # Restore previous mount state if it was changed.
+ if $_remount; then
+ mount -u -r $_dkdev || _error=true
+ fi
+
+ if $_error; then
+ echo ' failed.'
+ else
+ echo ' done.'
+ fi
+}
+
+# Run rc.* script and email output to root.
+# Usage: run_upgrade_script firsttime|sysmerge
+run_upgrade_script() {
+ local _suffix=$1
+ [[ -n $_suffix ]] || return 1
+ if [[ -f /etc/rc.$_suffix ]]; then
+ mv /etc/rc.$_suffix /etc/rc.$_suffix.run
+ . /etc/rc.$_suffix.run 2>&1 | tee /dev/tty |
+ mail -Es "$(hostname) rc.$_suffix output" root >/dev/null
+ fi
+ rm -f /etc/rc.$_suffix.run
+}
+
# Check filesystems, optionally by using a fsck(8) flag.
# Usage: do_fsck [-flag]
do_fsck() {
@@ -244,7 +315,7 @@
exit 0
fi
-# Add swap block-devices.
+# Add swap block-devices.
swapctl -A -t blk
if [[ -e /fastboot ]]; then
@@ -338,6 +409,8 @@
random_seed
+reorder_libs
+
# Clean up left-over files.
rm -f /etc/nologin /var/spool/lock/LCK.* /var/spool/uucp/STST/*
(cd /var/run && { rm -rf -- *; install -c -m 664 -g utmp /dev/null utmp; })
@@ -445,6 +518,9 @@
echo 'preserving editor files.'; /usr/libexec/vi.recover
+# If rc.sysmerge exists, run it just once, and make sure it is deleted.
+run_upgrade_script sysmerge
+
echo -n 'starting network daemons:'
start_daemon ldomd vmd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd
@@ -461,12 +537,7 @@
echo '.'
# If rc.firsttime exists, run it just once, and make sure it is deleted.
-if [[ -f /etc/rc.firsttime ]]; then
- mv /etc/rc.firsttime /etc/rc.firsttime.run
- . /etc/rc.firsttime.run 2>&1 | tee /dev/tty |
- mail -Es "$(hostname) rc.firsttime output" root >/dev/null
-fi
-rm -f /etc/rc.firsttime.run
+run_upgrade_script firsttime
# Run rc.d(8) scripts from packages.
if [[ -n $pkg_scripts ]]; then
diff -ur -x moduli 59/etc/rc.d/rc.subr 60/etc/rc.d/rc.subr
--- 59/etc/rc.d/rc.subr 2016-02-26 09:14:28.000000000 +0100
+++ 60/etc/rc.d/rc.subr 2016-07-26 20:42:06.000000000 +0200
@@ -1,6 +1,6 @@
-# $OpenBSD: rc.subr,v 1.105 2015/12/21 10:18:05 ajacoutot Exp $
+# $OpenBSD: rc.subr,v 1.114 2016/05/03 08:59:29 otto Exp $
#
-# Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
+# Copyright (c) 2010, 2011, 2014-2016 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
# Copyright (c) 2010, 2011, 2014 Robert Nagy <robert@openbsd.org>
#
@@ -25,10 +25,11 @@
}
_rc_not_supported() {
- local _a _enotsup
+ local _a _enotsup _what=${1}
for _a in ${_rc_actions}; do
- if [ "${1}" == "${_a}" ]; then
- eval _enotsup=\${rc_$1}
+ [ "${_what}" == "restart" ] && _what="stop"
+ if [ "${_what}" == "${_a}" ]; then
+ eval _enotsup=\${rc_${_what}}
break
fi
done
@@ -45,13 +46,14 @@
_rc_write_runfile() {
[ -d ${_RC_RUNDIR} ] || mkdir -p ${_RC_RUNDIR} && \
- print -rn -- "${pexp}" > ${_RC_RUNFILE}
-}
-
-_rc_read_runfile() {
- local _new_pexp
- [ -f ${_RC_RUNFILE} ] && _new_pexp=$(< ${_RC_RUNFILE})
- [ -n "${_new_pexp}" ] && pexp="${_new_pexp}"
+ cat >${_RC_RUNFILE} <<EOF
+daemon_class=${daemon_class}
+daemon_flags=${daemon_flags}
+daemon_rtable=${daemon_rtable}
+daemon_timeout=${daemon_timeout}
+daemon_user=${daemon_user}
+pexp=${pexp}
+EOF
}
_rc_rm_runfile() {
@@ -120,9 +122,8 @@
typeset -l _key
local _l _rcfile _val
set -A _allowed_keys -- \
- spamd_black pf ipsec check_quotas accounting \
- multicast amd_master \
- shlib_dirs pkg_scripts nfs_server
+ accounting amd_master check_quotas ipsec multicast nfs_server \
+ pexp pf pkg_scripts shlib_dirs spamd_black
[ $# -gt 0 ] || set -- /etc/rc.conf /etc/rc.conf.local
for _rcfile; do
@@ -130,7 +131,7 @@
while IFS=' ' read -r _l; do
[[ $_l == [!#=]*=* ]] || continue
_key=${_l%%*([[:blank:]])=*}
- [[ $_key == *_@(flags|user|timeout) ]] || \
+ [[ $_key == *_@(flags|rtable|user|timeout) ]] || \
[[ " ${_allowed_keys[*]} " == *" $_key "* ]] || \
continue
[[ $_key == "" ]] && continue
@@ -154,28 +155,26 @@
}
rc_check() {
- pgrep -q -xf "${pexp}"
+ pgrep -T "${daemon_rtable}" -q -xf "${pexp}"
}
rc_reload() {
- pkill -HUP -xf "${pexp}"
+ pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
}
rc_stop() {
- pkill -xf "${pexp}"
+ pkill -T "${daemon_rtable}" -xf "${pexp}"
}
rc_cmd() {
local _bg _n
+ [ -n "${1}" ] && echo "${_rc_actions}" | grep -qw -- ${1} || _rc_usage
+
[ "$(id -u)" -eq 0 ] || \
[ X"${rc_usercheck}" != X"NO" -a X"$1" = "Xcheck" ] || \
_rc_err "$0: need root privileges"
- if _rc_not_supported start || _rc_not_supported stop; then
- rc_restart=NO
- fi
-
if _rc_not_supported $1; then
[ -n "${INRC}" ] && exit 1
_rc_err "$0: $1 is not supported"
@@ -184,7 +183,7 @@
[ X"${rc_bg}" = X"YES" ] && _bg="&"
[ -n "${_RC_DEBUG}" ] || _n="-n"
- _rc_do _rc_read_runfile
+ _rc_do _rc_parse_conf ${_RC_RUNFILE}
case "$1" in
check)
@@ -230,7 +229,7 @@
_rc_exit ok
;;
restart)
- $0 ${_RC_DEBUG} ${_RC_FORCE} stop &&
+ $0 ${_RC_DEBUG} ${_RC_FORCE} stop && \
$0 ${_RC_DEBUG} ${_RC_FORCE} start
;;
*)
@@ -259,12 +258,14 @@
_rc_do _rc_parse_conf
eval _rcflags=\${${_name}_flags}
+eval _rcrtable=\${${_name}_rtable}
eval _rcuser=\${${_name}_user}
eval _rctimeout=\${${_name}_timeout}
# set default values; duplicated in rcctl(8)
getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \
daemon_class=${_name} || daemon_class=daemon
+[ -z "${daemon_rtable}" ] && daemon_rtable=0
[ -z "${daemon_user}" ] && daemon_user=root
[ -z "${daemon_timeout}" ] && daemon_timeout=30
@@ -273,6 +274,7 @@
unset _rcflags
[ -n "${_rcflags}" ] && daemon_flags=${_rcflags}
+[ -n "${_rcrtable}" ] && daemon_rtable=${_rcrtable}
[ -n "${_rcuser}" ] && daemon_user=${_rcuser}
[ -n "${_rctimeout}" ] && daemon_timeout=${_rctimeout}
@@ -283,6 +285,8 @@
fi
readonly daemon_class
-unset _rcflags _rcuser _rctimeout
+unset _rcflags _rcrtable _rcuser _rctimeout
pexp="${daemon}${daemon_flags:+ ${daemon_flags}}"
rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c"
+[ "${daemon_rtable}" -eq 0 ] || \
+ rcexec="route -T ${daemon_rtable} exec ${rcexec}"
diff -ur -x moduli 59/etc/rc.d/sndiod 60/etc/rc.d/sndiod
--- 59/etc/rc.d/sndiod 2016-02-26 09:14:29.000000000 +0100
+++ 60/etc/rc.d/sndiod 2016-07-26 20:42:06.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: sndiod,v 1.2 2011/12/28 14:58:16 ajacoutot Exp $
+# $OpenBSD: sndiod,v 1.4 2016/04/28 09:15:16 ajacoutot Exp $
daemon="/usr/bin/sndiod"
Only in 60/etc/signify: openbsd-61-base.pub
Only in 60/etc/signify: openbsd-61-fw.pub
Only in 60/etc/signify: openbsd-61-pkg.pub
Only in 59/etc/: systrace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment