From owner-p4-projects@FreeBSD.ORG Sun Aug 3 22:30:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAB9437B404; Sun, 3 Aug 2003 22:30:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5805437B401 for ; Sun, 3 Aug 2003 22:30:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B52743F93 for ; Sun, 3 Aug 2003 22:30:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h745Ug0U079667 for ; Sun, 3 Aug 2003 22:30:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h745UdWN079664 for perforce@freebsd.org; Sun, 3 Aug 2003 22:30:39 -0700 (PDT) Date: Sun, 3 Aug 2003 22:30:39 -0700 (PDT) Message-Id: <200308040530.h745UdWN079664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 35459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2003 05:30:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=35459 Change 35459 by marcel@marcel_nfs on 2003/08/03 22:29:59 IFC @35458 Affected files ... .. //depot/projects/ia64/bin/sh/expand.c#12 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#11 integrate .. //depot/projects/ia64/games/fortune/strfile/strfile.c#5 integrate .. //depot/projects/ia64/gnu/lib/libregex/regex.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/glob.c#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/Ovfork.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/fork.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/getcontext.S#1 branch .. //depot/projects/ia64/lib/libc/ia64/sys/setlogin.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/swapcontext.S#1 branch .. //depot/projects/ia64/lib/libc/locale/collcmp.c#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 integrate .. //depot/projects/ia64/release/Makefile#64 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#22 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#24 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#113 integrate .. //depot/projects/ia64/release/ia64/doFS.sh#6 delete .. //depot/projects/ia64/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#14 integrate .. //depot/projects/ia64/sbin/atm/Makefile#2 integrate .. //depot/projects/ia64/sbin/atm/Makefile.inc#2 integrate .. //depot/projects/ia64/sbin/atm/atm/Makefile#4 integrate .. //depot/projects/ia64/sbin/atm/fore_dnld/Makefile#4 integrate .. //depot/projects/ia64/sbin/atm/ilmid/Makefile#5 integrate .. //depot/projects/ia64/share/examples/kld/cdev/module/Makefile#2 integrate .. //depot/projects/ia64/share/examples/kld/cdev/module/cdevmod.c#2 integrate .. //depot/projects/ia64/share/examples/kld/cdev/test/Makefile#2 integrate .. //depot/projects/ia64/share/examples/kld/cdev/test/testcdev.c#2 integrate .. //depot/projects/ia64/share/man/man4/ath.4#5 integrate .. //depot/projects/ia64/sys/alpha/include/endian.h#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/ia64/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/ia64/sys/arm/include/endian.h#2 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efiboot.h#5 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#6 integrate .. //depot/projects/ia64/sys/boot/efi/loader/main.c#18 integrate .. //depot/projects/ia64/sys/conf/NOTES#60 integrate .. //depot/projects/ia64/sys/conf/files.alpha#23 integrate .. //depot/projects/ia64/sys/conf/files.amd64#9 integrate .. //depot/projects/ia64/sys/conf/files.i386#42 integrate .. //depot/projects/ia64/sys/conf/files.pc98#34 integrate .. //depot/projects/ia64/sys/conf/options#60 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#3 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#41 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#27 integrate .. //depot/projects/ia64/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#16 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#39 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#53 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#20 integrate .. //depot/projects/ia64/sys/i386/include/endian.h#8 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#17 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#17 integrate .. //depot/projects/ia64/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/ia64/sys/ia64/ia64/genassym.c#13 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#29 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#85 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#34 integrate .. //depot/projects/ia64/sys/ia64/ia64/timerreg.h#2 delete .. //depot/projects/ia64/sys/ia64/include/clock.h#8 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#18 integrate .. //depot/projects/ia64/sys/ia64/include/endian.h#7 integrate .. //depot/projects/ia64/sys/ia64/include/pcpu.h#4 integrate .. //depot/projects/ia64/sys/ia64/include/ucontext.h#3 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_physio.c#10 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#22 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#35 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#55 integrate .. //depot/projects/ia64/sys/modules/ep/Makefile#3 integrate .. //depot/projects/ia64/sys/pc98/pc98/ppc.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#25 integrate .. //depot/projects/ia64/sys/powerpc/include/endian.h#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#29 integrate .. //depot/projects/ia64/sys/sys/acl.h#6 integrate .. //depot/projects/ia64/sys/ufs/ufs/acl.h#4 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_acl.c#8 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#32 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#36 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#13 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#48 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#32 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#43 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.h#10 integrate .. //depot/projects/ia64/sys/vm/vm_pager.c#14 integrate .. //depot/projects/ia64/sys/vm/vm_pager.h#8 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/experimental.rc#3 integrate .. //depot/projects/ia64/tools/tools/tinderbox/powerpc.diff#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.1#5 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#18 integrate .. //depot/projects/ia64/usr.bin/systat/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/systat/cmdtab.c#4 integrate .. //depot/projects/ia64/usr.bin/systat/extern.h#5 integrate .. //depot/projects/ia64/usr.bin/systat/icmp6.c#1 branch .. //depot/projects/ia64/usr.bin/systat/ip6.c#1 branch .. //depot/projects/ia64/usr.bin/systat/netstat.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/systat.1#8 integrate .. //depot/projects/ia64/usr.bin/tr/extern.h#4 integrate .. //depot/projects/ia64/usr.bin/tr/str.c#6 integrate .. //depot/projects/ia64/usr.bin/tr/tr.1#6 integrate .. //depot/projects/ia64/usr.bin/tr/tr.c#9 integrate .. //depot/projects/ia64/usr.bin/truss/ia64-fbsd.c#4 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#12 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#9 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#20 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.h#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/match.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#13 integrate Differences ... ==== //depot/projects/ia64/bin/sh/expand.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.44 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.45 2003/08/03 04:28:10 ache Exp $"); #include #include @@ -116,20 +116,13 @@ STATIC int collate_range_cmp(int, int); STATIC int -collate_range_cmp (int c1, int c2) +collate_range_cmp(int c1, int c2) { static char s1[2], s2[2]; - int ret; - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); s1[0] = c1; s2[0] = c2; - if ((ret = strcoll(s1, s2)) != 0) - return (ret); - return (c1 - c2); + return (strcoll(s1, s2)); } /* ==== //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#11 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.30 2003/02/15 09:11:25 robert Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.31 2003/08/02 20:36:28 schweikh Exp $ % Having trouble using fetch through a firewall? Try setting the environment variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. @@ -439,7 +439,7 @@ "sockstat -4l" for IPv4, and "sockstat -l" for IPv4 and IPv6. -- Dru % -Can't remember is you've installed a certain port or not? Try "pkg_info | +Can't remember if you've installed a certain port or not? Try "pkg_info | grep port_name". -- Dru % @@ -449,7 +449,7 @@ To repeat the last command in the C shell, type "!!". -- Dru % -Need to quickly empty a file? Use "echo > filename". +Need to quickly empty a file? Use ": > filename". -- Dru % To see all of the directories on your FreeBSD system, type @@ -466,10 +466,6 @@ ifconfig -a -- Dru % -You can save your kernel startup configuration with kget(8). The -Configuration can be edited at boot time with 'boot -c' command in loader. -See boot(8), loader(8) for details. -% You can open up a new split-screen window in (n)vi with :N or :E and then use ^w to switch between the two. % ==== //depot/projects/ia64/games/fortune/strfile/strfile.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.22 2003/05/05 09:52:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.23 2003/08/03 19:44:36 ache Exp $"); # include # include @@ -131,7 +131,7 @@ void add_offset(FILE *, long); int cmp_str(const void *, const void *); -static int collate_range_cmp(int, int); +static int stable_collate_range_cmp(int, int); void do_order(void); void getargs(int, char **); void randomize(void); @@ -367,16 +367,12 @@ Tbl.str_flags |= STR_ORDERED; } -static int collate_range_cmp (c1, c2) +static int stable_collate_range_cmp(c1, c2) int c1, c2; { static char s1[2], s2[2]; int ret; - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); s1[0] = c1; s2[0] = c2; if ((ret = strcoll(s1, s2)) != 0) @@ -404,8 +400,8 @@ c1 = (unsigned char) p1->first; c2 = (unsigned char) p2->first; - if ((r = collate_range_cmp(c1, c2)) != 0) - return r; + if ((r = stable_collate_range_cmp(c1, c2)) != 0) + return (r); (void) fseek(Sort_1, p1->pos, 0); (void) fseek(Sort_2, p2->pos, 0); @@ -424,8 +420,8 @@ if (isupper(c2)) c2 = tolower(c2); } - if ((r = collate_range_cmp(c1, c2)) != 0) - return r; + if ((r = stable_collate_range_cmp(c1, c2)) != 0) + return (r); SET_N(n1, c1); SET_N(n2, c2); c1 = getc(Sort_1); @@ -435,7 +431,7 @@ c1 = 0; if (IS_END(c2, n2)) c2 = 0; - return collate_range_cmp(c1, c2); + return (stable_collate_range_cmp(c1, c2)); } /* ==== //depot/projects/ia64/gnu/lib/libregex/regex.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.10 2003/08/03 04:36:09 ache Exp $ */ + /* AIX requires this to be the first thing in the file. */ #if defined (_AIX) && !defined (REGEX_MALLOC) #pragma alloca @@ -1114,19 +1116,14 @@ regnum_t regnum)); #ifdef __FreeBSD__ -static int collate_range_cmp (a, b) +static int collate_range_cmp(a, b) int a, b; { - int r; static char s[2][2]; - if ((unsigned char)a == (unsigned char)b) - return 0; s[0][0] = a; s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (unsigned char)a - (unsigned char)b; - return r; + return (strcoll(s[0], s[1])); } #endif ==== //depot/projects/ia64/gnu/usr.bin/man/man/glob.c#2 (text+ko) ==== @@ -15,6 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD: src/gnu/usr.bin/man/man/glob.c,v 1.5 2003/08/03 04:47:34 ache Exp $ */ + /* To whomever it may concern: I have never seen the code which most Unix programs use to perform this function. I wrote this from scratch based on specifications for the pattern matching. --RMS. */ @@ -112,19 +114,14 @@ static int glob_match_after_star (); #ifdef __FreeBSD__ -static int collate_range_cmp (a, b) +static int collate_range_cmp(a, b) int a, b; { - int r; static char s[2][2]; - if ((unsigned char)a == (unsigned char)b) - return 0; s[0][0] = a; s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (unsigned char)a - (unsigned char)b; - return r; + return (strcoll(s[0], s[1])); } #endif ==== //depot/projects/ia64/lib/libc/ia64/sys/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.6 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.7 2003/08/02 00:49:36 marcel Exp $ -MDASM+= Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \ - sbrk.S setlogin.S sigreturn.S +MDASM+= Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \ + sbrk.S setlogin.S sigreturn.S swapcontext.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/ia64/lib/libc/ia64/sys/Ovfork.S#3 (text+ko) ==== @@ -25,14 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/Ovfork.S,v 1.5 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/Ovfork.S,v 1.6 2003/08/01 22:17:12 marcel Exp $"); #include "SYS.h" SYSCALL(vfork) + cmp.ne p7,p0=ret1,r0 /* ret1!=0 for child */ ;; - cmp.ne p6,p0=ret1,r0 /* ret1!=0 for child */ - ;; -(p6) mov ret0=r0 +(p7) mov ret0=r0 br.ret.sptk.few rp -END(vfork) +END(__sys_vfork) ==== //depot/projects/ia64/lib/libc/ia64/sys/fork.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/fork.S,v 1.5 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/fork.S,v 1.6 2003/08/01 22:17:12 marcel Exp $"); #include "SYS.h" @@ -34,4 +34,4 @@ ;; (p7) mov ret0=r0 br.ret.sptk.few rp -END(fork) +END(__sys_fork) ==== //depot/projects/ia64/lib/libc/ia64/sys/setlogin.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/setlogin.S,v 1.3 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/setlogin.S,v 1.4 2003/08/01 22:17:12 marcel Exp $"); #include "SYS.h" @@ -39,4 +39,4 @@ ld8 r14=[r14] ;; st4 [r14]=r0 /* clear it */ br.ret.sptk.few rp -END(setlogin) +END(__sys_setlogin) ==== //depot/projects/ia64/lib/libc/locale/collcmp.c#3 (text+ko) ==== @@ -25,61 +25,21 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.14 2002/03/22 21:52:18 obrien Exp $"); - -#define ASCII_COMPATIBLE_COLLATE /* see share/colldef */ +__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.17 2003/08/03 19:28:23 ache Exp $"); #include #include "collate.h" -#ifndef ASCII_COMPATIBLE_COLLATE -#include -#endif /* - * Compare two characters converting collate information - * into ASCII-compatible range, it allows to handle - * "[a-z]"-type ranges with national characters. + * Compare two characters using collate */ -int __collate_range_cmp (c1, c2) +int __collate_range_cmp(c1, c2) int c1, c2; { static char s1[2], s2[2]; - int ret; -#ifndef ASCII_COMPATIBLE_COLLATE - int as1, as2, al1, al2; -#endif - - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); - -#ifndef ASCII_COMPATIBLE_COLLATE - as1 = isascii(c1); - as2 = isascii(c2); - al1 = isalpha(c1); - al2 = isalpha(c2); - if (as1 || as2 || al1 || al2) { - if ((as1 && as2) || (!al1 && !al2)) - return (c1 - c2); - if (al1 && !al2) { - if (isupper(c1)) - return ('A' - c2); - else - return ('a' - c2); - } else if (al2 && !al1) { - if (isupper(c2)) - return (c1 - 'A'); - else - return (c1 - 'a'); - } - } -#endif s1[0] = c1; s2[0] = c2; - if ((ret = strcoll(s1, s2)) != 0) - return (ret); - return (c1 - c2); + return (strcoll(s1, s2)); } ==== //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.2 2003/07/31 08:50:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.3 2003/08/02 22:39:10 davidxu Exp $"); /* @@ -34,7 +34,7 @@ */ ENTRY(_amd64_enter_uts) addq %rcx, %rdx /* get stack base */ - andq $-15, %rdx /* align to 16 bytes */ + andq $~0xf, %rdx /* align to 16 bytes */ movq %rdx, %rsp /* switch to UTS stack */ movq %rdx, %rbp /* set frame */ pushq %rsi ==== //depot/projects/ia64/release/Makefile#64 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.808 2003/07/31 07:28:58 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.810 2003/08/03 15:06:00 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -240,15 +240,16 @@ RND= ${RD}/release.doc FD= ${_R}/ftp CD= ${_R}/cdrom +.if ${TARGET} != "pc98" +CD_BOOT= ${CD}/bootonly +.endif CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 # Where the bootstrap ports (see DOCPORTS) get installed. LOCALDIR= /usr/local/bin -.if exists(${.CURDIR}/${TARGET_ARCH}/doFS.sh) -DOFS_SH= ${.CURDIR}/${TARGET_ARCH}/doFS.sh -.elif ${TARGET} != ${MACHINE} +.if ${TARGET} != ${MACHINE} DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ${TARGET} .else DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} "" @@ -601,6 +602,19 @@ echo "$${i} distribution is finished."; \ fi ; \ done +.if !defined(NOPORTS) + # XXX: Inline stripped version of doTARBALL + @rm -rf ${RD}/dists/ports/ports* + @mkdir -p ${RD}/dists/ports + @echo rolling ports/ports tarball + @tar --exclude CVS --exclude 'ports/distfiles/*' -czf \ + ${RD}/dists/ports/ports.tgz -C /usr ports + @cp ${.CURDIR}/scripts/ports-install.sh ${RD}/dists/ports/install.sh + @(cd ${RD}/dists/ports; \ + rm -f CHECKSUM.MD5; \ + md5 * > CHECKSUM.MD5) + @echo "ports distribution is finished." +.endif touch ${.TARGET} @@ -701,8 +715,8 @@ .endif @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ tar xf - -C ${RD}/mfsfd/stand - @mkdir -p ${RD}/mfsroot .if defined(SMALLBOOTSIZE) + @mkdir -p ${RD}/mfsroot-small .if exists(${.CURDIR}/${TARGET}/drivers-small.conf) @mkdir -p ${RD}/mfsfd/modules @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ @@ -711,7 +725,7 @@ .endif sh -e ${DOFS_SH} mfsroot-small ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot-small > ${RD}/mfsroot/mfsroot-small.gz + @gzip -9cnv mfsroot-small > ${RD}/mfsroot-small/mfsroot.gz @rm -rf ${RD}/mfsfd/modules .endif .if exists(${.CURDIR}/${TARGET}/drivers.conf) @@ -720,9 +734,10 @@ ${.CURDIR}/${TARGET}/drivers.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules .endif + @mkdir -p ${RD}/mfsroot sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > ${RD}/mfsroot/mfsroot.gz + @gzip -9cnv mfsroot > ${RD}/mfsroot/mfsroot.gz @rm -f mfsroot mfsroot-small touch ${.TARGET} @@ -827,9 +842,6 @@ @mv ${FD}/EARLY-ADOPTER.HTM ${FD}/EARLY.HTM .endif @echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf -.if !defined(NOPORTS) - @tar --exclude CVS -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD} -.endif touch ${.TARGET} # @@ -837,7 +849,7 @@ # cdrom.1: @echo "Setting up CDROM distribution area" - @mkdir -p ${CD_DISC1} ${CD_DISC2} + @mkdir -p ${CD_BOOT} ${CD_DISC1} ${CD_DISC2} -@ln -s . ${CD_DISC1}/${BUILDNAME} .if !defined(NO_FLOPPIES) @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DISC1} @@ -871,31 +883,36 @@ @mv ${CD_DISC1}/EARLY-ADOPTER.HTM ${CD_DISC1}/EARLY.HTM .endif .if ${TARGET} != "pc98" - @echo "Setting up /boot" + @echo "Setting up boot area" @rm -f ${CD_DISC2}/boot/loader.conf @cp ${RD}/mfsroot/mfsroot.gz ${CD_DISC2}/boot/mfsroot.gz @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf +.if defined(CD_BOOT) + @cp -Rp ${CD_DISC2}/boot ${CD_BOOT} +.endif @cp -Rp ${CD_DISC2}/boot ${CD_DISC1} -.endif .if ${TARGET} == "i386" && defined(EMUL_BOOT) && !defined(NO_FLOPPIES) # In case bootable ISO with floppy emulation is desired. +.if defined(CD_BOOT) + @mkdir -p ${CD_BOOT}/floppies + @cp ${CD_DISC1}/floppies/boot.flp ${CD_BOOT}/floppies +.endif @mkdir -p ${CD_DISC2}/floppies @cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies .endif -.if !defined(NOPORTS) - @mkdir -p ${CD_DISC1}/ports && \ - tar --exclude CVS --exclude 'ports/distfiles/*' -czf \ - ${CD_DISC1}/ports/ports.tgz -C /usr ports && \ - cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \ - && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) .endif touch ${.TARGET} iso.1: .if exists(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh) @echo "Creating ISO images..." +.if defined(CD_BOOT) + @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ + fbsd_bootonly \ + ${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} +.endif @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ fbsd_miniinst \ ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1} @@ -1056,8 +1073,6 @@ .if ${TARGET} == "i386" @${WMAKEENV} kgzip -v -l ${RD}/trees/base/usr/lib/kgzldr.o \ -o ${RD}/image.${FSIMAGE}/boot/loader ${RD}/trees/base/boot/loader -.elif ${TARGET_ARCH} == "ia64" - @cp ${RD}/trees/base/boot/loader.efi ${RD}/image.${FSIMAGE}/boot .else @cp ${RD}/trees/base/boot/loader ${RD}/image.${FSIMAGE}/boot .endif @@ -1072,14 +1087,8 @@ @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 @if [ -r ${RD}/floppies/drivers.flp ]; then \ echo "set driver_floppy=YES" >> ${RD}/image.${FSIMAGE}/boot/loader.rc; \ fi @@ -1098,7 +1107,7 @@ ${BOOTINODE} ${BIGBOOTLABEL} .elif defined(FDSIZE) && ${FDSIZE} == "SMALL" sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ - ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \ + ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot-small/mfsroot.gz \ ${BOOTINODE} ${SMALLBOOTLABEL} sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \ ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/image.${FSIMAGE} \ ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#22 (text+ko) ==== @@ -36,7 +36,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.43 2003/06/24 17:58:22 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.44 2003/08/04 00:57:27 bmah Exp $ 2000 @@ -116,7 +116,13 @@ ]]> No advisories. + The implementation of the &man.realpath.3; function contains + a single-byte buffer overflow bug. This may have various + impacts, depending on the application using &man.realpath.3; and + other factors. This bug has been fixed on the &release.prev; + security fix branch and the &release.branch; development branch. For + more information, see security advisory + FreeBSD-SA-03:08. ]]> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#24 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -2283,9 +2283,12 @@ Rawhide comes with RCM functionality, which means you can power it on/off remotely, reset it etc. See also the description for - RMC in the DS10 section of this document. RCM versus RMC is not a typo, + the RMC in the DS10 section of this document. RCM versus RMC is not a typo, the various documentation I consulted used both acronyms - interchangably. + interchangably. Note that if you want remote power on/off to function + you need to connect a small DC adapter to the machine in order to have + the RCM logic powered. You need to supply 9-12V DC to the small inlet + located next to the keyboard connector. The kernel config file must contain: options DEC_KN300 ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#113 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.604 2003/08/01 13:46:22 yar Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.608 2003/08/04 00:57:28 bmah Exp $ 2000 @@ -116,7 +116,9 @@ Security Advisories - + A single-byte buffer overflow in &man.realpath.3; has been + fixed. See security advisory + FreeBSD-SA-03:08. &merged; @@ -146,6 +148,10 @@ is no longer needed when only a USB keyboard is connected. &merged; + The &man.puc.4;, + PCI Universal Communications driver now supports + to connect parallel ports to the &man.ppc.4; driver. + The &man.safe.4; driver has been added to support SafeNet 1141, 1741-based crypto accelerators. &merged; @@ -177,6 +183,10 @@ A bug in the &man.bge.4; driver that prevented it from working correctly at 10 Mbps has been fixed. + The &man.em.4; driver now has support for tuning + the interrupt delays using sysctl tunables + without recompiling the driver. + The &man.harp.4; driver has been added. This is a pseudo physical interface driver for HARP, which attaches to all netgraph ATM interface in the @@ -289,6 +299,11 @@ The dev_db utility is unnecessary due to the mandatory presence of devfs, and has been removed. + &man.dhclient.8; now polls the state of network interfaces + and only sends DHCP requests on interfaces that are up. The + polling interval can be controlled with the + option. + &man.ipfw.8; list and show command now support ranges of rule numbers. &merged; @@ -331,6 +346,9 @@ A bug that &man.rarpd.8; does not recognize removable Ethernet NICs has been fixed. + &man.systat.1; now includes displays for IPv6 and ICMPv6 + traffic. + A number of utilities available in /bin and /sbin are now available as a statically-linked crunched binary that lives in @@ -388,6 +406,10 @@ Release Engineering and Integration + Floppy disk installation images are + no longer built for the alpha, amd64, and ia64 + architectures. + The supported release of GNOME has been updated from 2.2.1 to 2.2.2. &merged; ==== //depot/projects/ia64/release/ia64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.4 2003/07/29 18:29:44 ru Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.5 2003/08/03 15:06:00 ru Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -70,20 +70,20 @@ EFIPART=efipart.sys # To create a bootable CD under EFI, the boot image should be an EFI -# system partition. Since we already made that on the boot floppy, -# we sneakily extract that. +# system partition. if [ $bootable = yes ]; then - EFISZ=20480 + EFISZ=32768 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` newfs_msdos -F 12 -S 512 -h 4 -o 0 -s $EFISZ -u 16 $md - mount -t msdos /dev/$md $MNT + mount -t msdosfs /dev/$md $MNT mkdir -p $MNT/efi/boot $MNT/boot $MNT/boot/kernel cp -R $BASE/boot/defaults $MNT/boot cp $BASE/boot/kernel/kernel $MNT/boot/kernel cp $BASE/boot/device.hints $MNT/boot cp $BASE/boot/loader.* $MNT/boot + cp $BASE/boot/mfsroot.gz $MNT/boot cp $BASE/boot/support.4th $MNT/boot mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi umount $MNT ==== //depot/projects/ia64/release/pc98/dokern.sh#14 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/pc98/dokern.sh,v 1.78 2003/07/28 18:22:07 ru Exp $ +# $FreeBSD: src/release/pc98/dokern.sh,v 1.79 2003/08/02 09:36:49 ru Exp $ # if [ $# -lt 1 ]; then @@ -12,62 +12,62 @@ if [ "${FDSIZE}" = "SMALL" ]; then sed -e 's/ident.*GENERIC/ident BOOTMFS/g' \ + -e '/COMPAT_FREEBSD4/d' \ + -e '/DDB/d' \ -e '/DEBUG/d' \ - -e '/SOFTUPDATES/d' \ - -e '/UFS_DIRHASH/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/KTRACE/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ -e '/PROCFS/d' \ -e '/PSEUDOFS/d' \ - -e '/COMPAT_FREEBSD4/d' \ - -e '/KTRACE/d' \ + -e '/SOFTUPDATES/d' \ -e '/SYSV/d' \ - -e '/DDB/d' \ - -e '/INVARIANTS/d' \ - -e '/INVARIANT_SUPPORT/d' \ + -e '/UFS_DIRHASH/d' \ -e '/WITNESS/d' \ + -e '/ adv /d' \ + -e '/ ahc /d' \ + -e '/ amd /d' \ + -e '/ an /d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ - -e '/ ch /d' \ - -e '/ sa /d' \ + -e '/ awi /d' \ + -e '/ ch /d' \ + -e '/ dc /d' \ + -e '/ de /d' \ + -e '/ em /d' \ + -e '/ faith /d' \ + -e '/ fxp /d' \ + -e '/ gif /d' \ + -e '/ isp /d' \ + -e '/ lpt /d' \ -e '/ pass /d' \ - -e '/ ses /d' \ - -e '/ splash /d' \ + -e '/ pci$/d' \ + -e '/ pcn /d' \ + -e '/ plip /d' \ + -e '/ ppbus /d' \ -e '/ ppc$/d' \ - -e '/ ppbus /d' \ - -e '/ lpt /d' \ - -e '/ plip /d' \ -e '/ ppi /d' \ - -e '/ an /d' \ - -e '/ awi /d' \ - -e '/ wi /d' \ - -e '/ random /d' \ - -e '/ sl /d' \ -e '/ ppp /d' \ -e '/ pty /d' \ - -e '/ gif /d' \ - -e '/ faith /d' \ - -e '/ pci$/d' \ - -e '/ adv /d' \ - -e '/ ahc /d' \ - -e '/ amd /d' \ - -e '/ isp /d' \ - -e '/ sym /d' \ - -e '/ de /d' \ - -e '/ em /d' \ - -e '/ txp /d' \ - -e '/ vx /d' \ - -e '/ dc /d' \ - -e '/ fxp /d' \ - -e '/ pcn /d' \ + -e '/ random /d' \ -e '/ rl /d' \ + -e '/ sa /d' \ + -e '/ ses /d' \ -e '/ sf /d' \ -e '/ sis /d' \ + -e '/ sl /d' \ + -e '/ splash /d' \ -e '/ ste /d' \ + -e '/ sym /d' \ -e '/ tl /d' \ -e '/ tx /d' \ + -e '/ txp /d' \ -e '/ vr /d' \ + -e '/ vx /d' \ -e '/ wb /d' \ + -e '/ wi /d' \ -e '/ xl /d' echo "options ATA_NOPCI" @@ -75,38 +75,38 @@ else sed -e 's/ident.*GENERIC/ident BOOTMFS/g' \ + -e '/COMPAT_FREEBSD4/d' \ + -e '/DDB/d' \ -e '/DEBUG/d' \ - -e '/SOFTUPDATES/d' \ - -e '/UFS_DIRHASH/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/KTRACE/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ -e '/PROCFS/d' \ -e '/PSEUDOFS/d' \ - -e '/COMPAT_FREEBSD4/d' \ - -e '/KTRACE/d' \ + -e '/SOFTUPDATES/d' \ -e '/SYSV/d' \ - -e '/DDB/d' \ - -e '/INVARIANTS/d' \ - -e '/INVARIANT_SUPPORT/d' \ + -e '/UFS_DIRHASH/d' \ -e '/WITNESS/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ -e '/ ch /d' \ - -e '/ sa /d' \ + -e '/ faith /d' \ + -e '/ gif /d' \ + -e '/ lpt /d' \ -e '/ pass /d' \ - -e '/ ses /d' \ - -e '/ splash /d' \ + -e '/ plip /d' \ + -e '/ ppbus /d' \ -e '/ ppc$/d' \ - -e '/ ppbus /d' \ - -e '/ lpt /d' \ - -e '/ plip /d' \ -e '/ ppi /d' \ + -e '/ ppp /d' \ + -e '/ pty /d' \ -e '/ random /d' \ + -e '/ sa /d' \ + -e '/ ses /d' \ -e '/ sl /d' \ - -e '/ ppp /d' \ - -e '/ pty /d' \ >>> TRUNCATED FOR MAIL (1000 lines) <<<