Update to PicoBSD 0.44 from RELENG_

4 files changed, 12 insertions, 29 deletions

diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index f58a107..27ae9d3 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -1,22 +1,9 @@
 #
-# $Id: crunch.conf,v 1.5 1999/01/19 23:12:50 abial Exp $
+# $Id: crunch.conf,v 1.5.2.3 1999/05/21 15:39:02 roger Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
-# sources for kget & vm
-srcdirs ../../tinyware
-# sources for ucd-snmp - they must be already patched & configured!
-# The necessary steps are given below:
-#  * you have to comment out the line with 'CONFIGURE_ARGS' in
-#    /usr/ports/net/ucd-snmp/Makefile - otherwise you'll end up with
-#     shared libsnmp library, and we want a static one.
-#  * you have to symlink subdirectory agent -> snmpd
-#  * you have to properly construct an OBJS variable in snmpd/Makefile:
-#	OBJS=${MIBOBJS} ${AGENTOBJS}
-#  * we install a special version of MIB files - stripped of comments and
-#    descriptions. These MIBs are included here to save you the stripping.
-#srcdirs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5.3
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -25,15 +12,16 @@ srcdirs /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin
 srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
+# sources for ns & vm
+srcdirs ../../tinyware
 
-progs ash test echo hostname ln login getty stty
+progs sh test echo hostname ln login getty stty
 progs inetd telnetd w msg kget reboot
 progs init ifconfig df sps ns vm cat
 progs cp rm mknod chmod chown mkdir ls syslogd
 progs sysctl route pwd_mkdb dev_mkdb
 progs mount mount_msdos umount
 progs kill mount_std natd
-#progs snmpd
 
 progs pwd ppp telnet more
 progs passwd date
@@ -42,10 +30,7 @@ progs mount_cd9660 mount_nfs ping traceroute routed ipfw
 ln mount_cd9660 cd9660
 ln mount_nfs nfs
 ln test [
-ln ash -sh
-ln ash sh
-# XXX Why? Some bug in crunchgen?
-#ln newfs mfs
+ln sh -sh
 ln mount_msdos msdos
 ln mount_std procfs
 ln mount_std mount_procfs
@@ -54,8 +39,6 @@ ln msg dmesg
 ln ns netstat
 ln chown chgrp
 
-# For snmpd
-#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5.3/snmplib/libsnmp.a
-libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias
+libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias -lwrap
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
-libs -lgnuregex -ltelnet
+libs -lgnuregex -ltelnet -lradius
diff --git a/release/picobsd/net/floppy.tree/etc/login.conf b/release/picobsd/net/floppy.tree/etc/login.conf
index b93cac1..c9596aa 100644
--- a/release/picobsd/net/floppy.tree/etc/login.conf
+++ b/release/picobsd/net/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.2 1999/01/12 14:09:21 asami Exp $
+#	$Id: login.conf,v 1.2.2.1 1999/04/30 18:48:10 hoek Exp $
 #
 
 
diff --git a/release/picobsd/net/lang/update.en b/release/picobsd/net/lang/update.en
index cf6e1b1..7720a18 100755
--- a/release/picobsd/net/lang/update.en
+++ b/release/picobsd/net/lang/update.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: update.en,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+# $Id: update.en,v 1.2.2.1 1999/05/07 10:03:29 abial Exp $
 pwd=`pwd`
 echo -n "Updating /etc contents on startup floppy...  "
 mount /dev/fd0a /start_floppy
@@ -17,7 +17,7 @@ cp -Rp . /start_floppy/etc/
 pwd_mkdb master.passwd
 echo " Done."
 echo -n "Updating kernel parameters...  "
-kget /start_floppy/kernel.config
+kget /start_floppy/boot/kernel.conf
 umount /dev/fd0a
 cd ${pwd}
 echo " Done."
diff --git a/release/picobsd/net/lang/update.pl b/release/picobsd/net/lang/update.pl
index 3055d05..51fee7c 100755
--- a/release/picobsd/net/lang/update.pl
+++ b/release/picobsd/net/lang/update.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: update.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+# $Id: update.pl,v 1.2.2.1 1999/05/07 10:03:30 abial Exp $
 pwd=`pwd`
 echo -n "Uaktualniam katalog /etc na dyskietce...  "
 mount /dev/fd0a /start_floppy
@@ -17,7 +17,7 @@ cp -Rp . /start_floppy/etc/
 pwd_mkdb master.passwd
 echo " Zrobione."
 echo -n "Uaktualniam parametry jadra..."
-kget /start_floppy/kernel.config
+kget /start_floppy/boot/kernel.conf
 umount /dev/fd0a
 cd ${pwd}
 echo " Zrobione."