summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2016-12-31 02:06:36 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2016-12-31 02:06:36 +0000
commit6f449cc8104371ef51fdc729a444ce9e302304b2 (patch)
tree7872cba32fd2b0bde6aae1f2cd740a1aeec6e20d
parent42b74983b19a7b7bd91d61a2f79e7804171e8755 (diff)
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 armv7 results tested by jsg
-rw-r--r--distrib/armv7/ramdisk/list9
1 files changed, 6 insertions, 3 deletions
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 7048061c721..e6638e2fc86 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.27 2016/12/31 01:33:49 deraadt Exp $
+# $OpenBSD: list,v 1.28 2016/12/31 02:06:35 deraadt Exp $
SRCDIRS distrib/special
@@ -54,7 +54,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
@@ -64,6 +63,10 @@ LINK instbin usr/sbin/chroot
LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/mkuboot
+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
+
# firmware we might need
COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue
COPY ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211
@@ -87,7 +90,7 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ex
COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int
# this is the list from distrib/miniroot/makeconf.awk with -lz added.
-LIBS -lstubs -lutil -lm -lc -lz
+LIBS -lstubs -lutil -lm -lc -ltls -lssl -lcrypto -lz
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV