PERFORCE change 29749 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Apr 25 17:23:51 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=29749
Change 29749 by marcel at marcel_pluto1 on 2003/04/25 17:23:07
IFia64
Affected files ...
.. //depot/projects/ia64_epc/UPDATING#5 integrate
.. //depot/projects/ia64_epc/etc/pam.d/passwd#2 integrate
.. //depot/projects/ia64_epc/etc/rc.d/Makefile#5 integrate
.. //depot/projects/ia64_epc/etc/rc.d/early.sh#1 branch
.. //depot/projects/ia64_epc/etc/rc.d/hostname#2 integrate
.. //depot/projects/ia64_epc/etc/rc.d/ipfilter#4 integrate
.. //depot/projects/ia64_epc/etc/rc.d/ipfs#2 integrate
.. //depot/projects/ia64_epc/etc/rc.d/ipmon#2 integrate
.. //depot/projects/ia64_epc/etc/rc.d/ipnat#2 integrate
.. //depot/projects/ia64_epc/etc/rc.d/securelevel#2 integrate
.. //depot/projects/ia64_epc/etc/rc.d/sysctl#2 integrate
.. //depot/projects/ia64_epc/gnu/lib/libstdc++/c++config.h#3 integrate
.. //depot/projects/ia64_epc/gnu/lib/libstdc++/config.h#3 integrate
.. //depot/projects/ia64_epc/lib/Makefile#4 integrate
.. //depot/projects/ia64_epc/lib/libc/gen/getgrent.c#6 integrate
.. //depot/projects/ia64_epc/lib/libc/gen/getpwent.c#6 integrate
.. //depot/projects/ia64_epc/lib/libc/gen/getusershell.c#3 integrate
.. //depot/projects/ia64_epc/lib/libc/net/getaddrinfo.c#3 integrate
.. //depot/projects/ia64_epc/lib/libc/net/gethostnamadr.c#2 integrate
.. //depot/projects/ia64_epc/lib/libc/net/getnetnamadr.c#2 integrate
.. //depot/projects/ia64_epc/lib/libc/net/name6.c#3 integrate
.. //depot/projects/ia64_epc/lib/libc/net/nsdispatch.c#4 integrate
.. //depot/projects/ia64_epc/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate
.. //depot/projects/ia64_epc/lib/libpthread/Makefile#4 integrate
.. //depot/projects/ia64_epc/lib/libpthread/arch/i386/include/ksd.h#2 integrate
.. //depot/projects/ia64_epc/lib/libpthread/sys/thr_error.c#3 integrate
.. //depot/projects/ia64_epc/lib/libpthread/thread/thr_kern.c#6 integrate
.. //depot/projects/ia64_epc/lib/libpthread/thread/thr_private.h#6 integrate
.. //depot/projects/ia64_epc/lib/libstand/bzlib_private.h.diff#2 integrate
.. //depot/projects/ia64_epc/release/Makefile#9 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#3 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate
.. //depot/projects/ia64_epc/sbin/devd/devd.cc#3 integrate
.. //depot/projects/ia64_epc/sbin/fsck/fsck.c#3 integrate
.. //depot/projects/ia64_epc/share/man/man4/acpi.4#2 integrate
.. //depot/projects/ia64_epc/share/man/man4/man4.i386/pae.4#2 integrate
.. //depot/projects/ia64_epc/share/man/man4/syscons.4#3 integrate
.. //depot/projects/ia64_epc/sys/alpha/alpha/machdep.c#5 integrate
.. //depot/projects/ia64_epc/sys/alpha/alpha/sys_machdep.c#4 integrate
.. //depot/projects/ia64_epc/sys/alpha/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/sys/alpha/osf1/osf1_misc.c#3 integrate
.. //depot/projects/ia64_epc/sys/alpha/osf1/osf1_signal.c#5 integrate
.. //depot/projects/ia64_epc/sys/arm/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/ia64_epc/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/ia64_epc/sys/compat/linux/linux_signal.c#6 integrate
.. //depot/projects/ia64_epc/sys/conf/options#8 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_bufs.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_context.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_dma.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_drv.h#5 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_fops.h#4 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_init.h#3 delete
.. //depot/projects/ia64_epc/sys/dev/drm/drm_ioctl.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_lists.h#3 delete
.. //depot/projects/ia64_epc/sys/dev/drm/drm_lock.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_memory.h#4 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_os_freebsd.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_sysctl.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_vm.h#5 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/mga_dma.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/mga_drv.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/mga_drv.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/mga_state.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/r128_cce.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/r128_drv.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/r128_drv.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/r128_state.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_drm.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_drv.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_irq.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_mem.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/radeon_state.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/tdfx_drv.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/en/midway.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/en/midwayreg.h#2 integrate
.. //depot/projects/ia64_epc/sys/dev/en/midwayvar.h#2 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/firewire.c#7 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/fwohci.c#7 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/fwohci_pci.c#6 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/fwohcireg.h#4 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#9 integrate
.. //depot/projects/ia64_epc/sys/dev/fxp/if_fxp.c#11 integrate
.. //depot/projects/ia64_epc/sys/dev/fxp/if_fxpvar.h#4 integrate
.. //depot/projects/ia64_epc/sys/dev/iir/iir.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/iir/iir.h#2 integrate
.. //depot/projects/ia64_epc/sys/dev/iir/iir_ctrl.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/iir/iir_pci.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/pccard/pccardvar.h#4 integrate
.. //depot/projects/ia64_epc/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/ia64_epc/sys/geom/bde/g_bde_work.c#3 integrate
.. //depot/projects/ia64_epc/sys/geom/geom.h#7 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_disk.c#8 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_dump.c#5 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_event.c#8 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_kern.c#5 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_sunlabel.c#7 integrate
.. //depot/projects/ia64_epc/sys/i386/conf/NOTES#9 integrate
.. //depot/projects/ia64_epc/sys/i386/conf/PAE#3 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/sys_machdep.c#5 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/trap.c#7 integrate
.. //depot/projects/ia64_epc/sys/i386/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_proto.h#2 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_syscall.h#2 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysent.c#2 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia32/syscalls.master#4 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#18 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia64/sys_machdep.c#2 integrate
.. //depot/projects/ia64_epc/sys/ia64/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_context.c#4 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_mac.c#8 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_malloc.c#5 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_prot.c#3 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_sig.c#11 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_thread.c#14 integrate
.. //depot/projects/ia64_epc/sys/kern/sys_process.c#5 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/ia64_epc/sys/modules/Makefile#10 integrate
.. //depot/projects/ia64_epc/sys/modules/en/Makefile#1 branch
.. //depot/projects/ia64_epc/sys/net/if_ethersubr.c#6 integrate
.. //depot/projects/ia64_epc/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/ia64_epc/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/ia64_epc/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/ia64_epc/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/ia64_epc/sys/pc98/i386/machdep.c#5 integrate
.. //depot/projects/ia64_epc/sys/pccard/cardinfo.h#2 integrate
.. //depot/projects/ia64_epc/sys/pccard/pccard.c#4 integrate
.. //depot/projects/ia64_epc/sys/pccard/pccard_nbk.c#2 integrate
.. //depot/projects/ia64_epc/sys/pccard/slot.h#2 integrate
.. //depot/projects/ia64_epc/sys/pci/if_en_pci.c#3 integrate
.. //depot/projects/ia64_epc/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/sys/powerpc/powerpc/machdep.c#4 integrate
.. //depot/projects/ia64_epc/sys/powerpc/powerpc/sys_machdep.c#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#8 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/sys_machdep.c#3 integrate
.. //depot/projects/ia64_epc/sys/sys/limits.h#1 branch
.. //depot/projects/ia64_epc/sys/sys/proc.h#12 integrate
.. //depot/projects/ia64_epc/sys/sys/ucontext.h#2 integrate
.. //depot/projects/ia64_epc/sys/vm/swap_pager.h#3 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_contig.c#4 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_glue.c#4 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_map.c#9 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_object.c#10 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_page.c#8 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_pageout.c#7 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/ia64_epc/sys/x86_64/include/_limits.h#2 integrate
.. //depot/projects/ia64_epc/tools/regression/fsx/fsx.c#2 integrate
.. //depot/projects/ia64_epc/usr.bin/calendar/calendars/calendar.birthday#3 integrate
.. //depot/projects/ia64_epc/usr.bin/login/login.c#3 integrate
.. //depot/projects/ia64_epc/usr.sbin/apm/apm.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/chown/Makefile#3 integrate
.. //depot/projects/ia64_epc/usr.sbin/chown/chgrp.1#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/chown/chown.8#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/chown/chown.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/config/mkmakefile.c#4 integrate
.. //depot/projects/ia64_epc/usr.sbin/moused/moused.8#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/newsyslog/newsyslog.8#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/pccard/pccardd/cardd.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/pccard/pccardd/cardd.h#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/quot/quot.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/rpc.lockd/lockd.c#2 integrate
Differences ...
==== //depot/projects/ia64_epc/UPDATING#5 (text+ko) ====
@@ -17,6 +17,31 @@
developers choose to disable these features on build machines
to maximize performance.
+20030423:
+ A bug has been fixed in /dev/devctl which would cause devd
+ to hang on boot, were it not for a workaround in devd. The
+ work around in devd will be removed around 20030507. You
+ have until then to upgrade your kernel before updating
+ userland. In general, you should have a userland and
+ kernel that's in sync with each other. However, given the
+ effects of this bug (hang on boot when starting devd), some
+ allowances are made.
+
+20030329:
+ Alphas with libc from between 20030312 and 20030329 exhibit
+ floating point exceptions (FPEs), most notably in awk(1)
+ while upgrading the system through a buildworld.
+
+ So, to successfully upgrade your Alpha, you must either
+ downgrade your libc.so to a pre-20030312 version, or update
+ /usr/share/mk/bsd.cpu.mk to revision 1.26 which adds -mieee
+ to CFLAGS, then forcibly rebuild and install libc:
+
+ cd /usr/src/lib/libc && \
+ make cleandir && make obj && \
+ make -DNOMAN -DNOPROFILE all && \
+ make -DNOMAN -DNOPROFILE install
+
20030208:
sendmail 8.12.7 has been imported. It has one important
change for IPv6 users. The default submit.mc now uses
@@ -1234,4 +1259,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.245 2003/04/23 14:28:13 schweikh Exp $
+$FreeBSD: src/UPDATING,v 1.247 2003/04/25 20:11:17 ru Exp $
==== //depot/projects/ia64_epc/etc/pam.d/passwd#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/passwd,v 1.2 2003/02/10 00:50:03 des Exp $
+# $FreeBSD: src/etc/pam.d/passwd,v 1.3 2003/04/24 12:22:42 des Exp $
#
# PAM configuration for the "passwd" service
#
@@ -8,4 +8,4 @@
# password
#password requisite pam_passwdqc.so enforce=users
-password required pam_unix.so no_warn try_first_pass
+password required pam_unix.so no_warn try_first_pass nullok
==== //depot/projects/ia64_epc/etc/rc.d/Makefile#5 (text+ko) ====
@@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.14 2003/04/19 01:56:44 mtm Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.15 2003/04/24 08:20:47 mtm Exp $
.include <bsd.own.mk>
FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \
apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \
cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \
- hostname inetd initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat \
- ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref ldconfig \
- local localdaemons lomac lpd motd mountcritlocal mountcritremote \
+ hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \
+ ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref \
+ ldconfig local localdaemons lomac lpd motd mountcritlocal mountcritremote \
mountd moused mroute6d mrouted msgs named netif network1 network2 network3 \
network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \
ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \
==== //depot/projects/ia64_epc/etc/rc.d/hostname#2 (text+ko) ====
@@ -23,11 +23,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/hostname,v 1.1 2003/04/18 17:51:53 mtm Exp $
+# $FreeBSD: src/etc/rc.d/hostname,v 1.2 2003/04/24 08:20:47 mtm Exp $
#
# PROVIDE: hostname
-# REQUIRE: mountcritlocal sysctl tty
+# REQUIRE: mountcritlocal tty
# BEFORE: netif
# KEYWORD: FreeBSD
==== //depot/projects/ia64_epc/etc/rc.d/ipfilter#4 (text+ko) ====
@@ -1,11 +1,12 @@
#!/bin/sh
#
# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfilter,v 1.7 2003/03/22 14:53:23 ume Exp $
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.8 2003/04/24 08:20:47 mtm Exp $
#
# PROVIDE: ipfilter
-# REQUIRE: root beforenetlkm mountcritlocal tty
+# REQUIRE: root beforenetlkm mountcritlocal tty ipmon
+# BEFORE: netif
# KEYWORD: FreeBSD NetBSD
. /etc/rc.subr
@@ -43,8 +44,7 @@
if kldload ipl; then
echo 'IP-filter module loaded.'
else
- warn 'IP-filter module failed to load.'
- return 1
+ err 1 'IP-filter module failed to load.'
fi
fi
==== //depot/projects/ia64_epc/etc/rc.d/ipfs#2 (text+ko) ====
@@ -1,23 +1,47 @@
#!/bin/sh
#
# $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $
+# $FreeBSD: src/etc/rc.d/ipfs,v 1.2 2003/04/24 08:20:47 mtm Exp $
#
# PROVIDE: ipfs
-# REQUIRE: ipnat mountcritremote
-# KEYWORD: shutdown
+# REQUIRE: ipnat
+# BEFORE: netif
+# KEYWORD: FreeBSD NetBSD shutdown
. /etc/rc.subr
name="ipfs"
-rcvar=$name
+rcvar=`set_rcvar`
start_cmd="ipfs_start"
stop_cmd="ipfs_stop"
+case ${OSTYPE} in
+FreeBSD)
+ start_precmd="ipfs_prestart"
+ ;;
+NetBSD)
+ ipfs_program="/usr/sbin/ipfs"
+ ;;
+esac
+
+ipfs_prestart()
+{
+ # Do not continue if either ipnat or ipfilter is not enabled or
+ # if the ipfilter module is not loaded.
+ #
+ if ! checkyesno ipfilter_enable -o ! checkyesno ipnat_enable ; then
+ err 1 "${name} requires either ipfilter or ipnat enabled"
+ fi
+ if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then
+ err 1 "ipfilter module is not loaded"
+ fi
+ return 0
+}
ipfs_start()
{
if [ -r /var/db/ipf/ipstate.ipf -a -r /var/db/ipf/ipnat.ipf ]; then
- /usr/sbin/ipfs -R ${rc_flags}
+ ${ipfs_program} -R ${rc_flags}
rm -f /var/db/ipf/ipstate.ipf /var/db/ipf/ipnat.ipf
fi
}
@@ -29,7 +53,7 @@
chmod 700 /var/db/ipf
chown root:wheel /var/db/ipf
fi
- /usr/sbin/ipfs -W ${rc_flags}
+ ${ipfs_program} -W ${rc_flags}
}
load_rc_config $name
==== //depot/projects/ia64_epc/etc/rc.d/ipmon#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipmon,v 1.4 2002/10/12 10:31:31 schweikh Exp $
+# $FreeBSD: src/etc/rc.d/ipmon,v 1.5 2003/04/24 08:20:47 mtm Exp $
#
# PROVIDE: ipmon
-# REQUIRE: syslogd
+# REQUIRE: mountcritlocal hostname sysctl
# BEFORE: SERVERS
# KEYWORD: FreeBSD NetBSD
@@ -26,9 +26,14 @@
ipmon_precmd()
{
- # Make sure ipfilter is loaded before continuing
+ # Continue only if ipfilter or ipnat is enabled and the
+ # ipfilter module is loaded.
+ #
+ if ! checkyesno ipfilter_enable -o ! checkyesno ipnat_enable ; then
+ err 1 "${name} requires either ipfilter or ipnat enabled"
+ fi
if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then
- return 1
+ err 1 "ipfilter module is not loaded"
fi
return 0
}
==== //depot/projects/ia64_epc/etc/rc.d/ipnat#2 (text+ko) ====
@@ -1,84 +1,65 @@
#!/bin/sh
#
# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipnat,v 1.5 2002/10/26 00:18:06 fenner Exp $
+# $FreeBSD: src/etc/rc.d/ipnat,v 1.7 2003/04/24 18:14:52 mtm Exp $
#
# PROVIDE: ipnat
-# REQUIRE: ipfilter mountcritremote
-# BEFORE: DAEMON
+# REQUIRE: ipfilter
+# BEFORE: DAEMON netif
# KEYWORD: FreeBSD NetBSD
. /etc/rc.subr
name="ipnat"
rcvar=`set_rcvar`
+load_rc_config $name
case ${OSTYPE} in
-FreeBSD)
- IPNATDIR="/sbin"
- start_precmd="ipnat_precmd"
- reload_cmd="ipnat_start"
- ;;
NetBSD)
- IPNATDIR="/usr/sbin"
- config="/etc/ipnat.conf"
- reload_cmd="/usr/sbin/ipnat -F -C -f ${config}"
- start_precmd=
+ ipnat_flags=
+ ipnat_rules="/etc/ipnat.conf"
+ ipnat_program="/usr/sbin/ipnat"
;;
esac
+start_precmd="ipnat_precmd"
start_cmd="ipnat_start"
-stop_cmd="${ipnat_program:-${IPNATDIR}/${name}} -F -C"
+stop_cmd="${ipnat_program} -F -C"
+reload_cmd="${ipnat_program} -F -C -f ${ipnat_rules}"
extra_commands="reload"
ipnat_precmd()
{
+ case ${OSTYPE} in
+ NetBSD)
+ if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then
+ echo "Enabling ipfilter for NAT."
+ /sbin/ipf -E -Fa
+ fi
+ return 0
+ ;;
+ esac
+
# Make sure ipfilter is loaded before continuing
if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then
- err 1 'ipnat requires ipfilter be loaded'
+ if kldload ipl; then
+ echo 'IP-filter module loaded.'
+ else
+ err 1 'IP-filter module failed to load.'
+ fi
fi
return 0
}
ipnat_start()
{
- case ${OSTYPE} in
- FreeBSD)
- echo -n 'Installing NAT rules ... '
- if [ -r "${ipnat_rules}" ]; then
- ${ipnat_program:-/sbin/ipnat} -CF -f \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- echo '.'
-
- # restore filter/NAT state tables after loading the rules
- if checkyesno ipfs_enable; then
- if [ -r "/var/db/ipf/ipstate.ipf" ]; then
- echo -n ' ipfs'
- ${ipfs_program:-/sbin/ipfs} -R ${ipfs_flags}
- # remove files to avoid reloading old state
- # after an ungraceful shutdown
- rm -f /var/db/ipf/ipstate.ipf
- rm -f /var/db/ipf/ipnat.ipf
- fi
- fi
- ;;
- NetBSD)
- if [ ! -f ${config} ]; then
- return 0
- fi
- if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then
- echo "Enabling ipfilter for NAT."
- /sbin/ipf -E -Fa
- fi
- echo -n "Installing NAT rules ... "
- /usr/sbin/ipnat -F -f ${config}
- ;;
- esac
+ if [ ! -f ${ipnat_rules} ]; then
+ echo -n ' NO IPNAT RULES'
+ return 0
+ fi
+ echo -n "Installing NAT rules ... "
+ ${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}
}
-load_rc_config $name
run_rc_command "$1"
==== //depot/projects/ia64_epc/etc/rc.d/securelevel#2 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/securelevel,v 1.4 2002/09/06 16:18:05 gordon Exp $
+# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $
#
# PROVIDE: securelevel
@@ -17,6 +17,10 @@
securelevel_start()
{
+ # Last chance to set sysctl variables that failed the first time.
+ #
+ /etc/rc.d/sysctl lastload
+
case ${OSTYPE} in
FreeBSD)
case ${kern_securelevel_enable} in
==== //depot/projects/ia64_epc/etc/rc.d/sysctl#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $
-# $FreeBSD: src/etc/rc.d/sysctl,v 1.11 2002/10/25 23:02:54 fenner Exp $
+# $FreeBSD: src/etc/rc.d/sysctl,v 1.12 2003/04/24 08:20:47 mtm Exp $
#
# PROVIDE: sysctl
-# REQUIRE: root ipfilter ipsec
+# REQUIRE: root
# BEFORE: DAEMON
# KEYWORD: FreeBSD NetBSD
==== //depot/projects/ia64_epc/gnu/lib/libstdc++/c++config.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.3 2003/02/19 04:28:12 kan Exp $
+// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $
// Predefined symbols and macros -*- C++ -*-
@@ -101,7 +101,7 @@
#define _GLIBCPP_USE_LONG_LONG 1
// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
-/* #undef _GLIBCPP_USE_C99 */
+#define _GLIBCPP_USE_C99 1
// Define if code specialized for wchar_t should be used.
/* #undef _GLIBCPP_USE_WCHAR_T */
@@ -649,10 +649,10 @@
/* #undef _GLIBCPP_HAVE_SQRTL */
/* Define if you have the strtof function. */
-/* #undef _GLIBCPP_HAVE_STRTOF */
+#define _GLIBCPP_HAVE_STRTOF 1
/* Define if you have the strtold function. */
-/* #undef _GLIBCPP_HAVE_STRTOLD */
+#define _GLIBCPP_HAVE_STRTOLD 1
/* Define if you have the swprintf function. */
#define _GLIBCPP_HAVE_SWPRINTF 1
@@ -748,7 +748,7 @@
#define _GLIBCPP_HAVE_WCSTOD 1
/* Define if you have the wcstof function. */
-/* #undef _GLIBCPP_HAVE_WCSTOF */
+#define _GLIBCPP_HAVE_WCSTOF 1
/* Define if you have the wcstok function. */
#define _GLIBCPP_HAVE_WCSTOK 1
@@ -832,7 +832,7 @@
#define _GLIBCPP_HAVE_SYS_RESOURCE_H 1
/* Define if you have the <sys/stat.h> header file. */
-/* #undef _GLIBCPP_HAVE_SYS_STAT_H */
+#define _GLIBCPP_HAVE_SYS_STAT_H 1
/* Define if you have the <sys/types.h> header file. */
#define _GLIBCPP_HAVE_SYS_TYPES_H 1
==== //depot/projects/ia64_epc/gnu/lib/libstdc++/config.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.4 2003/02/19 04:28:12 kan Exp $ */
+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -13,7 +13,7 @@
#define _GLIBCPP_USE_LONG_LONG 1
// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
-/* #undef _GLIBCPP_USE_C99 */
+#define _GLIBCPP_USE_C99 1
// Define if code specialized for wchar_t should be used.
/* #undef _GLIBCPP_USE_WCHAR_T */
@@ -561,10 +561,10 @@
/* #undef HAVE_SQRTL */
/* Define if you have the strtof function. */
-/* #undef HAVE_STRTOF */
+#define HAVE_STRTOF 1
/* Define if you have the strtold function. */
-/* #undef HAVE_STRTOLD */
+#define HAVE_STRTOLD 1
/* Define if you have the swprintf function. */
#define HAVE_SWPRINTF 1
@@ -660,7 +660,7 @@
#define HAVE_WCSTOD 1
/* Define if you have the wcstof function. */
-/* #undef HAVE_WCSTOF */
+#define HAVE_WCSTOF 1
/* Define if you have the wcstok function. */
#define HAVE_WCSTOK 1
==== //depot/projects/ia64_epc/lib/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.150 2003/03/08 11:01:31 markm Exp $
+# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -27,7 +27,7 @@
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
- libnetgraph libopie libpam libpanel libpcap \
+ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \
${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \
libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \
libwrap libxpg4 liby libz
@@ -60,6 +60,9 @@
_libncp= libncp
_libsmb= libsmb
_libvgl= libvgl
+.if !defined(NOLIBPTHREAD)
+_libpthread= libpthread
+.endif
.endif
.if ${MACHINE_ARCH} == "alpha"
==== //depot/projects/ia64_epc/lib/libc/gen/getgrent.c#6 (text+ko) ====
@@ -31,7 +31,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.28 2003/04/22 22:19:05 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -819,9 +819,31 @@
static int
compat_setgrent(void *retval, void *mdata, va_list ap)
{
+ static const ns_src compatsrc[] = {
+#ifdef YP
+ { NSSRC_NIS, NS_SUCCESS },
+#endif
+ { NULL, 0 }
+ };
+ ns_dtab dtab[] = {
+#ifdef HESIOD
+ { NSSRC_DNS, dns_setgrent, NULL },
+#endif
+#ifdef YP
+ { NSSRC_NIS, nis_setgrent, NULL },
+#endif
+ { NULL, NULL, NULL }
+ };
struct compat_state *st;
int rv, stayopen;
+#define set_setent(x, y) do { \
+ int i; \
+ \
+ for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++) \
+ x[i].mdata = (void *)y; \
+} while (0)
+
rv = compat_getstate(&st);
if (rv != 0)
return (NS_UNAVAIL);
@@ -832,12 +854,18 @@
rewind(st->fp);
else if (stayopen)
st->fp = fopen(_PATH_GROUP, "r");
+ set_setent(dtab, mdata);
+ (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent",
+ compatsrc, 0);
break;
case ENDGRENT:
if (st->fp != NULL) {
fclose(st->fp);
st->fp = NULL;
}
+ set_setent(dtab, mdata);
+ (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent",
+ compatsrc, 0);
break;
default:
break;
@@ -846,6 +874,7 @@
free(st->name);
st->name = NULL;
return (NS_UNAVAIL);
+#undef set_setent
}
==== //depot/projects/ia64_epc/lib/libc/gen/getpwent.c#6 (text+ko) ====
@@ -31,7 +31,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.77 2003/04/21 13:57:58 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.79 2003/04/25 18:25:19 nectar Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -1321,6 +1321,7 @@
for (i = 0; i < sizeof(dtab)/sizeof(dtab[0]) - 1; i++)
dtab[i].mdata = (void *)lookup_how;
more:
+ pwd_init(pwd);
switch (lookup_how) {
case nss_lt_all:
rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
@@ -1391,9 +1392,31 @@
static int
compat_setpwent(void *retval, void *mdata, va_list ap)
{
+ static const ns_src compatsrc[] = {
+#ifdef YP
+ { NSSRC_NIS, NS_SUCCESS },
+#endif
+ { NULL, 0 }
+ };
+ ns_dtab dtab[] = {
+#ifdef YP
+ { NSSRC_NIS, nis_setpwent, NULL },
+#endif
+#ifdef HESIOD
+ { NSSRC_DNS, dns_setpwent, NULL },
+#endif
+ { NULL, NULL, NULL }
+ };
struct compat_state *st;
int rv, stayopen;
+#define set_setent(x, y) do { \
+ int i; \
+ \
+ for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++) \
+ x[i].mdata = (void *)y; \
+} while (0)
+
rv = compat_getstate(&st);
if (rv != 0)
return (NS_UNAVAIL);
@@ -1404,17 +1427,24 @@
if (stayopen)
st->db = pwdbopen(&st->version);
st->stayopen = stayopen;
+ set_setent(dtab, mdata);
+ (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent",
+ compatsrc, 0);
break;
case ENDPWENT:
if (st->db != NULL) {
(void)st->db->close(st->db);
st->db = NULL;
}
+ set_setent(dtab, mdata);
+ (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent",
+ compatsrc, 0);
break;
default:
break;
}
return (NS_UNAVAIL);
+#undef set_setent
}
==== //depot/projects/ia64_epc/lib/libc/gen/getusershell.c#3 (text+ko) ====
@@ -36,8 +36,9 @@
#endif /* LIBC_SCCS and not lint */
/* $NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getusershell.c,v 1.8 2003/03/19 14:17:24 robert Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getusershell.c,v 1.9 2003/04/24 20:16:21 nectar Exp $");
+#include "namespace.h"
#include <sys/param.h>
#include <sys/file.h>
@@ -59,6 +60,7 @@
#include <rpcsvc/ypclnt.h>
#include <rpcsvc/yp_prot.h>
#endif
+#include "un-namespace.h"
/*
* Local shells should NOT be added here. They should be added in
@@ -259,7 +261,7 @@
sl_free(sl, 1);
sl = sl_init();
- if (nsdispatch(NULL, dtab, NSDB_SHELLS, "initshells", __nsdefaultsrc)
+ if (_nsdispatch(NULL, dtab, NSDB_SHELLS, "initshells", __nsdefaultsrc)
!= NS_SUCCESS) {
if (sl)
sl_free(sl, 1);
==== //depot/projects/ia64_epc/lib/libc/net/getaddrinfo.c#3 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.37 2003/02/27 13:40:00 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.38 2003/04/24 17:41:20 nectar Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -607,7 +607,7 @@
return 0;
}
- switch (nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo",
+ switch (_nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo",
default_dns_files, hostname, pai)) {
case NS_TRYAGAIN:
error = EAI_AGAIN;
==== //depot/projects/ia64_epc/lib/libc/net/gethostnamadr.c#2 (text+ko) ====
@@ -24,8 +24,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.20 2002/03/22 21:52:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.21 2003/04/24 18:05:48 nectar Exp $");
+#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -38,6 +39,7 @@
#include <nsswitch.h>
#include <arpa/nameser.h> /* XXX hack for _res */
#include <resolv.h> /* XXX hack for _res */
+#include "un-namespace.h"
extern int _ht_gethostbyname(void *, void *, va_list);
extern int _dns_gethostbyname(void *, void *, va_list);
@@ -83,7 +85,7 @@
{ 0 }
};
- rval = nsdispatch((void *)&hp, dtab, NSDB_HOSTS, "gethostbyname",
+ rval = _nsdispatch((void *)&hp, dtab, NSDB_HOSTS, "gethostbyname",
default_src, name, type);
if (rval != NS_SUCCESS)
@@ -105,7 +107,7 @@
{ 0 }
};
- rval = nsdispatch((void *)&hp, dtab, NSDB_HOSTS, "gethostbyaddr",
+ rval = _nsdispatch((void *)&hp, dtab, NSDB_HOSTS, "gethostbyaddr",
default_src, addr, len, type);
if (rval != NS_SUCCESS)
==== //depot/projects/ia64_epc/lib/libc/net/getnetnamadr.c#2 (text+ko) ====
@@ -24,8 +24,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.16 2002/03/22 21:52:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.17 2003/04/24 18:05:48 nectar Exp $");
+#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -36,6 +37,7 @@
#include <string.h>
#include <stdarg.h>
#include <nsswitch.h>
+#include "un-namespace.h"
extern int _ht_getnetbyname(void *, void *, va_list);
extern int _dns_getnetbyname(void *, void *, va_list);
@@ -65,7 +67,7 @@
{ 0 }
};
- rval = nsdispatch((void *)&hp, dtab, NSDB_NETWORKS, "getnetbyname",
+ rval = _nsdispatch((void *)&hp, dtab, NSDB_NETWORKS, "getnetbyname",
default_src, name);
if (rval != NS_SUCCESS)
@@ -87,7 +89,7 @@
{ 0 }
};
- rval = nsdispatch((void *)&hp, dtab, NSDB_NETWORKS, "getnetbyaddr",
+ rval = _nsdispatch((void *)&hp, dtab, NSDB_NETWORKS, "getnetbyaddr",
default_src, addr, af);
if (rval != NS_SUCCESS)
==== //depot/projects/ia64_epc/lib/libc/net/name6.c#3 (text+ko) ====
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.31 2003/02/16 17:29:10 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.32 2003/04/24 17:41:20 nectar Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -291,7 +291,7 @@
}
THREAD_LOCK();
- rval = nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyname", default_src,
+ rval = _nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyname", default_src,
name, af, errp);
THREAD_UNLOCK();
return (rval == NS_SUCCESS) ? hp : NULL;
@@ -438,7 +438,7 @@
}
THREAD_LOCK();
- rval = nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyaddr", default_src,
+ rval = _nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyaddr", default_src,
src, len, af, errp);
THREAD_UNLOCK();
return (rval == NS_SUCCESS) ? hp : NULL;
==== //depot/projects/ia64_epc/lib/libc/net/nsdispatch.c#4 (text+ko) ====
@@ -68,7 +68,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.7 2003/04/17 14:14:22 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.8 2003/04/24 19:57:31 nectar Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list