Update to PicoBSD 0.44 from RELENG_3

5 files changed, 17 insertions, 29 deletions

diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf
index 390e391..ac6b2ec 100644
--- a/release/picobsd/isp/crunch1/crunch.conf
+++ b/release/picobsd/isp/crunch1/crunch.conf
@@ -1,22 +1,9 @@
 #
-# $Id: crunch.conf,v 1.5 1999/01/19 23:10:34 abial Exp $
+# $Id: crunch.conf,v 1.5.2.2 1999/05/07 10:02:57 abial 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
 # 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
+progs sh test echo hostname ln login getty
 progs inetd telnetd stty w msg kget natd reboot
 progs init fsck ifconfig df ps ns vm cat
 progs cp rm mkdir ls chmod chown
 progs sysctl route swapon pwd_mkdb dev_mkdb
 progs mount mount_msdos umount comcontrol
 progs kill mount_std natd
-#progs snmpd
 
 progs pwd pppd telnet more
 progs passwd date
@@ -42,20 +30,15 @@ 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
+ln sh -sh
 #ln newfs mount_mfs
 ln chown chgrp
-# XXX Why? Some bug in crunchgen?
-#ln newfs mfs
 ln mount_msdos msdos
 ln mount_std procfs
 ln mount_std mount_procfs
 ln msg dmesg
 ln ns netstat
 
-# For snmpd
-#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5/snmplib/libsnmp.a
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
-libs -lmytinfo -lipx -lz -lpcap -lalias
+libs -lmytinfo -lipx -lz -lpcap -lalias -lwrap
 libs -ltermcap -lgnuregex -ltelnet -lcurses
diff --git a/release/picobsd/isp/lang/README.en b/release/picobsd/isp/lang/README.en
index d1dc2dc..3f4128d 100644
--- a/release/picobsd/isp/lang/README.en
+++ b/release/picobsd/isp/lang/README.en
@@ -1,4 +1,4 @@
-1998.07.20, Warsaw, Poland
+1999.04.20, Warsaw, Poland
 
 				PicoBSD @VER@
 				-----------
@@ -25,6 +25,10 @@ What are minimal requirements?
   two PPP connections (tun interfaces). So you can easily build something like
   router with as many as 6 outlets :-)
 
+If you want to build a NAT (a.k.a. masquerading) router for your local
+network, it's often enough if you run 'ppp -alias' on your serial line.
+However, if you use ethernet cards, you should use combination of natd(8)
+and ipfw(8). See the documentation on your full FreeBSD system.
 
 I'll be glad hearing from you about your experiences with PicoBSD. Thanks.
 
diff --git a/release/picobsd/isp/lang/update.en b/release/picobsd/isp/lang/update.en
index a821d4c..0f751e9 100755
--- a/release/picobsd/isp/lang/update.en
+++ b/release/picobsd/isp/lang/update.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: update.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: update.en,v 1.2.2.1 1999/05/07 10:03:03 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/isp/lang/update.pl b/release/picobsd/isp/lang/update.pl
index 1b2c523..e55ef89 100755
--- a/release/picobsd/isp/lang/update.pl
+++ b/release/picobsd/isp/lang/update.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: update.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: update.pl,v 1.2.2.1 1999/05/07 10:03:04 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."
diff --git a/release/picobsd/isp/mfs.tree/Makefile b/release/picobsd/isp/mfs.tree/Makefile
index 40bffa4..010abc5 100644
--- a/release/picobsd/isp/mfs.tree/Makefile
+++ b/release/picobsd/isp/mfs.tree/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/09/20 00:46:25 abial Exp $
+# $Id: Makefile,v 1.2.2.1 1999/05/09 22:04:05 abial Exp $
 #
 
 DESTDIR?=/mnt
@@ -40,3 +40,4 @@ devnodes: tree
 	rm MAKEDEV)
 
 clean:
+