Module Name: src
Committed By: riz
Date: Wed Dec 18 02:22:01 UTC 2013
Modified Files:
src/distrib/amd64/cdroms [netbsd-6]: Makefile.cdrom
src/distrib/i386/cdroms [netbsd-6]: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd [netbsd-6]: Makefile
src/rescue [netbsd-6]: list.crypto
Log Message:
Apply patches to fix pullup #997:
- ftp(1) now supports https, fix rescue and some cdrom sets.
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.26.4.1 -r1.26.4.2 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 \
src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.8 -r1.8.8.1 src/rescue/list.crypto
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.6.4.1 src/distrib/amd64/cdroms/Makefile.cdrom:1.6.4.2
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.6.4.1 Sat Jun 23 22:54:55 2012
+++ src/distrib/amd64/cdroms/Makefile.cdrom Wed Dec 18 02:22:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.6.4.1 2012/06/23 22:54:55 riz Exp $
+# $NetBSD: Makefile.cdrom,v 1.6.4.2 2013/12/18 02:22:01 riz Exp $
.include <bsd.own.mk>
@@ -47,6 +47,10 @@ CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != "no")
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
CDRUNTIME+= ./usr/libexec/ld.elf_so
CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.26.4.1 src/distrib/i386/cdroms/Makefile.cdrom:1.26.4.2
--- src/distrib/i386/cdroms/Makefile.cdrom:1.26.4.1 Sat Jun 23 22:54:55 2012
+++ src/distrib/i386/cdroms/Makefile.cdrom Wed Dec 18 02:22:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.26.4.1 2012/06/23 22:54:55 riz Exp $
+# $NetBSD: Makefile.cdrom,v 1.26.4.2 2013/12/18 02:22:01 riz Exp $
.include <bsd.own.mk>
@@ -47,6 +47,10 @@ CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != "no")
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
CDRUNTIME+= ./usr/libexec/ld.elf_so
CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.14.2.1 src/distrib/sparc64/cdroms/installcd/Makefile:1.14.2.2
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.14.2.1 Sat Jun 23 22:54:56 2012
+++ src/distrib/sparc64/cdroms/installcd/Makefile Wed Dec 18 02:22:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14.2.1 2012/06/23 22:54:56 riz Exp $
+# $NetBSD: Makefile,v 1.14.2.2 2013/12/18 02:22:01 riz Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -48,6 +48,10 @@ CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != "no")
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
CDRUNTIME+= ./usr/libexec/ld.elf_so
CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
Index: src/rescue/list.crypto
diff -u src/rescue/list.crypto:1.8 src/rescue/list.crypto:1.8.8.1
--- src/rescue/list.crypto:1.8 Mon Jul 20 19:59:22 2009
+++ src/rescue/list.crypto Wed Dec 18 02:22:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: list.crypto,v 1.8 2009/07/20 19:59:22 christos Exp $
+# $NetBSD: list.crypto,v 1.8.8.1 2013/12/18 02:22:01 riz Exp $
PROG cgdconfig
@@ -7,4 +7,4 @@ PROG ssh slogin
SPECIAL scp srcdir crypto/external/bsd/openssh/bin/scp
SPECIAL ssh srcdir crypto/external/bsd/openssh/bin/ssh
-LIBS -lssh -lcrypto
+LIBS -lssh -lssl -lcrypto
