Skip to content

Instantly share code, notes, and snippets.

@zeszyt

zeszyt/etc-60-61.diff

Created April 12, 2017 12:04
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/46943a6f27069d52592abb2850529595 to your computer and use it in GitHub Desktop.
Save zeszyt/46943a6f27069d52592abb2850529595 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
etc-60-61.diff
Only in 61/etc: acme
diff -ur -x moduli 60/etc/disktab 61/etc/disktab
--- 60/etc/disktab Wed Apr 12 13:56:09 2017
+++ 61/etc/disktab Wed Apr 12 13:56:34 2017
@@ -1,9 +1,9 @@
-# $OpenBSD: disktab,v 1.25 2015/08/14 23:45:55 krw Exp $
+# $OpenBSD: disktab,v 1.26 2016/12/30 22:26:29 deraadt Exp $
-mini34|gzip bsd.rd disk image 3.40625MB:\
- :dt=rdroot:se#512:nt#1:ns#64:nc#109:\
- :pa#6912:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
- :pc#6976:oc#0:
+mini34|gzip bsd.rd disk image 4.34375MB:\
+ :dt=rdroot:se#512:nt#1:ns#64:nc#124:\
+ :pa#7872:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
+ :pc#7936:oc#0:
install240|install.fs disk image 240MB:\
:dt=rdroot:se#512:nt#1:ns#64:nc#7680:\
@@ -33,3 +33,9 @@
:pa#3872:oa#0:ta=4.2BSD:ba#4096:fa#512:\
:pb#0:ob#0:tb=swap:\
:pc#3872:oc#0:
+
+rdrootb|ramdiskrootb|RAM-disk root FS image:\
+ :dt=rdroot:se#512:nt#2:ns#200:nc#16:\
+ :pa#6400:oa#0:ta=4.2BSD:ba#4096:fa#512:\
+ :pb#0:ob#0:tb=swap:\
+ :pc#6400:oc#0:
Only in 61/etc/examples: doas.conf
diff -ur -x moduli 60/etc/examples/httpd.conf 61/etc/examples/httpd.conf
--- 60/etc/examples/httpd.conf Wed Apr 12 13:56:09 2017
+++ 61/etc/examples/httpd.conf Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.14 2015/02/04 08:39:35 florian Exp $
+# $OpenBSD: httpd.conf,v 1.16 2016/09/17 20:05:59 tj Exp $
#
# Macros
@@ -48,6 +48,10 @@
# An HTTPS server using SSL/TLS
server "secure.example.com" {
listen on 127.0.0.1 tls port 443
+
+ # TLS certificate and key files created with acme-client(1)
+ tls certificate "/etc/ssl/acme/fullchain.pem"
+ tls key "/etc/ssl/acme/private/privkey.pem"
# Define server-specific log files relative to /logs
log { access "secure-access.log", error "secure-error.log" }
Only in 60/etc/examples: pkg.conf
diff -ur -x moduli 60/etc/examples/sysctl.conf 61/etc/examples/sysctl.conf
--- 60/etc/examples/sysctl.conf Wed Apr 12 13:56:09 2017
+++ 61/etc/examples/sysctl.conf Wed Apr 12 13:56:34 2017
@@ -37,4 +37,4 @@
#machdep.allowaperture=2 # See xf86(4)
#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.lidaction=0 # 1=suspend, 2=hibernate laptop upon lid closing
diff -ur -x moduli 60/etc/examples/vm.conf 61/etc/examples/vm.conf
--- 60/etc/examples/vm.conf Wed Apr 12 13:56:09 2017
+++ 61/etc/examples/vm.conf Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: vm.conf,v 1.4 2016/01/06 09:59:30 reyk Exp $
+# $OpenBSD: vm.conf,v 1.7 2017/03/25 16:28:25 reyk Exp $
#
# Macros
@@ -9,26 +9,43 @@
# Virtual machines
#
+switch "uplink" {
+ # This interface will default to bridge0, but switch(4) is supported
+ #interface switch0
+
+ # Add additional members
+ add em0
+}
+
+switch "local" {
+ add vether0
+ down
+}
+
# OpenBSD snapshot install test
vm "openbsd.vm" {
- memory 512M
- kernel $sets "bsd.rd"
+ boot $sets "bsd.rd"
# First disk from 'vmctl create "/home/vm/OpenBSD.img" -s 4G'
disk "/home/vm/OpenBSD.img"
# Second disk from OpenBSD contains the install sets
- disk $sets "install59.fs"
+ disk $sets "install60.fs"
# Interface will show up as tap(4) on the host and as vio(4) in the VM
- interfaces 1
+ interface { switch "uplink" }
+ interface { switch "local" }
}
# Another VM that is disabled on startup
vm "vm1.example.com" {
disable
memory 1G
- interfaces 2
- kernel "/bsd"
disk "/home/vm/vm1-disk.img"
+
+ # Use a specific tap(4) interface with a hardcoded MAC address
+ interface tap3 {
+ lladdr 00:11:22:aa:bb:cc
+ down
+ }
}
Binary files 60/etc/firmware/ral-rt2860 and 61/etc/firmware/ral-rt2860 differ
diff -ur -x moduli 60/etc/magic 61/etc/magic
--- 60/etc/magic Wed Apr 12 13:56:09 2017
+++ 61/etc/magic Wed Apr 12 13:56:34 2017
@@ -5327,7 +5327,7 @@
>>&20 lelong 7 \b, i386
>>&20 lelong 0x01000007 \b, x86_64
>4 lelong >2 Universal EFI binary with %d architectures
-# $OpenBSD: elf,v 1.17 2009/04/24 18:54:34 chl Exp $
+# $OpenBSD: elf,v 1.18 2017/02/19 13:15:19 jsg Exp $
#------------------------------------------------------------------------------
# elf: file(1) magic for ELF executables
@@ -5475,6 +5475,7 @@
>>18 leshort 97 NatSemi 32k,
>>18 leshort 106 Analog Devices Blackfin,
>>18 leshort 0x9026 Alpha (unofficial),
+>>18 leshort 183 AArch64,
>>20 lelong 0 invalid version
>>20 lelong 1 version 1
>>36 lelong 1 MathCoPro/FPU/MAU Required
diff -ur -x moduli 60/etc/mtree/4.4BSD.dist 61/etc/mtree/4.4BSD.dist
--- 60/etc/mtree/4.4BSD.dist Wed Apr 12 13:56:09 2017
+++ 61/etc/mtree/4.4BSD.dist Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.282 2016/05/11 21:52:48 deraadt Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.294 2017/02/12 08:56:17 landry Exp $
/set type=dir uname=root gname=wheel mode=0755
@@ -78,8 +78,8 @@
certs mode=0700
..
..
-
- # ./etc/mail
+ acme mode=0700
+ ..
mail
..
mtree
@@ -90,14 +90,10 @@
..
rc.d
..
-
- # ./etc/skel
skel
.ssh uname=root mode=0700
..
..
-
- # ./etc/signify
signify
..
ssh
@@ -109,8 +105,11 @@
..
lib
..
+ acme
+ private uname=root mode=0700
+ ..
+ ..
..
-
..
# ./home
@@ -119,6 +118,8 @@
mnt
..
root mode=0700
+ .ssh uname=root mode=0700
+ ..
..
sbin
..
@@ -136,8 +137,6 @@
include gname=bin uname=root mode=0755
arpa gname=bin uname=root mode=0755
..
-
- # ./usr/include/g++
g++ gname=bin uname=root mode=0755
std gname=bin uname=root mode=0755
..
@@ -169,8 +168,6 @@
# ./usr/libdata
libdata
perl5
- site_perl
- ..
..
..
@@ -198,6 +195,8 @@
..
libexec
..
+
+ # ./usr/local/man
man
cat1
..
@@ -225,6 +224,8 @@
..
catn
..
+
+ # ./usr/local/man/ja_JP.EUC
ja_JP.EUC
cat1
..
@@ -273,6 +274,8 @@
mann
..
..
+
+ # ./usr/local/man/man1
man1
..
man2
@@ -300,8 +303,12 @@
mann
..
..
+
+ # ./usr/local/sbin
sbin
..
+
+ # ./usr/local/share
share
dict
..
@@ -313,6 +320,8 @@
..
misc
..
+
+ # ./usr/local/share/nls
nls
C
..
@@ -387,6 +396,8 @@
uk_UA.KOI8-U
..
..
+
+ # ./usr/local/share/pkgconfig
pkgconfig
..
skel
@@ -405,8 +416,6 @@
# ./usr/mdec
mdec
..
- obj gname=wsrc mode=0775
- ..
sbin
..
@@ -442,8 +451,6 @@
# ./usr/share/info
info
..
-
- # ./usr/share/locale
locale
..
@@ -454,8 +461,6 @@
..
i386
..
- sparc
- ..
sparc64
..
..
@@ -466,12 +471,10 @@
..
amd64
..
- armish
+ armv7
..
i386
..
- zaurus
- ..
..
# ./usr/share/man/man3
@@ -492,8 +495,6 @@
..
amd64
..
- armish
- ..
armv7
..
hppa
@@ -514,35 +515,13 @@
..
socppc
..
- sparc
- ..
sparc64
..
- zaurus
- ..
..
# ./usr/share/man/man5
man5
- amd64
- ..
- armish
- ..
- hppa
- ..
- i386
- ..
- landisk
- ..
- macppc
- ..
- socppc
- ..
- zaurus
- ..
..
-
- # ./usr/share/man/man6
man6
..
man7
@@ -554,8 +533,6 @@
..
amd64
..
- armish
- ..
armv7
..
hppa
@@ -576,12 +553,8 @@
..
socppc
..
- sparc
- ..
sparc64
..
- zaurus
- ..
..
# ./usr/share/man/man9
@@ -594,14 +567,10 @@
..
mk
..
-
- # ./usr/share/snmp
snmp
mibs
..
..
-
- # ./usr/share/tabset
tabset
..
@@ -621,14 +590,6 @@
..
..
..
-
- # ./usr/src
- #src gname=wsrc mode=0775
- #..
-
- # ./usr/xobj
- xobj gname=wsrc mode=0775
- ..
..
# ./var
@@ -637,12 +598,8 @@
..
authpf uname=root gname=authpf mode=0770
..
-
- # ./var/empty
empty mode=0755
..
-
- # ./var/backups
backups mode=0700
..
yp mode=755
@@ -660,6 +617,8 @@
# ./var/db
db
+ acpi
+ ..
ldap mode=0700
..
ns
@@ -676,8 +635,6 @@
save uname=root gname=games mode=0770
..
..
-
- # ./var/games/save
save uname=root gname=games mode=0775
..
phantasia uname=root gname=games mode=0775
@@ -689,8 +646,6 @@
rdist
..
..
-
- # ./var/mail
mail
..
@@ -700,8 +655,6 @@
..
etc uname=root gname=_nsd mode=0750
..
-
- # ./var/nsd/run
run uname=root gname=_nsd mode=0775
xfr uname=root gname=_nsd mode=0770
..
@@ -721,15 +674,13 @@
..
run
..
-
- # ./var/sysmerge
sysmerge uname=root gname=wheel mode=0700
..
+ syspatch uname=root gname=wheel mode=0755
+ ..
# ./var/spool
spool
-
- # ./var/spool/ftp
ftp mode=0555
bin mode=0511
..
@@ -737,17 +688,16 @@
..
hidden mode=0111
..
- #pub mode=0555
- #..
..
# ./var/spool/lock
- lock uname=uucp gname=dialer mode=1775
+ lock uname=root gname=dialer mode=1775
..
output
lpd gname=daemon mode=0775
..
..
+
# ./var/spool/smtpd
smtpd type=dir uname=root gname=wheel mode=0711
corrupt type=dir uname=_smtpq gname=wheel mode=0700
@@ -763,12 +713,7 @@
temporary type=dir uname=_smtpq gname=wheel mode=0700
..
..
- #sockets mode=777
- #..
- uucp uname=uucp gname=daemon
- ..
- uucppublic uname=uucp gname=daemon mode=0755
- ..
+
..
# ./var/unbound
@@ -786,6 +731,8 @@
cgi-bin type=dir uname=root gname=daemon mode=755
..
htdocs type=dir uname=root gname=daemon mode=755
+ ..
+ acme type=dir uname=root gname=daemon mode=755
..
logs type=dir uname=root gname=daemon mode=755
..
diff -ur -x moduli 60/etc/mtree/BSD.x11.dist 61/etc/mtree/BSD.x11.dist
--- 60/etc/mtree/BSD.x11.dist Wed Apr 12 13:56:09 2017
+++ 61/etc/mtree/BSD.x11.dist Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: BSD.x11.dist,v 1.42 2016/03/20 09:33:56 jsg Exp $
+# $OpenBSD: BSD.x11.dist,v 1.44 2017/02/26 16:51:18 matthieu Exp $
/set type=dir uname=root gname=wheel mode=0755
.
@@ -8,12 +8,14 @@
..
twm
..
- xdm
+ xenodm
pixmaps
..
..
xinit
..
+ xsm
+ ..
..
fonts
conf.avail
@@ -177,6 +179,8 @@
..
armscii-8
..
+ cs_CZ.UTF-8
+ ..
el_GR.UTF-8
..
en_US.UTF-8
@@ -340,6 +344,8 @@
types
..
..
+ xorg.conf.d
+ ..
..
aclocal
..
diff -ur -x moduli 60/etc/mtree/special 61/etc/mtree/special
--- 60/etc/mtree/special Wed Apr 12 13:56:09 2017
+++ 61/etc/mtree/special Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: special,v 1.119 2016/04/25 20:38:11 tedu Exp $
+# $OpenBSD: special,v 1.123 2017/02/12 08:59:52 landry Exp $
#
# Hand-crafted mtree specification for the dangerous files.
#
@@ -13,12 +13,13 @@
.. #dev
etc type=dir mode=0755 uname=root gname=wheel
+acme-client.conf type=file mode=0644 uname=root gname=wheel optional
bgpd.conf type=file mode=0600 uname=root gname=wheel optional
chio.conf type=file mode=0644 uname=root gname=operator optional
crontab type=file mode=0600 uname=root gname=wheel optional
-csh.cshrc type=file mode=0644 uname=root gname=wheel
-csh.login type=file mode=0644 uname=root gname=wheel
-csh.logout type=file mode=0644 uname=root gname=wheel
+csh.cshrc type=file mode=0644 uname=root gname=wheel optional
+csh.login type=file mode=0644 uname=root gname=wheel optional
+csh.logout type=file mode=0644 uname=root gname=wheel optional
daily type=file mode=0644 uname=root gname=wheel
daily.local type=file mode=0644 uname=root gname=wheel optional
dhcpd.conf type=file mode=0644 uname=root gname=wheel optional
@@ -113,8 +114,6 @@
weekly type=file mode=0644 uname=root gname=wheel
weekly.local type=file mode=0644 uname=root gname=wheel optional
ypldap.conf type=file mode=0600 uname=root gname=wheel optional
-uucp type=dir mode=0755 uname=root gname=wheel optional ignore
-.. #uucp
.. #etc
root type=dir mode=0700 uname=root gname=wheel
@@ -122,6 +121,9 @@
.login type=file mode=0644 uname=root gname=wheel
.profile type=file mode=0644 uname=root gname=wheel
.rhosts type=file mode=0600 uname=root gname=wheel optional
+.ssh type=dir mode=0700 uname=root gname=wheel
+authorized_keys type=file mode=0600 uname=root gname=wheel
+.. #root/.ssh
.. #root
sbin type=dir mode=0755 uname=root gname=wheel ignore
@@ -208,8 +210,4 @@
.. #var/spool/ftp
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
-uucppublic type=dir mode=0755 uname=uucp gname=daemon ignore
-.. #var/spool/uucppublic
.. #var/spool
diff -ur -x moduli 60/etc/netstart 61/etc/netstart
--- 60/etc/netstart Wed Apr 12 13:56:09 2017
+++ 61/etc/netstart Wed Apr 12 13:56:34 2017
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.169 2016/07/19 08:03:01 mpi Exp $
+# $OpenBSD: netstart,v 1.172 2016/12/06 14:01:43 mpi Exp $
# Turn off Strict Bourne shell mode.
set +o sh
@@ -167,15 +167,37 @@
done
}
+# Parse /etc/mygate and add default routes for IPv4 and IPv6
+# Usage: defaultroute
+defaultroute() {
+ [[ -z $dhcpif ]] && stripcom /etc/mygate | while read gw; do
+ [[ $gw == @(*:*) ]] && continue
+ route -qn delete default >/dev/null 2>&1
+ route -qn add -host default $gw && break
+ done
+ [[ -z $rtsolif ]] && stripcom /etc/mygate | while read gw; do
+ [[ $gw == !(*:*) ]] && continue
+ route -qn delete -inet6 default >/dev/null 2>&1
+ route -qn add -host -inet6 default $gw && break
+ done
+}
+
+# Make sure the invoking user has the right privileges.
+if (($(id -u) != 0)); then
+ echo "${0##*/}: need root privileges"
+ exit 1
+fi
+
# Get network related vars from rc.conf using the parsing routine from rc.subr.
FUNCS_ONLY=1 . /etc/rc.d/rc.subr
_rc_parse_conf
# If we were invoked with a list of interface names, just reconfigure these
-# interfaces (or bridges) and return.
+# interfaces (or bridges), add default routes and return.
if (($# > 0)); then
for _if; do ifstart $_if; done
ifv6autoconf
+ defaultroute
return
fi
@@ -245,7 +267,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 bridge pflow"
+ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun bridge switch pflow"
# The trunk interfaces need to come up first in this list.
# The (s)vlan interfaces need to come up after trunk.
@@ -256,16 +278,7 @@
ifv6autoconf
# Look for default routes in /etc/mygate.
-[[ -z $dhcpif ]] && stripcom /etc/mygate | while read gw; do
- [[ $gw == @(*:*) ]] && continue
- route -qn delete default >/dev/null 2>&1
- route -qn add -host default $gw && break
-done
-[[ -z $rtsolif ]] && stripcom /etc/mygate | while read gw; do
- [[ $gw == !(*:*) ]] && continue
- route -qn delete -inet6 default >/dev/null 2>&1
- route -qn add -host -inet6 default $gw && break
-done
+defaultroute
# Multicast routing.
if [[ $multicast != YES ]]; then
@@ -277,7 +290,7 @@
# 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 gif gre bridge pflow"
+ifmstart "pppoe tun gif gre bridge switch 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 60/etc/pf.os 61/etc/pf.os
--- 60/etc/pf.os Wed Apr 12 13:56:09 2017
+++ 61/etc/pf.os Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: pf.os,v 1.26 2012/08/03 12:25:16 jsg Exp $
+# $OpenBSD: pf.os,v 1.27 2016/09/03 17:08:57 sthen Exp $
# passive OS fingerprinting
# -------------------------
#
@@ -313,6 +313,9 @@
16384:64:1:64:M*,N,N,S,N,W3,N,N,T: OpenBSD:4.9::OpenBSD 4.9
16384:64:0:64:M*,N,N,S,N,W3,N,N,T: OpenBSD:4.9:no-df:OpenBSD 4.9 (scrub no-df)
+
+16384:64:1:64:M*,N,N,S,N,W6,N,N,T: OpenBSD:6.1::OpenBSD 6.1
+16384:64:0:64:M*,N,N,S,N,W6,N,N,T: OpenBSD:6.1:no-df:OpenBSD 6.1 (scrub no-df)
# ----------------- Solaris -----------------
diff -ur -x moduli 60/etc/rc 61/etc/rc
--- 60/etc/rc Wed Apr 12 13:56:09 2017
+++ 61/etc/rc Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.486 2016/07/10 09:08:18 rpe Exp $
+# $OpenBSD: rc,v 1.493 2017/02/26 16:51:18 matthieu 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
@@ -31,7 +31,7 @@
local _cap=$2 _val # login.conf capability and its value
local _suffix
- for _suffix in {,-cur,-max}; do
+ for _suffix in {,-max,-cur}; do
_val=$(getcap -f /etc/login.conf -s ${_cap}${_suffix} daemon 2>/dev/null)
[[ -n $_val ]] || continue
[[ $_val == infinity ]] && _val=unlimited
@@ -220,7 +220,9 @@
# 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 |
@@ -412,7 +414,7 @@
reorder_libs
# Clean up left-over files.
-rm -f /etc/nologin /var/spool/lock/LCK.* /var/spool/uucp/STST/*
+rm -f /etc/nologin /var/spool/lock/LCK.*
(cd /var/run && { rm -rf -- *; install -c -m 664 -g utmp /dev/null utmp; })
(cd /var/authpf && rm -rf -- *)
@@ -451,6 +453,11 @@
savecore $savecore_flags /var/crash
fi
+# Store ACPI tables in /var/db/acpi to be used by sendbug(1).
+if [[ -x /usr/sbin/acpidump ]]; then
+ acpidump -o /var/db/acpi/
+fi
+
if [[ $check_quotas == YES ]]; then
echo -n 'checking quotas:'
quotacheck -a
@@ -522,7 +529,7 @@
run_upgrade_script sysmerge
echo -n 'starting network daemons:'
-start_daemon ldomd vmd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
+start_daemon ldomd sshd switchd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd
if ifconfig lo0 inet6 >/dev/null 2>&1; then
@@ -533,7 +540,7 @@
start_daemon hostapd lpd smtpd slowcgi httpd ftpd
start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
-start_daemon rbootd mopd spamd spamlogd sndiod
+start_daemon rbootd mopd vmd spamd spamlogd sndiod
echo '.'
# If rc.firsttime exists, run it just once, and make sure it is deleted.
@@ -559,7 +566,7 @@
mixerctl_conf
echo -n 'starting local daemons:'
-start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xdm
+start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm
echo '.'
date
diff -ur -x moduli 60/etc/rc.conf 61/etc/rc.conf
--- 60/etc/rc.conf Wed Apr 12 13:56:09 2017
+++ 61/etc/rc.conf Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.conf,v 1.211 2015/12/06 13:51:41 rpe Exp $
+# $OpenBSD: rc.conf,v 1.213 2017/02/26 16:51:18 matthieu Exp $
# DO NOT EDIT THIS FILE!!
#
@@ -64,6 +64,7 @@
spamd_flags=NO # also see spamd_black below
spamlogd_flags= # use eg. "-i interface" and see spamlogd(8)
sshd_flags=
+switchd_flags=NO
syslogd_flags= # add more flags, e.g. "-u -a /chroot/dev/log"
tftpd_flags=NO
tftpproxy_flags=NO
@@ -72,7 +73,7 @@
watchdogd_flags=NO
wsmoused_flags=NO # for enabling console mouse support (i386 alpha amd64)
# for ps/2 or usb mice: "", serial: "-p /dev/cua00"
-xdm_flags=NO # on some architectures, you must also
+xenodm_flags=NO # on some architectures, you must also
# disable console getty in /etc/ttys
# services related to RPC, NFS, and YP
Only in 61/etc/rc.d: dhcrelay6
diff -ur -x moduli 60/etc/rc.d/rc.subr 61/etc/rc.d/rc.subr
--- 60/etc/rc.d/rc.subr Wed Apr 12 13:56:09 2017
+++ 61/etc/rc.d/rc.subr Wed Apr 12 13:56:34 2017
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.114 2016/05/03 08:59:29 otto Exp $
+# $OpenBSD: rc.subr,v 1.118 2017/02/17 16:42:41 ajacoutot Exp $
#
# Copyright (c) 2010, 2011, 2014-2016 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -60,6 +60,10 @@
rm -f ${_RC_RUNFILE}
}
+_rc_check_name() {
+ [[ $1 == +([_[:alpha:]])+(|[_[:alnum:]]) ]]
+}
+
_rc_do() {
if [ -n "${_RC_DEBUG}" ]; then
echo "doing $@" && "$@"
@@ -78,7 +82,7 @@
_rc_wait() {
local _i=0
while [ $_i -lt ${daemon_timeout} ]; do
- case "$1" in
+ case "$1" in
reload|start)
_rc_do rc_check && return 0 ;;
stop)
@@ -95,7 +99,7 @@
_rc_quirks() {
# special care needed for spamlogd to avoid starting it up and failing
# all the time
- if [ X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
+ if [ X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
spamlogd_flags=NO
fi
@@ -111,11 +115,6 @@
[ X"${nfsd_flags}" = X"NO" ] && nfsd_flags="-tun 4"
[ X"${mountd_flags}" = X"NO" ] && mountd_flags=
fi
-
- # in case domainname is set and /var/yp/binding exists enable ypbind
- if [ X"`domainname`" != X"" -a -d /var/yp/binding ]; then
- ypbind_flags=
- fi
}
_rc_parse_conf() {
@@ -197,7 +196,7 @@
fi
[ -z "${INRC}" ] && _rc_do rc_check && exit 0
echo $_n "${INRC:+ }${_name}"
- while true; do # no real loop, only needed to break
+ while true; do # no real loop, only needed to break
if type rc_pre >/dev/null; then
_rc_do rc_pre || break
fi
@@ -238,6 +237,9 @@
esac
}
+_name=$(basename $0)
+_rc_check_name "${_name}" || _rc_err "invalid rc.d script name: ${_name}"
+
[ -n "${daemon}" ] || _rc_err "$0: daemon is not set"
unset _RC_DEBUG _RC_FORCE
@@ -250,7 +252,6 @@
done
shift $((OPTIND-1))
-_name=$(basename $0)
_RC_RUNDIR=/var/run/rc.d
_RC_RUNFILE=${_RC_RUNDIR}/${_name}
diff -ur -x moduli 60/etc/rc.d/spamd 61/etc/rc.d/spamd
--- 60/etc/rc.d/spamd Wed Apr 12 13:56:09 2017
+++ 61/etc/rc.d/spamd Wed Apr 12 13:56:34 2017
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: spamd,v 1.7 2015/07/15 13:50:54 ajacoutot Exp $
+# $OpenBSD: spamd,v 1.8 2017/03/23 10:10:54 ajacoutot Exp $
daemon="/usr/libexec/spamd"
@@ -10,17 +10,15 @@
rc_reload=NO
rc_pre() {
- [ X"${spamd_black}" != X"NO" ] && \
+ if [ X"${spamd_black}" != X"NO" ]; then
daemon_flags="-b ${daemon_flags}"
- return 0
+ spamd_setup_flags="-b"
+ fi
}
rc_start() {
${rcexec} "${daemon} ${daemon_flags}" || return 1
- spamd_setup_flags="-D"
- [ X"${spamd_black}" != X"NO" ] && \
- spamd_setup_flags="-b ${spamd_setup_flags}"
- /usr/libexec/spamd-setup ${spamd_setup_flags}
+ /usr/libexec/spamd-setup -D ${spamd_setup_flags}
}
rc_cmd $1
Only in 61/etc/rc.d: switchd
Only in 60/etc/rc.d: xdm
Only in 61/etc/rc.d: xenodm
Only in 60/etc/signify: openbsd-58-base.pub
Only in 60/etc/signify: openbsd-58-fw.pub
Only in 60/etc/signify: openbsd-58-pkg.pub
Only in 61/etc/signify: openbsd-61-syspatch.pub
Only in 61/etc/signify: openbsd-62-base.pub
Only in 61/etc/signify: openbsd-62-fw.pub
Only in 61/etc/signify: openbsd-62-pkg.pub
Only in 61/etc/signify: openbsd-62-syspatch.pub
Only in 61/etc/ssl: acme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment