From owner-p4-projects@FreeBSD.ORG Tue Aug 22 18:49:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35ACE16A4DF; Tue, 22 Aug 2006 18:49:39 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DEE5E16A4DD for ; Tue, 22 Aug 2006 18:49:38 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CF2643D46 for ; Tue, 22 Aug 2006 18:49:38 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7MIncvQ013571 for ; Tue, 22 Aug 2006 18:49:38 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7MInY93013568 for perforce@freebsd.org; Tue, 22 Aug 2006 18:49:34 GMT (envelope-from piso@freebsd.org) Date: Tue, 22 Aug 2006 18:49:34 GMT Message-Id: <200608221849.k7MInY93013568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 104791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Aug 2006 18:49:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=104791 Change 104791 by piso@piso_newluxor on 2006/08/22 18:48:53 IFC Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#3 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#4 integrate .. //depot/projects/soc2005/libalias/UPDATING#4 integrate .. //depot/projects/soc2005/libalias/bin/date/netdate.c#2 integrate .. //depot/projects/soc2005/libalias/bin/df/df.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ed/main.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ps/ps.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/todo#1 branch .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/LICENSE#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/Makefile.aut#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/NEWS#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/brac.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/ch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/charset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/charset.h#1 branch .. //depot/projects/soc2005/libalias/contrib/less/cmd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/command.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/configure.ac#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/decode.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.ds#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.o2#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.o9#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.wn#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/edit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/filename.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/forwback.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/funcs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/ifile.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/input.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/jump.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.nro#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lessecho.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lessecho.man#1 branch .. //depot/projects/soc2005/libalias/contrib/less/lessecho.nro#1 branch .. //depot/projects/soc2005/libalias/contrib/less/lesskey.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.nro#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lglob.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/line.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/linenum.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/lsystem.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/mark.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/mkhelp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/optfunc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/option.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/option.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/opttbl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/os.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/output.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/pckeys.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/position.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/position.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/prompt.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/screen.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/scrsize.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/search.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/signal.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/tags.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/ttyin.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/less/version.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2005/libalias/etc/network.subr#2 integrate .. //depot/projects/soc2005/libalias/etc/pccard_ether#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/dhclient#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ramdisk#2 delete .. //depot/projects/soc2005/libalias/etc/rc.d/ramdisk-own#2 delete .. //depot/projects/soc2005/libalias/etc/rc.d/sshd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.initdiskless#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.subr#3 integrate .. //depot/projects/soc2005/libalias/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/soc2005/libalias/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libsupc++/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/Makefile#3 integrate .. //depot/projects/soc2005/libalias/lib/csu/alpha/Makefile#2 delete .. //depot/projects/soc2005/libalias/lib/csu/alpha/crt1.c#2 delete .. //depot/projects/soc2005/libalias/lib/csu/alpha/crti.S#2 delete .. //depot/projects/soc2005/libalias/lib/csu/alpha/crtn.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/alpha/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/SYS.h#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/Symbol.map#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/_fpmath.h#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/arith.h#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/_ctx_start.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/_set_tp.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/_setjmp.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/divrem.m4#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/fabs.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/flt_rounds.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/fpgetmask.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/fpgetround.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/fpgetsticky.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/fpsetmask.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/fpsetround.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/infinity.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/makecontext.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/modf.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/rfork_thread.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/setjmp.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/signalcontext.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/gen/sigsetjmp.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/byte_swap_2.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/byte_swap_4.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/htonl.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/htons.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/ntohl.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/net/ntohs.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/stdlib/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/string/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/string/bcopy.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/string/bzero.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/string/ffs.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/string/memcpy.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/string/memmove.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/Ovfork.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/brk.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/cerror.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/exect.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/fork.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/pipe.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/ptrace.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/sbrk.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/setlogin.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/alpha/sys/sigreturn.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/arm/net/htonl.S#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/arm/net/htons.S#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/arm/net/ntohl.S#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/arm/net/ntohs.S#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/findfp.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc_r/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libc_r/arch/alpha/_atomic_lock.S#2 delete .. //depot/projects/soc2005/libalias/lib/libio/Makefile#2 delete .. //depot/projects/soc2005/libalias/lib/libio/alpha_sethae.c#2 delete .. //depot/projects/soc2005/libalias/lib/libio/bwx.c#2 delete .. //depot/projects/soc2005/libalias/lib/libio/io.c#2 delete .. //depot/projects/soc2005/libalias/lib/libio/io.h#2 delete .. //depot/projects/soc2005/libalias/lib/libio/swiz.c#2 delete .. //depot/projects/soc2005/libalias/lib/libpthread/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libpthread/arch/alpha/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libpthread/arch/alpha/alpha/context.S#2 delete .. //depot/projects/soc2005/libalias/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 delete .. //depot/projects/soc2005/libalias/lib/libpthread/arch/alpha/alpha/pthread_md.c#2 delete .. //depot/projects/soc2005/libalias/lib/libpthread/arch/alpha/include/atomic_ops.h#2 delete .. //depot/projects/soc2005/libalias/lib/libpthread/arch/alpha/include/pthread_md.h#2 delete .. //depot/projects/soc2005/libalias/lib/libstand/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libstand/alpha/_setjmp.S#2 delete .. //depot/projects/soc2005/libalias/lib/libthr/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/alpha/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/libthr/arch/alpha/alpha/pthread_md.c#2 delete .. //depot/projects/soc2005/libalias/lib/libthr/arch/alpha/include/pthread_md.h#2 delete .. //depot/projects/soc2005/libalias/lib/msun/alpha/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/lib/msun/alpha/Symbol.map#2 delete .. //depot/projects/soc2005/libalias/lib/msun/alpha/fenv.c#2 delete .. //depot/projects/soc2005/libalias/lib/msun/alpha/fenv.h#2 delete .. //depot/projects/soc2005/libalias/lib/msun/alpha/s_copysign.S#2 delete .. //depot/projects/soc2005/libalias/lib/msun/alpha/s_copysignf.S#2 delete .. //depot/projects/soc2005/libalias/libexec/rtld-elf/alpha/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/libexec/rtld-elf/alpha/ld.so.script#2 delete .. //depot/projects/soc2005/libalias/libexec/rtld-elf/alpha/reloc.c#2 delete .. //depot/projects/soc2005/libalias/libexec/rtld-elf/alpha/rtld_machdep.h#2 delete .. //depot/projects/soc2005/libalias/libexec/rtld-elf/alpha/rtld_start.S#2 delete .. //depot/projects/soc2005/libalias/release/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/alpha/boot_crunch.conf#2 delete .. //depot/projects/soc2005/libalias/release/alpha/mkisoimages.sh#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/soc2005/libalias/rescue/rescue/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/dump/dump.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ggate/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipf/libipf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/ping/Makefile#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/Makefile.inc#4 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-alpha.h#2 delete .. //depot/projects/soc2005/libalias/share/man/man4/amdsmb.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ixgb.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/nfsmb.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uplcom.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/soc2005/libalias/share/man/man8/rc.subr.8#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/lock.9#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/common/help.common#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/loader.8#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ips/ips.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_process.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#6 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_crypt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/nfsmb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#4 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/less/defines.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/lessecho/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/locate/locate/locate.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/pkill/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/uac/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.bin/uac/uac.1#2 delete .. //depot/projects/soc2005/libalias/usr.bin/uac/uac.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/crunch/crunchide/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pnpinfo/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/yppush/yppush_main.c#3 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.553 2006/08/22 07:51:05 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -926,9 +926,6 @@ .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "alpha" -_elf2exe= usr.sbin/elf2exe -.endif .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif @@ -941,7 +938,6 @@ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ - ${_elf2exe} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060822: ramdisk{,-own} have been replaced by mdconfig{,2} +OLD_FILES+=etc/rc.d/ramdisk +OLD_FILES+=etc/rc.d/ramdisk-own # 20060704: KAME compat file net_osdep.h removed OLD_FILES+=usr/include/net/net_osdep.h # 20060517: pcvt removed @@ -334,7 +337,7 @@ OLD_FILES+=usr/share/man/man1/sgsc.1.gz OLD_FILES+=usr/share/man/man4/i386/stl.4.gz OLD_FILES+=usr/share/man/man8/raidctl.8.gz -.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse.so @@ -3066,7 +3069,7 @@ OLD_LIBS+=usr/lib/libisc.so.1 # 200408XX OLD_LIBS+=usr/lib/snmp_netgraph.so.1 -.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_LIBS+=usr/lib/libkse.so.1 .endif ==== //depot/projects/soc2005/libalias/UPDATING#4 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060816: + The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour + for IP_FIREWALL_FORWARD is now as it was before when it was first + committed and for years after. The behaviour is now ON. + 20060725: enigma(1)/crypt(1) utility has been changed on 64 bit architectures. Now it can decrypt files created from different architectures. @@ -598,4 +603,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $ +$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ ==== //depot/projects/soc2005/libalias/bin/date/netdate.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.18 2004/04/06 20:06:45 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.19 2006/08/20 06:31:24 imp Exp $"); #include #include @@ -108,14 +108,14 @@ warnx("all ports in use"); goto bad; } + memset(&msg, 0, sizeof(msg)); msg.tsp_type = TSP_SETDATE; msg.tsp_vers = TSPVERSION; if (gethostname(hostname, sizeof(hostname))) { warn("gethostname"); goto bad; } - (void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name) - 1); - msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0'; + (void)strlcpy(msg.tsp_name, hostname, sizeof(msg.tsp_name)); msg.tsp_seq = htons((u_short)0); msg.tsp_time.tv_sec = htonl((u_long)tval); msg.tsp_time.tv_usec = htonl((u_long)0); ==== //depot/projects/soc2005/libalias/bin/df/df.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.64 2005/01/10 08:39:21 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.65 2006/08/20 06:32:40 imp Exp $"); #include #include @@ -113,7 +113,7 @@ memset(&totalbuf, 0, sizeof(totalbuf)); totalbuf.f_bsize = DEV_BSIZE; - strncpy(totalbuf.f_mntfromname, "total", MNAMELEN); + strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1) switch (ch) { @@ -552,7 +552,7 @@ *str = 'n'; *(str + 1) = 'o'; for (i = 0, strptr = str + 2; i < cnt; i++, strptr++) { - strncpy(strptr, listptr[i], 32); + strlcpy(strptr, listptr[i], 32); strptr += strlen(listptr[i]); *strptr = ','; free(listptr[i]); ==== //depot/projects/soc2005/libalias/bin/ed/main.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.28 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.29 2006/08/17 23:00:33 imp Exp $"); /* * CREDITS @@ -292,7 +292,7 @@ errmsg = "invalid address"; \ return ERR; \ } \ -} while (0); +} while (0) /* next_addr: return the next line address in the command buffer */ long ==== //depot/projects/soc2005/libalias/bin/ps/ps.1#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.86 2005/04/29 11:10:27 maxim Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.88 2006/08/21 03:09:12 yar Exp $ .\" -.Dd March 20, 2005 +.Dd August 21, 2006 .Dt PS 1 .Os .Sh NAME @@ -179,14 +179,16 @@ .It Fl o Display information associated with the space or comma separated list of keywords specified. +The last keyword in the list may be appended with an equals +.Pq Ql = +sign and a string that spans the rest of the argument and can contain +space and comma characters. +This causes the printed header to use the specified string instead of +the standard header. Multiple keywords may also be given in the form of more than one .Fl o option. -Keywords may be appended with an equals -.Pq Ql = -sign and a string. -This causes the printed header to use the specified string instead of -the standard header. +So the header texts for multiple keywords can be changed. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. ==== //depot/projects/soc2005/libalias/contrib/ipfilter/BSD/Makefile#2 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/soc2005/libalias/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/soc2005/libalias/contrib/ipfilter/Makefile#2 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/soc2005/libalias/contrib/ipfilter/bpf_filter.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we + * assume that BPF_MAXINSNS is < the maximum size + * of a u_int, so that i + 1 doesn't overflow. + */ + from = i + 1; + switch (BPF_OP(p->code)) { + case BPF_JA: + if (from + p->k < from || from + p->k >= len) + return 0; + break; + case BPF_JEQ: + case BPF_JGT: + case BPF_JGE: + case BPF_JSET: + if (from + p->jt >= len || from + p->jf >= len) + return 0; + break; + default: return 0; + } + break; + case BPF_RET: + break; + case BPF_MISC: + break; + default: + return 0; } - /* - * Check that memory operations use valid addresses. - */ - if ((BPF_CLASS(p->code) == BPF_ST || - (BPF_CLASS(p->code) == BPF_LD && - (p->code & 0xe0) == BPF_MEM)) && - (p->k >= BPF_MEMWORDS || p->k < 0)) - return 0; - /* - * Check for constant division by 0. - */ - if (p->code == (BPF_ALU|BPF_DIV|BPF_K) && p->k == 0) - return 0; } return BPF_CLASS(f[len - 1].code) == BPF_RET; } ==== //depot/projects/soc2005/libalias/contrib/ipfilter/ip_fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.4 2006/08/16 12:23:00 guido Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.9 2005/01/08 14:22:18 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.11 2006/03/25 11:15:30 darrenr Exp $"; #endif #ifndef SOLARIS @@ -138,7 +138,7 @@ #include "md5.h" -#if !defined(__osf__) +#if !defined(__osf__) && !defined(__linux__) extern struct protosw inetsw[]; #endif @@ -718,13 +718,45 @@ { struct ifnet *ifp = fdp->fd_ifp; ip_t *ip = fin->fin_ip; + int error = 0; + frentry_t *fr; + void *sifp; if (!ifp) return 0; /* no routing table out here */ - ip->ip_len = htons((u_short)ip->ip_len); - ip->ip_off = htons((u_short)(ip->ip_off | IP_MF)); + fr = fin->fin_fr; ip->ip_sum = 0; + + if (fin->fin_out == 0) { + sifp = fin->fin_ifp; + fin->fin_ifp = ifp; + fin->fin_out = 1; + (void) fr_acctpkt(fin, NULL); + fin->fin_fr = NULL; + if (!fr || !(fr->fr_flags & FR_RETMASK)) { + u_32_t pass; + >>> TRUNCATED FOR MAIL (1000 lines) <<<