## $erdelynet: yaifo-0.2-40p1.patch,v 1.1 2006/11/29 16:42:49 mike Exp $ Changes from yaifo-0.2: 1. Updated for 4.0. 2. Enables using sudo (if SUDO variable defined in mk.conf or environment) instead of having to run everything as root. 3. Enables using existing ssh_host*_key files instead of creating new ones for each yaifo build. If existing key files are not provided, new ones are still created. 4. DNS Search string added to config file. If specified in config, saved in /etc/resolv.conf during install. 5. Remove wicontrol device as it is not needed anymore. 6. Remove ancontrol device as it is not needed anymore. 7. Ask if ssh_host*_key files should be copied to newly installed /etc/ssh. ================================================================================ diff -rNu yaifo-0.2/Makefile yaifo-0.2-40p1/Makefile --- ./Makefile Sun Dec 11 15:05:40 2005 +++ ./Makefile Fri Nov 3 14:30:10 2006 @@ -75,18 +75,18 @@ ${FS}: bsd.gz dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE} - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -R ${VND} ${LABEL} - newfs ${NEWFSOPTS_FD} ${VND_RDEV} - mount ${VND_DEV} ${MOUNT_POINT} - cp ${BOOT} ${BOOTOUT} - cp bsd.gz ${MOUNT_POINT}/bsd - ${INSTALLB} + ${SUDO} vnconfig -v -c ${VND} ${REALIMAGE} + ${SUDO} disklabel -R ${VND} ${LABEL} + ${SUDO} newfs ${NEWFSOPTS_FD} ${VND_RDEV} + ${SUDO} mount ${VND_DEV} ${MOUNT_POINT} + ${SUDO} cp ${BOOT} ${BOOTOUT} + ${SUDO} cp bsd.gz ${MOUNT_POINT}/bsd + ${SUDO} ${INSTALLB} @echo "" @df -i ${MOUNT_POINT} @echo "" - umount ${MOUNT_POINT} - vnconfig -u ${VND} + ${SUDO} umount ${MOUNT_POINT} + ${SUDO} vnconfig -u ${VND} dd if=${REALIMAGE} of=${FS} count=${IMAGESIZE} rm ${REALIMAGE} @@ -110,20 +110,20 @@ ${IMAGE}: crunch ${CBIN} rd_setup do_files rd_teardown crunch: - cd ${SRCDIR}/distrib/crunch && make && make install + cd ${SRCDIR}/distrib/crunch && make && ${SUDO} make install rd_setup: ${CBIN} dd if=/dev/zero of=${REALIMAGE} count=${RDSIZE} - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -R ${VND} ${RDLABEL} - newfs ${NEWFSOPTS_RD} ${VND_RDEV} - fsck ${VND_RDEV} - mount ${VND_DEV} ${MOUNT_POINT} + ${SUDO} vnconfig -v -c ${VND} ${REALIMAGE} + ${SUDO} disklabel -R ${VND} ${RDLABEL} + ${SUDO} newfs ${NEWFSOPTS_RD} ${VND_RDEV} + ${SUDO} fsck ${VND_RDEV} + ${SUDO} mount ${VND_DEV} ${MOUNT_POINT} rd_teardown: @df -i ${MOUNT_POINT} - -umount ${MOUNT_POINT} - -vnconfig -u ${VND} + -${SUDO} umount ${MOUNT_POINT} + -${SUDO} vnconfig -u ${VND} cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} @@ -131,11 +131,12 @@ ${HOSTCC} -DDEBUG -o rdsetroot ${SRCDIR}/distrib/common/elfrdsetroot.c unconfig: - -umount -f ${MOUNT_POINT} - -vnconfig -u ${VND} + -${SUDO} umount -f ${MOUNT_POINT} + -${SUDO} vnconfig -u ${VND} ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} - crunchgen -E -D ${SRCDIR} -L /usr/lib \ + pwd + ${SUDO} crunchgen -E -D ${SRCDIR} -L /usr/lib \ -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c @@ -143,15 +144,26 @@ ${STRIP} ${CBIN} ${CRUNCHCONF}: ${LISTS} - cp -Rp ${.CURDIR}/ssh ${SRCDIR}/distrib/special/ + ${SUDO} cp -Rp ${.CURDIR}/ssh ${SRCDIR}/distrib/special/ + ${SUDO} chown -R root:wsrc ${SRCDIR}/distrib/special/ssh + ${SUDO} chmod -R g+w ${SRCDIR}/distrib/special/ssh awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CRUNCHCONF} do_files: - mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} SRCDIR=${SRCDIR} \ +.if !exists(${.CURDIR}/ssh_host_rsa_key) + ssh-keygen -q -t rsa -f ${.CURDIR}/ssh_host_rsa_key -N '' +.endif +.if !exists(${.CURDIR}/ssh_host_dsa_key) + ssh-keygen -q -t dsa -f ${.CURDIR}/ssh_host_dsa_key -N '' +.endif +.if !exists(${.CURDIR}/ssh_host_key) + ssh-keygen -q -t rsa1 -f ${.CURDIR}/ssh_host_key -N '' +.endif + ${SUDO} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u + ${SUDO} env TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} SRCDIR=${SRCDIR} \ ARCH=${MACHINE_ARCH} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ sh ${UTILS}/runlist.sh ${LISTS} - rm ${MOUNT_POINT}/${CBIN} + ${SUDO} rm ${MOUNT_POINT}/${CBIN} .if ${MACHINE_ARCH} == "sparc" arch: diff -rNu yaifo-0.2/config yaifo-0.2-40p1/config --- ./config Sun Dec 11 15:05:40 2005 +++ ./config Tue Nov 21 17:24:00 2006 @@ -34,6 +34,8 @@ # DNS server's IP address, not used if DHCP=on DNS=192.168.2.1 +# DNS Search list (for resolv.conf) +SEARCH= # static TCP/IP configuration, DHCP must be off IP= diff -rNu yaifo-0.2/i386/RAMDISK_YAIFO yaifo-0.2-40p1/i386/RAMDISK_YAIFO --- ./i386/RAMDISK_YAIFO Sun Dec 11 15:05:39 2005 +++ ./i386/RAMDISK_YAIFO Fri Nov 3 14:30:10 2006 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.103 2005/08/23 19:59:35 fgsch Exp $ +# $OpenBSD: RAMDISK_CD,v 1.128 2006/08/28 11:38:17 dlg Exp $ machine i386 # architecture, used by config; REQUIRED @@ -9,13 +9,10 @@ option I486_CPU option I586_CPU option I686_CPU -option GPL_MATH_EMULATE # floating point emulation option SMALL_KERNEL option NO_PROPOLICE -#option DUMMY_NOPS # speed hack; recommended - maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC @@ -25,7 +22,7 @@ option FFS # UFS option EXT2FS # Linux ext2fs -#option NFSCLIENT # Network File System client +option NFSCLIENT # Network File System client option CD9660 # ISO 9660 + Rock Ridge file system option UDF # UDF (DVD) file system @@ -134,7 +131,7 @@ #scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver -ural* at uhub? # Ralink +ural* at uhub? # Ralink RT2500 npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? @@ -184,14 +181,16 @@ scsibus* at aha? ahb* at eisa? # Adaptec 174[024] SCSI controllers scsibus* at ahb? -ahc0 at isa? # Adaptec 284x SCSI controllers +#ahc0 at isa? # Adaptec 284x SCSI controllers ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers scsibus* at ahc? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? +arc* at pci? # Areca RAID Controllers +scsibus* at arc? +mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface +scsibus* at mpi? dpt* at pci? # DPT SmartCache/SmartRAID PCI dpt* at eisa? # DPT SmartCache/SmartRAID EISA scsibus* at dpt? @@ -201,6 +200,8 @@ #scsibus* at aac? ami* at pci? # AMI MegaRAID controllers scsibus* at ami? +mfi* at pci? # LSI MegaRAID SAS controllers +scsibus* at mfi? cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers cac* at eisa? scsibus* at cac? @@ -237,9 +238,11 @@ scsibus* at wds? # I2O -iop* at pci? # I2O -ioprbs* at iop? # Random block storage +iop* at pci? # I2O processor +ioprbs* at iop? # I2O arrays scsibus* at ioprbs? +iopsp* at iop? # I2O SCSI pass-through +scsibus* at iopsp? sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives @@ -284,6 +287,7 @@ el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet ep0 at isa? # 3C509 ethernet ep* at isa? # 3C509 ethernet +ep* at isapnp? # 3C509 PnP ethernet ef* at isapnp? # 3C515 PnP ethernet ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #ie1 at isa? port 0x300 irq 10 # EtherExpress @@ -293,8 +297,6 @@ ep* at eisa? # 3C579 ethernet ef* at isapnp? # 3C515 ethernet #fea* at eisa? # DEC DEFEA FDDI -le* at pci? # PCnet-PCI based ethernet -ep* at isapnp? # 3C509 PnP ethernet le* at isapnp? pcn* at pci? # AMD PCnet-PCI Ethernet de* at pci? # DC21X4X-based ethernet @@ -320,21 +322,28 @@ ste* at pci? # Sundance ST201 ethernet sis* at pci? # SiS 900/7016 ethernet wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet ti* at pci? # Alteon Tigon 1Gb ethernet skc* at pci? # SysKonnect GEnesis 984x sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above em* at pci? # Intel Pro/1000 ethernet +ixgb* at pci? # Intel Pro/10Gb ethernet txp* at pci? # 3com 3CR990 nge* at pci? # NS DP83820/DP83821 GigE re* at pci? # Realtek 8169/8169S/8110S re* at cardbus? # Realtek 8169/8169S/8110S stge* at pci? # Sundance TC9021 GigE -bge* at pci? # Broadcom BCM570x (aka Tigon3) -#lge* at pci? # Level1 LXT1001 GigE +bge* at pci? # Broadcom BCM57xx (aka Tigon3) +bnx* at pci? # Broadcom BCM5706/5708 GigE +lge* at pci? # Level1 LXT1001 GigE mtd* at pci? # Myson MTD803 hme* at pci? # Sun Happy Meal bce* at pci? # Broadcom BCM4401 vge* at pci? # VIA VT612x +nfe* at pci? # NVIDIA nForce Ethernet +xge* at pci? # Neterion Xframe-I/II 10Gb ethernet # Wireless network cards ath* at pci? # Atheros AR5k (802.11a/b/g) @@ -347,8 +356,8 @@ an* at pcmcia? # Aironet IEEE 802.11DS #cnw* at pcmcia? # Xircom Netwave ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH -ral* at pci? # Ralink RT2500 -ral* at cardbus? # Ralink RT2500 +ral* at pci? # Ralink RT2500/RT2501/RT2600 +ral* at cardbus? # Ralink RT2500/RT2501/RT2600 rtw* at pci? # Realtek 8180 rtw* at cardbus? # Realtek 8180 diff -rNu yaifo-0.2/i386/list yaifo-0.2-40p1/i386/list --- ./i386/list Sun Dec 11 15:05:39 2005 +++ ./i386/list Fri Nov 3 14:30:10 2006 @@ -3,8 +3,6 @@ LINK instbin sbin/fdisk LINK instbin sbin/mount_msdos LINK instbin sbin/mount_ext2fs -LINK instbin sbin/wicontrol -LINK instbin sbin/ancontrol LINK instbin sbin/ccdconfig LINK instbin sbin/apm sbin/zzz LINK instbin sbin/apmd diff -rNu yaifo-0.2/install.sh yaifo-0.2-40p1/install.sh --- ./install.sh Sun Dec 11 15:05:40 2005 +++ ./install.sh Tue Nov 21 17:10:17 2006 @@ -331,6 +331,7 @@ # one. This preserves any existing domain information in the hostname. ask_until "\nSystem hostname? (short form, e.g. 'foo')" "$(hostname -s)" [[ ${resp%%.*} != $(hostname -s) ]] && hostname $resp +THESETS="$THESETS site$VERSION-$(hostname -s).tgz" # Remove existing network configuration files in /tmp to ensure they don't leak # onto the installed system in the case of a restarted install. Any information @@ -425,6 +426,13 @@ echo -n "Writing network configuration..." write_netconfig echo "done." + +ask_yn "Do you want to copy the SSH Host Keys from the Yaifo image?" "yes" +if [[ $resp == y ]] ; then + echo -n "Copying SSH Host Keys..." + cp -p /etc/ssh_host*_key* /mnt/etc/ssh/. > /dev/null 2>&1 + echo "done." +fi # Perform final steps common to both an install and an upgrade. finish_up diff -rNu yaifo-0.2/install.sub yaifo-0.2-40p1/install.sub --- ./install.sub Sun Dec 11 15:05:40 2005 +++ ./install.sub Tue Nov 21 15:47:49 2006 @@ -1,7 +1,7 @@ -# $OpenBSD: install.sub,v 1.390 2005/08/29 17:47:55 krw Exp $ +# $OpenBSD: install.sub,v 1.406 2006/08/29 01:02:49 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # -# Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback +# Copyright (c) 1997-2006 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -76,24 +76,24 @@ # MDDKDEVS - '/^[sw]d[0-9][0-9]* /s/ .*//p' assumed if not provided # MDCDDEVS - '/^cd[0-9][0-9]* /s/ .*//p' assumed if not provided # MDMTDEVS - '/^[cmsw]t[0-9][0-9]* /s/ .*//p' +# MDSERIAL - offer to configure a serial console # MDXAPERTURE - set machdep.allowaperture=value in sysctl.conf . install.md set_term() { local _tables - [[ -n $TERM ]] && return - ask "Terminal type?" ${MDTERM:-vt220} - TERM=$resp - export TERM + TERM=${TERM:-${MDTERM:-vt220}} + ask "Terminal type?" $TERM + export TERM=$resp [[ -x /sbin/kbd ]] || return _tables=$(bsort $(kbd -l | egrep -v "^(user|tables|encoding)")) while :; do - ask "kbd(8) mapping? ('?' for list)" "none" + ask "kbd(8) mapping? ('L' for list)" "none" case $resp in + [Ll?]) echo "Major tables: $_tables" ;; none) return ;; - "?") echo "Major tables: $_tables" ;; *) kbd $resp && { echo $resp >/tmp/kbdtype ; return ; } ;; esac done @@ -168,6 +168,18 @@ echo "Cool! Let's get to it." } +# Echo the file $1 to standard output, skipping any lines that begin with a +# '#'. i.e. strip comment lines from the file. +stripcom () { + local _l + + [[ -f $1 ]] || return + + while read _l; do + [[ -n ${_l%%#*} ]] && echo $_l + done <$1 +} + scan_dmesg() { bsort $(sed -ne "$1" /var/run/dmesg.boot) } @@ -179,6 +191,15 @@ } # Get the first (lowest unit #) serial device if any, if MDSERIAL is set. +# +# MDSERIAL is of the form +# +# " " +# +# So "pccom com tty0" means the dmesg is searched for devices pccom0, pccom1, +# ... pccom9. If pccom2 is found, then com2 and tty02 are used in serial +# console configuration via boot.conf commands and /etc/ttys. +# # NOTE: Only single digit serial devices (0 -> 9) are looked for. get_serialdev() { local _d _bd _td @@ -483,7 +504,7 @@ Select sets by entering a set name, a file name pattern or 'all'. De-select sets by prepending a '-' to the set name, file name pattern or 'all'. Selected -sets are labelled '[x]'. +sets are labelled '[X]'. __EOT while :; do _action= @@ -707,7 +728,7 @@ v6_defroute $_ifs [[ $resp == none ]] && return route -n add -inet6 -host default "$resp" || return - echo "!route -qn add -host -inet6 default $resp" >>$_hn + echo "$resp" >>/tmp/mygate } v4_defroute() { @@ -760,7 +781,7 @@ # Much of this is gratuitously stolen from /etc/netstart. enable_network() { - local _netfile + local _netfile _gw # Copy any required or optional files found for _netfile in hosts dhclient.conf resolv.conf resolv.conf.tail protocols services; do @@ -806,13 +827,13 @@ "dhcp") [ "$name" = "NONE" ] && name= [ "$mask" = "NONE" ] && mask= [ "$bcaddr" = "NONE" ] && bcaddr= - ifconfig $if $name $mask $bcaddr $ext1 $ext2 down - cmd="dhclient $if" + dhcpif="$dhcpif $if" + cmd="ifconfig $if $name $mask $bcaddr $ext1 $ext2 down" + cmd="$cmd; dhclient $if" ;; "rtsol") - ifconfig $if $name $mask $bcaddr $ext1 $ext2 up - rtsif="$rtsif $if" - cmd= + rtsolif="$rtsolif $if" + cmd="ifconfig $if $name $mask $bcaddr $ext1 $ext2 up" ;; "up") # The only one of these guaranteed to be set is $if @@ -863,14 +884,21 @@ done /dev/null 2>&1 - route -qn add -host default $(/dev/null 2>&1 + route -qn add -host default $_gw && break + done + [[ -z $rtsolif ]] && stripcom /mnt/etc/mygate | while read _gw; do + [[ $_gw == !(*:*) ]] && continue + route -qn delete -inet6 default >/dev/null 2>&1 + route -qn add -host -inet6 default $_gw && break + done # Use loopback, not the wire. route -qn add -host `hostname` 127.0.0.1 >/dev/null @@ -904,7 +932,8 @@ for _f in $THESETS; do isin $_f $_files || continue; _sets=$(addel $_f $_sets) - isin $_f $DEFAULTSETS && _get_sets=$(addel $_f $_get_sets) + isin $_f $DEFAULTSETS "site$VERSION-$(hostname -s).tgz" && \ + _get_sets=$(addel $_f $_get_sets) done if [[ -z $_sets ]]; then @@ -1019,9 +1048,8 @@ [[ $resp == none ]] || export ftp_proxy=$resp http_proxy=$resp rm -f $SERVERLIST - ask_yn "Display the list of known $_url_type servers?" "${_get_server_list:-yes}" - _get_server_list=$resp - if [[ $_get_server_list == y ]]; then + ask_yn "Display the list of known $_url_type servers?" + if [[ $resp == y ]]; then # ftp.openbsd.org == 129.128.5.191 and will remain at # that address for the forseeable future. echo -n "Getting the list from 129.128.5.191 (ftp.openbsd.org)..." @@ -1092,9 +1120,10 @@ ask_until "Login?" "${_ftp_server_login:=anonymous}" _ftp_server_login=$resp - # Get password unless anonymous - _passwd=root@`hostname` - if [[ $_ftp_server_login != anonymous ]]; then + # Get password unless login in 'anonymous' or 'ftp' + if [[ $_ftp_server_login == @(anonymous|ftp) ]]; then + _passwd=root@`hostname` + else resp= while [[ -z $resp ]] ; do askpass "Password? (will not echo)" @@ -1526,14 +1555,14 @@ >>/mnt/etc/rc.conf.local fi - ask_yn "Start ntpd(8) by default?" no + ask_yn "Start ntpd(8) by default?" if [[ $resp == y ]]; then echo "ntpd_flags= # enabled during install" \ >>/mnt/etc/rc.conf.local fi if [[ -n $MDXAPERTURE ]]; then - ask_yn "Do you expect to run the X Window System?" yes + ask_yn "Do you expect to run the X Window System?" if [[ $resp == y ]]; then sed -e "/^#\(machdep\.allowaperture=${MDXAPERTURE}\)/s//\1 /" \ /mnt/etc/sysctl.conf >/tmp/sysctl.conf @@ -1619,7 +1648,7 @@ ROOTDISK= ROOTDEV= -VERSION=38 +VERSION=40 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))" SETDIR="$VNAME/$ARCH" diff -rNu yaifo-0.2/list yaifo-0.2-40p1/list --- ./list Sun Dec 11 15:05:40 2005 +++ ./list Tue Nov 21 17:11:35 2006 @@ -85,12 +85,15 @@ SPECIAL chmod 755 install net upgrade sbin/dhclient-script COPY ${CURDIR}/authorized_keys etc/authorized_keys +COPY ${CURDIR}/ssh_host_rsa_key etc/ssh_host_rsa_key +COPY ${CURDIR}/ssh_host_dsa_key etc/ssh_host_dsa_key +COPY ${CURDIR}/ssh_host_key etc/ssh_host_key +COPY ${CURDIR}/ssh_host_rsa_key.pub etc/ssh_host_rsa_key.pub +COPY ${CURDIR}/ssh_host_dsa_key.pub etc/ssh_host_dsa_key.pub +COPY ${CURDIR}/ssh_host_key.pub etc/ssh_host_key.pub COPY ${CURDIR}/sshd_config etc/sshd_config SPECIAL echo "/bin/ksh" > etc/shells SPECIAL sed 's!^root.*!root:x:0:0:daemon:0:0:Charlie \&,,,:/root:/bin/ksh!' <${SRCDIR}/etc/master.passwd >etc/master.passwd SPECIAL /usr/sbin/pwd_mkdb -d etc etc/master.passwd SPECIAL mkdir root && echo '. /.profile' > root/.profile && chmod 700 root -SPECIAL ssh-keygen -q -t rsa -f etc/ssh_host_rsa_key -N '' -SPECIAL ssh-keygen -q -t dsa -f etc/ssh_host_dsa_key -N '' -SPECIAL ssh-keygen -q -t rsa1 -f etc/ssh_host_key -N '' diff -rNu yaifo-0.2/net.sh yaifo-0.2-40p1/net.sh --- ./net.sh Sun Dec 11 15:05:40 2005 +++ ./net.sh Tue Nov 21 16:44:37 2006 @@ -50,6 +50,9 @@ route add default ${GATEWAY} rm /etc/resolv.conf echo "nameserver ${DNS}" > /etc/resolv.conf + if [ "${SEARCH}" != "" ]; then + echo "search ${SEARCH}" >> /etc/resolv.conf + fi echo "lookup file bind" >> /etc/resolv.conf fi } diff -rNu yaifo-0.2/ssh/sshd/Makefile yaifo-0.2-40p1/ssh/sshd/Makefile --- ./ssh/sshd/Makefile Sun Dec 11 15:05:40 2005 +++ ./ssh/sshd/Makefile Fri Nov 3 14:30:10 2006 @@ -14,7 +14,7 @@ auth2-none.c auth2-passwd.c auth2-pubkey.c \ monitor_mm.c monitor.c monitor_wrap.c \ kexdhs.c kexgexs.c \ - authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ + authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c \ cipher.c cipher-3des1.c cipher-bf1.c cipher-ctr.c \ compat.c compress.c crc32.c deattack.c fatal.c \ hostfile.c log.c match.c nchan.c packet.c readpass.c \ @@ -22,7 +22,7 @@ key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \ ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \ - monitor_fdpass.c + monitor_fdpass.c md-sha256.c .include