Date: Wed, 22 Sep 2004 22:43:02 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 61974 for review Message-ID: <200409222243.i8MMh2wK074524@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=61974 Change 61974 by marcel@marcel_nfs on 2004/09/22 22:42:21 IFC @61973 Affected files ... .. //depot/projects/ia64/Makefile.inc1#94 integrate .. //depot/projects/ia64/UPDATING#68 integrate .. //depot/projects/ia64/bin/chflags/chflags.1#5 integrate .. //depot/projects/ia64/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/ia64/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwinetaton.c#1 branch .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwinetntop.c#1 branch .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwinetpton.c#1 branch .. //depot/projects/ia64/contrib/bind9/lib/tests/Makefile.in#2 delete .. //depot/projects/ia64/contrib/bind9/lib/tests/include/Makefile.in#2 delete .. //depot/projects/ia64/contrib/bind9/lib/tests/include/tests/Makefile.in#2 delete .. //depot/projects/ia64/contrib/bind9/lib/tests/include/tests/t_api.h#2 delete .. //depot/projects/ia64/contrib/bind9/lib/tests/t_api.c#2 delete .. //depot/projects/ia64/etc/Makefile#42 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#28 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#13 integrate .. //depot/projects/ia64/etc/rc.d/dumpon#4 integrate .. //depot/projects/ia64/gnu/lib/libregex/Makefile#7 integrate .. //depot/projects/ia64/lib/Makefile#47 integrate .. //depot/projects/ia64/lib/bind/Makefile#1 branch .. //depot/projects/ia64/lib/bind/bind/Makefile#1 branch .. //depot/projects/ia64/lib/bind/bind/config.h#1 branch .. //depot/projects/ia64/lib/bind/bind/port_after.h#1 branch .. //depot/projects/ia64/lib/bind/bind/port_before.h#1 branch .. //depot/projects/ia64/lib/bind/bind9/Makefile#1 branch .. //depot/projects/ia64/lib/bind/config.h#1 branch .. //depot/projects/ia64/lib/bind/config.mk#1 branch .. //depot/projects/ia64/lib/bind/dns/Makefile#1 branch .. //depot/projects/ia64/lib/bind/dns/code.h#1 branch .. //depot/projects/ia64/lib/bind/dns/dns/enumclass.h#1 branch .. //depot/projects/ia64/lib/bind/dns/dns/enumtype.h#1 branch .. //depot/projects/ia64/lib/bind/dns/dns/rdatastruct.h#1 branch .. //depot/projects/ia64/lib/bind/isc/Makefile#1 branch .. //depot/projects/ia64/lib/bind/isc/isc/platform.h#1 branch .. //depot/projects/ia64/lib/bind/isccc/Makefile#1 branch .. //depot/projects/ia64/lib/bind/isccfg/Makefile#1 branch .. //depot/projects/ia64/lib/bind/lwres/Makefile#1 branch .. //depot/projects/ia64/lib/bind/lwres/lwres/netdb.h#1 branch .. //depot/projects/ia64/lib/bind/lwres/lwres/platform.h#1 branch .. //depot/projects/ia64/lib/libbind/Makefile#4 delete .. //depot/projects/ia64/lib/libc/locale/collate.c#8 integrate .. //depot/projects/ia64/lib/libdevinfo/devinfo.c#3 integrate .. //depot/projects/ia64/lib/libfetch/common.c#12 integrate .. //depot/projects/ia64/lib/libfetch/common.h#8 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#12 integrate .. //depot/projects/ia64/lib/libfetch/fetch.c#6 integrate .. //depot/projects/ia64/lib/libfetch/fetch.h#5 integrate .. //depot/projects/ia64/lib/libfetch/file.c#4 integrate .. //depot/projects/ia64/lib/libfetch/ftp.c#14 integrate .. //depot/projects/ia64/lib/libfetch/http.c#16 integrate .. //depot/projects/ia64/lib/libisc/Makefile#6 delete .. //depot/projects/ia64/lib/libkvm/kvm_ia64.c#4 integrate .. //depot/projects/ia64/lib/libncp/ncpl_subr.c#7 integrate .. //depot/projects/ia64/lib/libnetgraph/sock.c#5 integrate .. //depot/projects/ia64/lib/libstand/stand.h#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#20 integrate .. //depot/projects/ia64/libexec/Makefile#22 integrate .. //depot/projects/ia64/libexec/named-xfer/Makefile#4 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#83 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/Makefile.inc#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#20 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/i386/Makefile#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml#5 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/Makefile#4 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/readme/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#36 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#36 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#27 integrate .. //depot/projects/ia64/share/man/man3/Makefile#10 integrate .. //depot/projects/ia64/share/man/man4/Makefile#74 integrate .. //depot/projects/ia64/share/man/man4/axe.4#6 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/vpd.4#3 integrate .. //depot/projects/ia64/share/man/man4/snd_ess.4#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#54 integrate .. //depot/projects/ia64/share/man/man9/Makefile#44 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#24 integrate .. //depot/projects/ia64/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/ia64/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#50 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#40 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/ia64/sys/amd64/include/db_machdep.h#4 integrate .. //depot/projects/ia64/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosdisk.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#26 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#54 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#17 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#21 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#30 integrate .. //depot/projects/ia64/sys/dev/adlink/adlink.c#11 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_isa.c#5 integrate .. //depot/projects/ia64/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/ia64/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq.c#6 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#16 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#64 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#24 integrate .. //depot/projects/ia64/sys/dev/usb/usb_port.h#17 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#59 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumext.h#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinummemory.c#8 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#32 integrate .. //depot/projects/ia64/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/ia64/sys/geom/label/g_label.c#3 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/ia64/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/ia64/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#78 integrate .. //depot/projects/ia64/sys/ia64/ia64/db_trace.c#15 integrate .. //depot/projects/ia64/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#25 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#64 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#54 integrate .. //depot/projects/ia64/sys/kern/kern_kse.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#54 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#80 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#42 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#41 integrate .. //depot/projects/ia64/sys/net/if.c#36 integrate .. //depot/projects/ia64/sys/net/if_arcsubr.c#16 integrate .. //depot/projects/ia64/sys/net/pfil.c#6 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#17 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#37 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#24 integrate .. //depot/projects/ia64/sys/pci/viapm.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#12 integrate .. //depot/projects/ia64/sys/sys/sched.h#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#37 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#43 integrate .. //depot/projects/ia64/tools/tools/genericize/genericize.pl#3 integrate .. //depot/projects/ia64/tools/tools/netrate/Makefile#2 integrate .. //depot/projects/ia64/tools/tools/netrate/netreceive/netreceive.c#2 integrate .. //depot/projects/ia64/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/ia64/usr.bin/Makefile#64 integrate .. //depot/projects/ia64/usr.bin/dig/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.1#13 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#21 integrate .. //depot/projects/ia64/usr.bin/host/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/indent/args.c#9 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.c#9 integrate .. //depot/projects/ia64/usr.bin/nslookup/Makefile#1 branch .. //depot/projects/ia64/usr.bin/nsupdate/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/Makefile#62 integrate .. //depot/projects/ia64/usr.sbin/dnssec-keygen/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/dnssec-signzone/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/named-checkconf/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/named-checkzone/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/named.reload/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/named.reload/named.reload.8#3 integrate .. //depot/projects/ia64/usr.sbin/named.reload/named.reload.sh#2 integrate .. //depot/projects/ia64/usr.sbin/named.restart/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/named.restart/named.restart.8#3 delete .. //depot/projects/ia64/usr.sbin/named.restart/named.restart.sh#2 delete .. //depot/projects/ia64/usr.sbin/named/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/named/Makefile.inc#4 delete .. //depot/projects/ia64/usr.sbin/named/Makefile.maninc#4 delete .. //depot/projects/ia64/usr.sbin/rndc-confgen/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/rndc/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#30 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#94 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.445 2004/09/07 15:27:10 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.447 2004/09/21 21:47:05 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -900,6 +900,14 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L +.if !defined(NO_BIND) +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" +_prebuild_libs+= lib/libc_r +.else +_prebuild_libs+= lib/libpthread +.endif +.endif + _generic_libs+= lib .if !defined(NOCRYPT) ==== //depot/projects/ia64/UPDATING#68 (text+ko) ==== @@ -1859,4 +1859,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.359 2004/09/15 01:08:32 seanc Exp $ +$FreeBSD: src/UPDATING,v 1.361 2004/09/22 20:42:30 andre Exp $ ==== //depot/projects/ia64/bin/chflags/chflags.1#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.18 2004/04/06 20:06:44 markm Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.19 2004/09/21 10:13:34 keramida Exp $ .\" .Dd March 24, 2003 .Dt CHFLAGS 1 @@ -78,30 +78,25 @@ of keywords. The following keywords are currently defined: .Pp -.Bl -tag -offset indent -width "opaque" -compact -.It Ar arch +.Bl -tag -offset indent -width ".Ar opaque" +.It Ar arch , archived set the archived flag (super-user only) .It Ar opaque set the opaque flag (owner or super-user only) .It Ar nodump set the nodump flag (owner or super-user only) -.It Ar sappnd +.It Ar sappnd , sappend set the system append-only flag (super-user only) -.It Ar schg +.It Ar schg , schange , simmutable set the system immutable flag (super-user only) -.It Ar sunlnk +.It Ar sunlnk , sunlink set the system undeletable flag (super-user only) -.It Ar uappnd +.It Ar uappnd , uappend set the user append-only flag (owner or super-user only) -.It Ar uchg +.It Ar uchg , uchange , uimmutable set the user immutable flag (owner or super-user only) -.It Ar uunlnk +.It Ar uunlnk , uunlink set the user undeletable flag (owner or super-user only) -.It Ar archived , sappend , schange , Xo -.Ar simmutable , uappend , uchange , uimmutable , -.Ar sunlink , uunlink -.Xc -aliases for the above .El .Pp Putting the letters ==== //depot/projects/ia64/etc/Makefile#42 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.327 2004/03/23 22:17:34 des Exp $ +# $FreeBSD: src/etc/Makefile,v 1.328 2004/09/21 19:01:41 des Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -114,8 +114,10 @@ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree +.if 0 cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/etc/namedb +.endif cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.91 2004/09/16 21:33:56 glebius Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.92 2004/09/21 19:01:41 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -9,6 +9,10 @@ .. arpa .. + bind + .. + bind9 + .. bsnmp .. c++ @@ -53,6 +57,10 @@ wi .. .. + dns + .. + dst + .. fs autofs .. @@ -105,6 +113,10 @@ .. isc .. + isccc + .. + isccfg + .. isofs cd9660 .. @@ -113,6 +125,8 @@ .. libmilter .. + lwres + .. machine pc .. ==== //depot/projects/ia64/etc/mtree/BSD.root.dist#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.68 2004/07/27 12:31:38 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.69 2004/09/21 19:01:41 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -32,12 +32,6 @@ .. mtree .. - namedb -# leave commented out until buildworld/installworld can -# handle new user ids -# s uname=bind gname=bind mode=0750 -# .. - .. ntp mode=0700 .. pam.d ==== //depot/projects/ia64/etc/rc.d/dumpon#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.3 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.4 2004/09/20 17:48:45 des Exp $ # # PROVIDE: dumpon @@ -22,6 +22,16 @@ case ${dumpdev} in [Nn][Oo] | '') ;; + [Aa][Uu][Tt][Oo]) + memsize=$((`/sbin/sysctl -n hw.physmem` / 1024)) + while read dev mp type more ; do + [ "${type}" = "swap" ] || continue + [ -c "${dev}" ] || continue + /sbin/dumpon -v "${dev}" 2>/dev/null && return 0 + done </etc/fstab + echo "No suitable dump device was found." 1>&2 + return 1 + ;; *) /sbin/dumpon -v ${dumpdev} ;; ==== //depot/projects/ia64/gnu/lib/libregex/Makefile#7 (text+ko) ==== @@ -1,23 +1,22 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.29 2004/09/16 01:39:13 peter Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.30 2004/09/19 12:15:25 ru Exp $ -SUBDIR+= doc +SUBDIR= doc LIB= gnuregex SHLIB_MAJOR= 2 -SRCS= gnuregex.c +SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS -INCS= regex.h.patched -CLEANFILES+= regex.h.patched gnuregex.c +INCS= regex.h.patched INCSNAME= regex.h INCSDIR= ${INCLUDEDIR}/gnu -WRINCS= gnuregex.h -PXINCS= posix/regex.h -PXINCSDIR= ${INCLUDEDIR}/gnu/posix -NOMAN= noman +WRINCS= gnuregex.h +PXINCS= posix/regex.h +PXINCSDIR= ${INCSDIR}/posix CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS +CLEANFILES= regex.h.patched gnuregex.c regex.h.patched: regex.h sed 's=<posix/regex\.h>=<gnu/posix/regex.h>=g' \ < ${.ALLSRC} > ${.TARGET} ==== //depot/projects/ia64/lib/Makefile#47 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.192 2004/09/03 17:39:00 alfred Exp $ +# $FreeBSD: src/lib/Makefile,v 1.193 2004/09/21 19:01:42 des Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -24,15 +24,15 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ - ${_libypclnt} libalias libarchive ${_libatm} ${_libbind} \ + ${_libypclnt} libalias libarchive ${_libatm} \ ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ - libipx libisc libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ + libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libautofs libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ - libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz + libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -48,7 +48,7 @@ .endif .if !defined(NO_BIND) -_libbind= libbind +_bind= bind .endif .if !defined(NO_BLUETOOTH) ==== //depot/projects/ia64/lib/libc/locale/collate.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.32 2002/10/29 09:03:57 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.33 2004/09/22 16:56:48 stefanf Exp $"); #include "namespace.h" #include <arpa/inet.h> @@ -202,14 +202,14 @@ delta += delta / 8; dest_str = malloc(dest_len = delta); if (dest_str == NULL) - __collate_err(EX_OSERR, __FUNCTION__); + __collate_err(EX_OSERR, __func__); len = 0; while (*s) { nlen = len + strlen(__collate_substitute_table[*s]); if (dest_len <= nlen) { dest_str = reallocf(dest_str, dest_len = nlen + delta); if (dest_str == NULL) - __collate_err(EX_OSERR, __FUNCTION__); + __collate_err(EX_OSERR, __func__); } (void)strcpy(dest_str + len, __collate_substitute_table[*s++]); len = nlen; @@ -246,7 +246,7 @@ u_char *t = strdup(s); if (t == NULL) - __collate_err(EX_OSERR, __FUNCTION__); + __collate_err(EX_OSERR, __func__); return (t); } ==== //depot/projects/ia64/lib/libdevinfo/devinfo.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdevinfo/devinfo.c,v 1.4 2002/09/20 02:16:33 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libdevinfo/devinfo.c,v 1.5 2004/09/22 16:56:49 stefanf Exp $"); /* * An interface to the FreeBSD kernel's bus/devce information interface. @@ -84,7 +84,7 @@ #if 0 # define debug(fmt, args...) \ - fprintf(stderr, "%s:" fmt "\n", __FUNCTION__ , ##args) + fprintf(stderr, "%s:" fmt "\n", __func__ , ##args) #else # define debug(fmt, args...) #endif ==== //depot/projects/ia64/lib/libfetch/common.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.48 2003/10/23 13:50:01 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.49 2004/09/21 18:35:20 des Exp $"); #include <sys/param.h> #include <sys/socket.h> ==== //depot/projects/ia64/lib/libfetch/common.h#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libfetch/common.h,v 1.27 2003/03/03 12:35:03 des Exp $ + * $FreeBSD: src/lib/libfetch/common.h,v 1.28 2004/09/21 18:35:20 des Exp $ */ #ifndef _COMMON_H_INCLUDED ==== //depot/projects/ia64/lib/libfetch/fetch.3#12 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 1998 Dag-Erling Coïdan Smørgrav +.\"- +.\" Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.57 2004/07/02 23:52:15 ru Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.58 2004/09/21 18:35:20 des Exp $ .\" .Dd July 1, 1998 .Dt FETCH 3 ==== //depot/projects/ia64/lib/libfetch/fetch.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.37 2003/01/28 08:04:40 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.38 2004/09/21 18:35:20 des Exp $"); #include <sys/param.h> #include <sys/errno.h> ==== //depot/projects/ia64/lib/libfetch/fetch.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libfetch/fetch.h,v 1.25 2002/07/22 16:11:39 des Exp $ + * $FreeBSD: src/lib/libfetch/fetch.h,v 1.26 2004/09/21 18:35:20 des Exp $ */ #ifndef _FETCH_H_INCLUDED ==== //depot/projects/ia64/lib/libfetch/file.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.16 2003/01/28 08:04:40 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.17 2004/09/21 18:35:20 des Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/ia64/lib/libfetch/ftp.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.90 2003/08/29 15:56:52 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.91 2004/09/21 18:35:20 des Exp $"); /* * Portions of this code were taken from or based on ftpio.c: ==== //depot/projects/ia64/lib/libfetch/http.c#16 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.73 2004/08/07 20:23:50 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.74 2004/09/21 18:35:21 des Exp $"); /* * The following copyright applies to the base64 code: ==== //depot/projects/ia64/lib/libkvm/kvm_ia64.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.4 2003/05/16 21:26:40 marcel Exp $ */ +/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.5 2004/09/22 20:26:33 marcel Exp $ */ /* $NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $ */ /* @@ -72,7 +72,7 @@ } vm->mmapsize = sz; - vm->mmapbase = mmap(NULL, sz, PROT_READ, MAP_PRIVATE, kd->pmfd, NULL); + vm->mmapbase = mmap(NULL, sz, PROT_READ, MAP_PRIVATE, kd->pmfd, 0); if (vm->mmapbase == MAP_FAILED) { _kvm_err(kd, kd->program, "cannot mmap corefile"); return (-1); ==== //depot/projects/ia64/lib/libncp/ncpl_subr.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.10 2004/06/02 03:41:10 bp Exp $"); +__FBSDID("$FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.11 2004/09/22 16:56:49 stefanf Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -254,19 +254,19 @@ if (errno == ENOENT) fprintf(stderr, "Kernel module ncp is not loaded.\n"); else - fprintf(stderr, "%s: kernel module is old, please recompile it.\n", __FUNCTION__); + fprintf(stderr, "%s: kernel module is old, please recompile it.\n", __func__); return error; } if (NCP_VERSION != kv) { - fprintf(stderr, "%s: kernel module version(%d) don't match library(%d).\n", __FUNCTION__, kv, NCP_VERSION); + fprintf(stderr, "%s: kernel module version(%d) don't match library(%d).\n", __func__, kv, NCP_VERSION); return EINVAL; } if ((error = ncp_nls_setrecode(0)) != 0) { - fprintf(stderr, "%s: can't initialise recode\n", __FUNCTION__); + fprintf(stderr, "%s: can't initialise recode\n", __func__); return error; } if ((error = ncp_nls_setlocale("")) != 0) { - fprintf(stderr, "%s: can't initialise locale\n", __FUNCTION__); + fprintf(stderr, "%s: can't initialise locale\n", __func__); return error; } ncp_initialized++; ==== //depot/projects/ia64/lib/libnetgraph/sock.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libnetgraph/sock.c,v 1.6 2004/01/27 20:25:14 ru Exp $"); +__FBSDID("$FreeBSD: src/lib/libnetgraph/sock.c,v 1.7 2004/09/22 16:56:49 stefanf Exp $"); #include <sys/types.h> #include <stdarg.h> @@ -196,7 +196,7 @@ if (NgSendMsg(cs, path, NGM_GENERIC_COOKIE, NGM_NAME, &ngn, sizeof(ngn)) < 0) { if (_gNgDebugLevel >= 1) - NGLOGX("%s: failed", __FUNCTION__); + NGLOGX("%s: failed", __func__); return (-1); } ==== //depot/projects/ia64/lib/libstand/stand.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libstand/stand.h,v 1.39 2004/01/15 18:35:32 jhb Exp $ + * $FreeBSD: src/lib/libstand/stand.h,v 1.40 2004/09/22 16:56:49 stefanf Exp $ * From $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $ */ @@ -68,8 +68,8 @@ #include <sys/dirent.h> #include <string.h> -#define CHK(fmt, args...) printf("%s(%d): " fmt "\n", __FUNCTION__, __LINE__ , ##args) -#define PCHK(fmt, args...) {printf("%s(%d): " fmt "\n", __FUNCTION__, __LINE__ , ##args); getchar();} +#define CHK(fmt, args...) printf("%s(%d): " fmt "\n", __func__, __LINE__ , ##args) +#define PCHK(fmt, args...) {printf("%s(%d): " fmt "\n", __func__, __LINE__ , ##args); getchar();} #ifndef NULL #define NULL 0 ==== //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#20 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.30 2004/07/30 17:13:00 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.32 2004/09/22 18:51:16 mtm Exp $ */ #include <stdlib.h> #include <errno.h> @@ -105,9 +105,7 @@ { int ret = 0; - if (mutex == NULL) - ret = EINVAL; - else if (*mutex == PTHREAD_MUTEX_INITIALIZER) + if (*mutex == PTHREAD_MUTEX_INITIALIZER) ret = _pthread_mutex_init(mutex, NULL); else { /* @@ -169,9 +167,6 @@ int _pthread_mutex_destroy(pthread_mutex_t * mutex) { - if (mutex == NULL) - return (EINVAL); - /* * If this mutex was statically initialized, don't bother * initializing it in order to destroy it immediately. @@ -271,14 +266,11 @@ { int ret = 0; - if (mutex == NULL) - ret = EINVAL; - /* * If the mutex is statically initialized, perform the dynamic * initialization: */ - else if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || + if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || (ret = mutex_init(mutex, 0)) == 0) ret = mutex_lock_common(mutex, 1, NULL); @@ -293,22 +285,14 @@ { int ret = 0; - _thread_sigblock(); - - if (mutex == NULL) - ret = EINVAL; - /* * If the mutex is statically initialized, perform the dynamic * initialization marking the mutex private (delete safe): */ - else if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || + if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || (ret = mutex_init(mutex, 1)) == 0) ret = mutex_lock_common(mutex, 1, NULL); - if (ret != 0) - _thread_sigunblock(); - return (ret); } @@ -518,14 +502,11 @@ if (_thread_initial == NULL) _thread_init(); - if (mutex == NULL) - ret = EINVAL; - /* * If the mutex is statically initialized, perform the dynamic * initialization: */ - else if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || + if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || ((ret = mutex_init(mutex, 0)) == 0)) ret = mutex_lock_common(mutex, 0, NULL); @@ -543,22 +524,14 @@ if (_thread_initial == NULL) _thread_init(); - _thread_sigblock(); - - if (mutex == NULL) - ret = EINVAL; - /* * If the mutex is statically initialized, perform the dynamic * initialization marking it private (delete safe): */ - else if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || + if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || ((ret = mutex_init(mutex, 1)) == 0)) ret = mutex_lock_common(mutex, 0, NULL); - if (ret != 0) - _thread_sigunblock(); - return (ret); } @@ -574,9 +547,7 @@ /* * Initialize it if it's a valid statically inited mutex. */ - if (mutex == NULL) - error = EINVAL; - else if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || + if ((*mutex != PTHREAD_MUTEX_INITIALIZER) || ((error = mutex_init(mutex, 0)) == 0)) error = mutex_lock_common(mutex, 0, abstime); @@ -596,10 +567,7 @@ int _pthread_mutex_unlock(pthread_mutex_t * mutex) { - int error; - if ((error = mutex_unlock_common(mutex, /* add reference */ 0)) == 0) - _thread_sigunblock(); - return (error); + return (mutex_unlock_common(mutex, /* add reference */ 0)); } int @@ -660,8 +628,6 @@ /* * Error checking. */ - if (*mutex == NULL) - return (EINVAL); if ((*mutex)->m_owner != curthread) return (EPERM); PTHREAD_ASSERT(((*mutex)->m_protocol >= PTHREAD_PRIO_NONE && ==== //depot/projects/ia64/libexec/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.67 2004/06/17 16:08:19 obrien Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.68 2004/09/21 19:01:45 des Exp $ SUBDIR= atrun \ bootpd \ @@ -13,7 +13,6 @@ ${_mail.local} \ makekey \ mknetid \ - ${_named-xfer} \ pppoed \ pt_chown \ rbootd \ @@ -35,10 +34,6 @@ tftpd \ ypxfr -.if !defined(NO_BIND) -_named-xfer= named-xfer -.endif - .if !defined(NO_PF) _ftp-proxy= ftp-proxy .endif ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#83 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.257 2004/09/16 20:38:28 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.258 2004/09/20 20:26:20 simon Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -734,6 +734,8 @@ &hwlist.snd.es137x; + &hwlist.snd.ess; + <para arch="i386,alpha,amd64">ESS <itemizedlist> <listitem> ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,16 @@ -# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/Makefile.inc,v 1.1 2002/03/03 14:31:32 hrs Exp $ -# Original revision: 1.2 +# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/Makefile.inc,v 1.2 2004/09/20 11:19:32 hrs Exp $ +# Original revision: 1.3 .ifdef NO_LANGCODE_IN_DESTDIR DESTDIR?= ${DOCDIR}/hardware/${.CURDIR:T} .else DESTDIR?= ${DOCDIR}/ja_JP.eucJP/hardware/${.CURDIR:T} >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409222243.i8MMh2wK074524>