Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Config files installation works now

Browse Source 
Change-Id: I2f0b23d8bce56cf00eeb5a22631145bd29f8a271
This commit is contained in:
Lionel Sambuc
2017-10-07 08:06:49 +02:00
parent 61020f23a6
commit c45c9fc420
11 changed files with 149 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/external/bsd/openssh/Makefile vendored
View File

@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2009/06/07 22:38:44 christos Exp $
SUBDIR= lib .WAIT bin .WAIT etc
SUBDIR= lib .WAIT bin
.include <bsd.subdir.mk>

9
crypto/external/bsd/openssh/bin/Makefile vendored
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:21 adam Exp $
.include <bsd.own.mk>
.include <bsd.obj.mk>
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
@@ -9,10 +8,10 @@ SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper
.PATH: ${SSHDIST}
#.MADE: moduli
#CONFIGFILES= ssh_config sshd_config moduli
#FILESDIR= /etc/ssh
#FILESDIR_moduli=/etc
.MADE: moduli
CONFIGFILES= ssh_config sshd_config moduli
FILESDIR= /etc/ssh
FILESDIR_moduli=/etc
.include <bsd.files.mk>
.include <bsd.subdir.mk>

9
crypto/external/bsd/openssh/dist/sshd_config vendored
View File

@@ -102,12 +102,19 @@ AuthorizedKeysFile .ssh/authorized_keys
#X11Forwarding no
#X11DisplayOffset 10
#X11UseLocalhost yes
# LSC: Uncomment if you wish to use X11 forwarding. To actually
# activate X11 forwarding, you also need to set X11Forwarding yes.
#XAuthLocation /usr/X11R7/bin/xauth # LSC: Use Native xauth
#X11UseLocalhost no # LSC: Workaround SSHD bug
#PermitTTY yes
#PrintMotd yes
#PrintLastLog yes
#TCPKeepAlive yes
#UseLogin no
UsePrivilegeSeparation sandbox # Default for new installations.
#UsePrivilegeSeparation sandbox # Default for new installations.
UsePrivilegeSeparation no # LSC: for Minix, this is not supported ATM.
#PermitUserEnvironment no
#Compression delayed
#ClientAliveInterval 0

14
crypto/external/bsd/openssh/etc/Makefile vendored
View File

@@ -1,14 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:21 adam Exp $
.include <bsd.own.mk>
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
.PATH: ${SSHDIST}
.MADE: moduli
FILESDIR=/etc/ssh
FILESDIR_moduli=/etc
FILES= ssh_config sshd_config moduli
.include <bsd.files.mk>
.include <bsd.subdir.mk>

7
crypto/external/bsd/openssh/etc/Makefile.inc vendored
View File

@@ -1,7 +0,0 @@
# $NetBSD: Makefile.inc,v 1.3 2014/10/19 16:30:58 christos Exp $
CPPFLAGS+=-DWITH_OPENSSL
LDADD+= -lssh -lcrypto -lcrypt -lz
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
.include "${.PARSEDIR}/../Makefile.inc"

2
distrib/sets/lists/minix-base/mi
View File

@@ -163,6 +163,7 @@
./etc/rc.d/pwcheck minix-base
./etc/rc.d/root minix-base
./etc/rc.d/rtadvd minix-base
./etc/rc.d/sshd minix-base crypto
./etc/rc.d/staticroute minix-base
./etc/rc.d/sysctl minix-base
./etc/rc.d/sysdb minix-base
@@ -194,6 +195,7 @@
./etc/spwd.db minix-base
./etc/ssh minix-base
./etc/ssh/ssh_config minix-base crypto
./etc/ssh/ssh_known_hosts minix-base crypto
./etc/ssh/sshd_config minix-base crypto
./etc/syslog.conf minix-base
./etc/system.conf minix-base

6
etc/Makefile
View File

