Commit Graph

3873 Commits

Author SHA1 Message Date
Ruslan Ermilov
d429ea3323 Markup fixes.
Approved by:	re (blanket)
2005-06-16 20:51:10 +00:00
Ruslan Ermilov
c1c9502bf7 Apply a series of scripts to automatically fix some markup bugs.
Approved by:	re (blanket)
2005-06-16 20:21:03 +00:00
Gregory Neil Shapiro
0c97652c0b Import OSTYPE(freebsd6) support from sendmail open source repo for FreeBSD 6.0.
Approved by: re (scottl)
Requested by: keramida
2005-06-14 02:23:14 +00:00
Gregory Neil Shapiro
9f0725482c This commit was generated by cvs2svn to compensate for changes in r147353,
which included commits to RCS files with non-trunk default branches.
2005-06-14 02:23:14 +00:00
Sam Leffler
fb74d4fdc8 resolve merge conflicts
Approved by:	re (dwhite)
2005-06-13 17:07:31 +00:00
Sam Leffler
fd7895c8dd stripped down import of hostapd 0.3.9
Approved by:	re (dwhite)
2005-06-13 17:00:32 +00:00
Sam Leffler
d2f530490d This commit was generated by cvs2svn to compensate for changes in r147341,
which included commits to RCS files with non-trunk default branches.
2005-06-13 17:00:32 +00:00
Sam Leffler
aff0e28457 resolve merge conflicts 2005-06-13 16:54:21 +00:00
Sam Leffler
1c3c13af99 stripped down import of wpa_supplicant v0.3.9
Approved by:	re (dwhite)
2005-06-13 16:43:14 +00:00
Sam Leffler
f59037e440 This commit was generated by cvs2svn to compensate for changes in r147338,
which included commits to RCS files with non-trunk default branches.
2005-06-13 16:43:14 +00:00
Sam Leffler
dd9c1736f5 pullup security fix on vendor branch 2005-06-09 15:54:42 +00:00
Sam Leffler
cc157742d1 Correct several denial-of-service vulnerabilities in tcpdump.
Security:	FreeBSD-SA-05:10.tcpdump
Security:	CAN-2005-1267, CAN-2005-1278, CAN-2005-1279, CAN-2005-1280
Obtained from:	tcpdump.org
2005-06-09 15:42:58 +00:00
Sam Leffler
fa2afacabb This commit was generated by cvs2svn to compensate for changes in r147173,
which included commits to RCS files with non-trunk default branches.
2005-06-09 15:42:58 +00:00
Sam Leffler
4f735865c7 fix byte order handling: FreeBSD != Linux 2005-06-07 23:33:13 +00:00
Gregory Neil Shapiro
50bd7c73f6 Note the sendmail 8.13.4 upgrade
MFC after:	4 days
2005-06-07 04:22:21 +00:00
Gregory Neil Shapiro
188b7d28c9 Resolve conflicts from sendmail 8.13.4 import 2005-06-07 04:17:21 +00:00
Gregory Neil Shapiro
13d8826863 Import sendmail 8.13.4 2005-06-07 04:14:59 +00:00
Gregory Neil Shapiro
b1b29dff01 This commit was generated by cvs2svn to compensate for changes in r147078,
which included commits to RCS files with non-trunk default branches.
2005-06-07 04:14:59 +00:00
Sam Leffler
4e40980e6f apply important fixes from development branch 2005-06-05 22:41:14 +00:00
cvs2svn
6f38331fdd This commit was manufactured by cvs2svn to create branch
'VENDOR-hostapd'.
2005-06-05 22:36:47 +00:00
Sam Leffler
3807a45d8a import/upgrade instructions 2005-06-05 22:36:46 +00:00
Sam Leffler
5d48cb5da2 Stripped down import of hostapd v0.3.7 2005-06-05 22:35:03 +00:00
Sam Leffler
523fd026bd This commit was generated by cvs2svn to compensate for changes in r147021,
which included commits to RCS files with non-trunk default branches.
2005-06-05 22:35:03 +00:00
Sam Leffler
b1bb8b1684 fix for ctrl interface socket setup
Submitted by:	brooks
2005-06-05 21:13:08 +00:00
cvs2svn
4df0b3fb12 This commit was manufactured by cvs2svn to create branch
'VENDOR-wpa_supplicant'.
2005-06-05 20:55:02 +00:00
Sam Leffler
75c61a94a4 import/ugprade instructions 2005-06-05 20:55:01 +00:00
Sam Leffler
f1fb6907ab Stripped down import of wpa_supplicant v0.3.8 2005-06-05 20:52:14 +00:00
Sam Leffler
e66286908c This commit was generated by cvs2svn to compensate for changes in r147013,
which included commits to RCS files with non-trunk default branches.
2005-06-05 20:52:14 +00:00
Alexander Kabaev
b297022008 Enable handling of MS-compatible packing push and pop pragmas. This change was
inadvertedly left out of the last import.
2005-06-03 17:35:13 +00:00
David E. O'Brien
28832e4b79 Make diff(1) follow traditional UNIX SOP of later options nullify earlier
options that are mutually exclusive.
2005-06-03 06:46:56 +00:00
Alexander Kabaev
441d901f19 Fix a typo from previos commit. 2005-06-03 05:58:56 +00:00
Alexander Kabaev
65bbb3030a Catch up with changes in BDX_OUTPUT_[LR]BRAC callers. 2005-06-03 04:19:23 +00:00
Alexander Kabaev
c3cbf7fdb9 Merge conflicts for GCC 3.4.4. 2005-06-03 04:02:20 +00:00
Alexander Kabaev
d14a001770 Localize GCC version string for FreeBSD. 2005-06-03 03:52:25 +00:00
Alexander Kabaev
31a119f3ed Stock files. 2005-06-03 03:50:42 +00:00
Alexander Kabaev
8fb36271ea This commit was generated by cvs2svn to compensate for changes in r146901,
which included commits to RCS files with non-trunk default branches.
2005-06-03 03:30:16 +00:00
Alexander Kabaev
502dfb0aa3 Gcc 3.4.4 F77 runtime support bits. 2005-06-03 03:30:16 +00:00
Alexander Kabaev
07ae8264f2 This commit was generated by cvs2svn to compensate for changes in r146899,
which included commits to RCS files with non-trunk default branches.
2005-06-03 03:29:59 +00:00
Alexander Kabaev
ef4048012a Gcc 3.4.4 Objective C support bits. 2005-06-03 03:29:59 +00:00
Alexander Kabaev
8d990d16a0 This commit was generated by cvs2svn to compensate for changes in r146897,
which included commits to RCS files with non-trunk default branches.
2005-06-03 03:29:38 +00:00
Alexander Kabaev
f260e61b15 Gcc 3.4.4 C++ support bits. 2005-06-03 03:29:38 +00:00
Alexander Kabaev
4101e78861 This commit was generated by cvs2svn to compensate for changes in r146895,
which included commits to RCS files with non-trunk default branches.
2005-06-03 03:28:44 +00:00
Alexander Kabaev
d51085f37e Gcc 3.4.4 release. 2005-06-03 03:28:44 +00:00
Maxim Sobolev
55f88dd25e Make bzip2 support working again after bzip2 upgrade. This time commit
BZ_NO_COMPRESS support to the bzip2 sources directly (yes, this takes file
off the vendor branch, but looks like bzip2 maintainer doesn't care), so that
it will not be removed when the next upgrade is performed. Also, add a short
note on how to test bzip2 support.

Pointy hat to:  obrien

Correct comment (libz -> libbz2) and remove useless full path to zutil.h
while I am here.
2005-05-29 21:56:38 +00:00
Sam Leffler
c1ad1296ec resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h

Reviewed by:	bms
2005-05-29 19:09:28 +00:00
Sam Leffler
d93a098204 Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org 2005-05-29 18:24:21 +00:00
Sam Leffler
3d1038b8ce This commit was generated by cvs2svn to compensate for changes in r146775,
which included commits to RCS files with non-trunk default branches.
2005-05-29 18:24:21 +00:00
Sam Leffler
1de50e9f41 Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org 2005-05-29 18:17:16 +00:00
Sam Leffler
233f3abd96 This commit was generated by cvs2svn to compensate for changes in r146773,
which included commits to RCS files with non-trunk default branches.
2005-05-29 18:17:16 +00:00
Sam Leffler
c761ebcb2c resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
Sam Leffler
04fb274578 Virgin import of libpcap v0.9.1 (alpha 096) from tcpdump.org 2005-05-29 17:46:52 +00:00
Sam Leffler
0a71d148de This commit was generated by cvs2svn to compensate for changes in r146768,
which included commits to RCS files with non-trunk default branches.
2005-05-29 17:46:52 +00:00
Eivind Eklund
466aa63579 Since this is already off the vendor branch: Our kernel is now in
/boot/kernel/kernel, not plain /kernel
2005-05-27 01:09:42 +00:00
Hartmut Brandt
078b57e43c Apply vendor patch: include the header files from the canonical place.
Explained to me by:	ru
2005-05-25 12:03:26 +00:00
Hartmut Brandt
e6ebcf9203 This commit was generated by cvs2svn to compensate for changes in r146611,
which included commits to RCS files with non-trunk default branches.
2005-05-25 12:03:26 +00:00
Hartmut Brandt
9ed6112d51 Apply a vendor patch: silence gcc on arm (alignent when casting pointer).
Submitted by:	Olivier Houchard <cognet@ci0.org>
2005-05-25 12:00:03 +00:00
Hartmut Brandt
92fd12db24 This commit was generated by cvs2svn to compensate for changes in r146609,
which included commits to RCS files with non-trunk default branches.
2005-05-25 12:00:03 +00:00
Olivier Houchard
6ffb8d33c7 arm defaults to unsigned char as well. 2005-05-24 21:25:32 +00:00
Hartmut Brandt
4e4a36d5f3 Virgin import of NgATM user part 1.2 2005-05-23 12:22:12 +00:00
Hartmut Brandt
c90a265333 This commit was generated by cvs2svn to compensate for changes in r146532,
which included commits to RCS files with non-trunk default branches.
2005-05-23 12:22:12 +00:00
Hartmut Brandt
69292ced51 Virgin import of bsnmpd 1.10 2005-05-23 11:19:11 +00:00
Hartmut Brandt
fbe4316a67 This commit was generated by cvs2svn to compensate for changes in r146525,
which included commits to RCS files with non-trunk default branches.
2005-05-23 11:19:11 +00:00
Ruslan Ermilov
94cfa110b2 Update for version 4.8 import. 2005-05-23 10:55:29 +00:00
Ruslan Ermilov
b5481c54cc Update for texinfo 4.8. 2005-05-23 10:52:07 +00:00
Ruslan Ermilov
13b21befd2 Merge texinfo 4.8 changes onto the trunk. 2005-05-23 10:50:48 +00:00
Ruslan Ermilov
cea538d9c7 Use stock (FSF) version of this file. 2005-05-23 10:50:32 +00:00
Ruslan Ermilov
bea5143702 This commit was generated by cvs2svn to compensate for changes in r146518,
which included commits to RCS files with non-trunk default branches.
2005-05-23 10:47:04 +00:00
Ruslan Ermilov
2531b324df This commit was generated by cvs2svn to compensate for changes in r146515,
which included commits to RCS files with non-trunk default branches.
2005-05-23 10:46:22 +00:00
Ruslan Ermilov
b641f89e08 Import of stripped down GNU texinfo 4.8 2005-05-23 10:46:22 +00:00
Hajimu UMEMOTO
10cb8fdace NI_WITHSCOPEID cleanup 2005-05-21 15:28:42 +00:00
Giorgos Keramidas
3c2ab2b0ec The 'text' argument of u_header() is not used, so we don't need to
trim_header() it.

Noticed by:	bde
2005-05-19 13:34:19 +00:00
Giorgos Keramidas
cd660671ce Properly trim the header line too, to fix wrap-around problems that
have been noticed by running top(1) in terminals that are too narrow
(or on systems with usernames that were too long, pushing everything
too far to the right).

Note that this does *not* solve the wrap-around problem of the system
statistics, which is an entirely different matter :-/

Tested on:	i386, sparc64 (panther), amd64 (sledge)
Approved by:	davidxu (in principle)
2005-05-18 13:48:33 +00:00
Giorgos Keramidas
bbf750fbff Merge the CPU and WCPU columns in a single %6.2f column, add a new 'C'
command that toggles between the two and update the ORDER_PCTCPU()
macro to sort correctly by the visible "cpu" value.

This saves 6 more columns in 80-column terminals, making things a lot
better for the COMMAND column.

Tested on:	i386, sparc64 (panther), amd64 (sledge)
Approved by:	davidxu (in principle)
2005-05-18 13:30:08 +00:00
Mike Heffner
d64cfd6cad This commit was generated by cvs2svn to compensate for changes in r146309,
which included commits to RCS files with non-trunk default branches.
2005-05-17 03:11:29 +00:00
Mike Heffner
f367c1fb52 Import latest NetBSD version...changes:
* Whitespace and gcc 4.x fixes.
 * Fix deallocation bug in fetch.c.
 * Implement timeouts for accept(2) and connect(2),
   which accept timeout values with '-q quittime'.
   (intended to help with active mode through firewalls)
 * Fix bin/77158 by Ryoji Kanai <rkanai@eeye.com>.
2005-05-17 03:11:29 +00:00
Ruslan Ermilov
45c9b8cd6e Update for the 2005/04/24 import. 2005-05-16 19:19:32 +00:00
Ruslan Ermilov
e53d81968a This commit was generated by cvs2svn to compensate for changes in r146299,
which included commits to RCS files with non-trunk default branches.
2005-05-16 19:11:36 +00:00
Ruslan Ermilov
c263f9bff0 Vendor import of bwk's 24-Apr-2005 release. 2005-05-16 19:11:36 +00:00
David E. O'Brien
d87b8d2a1b Update to match the 1.0.3 import. 2005-05-16 18:56:30 +00:00
David E. O'Brien
9dba3024c3 This commit was generated by cvs2svn to compensate for changes in r146293,
which included commits to RCS files with non-trunk default branches.
2005-05-16 18:31:55 +00:00
David E. O'Brien
f7a4f99f70 Virgin import (trimmed) of Bzip2 version 1.0.3. 2005-05-16 18:31:55 +00:00
Darren Reed
051adc35a2 Enable building /sbin/ipf (but not the rescue version) with the ability to
parse bpf strings for filter rules in ipf.conf
2005-05-16 16:22:55 +00:00
Hajimu UMEMOTO
4f10131848 NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines
NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special
for it, now.
2005-05-13 16:31:11 +00:00
Peter Grehan
9fce4d1d91 Fix tinderbox build on ppc.
Requested by:  mlaier
2005-05-08 00:29:15 +00:00
Takanori Watanabe
4ebd3ea1f6 Make smbfs capable to use 16bit char set in filenames.
PR:78110
2005-05-04 15:05:46 +00:00
Max Laier
0baf7c8675 Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step.  This is functional as is.

Tested by:	freebsd-pf, pfsense.org
Obtained from:	OpenBSD
2005-05-03 16:55:20 +00:00
Max Laier
b1feb7cada This commit was generated by cvs2svn to compensate for changes in r145837,
which included commits to RCS files with non-trunk default branches.
2005-05-03 16:47:37 +00:00
Max Laier
61a1372b41 Import pf userland from OpenBSD 3.7 (OPENBSD_3_7 as of today) 2005-05-03 16:47:37 +00:00
Hartmut Brandt
a9bfedb789 Vendor patch: fix a bug that was introduced when moving from libisc to
libbegemot: the rpoll_start_timer function needs the timeout value in
milli-seconds, not the absolute time when the timer should tick.
2005-04-29 11:02:18 +00:00
Hartmut Brandt
5710486746 This commit was generated by cvs2svn to compensate for changes in r145673,
which included commits to RCS files with non-trunk default branches.
2005-04-29 11:02:18 +00:00
Darren Reed
e01de6cda3 Don't use quad_t on FreeBSD (deprecated) so use "long long" instead.
Someday this should be converted to uint64_t and printstate.c changed to
use those horrid PRiud64 things.
2005-04-28 21:36:30 +00:00
Darren Reed
cf4ee2c933 Patches from Ruslam Ermilov to remove NetBSD bits from Makefiles and cleanup
build problems with rescue.
2005-04-28 16:26:35 +00:00
Hartmut Brandt
d7eb6b4714 Virgin import of bsnmp 1.9 2005-04-26 16:43:22 +00:00
Hartmut Brandt
646c481fe6 This commit was generated by cvs2svn to compensate for changes in r145557,
which included commits to RCS files with non-trunk default branches.
2005-04-26 16:43:22 +00:00
Darren Reed
dfb07485de Fix include directives that were missing the netinet include directory, where
the ipl.h file is found.  Also add back in ip_fil.c, which somehow went missing
in action.
2005-04-26 15:18:45 +00:00
Darren Reed
984f8800d4 Missing file from vendor branch import. 2005-04-26 14:59:26 +00:00
Darren Reed
eaa8e3e8c5 Fix problems with building libipf:
ipf_dontuning.c - change the include to look in netinet for ipl.h
ipft_tx.c - make the private use of arrays with tcp flags info in them more
            not use names that can be "confusing"
2005-04-26 14:27:12 +00:00
Darren Reed
0eb958a2b7 this file does not belong in a freebsd distribution 2005-04-25 19:15:19 +00:00
Darren Reed
750e88322f * Someone imported a lot of files with the wrong CVS tag, so lots of files need
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.
2005-04-25 18:20:15 +00:00
Darren Reed
74708a0492 these files should never have been imported...they are junk 2005-04-25 17:40:37 +00:00
Darren Reed
83b71dcb90 This commit was generated by cvs2svn to compensate for changes in r145513,
which included commits to RCS files with non-trunk default branches.
2005-04-25 17:40:37 +00:00
Darren Reed
144279dcb8 import ipfilter 4.1.8 into the vendor branch 2005-04-25 17:31:50 +00:00
Darren Reed
3c911a00da This commit was generated by cvs2svn to compensate for changes in r145510,
which included commits to RCS files with non-trunk default branches.
2005-04-25 17:31:50 +00:00
Mark Peek
23338178da Import of tcsh-6.14.00 2005-04-24 19:41:08 +00:00
Mark Peek
7c1eefa6b6 This commit was generated by cvs2svn to compensate for changes in r145479,
which included commits to RCS files with non-trunk default branches.
2005-04-24 19:41:08 +00:00
Simon L. B. Nielsen
31363b6067 Correct multiple security related errors: a buffer overflow, NULL
pointer dereferences, possible use of uninitialized variables, and
memory leaks.

Security:	CAN-2005-0753
Security:	FreeBSD-SA-05:05.cvs
Approved by:	peter
2005-04-22 17:58:25 +00:00
Giorgos Keramidas
32efd26355 - Add a THR column to the process listing, that shows the number of
threads a process has.  The THR column is disabled and disappears
  when 'H' is hit, because then every thread gets its own output line.
- Allow sorting processes by "threads".

Approved by:	davidxu
Inspired by:	Jiawei Ye <leafy7382@gmail.com>
2005-04-14 15:02:03 +00:00
Thomas Quinot
be9ede4a45 Fix minor discrepancy between documentation and implementation: the
destination port is incremented for each packet sent to the same hop.

MFC after:	1 week
2005-04-12 15:16:32 +00:00
Jacques Vidrine
14aab889f4 Correct a pair of buffer overflows in the telnet(1) command:
(CAN-2005-0468) A heap buffer overflow in env_opt_add() and related
 functions.

 (CAN-2005-0469) A global uninitialized data section buffer overflow in
 slc_add_reply() and related functions.

As a result of these vulnerabilities, it may be possible for a malicious
telnet server or active network attacker to cause telnet(1) to execute
arbitrary code with the privileges of the user running it.

Security: CAN-2005-0468, CAN-2005-0469
Security: FreeBSD-SA-05:01.telnet
Security: http://www.idefense.com/application/poi/display?id=220&type=vulnerabilities
Security: http://www.idefense.com/application/poi/display?id=221&type=vulnerabilities

These fixes are based in part on patches
Submitted by:	Solar Designer <solar@openwall.com>
2005-03-28 14:45:12 +00:00
Doug Barton
0e41462ff3 Expand and refine a few sections for future reference 2005-03-17 08:40:41 +00:00
Doug Barton
e7639cc3cd Delete all aix ports 2005-03-17 08:40:11 +00:00
Doug Barton
94b2911216 Remove files from the vendor branch that were [re]moved in 9.3.1 2005-03-17 08:10:34 +00:00
Doug Barton
0c3e8a73d1 This commit was generated by cvs2svn to compensate for changes in r143734,
which included commits to RCS files with non-trunk default branches.
2005-03-17 08:10:34 +00:00
Doug Barton
6bc6438a36 Vendor import of BIND 9.3.1 2005-03-17 08:04:02 +00:00
Doug Barton
085ef8005f This commit was generated by cvs2svn to compensate for changes in r143731,
which included commits to RCS files with non-trunk default branches.
2005-03-17 08:04:02 +00:00
Christian Brueffer
28d223bdcb Correct macro usage.
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
MFC after:	3 days
2005-03-13 13:37:02 +00:00
Hartmut Brandt
966fd1ea2f Don't extract the .gdbinit file from the distribution. 2005-02-28 17:29:10 +00:00
Hartmut Brandt
94caccb357 Virgin import of bsnmpd 1.8 2005-02-28 17:27:11 +00:00
Hartmut Brandt
71651a2743 This commit was generated by cvs2svn to compensate for changes in r142810,
which included commits to RCS files with non-trunk default branches.
2005-02-28 17:27:11 +00:00
Anton Berezin
3a44a4c33e Increase usefulness of telnet(1) as a protocol tester. By prepending
"+" to the port number, disable option negotiation and allow
transferring of data with high bit set.

OKed by:	markm (maintainer)
PR:		52032
Submitted by:	Valentin Nechayev <netch maybe-at netch stop kiev stop ua>
MFC After:	2 weeks
2005-02-28 12:46:53 +00:00
Gleb Smirnoff
469f8a6aca - remove OpenBSDisms, add FreeBSDisms
- comment out feature, we do not have yet: tcpdumping on pfsync,
  add a BUGS section
- reference carp.4
- dereference bpf(4), tcpdump(7), hostname.if(5)
- sort references
- tell when pfsync appeared in FreeBSD

Reviewed by:	mlaier
MFC after:	1 week
2005-02-23 17:37:39 +00:00
Mike Heffner
9058027721 Import the latest CVS version of lukemftp.
Short list of changes:

 * SIGINT termination from auto-fetch.
 * Less trusting of remote filenames during auto mgets.
 * Improved RFC2616 compliancy.
 * Fix globs when using ftp reget (from mat@).
 * Limit send buffer size.
2005-02-20 17:33:34 +00:00
Mike Heffner
7ffd9476ea This commit was generated by cvs2svn to compensate for changes in r142129,
which included commits to RCS files with non-trunk default branches.
2005-02-20 17:33:34 +00:00
Gregory Neil Shapiro
dbda3744f4 Merge mci.c change to add mci_close() from the vendor branch.
Problem noted by:	marcus
2005-02-14 08:04:08 +00:00
Gregory Neil Shapiro
27bec48138 Commit patch from sendmail.org web site for socket close bug:
http://www.sendmail.org/patches/close_wait.p2

This is being put in the vendor branch as it is in the vendor's repo.
2005-02-14 03:04:18 +00:00
Gregory Neil Shapiro
2beed715b1 This commit was generated by cvs2svn to compensate for changes in r141867,
which included commits to RCS files with non-trunk default branches.
2005-02-14 03:04:18 +00:00
Gregory Neil Shapiro
b37a166a40 Remove files no longer in vendor distribution from vendor branch 2005-02-14 02:58:21 +00:00
Gregory Neil Shapiro
92e30605d8 Update for sendmail 8.13.3 import 2005-02-14 02:45:25 +00:00
Gregory Neil Shapiro
684b2a5fa3 Resolve conflicts from sendmail 8.13.3 import
MFC after:	4 days
2005-02-14 02:39:14 +00:00
Gregory Neil Shapiro
b6bacd3150 Import sendmail 8.13.3 2005-02-14 02:30:00 +00:00
Gregory Neil Shapiro
6af83ee0d2 This commit was generated by cvs2svn to compensate for changes in r141858,
which included commits to RCS files with non-trunk default branches.
2005-02-14 02:30:00 +00:00
Ruslan Ermilov
0227791b40 Expand *n't contractions. 2005-02-13 22:25:33 +00:00
Max Laier
c721916790 Fix sloppy use of "manpage", bump .Dd where applicable and rename RED to
Random Early Detection (not ... Drop) in order to be consistent with other
documentation on ALTQ

Pointed out by:	simon, ru, Brad Davis
2005-02-07 23:20:12 +00:00
Max Laier
8624b327d4 Be more verbose about altq SYNOPSIS and add more linkage in the relating pf
documents.

Inspired by:	scottl
Reviewed by:	Brad Davis <so14kNOso14kSPAMcom>
MFC after:	3 days
2005-02-07 11:46:36 +00:00
Xin LI
b0683dae2d Undo the VCS tag move to reduce diff hunks.
Pointed out by:	ru
2005-02-07 05:34:35 +00:00
Xin LI
a58ff0abbb Add instructions about upgrading netcat(1). 2005-02-06 15:26:44 +00:00
Xin LI
04def62430 Finish the import of nc(1) from OpenBSD. This includes:
- Bring IPsec support from the ports collection [1].
	- Bring -o ("once only") option from the ports
	  collection [2].
	- Adopt the Makefile framework into
	  usr.bin/nc/Makefile.
	- Add a knob to control whether to build nc(1),
	  NO_NETCAT.
	- Bump __FreeBSD_version so ports collection can
	  detect this change.

Original patchset are contributed to the ports collection by:
[1] nectar, [2] joerg.

Note: WARNS?=6 patchset spined off in this commit, in order not
to take too many files off the vendor branch.
2005-02-06 14:44:27 +00:00
Xin LI
8f70b0946d This commit was generated by cvs2svn to compensate for changes in r141261,
which included commits to RCS files with non-trunk default branches.
2005-02-04 08:41:44 +00:00
Xin LI
8c384020b3 Import a (stripped) snapshot of OpenBSD's nc(1) an excellent
reimplementation of the famous tool that can do arbitrary TCP
and UDP connections and listens.

This gaves sysadm the same tool the crackers have, so that
they may learn what the network is about and protect it better.
For developers, this is an invaluable debugging tool, and a
good build block of scripts.

Discussed on:	freebsd-hackers@
2005-02-04 08:41:44 +00:00
Dag-Erling Smørgrav
b33ab32994 Vendor import of OpenPAM Feterita. 2005-02-01 10:16:17 +00:00
Dag-Erling Smørgrav
24a3c486ce This commit was generated by cvs2svn to compensate for changes in r141098,
which included commits to RCS files with non-trunk default branches.
2005-02-01 10:16:17 +00:00
Ruslan Ermilov
2ed83d261b MFV: Latest mdoc(7) fixes. 2005-01-25 09:32:56 +00:00
Ruslan Ermilov
bc33253bf8 Bring in latest mdoc(7) fixes over here. 2005-01-25 09:29:48 +00:00
Ruslan Ermilov
3899af05ce This commit was generated by cvs2svn to compensate for changes in r140801,
which included commits to RCS files with non-trunk default branches.
2005-01-25 09:29:48 +00:00
Bruce M Simpson
a0fba9baed Fix NULL pointer dereference bug when parsing IPV6CP traffic.
This file is already off the vendor branch, and the fix will be
in future tcpdump.org vendor branch imports.

PR:		bin/76497
MFC after:	1 week
Obtained from:	tcpdump.org rev 1.89.2.4
Discussed with:	fenner, keramida
2005-01-24 14:56:48 +00:00
Ruslan Ermilov
a5947c18a8 - Soften sentence breaks.
- Remove double whitespace.
- Sort sections.
2005-01-21 21:57:05 +00:00
David Schultz
ba54cdcdda Configure gdtoa so that floating-point numbers are correctly rounded
when they are printed in non-default rounding modes.
2005-01-18 18:56:18 +00:00
Ruslan Ermilov
32fe84f7e8 Pull up a vendor fix for a problem exposed by tr/tr.1,v 1.30. 2005-01-14 09:50:45 +00:00
Ruslan Ermilov
7643035a1c This commit was generated by cvs2svn to compensate for changes in r140229,
which included commits to RCS files with non-trunk default branches.
2005-01-14 09:50:45 +00:00
Maxim Konovalov
de93353dad o Make telnet[d] -S (IP TOS) flag really work. We do not have
/etc/iptos implementation so only numeric values supported.

o telnetd.8: steal the -S flag description from telnet.1, bump
the date of the document.

MFC after:	6 weeks
2005-01-09 10:24:46 +00:00
Maxim Konovalov
913fffe21a o Add -4 and -6 flags to a man page and usage(). Bump the man page
date.
2005-01-05 09:59:38 +00:00
Maxim Konovalov
ab90852ba3 o Remove -t flag from getopt(3), it was killed in rev. 1.15 three
years ago.
2005-01-05 09:47:10 +00:00
Maxim Konovalov
0d4cc5f650 o Print a correct status for unix domain sockets.
o Restore input mode when return from the command one.

PR:			bin/49983
Submitted by:		Volker Stolz
OK in general from:	markm
MFC after:		1 month
2005-01-04 21:22:32 +00:00
David E. O'Brien
f802162636 This commit was generated by cvs2svn to compensate for changes in r139368,
which included commits to RCS files with non-trunk default branches.
2004-12-28 04:31:47 +00:00
David E. O'Brien
a2e8fb4c99 Virgin import of Christos Zoulas's FILE 4.12. 2004-12-28 04:31:47 +00:00
Ruslan Ermilov
731db6a428 NOINET6 -> NO_INET6 2004-12-21 10:49:29 +00:00
Joseph Koshy
548c9b4376 Revert rev 1.66. This file needs to track its upstream source.
Requested by:	ru
2004-12-17 16:29:54 +00:00
Joseph Koshy
e791235b73 Support for ".Fx 6.0".
Reviewed by:	ru
2004-12-17 14:10:44 +00:00
Ollivier Robert
0003d12e46 This commit was generated by cvs2svn to compensate for changes in r138451,
which included commits to RCS files with non-trunk default branches.
2004-12-06 14:33:29 +00:00
Ollivier Robert
b9bb0f5d00 Merge from the main BK repository for ntp: put two midly annoying messages
under #ifdef DEBUG. Merge of revision 1.45 by H. Stenn.

Done on the vendor branch to minimise future imports.

Reminded by:	obrien
2004-12-06 14:33:29 +00:00
Max Laier
2346577455 Fix a reference from pool(9) -> zone(9), but keep on talking about "memory
pools" as that is what UMA provides.

Submitted by:	Jay <jay NO meangrape SPAM com>
2004-11-14 17:05:54 +00:00
David E. O'Brien
337c1d7b9b Break lines at sentence ends, etc... 2004-11-11 07:50:09 +00:00
David E. O'Brien
fb89b41ce4 Don't attempt to claim what version of GCC we're documenting. The manpage
is still mostly the GCC 2.95 one, with faint attempts by me over the years
to document a few new switches.  Thus, it is dubious to claim documentation
of specific modern GCC versions.

Noted by:	delphij
2004-11-11 07:45:01 +00:00
Peter Wemm
a4a4e5a535 Fix some more files that got butchered to appear to be back on the
vendor branch again.  (These will need a readline import merge too)
2004-10-21 20:10:14 +00:00
Peter Wemm
3dc55b1483 Force these files back off the vendor branch. They should NEVER have been
put back on there in the first place. :-(

Note that complete.c will need a readline 5.0 merge.
2004-10-21 20:02:02 +00:00
David E. O'Brien
1ac62e0b31 + Get prototypes for libc functions.
+ Use the correct printf format for size_t.
2004-10-19 17:44:31 +00:00
David E. O'Brien
caef65b837 Size matters. Correctly use a size_t so 64-bit hosts can mount SMB FS's
when using character set conversions.
Also include POSIX <string.h> vs. BSD <strings.h> now that we've broken
traditional BSD behavior [and compatibility with our BSD brethren].

PR:		72445
Submitted by:	Vladimir Nechitailo <nechit@lpi.ru>
Patch by:	Stasys Smailys <ssmailys@komvista.lt>
2004-10-19 17:39:15 +00:00
Andrey A. Chernov
1708dd06c1 This files no longer used
Asked-by: ru
2004-10-18 08:14:48 +00:00
Andrey A. Chernov
b69b773e8a Merge local changes 2004-10-18 07:25:32 +00:00
Andrey A. Chernov
761828a6e6 Remove files not in 5.0 2004-10-18 07:18:06 +00:00
Andrey A. Chernov
60b6984141 Update instructions 2004-10-18 07:15:43 +00:00
Andrey A. Chernov
e5ce20496d Official patches 001-005 2004-10-18 07:10:33 +00:00
Andrey A. Chernov
6af9ea3853 This commit was generated by cvs2svn to compensate for changes in r136647,
which included commits to RCS files with non-trunk default branches.
2004-10-18 07:10:33 +00:00
Andrey A. Chernov
fc34a2e6e7 Virgin import of GNU Readline 5.0 2004-10-18 07:02:42 +00:00
Andrey A. Chernov
d1447d3869 This commit was generated by cvs2svn to compensate for changes in r136644,
which included commits to RCS files with non-trunk default branches.
2004-10-18 07:02:42 +00:00
Tom Rhodes
1cef902abd Use .Xr in place of .I for Xref's.
PR:		71730
Submitted by:	Gavin Atkinson <gavin.atkinson@ury.york.ac.uk> (original patch)
Commit ok:	mbr (through GNATS PR)
2004-10-15 12:50:05 +00:00
Alexander Kabaev
1689e31de6 Import a patch from GCC PR c/16999 to stop quoting already quoted ident
strings.
2004-10-15 03:22:13 +00:00
Alexander Kabaev
f75a5631b8 This commit was generated by cvs2svn to compensate for changes in r136527,
which included commits to RCS files with non-trunk default branches.
2004-10-15 03:22:13 +00:00
Max Laier
048b39f692 Rename the QUEUEING section to QUEUEING/ALTQ to make it easier to find the
appropiate section when redirected from ALTQ(4).

MFC after:	2 days
2004-10-07 15:39:02 +00:00
Max Laier
22d6889b4d Make pflogd cope with module unload (and the sudden disappearing of pflog0).
Instead of eating all the available CPU we now shutdown gracefully.

Submitted by:	yongari
MFC after:	3 days
2004-10-05 08:26:34 +00:00
Ruslan Ermilov
6f9868d148 Pull up the latest minor fixes. 2004-10-05 06:14:29 +00:00
Ruslan Ermilov
04e67b43ff This commit was generated by cvs2svn to compensate for changes in r136136,
which included commits to RCS files with non-trunk default branches.
2004-10-05 06:14:29 +00:00
Max Laier
f2403525f7 Document a problem with user/group filtering. With debug.mpsafenet=1 this
might result in a deadlock. The fix involves critical changes in the PF
locking strategy (which will happen after 5.3R). For now advise users to set
debug.mpsafenet=0 if they use this kind of filtering.

The same problem exists for IPFW.

mdoc help from:		simon
MFC after:		2 days
2004-10-03 10:42:42 +00:00
Tom Rhodes
24dc798a69 Place files back on the vendor branch.
Prodded by:	ru
2004-09-29 06:22:38 +00:00
Tom Rhodes
84c5f309ab This commit was generated by cvs2svn to compensate for changes in r135923,
which included commits to RCS files with non-trunk default branches.
2004-09-29 06:22:38 +00:00
Dag-Erling Smørgrav
456f759554 Document the upgrade procedure. 2004-09-27 00:25:56 +00:00
Max Laier
9007cc283f PFIL_HOOKS is no longer an optional item.
Submitted by:	Anders Hanssen
MFC after:	1 day
2004-09-26 16:10:40 +00:00
Tom Rhodes
911a190fe5 Vendor import of harti's begemot library. 2004-09-24 21:48:46 +00:00
Tom Rhodes
7bd076c06c This commit was generated by cvs2svn to compensate for changes in r135768,
which included commits to RCS files with non-trunk default branches.
2004-09-24 21:48:46 +00:00
Dag-Erling Smørgrav
29d75632bd Retire the BIND 8 sources. 2004-09-24 19:48:50 +00:00
Dag-Erling Smørgrav
8e4912ed06 Vendor import of BIND 9.3.0. 2004-09-23 07:18:50 +00:00
Dag-Erling Smørgrav
67c80bd25b This commit was generated by cvs2svn to compensate for changes in r135601,
which included commits to RCS files with non-trunk default branches.
2004-09-23 07:18:50 +00:00
cvs2svn
444dbe19dd This commit was manufactured by cvs2svn to create branch 'VENDOR-bind9'. 2004-09-21 19:01:49 +00:00
Dag-Erling Smørgrav
cd3ee173f9 Switch from BIND 8 to BIND 9.
Submitted by:	(in part) dougb@, trhodes@
Reviewed by:	dougb@, trhodes@, re@
MFC after:	5 days
2004-09-21 19:01:48 +00:00
Dag-Erling Smørgrav
3d3b189a12 Add lib/tests. 2004-09-20 18:36:02 +00:00
Tom Rhodes
5d29436106 Add a config.h file. 2004-09-19 19:30:46 +00:00
Tom Rhodes
c725e1f2d3 Add a FREEBSD-Xlist file. 2004-09-19 19:24:56 +00:00
Tom Rhodes
64aa1955c5 Vendor import of BIND 9.3.0rc4.
These three files were missed in the original import because their names
contained the magic letters w, i and n in that sequence.
2004-09-19 18:34:53 +00:00
Tom Rhodes
bc2541491b This commit was generated by cvs2svn to compensate for changes in r135471,
which included commits to RCS files with non-trunk default branches.
2004-09-19 18:34:53 +00:00
Tom Rhodes
b1e4bd53e0 Vender import of BIND 9.3.0rc4. 2004-09-19 01:30:24 +00:00
Tom Rhodes
25aa24cabd This commit was generated by cvs2svn to compensate for changes in r135446,
which included commits to RCS files with non-trunk default branches.
2004-09-19 01:30:24 +00:00
Max Laier
9d7ccc0ffa Bring in some examples (and create space for future work here):
- Add OpenBSD example rulesets as advertised in etc/pf.conf and pf.conf(5)
- Tweak the pointer to fit the FreeBSD default location share/examples/pf
- Account for the new directory in BSD.usr.dist (no hier(7) change required
  as share/examples is an opaque item there).

Obtained from:	OpenBSD
Reminded by:	Thomas T. Veldhouse
PR:		docs/71691
MFC after:	2 days
2004-09-14 01:07:19 +00:00
Tim J. Robbins
95269a8951 Correctly check the return value of kldload() to determine whether an
error occurred.
2004-09-05 06:42:51 +00:00
Marcel Moolenaar
78cf5f2fcd Abstract the handling of dirty stacked registers in ia64_read_reg() and
ia64_write_reg() and call these whenever we read or write registers from
and to memory. This way we correctly read registers from addresses in
the register cache and thus fixes backtraces when the saved registers
(such as rp and ar.pfs) are in dirty stacked registers.
2004-09-05 06:17:25 +00:00
Max Laier
6964e37de4 Make pflogd(8) store pcap_sf_pkthdr instead of MD timeval contaminated
pcap_pkthdr. This makes /var/log/pflog standart compliant on 64bit archs.

OpenBSD has fixed this by changing the bpf timeval to 32bit in the kernel,
so no need to report this over (again).

PR:		bin/71096 (w/ changes)
Submitted by:	Ville-Pertti Keinonen
Tested by:	amd64(submitter), sparc64(yongari), i386(myself)
MFC after:	3 days
2004-08-31 18:04:34 +00:00
Tim Kientzle
61bc62e942 Recognize and skip 'x' and 'g' pax extension entries. In particular,
this avoids the creation of "PaxHeader" dirs when unpacking pax-format
tar archives such as those written by bsdtar.

MFC after: 3 days
2004-08-28 03:13:05 +00:00
Tim Kientzle
20192d1959 Correct va_end usage.
Thanks to: Sean McNeil
MFC after: 3 days
2004-08-27 03:52:29 +00:00
Max Laier
c5be312a19 Loopback a fix from Cedric Berger:
Fix table add/replace commands with securelevel=2.
	Reported by James J. Lippard.

Discussed with:	yongari
MFC after:	5 days
2004-08-22 16:58:06 +00:00
Max Laier
8a7574f3ce Import pfctl_table.c#1.61 from OpenBSD into vendor branch. 2004-08-22 16:53:39 +00:00
David E. O'Brien
b4e8286b3b Enter the long awaited start of FreeBSD 6.0! 2004-08-21 03:58:39 +00:00
David E. O'Brien
abbf5f5f8f NetBSD has updated their groff to a version that handles .Nm the same
way ours does.  So use the vendor files now.
2004-08-18 06:41:13 +00:00
David E. O'Brien
5bf06d869f Merge rev 1.2 (OPIE, login user capabilities database, PAM) support
into 'nbsd_20040809'.
2004-08-18 06:34:20 +00:00
David E. O'Brien
07539dd5d7 This commit was generated by cvs2svn to compensate for changes in r133936,
which included commits to RCS files with non-trunk default branches.
2004-08-18 06:29:48 +00:00
David E. O'Brien
3a802515c6 Import of LukeM's ftpd taken from the NetBSD CVS repo on 9-Aug-2004.
This closes the remotely exploitable vulnerability documented at
ftp://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2004-009.txt.asc
http://www.vuxml.org/freebsd/c4b025bb-f05d-11d8-9837-000c41e2cdad.html
2004-08-18 06:29:48 +00:00
Martin Blapp
b5c1da06a9 Make 'client DNS forward update' working again which got broken in rev.
RC9 of dhclient 3.0.1. This fix will be part of dhclient 3.0.2. It is
also part of the official redhat package.

Submitted by:	Jason Vas Dias <jvdias@redhat.com>
Discussed on:	dhcp-hackers@isc.org
2004-08-16 22:35:56 +00:00
Martin Blapp
ff20f7a95e Document local changes r1.41 and r1.42 of dhclient.c 2004-08-16 21:31:34 +00:00
Martin Blapp
93fb40624f Recommit removed Rev. 1.40. This fix does solve a FPE with negative lease
time as described in the PR below.

It seems that this patch should have been part of the vendor tree but got
accidently missed in the 3.0.1 final version. It will definitly be
part of 3.0.2 but until then it's a long way to go.

Submitted by:   ISC (Vendor)
PR:             bin/54517
2004-08-16 21:26:04 +00:00
Martin Blapp
222bb5ab84 It could happen that the renew/rebind times in the leasefile were
expired but the expire time itself was still valid and in the future.
If this happened we ended up using the state S_RENEW with an
INADDR_BROADCAST address set in the request and dhclient never got
any answer back. The only workaround was to delete the lease file.

Fix this case with a check for the S_RENEW and a fallback to the
S_INIT state.

PR:		bin/69361
Submitted by:	Andrew Gallatin <gallatin@cs.duke.edu>
2004-08-16 16:09:50 +00:00
Martin Blapp
e6fb0bd676 Sync a reverted part of dhclient.c with the vendor source. It seems
that a buxfix from rc14 got backed out again. We do the same.
2004-08-16 15:48:02 +00:00
Alfred Perlstein
5d320d4b95 This patch merges the sort fields for both pages, so you can (for
example) view io stats while sorting by process size.  Also adds
voluntary and involuntary context-switch stats to the io page because
there was lots of room.

Submitted by: Dan Nelson dnelson at allantgroup.com
2004-08-16 07:51:22 +00:00
Martin Blapp
c9dca5ca78 Resolve conflicts from dhclient 3.0.1 final import.
No functional changes in this import.
2004-08-15 23:37:10 +00:00
Martin Blapp
f511f66676 This commit was generated by cvs2svn to compensate for changes in r133783,
which included commits to RCS files with non-trunk default branches.
2004-08-15 23:33:13 +00:00
Martin Blapp
41893d8997 Import ISC DHCP 3.0.1 client. 2004-08-15 23:33:13 +00:00
David Xu
82552011ab Disable surplus detection of breakpoint event in signal stack, the check
causes a normal breakpoint event in new thread to be ignored unexpectly,
result is process SIGSEGV.

Test on: AMD64, i386
2004-08-15 12:31:30 +00:00
Hartmut Brandt
e0fd476003 Vendor patch: don't dump core when the config file cannot be opened.
Submitted by:	Maxim Konovalov <maxim@macomnet.ru>
2004-08-12 19:17:29 +00:00
Hartmut Brandt
181fd12f6c This commit was generated by cvs2svn to compensate for changes in r133594,
which included commits to RCS files with non-trunk default branches.
2004-08-12 19:17:29 +00:00
Alexander Kabaev
292f200484 Remove files that are not part of GCC 3.4.x from the vendor branch. 2004-08-12 16:41:42 +00:00
Alexander Kabaev
6d3e93598f This commit was generated by cvs2svn to compensate for changes in r133582,
which included commits to RCS files with non-trunk default branches.
2004-08-12 16:41:42 +00:00
Tim J. Robbins
4c00d1609e This commit was generated by cvs2svn to compensate for changes in r133546,
which included commits to RCS files with non-trunk default branches.
2004-08-12 05:59:33 +00:00
Tim J. Robbins
da2802fe8c Import of GNU sort from coreutils CVS (trimmed) 2004-08-12 05:59:33 +00:00
Tim J. Robbins
144ccb4106 Merge local changes. 2004-08-12 05:46:04 +00:00
Tim J. Robbins
9da8305ad3 Import of GNU sort from coreutils CVS (trimmed) 2004-08-12 05:37:46 +00:00
Tim J. Robbins
c5fe2733ea This commit was generated by cvs2svn to compensate for changes in r133543,
which included commits to RCS files with non-trunk default branches.
2004-08-12 05:37:46 +00:00
Alexander Kabaev
025ee8b5ee Import one more file for Gcc 3.4.2 20040728. 2004-08-12 02:21:58 +00:00
Alexander Kabaev
db20bc12fe This commit was generated by cvs2svn to compensate for changes in r133534,
which included commits to RCS files with non-trunk default branches.
2004-08-12 02:21:58 +00:00
Hartmut Brandt
0943e320d0 Exclusion list for easier import. 2004-08-11 12:19:32 +00:00
Hartmut Brandt
36919bb12f Virgin import of NgATM user part 1.1 2004-08-11 12:17:54 +00:00
Hartmut Brandt
4b61cb7ef9 This commit was generated by cvs2svn to compensate for changes in r133488,
which included commits to RCS files with non-trunk default branches.
2004-08-11 12:17:54 +00:00
Hartmut Brandt
0a9d66ca0d Fix the 4.X -> 5.X upgrade path by include <inttypes.h> instead of
stdint.h.
2004-08-10 11:05:25 +00:00
Hartmut Brandt
11eb5b4589 This commit was generated by cvs2svn to compensate for changes in r133429,
which included commits to RCS files with non-trunk default branches.
2004-08-10 11:05:25 +00:00
David E. O'Brien
ea8dc7e0f2 Virgin import of Christos Zoulas's FILE 4.10.
*- file is now broken into a library containing and processing the magic
   and a consumer binary.
2004-08-09 08:45:41 +00:00
David E. O'Brien
bd83d14fb5 This commit was generated by cvs2svn to compensate for changes in r133359,
which included commits to RCS files with non-trunk default branches.
2004-08-09 08:45:41 +00:00
Hartmut Brandt
4cba8c6ddf List some more files to be excluded from the original distribution. 2004-08-06 13:41:55 +00:00
Hartmut Brandt
896052c10f Virgin import of bsnmpd 1.7 2004-08-06 13:38:30 +00:00
Hartmut Brandt
495190c602 This commit was generated by cvs2svn to compensate for changes in r133211,
which included commits to RCS files with non-trunk default branches.
2004-08-06 13:38:30 +00:00
Dag-Erling Smørgrav
40bce2b2a1 Do not check val-tags if the repository is read-only.
Approved by:	maintainer's silence
MFC after:	2 weeks
2004-08-05 17:47:35 +00:00
Gregory Neil Shapiro
5ec584e8c3 Update notes after sendmail 8.13.1 import 2004-08-01 01:18:40 +00:00
Gregory Neil Shapiro
bfb62e91d7 Resolve conflicts from sendmail 8.13.1 import 2004-08-01 01:16:16 +00:00
Gregory Neil Shapiro
e92d3f3ffe Import sendmail 8.13.1 2004-08-01 01:04:57 +00:00
Gregory Neil Shapiro
6b3455a766 This commit was generated by cvs2svn to compensate for changes in r132943,
which included commits to RCS files with non-trunk default branches.
2004-08-01 01:04:57 +00:00