Install cert.pem + ftp(1) binary that supports SSL, so the install script

can perform https fetches.  While non-critical for sets (which are verified
using signify), it is an uplift for communication towards the ftp.openbsd.org
cgi which provides mirror proposals, entropy seeds, and current time.
[The install script changes are not included in this commit]
ok beck jsing rpe

5 files changed, 17 insertions, 8 deletions

diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index 26f25d519ee..75e1757b6ad 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.44 2016/09/17 15:03:39 florian Exp $
+#	$OpenBSD: list,v 1.45 2016/12/30 22:32:23 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -48,7 +48,6 @@ LINK	instbin					sbin/sysctl
 LINK	instbin					sbin/umount
 LINK	instbin					usr/bin/doas
 LINK	instbin					usr/bin/encrypt
-LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
 LINK	instbin					usr/bin/more usr/bin/less
diff --git a/distrib/amd64/ramdiskA/list.local b/distrib/amd64/ramdiskA/list.local
index 98798ba6fc6..9d3efd2fdab 100644
--- a/distrib/amd64/ramdiskA/list.local
+++ b/distrib/amd64/ramdiskA/list.local
@@ -1,3 +1,5 @@
-# $OpenBSD: list.local,v 1.4 2012/10/15 17:21:04 deraadt Exp $
+# $OpenBSD: list.local,v 1.5 2016/12/30 22:32:25 deraadt Exp $
+
+LINK	instbin					usr/bin/ftp
 
 #TZ		# this does not fit on the floppy
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index 2cf81edf8dc..9f94c6c7cff 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,8 +1,9 @@
-#	$OpenBSD: Makefile,v 1.10 2016/10/19 17:45:38 natano Exp $
+#	$OpenBSD: Makefile,v 1.11 2016/12/30 22:32:25 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISK_CD
-FLOPPYSIZE=7936
+DISKTYPE=rdrootb
+FLOPPYSIZE=8960
 FLOPPYTYPE=mini34
 LBA=1
 TEMPLATE=${.CURDIR}/template
diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index e23591f78b6..33a0e0e09d1 100644
--- a/distrib/amd64/ramdisk_cd/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2016/11/24 16:32:33 natano Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2016/12/30 22:32:25 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -62,7 +62,7 @@ unconfig:
 	-vnconfig -u ${VND}
 
 
-DISKTYPE=	rdroot
+DISKTYPE?=	rdroot
 MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
 
 bsd.gz: bsd.rd
@@ -90,6 +90,9 @@ mr.fs: instbin
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
 	makefs ${MAKEFSARGS_RD} $@ $@.d
+	vnconfig -v -c ${VND} mr.fs
+	df -i /dev/${VND}a
+	vnconfig -u ${VND}
 
 rdsetroot:	${TOP}/../common/elfrdsetroot.c
 	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local
index a222446cb8f..ed6564e7033 100644
--- a/distrib/amd64/ramdisk_cd/list.local
+++ b/distrib/amd64/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.27 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list.local,v 1.28 2016/12/30 22:32:25 deraadt Exp $
 
 # add local links; use bin/sh since instbin has already been unlinked
 LINK	instbin					sbin/dhclient
@@ -10,6 +10,10 @@ LINK	instbin					sbin/mount_udf
 LINK	instbin					sbin/newfs_msdos
 LINK	instbin					sbin/fsck_msdos
 
+COPY	${DESTDIR}/etc/ssl/cert.pem		etc/ssl/cert.pem
+LINK	instbin					usr/bin/ftp-ssl usr/bin/ftp
+SPECIAL	rm usr/bin/ftp-ssl
+
 COPY	${DESTDIR}/etc/firmware/kue		etc/firmware/kue
 
 COPY	${DESTDIR}/etc/firmware/bnx-b06		etc/firmware/bnx-b06