PERFORCE change 35000 for review
Peter Wemm
peter at FreeBSD.org
Fri Jul 25 12:13:51 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=35000
Change 35000 by peter at peter_daintree on 2003/07/25 12:13:16
IFC @34999
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#26 integrate
.. //depot/projects/hammer/bin/ed/Makefile#7 integrate
.. //depot/projects/hammer/etc/rc.subr#8 integrate
.. //depot/projects/hammer/games/factor/Makefile#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#11 integrate
.. //depot/projects/hammer/lib/Makefile#23 integrate
.. //depot/projects/hammer/lib/libatm/Makefile#3 integrate
.. //depot/projects/hammer/lib/libatm/ioctl_subr.c#3 integrate
.. //depot/projects/hammer/lib/libatm/ip_addr.c#3 integrate
.. //depot/projects/hammer/lib/libatm/ip_checksum.c#2 integrate
.. //depot/projects/hammer/lib/libc/net/ip6opt.c#2 integrate
.. //depot/projects/hammer/lib/libc/posix1e/acl_to_text.c#2 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_kqueue.c#1 branch
.. //depot/projects/hammer/lib/libgeom/Makefile#4 integrate
.. //depot/projects/hammer/lib/libtelnet/Makefile#3 integrate
.. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#2 integrate
.. //depot/projects/hammer/lib/libwrap/Makefile#5 integrate
.. //depot/projects/hammer/libexec/telnetd/Makefile#3 integrate
.. //depot/projects/hammer/release/Makefile#34 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 integrate
.. //depot/projects/hammer/release/i386/drivers.conf#12 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#5 integrate
.. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#2 integrate
.. //depot/projects/hammer/sbin/atm/ilmid/Makefile#3 integrate
.. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#8 integrate
.. //depot/projects/hammer/share/man/man7/release.7#11 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#15 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#15 integrate
.. //depot/projects/hammer/sys/alpha/alpha/support.s#4 integrate
.. //depot/projects/hammer/sys/alpha/include/alpha_cpu.h#3 integrate
.. //depot/projects/hammer/sys/alpha/include/ucontext.h#4 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#47 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#29 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#9 integrate
.. //depot/projects/hammer/sys/ia64/conf/SKI#8 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#22 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mem.c#6 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#17 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#15 integrate
.. //depot/projects/hammer/sys/ia64/include/_regset.h#4 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#23 integrate
.. //depot/projects/hammer/sys/libkern/scanc.c#3 integrate
.. //depot/projects/hammer/sys/netatm/atm_cm.c#7 integrate
.. //depot/projects/hammer/sys/netatm/atm_device.c#6 integrate
.. //depot/projects/hammer/sys/netatm/atm_if.c#7 integrate
.. //depot/projects/hammer/sys/netatm/atm_ioctl.h#2 integrate
.. //depot/projects/hammer/sys/netatm/atm_proto.c#3 integrate
.. //depot/projects/hammer/sys/netatm/atm_socket.c#5 integrate
.. //depot/projects/hammer/sys/netatm/atm_subr.c#7 integrate
.. //depot/projects/hammer/sys/netatm/atm_var.h#4 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_input.c#5 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_load.c#5 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_output.c#3 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_usrreq.c#4 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_var.h#3 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_vcm.c#5 integrate
.. //depot/projects/hammer/sys/netatm/spans/spans_cls.c#5 integrate
.. //depot/projects/hammer/sys/netatm/spans/spans_proto.c#4 integrate
.. //depot/projects/hammer/sys/netatm/spans/spans_var.h#2 integrate
.. //depot/projects/hammer/sys/netatm/uni/sscf_uni.c#5 integrate
.. //depot/projects/hammer/sys/netatm/uni/sscf_uni_lower.c#4 integrate
.. //depot/projects/hammer/sys/netatm/uni/sscf_uni_var.h#3 integrate
.. //depot/projects/hammer/sys/netatm/uni/sscop_pdu.c#4 integrate
.. //depot/projects/hammer/sys/netatm/uni/sscop_var.h#3 integrate
.. //depot/projects/hammer/sys/netatm/uni/uniarp.c#5 integrate
.. //depot/projects/hammer/sys/netatm/uni/uniarp_input.c#3 integrate
.. //depot/projects/hammer/sys/netatm/uni/uniip_var.h#2 integrate
.. //depot/projects/hammer/sys/netatm/uni/unisig_msg.c#5 integrate
.. //depot/projects/hammer/sys/netatm/uni/unisig_proto.c#3 integrate
.. //depot/projects/hammer/sys/netatm/uni/unisig_var.h#3 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#10 integrate
.. //depot/projects/hammer/sys/sys/cdefs.h#10 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/current.rc#2 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/releng_4.rc#2 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#11 integrate
.. //depot/projects/hammer/usr.bin/Makefile#18 integrate
.. //depot/projects/hammer/usr.bin/find/find.1#4 integrate
.. //depot/projects/hammer/usr.bin/telnet/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#26 integrate
.. //depot/projects/hammer/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/pppd/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/sendmail/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/zzz/zzz.sh#2 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#26 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.381 2003/07/14 16:21:16 gordon Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.382 2003/07/24 18:14:29 markm Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -339,7 +339,8 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 4: building libraries"
@echo "--------------------------------------------------------------"
- cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries
+ cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \
+ libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
==== //depot/projects/hammer/bin/ed/Makefile#7 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.28 2003/07/20 12:26:24 ru Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.29 2003/07/24 18:30:24 markm Exp $
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION=crypto
CFLAGS+=-DDES
WARNS?= 2
==== //depot/projects/hammer/etc/rc.subr#8 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.13 2003/06/09 17:31:06 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.14 2003/07/24 18:17:21 mtm Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -669,7 +669,7 @@
# if the precmd failed and force
# isn't set, exit
#
- if [ -n $_precmd ]; then
+ if [ -n "$_precmd" ]; then
eval $_precmd
_return=$?
[ $_return -ne 0 ] && [ -z "$rc_force" ] &&
==== //depot/projects/hammer/games/factor/Makefile#4 (text+ko) ====
@@ -1,11 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $
+# $FreeBSD: src/games/factor/Makefile,v 1.7 2003/07/24 18:30:24 markm Exp $
PROG= factor
SRCS= factor.c pr_tbl.c
CFLAGS+=-I${.CURDIR}/../primes
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DHAVE_OPENSSL
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#11 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.114 2003/07/14 22:22:56 mph Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.115 2003/07/25 11:14:03 mux Exp $
%
-- Gifts for Children --
@@ -9550,10 +9550,6 @@
%
Man is the only animal that can remain on friendly terms with the
victims he intends to eat until he eats them.
- -- Samuel Butler
-%
-Man is the only animal that can remain on friendly terms with the
-victims he intends to eat until he eats them.
-- Samuel Butler (1835-1902)
%
Man, n.:
==== //depot/projects/hammer/lib/Makefile#23 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.165 2003/07/24 02:05:48 peter Exp $
+# $FreeBSD: src/lib/Makefile,v 1.166 2003/07/24 18:30:24 markm Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -94,7 +94,7 @@
_libdisk= libdisk
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
_libmp= libmp
.endif
==== //depot/projects/hammer/lib/libatm/Makefile#3 (text+ko) ====
@@ -23,7 +23,7 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $
+# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.7 2003/07/25 08:22:08 harti Exp $
#
#
@@ -33,6 +33,6 @@
LDADD+= -lmd
DPADD+= ${LIBMD}
-WARNS?= 3
+WARNS?= 6
.include <bsd.lib.mk>
==== //depot/projects/hammer/lib/libatm/ioctl_subr.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.8 2002/09/30 09:18:54 mdodd Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.9 2003/07/25 08:22:08 harti Exp $");
/*
* User Space Library Functions
@@ -172,7 +172,7 @@
/*
* Return a pointer to the VCC info and its length
*/
- *vccp = (struct air_vcc_rsp *) air.air_buf_addr;
+ *vccp = (struct air_vcc_rsp *)(void *)air.air_buf_addr;
return(buf_len);
}
@@ -226,7 +226,7 @@
/*
* Give the answer back to the caller
*/
- ip_mask = (struct sockaddr_in *)&req.ifr_addr;
+ ip_mask = (struct sockaddr_in *)(void *)&req.ifr_addr;
*mask = *ip_mask;
mask->sin_family = AF_INET;
@@ -392,7 +392,7 @@
/*
* Return a pointer to the Config info and its length
*/
- *cfgp = (struct air_cfg_rsp *) air.air_buf_addr;
+ *cfgp = (struct air_cfg_rsp *)(void *)air.air_buf_addr;
return ( buf_len );
}
@@ -430,7 +430,7 @@
/*
* Return a pointer to the Physical Interface info and its length
*/
- *intp = (struct air_int_rsp *) air.air_buf_addr;
+ *intp = (struct air_int_rsp *)(void *)air.air_buf_addr;
return ( buf_len );
}
==== //depot/projects/hammer/lib/libatm/ip_addr.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.9 2003/07/25 08:22:08 harti Exp $");
/*
* User Space Library Functions
@@ -96,7 +96,8 @@
ip_host->h_addrtype != AF_INET) {
return((struct sockaddr_in *)0);
}
- s.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0];
+ memcpy(&s.sin_addr.s_addr, ip_host->h_addr_list[0],
+ sizeof(s.sin_addr.s_addr));
}
return(&s);
}
==== //depot/projects/hammer/lib/libatm/ip_checksum.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.7 2002/03/21 23:35:20 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.8 2003/07/25 08:22:08 harti Exp $");
/*
* User Space Library Functions
@@ -77,7 +77,7 @@
while( count > 1 ) {
/* This is the inner loop */
- sum += ntohs(* (unsigned short *) addr);
+ sum += ntohs(* (unsigned short *)(void *)addr);
addr += sizeof(unsigned short);
count -= sizeof(unsigned short);
}
==== //depot/projects/hammer/lib/libc/net/ip6opt.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.3 2002/03/22 21:52:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.4 2003/07/25 12:23:25 mux Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -111,8 +111,6 @@
return(-1);
if (plusy < 0 || plusy > 7)
return(-1);
- if (typep[0] > 255)
- return(-1);
/*
* If this is the first option, allocate space for the
==== //depot/projects/hammer/lib/libc/posix1e/acl_to_text.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.10 2002/03/22 21:52:38 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.11 2003/07/24 23:33:25 rwatson Exp $");
#include <sys/types.h>
#include "namespace.h"
@@ -177,9 +177,10 @@
effective_perm_buf);
if (error)
goto error_label;
- len = asprintf(&tmpbuf, "%sgroup::%s\t\t# "
+ len = asprintf(&tmpbuf, "%sgroup:%s:%s\t\t# "
"effective: %s\n",
- buf, perm_buf, effective_perm_buf);
+ buf, name_buf, perm_buf,
+ effective_perm_buf);
} else {
len = asprintf(&tmpbuf, "%sgroup:%s:%s\n", buf,
name_buf, perm_buf);
==== //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.36 2003/04/20 01:53:12 jdp Exp $
+# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $
# uthread sources
.PATH: ${.CURDIR}/uthread
@@ -77,6 +77,7 @@
uthread_join.c \
uthread_kern.c \
uthread_kevent.c \
+ uthread_kqueue.c \
uthread_kill.c \
uthread_listen.c \
uthread_main_np.c \
==== //depot/projects/hammer/lib/libgeom/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $
+# $FreeBSD: src/lib/libgeom/Makefile,v 1.7 2003/07/24 19:53:02 markm Exp $
LIB= geom
SRCS+= geom_getxml.c
@@ -7,7 +7,7 @@
SRCS+= geom_ctl.c
INCS= libgeom.h
-CFLAGS += -I${.CURDIR} -g
+CFLAGS += -I${.CURDIR}
WARNS?= 3
==== //depot/projects/hammer/lib/libtelnet/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $FreeBSD: src/lib/libtelnet/Makefile,v 1.16 2003/07/20 23:29:46 markm Exp $
+# $FreeBSD: src/lib/libtelnet/Makefile,v 1.18 2003/07/24 17:19:15 markm Exp $
TELNETDIR= ${.CURDIR}/../../contrib/telnet
.PATH: ${TELNETDIR}/libtelnet
@@ -13,7 +13,9 @@
WARNS?= 2
+.if !defined(RELEASE_CRUNCH)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
.if !defined(NO_KERBEROS)
@@ -22,6 +24,7 @@
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
.endif
.endif
+.endif
INCS= ${TELNETDIR}/arpa/telnet.h
INCSDIR= ${INCLUDEDIR}/arpa
==== //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.1.1.1 2003/07/19 15:57:52 mtm Exp $");
+__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.2 2003/07/24 07:51:49 marcel Exp $");
#include <sys/types.h>
#include <sys/ucontext.h>
@@ -35,13 +35,18 @@
void *
_set_curthread(ucontext_t *uc, struct pthread *thread, int *err)
{
+ *err = 0;
+ if (uc != NULL)
+ uc->uc_mcontext.mc_thrptr = (uint64_t)thread;
+ else
+ __builtin_set_thread_pointer(thread);
return (NULL);
}
struct pthread *
_get_curthread(void)
{
- return (NULL);
+ return (__builtin_thread_pointer());
}
void
==== //depot/projects/hammer/lib/libwrap/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libwrap/Makefile,v 1.13 2003/06/04 16:01:37 markm Exp $
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.14 2003/07/24 19:58:55 markm Exp $
#
LIB= wrap
@@ -16,7 +16,7 @@
-DREAL_DAEMON_DIR=\"/usr/libexec\" -DPROCESS_OPTIONS \
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
- -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP
+ -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS
.if !defined(NOINET6)
CFLAGS+=-DINET6
.endif
==== //depot/projects/hammer/libexec/telnetd/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/telnetd/Makefile,v 1.21 2003/07/20 23:29:46 markm Exp $
+# $FreeBSD: src/libexec/telnetd/Makefile,v 1.23 2003/07/24 17:19:15 markm Exp $
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.
@@ -28,7 +28,9 @@
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
+.if !defined(RELEASE_CRUNCH)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= authenc.c
CFLAGS+= -DAUTHENTICATION -DENCRYPTION
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
@@ -39,5 +41,6 @@
LDADD+= -lkrb5 -lasn1 -lroken -lcom_err
.endif
.endif
+.endif
.include <bsd.prog.mk>
==== //depot/projects/hammer/release/Makefile#34 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.793 2003/07/23 20:53:37 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.799 2003/07/25 13:39:11 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -29,6 +29,12 @@
# If this is a -stable snapshot, then set
#RELEASETAG=RELENG_4
#
+# To test a release with a source tree containing patches and
+# other work. This tree will get copied instead of getting the
+# src/ tree from a CVS checkout. For "rerelease", this will NOT
+# be copied; cvs update will be used instead.
+#EXTSRCDIR=/usr/src
+#
# To add other options to the CVS subcommands (co,up), set
#CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'"
#
@@ -38,6 +44,9 @@
# To prefix the cvs command
#CVSPREFIX="/usr/bin/time"
#
+# Where the CVS repository is
+#CVSROOT="/home/ncvs"
+#
# Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
# are building an official release. Otherwise, we are building for
# a branch.
@@ -232,14 +241,9 @@
# Things that need to be compiled without crypto support in releases
.if !defined(FIXCRYPTO)
-FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
-FIXCRYPTO+= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
- lib/libfetch usr.bin/fetch
-.if !defined(NO_SENDMAIL)
-FIXCRYPTO+= usr.sbin/sendmail
+FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \
+ cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS
.endif
-.endif
-
# Things which may get you into trouble if you change them
MTREEFILES= ${.CURDIR}/../etc/mtree
@@ -265,23 +269,16 @@
.if ${TARGET_ARCH} == "sparc64"
CRUNCH_TARGETS= boot
-FIXIT_TARGET=
.elif ${TARGET_ARCH} == "ia64"
CRUNCH_TARGETS= boot
-FIXIT_TARGET=
.elif ${TARGET} == "pc98"
CRUNCH_TARGETS= boot fixit fixit-small
.elif ${TARGET_ARCH} == "amd64"
CRUNCH_TARGETS= boot
-FIXIT_TARGET=
.endif
CRUNCH_TARGETS?=boot fixit
-.if !defined(FIXIT_TARGET)
-FIXIT_TARGET= release.10
-.endif
-
EXTRAS= ftp.1
.if !defined(NOCDROM)
EXTRAS+= cdrom.1
@@ -492,7 +489,7 @@
env -i /usr/sbin/chroot ${CHROOTDIR} /mk
clean:
- rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] ${FIXIT_TARGET} \
+ rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] release.10 \
${EXTRAS}
fetch-distfiles:
@@ -526,13 +523,13 @@
mtree -deU -f ${MTREEFILES}/BSD.var.dist \
-p ${RD}/trees/$$i/var > /dev/null ; \
done
- touch release.1
+ touch ${.TARGET}
# Install the system into the various distributions.
release.2:
cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base
cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees
- touch release.2
+ touch ${.TARGET}
# Build and install crypto distributions.
release.3:
@@ -542,7 +539,7 @@
SUBDIR_OVERRIDE="${FIXCRYPTO}" \
buildworld distributeworld DISTDIR=${RD}/trees
-chflags -R noschg ${RD}/trees
- touch release.3
+ touch ${.TARGET}
# Make and install the generic kernel(s).
release.4:
@@ -561,7 +558,7 @@
${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \
reinstallkernel -DINSTALL_DEBUG \
DESTDIR=${RD}/trees/base
- touch release.4
+ touch ${.TARGET}
# Make and install the three crunched binaries which live on the floppies.
# You are not supposed to like this :-)
@@ -583,7 +580,7 @@
${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch
mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j}
.endfor
- touch release.5
+ touch ${.TARGET}
#
# --==## Fix up the distributions. ##==--
@@ -601,7 +598,7 @@
# Remove all the directories we don't need.
-cd ${RD}/trees && \
find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir
- touch release.6
+ touch ${.TARGET}
#
# --==## Package up the tarballs from assembled trees ##==--
@@ -618,7 +615,7 @@
echo "$${i} distribution is finished."; \
fi ; \
done
- touch release.7
+ touch ${.TARGET}
#
@@ -655,7 +652,7 @@
(cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5)
@echo "src distribution is finished."
.endif
- touch release.8
+ touch ${.TARGET}
# Complete the bootfd
#
@@ -671,7 +668,6 @@
#
release.9:
-.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH}
cp ${RD}/trees/base/etc/disktab /etc
rm -rf ${RD}/mfsfd
mkdir ${RD}/mfsfd
@@ -717,34 +713,40 @@
.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
@cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
.endif
- @echo "Making the regular boot floppy."
@tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \
tar xf - -C ${RD}/mfsfd/stand
.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES)
rm -rf ${RD}/mfsfd/stand/help/*
.endif
-.if defined(SMALLBOOTSIZE) && !defined(NO_FLOPPIES)
+ @mkdir -p ${RD}/mfsroot
+.if defined(SMALLBOOTSIZE)
.if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
- @rm -rf ${RD}/mfsfd/modules
@mkdir -p ${RD}/mfsfd/modules
@awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
${.CURDIR}/${TARGET}/drivers-small.conf \
${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
.endif
- sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
+ sh -e ${DOFS_SH} mfsroot-small ${RD} ${MNT} \
${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
- @gzip -9vc mfsroot > mfsroot.gz
- @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
- ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
- ${BOOTINODE} ${SMALLBOOTLABEL}
+ @gzip -9vc mfsroot-small > ${RD}/mfsroot/mfsroot-small.gz
+ @rm -rf ${RD}/mfsfd/modules
.endif
.if exists(${.CURDIR}/${TARGET}/drivers.conf)
- @rm -rf ${RD}/mfsfd/modules
@mkdir -p ${RD}/mfsfd/modules
@awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
${.CURDIR}/${TARGET}/drivers.conf \
${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
+.endif
+ sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
+ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
+ @gzip -9vc mfsroot > ${RD}/mfsroot/mfsroot.gz
+ @rm mfsroot mfsroot-small
+ touch ${.TARGET}
+
+release.10:
.if !defined(NO_FLOPPIES)
+.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+ @echo "Making the drivers floppy."
@rm -rf ${RD}/driversfd
@mkdir ${RD}/driversfd
@awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \
@@ -759,35 +761,25 @@
*.dsc >> ${RD}/floppies/DRIVERS.TXT; \
fi
.endif
-.endif
- sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
- ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
- @gzip -9vc mfsroot > mfsroot.gz
- @mkdir -p ${RD}/mfsroot
- @cp mfsroot.gz ${RD}/mfsroot
-.if !defined(NO_FLOPPIES)
.if defined(BOOTSIZE)
+ @echo "Making the regular boot floppy."
@sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \
- ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
+ ${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \
+ ${BOOTINODE} ${BOOTLABEL}
@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
.endif
.if defined(SMALLBOOTSIZE)
+ @echo "Making the small boot floppy."
+ @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
+ ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \
+ ${BOOTINODE} ${SMALLBOOTLABEL}
@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
.endif
.if defined(BIGBOOTSIZE)
+ @echo "Making the big boot floppy."
@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
.endif
-.endif
- @rm mfsroot mfsroot.gz
- @echo "Regular and MFS boot floppies made."
-.endif
- touch release.9
-
-#
-# --==## Create a fixit floppy ##==--
-#
-release.10:
-.if !defined(NO_FLOPPIES)
+.if defined(FIXITSIZE) || defined(SMALLFIXITSIZE)
@echo "Making fixit floppy."
@rm -rf ${RD}/fixitfd
@mkdir ${RD}/fixitfd
@@ -813,10 +805,13 @@
@rm -rf ${RD}/fixitfd/stand
@mkdir ${RD}/fixitfd/stand
.endif
+.if defined(FIXITSIZE)
@cd ${.CURDIR} && ${MAKE} installCRUNCH CRUNCH=fixit \
DIR=${RD}/fixitfd/stand ZIP=false
@sh -e ${DOFS_SH} ${RD}/floppies/fixit.flp ${RD} \
${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
+.endif
+.endif
# Do our last minute floppies directory setup in a convenient place.
.if !defined(NODOC)
@cp ${RND}/${RELNOTES_LANG}/installation/${TARGET}/article.txt \
@@ -826,7 +821,7 @@
@(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
.endif
.endif
- touch release.10
+ touch ${.TARGET}
#
# --==## Setup a suitable ftp-area ##==--
@@ -858,7 +853,7 @@
.if !defined(NOPORTS)
@tar --exclude CVS -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD}
.endif
- touch ftp.1
+ touch ${.TARGET}
#
# --==## Setup a suitable cdrom-area ##==--
@@ -919,7 +914,7 @@
cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \
&& (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5)
.endif
- touch cdrom.1
+ touch ${.TARGET}
iso.1:
.if exists(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh)
@@ -937,7 +932,7 @@
${CD_EXTRA_BITS} \
&& false
.endif
- touch iso.1
+ touch ${.TARGET}
.else
@echo "Do not know how to create an ISO for ${TARGET_ARCH}."
.endif
@@ -954,7 +949,7 @@
WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \
done
@cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc
- touch doc.1
+ touch ${.TARGET}
#
# --==## RELNOTESng: Next-generation replacements for *.TXT files ##==--
@@ -962,7 +957,7 @@
doc.2:
@echo "Making release documentation..."
@cd ${.CURDIR}/doc && make all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' DOCDIR=${RND}
- touch doc.2
+ touch ${.TARGET}
# Various "subroutine" and other supporting targets.
@@ -1004,30 +999,16 @@
md5 * > CHECKSUM.MD5) \
)
-.if target(release.9.${TARGET_ARCH})
-RELEASE9=release.9.${TARGET_ARCH}
-.else
-RELEASE9=release.9
-.endif
-
doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \
- release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET}
+ release.6 release.7 release.8 release.9 release.10
@cd ${.CURDIR} && ${MAKE} ${EXTRAS}
@echo "Release done"
floppies:
- @cd ${.CURDIR} && ${MAKE} boot.flp
- @cd ${.CURDIR} && ${MAKE} fixit.flp
+ @rm -f release.5 release.9 release.10
+ @cd ${.CURDIR} && ${MAKE} release.5 release.9 release.10
@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
-boot.flp:
- @rm -f release.5 release.9
- @cd ${.CURDIR} && ${MAKE} release.5 release.9 CRUNCH_TARGETS=boot
-
-fixit.flp:
- @rm -f release.5 release.10
- @cd ${.CURDIR} && ${MAKE} release.5 release.10 CRUNCH_TARGETS=fixit
-
installCRUNCH:
.if !defined(CRUNCH)
@echo "CRUNCH undefined in installCRUNCH" && exit 1
@@ -1110,7 +1091,11 @@
@echo "echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
@echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
.endif
+.if defined(FDSIZE) && ${FDSIZE} == "SMALL"
+ @echo "load -t mfs_root /mfsroot-small" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+.else
@echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+.endif
.if ${TARGET_ARCH} != "ia64"
@echo "set hint.acpi.0.disabled=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
.endif
@@ -1126,7 +1111,7 @@
@gzip -9v ${RD}/image.${FSIMAGE}/kernel
@rm -f ${RD}/floppies/${FSIMAGE}.flp
.if defined(FDSIZE) && ${FDSIZE} == "BIG"
- @cp mfsroot.gz ${RD}/image.${FSIMAGE}
+ @cp ${RD}/mfsroot/mfsroot.gz ${RD}/image.${FSIMAGE}
sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \
${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
${BOOTINODE} ${BIGBOOTLABEL}
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.595 2003/07/21 22:07:40 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.596 2003/07/25 14:08:32 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -148,6 +148,7 @@
<para arch="i386">The &man.safe.4; driver has been added
to support SafeNet 1141, 1741-based crypto accelerators.
+ &merged;
<note>
<para>The public key support is not implemented.</para>
@@ -170,6 +171,9 @@
support for 802.11a/b/g devices based on the AR5210, AR5211,
and AR5212 chips.</para>
+ <para>&man.bge.4; now supports Broadcom 5705 based Gigabit Ethernet NICs.
+ &merged;</para>
+
<para>A bug in the &man.bge.4; driver that prevented it from
working correctly at 10 Mbps has been fixed.</para>
@@ -323,7 +327,8 @@
the <filename>/stand</filename> directory installed by
&man.sysinstall.8;, but it <filename>/rescue</filename> includes
more functionality and is updated by as part of
- buildworld/installworld operations.
+ buildworld/installworld operations. More details can be found in
+ &man.rescue.7;.
<note>
<para>Due to some cross-build interactions,
==== //depot/projects/hammer/release/i386/drivers.conf#12 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/i386/drivers.conf,v 1.28 2003/06/01 20:01:05 ru Exp $
+# $FreeBSD: src/release/i386/drivers.conf,v 1.29 2003/07/25 00:10:33 scottl Exp $
#
# drv: driver name in kernel config file
@@ -69,7 +69,6 @@
amr amr 3 disk "AMI MegaRAID"
ips ips 3 disk "IBM ServeRAID"
-mlx mlx 3 disk "Mylex DAC-family RAID"
mly mly 3 disk "Mylex AcceleRAID/eXtremeRAID family"
sbp sbp 3 disk "SBP-2 SCSI over FireWire"
trm trm 3 disk "Tekram DC395X SCSI cards"
==== //depot/projects/hammer/rescue/rescue/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.13 2003/07/21 02:47:04 obrien Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.14 2003/07/24 07:42:42 gordon Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
PROG= rescue
@@ -246,14 +246,15 @@
.endfor
+.ORDER: $(OUTPUTS) objs
$(OUTPUTS): $(CONF)
MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -q -m $(OUTMK) -c $(OUTC) \
$(CONF)
-$(PROG): $(OUTPUTS)
+$(PROG): $(OUTPUTS) objs
MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK)
-objs:
+objs: $(OUTMK)
MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) objs
# <sigh> Someone should replace the bin/csh and bin/sh build-tools with
==== //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.9 2000/12/09 09:35:38 obrien Exp $
+ * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.10 2003/07/25 12:40:03 harti Exp $
*
*/
@@ -64,7 +64,7 @@
#include <unistd.h>
#ifndef lint
-__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.9 2000/12/09 09:35:38 obrien Exp $");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.10 2003/07/25 12:40:03 harti Exp $");
#endif
extern u_char pca200e_microcode[];
@@ -1036,7 +1036,7 @@
*/
air = (struct air_cfg_rsp *)buf;
- if (air->acp_vendor == VENDOR_FORE )
+ if (air->acp_vendapi == VENDAPI_FORE_1 && air->acp_ram != 0)
{
/*
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list