first set of changes for OpenBSD 5.2

kirei · Jan 2, 2013 · 590cecd · 590cecd
1 parent bdf0535
commit 590cecd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/build-release.sh b/build-release.sh
@@ -6,8 +6,8 @@ WORKDIR=sandbox
 export CWD WORKDIR
 
 # Update for each new release
-SHORTREL="51"
-LONGREL="5.1"
+SHORTREL="52"
+LONGREL="5.2"
 
 # No need to change anything below this line for new OS releases!
 

diff --git a/initial-conf/master.passwd b/initial-conf/master.passwd
@@ -48,4 +48,5 @@ _ldpd:*:98:98::0:0:LDP Daemon:/var/empty:/sbin/nologin
 _sndio:*:99:99::0:0:sndio privsep:/var/empty:/sbin/nologin
 _ldapd:*:100:100::0:0:LDAP Daemon:/var/empty:/sbin/nologin
 _iked:*:101:101::0:0:IKEv2 Daemon:/var/empty:/sbin/nologin
+_iscsid:*:102:102::0:0:iSCSI Daemon:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin
diff --git a/list b/list
@@ -205,7 +205,6 @@ COPY ${DESTDIR}/usr/libexec/ld.so		usr/libexec/ld.so
 COPY ${DESTDIR}/usr/libexec/sftp-server		usr/libexec/sftp-server
 COPY ${DESTDIR}/usr/libexec/spamd		usr/libexec/spamd
 COPY ${DESTDIR}/usr/libexec/spamd-setup		usr/libexec/spamd-setup
-COPY ${DESTDIR}/usr/libexec/tftpd		usr/libexec/tftpd
 COPY ${DESTDIR}/usr/sbin/authpf			usr/sbin/authpf
 COPY ${DESTDIR}/usr/sbin/arp			usr/sbin/arp
 COPY ${DESTDIR}/usr/sbin/bgpd			usr/sbin/bgpd
@@ -244,6 +243,7 @@ COPY ${DESTDIR}/usr/sbin/syslogc		usr/sbin/syslogc
 COPY ${DESTDIR}/usr/sbin/syslogd		usr/sbin/syslogd
 COPY ${DESTDIR}/usr/sbin/tcpdrop		usr/sbin/tcpdrop
 COPY ${DESTDIR}/usr/sbin/tcpdump		usr/sbin/tcpdump
+COPY ${DESTDIR}/usr/sbin/tftpd			usr/sbin/tftpd
 COPY ${DESTDIR}/usr/sbin/traceroute		usr/sbin/traceroute
 COPY ${DESTDIR}/usr/sbin/traceroute6		usr/sbin/traceroute6
 COPY ${DESTDIR}/usr/sbin/watchdogd		usr/sbin/watchdogd

diff --git a/list.recovery b/list.recovery
@@ -155,7 +155,6 @@ COPY ${DESTDIR}/usr/libexec/ld.so		usr/libexec/ld.so
 COPY ${DESTDIR}/usr/libexec/sftp-server		usr/libexec/sftp-server
 COPY ${DESTDIR}/usr/libexec/spamd		usr/libexec/spamd
 COPY ${DESTDIR}/usr/libexec/spamd-setup		usr/libexec/spamd-setup
-COPY ${DESTDIR}/usr/libexec/tftpd		usr/libexec/tftpd
 COPY ${DESTDIR}/usr/sbin/authpf			usr/sbin/authpf
 COPY ${DESTDIR}/usr/sbin/arp			usr/sbin/arp
 COPY ${DESTDIR}/usr/sbin/bgpd			usr/sbin/bgpd
@@ -188,6 +187,7 @@ COPY ${DESTDIR}/usr/sbin/syslogc		usr/sbin/syslogc
 COPY ${DESTDIR}/usr/sbin/syslogd		usr/sbin/syslogd
 COPY ${DESTDIR}/usr/sbin/tcpdrop		usr/sbin/tcpdrop
 COPY ${DESTDIR}/usr/sbin/tcpdump		usr/sbin/tcpdump
+COPY ${DESTDIR}/usr/sbin/tftpd			usr/sbin/tftpd
 COPY ${DESTDIR}/usr/sbin/traceroute		usr/sbin/traceroute
 #COPY ${DESTDIR}/usr/sbin/traceroute6		usr/sbin/traceroute6