[src/netbsd-6]: src Apply patches to fix pullup #997:

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/82dd663d7faf
branches:  netbsd-6
changeset: 776527:82dd663d7faf
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Dec 18 02:22:01 2013 +0000

description:
Apply patches to fix pullup #997:

- ftp(1) now supports https, fix rescue and some cdrom sets.

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom       |  6 +++++-
 distrib/i386/cdroms/Makefile.cdrom        |  6 +++++-
 distrib/sparc64/cdroms/installcd/Makefile |  6 +++++-
 rescue/list.crypto                        |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r 283b075be7cf -r 82dd663d7faf distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Tue Dec 17 22:39:33 2013 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Wed Dec 18 02:22:01 2013 +0000
@@ -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/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
diff -r 283b075be7cf -r 82dd663d7faf distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Tue Dec 17 22:39:33 2013 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Wed Dec 18 02:22:01 2013 +0000
@@ -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/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
diff -r 283b075be7cf -r 82dd663d7faf distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Tue Dec 17 22:39:33 2013 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Wed Dec 18 02:22:01 2013 +0000
@@ -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/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
diff -r 283b075be7cf -r 82dd663d7faf rescue/list.crypto
--- a/rescue/list.crypto        Tue Dec 17 22:39:33 2013 +0000
+++ b/rescue/list.crypto        Wed Dec 18 02:22:01 2013 +0000
@@ -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 @@
 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