@@ -483,13 +483,17 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/rc.capes/* ${DESTDIR}/etc/rc.capes
${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/minix/drivers/usb/usbd/usbd.conf ${DESTDIR}/etc/system.conf.d/usbd
.endif # Minix/earm specific
.for subdir in . defaults mtree namedb rc.d root skel
.for subdir in . defaults mtree namedb rc.d root skel ssh
${MAKEDIRTARGET} ${subdir} configinstall
.endfor
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/dhcpcd/sbin/dhcpcd configinstall
${_MKMSG_INSTALL} ${DESTDIR}/usr/lib/fonts
${INSTALL_DIR} ${DESTDIR}/usr/lib/fonts
${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/fonts/*.fnt ${DESTDIR}/usr/lib/fonts/
.if (${MKCRYPTO} != "no")
${MAKEDIRTARGET} ${NETBSDSRCDIR}/crypto/external/bsd/openssh/bin configinstall
.endif
.endif # LSC Minix Specific

2
etc/rc.d/Makefile
View File

@@ -47,7 +47,7 @@ CONFIGFILES=\
\
root rtadvd \
\
\
sshd \
staticroute sysctl sysdb syslogd \
ttys \
wscons \

62
etc/rc.d/sshd Executable file
View File

@@ -0,0 +1,62 @@
#!/bin/sh
#
# $NetBSD: sshd,v 1.23 2014/10/19 16:33:01 christos Exp $
#
# PROVIDE: sshd
# REQUIRE: LOGIN
$_rc_subr_loaded . /etc/rc.subr
name="sshd"
rcvar=$name
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="/etc/ssh/sshd_config"
extra_commands="keygen reload"
sshd_keygen()
{
(
keygen="/usr/bin/ssh-keygen"
umask 022
while read type bits filename version name; do
f="/etc/ssh/$filename"
if [ -f "$f" ]; then
echo "You already have an $name host key in $f"
echo "Skipping protocol version $version $name" \
"Key Generation"
else
case "${bits}" in
-1) bitarg=;;
0) bitarg="${ssh_keygen_flags}";;
*) bitarg="-b ${bits}";;
esac
"${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
fi
done << _EOF
rsa1 0 ssh_host_key 1 RSA
dsa 1024 ssh_host_dsa_key 2 DSA
ecdsa 521 ssh_host_ecdsa_key 1 ECDSA
ed25519 -1 ssh_host_ed25519_key 1 ED25519
rsa 0 ssh_host_rsa_key 2 RSA
_EOF
)
}
sshd_precmd()
{
if [ ! -f /etc/ssh/ssh_host_key -o \
! -f /etc/ssh/ssh_host_dsa_key -o \
! -f /etc/ssh/ssh_host_ecdsa_key -o \
! -f /etc/ssh/ssh_host_ed25519_key -o \
! -f /etc/ssh/ssh_host_rsa_key ]; then
run_rc_command keygen
fi
}
keygen_cmd=sshd_keygen
start_precmd=sshd_precmd
load_rc_config $name
run_rc_command "$1"

12
etc/ssh/Makefile Normal file
View File

@@ -0,0 +1,12 @@
# $NetBSD: Makefile,v 1.2 2006/06/26 19:50:57 mrg Exp $
.include <bsd.own.mk>
.if ${MKCRYPTO} != "no"
CONFIGFILES= ssh_known_hosts
FILESDIR= /etc/ssh
.endif
.include <bsd.prog.mk>

54
etc/ssh/ssh_known_hosts Normal file
View File

@@ -0,0 +1,54 @@
# $NetBSD: ssh_known_hosts,v 1.9 2015/09/23 12:14:51 wiz Exp $
#
anoncvs.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
anoncvs.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFhP4E9+oDpCQZ9yVQA7OzDF0tHnL3eykrqEt3hS+rdHXA0Ak5uCaxi2Aj2JRnAKW1JYbjQ5hyKHYZ2o6SfDimqaQBAt18nWm4CCKc20UbSgyWaH/x+O3J68j5n43MY8gHycPKcLHly2FjhDhuhHuoYODfq9GYn3okYsMu2T/i6Tg+SKw==
#
cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk=
cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q==
#
ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
morden.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A==
morden.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A==
#
mail.netbsd.org,homeworld.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ==
#
pkgbuild.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
pkgbuild.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ==
#
build.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
build.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHYkX/uBJWozv+YkhVu4lvyPw8vlmD8oElKC3jNi2fWiWh+8naw7pTvscgqW5kzihSebdZ8eHnb1+oBOqgjlyaSPgFy+Jvtf2DunOrWTZ1sxSPS5c3j4A35cufNH/cYO5KbWb06h39BUi7c4iB5o0yfguNutuyBPlI9T9GKUmzU1SpfrA==
#
www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
releng.netbsd.org,wiki.netbsd.org,mollari.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHay/FAe8Qu8v0MsCzeelmfe98eeX9adicMWzPfpIMZP72kBBHoCj8gTPWMXcck0ilM/NjtW9j7og5sBojei55mkQENwiJhXf5QTBoTOGDuOUNhObo20xLh8munc7Hpd5+47o5grSDMQHhUwNRoGkHryNxDE4o/AGEdCXqP1OXe7Y57zw==
blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHay/FAe8Qu8v0MsCzeelmfe98eeX9adicMWzPfpIMZP72kBBHoCj8gTPWMXcck0ilM/NjtW9j7og5sBojei55mkQENwiJhXf5QTBoTOGDuOUNhObo20xLh8munc7Hpd5+47o5grSDMQHhUwNRoGkHryNxDE4o/AGEdCXqP1OXe7Y57zw==
releng.netbsd.org,wiki.netbsd.org,mollari.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHay/FAe8Qu8v0MsCzeelmfe98eeX9adicMWzPfpIMZP72kBBHoCj8gTPWMXcck0ilM/NjtW9j7og5sBojei55mkQENwiJhXf5QTBoTOGDuOUNhObo20xLh8munc7Hpd5+47o5grSDMQHhUwNRoGkHryNxDE4o/AGEdCXqP1OXe7Y57zw==
#
garibaldi.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc=
garibaldi.NetBSD.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGItoiqhakV8VrpiuyiHHCAbkjhji6kK8sM0OuAksvfzW1tlSgI2q2X786V24TMm/Qmsk2ykqYVy57gSGsN0QSbeQDM7H96SYqgR9s7XVhJEjIUTTYZ3TSQd8tJanPPg33JRUYvBnOWFKAPfITCvQDhahT+oJXUleKEl/bVtZfmBh/yxw==
#
babylon5.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwR5xZ0J/jfvT4ZqlJy/JkVbZV2FRqkq/IbyL2aM4FAFDWKxOsm+kvScXGnoGKb9fT9EJAhJNjYjAAGkmFdT/Q97MFYghKUhGW85y4b37SWaFgITGYjEObGy9G2dRWcTion9Ve1fLe2eCO5o4EIsCIfvTA53Fp721o5lPgG6RUVU=
babylon5.netbsd.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg==
#
wip.pkgsrc.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17
wip.pkgsrc.org ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g==
#