Compare commits

..
1707 Commits
Author SHA1 Message Date
Devin Teske 0b14be7ca1 MFH r144419 (scottl): Add a manual page for the arcmsr driver. 2014-04-30 06:27:23 +00:00
Devin Teske 509fdeb47c Merge r144423 with r144497 in-mind. Glue the arcmsr driver into the
stable/4 branch -- but don't build arcmsr on pc98. This is a direct
commit to stable/4 as arcmsr is already hooked into stable/5 and up.
2014-04-30 06:03:01 +00:00
Devin Teske 59052e0215 Add tested known good version of Areca SATA RAID driver (arcmsr) working
in stable/4. An MFC of slightly later code than that of r144411 (scottl).
This is a direct commit to stable/4.

Obtained from:  Erich Chen <erich at areca com tw>
2014-04-30 05:59:31 +00:00
Devin Teske f46caf19b7 As-per r161293 (jhb), only recognize mfi(4) on i386.
This is a direct commit to stable/4 as all future branches contain
r105818 which made this code obsolete.
2014-04-30 05:26:31 +00:00
Devin Teske bb437b814f Fix lnc0 detection in VMware when PXE booting.
This is a direct commit to stable/4 since lnc(4) was deprecated
and does not exist beyond this branch.

Submitted by:	Paul Meng <[email protected]>
PR:		kern/77982
2014-04-30 05:00:52 +00:00
Devin Teske 1b671f52a1 MF6 r157468: Teach sysinstall about MFI (scottl)
NB: Merged from stable/6/usr.sbin/sysinstall to
stable/4/release/sysinstall (location changed in
between releases 4 and 6).
2014-04-30 04:44:51 +00:00
Devin Teske b571f5ab2f Teach libdisk about mfid devices. This is a direct commit to stable/4
since stable/5 and newer have r105681 which made this code obsolete.
2014-04-30 04:24:21 +00:00
Peter Wemm b870694b60 Revert MFC of r258821 2014-01-08 03:22:42 +00:00
Peter Wemm efa596224a MFC r258821 - fix tcp simultaneous close
PR:             kern/99188
2014-01-07 23:04:06 +00:00
John Baldwin 74886bb640 MF7: If the running kernel has support for shm_open() and shm_unlink() as
system calls (i.e. 8.0+), then invoke the system calls instead of using
open/fcntl/unlink.
2009-06-23 17:44:55 +00:00
John Baldwin f5e048d1f5 MFC: Add a feature_present(3) function which checks to see if a named kernel
feature is present by checking the kern.features sysctl MIB.
2009-06-11 13:07:42 +00:00
John Baldwin 9dcbeb11c2 MFC: Use a clean slate of register state when executing hardware interrupt
handlers to avoid leaking values into the upper 16-bits of general purpose
registers when executing these routines.
2009-03-03 17:16:26 +00:00
John Baldwin ffbe475239 MFC: tzdata2008i 2008-10-29 15:52:22 +00:00
John Baldwin 4d317604cb MFC: tzdata2008h. 2008-10-14 15:22:36 +00:00
John Baldwin dc48addf78 MFC: tzdata2008f. 2008-09-16 15:45:10 +00:00
John Baldwin 46e58ef6d1 MFC: Fix some of the hangs reported with the real mode BTX by disabling
interrupts for software interrupts.
2008-08-15 19:59:18 +00:00
John Baldwin 226a681031 MFC: Initialize the vm86 structure to a known-good state, specifically
eflags.
2008-08-15 19:34:02 +00:00
John Baldwin 2ca6835125 MFC: tzdata2008[cde]. 2008-08-15 16:21:32 +00:00
Paul Saab 0a4886a6a8 MFC: r179705
Add support for the P212, P410, P410i, P411, and P812 HP Smart Array
controllers.
2008-06-10 18:51:05 +00:00
Paul Saab 74be0aa080 Add the missing support for the P800 2008-06-10 18:50:14 +00:00
John Baldwin 78bcf0b937 MFC: rev 1.88
Remove a check that didn't allow > 12 byte CDB's to be issued to
ciss.  This should allow volumes > 2TB to work.
2008-05-19 19:21:14 +00:00
Bruce A. Mah 7908e0a091 MFC: BTX real mode, tzdata2008b. 2008-04-05 18:19:06 +00:00
John Baldwin 59f9eeeaa4 MFC of tzdata2008b 2008-03-25 18:09:20 +00:00
John Baldwin 1e7cd763ac MFC: Use real moder to invoke BIOS routines rather than virtual 86 mode. 2008-03-18 18:28:09 +00:00
John Baldwin 84cc038799 MFC: Fail attempts to use file descriptors larger than SHRT_MAX. 2008-03-17 17:42:26 +00:00
John Baldwin 8a5255bd87 MFC: tzdata2008a 2008-03-10 16:49:43 +00:00
John Baldwin 49a124a1f8 Bah, extra hunk slipped in. 2008-03-05 20:19:00 +00:00
John Baldwin 187acbcf67 MFC: Fix a problem with XID re-use when a server returns NFSERR_JUKEBOX. 2008-03-05 20:17:12 +00:00
Gregory Neil Shapiro 30ec02ece6 MFC: Fix quoting for the dnsbl example -- m4 misparses quoted strings with
commas due to our deconstruction of the line in cf/feature/dnsbl.m4.

     PR:             120038
     Submitted by:   mattijs vreeling

     Revision  Changes    Path
     1.36      +1 -1      src/etc/sendmail/freebsd.mc
2008-02-24 01:03:33 +00:00
Gregory Neil Shapiro be3124b49d MFC: Use better examples (and comment them out for safety).
PR:             118837
     Submitted by:   Matthew Seaman

     Revision  Changes    Path
     1.4       +13 -6     src/etc/mail/access.sample
2008-02-24 01:00:07 +00:00
John Baldwin e7f0a0d747 MFC 1.6: Allow MAXDEP dependants, not MAXDEP-1.
PR:		kern/46368
2008-01-30 16:24:24 +00:00
John Baldwin b4071ca476 MFC of tzdata2007k. 2008-01-07 15:49:35 +00:00
Peter Wemm 35a4f42e05 MFC: rev 1.4: forward compatability with cvs-1.12 repository 2008-01-07 09:11:23 +00:00
John Baldwin 8f915a7e4e MFC: Relax the probe for type #1 PCI config transactions on i386. 2007-12-06 08:28:17 +00:00
John Baldwin d8112c1194 MFC: Change pci_cfgdisable() into a nop for type #1 similar to what other
OSs do.
2007-12-06 08:21:23 +00:00
Bruce A. Mah 8d50548a06 MFC: Fix for tar directory traversal in FreeBSD-SA-07:10.tar. 2007-11-30 05:45:36 +00:00
John Baldwin 7d396c5f9c MFC: Correct a gtar directory traversal vulnerability. 2007-11-29 18:36:09 +00:00
David E. O'Brien 62fec1f9ee Add style.Makefile (refereed to from style.9). 2007-11-26 19:08:42 +00:00
David E. O'Brien ccdbd7e0d3 Sync with HEAD. 2007-11-26 19:05:49 +00:00
Gregory Neil Shapiro 8a5adbca8d Forced commit to .mc files to force creation of new .cf files for mergemaster.
Approved by:    re (kensmith)
2007-11-22 16:20:31 +00:00
Gregory Neil Shapiro 7aa157d6c2 MFC: sendmail 8.14.2 2007-11-11 17:09:13 +00:00
Maxim Konovalov 87801b0733 MFC revs. 1.12, 1.13: kill EOL w/spaces; update to the 1 November 2007
version of this file.
2007-11-05 07:53:06 +00:00
Bruce A. Mah 04a174a048 MFC: tzdata2007h. 2007-10-28 17:04:50 +00:00
John Baldwin 2f788d0a83 MFC of src/share/zoneinfo
MFV: tzdata2007h
2007-10-18 16:47:24 +00:00
John Baldwin 32872008e8 MFC: Use sysctlbyname(3) and some other minor cleanups. 2007-10-18 15:36:41 +00:00
John Baldwin ec89fced40 MFC: Sync whitespace. 2007-10-10 15:05:04 +00:00
John Baldwin 527e04fc0f MFC: Describe the process of importing new zoneinfo data and updating it
in CVS.

PR:		conf/116901
2007-10-09 15:05:26 +00:00
John Baldwin 30e3f23a51 MFC of src/share/zoneinfo
MFV: tzdata2007g
2007-09-18 20:35:40 +00:00
Gregory Neil Shapiro 269dc9dc0a Sort the SENDMAIL_* entries so I can...
MFC: You can never have enough documentation.

     Document the SENDMAIL_ALIASES, SENDMAIL_MAP_SRC, SENDMAIL_MAP_TYPE, and
     SENDMAIL_START_SCRIPT
     .Xr make.conf 5
     variables.
     These are used in
     .Pa /etc/mail/Makefile .

     PR:       conf/40548

     Revision  Changes    Path
     1.140     +40 -0     src/share/man/man5/make.conf.5
2007-06-18 04:36:31 +00:00
David Malone a3ff700424 MFC 1.209: Don't verify UDP IPv4 checksum in-place. 2007-06-10 07:34:28 +00:00
Matt Jacob b37842b29d Fix pointy-hat problem with BUS_DMA_ROOTARG macro that caused problems for sparc64. 2007-05-11 06:29:23 +00:00
Scott Long 0184436feb MFC rev 1.5: Add PCI Ids 2007-05-09 17:33:00 +00:00
Matt Jacob 24c2342e6b MFC to synchronize with -current. The bugs fixed are relatively few and
hopefully the bugs introduved are even fewer.
2007-05-08 17:47:08 +00:00
Peter Pentchev fcc1ae4eef MFC rev. 1.35 - remove MSG_PEEK from the description of the send(2)
syscall; it is only relevant for incoming data.
2007-05-04 09:06:59 +00:00
John Baldwin 8934eeaeb8 MFC: Only treat logical CPUs as hyperthreads if they share the L1 cache. 2007-04-30 16:34:10 +00:00
David Malone 34f02dc702 MFC: Man page improvements and don't put unix domain sockets into the
per-ip limits code.
2007-04-29 19:31:14 +00:00
Gregory Neil Shapiro 5b018e5026 MFC: Bring in sendmail.org code from the future 8.14.2 release which restores
ABI compatibility to users of the libmilter.so shared library.
2007-04-27 03:33:51 +00:00
Gregory Neil Shapiro 4b90ac0954 Forced commit to .mc files to force creation of new .cf files for mergemaster. 2007-04-23 22:30:23 +00:00
Gregory Neil Shapiro 7c1b834640 Include a note in the sendmail 8.14.1 release note regarding the libmilter
update.  Unfortunately, this problem (the need to recompile filters) was
found after the MFC.  The release engineering team has asked for this
instead of doing a full backout of sendmail 8.14 in the RELENG_[456]
branches.

Requested by:	re (bmah)
2007-04-20 05:12:48 +00:00
Gregory Neil Shapiro 3838fb6c0e MFC: Include a note about recompiling ports which use the base libmilter.
Submitted by:	Matthew Seaman
2007-04-14 16:27:16 +00:00
Gregory Neil Shapiro f85da9bc39 MFC: sendmail 8.14.1 2007-04-12 03:13:04 +00:00
cvs2svn d9005664af This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2007-04-09 01:38:53 +00:00
Matt Jacob 25b1ce325a EOL of RELENG_4 support.
MFC of constification, cleanups of pre-7.X compiles, additions of
SYNC_REG memory barriers and so on.
2007-04-01 17:22:03 +00:00
Matt Jacob cbc11e8e84 MFC xpt_print function. 2007-03-11 20:49:21 +00:00
cvs2svn 62656db132 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2007-03-10 02:39:55 +00:00
Bruce A. Mah 54405ba92b Add mention of the EOL status of RELENG_4. 2007-03-07 20:00:32 +00:00
Bruce Evans 4ccc7617da MFC (if_bge.c 1.108, etc., less some style bugs: eliminate one PCI
read per call to bge_start()).

In packet blasting tests using ttcp with tiny udp packets on an A64-3200
with a 64-bit 5701 on a 32-bit 33MHz PCI bus, this gives a speedup
from 347 kpps to 623 kpps.  sendto() has a lot of software overheads,
but even with these the single PCI write per call to bge_start() almost
doubled the per-packet time.  This is partly because the software
overheads are so large that the CPU can't keep up with a Gbps NIC that
can actually get anywhere near Gbps speed for tiny packets (347 kppps
for tiny packets is only about 21% of wire speed).  When the CPU can't
keep up, it gets further behind because it ends up calling bge_start()
at least once for every packet, so any overheads in bge_start() are
not amortized across multiple packets.  Thus the PCI read had an
especially high overhead.

For larger packets, the speedup is closer to the 1.8% claimed in rev.
1.108.

Rev.1.108 claims to eliminate a PCI write but actually eliminates a
PCI read.  The write of the tx product index is not so costly as its
read, and cannot be eliminated completely.  It could be coalesced in
some cases.
2007-02-15 10:33:49 +00:00
John Baldwin 7f041c7963 MF6: Sync with RELENG_6:
- Fix probe for 5708S adapters.
- Use LIST_FOREACH() in bce_ifmedia_upd().
- Compile fixes for BCE_DEBUG.
- Don't reset the chip in bce_watchdog() if we are in the routine because
  of pause frames.
- Fix multicast hash.
2007-02-08 17:22:03 +00:00
John Baldwin 25b9a27111 MFC: Don't read more than the given 'len' bytes from the 'big' string. 2007-02-01 19:11:25 +00:00
John Baldwin 85d7ae7691 MFC: Use malloc() rather than alloca() to allocate storage for old values
to avoid a segfault on boxes with lots of active TCP connections where
net.inet.tcp.pcblist can return a size bigger than alloca() can satisfy.
2007-01-22 20:37:37 +00:00
Markus Brueffer a2f5e3465f MFC rev. 1.83:
Fix a buffer overflow iff USB_DEBUG is set, hw.usb.ums.debug is > 5 and the
  total size of all input reports is < 6.

Approved by:	emax (mentor)
2007-01-21 02:27:40 +00:00
John Baldwin b17efbe326 MFC: Warn that the swap zone is exhausted before the machine deadlocks.
Reviewed by:	alc
2007-01-17 20:17:06 +00:00
Xin LI 4f12a58a49 The pc98 porting team's copyright year should be 2003, when
5.0-RELEASE, the first release including pc98 is released.

Noticed by:	hrs
Confirmed by:	nyan
2007-01-10 01:29:46 +00:00
David E. O'Brien c87c98f745 MFC: Welcome to 2007! 2007-01-01 03:03:50 +00:00
Matt Jacob 9d96a57785 RELENG_6 (5, 4) change to recognize 6 port NetMos
PR:             58953
Submitted by:   Milan Obuch
Reviewed by:    marcel
2006-12-16 02:41:00 +00:00
Alexander Leidinger 1b17934139 Don't display the status of the SMART bits when talking about the security
feature (should safe a heart attack or two when seeing the security feature
enabled when it isn't / shouldn't be).

This bug is not present in any more recent RELENG_X (the code is
different by an order of magnitude), so no MFC.
2006-12-10 13:35:41 +00:00
John Baldwin e11caf6c62 Sync with RELENG_6 including updating to version 6.2.9 of the driver. 2006-12-08 16:33:32 +00:00
John Baldwin 4f088aea53 Sync with RELENG_6 including:
- Use bus_dmamap_load_mbuf_sg() for tx packets and associated stability
  fixes.
- Kick the firmware sooner so IPMI works.
2006-12-07 16:30:35 +00:00
John Baldwin 1b4e415f7b Sync with RELENG_6 including:
- Add support for the 5752 and 5780 phys.
- Handle 10/100 only "bge" phys correctly.
- MFC some parts of 1.6 that among other things fix use of non-autoneg
  media with bce(4).
2006-12-07 16:28:44 +00:00
John Baldwin b8d95ea3aa Regen. 2006-12-07 16:25:53 +00:00
John Baldwin 5ed46b36d1 Add BCM5752 and BCM5780. 2006-12-07 16:25:31 +00:00
John Baldwin a49bd5303f Reduce diffs to RELENG_6:
- Use bus_dmamap_load_mbuf_sg() rather than a private simple callback in
  conjuction with bus_dmamap_load_mbuf().
- Use bus_alloc_resource_any().
- Remove bogus BUS_DMA_ALLOCNOW flag.
2006-12-06 22:03:13 +00:00
John Baldwin ec859b3569 Reduce diffs with RELENG_6:
- Use bus_dmamap_load_mbuf_sg() for setting up rx descriptors.
- Fix a few whitespace nits.
2006-12-06 22:01:46 +00:00
John Baldwin 386fb8a2b0 Add an MI bus_dmamap_load_mbuf_sg() that wraps around
bus_dmamap_load_mbuf() using a simple callback to make it easier to
keep drivers in sync between 4.x and 6.x.

Not objected to by:	scottl
2006-12-06 22:00:46 +00:00
Bruce A. Mah 48055e9d11 MFC: SA-06:25.kmem, SA-06:26.gtar. 2006-12-06 20:59:07 +00:00
Bruce A. Mah 9a6cf22d4b MFC: SA-06:25.kmem, SA-06:26.gtar. 2006-12-06 20:14:16 +00:00
Colin Percival ed4564dbef Correct a signedness bug which allowed members of the operator
group to read kernel memory. [1]

Disable handling of GNUTYPE_NAMES tar file entries by default,
since they can be used to extract files outside of the cwd. [2]

Security:	FreeBSD-SA-06:25.kmem [1]
Security:	FreeBSD-SA-06:26.gtar [2]
2006-12-06 09:17:09 +00:00
John Baldwin 9ed9ca9773 Add support for making mfi and mfid devices. 2006-11-28 21:59:47 +00:00
John Baldwin 540565e54d Assign major numbers 177 and 178 to mfi(4) rather than using two majors
reserved for local devices (200 and 201).
2006-11-28 19:05:06 +00:00
John Baldwin 180ddf14f2 Document major numbers used for amr(4). 2006-11-28 19:03:53 +00:00
Yoshihiro Takahashi fb4a042122 MFi386: revision 1.385.2.35. 2006-11-09 04:04:41 +00:00
John Baldwin 1445e5a326 Ignore I/O APICs that aren't really there (return 0xffffffff when you try
to talk to them) if they aren't listed as the destination of any interrupts
in the MP Table instead of panic'ing when we fail to set the APIC ID.  The
new APIC code in 5.x+ has a similar check.
2006-10-25 14:44:29 +00:00
John Baldwin b0e60e6f78 MFC: uthread fixes for select timeout and signal handling. 2006-10-23 20:11:31 +00:00
Bruce Evans 5973402762 MFC: parts of the following, so that atomic.h in RELENG_4 can be
compiled by RELENG_6's compiler:
1.26: pass constraints as a parameter since chars and shorts need
      different ones.
1.27: fix pedantic syntax errors.
1.40: don't use the '+' constraint so much, since gcc-3.3.mumble broke
      it for non-register operands.

1.40 essentially backs outs 1.22, and also avoids using the "0"
constraint, and also remumbers asm parameters.  1.22 had already been
merged to RELENG_4 in 1.9.2.2 in order to fix compiling with -O0 with
RELENG_4's compiler.  This turned out to be not future-proof.  I think
the "0" constaint would work with gcc-3, but not using it is a better
way to fix compiling with -O0 in RELENG_4.  Problems in this area go
back to gcc-2.early or gcc-1 when the "0" and "+" constraints didn't
exist and there were no correct alternatives for them.  1.9.2.1
unnecessarily used an incorrect alternative that happened to work
except for -O0.

This change is essentially null when compiled by RELENG_4's compiler.
For GENERIC, LINT and one other configuration, it changes no object
files except atomic.o compiled with -O0; for the latter it gives
different register allocation and some unused instructions.
2006-10-22 07:00:07 +00:00
Bruce Evans dca0728463 Remove special support for gcc <= 2.8 so that the next change is more
readable.  gcc-2.8 was last sighted in FreeBSD-3 and wasn't the system
compiler in any version of FreeBSD-4.  The next change will improve
portability and might even work without ifdefs for gcc-2.8.
2006-10-21 11:09:50 +00:00
Ruslan Ermilov d97ff0c8ea - Finish the incomplete MFC of 1.11 in 1.6.2.3 (newsletter V-6).
- MFC: 1.14 (newsletter V-11), 1.15 (newsletter V-12).
2006-10-18 09:13:47 +00:00
Bruce A. Mah 992cb9f884 MFC: tzdata2006n. 2006-10-14 15:22:24 +00:00
Doug Barton 63b6904a7f MFC tzdata2006n 2006-10-13 17:51:42 +00:00
Xin LI 9009688c8d MFC rev. 1.16 (iedowse):
Add missing parentheses to fix a segmentation fault that is easily
reproducable with `jot -s " " 400 1 | column -t'. The bug was present
in the the original CSRG 'column -t' added in 1989.
2006-10-08 02:26:53 +00:00
Bruce A. Mah 1a68479300 MFC: SA-06:22.openssh. 2006-10-08 00:28:24 +00:00
Bruce A. Mah 3df66645f8 New errata: SA-06:23.openssl. 2006-10-07 15:35:17 +00:00
Bruce Evans 1b34ff224d Fail the probe instead of panicing if the memory address is 0. The
memory address can be 0 only with certain misconfigurations.  We don't
try to detect misconfigurations of the kernel config file, but IIRC the
panic was caused by a hardware misconfiguration like the following:
- a cy PCI card physically present but with a hardware conflict
- then the cy PCI probe is called first but fails due to the conflict
- no cy ISA card present
- the cy ISA probe is called.  Normally this uses the nonzero memory
  address in the config file and just fails when there is no cy ISA
  card present, but when there is a cy PCI card present, the ISA memory
  resource is apparently lost.  The (non-)presence of the cy ISA card
  probably makes no difference here.
2006-10-06 14:16:20 +00:00
Bruce Evans 2bce92ca8d Fixed overflow at 2G for writing clock frequencies using sysctls.
Reads worked correctly using the IU format.  Writes only supported
signed integers using the CTLTYPE_INT flag.  sysctl(1) parses args for
CTLTYPE_INT using (int)strtol() and has no range checking of course,
so read-write of frequencies larger than INT_MAX always blindly corrupts
the frequency to INT_MAX (2G-1).

This keeps writing of TSC frequencies working up to 4GHz.
2006-10-06 13:24:16 +00:00
Matt Jacob 11972af438 Add REPORT_LUNS definition. 2006-10-05 17:15:30 +00:00
Matt Jacob 2e61752fe6 MFC the current state of mpt. 2006-10-05 16:00:08 +00:00
Bruce Evans 7ac6b8a89a MFC (1.519: fix a syntax error (no statement after a label)) so that this
file in RELENG_4 can be compiled by gcc in -current again.
2006-10-03 18:19:17 +00:00
Bruce Evans 60c653da58 MFC (1.34: fix a syntax error (no statement after a label)) so that this
file in RELENG_4 can be compiled by gcc in -current again.
2006-10-03 18:13:49 +00:00
Bruce Evans 2bc31b0b50 MFC (1.13: fix a syntax error (no statement after a label)) so that this
file in RELENG_4 can be compiled by gcc in -current again.
2006-10-03 18:04:55 +00:00
Bruce Evans 22c75a1a6c Fixed a syntax error (no statement after a label) so that nfs in RELENG_4
can be compiled by the -current gcc again.
2006-10-03 17:53:03 +00:00
Simon L. B. Nielsen c704d5aba4 Correct multiple vulnerabilities in OpenSSH.
Security:	FreeBSD-SA-06:22.openssh
2006-09-30 19:57:15 +00:00
Colin Percival 0cf1d7c6b1 Correct problem in the 2006-09-28 patch concerning the handling of
excessively large DH moduli.

Reported by:	Steve Kiernan (Juniper SIRT)
Security:	FreeBSD-SA-06:23.openssl
2006-09-29 13:46:23 +00:00
Bruce A. Mah f2804129c0 MFC: SA-06:21.gzip, SA-06:23.openssl. 2006-09-28 15:49:13 +00:00
Bruce A. Mah 5747982878 New errata: SA-06:21.gzip, SA-06:23.openssl. 2006-09-28 15:17:08 +00:00
Colin Percival 1a6bbf9e63 Correct multiple vulnerabilities in crypto(3).
Limit the size of public keys used in order to protect applications
from a denial of service via insane key sizes.

Security:	FreeBSD-SA-06:23.openssl
2006-09-28 13:05:59 +00:00
Bruce M Simpson 851dbecea7 Add a sysctl net.link.ether.bridge.hwassmask which lets administrators
mask hardware checksums on bridge interface members.

PR:		kern/57100
2006-09-23 19:27:39 +00:00
Bruce M Simpson 9999550269 Add a sysctl net.link.ether.bridge.hwassmask which lets administrators
mask hardware checksums on bridge interface members.

PR:		kern/57100
2006-09-23 09:40:02 +00:00
Simon L. B. Nielsen 682a090cae Correct multiple vulnerabilities in gzip(1).
Security:	FreeBSD-SA-06:21.gzip
2006-09-19 14:11:35 +00:00
Matt Jacob 769ba89464 MFC 1.163- give VMware disks min/max tags in their quirk. 2006-09-15 20:48:18 +00:00
Peter Wemm 16faf54439 MFC: rev 1.21: fix return of uninitialized data from malloc(). Could
cause readdir() to fail or give duplicate results or other strange things.
2006-09-12 22:27:11 +00:00
Bruce A. Mah 475800b7cf MFC: SA-06:19.openssl. 2006-09-12 16:47:44 +00:00
Remko Lodder d045e0d4ae Add FreeBSD-SA-06:19.openssl to the Errata. 2006-09-06 22:57:02 +00:00
Simon L. B. Nielsen bbc07a0c27 Correct incorrect PKCS#1 v1.5 padding validation in crypto(3).
Security:	FreeBSD-SA-06:19.openssl
2006-09-06 21:24:04 +00:00
John Baldwin 3289b92eea Sync up with most of the changes to RELENG_6 including using bus_dma,
new PCI IDs, lots of style changes, suspend/resume methods.  Things not
included include the INTR_FAST + taskqueue changes, link flapping
workarounds in em_ioctl(), and jumbo frame fixups for architectures that
require strict alignment.
2006-09-05 19:48:10 +00:00
Bruce A. Mah 610cad552e Close off a tag properly. This problem has existed since I first
created this file way back in April 2001 (on all other active branches
the section containing this tag has been obsoleted so it was only a
RELENG_4 problem).

I have no idea how this file ever compiled before, but my doc
toolchain suddenly started complaining about it.
2006-08-31 00:51:21 +00:00
Bruce A. Mah 75406f5d17 New errata: SA-06:18.ppp. 2006-08-31 00:39:10 +00:00
Bruce A. Mah 2a8f4eae06 MFC: SA-06:18.ppp. 2006-08-29 22:41:28 +00:00
Colin Percival e88e01fad7 Correct buffer overflow in the handling of LCP options in ppp(4)
Security:	FreeBSD-SA-06:18.ppp
2006-08-23 22:06:08 +00:00
Gregory Neil Shapiro 98d58fbac8 sendmail has been upgraded from 8.13.6 to 8.13.8 2006-08-23 03:48:05 +00:00
Gregory Neil Shapiro 87b155eb66 Forced commit to .mc files to force creation of new .cf files for mergemaster. 2006-08-23 03:40:18 +00:00
Gregory Neil Shapiro e7886e684f MFC: sendmail 8.13.8 2006-08-23 03:39:12 +00:00
David Malone 04e78af938 MFC: 1.300 When we receive an out-of-window SYN for an "ESTABLISHED"
connection, ACK the SYN as required by RFC793.
2006-08-21 12:43:24 +00:00
David Malone 03e5be2d12 MFC: 1.27 Avoid unwanted sign extension of indexed byte load in bpf code. 2006-08-21 12:42:52 +00:00
David Malone 5065ebddc7 MFC: 1.170 Give the same timestamp for each packet to all BPF listeners. 2006-08-21 12:42:25 +00:00
Matt Jacob 2cafc28e85 MFC 1.120: Fix RELENG_4 code version- isp_roles wasn't getting
initialized so it ended up defaulting to ISP_ROLE_NONE. My testing
hadn't caught it because I was deliberatly setting role via ioctl.
2006-08-21 00:48:37 +00:00
Maxim Konovalov e2a91f9c6f MFC rev. 1.14: simple strcpy/strcat replacement. 2006-08-20 20:31:10 +00:00
John Baldwin 29edcdadb0 Make the 'mfi' module i386 only on 4.x since it doesn't compile cleanly
on 4.x currently and there is very little chance that any alphas will ever
have an mfi(4) card.
2006-08-14 21:08:20 +00:00
Yaroslav Tykhiy f8f52c191c MFC rev. 1.57:
Do not forget to increment the input line counter
  when reading a word spanning multiple lines.
2006-08-06 10:47:45 +00:00
John Baldwin 290b4174ac Bah, fix the 1.5 MFC to actually work on 4.x.
Pointy hat to:	jhb
2006-07-20 20:16:16 +00:00
John Baldwin f2e74f72ea MFC: Chain the bus_dmamap_load() calls when mapping a command with a data
CCB instead of using BUS_DMA_NOWAIT().  Since bus_dmamap_load() doesn't
support BUS_DMA_NOWAIT in 4.x, this could result in data corruption if
sufficient bounce pages weren't available.

Submitted by:	scottl
2006-07-20 20:07:37 +00:00
John Baldwin 75812123d4 MFC revs 1.4 and 1.5:
- Removed updates to if_ibytes, if_obytes, if_imcasts, and if_omcasts.
- Match code in 6.x and HEAD for handling excessively fragmented mbufs for
  TX.
- Handle ifconfig up when HW is down.
2006-07-20 18:54:15 +00:00
John Baldwin 29911091d0 MFC: Probe volumes synchronously during boot. 2006-07-18 20:01:06 +00:00
Matt Jacob c795d37c9c MFC 1.117: don't claim to support the 2422 yet. 2006-07-14 05:19:17 +00:00
Matt Jacob 19b60149ee MFC: Fixes related for VMWare 2006-06-27 18:13:23 +00:00
Matt Jacob e14dcec7c2 MFC 1.162: Grumble. VMWare ESX and VMWare WorkStation have *slightly*
different inquiry data (pointlessly different I might add). Pick
the common parts.
2006-06-26 05:42:54 +00:00
Matt Jacob b5b1e543a8 MFC 1.161: VMware disk volumes are only on LUN 0, and
some VMware HBAs have known bugs with commands sent to
other than LUN 0.
2006-06-25 02:03:18 +00:00
John Baldwin fd58dfe91a Bah, include Makefile for bce(4) module.
Reported by:	Scott Allendorf <scott-allendorf AT uiowa dot edu>
2006-06-23 21:10:40 +00:00
Bruce A. Mah a57f28ddf7 MFC: SA-06:17, mfi(4), mpt(4) update, bce(4). 2006-06-23 18:38:03 +00:00
John Baldwin 1b93261e83 Regen. 2006-06-23 16:48:18 +00:00
John Baldwin 99a948a16f MF6: Add the bce(4) driver. Unlike the driver in 6.x and later this driver
does not support jumbo frames or hardware vlan tagging.
2006-06-23 16:47:46 +00:00
Paul Saab 4ec0843a7b Add mfi without the Linux ioctl layer. 2006-06-22 15:22:05 +00:00
cvs2svn 81f87079dd This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2006-06-20 23:08:36 +00:00
Matt Jacob 1f3727d650 MFC 1.34: support for FC919X 2006-06-17 12:48:27 +00:00
John Baldwin e78df6e86c MFC 1.27: Fix a typo when setting wirespeed. 2006-06-15 20:57:05 +00:00
Matt Jacob 4b50c2e075 MFC 1.24- add ability to reset individual targets and negotiate specific
rates.
2006-06-14 19:47:22 +00:00
Hiroki Sato 01780d930d Document FreeBSD-SA-06:17.sendmail. 2006-06-14 16:36:08 +00:00
Colin Percival 918ccd0822 Correct a bug in the handling of multipart messages by sendmail(8)
which can allow a malformed message to crash a sendmail queue
processing process.

Security:	FreeBSD-SA-06:17.sendmail
2006-06-14 16:01:06 +00:00
Matt Jacob ff5211e6c8 MFC -current mpt driver to support FC target mode and SAS HBAs plus
probably correct U320 negotiations. MFC sequential probe scan code
top support htis.
2006-06-08 17:55:15 +00:00
cvs2svn c44f3af96c This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2006-06-05 22:25:50 +00:00
Matt Jacob fd10f4d70b MFC: allow this to compile cleanly under RELENG_4 2006-06-03 07:21:09 +00:00
Matt Jacob 4a64f8794a MFC: current state in RELENG_6 && -current as of 5/31/06. Lots of formatting
changes and type rototilling. Some genuine bug fixes tho.
2006-06-01 07:31:44 +00:00
Matt Jacob 9f145c53b7 MFC 2300 firmware 2006-06-01 07:18:26 +00:00
Bruce A. Mah 5c50da438d New errata: SA-06:16.
While here, retarget advisory URLs (and one or two others) to use
security.FreeBSD.org.
2006-06-01 04:56:53 +00:00
Bruce A. Mah 7ce45f14d7 Swing URLs to security advisories over to security.FreeBSD.org. 2006-05-31 23:49:51 +00:00
Bruce A. Mah b6ce60be7c MFC: SA-06:16.
Note:  We should swing the URLs for all the older security advisories
mentioned here over to the new location on security.FreeBSD.org.
2006-05-31 23:44:25 +00:00
Colin Percival 3b192f61b0 Correct a bug in the handling of backslash characters in smbfs which can
allow an attacker to escape from a chroot(2).

Security:	FreeBSD-SA-06:16.smbfs
2006-05-31 22:34:32 +00:00
cvs2svn 1823be123d This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2006-05-29 20:34:29 +00:00
John Baldwin 42d2722235 When routing a PCI interrupt across a PCI-PCI bridge that is not listed
in the MP Table, use the slot (aka device) of the _child_ PCI device
on the child bus of the PCI-PCI bridge instead of the slot of the
PCI-PCI bridge on the parent bus of the bridge.
2006-05-23 17:59:06 +00:00
Paul Saab 0f6b7809d4 Protect amr_wait_command under splbio to avoid a missed wakeup. 2006-05-16 07:03:32 +00:00
Tai-hwa Liang 4f301220e8 MFC: (1.4, 1.5) Allow the gif module to be built without IPv6 support when
NOINET6 is defined.
2006-05-15 23:27:00 +00:00
Maxim Konovalov 78f1625b44 MFC revs. 1.29, 1.30, a part of 1.36: the .Nm utility,
filesystem -> file system, move rcs id tag.

PR:		docs/66264
Submitted by:	Michel Lavondes
2006-05-15 10:03:09 +00:00
Tor Egge d1f353e99d MFC part of revision 1.436 missed in MFC to revision 1.250.2.24. If page
table allocation failed then the allocation should be retried.

Submitted by:	ps
2006-05-03 00:51:02 +00:00
David Malone 41808ed937 MFC: 1.37
Stop dump reading off the end of its inode bitmaps when it finds an
invalid inode number in a directory entry.
2006-05-02 19:09:22 +00:00
David Malone ea1fe38e6a MFC: v1.45, v1.44
Make port 37 time work on machines with 64 bit longs. Also merge a couple
of updates to comments.
2006-05-02 18:32:43 +00:00
Julian Elischer eb96ff8d0a MFC: Add capacity to forward messages to an arbitrary UDP port,
not just to 514.
2006-05-01 23:46:12 +00:00
Joe Marcus Clarke e43c8019c3 MFC:
Fix a file descriptor leak in cam_lookup_pass() when the ioctl to find
the passthru device fails.

Approved by:	re (scottl)
2006-05-01 00:21:47 +00:00
Colin Percival 5826d4c070 MFC: Correct a local information leakage bug affecting AMD FPUs.
Security:	FreeBSD-SA-06:14.fpu
2006-04-19 07:02:43 +00:00
Florent Thoumie 767f330119 - Add missing libdata/ldconfig{,32} directories to BSD.local.dist.
- Bump __FreeBSD_version so that misc/ldconfig_compat can make good use
of it.

Approved by:	cperciva (mentor)
2006-04-18 15:33:32 +00:00
Maxim Konovalov 0764d34a8f MFC rev. 1.112 by mdodd: bfp could be NULL.
PR:		kern/76410
2006-04-14 10:38:49 +00:00
Gregory Neil Shapiro 0ce2809f6a Forced commit to bump the $FreeBSD$ version so mergemaster merges
/etc/mail/freebsd.cf and /etc/mail/freebsd.submit.cf.

PR:		conf/95634
Submitted by:	Rostislav Krasny
Approved by:	re (scottl)
Obtained from:	keramida
2006-04-13 04:08:22 +00:00
Gregory Neil Shapiro 1af9ce6a59 MFC: Update sendmail 8.13.4 -> 8.13.6 in release note entry. 2006-03-29 07:58:06 +00:00
Gregory Neil Shapiro 0b5898868b MFC: Add new libsm file from sendmail 8.13.6 2006-03-29 07:43:23 +00:00
Gregory Neil Shapiro 77e0466b7d MFC: sendmail 8.13.6 2006-03-29 07:43:06 +00:00
Hajimu UMEMOTO c491b54569 MFC 1.55: fill ai_canonname field for numeric hostname, by the given
hostname.  follow new recommendation in RFC3493.

PR:		standards/94995
2006-03-27 16:47:17 +00:00
cvs2svn f37f9dbb4d This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2006-03-22 16:40:05 +00:00
Colin Percival 6159e829e8 Add missing code needed for the detection of IPSec packet replays. [1]
Correctly identify the user running opiepasswd(1) when the login name
differs from the account name. [2]

Modify timeout handling logic in sendmail(8) to correct a reported
signal handling race condition. [3]

Security:	FreeBSD-SA-06:11.ipsec [1]
Security:	FreeBSD-SA-06:12.opie [2]
Security:	FreeBSD-SA-06:13.sendmail [3]
2006-03-22 16:02:49 +00:00
Joe Marcus Clarke f5883a9bfe MFC:
Add missing libdata/ldconfig[32] entries.

Approved by:	re (scottl)
2006-03-14 22:13:13 +00:00
Roman Kurakin a008bf8d24 MFC:
Add support for Cronyx Tau32-PCI adapters.
2006-03-12 22:56:56 +00:00
John Baldwin 42cc9a8f91 Revert the previous change. Even though Intel insists that the behavior
this change restores is wrong, it turns out the "proper" method is worse
in practice for existing machines.  This is probably due to the fact that
using fixed priority with a physical broadcast destination effectively
broadcasts interrupts to all CPUs.  Fixing that would require a lot more
work than just restoring the previous "incorrect" behavior and would
probably be riskier as well.

PR:		kern/94160
Reported by:	Richard Wiwatowski rjwiwat at internode dot on dot net
2006-03-09 16:23:15 +00:00
Roman Kurakin 31f0c58c8e MFC:
Add support for Cronyx Tau32-PCI adapters.
	Connect to the system.
2006-03-04 23:01:39 +00:00
Roman Kurakin 7ad0795efc MFC:
Add support for Cronyx Tau32-PCI adapters.
2006-03-04 22:55:48 +00:00
Roman Kurakin b7615bd254 MFC:
Add support for Cronyx Tau32-PCI adapters.
2006-03-04 22:45:14 +00:00
cvs2svn c1dc19accd This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2006-03-03 18:42:10 +00:00
John Baldwin ae07094931 Use the fixed delivery mode rather than low priority for I/O APIC
interrupts since low priority delivery mode can only be used logical
destinations and 4.x and earlier always use only physical destinations.
2006-03-01 16:26:51 +00:00
Simon L. B. Nielsen a17473bb18 Correct a remote kernel panic when processing zero-length RPC records
via TCP.

Security:	FreeBSD-SA-06:10.nfs
Approved by:	cperciva
2006-03-01 14:21:56 +00:00
Ian Dowse 6f2020ba66 Fix an old mis-merge in 1.26.2.11 that invoked usb_cold_explore()
too late in the boot process - "cold" is guaranteed to be false at
SI_SUB_INT_CONFIG_HOOKS, but it was being KASSERTed as true. With
usb_cold_explore() now running at the correct time, it does need
to use polling mode and splusb(), so back out 1.26.2.14.

PR:		usb/81524
Tested by:	Eugene Grosbein
2006-02-28 09:32:08 +00:00
Hajimu UMEMOTO ef2dc9b352 MFC 1.63: avoided the use of purged address structure when an
address became invalid in nd6_timer().
2006-02-14 16:35:13 +00:00
Hajimu UMEMOTO 0a75c3bd03 MFC 1.168: Never select the PCB that has INP_IPV6 flag and is bound
to :: if we have another PCB which is bound to 0.0.0.0.  If a PCB has
the INP_IPV6 flag, then we set its cost higher than IPv4 only PCBs.
2006-02-11 09:10:53 +00:00
Hajimu UMEMOTO 62be4a437d MFC 1.56: make IPV6_V6ONLY socket option work for UDP as well. 2006-02-09 03:41:51 +00:00
Ruslan Ermilov d6f03ebe01 MFC: Make multicast routing rolling on bge's. 2006-02-01 10:15:12 +00:00
Diomidis Spinellis 0d94a803aa MFC: Return EINVAL if the tv_usec part of the utimes(2) arguments
contains incorrect fractional second values (outside the range
0-999999).
Prior to this change users could create files with values outside
that range.  Moreover, on 32-bit machines tv_usec offsets larger than
4.3s would result in an unnormalized AND wrong timestamp value,
due to overflow.
2006-01-22 13:41:15 +00:00
Diomidis Spinellis 8bb467bd3e MFC change 2005-09-19 10:11:47 UTC
Setting .nofinger will not hide you from root.
2006-01-22 11:56:15 +00:00
Diomidis Spinellis ea664c2004 MFC 1.47: Document the TMPDIR environment variable. 2006-01-22 11:41:18 +00:00
Ruslan Ermilov 5ed24e50dd MFC: polling(4) support for bge(4). 2006-01-17 10:41:06 +00:00
Pav Lucistnik ca951584be MFC 1.34: mention the size of the additional header 2006-01-14 12:13:04 +00:00
Ed Maste 6d08372564 Merge device_pager.c:1.69 from HEAD to RELENG_4:
The addition of a locking assertion to vm_page_zero_invalid() has
  revealed a long-time bug: vm_pager_get_pages() assumes that m[reqpage]
  contains a valid page upon return from pgo_getpages().  In the case of
  the device pager this page has been freed and replaced by a fake page.
  The fake page is properly inserted into the vm object but m[reqpage] is
  left pointing to a freed page.  For now, update m[reqpage] to point to
  the fake page.

  Submitted by:   tegge

Approved by:	alc, rwatson (mentor)
2006-01-12 19:56:58 +00:00
Colin Percival 613d8db2b9 Correct insecure temporary file usage in texindex. [06:01]
Correct insecure temporary file usage in ee. [06:02]
Correct a race condition when setting file permissions, sanitize file
names by default, and fix a buffer overflow when handling files
larger than 4GB in cpio. [06:03]

Security:	FreeBSD-SA-06:01.texindex
Security:	FreeBSD-SA-06:02.ee
Security:	FreeBSD-SA-06:03.cpio
2006-01-11 08:06:47 +00:00
Shunsuke Akiyama c7d8542358 Regenerate after updating usbdevs. 2006-01-06 15:16:41 +00:00
Florent Thoumie 6105148405 Fix latest commit, some vendor ids and product ids were missing.
Approved by:	pjd (implicit)
Pointyhat to:	self
2006-01-05 16:54:18 +00:00
Florent Thoumie 1c9096f353 MFC:
Add a hid blacklist quirk.

      src/sys/dev/usb/usbdevs: rev 1.240
      src/sys/dev/usb/usb_quirks.c: rev 1.45
      src/sys/dev/usb/uhid.c: rev 1.78
      src/sys/dev/usb/usb_quirks.h: rev 1.20

Approved by:	pjd
2006-01-05 16:46:10 +00:00
Paul Saab 7e7b44fd4a MFC:
revision 1.67
It seems ciss should ignore overrun and underrun on a SCSI INQUIRY
command.  This fixes some weird booting issues on newer versions
of the firmware on the MSA20.

revision 1.66
Update PCI ids to add the E200, E200i, P400, and P400i storage
controllers.  Remove the E400 since it is not a real product.

revision 1.65
There's no reason to check the valence.  This allows ciss to work
on the P600.
2005-12-31 06:28:57 +00:00
Diomidis Spinellis df0e9fe5a4 MFC 1.28
Bug fix: a numeric flag specification in the substitute command would
cause the next substitute flag to be ignored.
While working at it, detect and report overflows.
2005-12-25 16:40:03 +00:00
Diomidis Spinellis 4a5574a12e MFC 1.19
Use the appropriate error function for displaying the error,
instead of printing it to stdout.
2005-12-25 16:26:40 +00:00
Maxime Henrion f97aadf12e MFC r1.252:
date: 2005/12/12 14:30:13;  author: mux;  state: Exp;  lines: +1 -0
  Add the device ID of fxp(4) NICs found in Sony Vaio VGN-TX1XP laptops.
2005-12-16 03:26:37 +00:00
Gleb Smirnoff a6c634a44e Fix a typo that caused a panic in a quite rare case: when a packet was
policy routed by ipfw(4) to local IP address, and the previous destination
of the packet was reachable via an interface with checksum offloading
capabilities.

Not applicable to RELENG_5, RELENG_6 and HEAD.

Submitted by:	Mihail Balikov <misho interbgc.com>
2005-12-10 14:32:55 +00:00
Ruslan Ermilov c1026b37db MFC: Fix memory leak. 2005-12-09 07:13:06 +00:00
John Baldwin 075cf5a152 MF5: Always read RTC_IN to clear any pending interrupt when writing to
RTC_STATUSB.

Tested by:	Uwe Doering gemini at geminix dot org
2005-11-28 19:03:16 +00:00
Robert Watson e66f54b279 Add several missing calls to splx() in error cases associated with
calling ether_ipfw_chk() from the ethernet output code.

PR:		57985
Reported by:	Scot Loach <sloach at sandvine dot com>
2005-11-27 18:37:15 +00:00
Kirill Ponomarev e9ec5207c8 MFC: pkg_info.1:1.55
date: 2005/11/23 10:31:59;  author: krion;  state: Exp;  lines: +4 -1
  Document PKG_PATH enviroment variable.

  Prodded by:     Mark Andrews <Mark_Andrews AT isc DOT org>
2005-11-26 20:58:43 +00:00
Hajimu UMEMOTO b911500d1f MFC 1.55: The KAME's getipnodebyaddr() code honor the
MULTI_PTRS_ARE_ALIASES define also, but res_config.h was not
included into libc/net/name6.c.  So getipnodebyaddr() ignored
the multiple PTRs.
2005-11-18 02:38:45 +00:00
Pav Lucistnik 8aa540a47c Add new ports-net-im collection. 2005-11-09 10:16:26 +00:00
John Polstra 906987067d MFC 1.24: Fix an erroneous description of the file descriptor
assignments for the "~C" command.
2005-11-04 17:33:21 +00:00
Wilko Bulte 6008dfd2bc Small changes in the AlphaStation 200 and PC164 area. PC164 SRM does
not work with 53C896 SCSI chips.

Submitted by: Owen Mann <[email protected]>
2005-11-02 22:23:27 +00:00
Colin Percival 14b1ff25f5 Correct a man-in-the-middle SSL version rollback vulnerability.
Security:       FreeBSD-SA-05:21.openssl
2005-10-11 11:52:01 +00:00
Hajimu UMEMOTO d5e2470049 MFC 1.16: stop RFC 4193 address on the outside interface. 2005-10-10 09:52:01 +00:00
Doug Barton 9906dbfbac MFC through rm.c 1.53, rm.1 1.38, and Makefile 1.18.
This includes the recent change to improve handling of the -P flag
on read-only files, addition of the -I option for better handling
of recursive deletes, a test for removal of / in the argument list,
removal of clause 3 from the BSD license, some small code cleanups,
and related mdoc and comment changes and improvements.

The Makefile change removes a spurious SRCS=, and WARNS?=
2005-10-08 17:46:12 +00:00
John Baldwin 208191f1b1 Enable BWX for the Alcor2 chipset treating it like the Pyxis. This is not
an MFC as the code in 5.x and beyond is rather different.

Submitted by:	Paul V. Bolotoff walter at alasir dot com
2005-09-30 13:25:30 +00:00
Xin LI 5a66f48bd9 MFC 1.64: Restore a historical ufs_inactive behavior that respect
the RDONLY option, so subsequent call of UFS_TRUNCATE (ffs_truncate)
would not panic the system.  This fixes a panic that can happen
when mounting a corrputed filesystem read-only, and reading data
from it.

Reviewed by:	mckusick
2005-09-27 17:05:46 +00:00
Kirill Ponomarev e9bc9afe9c MFC: 1.20
date: 2005/09/24 21:41:47;  author: krion;  state: Exp;  lines: +1 -1
  Do not bitch about bsdpan modules not having origin.

  Based on PR:    bin/82269
  Submitted by:   Steven Hartland <killing at multiplay dot co dot uk>
  MFC after:      3 days
2005-09-27 07:56:03 +00:00
Kirill Ponomarev 78e71c01b7 MFC: 1.39
date: 2005/09/24 19:41:56;  author: krion;  state: Exp;  lines: +1 -1
  Remove '\n' since it's redundant in case if file doesn't exist while
  running 'pkg_info -g'

  Based on PR:    bin/42609
  Submitted by:   Jeff King <peff-freebsd at peff dot net>
  MFC after:      3 days
2005-09-27 07:54:08 +00:00
Robert Watson c7d769bfbd Merge rc.conf:1.260, rc.conf.5:1.265, and notionally kerbero:1.5 from
HEAD to RELENG_4:

  Add a new rc.conf entry, kerberos5_server_flags, which allows the
  administrator to specify additional start-up flags to the Kerberos
  5 Authentication Server.
2005-09-25 19:11:08 +00:00
Tor Egge bd1c32850b MFC: Retain generation count when writing zeroes instead of an inode to disk.
Don't free a struct inodedep if another process is allocating saved
     inode memory for the same struct inodedep in
     initiate_write_inodeblock().

     Handle disappearing dependencies in softdep_disk_io_initiation().
2005-09-20 22:37:54 +00:00
Gleb Smirnoff 8ee23ab4f5 MFC typo fix from 1.75:
Dej'a vu of revision 1.35

  PR:		kern/86258
  Submitted by:	Hiroshi Oota <ghelp excite.co.jp>
2005-09-20 13:47:59 +00:00
Stephan Uphoff bcd0b35a45 Multiple interrupt handlers may try to queue an event for a
nested kqueue. (4.X only race condition)

Found by:	Yahoo!
2005-09-20 01:12:06 +00:00
Doug Barton 8a37bb3346 MFC 1.32, always read to and write from a terminal.
PR:		bin/65892
Requested on:	freebsd-security
Requested by:	Yar Tikhiy <[email protected]>
2005-09-10 22:10:34 +00:00
Doug Barton 9595d86138 MFC through 1.22 the parts that make sense in this branch, which has
BIND 8 in the base. This includes the removal of the IP6.INT example
per RFC 4159.
2005-09-10 08:33:27 +00:00
Colin Percival 0b52e87f83 MFC: Correct insecure temporary file usage.
Security:	FreeBSD-SA-05:20.cvsbug
2005-09-07 13:44:06 +00:00
Stephan Uphoff e46db0c9d9 MFC ffs_softdep.c 1.182, softdep.h 1.18
Delay freeing disk space for file system blocks until all
dirty buffers are safely released. This fixes softdep
problems on truncation (deletion) of files with dirty
buffers.
2005-08-31 17:53:53 +00:00
Gregory Neil Shapiro d424f42cd9 MFC: sendmail 8.13.4 and hoststat(8)/purgestat(8) man page linking
Reminder by:    Terry Kennedy
2005-08-28 05:11:56 +00:00
Tor Egge ae2fa59957 MFC: Don't set the COMPLETE flag in an inodedep structure before the
related inode has been written.
2005-08-26 20:40:31 +00:00
Pawel Jakub Dawidek 42cdd86bbd MFC: sys/opencrypto/cryptodev.c 1.26
Fix bogus check. It was possible to panic the kernel by giving 0 length.
This is actually a local DoS, as every user can use /dev/crypto if there
is crypto hardware in the system and cryptodev.ko is loaded (or compiled
into the kernel).

Reported by:	Mike Tancsa <[email protected]>
Tested by:	Mike Tancsa <[email protected]>
Security:	Local DoS on systems with crypto HW and with /dev/crypto available
2005-08-19 20:45:42 +00:00
Murray Stokely a997916162 MFC: Sync with HEAD: fix typos, correct dates, add new freebsd
committer birthdays, add a few new history dates.
2005-08-19 03:38:59 +00:00
Diomidis Spinellis 67754cc9cd Fix make world breakage when MAKE_KERBEROS4 is defined.
Reviewed by:	Scott Allendorf
2005-08-16 23:04:52 +00:00
Tor Egge a3e033d97f MFC: Check for marker pages when scanning inactive page queue. 2005-08-15 17:56:08 +00:00
Diomidis Spinellis 7451acc525 MFC version 1.18
Interpret correctly the glob(3) return value.
Previously, interactive commands specifying a non-existent file or
directory used to display an "out of memory error".
2005-08-05 11:14:25 +00:00
Hajimu UMEMOTO 1ace8fadbb MFC 1.12: don't accept invalid form of an address like 1:2:3:4:5:6:7::8. 2005-07-29 16:27:31 +00:00
Xin LI 8675755e32 MFC 1.123:
Allow PLAY_MSF, PLAY_TRACK, PLAY_TRACK_REL, PAUSE, PLAY_12 commands to pass
through umass(4), in order to make cdcontrol(1) to issue commands to a USB
CD driver.

The command IDs were obtained from the CAM subsystem.  This was tested
on half dozen of USB CD drivers from different vendors.

Suggested by:   "intron" <intron at intron dot ac>
PR:             usb/83439
Reviewed by:    sanpei
2005-07-29 15:42:32 +00:00
Matthew N. Dodd 3816fca08a MFC 1.13
Move initialization above point of first possible reference to
avoid overwriting ty_status values set from the 'type' field.
2005-07-25 20:20:53 +00:00
Jonathan Chen eff178f849 MFC of 1.33: remember to reset nextgrp in getnetgrent(), so that subsequent calls to getnetgrent() doesn't return bogus information.
MFC of 1.34: fix innetgr() returning false positives and negatives when reverse netgroup matching is used.

PR:		35506
2005-07-25 20:05:40 +00:00
Sheldon Hearn a712bbe19a MFC rev 1.34: regen 2005-07-18 07:46:21 +00:00
Xin LI fc7299979b MFC revision 1.13
date: 2005/07/13 10:40:07;  author: delphij;  state: Exp;  lines: +7 -4
Better memory handling:

 - It is acceptable to call free(3) when the given pointer itself
   is NULL, so we do not need to determine NULL before passing
   a pointer to free(3)
 - Handle failure of malloc(3)

Submitted by:	Dan Lukes <dan at obluda cz>
PR:		bin/83352
Approved by:	re (scottl)
2005-07-17 17:29:22 +00:00
Ken Smith e5fd8baf13 MFC v1.2, Add -D_FREEFALL_CONFIG to CFLAGS via Makefile so that just
defining _FREEFALL_CONFIG in /etc/make.conf is all that is required
for the clusterisms to take effect.
2005-07-11 13:25:54 +00:00
Ken Smith 48e7073c83 MFC v1.16, Add -D_FREEFALL_CONFIG to CFLAGS via Makefile so that just
defining _FREEFALL_CONFIG in /etc/make.conf is all that is required
for the clusterisms to take effect.
2005-07-11 13:22:13 +00:00
Xin LI bb10cb5706 MFC 1.47:
Fix a bug when shell expansion is done against dangling symlinks, by
converting the stat() call to a lstat() call, which will cover the
situation.  One can exercise this bug by referring a dangling link with
something like */the-link.

Submitted by:   Simon 'corecode' Schubert [corecode fs ei tum de]
Obtained from:  NetBSD via DragonFlyBSD (NetBSD rev. 1.51 and DragonFly
                rev. 1.6)
2005-07-10 15:17:53 +00:00
Hiroki Sato 835305c772 Document security advisories applicable to 4.11R.
Submitted by:	Daniel Gerzo
PR:		www/82798
2005-07-03 13:43:10 +00:00
Dag-Erling Smørgrav b44ccced4e MFC: (1.75, 1.76) flush the send side rather than shut it down. 2005-07-03 10:40:23 +00:00
Mike Silbersack 77b7808c34 MFC PCI Ids for 5751M and 5789 chips - this brings device support
in line with what 6.x and 5.x have.

Requested by:	Juraj Lutter
2005-07-03 03:41:19 +00:00
Don Lewis 124b549098 Populate /R/ftp/ports explicitly and copy this to /R/cdrom/disc1/ports
instead of attempting the reverse, because the ftp.1 target is executed
before the cdrom.1 target, which is optional.  This has been broken
ever since the order of the targets was swapped and cdrom.1 was made
optional, which happened a very long time ago.
2005-07-02 07:22:12 +00:00
Bruce A. Mah 87f5f1cf40 MFC: SA-05:11.gzip, SA-05:14.bzip2, SA-05:15.tcp. (General security
advisory resync.)
2005-06-30 18:41:55 +00:00
Simon L. B. Nielsen b8833141ed Correct bzip2 denial of service and permission race vulnerabilities.
Obtained from:	Redhat, Steve Grubb via RedHat
Security:	CAN-2005-0953, CAN-2005-1260
Security:	FreeBSD-SA-05:14.bzip2
Approved by:	obrien

Correct TCP connection stall denial-of-service vulnerabilities.

MFC: rev 1.270 of tcp_input.c, rev 1.25 of tcp_seq.h by ps: When a TCP
packets containing a timestamp is received, inadequate checking of
sequence numbers is performed, allowing an attacker to artificially
increase the internal "recent" timestamp for a connection.

A TCP packets with the SYN flag set is accepted for established
connections, allowing an attacker to overwrite certain TCP options.

Security:	CAN-2005-0356, CAN-2005-2068
Security:	FreeBSD-SA-05:15.tcp

Approved by:	cperciva
2005-06-29 21:43:42 +00:00
Paul Saab 5a46cc72f4 Avoid a panic in the swizzle code by checking to see if the parent
of the pci bus is NULL.

Submitted by:	jhb
2005-06-29 15:57:10 +00:00
Paul Saab 6081e3d91f Merge a whole slew of stability fixes from RELENG_5/CURRENT.
- amr should now work reliably on systems with more than 4GB of ram.
- Assign a static slot number to each command instead of doing a
  linear search for free slots each time a command is needed.
- Fixes for the ioctl path.

A good portition of these changes were submitted by
David Sze <dsze at alumni dot uwaterloo dot ca>
2005-06-27 22:21:08 +00:00
Tai-hwa Liang 5805057cfb MFC: (1.154) Fixing a memory leak in xpt_release_device(). 2005-06-27 03:07:08 +00:00
Maxim Konovalov 4af8b08e76 MFC rev. 1.19 sys/kern/uipc_accf.c to sys/kern/uipc_socket.c, bug fixes for:
setsockopt(2) cannot remove accept filter, getsockopt(SO_ACCEPTFILTER)
always returns success on listen socket.
2005-06-26 07:04:23 +00:00
Roman Kurakin 7eb58dcb21 Prepare to close three old PRs.
MFC:
	revision 1.6
	date: 2004/12/28 00:07:56;  author: rik;  state: Exp;  lines: +1 -1
	Add FR support to sppp (MFCronyx).

	Silence on: net@, current@, hackers@.
	No objections: joerg

	Requested by: by many (mostly Cronyx) users for a long long time.
	MFC after:	10 days

PR:	kern/21771, kern/66348, kern/14848
2005-06-25 20:30:43 +00:00
Roman Kurakin 40737abd69 Prepare to close three old PRs.
MFC:
	revision 1.118
	date: 2005/01/07 01:45:34;  author: imp;  state: Exp;  lines: +2 -1
	/* -> /*- for license, minor formatting changes
	----------------------------
	revision 1.117
	date: 2004/12/28 00:07:56;  author: rik;  state: Exp;  lines: +38 -12
	Add FR support to sppp (MFCronyx).

	Silence on: net@, current@, hackers@.
	No objections: joerg

	Requested by: by many (mostly Cronyx) users for a long long time.
	MFC after:	10 days
	----------------------------
	revision 1.116
	date: 2004/12/14 18:18:54;  author: rik;  state: Exp;  lines: +0 -2
	Kill double inclusion for <netinet/in.h> and <netinet/in_systm.h>.
	----------------------------
	revision 1.111
	date: 2004/06/25 10:25:33;  author: rik;  state: Exp;  lines: +2 -1
	Do not count loobacks as other fuilures.
	As a result magic will not be rejected any more in case of loopback.

	Discussed with:	joerg@
	----------------------------
	revision 1.108
	date: 2004/05/25 21:54:07;  author: rik;  state: Exp;  lines: +2 -2
	Keepalive timer should be added if we does not have any sppp consumers
	before and should be deleted if we do not have any anymore.
	----------------------------
	revision 1.107
	date: 2004/03/14 01:32:44;  author: rwatson;  state: Exp;  lines: +2 -2
	Compare spppq to NULL instead of using spppq as a boolean.

PR:	kern/21771, kern/66348, kern/14848
2005-06-25 12:27:17 +00:00
Roman Kurakin 8786bfafe2 Prepare to close three old PRs.
MFC:
	revision 1.976
	date: 2004/12/28 00:07:56;  author: rik;  state: Exp;  lines: +2 -0
	Add FR support to sppp (MFCronyx).

	Silence on: net@, current@, hackers@.
	No objections: joerg

	Requested by: by many (mostly Cronyx) users for a long long time.
	MFC after:	10 days

PR:	kern/21771, kern/66348, kern/14848
2005-06-25 12:18:34 +00:00
Roman Kurakin 978c5624d6 Prepare to close three old PRs.
MFC:
	revision 1.27
	date: 2005/01/07 01:45:34;  author: imp;  state: Exp;  lines: +2 -1
	/* -> /*- for license, minor formatting changes
	----------------------------
	revision 1.26
	date: 2004/12/28 00:07:56;  author: rik;  state: Exp;  lines: +13 -2
	Add FR support to sppp (MFCronyx).

	Silence on: net@, current@, hackers@.
	No objections: joerg

	Requested by: by many (mostly Cronyx) users for a long long time.
	MFC after:	10 days

PR:	kern/21771, kern/66348, kern/14848
2005-06-25 11:50:33 +00:00
Roman Kurakin 6975fc498f Prepare to close three old PRs.
MFC:
	revision 1.2
	date: 2005/01/07 01:45:35;  author: imp;  state: Exp;  lines: +1 -1
	branches:  1.2.2;
	/* -> /*- for license, minor formatting changes
	----------------------------
	revision 1.1
	date: 2004/12/28 00:07:57;  author: rik;  state: Exp;
	Add FR support to sppp (MFCronyx).

	Silence on: net@, current@, hackers@.
	No objections: joerg

	Requested by: by many (mostly Cronyx) users for a long long time.
	MFC after:	10 days

PR:	kern/21771, kern/66348, kern/14848
2005-06-25 11:36:18 +00:00
Ceri Davies dde2ceb20a Remove an extra 't' that I inexplicably managed to insert during the
last commit.

Pointy hat awarded by:  ru
2005-06-23 22:46:09 +00:00
Ceri Davies 3e149b2f1e MFC revisions 1.17 and 1.18. 2005-06-23 22:33:33 +00:00
Paul Saab 7a66b9008e If a PCI interrupt cannot be routed in the mptable directly, it
tries to swizzle the interrupt and route across the parent bridge
recursively.

Submitted by:	jhb
2005-06-20 21:42:03 +00:00
John Baldwin d23992b1d7 Use the correct types (size_t rather than int) for a couple of variables
passed to kernel_sysctl() to fix an unaligned exception on Alpha.  This
is not an MFC as the code in 5.x is very different.

Reported by:	Eric Millbrandt emillbrandt at coldhaus dot com
2005-06-20 20:47:48 +00:00
Dejan Lesjak 2f869e6dc5 MFC BSD.x11-4.dist rev. 1.27:
Move couple of directories out of mtree and into their respective
ports. This mtree now specifies basic structure of X11BASE, similarly
to BSD.local.dist.
2005-06-16 08:50:41 +00:00
Warner Losh fd0cbb638f (direct commit, since MAKEDEV is gone in HEAD and RELENG_5):
Create the twa devices that communicate with the twa driver.
2005-06-14 23:34:29 +00:00
Wilko Bulte c402604fcf Empty CMOS batteries can cause agony with your AlphaBIOS versus
SRM selection.

Found out the hard way by: gallatin
2005-06-14 17:46:35 +00:00
cvs2svn d546b9943b This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2005-06-14 02:23:16 +00:00
Simon L. B. Nielsen 7f642d5faf Partial MFC of 1.212:
- Add missing manual page links for sysctl_add_oid(9).

The rman(9) parts of 1.212 are not MFC'ed since 4.X does not have
rman(9).

PR:		docs/60088
Submitted by:	le
2005-06-12 16:34:57 +00:00
Kirill Ponomarev 8212e44e8b MFC: main.c:1.5, perform.c:1.12, pkg_version:1.33, version.h:1.4
date: 2005/05/24 08:26:44;  author: cperciva;  state: Exp;  lines: +1 -0
  Add an -I option to pkg_version:

    -I  Use only the index file for determining if a package is out of
        date.  This is much faster than using the version number from a
        port's Makefile, at the expense of potentially giving an incor-
        rect result if the index file is out of date.

  Without this option, the index file is only consulted if "make -V PKGNAME"
  cannot be used.
2005-06-12 08:29:24 +00:00
Colin Percival d9823ccd59 MFr5 revision 1.342.2.30:
Belatedly document the disabling of Hyper-Threading.  Security issues
  are not normally documented in UPDATING on the stable branches, but
  since this is a user-visible change, it needs to be here.

  This is not an MFC since Hyper-Threading is enabled by default in HEAD.

  Pointed out by: Erik Trulsson, via freebsd-stable

  Revision    Changes    Path
  1.342.2.30  +5 -0      src/UPDATING
2005-06-11 00:17:00 +00:00
Scott Long 5746df1e2d Back out the previous revision to unbreak UDP and NFS.
Submitted by: rwatson
2005-06-09 20:06:44 +00:00
Simon L. B. Nielsen 302a8e0bdd Correct directory traversal and race condition vulnerabilities in gzip.
Security:	FreeBSD-SA-05:11.gzip
Security:	CAN-2005-0988, CAN-2005-1228
Obtained from:	Steve Grubb via RedHat, Debian

Approved by:	nectar
2005-06-08 21:29:53 +00:00
Maxim Konovalov cf21c81b60 MFC revs. 1.89 - 1.94: DragonFly 1.2.0, FreeBSD 5.4, MacOS 10.4,
OpenBSD 3.7, FreeBSD 1.1, 1.1.5, 1.1.5.1, 2.0 release dates.
2005-06-08 04:01:16 +00:00
Maxim Konovalov f7c572fb3b MFC rev. 1.68: terminate an endless loop sh -T goes into in dowait()
around waitproc().
2005-06-08 03:49:41 +00:00
Hajimu UMEMOTO cfbc8cf216 MFC 1.57 (partly): The kernel didn't return correctly after the
check of the existence of IPsec policy in SADB_X_SPDDELETE2 via
PF_KEYv2.

PR:		kern/81804
Submitted by:	KAMADA Ken'ichi <kamada _at_ nanohz.org>
2005-06-07 12:19:10 +00:00
John-Mark Gurney 7f4cb81106 MFC: v1.209
make sure that the socket is either accepting connections or is connected
when attaching a knote to it...  otherwise return EINVAL...

Suggested by:	dclark at applmath.scu.edu
2005-06-07 07:12:58 +00:00
Paul Saab 07bdb4ebfd regenerate 2005-06-03 19:14:40 +00:00
Paul Saab 6bc7dcefa9 MFC support for the 5714 2005-06-03 19:14:02 +00:00
Simon L. B. Nielsen 317bbc4866 Make sure the dest_realm buffer is always NUL terminated.
This code is only used when rlogin is compiled with Kerberos 4
support, and since the Kerberos code in rlogin has been removed from
FreeBSD 5.0 and newer, this is not an MFC.

It is not believed that this bug could be exploited as a security
vulnerability.

PR:		bin/80661
Submitted by:	Przemyslaw Frasunek <[email protected]>
Approved by:	cperciva
2005-05-29 15:33:35 +00:00
Archie Cobbs 95dda7c35e MFC: (rev. 1.10) Correct L2TP header offset handling. 2005-05-26 14:59:38 +00:00
Bruce A. Mah 0149a1959f MFC: sed(1) -l. 2005-05-26 14:44:41 +00:00
Sheldon Hearn d3565be21c MFC rev 1.11: release maintainership 2005-05-25 16:32:14 +00:00
Gleb Smirnoff 6924bcd0e5 MFC:
Add option -l, to make output line buffered.

  PR:             bin/78692
  Submitted by:   Eugene Grosbein
2005-05-23 13:27:49 +00:00
Bruce A. Mah 8e44053b6a MFC: SA-05:09.htt. 2005-05-19 14:53:18 +00:00
Tony Ackerman f0d3d352ec Changed to reflect the latest changes in Intel's em version 2.1.7 2005-05-19 00:24:32 +00:00
Tony Ackerman 83c8c88ba0 Changes to bring the driver closer to Intel's em version 2.1.7
- Changed from using explicit devices id to using descriptive labels.
- Added support for 82573 and 82546 Quad adapters.
- Corrected support for 82547EI and 82541ER (mac_type was not assigned)
- Removed #ifdef DBG_STATS and extraneous code.
- Corrected incorrect Packet Buffer assignment for 82541.
- Cleaned up a few typos and style nits.

PR:	None
2005-05-18 23:54:40 +00:00
Tony Ackerman 4c37199ae2 Changes to bring the driver closer to Intel's em version 2.1.7
- Added support for 82573 and 82546 Quad adapters.
- Brought forward Intel's most current mac and phy changes.
2005-05-18 23:52:54 +00:00
Tony Ackerman 33104e59c7 Changes to bring the driver closer to Intel's em version 2.1.7
- Changed from using explicit devices id to using descriptive labels.
- Added support for 82573 and 82546 Quad adapters.
- Corrected support for 82547EI and 82541ER (mac_type was not assigned)
- Removed #ifdef DBG_STATS and extraneous code.
- Corrected incorrect Packet Buffer assignment for 82541.
- Cleaned up a few typos and style nits.

PR:	None
2005-05-18 23:48:42 +00:00
Julian Elischer 95f192f4de Revert a set of MFCs that worked for me but seem to be causing
problems for others. Rest assured you haven't seen the end of these..
As soon as I get back to a test environment I can use for finding the
problem I'm try again.
2005-05-16 09:39:25 +00:00
Joe Marcus Clarke 1f9b8e8b00 MFC rev 1.115:
Add libdata/pkgconfig.  It is used under ${LOCALBASE} as much (if not more)
than under ${X11BASE}.
2005-05-14 19:47:53 +00:00
Jacques Vidrine 2bef1912ee Add a knob for disabling/enabling HTT, "machdep.hyperthreading_allowed".
Default off due to information disclosure on multi-user systems.

Submitted by:	cperciva
Reviewed by:	jhb
2005-05-13 00:10:56 +00:00
Xin LI 83c2030a02 MFC 1.15+1.16: Remove a check about whether sa->sa_len is equal to salen
from getnameinfo(3).  This improves API compatibility with other POSIX
complaint operating systems.

PR:		standards/80008
Requested by:	Xin Liu <[email protected]>
Reviewed by:	freebsd-standards (das)
2005-05-09 13:12:49 +00:00
Colin Percival 423094370c MFC: Fix two issues which were missed in FreeBSD-SA-05:08.kmem.
Reported by:	Uwe Doering
2005-05-08 10:26:42 +00:00
Bruce A. Mah 716918022d MFC: SA-05:06.iir, SA-05:07.ldt, SA-05:08.kmem. 2005-05-06 23:17:22 +00:00
Colin Percival 1ed2dcbbea If we are going to
1. Copy a NULL-terminated string into a fixed-length buffer, and
2. copyout that buffer to userland,
we really ought to
0. Zero the entire buffer
first.

Security: FreeBSD-SA-05:08.kmem
2005-05-06 02:50:00 +00:00
Colin Percival ceb816462c Correctly validate inputs to the i386_get_ldt syscall.
Security: FreeBSD-SA-05:07.ldt
2005-05-06 02:40:18 +00:00
Colin Percival 572c5e54b5 Correct improper permissions on /dev/iir. The earlier permissions
of 0644 allowed for people to do Evil Things via ioctl(2).

Security: FreeBSD-SA-05:06.iir
2005-05-06 02:33:46 +00:00
Hajimu UMEMOTO ac40fbb19e MFS:
- replace use of a spinlock with a mutex.
- enclose getservby{name,port}(3) call with mutex lock.
- protect _hostconf_init_done and _hostconf_init() call with mutex lock.

	lib/libc/net/getaddrinfo.c:	1.41
	lib/libc/net/name6.c:		1.33
	lib/libc/net/getnameinfo.c:	1.14.6.1, 1.14.6.2
2005-05-05 06:07:05 +00:00
Peter Wemm 2e43ef2e35 Check in the freebsd.org cluster modifications to make k5su actually
usable.  In particular:
* disable unix password authentication (ie: do kerberos only)
* install k5su setuid by default
* allow instances for things like ksu to the www account instead
of only doing this for root.
This stuff is only enabled by make.conf switches.
2005-05-04 16:51:57 +00:00
Julian Elischer 0c6d2ae97b Massage uhub.c so that it's more obvious what the differences to -current are.
Do some diff reduction.
Bring in a few small fixes.
2005-05-03 23:40:59 +00:00
Doug Ambrisko 66db63aa59 Backout the Promise SATA support due to some reported hangs. I have
an idea what the problem is but need more testing.

Leave in the Intel PCI Device ID changes.
2005-05-03 15:53:48 +00:00
Paul Saab eed45186dd MFC a part of rev 1.39.
- Fix a bug handling the return value of alloc_bounce_pages at map creation
  time.  It returns the number of pages allocated, not 0 on success.
2005-05-02 20:37:17 +00:00
Bruce A. Mah acdf5813aa MFC: SA-05:04.ifconf, SA-05:05.cvs. 2005-05-01 17:24:00 +00:00
Julian Elischer d9b7b39b16 A bunch more MFCs. import a lot of the new bus management stuff. 2005-04-30 01:48:02 +00:00
David Xu e1304b0f27 MFC Revision 1.73:
> Dont set prefetch etc on VIA chips, causes problems on newer chips and
 > ATAPI devices.
2005-04-29 13:41:51 +00:00
Julian Elischer b742ad63d6 We probe USB1.1. busses late enough to get and use interrupts
so don't ignore them.. it leads to an interrupt storm which freezes
the system.
2005-04-28 23:49:15 +00:00
Julian Elischer eb9bc03c1a MFC a helper routine that will be used in a USB MFC. 2005-04-28 00:14:09 +00:00
Julian Elischer 2a3d068afc MFC Basic drivers from -current
Also bring in the code that probves the non EHCI controllers
after the EHCI controllers, thus ensuring that high speed
devices are not pingponged all aver theplace during startup.
2005-04-26 21:50:14 +00:00
Paul Saab 7683b5cc67 Add support for the Intel ICH6 2005-04-26 21:31:40 +00:00
Julian Elischer cc04d58255 Add missing include. 2005-04-26 20:52:07 +00:00
Jesus R. Camou f7b36fc1d6 MFC: o mention the required byte order in
the ``ip'' man page.

     o put the word ``raw'' somewhere in
       the title of the ``ip'' man page.

PR:		docs/30873
Submitted by:	Douglas De Couto <[email protected]>
Approved by:	trhodes (mentor)
2005-04-26 00:51:19 +00:00
Julian Elischer 75379a2ffa MFC the latest changes to the ehci driver. 2005-04-23 07:19:30 +00:00
Julian Elischer 76fa1e2452 MFC: 1.14
Don't use Bus-dma to allocate a simple buffer that is not used by DMA.
2005-04-22 21:49:39 +00:00
Julian Elischer 3fd13340cb MFC a most of the changes that have occured inthe uaudio driver. 2005-04-22 21:26:13 +00:00
Simon L. B. Nielsen 265f65da85 MFC:
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 18:13:30 +00:00
Remko Lodder 9101a68d57 MFC:
date: 2005/04/10 19:03:48;  author: remko;  state: Exp;  lines: +1 -0
Add myself to the calendar.

MFC after:      1 week
Approved by:    simon (mentor)
2005-04-22 17:28:17 +00:00
Doug Ambrisko b21126911c Add in Promise and Intel SATA support based on FreeBSD 5.X ATAng.
This gets the HW to work but not to deal with SATA errors.  So if
the drive has a read error it will probably lock up.  This is
a small subset of my patches that do deal with these errors and
other issues in FreeBSD and ata-raid.

Sponsored by:	IronPort Systems
2005-04-20 23:51:32 +00:00
Colin Percival b5a1289e33 Zero the ifr.ifr_name buffer in ifconf() in order to avoid
accidental disclosure of kernel memory to userland.

Security:	FreeBSD-SA-05:04.ifconf
2005-04-15 01:52:40 +00:00
Sheldon Hearn 82077eac3c MFC rev 1.33: regen
Approved by:	re (kensmith)
2005-04-12 13:05:41 +00:00
Diomidis Spinellis e10dada865 MFC: Remove wrong -unfilled .Bd argument implied by -literal. 2005-04-12 06:25:01 +00:00
Tai-hwa Liang aff104612b MFC: It's useful to have this tool for dumping $PIR table on i386 machines.
Reviewed by:	bms, sam (mentor)
2005-04-11 12:40:06 +00:00
Diomidis Spinellis 7d90fc3d4a MFC the new pipe sub-namespace. 2005-04-10 07:58:05 +00:00
Diomidis Spinellis c08e6d57dd MFC 1.241-1.242:
- Return POLLHUP rather than POLLIN/POLLOUT on TS_ZOMBIE ttys
- Remove unneeded POLLWRNORM (old bug)
- TS_ZOMBIE ttys will set POLLIN and POLLRDNORM
- Do not call selrecord in TS_ZOMBIE ttys

PR:		kern/73821
2005-04-08 21:43:25 +00:00
Scott Long b7e573dd1d MFC: Close a very small race with command hand-off. Add an extra diagnostic
to the timeout code.
2005-04-07 05:21:53 +00:00
Bruce A. Mah 04d542f8e4 MFC: SA-05:02.sendfile. 2005-04-06 00:43:16 +00:00
Colin Percival 25fc2b4860 MFC revision 1.103.
Security:	FreeBSD-SA-05:02.sendfile
2005-04-04 23:53:36 +00:00
Nate Lawson efb17144ab Use taskqueue_thread instead of swi as the latter doesn't have a context
that we can tsleep on.  This bug is not present in 5.x since we have a
real thread context there.  Suggested by jhb.

Submitted by:	Dinesh Nair (dinesh alphaque.com)
2005-04-02 06:05:30 +00:00
Bruce A. Mah 640a49bb7f MFC: SA-05:01.telnet, getaddrinfo(3) query order. 2005-04-01 05:01:29 +00:00
Colin Percival 8e18f76d87 MFC revision 1.105: If dangerous environment variables are used, check
that libraries being loaded aren't on a noexec-mounted filesystem.
2005-03-31 00:32:37 +00:00
Jacques Vidrine ac70898dec MFC src/contrib/telnet/telnet.c 1.16: Correct buffer overflows in
telnet(1).
Security: CAN-2005-0468, CAN-2005-0469
2005-03-28 15:46:58 +00:00
Kirill Ponomarev cffa6e483d MFC BSD.local.dist revision 1.114 and BSD.x11-4.dist revision 1.26:
date: 2005/03/22 18:29:41;  author: krion;  state: Exp;  lines: +4 -0
  Add mt locale directory, since more and more ports create and use it.
2005-03-25 06:36:09 +00:00
Joe Marcus Clarke f51bc5ec89 MFC: rev 1.61
Change the PATH for pkg_add to be the same used for pointyhat package builds.
This will give our users and porters a more consistent experience between
installing ports and installing packages.
2005-03-21 17:42:03 +00:00
Ruslan Ermilov 2125297d47 MFC 1.25: Fix a problem with multiple-delivery (i.e. broadcast) in ng_bridge. 2005-03-17 05:35:26 +00:00
Gleb Smirnoff 81a15714fb MFC 1.27-28:
Increase level of kernel messages logged to console from debug to warning.
2005-03-16 13:49:54 +00:00
Maxime Henrion b1fd04908b MFC if_fxp.c revision 1.224:
revision 1.224
  date: 2005/02/27 15:12:50;  author: mux;  state: Exp;  lines: +10 -10
  Fix a stupid bogon from myself, sc->revision wasn't initialized when
  testing it to know whether we should enable the 82503 serial mode...
  Move code to the right location and disallow the use of the 82503
  serial mode if the sc->revision field is 0 again.  This makes fxp(4)
  work correctly with ATMEL 350 93C46 cards (3 port 82559 based with a
  82555 PHY), as well as with the older ATMEL 220 93C46 (same flavour)
  and with the even older 10Mbps-only 82557 cards with the 82503 serial
  interface.

  Tested by:      Andre Albsmeier <[email protected]>, krion
2005-03-13 18:59:23 +00:00
Hajimu UMEMOTO b5b0aba51e MFC 1.1.1.3 (partly): NLS catclose() bug avoidance (KAJIMOTO Masato).
PR:		bin/44504
Tested by:	[email protected] (Yoshihiko Sarumaru)
2005-03-08 16:27:41 +00:00
John-Mark Gurney a75de66918 prevent a crash when the watched proc exits... This bug was inadvertantly
fixed in v1.77 on HEAD...

Prodded to investigate:	ps
2005-03-08 03:24:32 +00:00
Alexey Zelkin c05b4d7fcb MFC: rev 1.9; Respect LC_MESSAGES locale category while handling of
NLS catalogs
2005-03-07 14:03:09 +00:00
Joe Marcus Clarke af2e98c855 MFC: rev 1.8
Fix a problem in the Skinny ALG where a specially crafted packet could cause
a libalias application (e.g.  natd, ppp, etc.) to crash.  Note: Skinny support
is not enabled in natd or ppp by default.

Approved by:	nectar (secteam)
Security:	This fixes a remote DoS exploit
2005-03-06 19:59:41 +00:00
Maxime Henrion d7665cbeb8 Sync device IDs with HEAD. 2005-03-06 19:55:19 +00:00
Hideyuki KURASHINA dac0b162ee Add Japanese 4.11-RELEASE hardware notes:
(new) -> 1.2.2.1	  hardware/Makefile
  (new) -> 1.1.2.2	  hardware/Makefile.inc
  (new) -> 1.3.2.2	  hardware/alpha/Makefile
  (new) -> 1.1.2.4 	  hardware/alpha/article.sgml
  (new) -> 1.13.2.46.2.2  hardware/alpha/proc-alpha.sgml
  (new) -> 1.1.2.6	  hardware/common/artheader.sgml
  (new) -> 1.1.2.2	  hardware/common/config.sgml
  (new) -> 1.13.2.95	  hardware/common/dev.sgml
  (new) -> 1.1.2.2	  hardware/common/hw.ent
  (new) -> 1.1.2.2	  hardware/common/intro.sgml
  (new) -> 1.3.2.2	  hardware/i386/Makefile
  (new) -> 1.1.2.5	  hardware/i386/article.sgml
  (new) -> 1.1.2.4	  hardware/i386/proc-i386.sgml

Noticed by:	hrs
Submitted by:	Ryusuke Suzuki <ryusuke at nucl dot sci dot hokudai dot ac dot jp>
Reference:	[doc-jp-work 1086]
2005-03-06 15:46:04 +00:00
cvs2svn 2d9e5af41f This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2005-03-06 14:50:43 +00:00
Ruslan Ermilov 05475752ce MFC: 1.27: Pull up to ETHER_HDR_LEN before passing an mbuf to ether_input(). 2005-03-01 19:44:28 +00:00
Peter Pentchev cb3513e0b8 MFC rev. 1.13: remove the misleading documentation of the unused
'key' argument to mpool_open(3).
2005-02-27 14:06:12 +00:00
Dag-Erling Smørgrav 4298ff1370 MFC: (1.50) stop leaking connection buffers. 2005-02-23 09:52:54 +00:00
Giorgos Keramidas 6ecbb72e9d MFC rc.conf 1.236, periodic.conf 1.33:
Add a note about their respective manpages to rc.conf and periodic.conf
2005-02-22 14:24:13 +00:00
Giorgos Keramidas eb6de503e8 MFC 1.23-1.26:
- Clarify a bit the BUGS section
- Quote example file names consistently
- Various fixes (contractions, grammar, etc)
2005-02-22 14:21:13 +00:00
Gregory Neil Shapiro a92b8a7a3c MFC: Release note entry for sendmail 8.13.3 2005-02-19 17:23:02 +00:00
Gregory Neil Shapiro 9b2ca3821e MFC: Remove file no longer in 8.13.3 2005-02-19 17:21:57 +00:00
Gregory Neil Shapiro e6252dcc13 MFC: sendmail 8.13.3 2005-02-19 17:21:32 +00:00
Ruslan Ermilov 2373a251cb MFC: 1.52: Time out routes created by redirect. 2005-02-14 13:20:30 +00:00
cvs2svn d889acb5e1 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2005-02-14 02:30:02 +00:00
Diomidis Spinellis f656c2b262 MFC 1.8
PR:		bin/76374
Security: Correct hiding of arguments, such as the password, from ps(1)
2005-02-13 15:00:57 +00:00
Maxim Konovalov 6fe836974f MFC rev. 1.34: print a correct status for unix domain sockets, restore
input mode when return from the command one.
2005-02-13 12:55:36 +00:00
Maxim Konovalov 0d42dead7c MFC a bit of rev. 1.50: do not ever try to work with empty routing table.
MFC revs. 1.55 and 1.56: try to guess a buffer size for a fast growing
routing table.
2005-02-13 12:37:29 +00:00
Kirill Ponomarev 3f7c1e5be4 MFC: rev. 1.50
Introduce three new targets for ports collection:
showconfig-recursive, rmconfig-recursive and config-conditional.
2005-02-10 07:04:13 +00:00
Ruslan Ermilov a343694844 Fix disorder caused by a year being off-by-one. 2005-02-07 09:19:16 +00:00
Hiroki Sato 0c1df52ad8 Catch up with rev.1.22.2.419.2.9 in the English version and
fix some translation nits.

Submitted by:   Hiroo Ono (hiroo at oikumene dot gcd dot org)
Reviewed by:    rushani
2005-02-07 01:54:19 +00:00
Ruslan Ermilov 2edd57c5c7 MFC: A manpage for the "eiface" Netgraph node type. 2005-02-03 13:49:18 +00:00
Ruslan Ermilov e5a21b9dea MFC: New ASCII message, "getifname". 2005-02-03 13:46:06 +00:00
cvs2svn 6f3b0e0392 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2005-02-03 11:52:43 +00:00
Hajimu UMEMOTO 26586f4086 MFC 1.54: query A RR before AAAA RR. 2005-02-03 08:03:41 +00:00
Hiroki Sato ecd3387b79 Catch up with the English version:
1.1.2.126 -> 1.1.2.127	errata/article.sgml
2005-02-03 06:35:29 +00:00
Hiroki Sato 4927928f52 Remove a misleading sentence. 2005-02-03 06:33:21 +00:00
Hiroki Sato 1085cdd003 Update &release.*; entities. 2005-02-03 06:30:49 +00:00
Hiroki Sato 11b5630953 Merge the following from the English version:
1.1.2.117	-> 1.1.2.126	errata/article.sgml
	1.1.2.3		-> 1.1.2.4	relnotes/alpha/article.sgml
	1.22.2.388	-> 1.22.2.420	relnotes/common/new.sgml
	1.1.2.4		-> 1.1.2.5	relnotes/i386/article.sgml
2005-02-03 06:26:21 +00:00
Hiroki Sato 25228bfee0 - Simplify entity declarations in the preamble.
- Update copyright year.
- Trim old entries.
2005-02-03 06:22:57 +00:00
Ruslan Ermilov d16cd24e58 MFC: Bitmap of free units. 2005-02-02 16:43:17 +00:00
Ruslan Ermilov 04f389ba9c Further reduce diffs with HEAD:
- In constructor(), don't initialize if_addrhead; if_attach()
  will do it for us.

- In rcvdata(), don't try to emulate m_adj() and just let
  ether_input() do its job.

- Add support for node removal (a-la hardware detach).
2005-02-02 16:07:30 +00:00
Ruslan Ermilov 59e14f0809 MFC:
o ng_eiface.c#1.3
  Allow a changed MAC address to show up in ifconfig by changing
  it in the ifaddr list as well.

o ng_eiface.c#1.10
  Check the correct set of interface flags and fix a memory leak.

o ng_eiface.c#1.12, ng_eiface.h#1.6
  Use the (now standard) Ethernet address parse type.
2005-02-02 14:35:56 +00:00
Ruslan Ermilov 3e62b2da0e Minimize diffs to HEAD (no code changes). 2005-02-02 13:36:09 +00:00
Shunsuke Akiyama f596f5a29c MFC: rev 1.11
Add support for new chips, PL-2303X and PL-2303HX.
Bump document date.
2005-02-01 13:53:39 +00:00
Shunsuke Akiyama 30a8d4173a MFC: rev 1.26
- Add support for new chips, PL-2303X and PL-2303HX.
- Update comment about datasheet.
- Fix minor typo in sysctl variable description.
2005-02-01 13:52:51 +00:00
Hajimu UMEMOTO 7652f8b26a MFC 1.69: correct to look right interface. 2005-02-01 10:48:29 +00:00
Maxim Konovalov 3e56e1ea11 MFC rev. 1.88: FreeBSD 4.11 2005-01-31 18:50:47 +00:00
Ken Smith 711f18cd4c Add 4.11 release date (slightly off but this is what matches the entry
in RELENG_4_11).

Noticed by:	"Morgan Davis" <mdavis at dtl dot net>
2005-01-27 16:43:26 +00:00
Ruslan Ermilov e930c896e6 MFC: libpam is now standard. 2005-01-25 09:39:17 +00:00
Ruslan Ermilov 7c2795b7d8 MFC: Latest mdoc(7) fixes. 2005-01-25 09:36:25 +00:00
Robert Watson fb4cb3f0b6 Temporarily back out ipx.h:1.15.2.1, which introduced a Linux compatibility
u_int to the IPX address structure, which introduced strong alignment
requirements for the structure, which in turn caused problems for MARS.

Reported by:	"Igor B. Bykhalo" <goshik at binep dot ac dot ru>
2005-01-23 12:57:38 +00:00
Shunsuke Akiyama c8004dbdf6 MFC: revision 1.56
Fix USB serial device stalled after tcflush() was called.
2005-01-23 11:42:28 +00:00
Poul-Henning Kamp 3e74d1e2b1 Remove a check that prevents us from purging the queues on shared interrupt
lines.  This has been long gone in -current.

Nailed by:	Mike Tancsa <[email protected]>
2005-01-21 13:44:42 +00:00
Paul Saab 6caa2e8525 MFC rev 1.57: Remove 6422, V100 and add the P600.
Approved by:	re (kensmith)
2005-01-21 05:28:00 +00:00
Peter Wemm 1167a1148e Yet another pass on trying to fix the nfs statfs large-fs blocksize scaler.
Casting the result of the 64 bit division to 32 bits (thus discarding the
upper 32 bits) and then looking at the truncated result to try and figure
out if the untruncated result would fit in 32 bits was utterly useless.

I am still not sure that it is right, but it has a chance of working now.
I'm not at all sure about the sign handling.  NFSv3 only reports positive
values here, but correctness of handling the 63/64 bit signs on nfs
volumes is not a problem we'll likely have to deal with for some time. I
think the "most correct" test is for an unsigned division testing for
exceeding LONG_MAX, since we should never end up with a negative number to
compare against LONG_MIN.
2005-01-21 01:23:25 +00:00
Peter Wemm ed315ed8c7 Partial backport of 64 bit filesystem space code. In spite of the bugs
in the kernel NFS code, df itself was broken.  It tries to re-factor the
statfs blocks / blocksize into whatever the user requested.  Thus, it must
be able to report >2TB file systems correctly, which means it must deal
with 64 bit block counts.
2005-01-21 01:09:04 +00:00
Peter Pentchev b82fa1e083 Unbreak the build when Kerberos IV is *not* built - add libkafs5 to
the krb4 dependencies.

Approved by:	rwatson
2005-01-20 08:41:52 +00:00
Jeffrey Hsu 3d9b68cde4 Merge copyright changes from -current.
Approved by:	re (Ken Smith).
2005-01-19 21:19:41 +00:00
Ken Smith 0801903ffb MFC revision 1.105:
date: 2002/09/07 04:59:49;  author: peter;  state: Exp;  lines: +1 -0
  Supposedly linux has added a 6th syscall arg register (%ebp).  I am not
  100% sure if this is enough, but it will not harm anything.

This appears to fix some breakage with the emulation of linux's mmap2().
When that function became available recently the linux executables started
using it which broke installing the emulators/linux_base-8 port.

Pointer from:	akiyama
MFS after:	1 day
2005-01-18 22:11:12 +00:00
Yaroslav Tykhiy d184ab77fe MFC 1.201: Use syslog(3) instead of err(3) when a daemon.
A daemon has no stderr to send its complains to.
2005-01-18 21:56:30 +00:00
Joerg Wunsch 8b42201cf9 MFC: (rev 1.84) document the actual behaviour for displaying the `Total'
line.
2005-01-18 10:53:10 +00:00
Robert Watson b9bcee4859 Do build hprop(8) by default, as we already build hpropd(8) by default. 2005-01-17 17:36:12 +00:00
Robert Watson a73cac65a0 When building hprop, add ${KRB5DIR}/lib to the include path, as the
mit_dump.c expects to be able to include krb5/admin.h.
2005-01-17 17:35:38 +00:00
Scott Long de34f506e8 Add tap(4) to LINT
PR: kern/44260
Submitted by: Matthias Andree
2005-01-17 09:37:27 +00:00
Garrett Wollman b3034f2177 MFC IERS Bulletin C 29
Obtained from:	International Earth Rotation Service
2005-01-15 21:56:17 +00:00
David Malone 881887ac92 MFC: 1.104 of tcp_usrreq.c
when IN6P_AUTOFLOWLABEL is set, set the flowlabel on outgoing tcp
connections.
2005-01-15 15:58:17 +00:00
David Malone 66779db452 MFC of 1.61, 1.62 of tcp_syncache.c and 1.107 tcp_var.h.
The tcp syncache code was leaving the IPv6 flowlabel uninitialised
for the SYN|ACK packet and then letting in6_pcbconnect set the
flowlabel later. Arange for the syncache/syncookie code to set and
recall the flow label so that the flowlabel used for the SYN|ACK
is consistent. This is done by using some of the cookie (when tcp
cookies are enabeled) and by stashing the flowlabel in syncache.
2005-01-15 15:55:59 +00:00
Diomidis Spinellis 5e07d07a5a Correct the pbio include file location.
Noticed by:	ru
Reviewed by:	ru
2005-01-14 14:21:06 +00:00
Christian Brueffer 68e129a8d3 MFC: rev. 1.10
- list the Hama USB RS-232 Serial Adapter as supported
- bump .Dd
2005-01-14 12:27:26 +00:00
Ruslan Ermilov 80263571fb MFC: Sync with HEAD. 2005-01-14 09:55:41 +00:00
SUZUKI Shinsuke ae3a8ecbba MFC Rev. 1.71
fixed an unexpected addr/port matching failure in IPv6 SA management

PR:		kern/72393
2005-01-13 22:30:16 +00:00
Eric Anholt d7ebb07ca9 Remove and recreate with correct permissions/owner three additional X socket
directories.

Submitted by:	lesi
2005-01-13 21:50:14 +00:00
Scott Long b71645face Teach libdisk about the ipsd devices. Note: I don't like to editorilize in
commits, but libdisk is just plain lame.  Being required to teach it about
each disk device name is part of the magic folklore that is just plain
wrong.  This is one of the many many many reasons why libdisk & sysinstall
need to be thrown away and rebuilt from scratch.  No amount of tweaking
and fixing them will make them better.
2005-01-13 17:55:24 +00:00
Diomidis Spinellis b6af7ee1d2 MFC 1.16 (plug memory leak)
PR:		bin/75656
2005-01-13 08:41:36 +00:00
Hidetoshi Shimokawa f6a3a3d70d MFC rev. 1.50:
Clear PCIM_CMD_SERRESPEN and PCIM_CMD_PERRESPEN for broken hardware.
2005-01-13 07:16:20 +00:00
Scott Long 52ddd62ff1 Add the ips.4 manual page. Add minor tweaks. 2005-01-13 01:01:10 +00:00
Scott Long e94b0bf53a Put the ips driver on disk2 of the install floppies. 2005-01-13 00:55:55 +00:00
Scott Long 004bd07ee0 Allow sysinstall to see ips devices. 2005-01-13 00:54:40 +00:00
Scott Long 8f61c29eb5 Add the ips and ipsd device nodes. 2005-01-13 00:53:17 +00:00
Scott Long 1ef30832eb Add the ips driver to GENERIC and LINT. 2005-01-13 00:50:47 +00:00
Scott Long 9c85ebd9f5 Add the kernel compile glue for the ips driver. 2005-01-13 00:48:31 +00:00
Scott Long 50db01c949 Hook the ips module up. 2005-01-13 00:47:50 +00:00
Scott Long 568b459d6d Add the ips module. 2005-01-13 00:47:33 +00:00
Scott Long d29d754d65 At long last, MFC the IBM ServeRAID driver. This is a backport of the
sources from HEAD, as opposed to a forward port of the original IBM 4.x
sources.  As such, it benefits from the many reliability improvements
that have happened to the driver in HEAD.  This is a RELENG_4_11 candidate.
2005-01-13 00:46:40 +00:00
Scott Long 982b7f9882 Add the ipsd major number. 2005-01-13 00:37:02 +00:00
Ceri Davies 92d68b0145 MFC r1.17:
Add a usb category for USB PRs.

Approved by:	re (kensmith)
2005-01-12 20:07:19 +00:00
Ken Smith e5005e050d Add a period to the end of a sentence, and bump document date.
Pointy hat:	kensmith
2005-01-12 17:24:22 +00:00
Ken Smith 59cac3bcac Regen from syscalls.master v1.30.2.9. 2005-01-12 16:36:50 +00:00
Ken Smith c2e9e58b60 This is a partial MFC of the current RELENG_5 Linux emulation, which
became necessary due to the plans for using linux_base-8 for the 4.11
release.  Among other things running "/compat/linux/bin/ls -l" dumped
core because it tried to use completely non-existent system calls.  We
don't actually implement the system calls it's trying to use but we at
least need to have something in place that returns an error code.

Things being added:

  - wrapper for mmap2(2) from
        sys/compat/linux/linux_machdep.c v1.31
        sys/compat/linux/linux_dummy.c v1.35
  - add dummy entries for fadvise64(2) and *xattr(2) family of syscalls from
        sys/compat/linux/linux_dummy.c v1.37
  - add ENOATTR error code because that is what the *xattr(2) family of
    syscalls returns, which in turn required tweaking the error code
    translation table in the NFS server code[1].
  - add $FreeBSD$ token to lib/libc/gen/errlst.c so it passes pre-commit
    check script...

[1] Noticed by rwatson.

Requested by:	nectar
Reviewed by:	nectar, sobomax, re@
Tested by:	nectar, ceri
MFS after:	2 days
2005-01-12 16:34:54 +00:00
Maxime Henrion 4b068b7114 Merge if_fxp.c:1.221 from HEAD to RELENG_5:
date: 2005/01/04 19:30:14;  author: mux;  state: Exp;  lines: +1 -1
  Allow fxp(4) cards with a revision id of 0 to use the 82503 serial
  interface as well.  This is not an expected revision id per the
  datasheet, but unfortunately there are such cards out there with
  a 82557 chipset, and they want to use the 82503.

  PR:             kern/75739
  Reported by:    Andre Albsmeier <[email protected]>
2005-01-12 13:27:29 +00:00
Christian Brueffer 7b579ecc74 MFC: rev. 1.17
- add new supported chips: 82541ER and 82546GB
- change .Nd to look better (no need to mention FreeBSD there)
- bump .Dd
2005-01-12 11:21:47 +00:00
Christian Brueffer 90bbe170cb MFC: rev. 1.30
- some SATA controllers were erroneously marked as SCSI, correct that
- move those controllers into the right place
- mention that the driver supports SATA
- bump .Dd
2005-01-12 11:21:10 +00:00
Christian Brueffer ed21603e68 MFC:
- add vendor names for the MegaRAID cards, since LSI aquired
  the AMI storage devision some time ago
- bump .Dd
2005-01-12 11:20:00 +00:00
Ken Smith e3128815a1 Sync list of ftp sites with current reality. 2005-01-12 03:56:05 +00:00
Ken Smith 796ca75f44 MFC of an off-by-one fix sos made to HEAD in v1.96 of ata-chipset.c and
v1.50 of ata-lowlevel.c.  From his log message:

  Log:
  Compensate for off by one bugs in disk firmware for 48BIT addressing cutover.

Requested by:	marck
Glanced at by:	sos
MFC after:	2 days
2005-01-11 18:25:01 +00:00
Ken Smith 0a5e413878 More disc1 package set adjustments. With the shift to linux_base-8 we
got to the point there wasn't enough space to put much more than the
basic gnome2-lite/kde-lite packages on disc1 which was painful.  So
for 4.11 we're going to make a disc1-gnome and disc1-kde which allows
us to put back a bunch of packages that have been slowly stripped out
of disc1 due to size issues.  Set the environment variable PKG_WINDOW
to select which base windowing system to include, default is gnome.

MFC after: 2 days
2005-01-11 05:07:44 +00:00
Ian Dowse 25ed983af9 MFC: 1.6; When searching for a suitable block of memory on the free
list, skip blocks that are too big by a factor of two or greater.
This avoids some cases of extremely inefficient memory use that can
occur when large (e.g. 64k) blocks on the free list get used when
allocating a 4k chunk of 64-byte fragments. Because fragments have
their own free list, the 60k difference got lost forever every time.
2005-01-11 01:19:43 +00:00
Julian Elischer f085049624 MFC:
Replace the static "qdat" structure with a per-instance softc field
  in all USB ethernet drivers. The qdat structure contains a pointer
  to the interface's struct ifnet and is used to process incoming
  packets, so simultaneous use of two similar devices caused crashes
  and confusion.

PR: kern/59290
2005-01-10 23:01:35 +00:00
Alexey Zelkin 19949e7d34 MFC: rev 1.40, fix redraw of checklist box while specifiyng manual dialog
size
2005-01-10 18:17:22 +00:00
Wilko Bulte 84d8785e65 MFC:
Document slot specific location for base I/O board on AS600.

Thanks to: Charles Smeijer for getting me my AS600.
2005-01-07 21:11:08 +00:00
Wilko Bulte 99092ca1ff MFC:
Note that fdisk is not used on Alpha.
Remove outdated info on install media.

Submitted by: "William H. Magill" <[email protected]>
2005-01-07 19:45:06 +00:00
Guido van Rooij cfd2ab27b8 MFC: 1.6 (link ipnat.conf manpage)
Requested by: Hideyuki KURASHINA <[email protected]>
2005-01-07 09:18:31 +00:00
Julian Elischer b5505c5064 Remove disparaging comment. 2005-01-07 06:35:06 +00:00
Vinod Kashyap 7029cef6c0 MFC of recent changes related to the 9.1.5.2 release of twa on the 3ware website.
Reviewed by: re
Approved by: re
MFC after: 1 day
2005-01-07 01:00:46 +00:00
Maxim Konovalov b9a32fb9fa o Indent (from rev. 1.59). 2005-01-05 09:19:33 +00:00
Maxim Konovalov 3cb00801c8 o MFC a part of rev. 1.59: do not ever try to write a sparse files with
-z (compress the core dump and kernel) flag.

PR:		bin/36136
Submitted by:	Dorr H. Clark, Dmitry Frolov
2005-01-05 09:14:34 +00:00
Mike Silbersack 01e59d4dee MFC revs 1.235 and 1.264;
Improve the security of RST handling, and add a sysctl which can fall
back to the old method.
2005-01-05 08:45:43 +00:00
Kirill Ponomarev e162c760ec MFC: Remove trailing spaces. 2005-01-05 08:38:32 +00:00
Julian Elischer 8a0dbc818b Fix a comment. 2005-01-05 00:48:55 +00:00
Marius Strobl 7028a338a2 Fix a mis-merge in the MFC of rev. 1.64 in rev. 1.3.2.3; the following
change wasn't included:
- Set the CAM status to CAM_SCSI_STATUS_ERROR rather than CAM_REQ_CMP
  in case of a CHECK CONDITION.

Noticed by:	Uwe Doering <[email protected]>
2005-01-03 18:38:57 +00:00
Josef El-Rayes fae19d5cc7 MFC fixes to string modification code.
Approved by:	re
Discussed on:	re, secteam
2005-01-03 15:00:55 +00:00
Robert Watson a547ce8244 Merge ipx.h:1.18 from HEAD to RELENG_4:
date: 2004/06/22 21:46:49;  author: bms;  state: Exp;  lines: +3 -0
  Improve source-code compatibility with Linux applications using the
  IPX stack.

  PR:             kern/65217
  Submitted by:   Radim Kolar
2005-01-02 13:00:51 +00:00
Kirill Ponomarev a8f7886c9e MFC: rev 1.24
date: 2004/12/30 13:09:34;  author: krion;  state: Exp;  lines: +3 -1
    Add LOG_NTP facility.

    Submitted by:   Kurt Jaeger <pi at complx dot LF dot net>
    Approved by:    ru
    MFC after:      3 days
2005-01-02 08:53:09 +00:00
Ken Smith 58fa08508a emulators/linux_base -> emulators/linux_base-8 per kris@. 2005-01-02 08:32:57 +00:00
Doug White b0846317e4 MFC: Fix locking/better IFF_OACTIVE handling (by jmg). Correct detected RAM
sizing for 88E8001 parts.  Fix off-by-one in VPD data read.  Correct handling
of jumbo frames for Yukon based devices.

PR:		kern/75460
Committed on behalf of: bz
2005-01-02 05:27:59 +00:00
Mike Silbersack cf12f9ab09 MFC of port randomization rate-based disabling:
in_pcb.c rev 1.157
in_pcb.h rev 1.79
ip_input.c rev 1.293
ip_var.h rev 1.93

Approved by:	re
2005-01-02 01:53:44 +00:00
Christian Brueffer abcf3ccf0a MFC: rev. 1.25
- call the driver 'bktr' instead of 'brooktree' throughout the document
- add a HARDWARE section
- add a more descriptive NAME section
- update for recently imported Pinnacle PCTV support
- add Branko Lankester, the original author of the PCTV patches,
  to the AUTHORS section
- bump .Dd
2005-01-01 14:39:41 +00:00
Julian Elischer 5d4d00597a MFC:
Fix a bug where an aborted command was removed from the
queue but not from the hardware's cache of it, leading to the
hardware DMAing into "freed" memory buffers.  (leading to crashes when
a usb ransaction was timed, but but eventually happenned)
2005-01-01 10:39:36 +00:00
Maxim Sobolev 297973c870 Complete 2005 transition.
Happy New Year! :-)
2005-01-01 07:29:20 +00:00
Warner Losh 81e26f4690 MFC: 2005
Approved by: re@ (kensmith)
2004-12-31 19:16:33 +00:00
Peter Pentchev 06018667aa Fix the build: gcc 2.95 with -ansi does not like C++ // comments. 2004-12-31 12:25:54 +00:00
Ken Smith 5edfe29d85 MFC of rev 1.329 of vm_object.c:
date: 2004/07/28 18:23:08;  author: alc;  state: Exp;  lines: +2 -2
  Correct a very old error in both vm_object_madvise() (originating in
  vm/vm_object.c revision 1.88) and vm_object_sync() (originating in
  vm/vm_map.c revision 1.36): When descending a chain of backing objects,
  both use the wrong object's backing offset.  Consequently, both may
  operate on the wrong pages.

  Quoting Matt, "This could be responsible for all of the sporatic madvise
  oddness that has been reported over the years."

  Reviewed by:    Matt Dillon

Reviewed by:	alc
Helped by:	DFly vm_map.c rev 1.31, vm_object.c rev 1.17
2004-12-31 11:12:18 +00:00
Julian Elischer 20d66878df MFC:
Formatting changes and a small correction when count of companions is wrong.
Diff reduction.
2004-12-31 08:45:18 +00:00
Julian Elischer b9194a374e MFC:
Slightly reorganise part of the ohci_softintr() function
to better keep track of the total amoutn transferred during a
transfer. Seems similar to some code in the NetBSD version.
I notice they have incorporated matches from him so I don't know which
direction it went.

Submitted by:   [email protected]
Obtained from:  patches to make the ueagle driver work
2004-12-31 08:40:04 +00:00
Julian Elischer 72785df59a MFC:
Allow /sys/dev/bktr to support Pinnacle PCTV Rave cards

PR:             73669
Submitted by:   arne_woerner at yahoo dot com
2004-12-31 08:33:52 +00:00
Julian Elischer 24270727e5 MFC of some whitespace chenges.
The change in current had a real bugfix but when I merged it in to 4.x
it disappeared and only the formatting changes remained..
Oh well it's a diff reduction..
2004-12-31 08:15:19 +00:00
Julian Elischer fd31cd3345 MFC: Add support for USB Microsoft Intellimouse
Submitted by:   Matt Wright <[email protected]>
2004-12-31 07:32:13 +00:00
Tony Ackerman da522905cf Corrected a workaround that should only be applied to one adapter. Workaround
was causing device hangs when incorrectly applied to other adapters.

PR:		kern/66634
2004-12-31 00:15:36 +00:00
Tony Ackerman 168c2a2543 Added device id support for Intel 82541ER and 82546GB dual port PCIE adapter.
PR:	None
2004-12-30 22:36:54 +00:00
Julian Elischer 39332a707d Merge a fix from Dragonfly:
to quote Matt:
Fix a very serious bug in contigmalloc() which we inherited from FreeBSD-4.x.
The contigmalloc() code incorrectly assumes that a page in PQ_CACHE can
be reused without having to do any further checks and it unconditionally
busies and frees such pages, and assumes that the page becomes PQ_FREE even
though it might actually have gone to a PQ_HOLD state.  Additionally the
contigmalloc() code unconditionally sets m->object to NULL, ignoring the
fact that the page will be in the VM page bucket hash table if object
happens to not be NULL, leading to page bucket hash table corruption.

The fix is two fold.  First, we add checks for m->busy, (m->flags & PG_BUSY),
m->wire_count, and m->hold_count and do not reuse a page with any of those
set.  We do this for all pages, not just PQ_CACHE pages, though it is
believed that it only needs to be done for PQ_CACHE pages.  Second, we
replace the m->object = NULL assignment with an assertion that it is
already NULL, since it had better be NULL and we cannot just set it to NULL
unconditionally without blowing up the VM page hash table.

Symptoms of the bug include:

    * Filesystem corruption, in particular with slower disk drivers (e.g.
      like the 'twe' driver), or in systems with drivers which use
      contigmalloc() a lot (e.g. require bounce buffers).

      Mangled directory entries, bad indirect blocks (containing data instead
      of indirect block pointers), and files containing other file's data.

    * 'page not found in hash' panic.

This is the last major VM issue in DragonFly, one that has plagued in
particular David Rhodus (who is a heavy user of the 'twe' driver) for over
a year.  I would never have found this bug if not for DR's persistence and
the dozens of kernel cores he was able to provide me over the last year.  We
finally got a core with a 'smoking gun', after having written a program
(/usr/src/test/debug/vmpageinfo.c) to run through all the VM pages and check
their hash table association for correctness it became obvious that pages
were being reused without being removed from the hash table which finally
led to contigmalloc*().

Many thanks to: David Rhodus!  Free gift enclosed!
2004-12-30 22:24:43 +00:00
Christian Brueffer cd620ce8d8 MFC: rev. 1.7
Fix typos.
2004-12-30 02:54:27 +00:00
Christian Brueffer 11b9d974bf MFC: rev. 1.6 + 1.7
The ixgb(4) driver actually first appeared in 5.3 and the upcomming 4.11.
2004-12-29 16:37:19 +00:00
Maxim Sobolev 5fe5b02ecb MFC: add missed mpt(4) manpage. 2004-12-29 15:57:30 +00:00
Maxim Sobolev f9453f732f MFC: add support for FC929X. 2004-12-29 15:49:18 +00:00
Maxime Henrion 69c9ec81e3 Merge if_fxp.c:1.220 from HEAD to RELENG_4:
date: 2004/12/20 10:18:21;  author: mux;  state: Exp;  lines: +2 -2
  Only try to use the 82503 serial interface for the 82557 chipsets.  The
  datasheet says it is only valid for such chipsets and shouldn't be used
  with others.  This fixes some 82559 based cards which otherwise only
  work at 10Mbit.

  MFC after:      5 days
  Tested by:      krion
2004-12-28 22:49:24 +00:00
Maxim Konovalov f89659a324 MFC rev. 1.19: allocate an additional white space in a username column. 2004-12-27 13:22:37 +00:00
Maxim Konovalov d849b2f8ce MFC rev. 1.9: no macros for sigemptyset(3) and friends,
sigismember(3) could return -1.
2004-12-27 13:18:19 +00:00
Maxim Konovalov ddb449118a MFC rev. 1.94: add a missed "." . 2004-12-27 13:11:02 +00:00
Maxim Konovalov 27281cd4ec MFC rev. 1.27 dump.h and rev. 1.16 itime.c: do not dump core
in -W if dumpdates was not readable and ddatev == NULL; remove
unused ddates_in.
2004-12-27 12:53:30 +00:00
Maxim Konovalov b5bbb63d0d MFC revs.1.81 - 1.87: FreeBSD 4.10-RELEASE, DragonFly BSD 1.0, 6.0-CURRENT,
FreeBSD 5.3, OpenBSD 3.6, NetBSD 2.0, "FreeBSD Design and Impl." book
description.
2004-12-27 12:23:28 +00:00
Wilko Bulte d5fcd3e2bd Make LCA entry consistent with the other ones. 2004-12-27 11:28:14 +00:00
Wilko Bulte 9e65f0866f Add Alpha CPU types 10-15. 2004-12-27 11:17:39 +00:00
Wilko Bulte 37c120575b move em(4) to MI section 2004-12-24 14:02:24 +00:00
Alexey Zelkin c824ab02d9 Fix longstanding typo
PR:	misc/50370
2004-12-24 08:00:30 +00:00
Mike Silbersack 15c54e979b MFC rev 1.259; accept RSTs when our window is closed. 2004-12-23 22:07:19 +00:00
Julian Elischer 6f3875497d MFC:
Small formatting change to allow ctags to parse the file successfully.
2004-12-23 21:38:07 +00:00
Wilko Bulte b2aa261ed5 move if_em from MD to MI
approval nodded by: scottl, ru
2004-12-23 18:50:58 +00:00
Christian Brueffer 472f85bd34 MFC: rev. 1.33
Nuke ports-picobsd, it was thrown out a while ago.
2004-12-22 17:23:44 +00:00
Yaroslav Tykhiy 40ae0ea23e MFC 1.37, 1.40: Document S_* macros and more struct stat fields.
Requested by:	roam
2004-12-22 09:43:19 +00:00
Ken Smith 5acc183353 Adjust the package set on disc1 so it fits as of 4.11RC1. 2004-12-22 06:21:31 +00:00
Ken Smith 9c1b8cd053 MFC rev 1.103:
date: 2004/11/03 18:26:06;  author: kensmith;  state: Exp;  lines: +7 -0
  Update the list of package names/descriptions.

MFC after:	3 days
2004-12-22 04:45:49 +00:00
Yaroslav Tykhiy 4e99bea24b MFC 1.198:
Never emit a message to stderr: use syslog instead.
When in inetd mode, this prevents bogus messages from
appearing on the control channel.  When running as a
daemon, we shouldn't write to the terminal we used to
have at all.
2004-12-21 12:44:00 +00:00
Christian Brueffer bc0f34fe75 MFC: rev. 1.11
Properly capitalize FireWire
2004-12-20 21:43:57 +00:00
Christian Brueffer 186ee3334b MFC: rev. 1.6
- remove nonexistant "device fwohci"
- sort SYNOPSIS devices
- capitalize Ethernet
- bump .Dd
2004-12-20 21:43:18 +00:00
Christian Brueffer 45f716af41 MFC: rev. 1.4
Assorted markup, spelling, and grammar fixes.
2004-12-20 21:42:37 +00:00
Christian Brueffer 53ef57b5d5 MFC: rev. 1.5
Assorted markup, spelling, and grammar fixes.
2004-12-20 21:41:35 +00:00
Christian Brueffer 3592bc55ea MFC: rev. 1.14 - 1.16
- Properly capitalize Gigabit Ethernet.
- First update for the 5721/5750/5751 chips.
2004-12-20 20:06:26 +00:00
Paul Saab 4d878a0ee5 MFC: 5721 Support
Approved by:	re
2004-12-20 18:58:15 +00:00
Ruslan Ermilov 2f91dfe89e MFC: Sync. 2004-12-20 10:13:13 +00:00
Kirill Ponomarev 7a609a120b MFC: rev 1.48
Introduce new variables FETCHINDEX, MASTER_SITE_INDEX and add
description for MASTER_SITE_BACKUP.
2004-12-20 08:09:58 +00:00
Christian Brueffer e85c0aa544 MFC: rev. 1.6
Remove clauses 3 and 4 of the license.
2004-12-19 10:36:12 +00:00
Ken Smith d784ed8488 Uncomment entries under the "not found in doc-common" section.
Thanks to:	jkoshy
Requested by:	ru
2004-12-19 05:02:05 +00:00
cvs2svn 6d9eff8b1e This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-12-18 19:12:07 +00:00
Gleb Smirnoff 4a8b975a4d MFC 1.32:
Note that send(2) is no longer applicable to divert(4) sockets.
2004-12-18 09:26:37 +00:00
Ken Smith 47b516386e Add 4.11 to the releases not found in doc-common.
Requested by:	ru
2004-12-18 01:11:33 +00:00
Boris Popov a320e6f34d Initialize olen value and use size_t type where necessary.
PR:		kern/70236
Approved by:	re
2004-12-17 12:55:52 +00:00
Ken Smith fc83953d68 Bump __FreeBSD_version for RELENG_4 to mark beginning of 4.11-STABLE.
Approved by:	re (implicit)
2004-12-17 06:41:35 +00:00
Ken Smith 33901cd56f The branch for RELENG_4_11 has happened so RELENG_4 shifts to being
called -STABLE, though note it's in a 'transition' period (we haven't
done the release...).

Approved by:	re (implicit)
2004-12-17 06:32:12 +00:00
Ken Smith dd175fc8c4 Change version to 4.11 in preparation for RELENG_4_11 branch.
Approved by:	re (implicit)
2004-12-17 04:35:57 +00:00
Ken Smith f40996fdf5 Change version to 4.11 in preparation for branching of RELENG_4_11.
Approved by:	re (implicit)
2004-12-17 04:33:43 +00:00
Darren Reed 639336d2b8 Allow ipnat redirect rules to work for non-TCP/UDP packets.
PR:		70038
Submitted by:	[email protected]
Reviewed by:	darrenr
Approved by:	re(kensmith)
Obtained from:	[email protected]
2004-12-17 02:24:30 +00:00
Darren Reed f93ab8566e Synchronise all of the files in src/contrib/ipfilter/ with those in
src/sys/contrib/ipfilter/netinet where the correct versions are located.

PR:		70492, 73580
Approved by:	re(kensmith)
2004-12-16 20:48:06 +00:00
Darren Reed 1117cf8f7d Using just m_pullup to get all of the interesting bits in packet into one
buffer doesn't work for ipv6 packets, so use m_defrag() here instead as an
easy drop-in replacement.

PR:		kern/70399
Submitted by:	[email protected]
Reviewed by:	darrenr
Approved by:	re(kensmith)
Obtained from:	[email protected]
2004-12-16 20:43:51 +00:00
Roman Kurakin 952ffd27cd MFC -j 1.16 -j 1.17:
revision 1.17
	date: 2004/12/14 23:13:08;  author: rik;  state: Exp;  lines: +1 -1
	Bring back ability to use FR support with sppp from Cronyx.

Approved by:	re (kensmith)
2004-12-16 19:26:15 +00:00
Wilko Bulte 15a11c7ee3 Document floppy brokennes on DS10-class Alphas.
Approved by: re (kensmith) / blanket
2004-12-15 22:10:31 +00:00
Yaroslav Tykhiy 140ea6d917 MFC: Make popen(3) thread-safe for libc_r.
Submitted by:	marck
Approved by:	re (kensmith)
2004-12-15 12:39:52 +00:00
Ken Smith 592b3f06d6 Attempt #2 at fixing boot floppies. Move NFS back into kernel to solve
current problem of mfsroot.flp overflowing (note to self: can't speed up
test release builds for boot floppy sizes by using NODOC=).  Address
original problem by removing sa (SCSI tape) and pass (SCSI passthrough)
devices.

Approved by:	re (scottl)
Pointy hat:	kensmith
2004-12-15 07:23:46 +00:00
Hiroki Sato dac0d4e120 Update &release.manpath.*;.
Pointed out by:	rik
2004-12-13 20:30:25 +00:00
Roman Kurakin fc55f827c3 Add Tau-PCI-L(/R) entry to the list of supported hardware by cp(4). 2004-12-13 19:55:06 +00:00
Marius Strobl baec73815e - MFC:
lib/Makefile 1.155
  libexec/Makefile 1.57
  usr.bin/Makefile 1.234 (partly), 1.235

  Build non-crypto telnet(1) and telnetd(8) if NO_OPENSSL is defined.

- Replace the check for the non-existence of src/secure and src/kerberosIV
  with a check for the non-existence of src/crypto only. This is to bring
  these checks in line with the demise of the NOSECURE knob and because
  if src/crypto doesn't exist we won't build any crypto stuff including
  not Kerberos IV (and also not Kerberos 5 for that matter).
  Note: On HEAD all these checks for the existence of crypto sources even
  have been completely removed.

Discussed with:	ru (some months ago)
Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago)
2004-12-13 14:10:30 +00:00
Marius Strobl 3d6414cf57 Add a note that MAKE_KERBEROS4 and MAKE_KERBEROS5 depend on OpenSSL
(and therefore must not be used together with NOCRYPT or NO_OPENSSL).

Corresponds to:
share/man/man5/make.conf.5 1.73
share/examples/etc/make.conf 1.216

Reviewed by:	ru (some months ago)
2004-12-13 14:03:52 +00:00
Marius Strobl 017b126fef MFC: 1.362
Unbreak world build if NO_OPENSSL is defined but MAKE_KERBEROS4 or
MAKE_KERBEROS5 are.

Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago)
2004-12-13 13:58:43 +00:00
Marius Strobl f60b09ba5c MFC:
Makefile.inc1 1.361
bin/ed/Makefile 1.22
lib/Makefile 1.157
lib/libcrypt/Makefile 1.31
lib/libfetch/Makefile 1.41
lib/libpam/modules/modules.inc 1.17
libexec/Makefile 1.61
share/examples/etc/make.conf 1.215
share/man/man5/make.conf.5 1.73
usr.bin/Makefile 1.239
usr.bin/fetch/Makefile 1.14
usr.sbin/pkg_install/Makefile 1.14
usr.sbin/pkg_install/add/Makefile 1.17
usr.sbin/pkg_install/info/Makefile 1.17
usr.sbin/pkg_install/version/Makefile 1.12
usr.sbin/ppp/Makefile 1.95, 1.96
usr.sbin/pppd/Makefile 1.25
usr.sbin/sendmail/Makefile 1.40
usr.sbin/tcpdump/tcpdump/Makefile 1.36

Retire the useless NOSECURE knob.

The motivation for this MFC is that MAKE_KERBEROS4 and MAKE_KERBEROS5
are meant to be buildable by various makefiles when NOSECURE is set but
this was broken because Kerberos depends on e.g. des(3) from OpenSSL
which wasn't built when NOSECURE was defined. Fixing the NOSECURE knob
however would have meant to make it do the same as the NOCRYPT knob.
If you had been using the NOSECURE build knob please now use the NOCRYPT
knob instead.

Discussed with:	ru (some months ago)
Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago), kensmith (re)
2004-12-13 13:50:02 +00:00
Stephen McKay ff100f6701 Unfortunately, abs() is not always available, since in 4.x it is magically
supplied by the compiler and LINT is compiled with -no-builtin.  Fix this
by defining abs() as a macro.

Another pointy hat for my collection...

Pointed out by: tinderbox, glebius, and ken.
2004-12-13 01:59:28 +00:00
Marius Strobl 7de2b6b273 MFC:
Remove GNU patch(1) sources unused since FreeBSD moved back to the
patch(1) sources in src/gnu/usr.bin/patch nearly seven years ago.
2004-12-13 00:32:48 +00:00
Marius Strobl 4e1a5051d4 MFC whois.c:
1.42: Add a -k flag for querying whois.krnic.net (the National Internet
      Development Agency of Korea) which hold details of IP address
      allocations within Korea.

MFC whois.1:
1.33: Add a -k flag for querying whois.krnic.net (the National Internet
      Development Agency of Korea) which hold details of IP address
      allocations within Korea.
1.34: Bump document date.

Short MFC interval to get this into RELENG_4 before the freeze for
FreeBSD 4.11.

MFC ok'ed by:	ceri
2004-12-12 23:53:50 +00:00
Scott Mitchell b5f2202a20 MFC: Add xe(4) manpage to 4.x
Approved by:	imp (mentor)
2004-12-12 23:50:44 +00:00
Scott Mitchell ea7dfe9255 MFC: rest of r1.267 - Add Xircom CEM28 and CEM33 cards.
Approved by:	imp (mentor)
2004-12-12 23:46:25 +00:00
Marius Strobl 30e7aee611 MFC whois.c:
1.29: Mark a function as __printflike().
1.30: Leave the `copyright' variable exposed, since the main purpose of
      it is to put a copyright in the object file.
1.35: Add support for identifying NORID (norwegian top level registry)
      handles.
1.38: Add whois.iana.org to the whois(1) utility, under the -I option.
1.39: Add whois.abuse.net to whois(1).
1.40: Add -b to usage.
1.41: Add special case for the german whois nameserver.

MFC whois.1:
1.29: mdoc(7) police: markup polishing.
1.30: Add whois.iana.org to the whois(1) utility, under the -I option.
1.31: Date bump.
1.32: Add whois.abuse.net to whois(1).
2004-12-12 23:02:45 +00:00
Marius Strobl f84262dc00 MFC: 1.64
- Set the CAM status to CAM_SCSI_STATUS_ERROR rather than CAM_REQ_CMP
  in case of a CHECK CONDITION.
- Make this driver return SCSI status information.
- While here, factor out the clearing of the CAM status from every
  element of the switch statement to only once before the switch.

MFC ok'ed by:	scottl (some months ago)
2004-12-12 22:23:10 +00:00
Brooks Davis 1a7e6820ce s/do_no_use/do_not_use/
Reported by:	ceri
Pointy hat to:	brooks
2004-12-12 21:08:33 +00:00
Brooks Davis 5f2f58bf80 MFC the addition of ifi_datalen to struct if_data and ifconfig support
for it.  The change to struct if_data differs slightly from the one in
5.3 in that a pad is added after ifi_xmitquota rather then adding
ifi_link_state before ifi_recvquota.  This is necessicary to maintain
the 4.x ABI.
2004-12-12 20:12:50 +00:00
Archie Cobbs 7eeeb757be MFC: (1.52) Disable protocol field compression on inner frame when compressing. 2004-12-12 19:37:52 +00:00
Gregory Neil Shapiro bf31515632 MFC: Enable _FFR_DEAL_WITH_ERROR_SSL to deal with OpenSSL error returns of 0.
PR:	bin/73105

     Revision  Changes    Path
     1.48      +1 -1      src/usr.sbin/sendmail/Makefile
2004-12-12 18:59:26 +00:00
Wilko Bulte 95e682dad3 Alpha needs to get USB ethernet devices out of BOOTMFS, so the newly
added axe(4) needs to be here as well.

<quote>
# USB support
# (if you add any USB devices to this list, they must be added to the Alpha

#  section of src/release/scripts/dokern.sh)
# USB Ethernet
</quote>

Forgotten by: rsm :-)
2004-12-12 18:51:39 +00:00
Shunsuke Akiyama a2e85ec8b5 Hook up bfe.4 man page. 2004-12-12 14:05:28 +00:00
Roman Kurakin ac1daac5ba MFC:
----------------------------
	revision 1.25
	date: 2004/07/07 19:36:12;  author: simon;  state: Exp;  lines: +20 -1
	Add a HARDWARE section.

	For cx(4) this was based on information from the Hardware Notes.

	OK'ed by:	rik
2004-12-12 13:27:23 +00:00
Roman Kurakin cdf457c9a1 MFC:
----------------------------
	revision 1.5
	date: 2004/09/05 22:09:53;  author: simon;  state: Exp;  lines: +16 -1
	Add a HARDWARE section which lists supported devices based on the
	Hardware Notes.

	MFC after:	3 days
2004-12-12 13:26:26 +00:00
Roman Kurakin 3bf0facda9 MFC:
Add Tau-PCI-L(/R) to list of supported hardware.
2004-12-12 12:29:39 +00:00
Roman Kurakin acb4e4179e MFC:
Add support for Tau-PCI/E3 rev. B
	Add support for Tau-PCI-L.
2004-12-12 11:38:05 +00:00
Mike Silbersack 46c635c8a5 Disable port randomization for now; it causes problems in some high speed
proxying applications.  Modified methods of randomization which should
solve this problem are being worked on, and will hopefully make it in
before 4.11-release.

This commit simply changes the default sysctl setting, it does not remove
or change the randomization feature in any way.
2004-12-12 04:40:11 +00:00
Stephen McKay befb53bc35 Merge from, um, oblivion: vinumvar.h 1.49, vinumrequest.c 1.73
When doing round-robin reads from a multi-plex volume, only switch to the
    next plex if the sector to be read isn't nearby the last read sector.

    Submitted by:  Vsevolod Lobko <[email protected]> via ru@

Not only does this boost multi-access performance, but surprisingly it helps
single process sequential reads on my IDE disk mirror.  My guess is that the
read-a-block skip-a-block read-a-block effect of strict round-robin defeats
some sort of on-disk caching, leading to poor performance.  With this patch,
longer contiguous reads from a single disk are more common.

/sbin/vinum needs to be rebuilt as this patch changes the size of struct plex.

OK'd by: grog
2004-12-12 04:10:51 +00:00
Ken Smith a12c5ccf61 Spell "filesystem" correctly both in the place I had copied it to and
the place I had copied it from.

Caught by:	ru
2004-12-12 02:19:58 +00:00
Scott Mitchell da2c889668 MFC: part of r1.267 - Add Xircom XEM5600 card.
Approved by:	imp (mentor)
2004-12-11 23:29:14 +00:00
Scott Mitchell 255430b096 MFC: r1.271 - Add Intel EtherExpress PRO/100 LAN/Modem card.
PR:		53027
Submitted by:	John Merryweather Cooper <coop9211 at uidaho dot edu>
Approved by:	imp (mentor)
2004-12-11 23:23:02 +00:00
Scott Mitchell 009c6816c0 MFC: r1.19 - clean up resources when attach fails.
PR:		kern/34306
Submitted by:	gibbs
Approved by:	gibbs, imp (mentor)
2004-12-11 23:20:23 +00:00
Gleb Smirnoff 09ed676473 MFC:
Make route caching optional and disabled by default.

Approved by:	re (kensmith)
2004-12-11 20:39:12 +00:00
Wilko Bulte 72021241cb Alpha can use 1 or 2 Gbyte of physical RAM max.
Approved by: re (kensmith) - blanket
2004-12-11 20:28:14 +00:00
Alexander Nedotsukov 39adb0385e MFC: 1.21
Fix -t option processing.
Partially initialized tm structure was passed into mktime(3).

Approved by:	ru
2004-12-11 17:16:45 +00:00
Xin LI f6d3442de8 MFC 1.7: Correct two bugs that may result in incorrect CBCP response for
administrator specified number.
2004-12-11 11:23:56 +00:00
Jeffrey Hsu de9bbd1231 Merge rev 1.104 from current:
date: 2004/08/03 02:01:44;  author: hsu;  state: Exp;  lines: +1 -1
  Fix bug with tracking the previous element in a list.

  Found by:       [email protected]
  Submitted by:   [email protected]
2004-12-11 08:58:15 +00:00
Ken Smith 078d489abe The kern.flp floppy was, as usual, overflowing. Moving NFS out of the
kernel on the boot floppy and into the mfsroot.flp floppy as a module
seems to solve the space problem and doesn't break the install.
2004-12-11 03:16:53 +00:00
Ken Smith 9d19e1fc9b Add in some processing of the cvsbug script that has been done in the
past.  I think it got missed in the last cvs import.

Approved by:	peter
2004-12-10 18:19:19 +00:00
Yaroslav Tykhiy 02dc26bbbc MFC 1.24:
Fix off-by-one errors and potential buffer overruns
in handling file and link names that reach the allowed
maximum for old tar and ustar archive formats.
2004-12-10 15:38:36 +00:00
cvs2svn aeb7c8bf0c This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-12-09 23:13:19 +00:00
Scott Mitchell 5e8ee2104c MFC axe(4) manpage.
Approved by:	imp (mentor)
2004-12-09 00:16:13 +00:00
Scott Mitchell 8b8c0ecc55 Attach if_axe to the build.
Reviewed by:	iedowse
Approved by:	imp (mentor), re
2004-12-08 22:33:11 +00:00
Scott Mitchell ba6a372623 MFC if_axe USB 2.0 Ethernet driver
Submitted by:	Barry Bouwsma <freebsd-misuser at dyndns dot dk>
Reviewed by:	iedowse
Approved by:	imp (mentor), re
2004-12-08 22:17:28 +00:00
Scott Mitchell 919cf7713e Sync to 1.11.2.67 of usbdevs
Reviewed by:	iedowse
Approved by:	imp (mentor), re
2004-12-08 22:15:06 +00:00
Scott Mitchell ab09063bdb MFC Sitecom LN029 and System TALKS SGC-X2UL USB 2.0 Ethernet adapters, for
if_axe driver.

Reviewed by:	iedowse
Approved by:	imp (mentor), re
2004-12-08 22:11:11 +00:00
cvs2svn e540c83c5d This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-12-08 22:02:59 +00:00
Mark Peek a68f3e37e4 MFC v1.23: Add new PCI device ID for PERC4/DI. 2004-12-08 18:53:23 +00:00
David Malone 009a640b3e Sync with -current (except interface renaming changes):
1) Man page updates.
2) Update from KAME.
3) -n flag
2004-12-08 12:18:57 +00:00
David Malone c1f481dc2e Sync with -current:
1) Fix a typo in a comment.
2) Merge macros that abstract locking and memory allocation.
3) Use the right bit of constant data when finishing hashing the name.
2004-12-08 11:54:13 +00:00
Julian Elischer 5f894ea0fa Hey that wasn't suppposed to be ther yet either.
Revert part of MFC that is not supposed to come over yet.
2004-12-08 08:52:30 +00:00
Julian Elischer 59d2a4939b Oops that wasn't supposed to be in there..
revert part of previous MFC that snuck in..
2004-12-08 08:44:42 +00:00
Julian Elischer cfd1541b83 MFC miscellaneous changes from NetBSD 2004-12-08 08:22:05 +00:00
Julian Elischer 376b93cd23 MFC a slight API change to allow callers to learn the size
of the string descriptor loaded.
2004-12-08 07:55:48 +00:00
Julian Elischer d5da8444da MFC a change to allow us to open some devices that are a little
confused..
2004-12-07 21:41:41 +00:00
Wilko Bulte 161a873ca1 Nice idea, but no cigar: bge(4) makes the bootfloppy overflow, so loose
it from GENERIC again :-(
2004-12-07 17:52:54 +00:00
Roman Kurakin 12c433d00f MFC -j 1.29 -j 1.30, -j 1.34 -j 1.35
----------------------------
	revision 1.35
	date: 2004/12/03 16:57:15;  author: rik;  state: Exp;  lines: +4 -2
	Don not call pp_down()/pp_up() form XX_tlf()/XX_tls() in non PPP mode
	to privent running of PPP's state machine in non PPP mode.

	MFC: after 3 days.
	----------------------------
	revision 1.30
	date: 2004/08/13 12:35:52;  author: rik;  state: Exp;  lines: +6 -6
	branches:  1.30.2;
	Fix resource check while autodetection.
2004-12-07 16:47:06 +00:00
Roman Kurakin fa8d4a9c2a MFC -j 1.13 -j 1.14, -j 1.16 -j 1.17:
----------------------------
	revision 1.17
	date: 2004/12/03 16:57:15;  author: rik;  state: Exp;  lines: +4 -2
	Don not call pp_down()/pp_up() form XX_tlf()/XX_tls() in non PPP mode
	to privent running of PPP's state machine in non PPP mode.

	MFC: after 3 days.
	----------------------------
	revision 1.14
	date: 2004/08/13 12:35:52;  author: rik;  state: Exp;  lines: +6 -6
	branches:  1.14.2;
	Fix resource check while autodetection.
2004-12-07 16:44:53 +00:00
Roman Kurakin 6dcb2d80b7 MFC -j 1.13 -j 1.14:
----------------------------
	revision 1.14
	date: 2004/12/03 16:57:15;  author: rik;  state: Exp;  lines: +4 -2
	Don not call pp_down()/pp_up() form XX_tlf()/XX_tls() in non PPP mode
	to privent running of PPP's state machine in non PPP mode.

	MFC: after 3 days.
2004-12-07 16:42:11 +00:00
Kris Kennaway 2eb5fda4ca MFC: Add more commonly-used locale directories 2004-12-07 02:54:17 +00:00
Ken Smith c1b70db5e1 We're one week away from code freeze for the 4.11 release cycle. Bump
the version now as a heads-up to users because this week typically means
increased developer activity and the branch is a tiny bit more volatile
than "usual".
2004-12-06 14:39:44 +00:00
Olivier Houchard c7c3bc6980 MFC rev 1.5 and 1.6
r1.5: Note we now support the DC395U2W cards.
r1.6: Change the HARDWARE section to have the same style as in the other
FreeBSD section 4 manual pages.
2004-12-04 14:41:51 +00:00
Olivier Houchard eafc0f956f MFC the current state of the trm(4) driver. It notably adds support for the
DC395U2W adapters, and should fix panics/hangs under heavy load.

Reported and tested by: jmz
2004-12-04 14:41:37 +00:00
Roman Kurakin 690cc0d20f MFC (1.4-1.6):
revision 1.6
	date: 2004/11/29 15:32:31;  author: rik;  state: Exp;  lines: +1 -1
	Fix typo.

	Submitted by:   Janusz Muc'ka (Defacto) <gdef at cvd dot pl>
	MFC after:      3 days
	----------------------------
	revision 1.5
	date: 2004/05/20 16:40:06;  author: ru;  state: Exp;  lines: +293 -261
	branches:  1.5.2;
	Clean up language.

	Reviewed by:    rik
	----------------------------
	revision 1.4
	date: 2004/05/18 07:23:37;  author: ru;  state: Exp;  lines: +389 -269
	Markup overhaul.
2004-12-03 11:54:35 +00:00
Garrett Wollman 54d25fc02d MFC: new Argentina zoneinfo directory
Pointed out by:	kensmith
Pointy hat to:	wollman
2004-12-03 04:54:52 +00:00
Garrett Wollman 63ee143dd1 MFC tzdata2004e and 2004g. This is likely to be the last update of
tzdata on the 4-STABLE branch.  For ongoing maintenance, users should
be aware that compiled zoneinfo formats are compatible across all
platforms and all versions of FreeBSD.
2004-12-02 23:16:39 +00:00
Garrett Wollman be06288d86 MFC rev. 1.13 (newsletters V-9 and V-10), required for update of
timezone database.
2004-12-02 23:13:46 +00:00
Wilko Bulte 0c165b22e6 Add bge(4) as it has proved itself on Alpha.
Tested using: the gigE switch donated by DS
2004-12-02 19:06:43 +00:00
Christian Brueffer 5b62335a5e MFC: rev. 1.13
Re-formulate the first sentence for better readability
2004-12-02 02:07:12 +00:00
Christian Brueffer 54ab6db2ab MFC:
Xref polling.4 and bump .Dd
2004-12-02 02:01:37 +00:00
Colin Percival 37228edef3 FreeBSD-SA-04:17.procfs:
MFC (in the spirit of) revision 1.54 of
src/sys/fs/procfs/procfs_status.c

Approved by: so (nectar)
2004-12-01 21:33:57 +00:00
Gleb Smirnoff 124cdcc090 MFC 1.110:
- Since divert protocol is not connection oriented, remove SS_ISCONNECTED flag
  from divert sockets.
- Remove div_disconnect() method, since it shouldn't be called now.
- Remove div_abort() method. It was never called directly, since protocol
  doesn't have listen queue. It was called only from div_disconnect(),
  which is removed now.
2004-12-01 11:16:04 +00:00
Hidetoshi Shimokawa 5d2ed95fb3 MFC: Fix malloc type in free(). 2004-12-01 06:55:47 +00:00
Ceri Davies d8aaa247eb MFC r1.25:
Allow the -f argument to work.

  PR:		bin/73229
  Submitted by:	Irina Liakh <spell at itl dot ua>
2004-11-28 17:51:05 +00:00
Ken Smith b14633d38a Remove single-quotes from around version number, it breaks scripts that
parse the version number.

Approved by:	peter
2004-11-28 02:25:20 +00:00
Simon L. B. Nielsen 9a085daa1d MFC 1.46+1.47:
- Document the DISABLE_VULNERABILITIES knob.
- Don't say this manual page is too long, it's not that long.
- s/man page/manual page/g
- Bump document date.
2004-11-27 15:05:27 +00:00
Julian Elischer 2ebe307886 Apply a patch from Scott Mitchel to allow these devices to work
properly again. This is not a perfect fix but since this is only for 4.x
the 'not-goodness' of the patch will remain within this branch and should
never propogate..  "good enough for government work" as we say
in Australia.

PR:	69319
Submitted by:	scott+freebsd at fishballoon dot org
2004-11-26 00:34:20 +00:00
Simon L. B. Nielsen ebb8435c33 MFC 1.231:
Only write the rc.conf header when a new rc.conf is written.

Approved by:	trhodes
2004-11-25 22:54:04 +00:00
Yaroslav Tykhiy 0a03b46110 MFC:
ftpd.c   1.185  '\n' needs not to appear in reply() strings.

ftpd.c   1.186  Fix perror_reply() vs. reply() usage.
ftpcmd.y 1.62   ---"---
2004-11-25 10:38:07 +00:00
Julian Elischer 828352a9c9 MFC: Fix just the worst of the known timeout race conditions.
ehci.c 1.20
 uhci.c 1.159
 ohci.c 1.147
2004-11-24 19:04:30 +00:00
Julian Elischer d5ab398e13 MFC: recent USB2/EHCI related changes from NetBSD
ehci.c 1.16
  uhub.c 1.64
  usb_subr.c 1.73
  usbdivar.h 1.42
2004-11-24 18:55:46 +00:00
Julian Elischer f2f1e2b3da MFC 1.15 State saving under suspension conditions.
Dissabled under ifdefs as I can not test it fully, but diff
 reduction to allow further MFCs to be done easier.
2004-11-24 18:32:34 +00:00
Julian Elischer eb8290a4c3 MFC 1.14
Diff reduction to -current.
 MFC the detach code but do not turn it on as I cannot test it
 properly.  From iedowse and NetBSD
2004-11-24 18:26:53 +00:00
Julian Elischer 9bbedfce10 MFC support for interrupt pipes and better BIOS handover.
MFC: ehci.c rev 1.13 amd ehcivar.h 1.5
2004-11-24 18:10:44 +00:00
Julian Elischer 42c45a8785 MFC cleanups and such up to version 1.11
From NetBSD via -current
2004-11-24 18:02:22 +00:00
Julian Elischer a27b01c007 MFC: Some changes from NetBSD via -current Version 1.7
fixes a few toggle problems and cleans up some code and commenrts.
More to come.
2004-11-24 17:57:05 +00:00
Julian Elischer 943645ac3f MFC: add an extra device ID 2004-11-24 17:43:48 +00:00
Alexander Kabaev b0089b9824 Make the life of those who is stuck debugging multithreaded programs on 4.x
little easier. Teach gdb how to look for thread info in core files. This
allows for more detailed post-mortem analysis of crashed programs as users
should now be able to use standard gdb commands to list all threads running
in the program at the time of the crash and switch between them to look at
their backtraces and inspect their frames.

Allow gdb to cleanly detach multithreaded programs.

Tested by:	jhb
Approved by:	obrien
2004-11-22 19:09:02 +00:00
Giorgos Keramidas 5aabc8e551 MFC 1.23: Correctly document the return value of strerror() and
strerror_r() and the contents of the returned buffer for unknown
error codes.
2004-11-20 00:03:28 +00:00
Xin LI 05e94b0ac6 MFC 1.5:
Correct a potential DoS vulnerability, as described at

http://www.securityfocus.com/archive/1/379450
2004-11-18 15:21:41 +00:00
Colin Percival 7cc508c0c6 FreeBSD-SA-04:16.fetch:
MFC revision 1.75 of src/usr.bin/fetch/fetch.c
2004-11-18 12:02:29 +00:00
Simon L. B. Nielsen 148721d90b MFC v. 1.224:
Workaround a problem with Postfix MTA selection code when installing via
FTP by hard-coding the Postfix major and minor revision (for the current
stable version).

Approved by:	trhodes
2004-11-16 22:13:58 +00:00
Paul Saab 29cc66260f Bump __FreeBSD_version for VM fix dealing with unwiring of fictitious
pages.
2004-11-16 20:51:45 +00:00
Paul Saab fad00f014e MFC:
>alc         2004/05/21 21:53:52 PDT
>
>  FreeBSD src repository
>
>  Modified files:
>    sys/vm               vm_extern.h vm_fault.c vm_map.c vm_page.c
>  Log:
>    To date, unwiring a fictitious page has produced a panic.  The reason
>    being that PHYS_TO_VM_PAGE() returns the wrong vm_page for fictitious
>    pages but unwiring uses PHYS_TO_VM_PAGE().  The resulting panic
>    reported an unexpected wired count.  Rather than attempting to fix
>    PHYS_TO_VM_PAGE(), this fix takes advantage of the properties of
>    fictitious pages.  Specifically, fictitious pages will never be
>    completely unwired.  Therefore, we can keep a fictitious page's wired
>    count forever set to one and thereby avoid the use of
>    PHYS_TO_VM_PAGE() when we know that we're working with a fictitious
>    page, just not which one.
>
>    In collaboration with: green@, tegge@
>    PR: kern/29915

Reviewed by:	alc
2004-11-16 19:48:09 +00:00
Paul Saab 066419b6b8 MFC: Support for the 5750/5751 2004-11-16 19:32:16 +00:00
Simon L. B. Nielsen 3331c02999 Very late MFC of v. 1.15:
Note that the D-Link 530-TXS also works with the ste(4) driver.
2004-11-15 23:38:48 +00:00
Ruslan Ermilov 2b3a8ec394 MFC: 1.79: Pacify gcc -Wundef. 2004-11-15 22:11:08 +00:00
Simon L. B. Nielsen 159eb62532 MFC 1.8: Fix typo. 2004-11-15 21:03:14 +00:00
Yaroslav Tykhiy b4af411577 MFC rev. 1.169, 1.175: Fixes related to logxfer(). 2004-11-13 12:44:12 +00:00
Yaroslav Tykhiy 41450ebc83 MFC rev. 1.166-1.168: Assorted fixes around the call to sendfile(2). 2004-11-13 12:28:50 +00:00
Julian Elischer 4f7eab5fd4 Apparently update_intr_masks() is only on x86 2004-11-12 20:33:13 +00:00
Julian Elischer 2f2c7518e2 Add a bandaid to help use devices that use the tty system with usb.
This makes teh two systems disable each other's interrupts
while they are operating together.
It's not perfect as it doesn't fully cover dynamic devices
and teh effect is not reversible, but it is similar to the hack we have
been doing for ywars with slip and ppp.

Submitted by: lost the email.
2004-11-11 22:59:26 +00:00
Maxim Konovalov 06de3e925e MFC rev. 1.160: kill an unused variable.
MFC rev. 1.164, 1.165: do not unconditionally fork() after accept().
2004-11-10 12:56:33 +00:00
Yaroslav Tykhiy 923db67e06 MFC: Fix a typo: sc = ns*nt, not nc*nt. 2004-11-09 18:06:06 +00:00
Ceri Davies 4e190c8a3a MFC r1.36:
Use a safe temporary file for saving out the PR if send-pr is
  interrupted.
2004-11-09 00:22:24 +00:00
Pawel Jakub Dawidek 3121ace36a Fix 'show' command for pipes and queues.
PR:		bin/70311
Submitted by:	Pawel Malachowski <[email protected]>
2004-11-08 18:47:11 +00:00
Don Lewis ff8cabbf9e MFC dir.c:1.30, fsck.h:1.33, fsutil.c:1.25, inode.c:1.37, main.c:1.42,
pass1.c:1.43, pass2.c:1.26, pass3.c:1.15, pass4.c:1.15, pass5.c:1.4
    with minor changes to match RELENG_4 code.

> truckman    2004-10-08 20:44:48 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     sbin/fsck_ffs        dir.c fsck.h fsutil.c inode.c main.c
>                          pass1.c pass2.c pass3.c pass4.c pass5.c
>   Log:
>   Eliminate linked list used to track inodes with an initial link
>   count of zero and instead encode this information in the inode state.
>   Pass 4 performed a linear search of this list for each inode in
>   the file system, which performs poorly if the list is long.
>
>   Reviewed by:    sam & keramida (an earlier version of the patch), mckusick
>   MFC after:      1 month
>
>   Revision  Changes    Path
>   1.30      +2 -3      src/sbin/fsck_ffs/dir.c
>   1.33      +15 -15    src/sbin/fsck_ffs/fsck.h
>   1.25      +1 -3      src/sbin/fsck_ffs/fsutil.c
>   1.37      +2 -0      src/sbin/fsck_ffs/inode.c
>   1.42      +0 -8      src/sbin/fsck_ffs/main.c
>   1.43      +5 -16     src/sbin/fsck_ffs/pass1.c
>   1.26      +5 -1      src/sbin/fsck_ffs/pass2.c
>   1.15      +3 -3      src/sbin/fsck_ffs/pass3.c
>   1.15      +8 -11     src/sbin/fsck_ffs/pass4.c
>   1.40      +2 -0      src/sbin/fsck_ffs/pass5.c

Tested by:	scrappy
2004-11-08 08:21:02 +00:00
Archie Cobbs 1f091c7835 MFC: (rev. 1.7) Rename internal structure to fix cut & paste error. 2004-11-06 21:43:16 +00:00
Peter Pentchev d7e49c4669 Correct the instructions for automated X setup: use 'configXSetup' instead
of 'configXEnvironment', and add 'configXDesktop'.

Not applicable to 5.x or 6.x, since the X configuration stuff has been
ripped out of sysinstall(8) there.

PR:		62665
Submitted by:	makham <[email protected]>
2004-11-05 18:09:19 +00:00
Wilko Bulte dfd8bdf5d3 Never be afraid to try something new. Remember, amateurs built the ark.
Professionals built the Titanic.
2004-11-02 10:26:17 +00:00
David Malone a069dcffa1 MFC: use nanoseconds in time comparison. 2004-10-30 20:45:45 +00:00
David Malone fb2d6e02b2 Sync with current execpt for the USE_RFC2292BIS option. Includes -I option
(use ICMP), endianness hiding, man page updates and various other cleanups.
2004-10-30 20:29:49 +00:00
Bruce M Simpson 9c06b5aeb5 MFC r1.131:
Check that rt_mask(rt) is non-NULL before dereferencing it, in the
RTM_ADD case, thus avoiding a panic.

PR:		kern/42030
Submitted by:	Iasen Kostov
2004-10-26 17:36:16 +00:00
Alfred Perlstein 251e78450a Give a "proper" prototype for the xdrproc_t type.
And a proper one for rpctest_service().

This allows programs utilizing the rpc headers to utilize higher warning
levels.
2004-10-26 02:25:17 +00:00
Hidetoshi Shimokawa 678a0f451f MFC: 1.18 - 1.20
- Don't crash if the CROM is all zeros.
- Use new eui64(3) functions to print EUI-64s and to allow access to nodes
	by EUI-64 and name.
- Add -m option, set default fwmem target.
2004-10-24 12:57:42 +00:00
Hidetoshi Shimokawa f01a9a0257 MFC:
- Normalize polling interval while the target is offline.
- eui64(5) support.
- Invalidate dcons buffer address if the magic is wrong.
- Manpage fix.
2004-10-23 15:50:37 +00:00
Hidetoshi Shimokawa 99d69eafca MFC:
Add support for eui64(5) to libc.
2004-10-23 15:43:20 +00:00
David E. O'Brien 06fd0dbf73 Partially MFC rev 1.15: provide an escape to our "savestring" compatibility
with ancient readline versions madness when 'RL_NO_COMPAT' is defined.
This should help ports/devel/gdb6 to build on RELENG_4.
2004-10-20 19:58:02 +00:00
Tony Ackerman 2e714a8149 Fixes incorrect copyright year and formatting errors introduced in previous version.
Reviewed by:	Prafulla Deuskar
MFC after:1
2004-10-19 20:46:14 +00:00
Sam Leffler d6656d1a35 MFC: compile fix for missing ; w/o INVARIANTS 2004-10-17 20:47:35 +00:00
Sam Leffler d921716475 MFC: Move session state from on-card memory to host memory... 2004-10-17 19:31:58 +00:00
Tony Ackerman 705c6a1f29 Clariified full duplex commands and added support for new devices. 2004-10-15 23:31:19 +00:00
Tony Ackerman 50ac58acd2 MFC
Added support for Intel PRO/1000 GT Desktop Adapter(Device ID 8086 107C)
Removed support for Intel 82541ER
Added fix for 82547 which corrects an issue with Jumbo frames larger than 10k.
Added fix for vlan tagged frames not being properly bridged.
Corrected TBI workaround.
Corrected incorrect LED operation issues
2004-10-15 23:27:42 +00:00
Diomidis Spinellis 835c344a9e MFC changes 1.4 (imp - newbus) and 1.3 (obrien - style)
OK'd by: imp
2004-10-15 16:22:30 +00:00
Ruslan Ermilov 99d5bbbd13 MFC: 1.49: correctly pass -1 to setfile(). 2004-10-08 22:31:50 +00:00
Ken Smith 42db169fb3 MFC v1.390: For this menu pressing 's' should result in selecting a
'Standard' installation but was instead selecting the 'Select' button.

Adapted from work by:	josef@
PR:			i386/37999
2004-10-08 02:16:43 +00:00
Xin LI 5d89ca4947 We already have GBK support so make sure that mklocale(1) would not
complain that it is not supported.

Reviewed by:	ru
Approved by:	murray (mentor)
2004-10-08 01:27:57 +00:00
Xin LI cae220d3d3 Because that GB18030 needs several libc functions to be actually
functional and presently they are not back-ported, disable the
build of GB18030 locale by now so we won't get the 13K+ warnings
when doing ``make buildworld''.

Noticed by:	ru
Approved by:	murray (mentor)
2004-10-08 01:26:14 +00:00
Diomidis Spinellis a0170b46cf Added pbio.4 in the set of manual pages.
PR:		i386/46238
Approved by:	re (kensmith)
Reminded by:	imp's commit on HEAD
2004-10-07 17:26:46 +00:00
Diomidis Spinellis e79022b230 Added the pbio(4) 8255 parallel peripheral interface basic I/O driver.
The driver is designed for performing I/O under program control using
peripherals such as the Advantech PCL-724 card, which emulates the Intel
8255A PPI in mode 0.  Other 8255A-based peripherals such as the BMCM
PIO24II card have also been reported to work.

PR:	i386/46238
Approved by:	re (kensmith)
2004-10-07 11:54:01 +00:00
Diomidis Spinellis bfbd4f46cb Added the pbio(4) 8255 parallel peripheral interface basic I/O driver.
The driver is designed for performing I/O under program control using
peripherals such as the Advantech PCL-724 card, which emulates the Intel
8255A PPI in mode 0.  Other 8255A-based peripherals such as the BMC
Messsysteme PIO24II card have also been reported to work.

PR:	i386/46238
Approved by:	re (kensmith)
2004-10-07 11:45:21 +00:00
SUZUKI Shinsuke 58239933c7 Fixed a kernel crash due to a duplicated free when net.inet[6].ip[6].rtexpire=0.
(this bug is specific to FreeBSD-4.x, so it's not committed to -CURRENT nor RELENG-5)

Reported in:	freebsd-net ("Weird memory exhaustion with FreeBSD 4.10-STABLE" starting from Sep 23, 2004)
Obtained from:	KAME
Approved by:	re (scottl)
2004-10-06 02:35:17 +00:00
Sheldon Hearn 1cdfadaa72 MFC rev 1.32: regen
Approved by:	re (hrs)
2004-10-05 20:12:15 +00:00
Wilko Bulte e791328929 The state that separates its scholars from its warriors will have its
thinking done by cowards, and its fighting by fools. - Thucydides
2004-10-03 11:08:21 +00:00
Warner Losh c704df90ee After assigning numbers for years in current, phk move it w/o talking
to me :-(.
2004-10-01 06:13:36 +00:00
Dag-Erling Smørgrav 105c010bf1 MFC: unsetting an undefined variable or function is not an error.
PR:		standards/45738
Submitted by:	Matthias Andree <[email protected]>
2004-09-30 04:44:10 +00:00
Dag-Erling Smørgrav 9e6212ccb0 MFC: (1.188) limit inetd to 60 simultaneous connections.
PR:		conf/33670
2004-09-27 18:46:00 +00:00
Dag-Erling Smørgrav ac0f469ced MFC: (1.73) restore the r_flag check; this unbreaks mirror mode. 2004-09-25 09:40:42 +00:00
Paul Saab e0e74444f1 MFC: Add some special case code to fix a problem with the BCM5704
in TBI (fiber) mode.
2004-09-23 20:11:18 +00:00
John Baldwin ed6c388096 MFC: Force a redraw if all dists are selected. 2004-09-23 18:25:33 +00:00
Paul Saab 7cfbe2e4d2 MFC:
revision 1.10
date: 2003/09/18 17:00:03;  author: jhb;  state: Exp;  lines: +1 -1
Fix a busted constant related to PCI configuration acess method #1.  The
reserved bits in the port that must be zero are 24:30, not 20:30.  Bits
16:23 are used to set the bus number.  This meant that when we tested for
config mechanism #1, if the previous PCI configuration transaction sent
used a bus number greater than 15, one of the bits in 20:23 would be
non-zero and we would fail to use config mechanism #1 and thus fail to see
that PCI existed on the machine at all.

Approved by:    jhb
2004-09-22 20:14:46 +00:00
MIHIRA Sanpei Yoshiro 6f36c00e89 Sync to 1.11.2.66 of usbdevs 2004-09-20 05:31:50 +00:00
MIHIRA Sanpei Yoshiro d00d2223bf MFC umass.c 1.113:
Add support Western Digital External USB HDD
	ONSPEC entry are sorted
2004-09-20 05:30:42 +00:00
MIHIRA Sanpei Yoshiro 7258d59b12 MFC usb_quirks.c 1.40:
Add support Qualcomm CDMA modem
2004-09-20 05:23:08 +00:00
MIHIRA Sanpei Yoshiro 8475ea74e7 MFC uscanner.c in 1.58
Add support Nikon CoolScan LS40 ED
2004-09-20 05:08:29 +00:00
MIHIRA Sanpei Yoshiro a9593345ff Sync to 1.11.2.63 of usbdevs 2004-09-20 04:59:52 +00:00
MIHIRA Sanpei Yoshiro fa4d1f4f59 MFC uplcom.c 1.21:
add support ELECOM UC-SGT(minor change version)
http://www2.elecom.co.jp/products/UC-SGT.html
2004-09-20 04:50:09 +00:00
Jun Kuriyama 819cf7175f MFC: Fix a condition where the hole would be inserted in the wrong
place during a split.

     Obtained from:	NetBSD
2004-09-19 12:44:29 +00:00
Xin LI e0b78373ec MFC revision 1.153
date: 2004/09/15 08:19:03;  author: delphij;  state: Exp;  lines: +7 -1
Clear all "active partition" bits before we set a new one.

This adds a safebelt that prevents users to mark more than
one "active" partitions, which will lead to a unbootable
machine, especially in multi-boot configurations.

Approved by:	re (scottl), mentor (murray)
2004-09-18 16:57:39 +00:00
Diomidis Spinellis 9e7d5c71ef Fix the suspend timer code to reflect the documented reality.
Approved by:	re (kensmith)
2004-09-18 10:26:12 +00:00
Diomidis Spinellis 1241fa7aa0 Document the hw.ata.suspend tunable.
Prompted by:	wilko
Approved by:	re (kensmith)
2004-09-18 10:24:55 +00:00
Diomidis Spinellis 1b3103f7b3 Allow setting the suspend mode on an ATA disk via a sysctl variable.
This is a direct commit to RELENG_4, because in 5.x the utility
of this change has been subsumed by ATAng and ports/sysutils/ataidle.

Approved by:	re (kensmith)
Original patch by: Robert Sexton
2004-09-17 20:28:30 +00:00
Hidetoshi Shimokawa 026ff6848e MFC rev. 1.32: Use VIS_GLOB flag.
PR: bin/60524
2004-09-17 05:43:28 +00:00
Hidetoshi Shimokawa 436c928e82 MFC: Add support for VIS_GLOB and sync with -current.
PR: bin/60524
2004-09-17 05:42:48 +00:00
Xin LI 1fd4ce7baf MFC revision 1.37
date: 2002/10/06 09:09:27;  author: charnier;  state: Exp;  lines: +11 -16
While removing a memory leak, rev 1.32 introduced a
free-memory-and-reuse-it-after. Correct both problems and
make rcp -r work again under /etc/malloc.conf -> AJ.

PR:		bin/54969
Approved by:	murray (mentor)
2004-09-16 12:16:10 +00:00
Maxim Konovalov cd0ec27543 MFC rev. 1.17 jail.c and rev. 1.58 jail.8: add -l option to jail(8)
similar to su(1): before running jail'ed program under specific user's
credentials, clean the environment and set only a few variables.
2004-09-14 06:35:59 +00:00
Andre Oppermann be838642d9 MFC 1.133: Change the array of char to an array of struct pollfd. 2004-09-13 19:46:21 +00:00
Maxim Konovalov 92930a08f4 MFC rev.1.75: recover normal behavior: return EINVAL to attempt
to add a divert rule when module is built without IPDIVERT.
2004-09-13 07:21:17 +00:00
Gleb Smirnoff 7393983383 MFC 1.34:
Increase PPTP_MAX_TIMEOUT up to 3 seconds. 10 proved too much for high
   packet
   loss links, and 1 second appeared to be too small for high latency links.
2004-09-10 06:19:20 +00:00
Yaroslav Tykhiy c80e9db908 MFC:
Apply EVL_VLANOFTAG() to a tag passed to vlan_input_tag() by a
VLAN-supporting Ethernet interface so the irrelevant bits (priority
etc) are cleared.  Otherwise frames with non-zero dot1q priority
would not be directed to the right vlan interface if the parent
Ethernet interface didn't mask off the irrelevant bits by itself.

Refuse to configure a bogus VLAN ID on a vlan(4) interface.
2004-09-09 16:57:33 +00:00
Christian Brueffer b7b4889d97 MFC: rev. 1.61
Fix a couple of typos in comments
2004-09-09 13:22:18 +00:00
Christian Brueffer 126777ee7d MFC: rev. 1.4 (partly)
- fix a device name
- various language fixes
2004-09-09 11:47:54 +00:00
Christian Brueffer aa03dcfb70 MFC: rev. 1.5
Add a missing 's'
2004-09-09 11:44:52 +00:00
Christian Brueffer b767d3d7f3 MFC: rev. 1.4
Remove dublicate words
2004-09-08 15:27:30 +00:00
Brooks Davis fbad4408cc MFC rev 1.200
When detaching an interface, don't leave an obsolete pointer to the
  soon to be deleted struct ifnet around.

PR:		kern/52260
Submitted by:	Jinmei Tatuya <jinmei at isl.rdc.toshiba.co.jp>
2004-09-08 04:08:21 +00:00
Maxim Konovalov 46e97468e7 MFC rev. 1.56: restore a historical ipfw1 logamount behaviour: rules
with 'log' keyword but without 'logamount' limit the amount of their
log messages by net.inet.ip.fw.verbose_limit sysctl value.
2004-09-07 06:38:49 +00:00
Gleb Smirnoff dea1126d10 MFC ng_fec manpage.
Approved by:	julian (mentor)
2004-09-05 10:26:00 +00:00
Ruslan Ermilov d6c5553e9e Merge (and tweak as necessary) documentation changes from HEAD that are
relevant to RELENG_4, including documenting the following configuration
variables: DOC_LANG, DOCRELEASETAG, KERNEL_FLAGS, KERNELS, NOCDROM,
PORTSRELEASETAG, and WORLD_FLAGS.
2004-09-03 09:36:16 +00:00
Christian Brueffer e6cc6648fc MT4: rev. 1.27
- use .Nm
- fix some grammar and spelling mistakes
2004-08-31 00:04:08 +00:00
Christian Brueffer f8a289aaec MT4: part of rev. 1.18, 1.19
- correct two typos
- correct the link to the AIC-6915 programmer's manual
- bump document date
2004-08-31 00:01:17 +00:00
Sheldon Hearn 278be81fff MFC rev 1.31: regen
This branch (RELENG_4) was out of sync with HEAD and RELENG_5.  I didn't
take the time to find out why.
2004-08-30 15:53:06 +00:00
Wilko Bulte d5feebc727 Now that I discovered that 164SX SRM recognises Intel 8255x NICs and allows
them to be net booted lets document that fact.
2004-08-28 21:17:24 +00:00
Yaroslav Tykhiy 16a5e39235 MFC 1.156:
Open a socket for a data transfer in active mode using euid
of the current user, not root, to allow matching the user's
FTP data traffic with an ipfw(8) rule.
2004-08-28 12:49:58 +00:00
Yaroslav Tykhiy 9f23b8da36 MFC: Fix some bugs in the code protecting from port theft.
netinet/in_pcb.c	1.147, 1.152
netinet6/in6_pcb.c	1.54, 1.57
2004-08-28 12:39:07 +00:00
Yaroslav Tykhiy adab1a9cfd MFC: Make adjusting by months more intuitive as well as
suitable for scripting.

date.1	1.68
vary.c	1.16
2004-08-28 09:03:42 +00:00
Marcel Moolenaar 0df25953e0 MFC: Implement missing SOUND_MIXER_WRITE_RECSRC ioctl.
PR: 55290
2004-08-28 06:29:51 +00:00
Tim J. Robbins 1868ad305e MFC eval.c 1.22, extern.h 1.12, main.c 1.26: Store a pointer to "null" in
struct ndblock's defn member instead of a duplicate allocated on the heap;
the address defn points to is significant, and is checked against the
address of "null" in certain conditionals.

PR:		59883
2004-08-23 11:27:00 +00:00
Peter Pentchev fe8563e611 MFC rev. 1.20: spell _SC_CLK_TCK correctly. 2004-08-23 11:10:58 +00:00
Peter Pentchev 97e10b9078 MFC getaddrinfo.3 1.25, getipnodebyname.3 1.14 and getnameinfo.3 1.17:
cross-reference these three pages.  Also, bump the document date.
2004-08-23 11:06:01 +00:00
Peter Pentchev 4f2ef939d4 Argh... also MFC rev. 1.52: spell FTP correctly and bump the date. 2004-08-23 11:04:25 +00:00
Peter Pentchev 6acb9d284f MFC rev. 1.51: describe the ftp-chroot option of login.conf. 2004-08-23 10:58:13 +00:00
Colin Percival 89255bea3d MFC revisions 1.98 - 1.102: Correct definition for port 1000, add
8021/tcp, sort entries correctly, whitespace cleanup, and add port 3653 [1].

PR:		conf/63907 [1]
2004-08-22 15:04:57 +00:00
Dag-Erling Smørgrav acb834cd40 MFC: (1.72) don't rely on sb.st_size unless we're sure it's meaningful. 2004-08-22 00:35:44 +00:00
MIHIRA Sanpei Yoshiro fcaa72e465 Sync to 1.11.2.62 of usbdevs 2004-08-21 08:26:06 +00:00
MIHIRA Sanpei Yoshiro 4fb8a12dd0 MFC umass.c 1.111:
add support for SanDisk Cruzer Mini 256MB USB 2.0 Flash Drive
2004-08-21 08:24:46 +00:00
David Malone 94fea8db8e MFC: now e.f.f.3.ip6.arpa is delegated, we no longer need to query ip6.int
Obtained from:  KAME
2004-08-21 07:53:07 +00:00
MIHIRA Sanpei Yoshiro b6f920ee6b MFC scsi_da.c 1.171:
add support Frontier Labs NEX IA+ Digital Audio Player with USB CF card reader/writer
2004-08-21 06:40:07 +00:00
Ruslan Ermilov ff0760f903 MFC the "dot" command. 2004-08-20 14:34:44 +00:00
Wilko Bulte c446f83730 - Note that Adaptec 3940UW won't be recognised by the 164sx SRM
- Warn that 164SX is a picky customer with regards to DIMMs.
2004-08-19 19:27:33 +00:00
Dag-Erling Smørgrav 32c47fffc3 MFC: (1.2) skip val-tags in read-only repositories. 2004-08-19 07:07:28 +00:00
Oliver Eikemeier ff50ea79df MFC forgotten ports-x11-themes category 2004-08-18 23:35:19 +00:00
MIHIRA Sanpei Yoshiro b0231f1da9 MFC scsi_da.c 1.170:
Add support iRiver iFP MP3 player
2004-08-18 03:36:06 +00:00
MIHIRA Sanpei Yoshiro 4f0f30e1cb Sync to 1.11.2.61 of usbdevs 2004-08-18 03:27:40 +00:00
MIHIRA Sanpei Yoshiro e9f5b88e0b MFC umass.c 1.109:
Add support Sony Handycam TRV-30 memory stick slot
2004-08-18 03:25:44 +00:00
MIHIRA Sanpei Yoshiro 0c23573736 MFC uplcom.c 1.20:
Add support to Sony Ericsson USB Cable(Susteen USB Data Cable)
2004-08-18 03:19:18 +00:00
Marc Fonvieille c89da00830 MFC:
1.13 Add Epson Perfection 1670
1.14 Add Canon CanoScan LIDE 20 and 30 (and fix name of other Canon
     scanners)
1.15 Update Document Date

Approved by:	re (fake line to allow commits on RELENG_4 branch)
2004-08-17 11:54:37 +00:00
Tim J. Robbins 16af5718b8 MFC rev. 1.9: bring in fix from gzip 1.3.3 to avoid crashes when
processing certain corrupt input files.
2004-08-16 09:03:34 +00:00
MIHIRA Sanpei Yoshiro bebabf4453 MFC bktr_card.c 1.24 and bktr_card.h 1.7
Add support AOpen VA1000 video capture card
2004-08-15 12:17:36 +00:00
Bruce A. Mah 3afbf1d8ac MFC: ppp(8) LQM, ppp(8) set rad_alive. 2004-08-13 15:13:11 +00:00
Hajimu UMEMOTO 939b44f0de MFC 1.187: allow more than MLEN bytes for ancillary data to meet the
requirement of Section 20.1 of RFC3542.
2004-08-13 14:51:45 +00:00
Hajimu UMEMOTO 2858b47848 MFC 1.93: do not send icmp response if the original packet is encrypted. 2004-08-13 14:48:50 +00:00
Peter Pentchev 9488db1ae3 MFC if.c 1.198 and if_xl.c 1.179:
Do not attempt to clean up data that has not been initialized yet.
This fixes two kernel panics on boot when the xl driver fails to
allocate bus/port/memory resources.
2004-08-13 14:42:18 +00:00
Peter Pentchev 1f44c1984e MFC revisions 1.29 through 1.31: fix a printf() example and bump
the document date.
2004-08-13 07:28:04 +00:00
Wilko Bulte 83fc1620e6 Clarify that both ECC and non-ECC DIMMS work on 164SX.
Suggested by: ru
2004-08-12 12:45:56 +00:00
Hajimu UMEMOTO 4086220b64 MFC: Use RFC 3849 address for examples.
etc/hosts.allow:	1.19
	etc/rc.firewall6:	1.15
2004-08-11 17:56:53 +00:00
Hajimu UMEMOTO 077b92555f MFC 1.18: allow ::1 explicitly. 2004-08-11 17:54:24 +00:00
Oliver Eikemeier f01c8fef8d bump __FreeBSD_version for the MFC of revision 20040629 of the package tools. 2004-08-11 16:18:44 +00:00
Oliver Eikemeier d6c03fac92 sync the pkg_install tools with -CURRENT:
- MFC of the package tools revision 20040629 changes.

- replace the perl version of pkg_version(1) by its C equivalent,
  which means that `pkg_version -c' does no longer work

- keep the perl version of pkg_update(1) until a replacement is available

- include some man pages fixes
2004-08-11 16:16:24 +00:00
Wilko Bulte 9b33db5efb There is nothing but real hardware to verify things: 164sx can really
run on non-ECC, plain vanilla PC133 PC SDRAM DIMMs.

Thanks to: obrien@ for the donation of a 164sx mlb.
2004-08-10 19:09:20 +00:00
Dag-Erling Smørgrav 527272efa8 MFC: (1.69) truncate long file names in progress meter
(1.70) style nits
     (1.71) don't strip trailing whitespace from passwords
2004-08-10 01:08:18 +00:00
Dag-Erling Smørgrav a6effd3d3b MFC: (1.73) allocate space for terminating NUL in base 64 encoded string. 2004-08-10 01:01:54 +00:00
Ruslan Ermilov 800692ee9f Do not run "make hierarchy" when installing kernel but *not* installing
modules, allowing in particular /usr to be mounted read-only.  This
change won't be MFS'ed, because semantics of installing modules in 5.x
is slightly different from 4.x.

PR:		68150
2004-08-09 10:36:06 +00:00
Gregory Neil Shapiro 6cbdb1abad MFC: sendmail 8.13.1 import and related changes 2004-08-09 00:15:44 +00:00
cvs2svn 20b30be859 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-08-08 22:27:03 +00:00
MIHIRA Sanpei Yoshiro 71bdce1cc5 Whitespace cleanup that was missed by quirks commit 1.42.2.52 2004-08-08 01:34:36 +00:00
Dag-Erling Smørgrav 56c2ce95b4 Behold the awesome might of the whitespace crusader! 2004-08-07 20:58:00 +00:00
Dag-Erling Smørgrav 743a815f1e MFC: (1.11, 1.12) set baudrate to 100Mbps, advertise VLAN capability.
PR:		kern/64222
Submitted by:	Steinar Haug <[email protected]>
2004-08-07 20:45:59 +00:00
Brian Somers 7d97f1e370 MFC: Support a ``set rad_alive N'' command to enable periodic RADIUS accounting
information being sent to the RADIUS server.

     Logging of RADIUS accounting information moves to a ``set log [+-]radius''
     level, along with the RADIUS alive info, and the version number is bumped
     to 3.2 to reflect this.

     Mostly submitted by:    [email protected] (back in January)
2004-08-07 18:27:08 +00:00
MIHIRA Sanpei Yoshiro c300634c04 MFC: rev.1.169
Quirk for SEGRAND NP-900 USB MP3Player
2004-08-07 09:36:46 +00:00
Gleb Smirnoff 676c1c66b8 MFC rev. 1.75
PR:		bin/69674
Approved by:	julian (mentor)
2004-08-05 06:51:24 +00:00
Maxim Konovalov bd6ea2a7ee MFC rev. 1.31: the signal number has to be less than NSIG strictly. 2004-08-05 04:06:41 +00:00
Brian Somers 4ee0f11843 MFC: Re-implement LQM, this time according to the rfc 2004-08-04 14:36:40 +00:00
Ruslan Ermilov 04678a5510 MFC: 1.41: make -p cover symlinks too. 2004-08-04 08:58:52 +00:00
Philip Paeps 1280725d12 MFC moused.c r1.67 and moused.8 r1.46
Document the existence of the '-l' option to specify at what level to operate
the mouse driver.  This has been undocumented for more than six years :-)
2004-08-03 19:28:08 +00:00
Makoto Matsushita 968e56c24a MFC: Enable KEYMAP_PATH environment variable to tweak keymap path.
This commit imports following commit to RELENG_4:
	src/usr.sbin/kbdcontrol/kbdcontrol.1 rev 1.27
	src/usr.sbin/kbdcontrol/kbdcontrol.c rev 1.34, 1.35

If my build sandbox works as expected, Jul/17/2004 or later RELENG_4
release build is broken iff old build environment is used.  This is because
that even if a new keymap hits the tree, release build doesn't see src/
directory but /usr/share/syscons/keymaps.

About three years before, 5-current had a fix for that by sobomax, but
it was not MFCed yet.  Let me give a chance to fix for RELENG_4.

Tested on: tora.jp.FreeBSD.org
           (aka snapshots.jp.FreeBSD.org RELENG_4 buildbox)
2004-08-03 14:59:09 +00:00
Colin Percival 5c9193bd76 MFC 1.61,1.62:
Restore part of the word that got (accidentally) removed.
Removed whitespace at EOL.
Document the behaviour of the "-o file" option when "file" is a directory
(downloaded file(s) are created inside the directory).
2004-08-02 01:27:35 +00:00
Max Khon a29c9bb582 MFC: Add copyriht notices.
Prodded by:	imp
2004-07-31 20:58:50 +00:00
Ruslan Ermilov 49d836dd1e MFC: Sync with HEAD (pull up latest mdoc(7) changes). 2004-07-30 08:16:37 +00:00
Peter Pentchev 8d97ad588e MFC sys/conf/NOTES rev. 1.1245: a couple of grammar fixes in the 'bktr'
options section.
2004-07-29 07:34:46 +00:00
Dag-Erling Smørgrav 49f3739d8a MFC: s/Guiseppe/Giuseppe/ 2004-07-29 07:01:45 +00:00
Peter Pentchev 03d5540b18 MFC rev. 1.14: fix 'camcontrol rescan' syntax and use the proper indentation
for the FILES list.
2004-07-29 06:22:27 +00:00
Paul Saab 47af04f6ba MFC: rev 1.55, Name non-physical devices. 2004-07-28 06:19:54 +00:00
Gary Jennejohn 508330f870 MFC 1.16 - fix a possible hang at warm boot.
PR:		kern/68756
Submitted by:	Ari Suutari <[email protected]>
2004-07-26 09:12:57 +00:00
Jens Schweikhardt 7c7b2a1b53 MFC: bktr driver may not tune correctly
PR:		kern/66006
Submitted by:	Josh Elsasser <[email protected]>
2004-07-24 10:36:28 +00:00
Paul Saab 5ec196f996 MFC:
Use a separate flag when doing a kernel coredump when polling for
completion instead of abusing the interrupt enable flag.
2004-07-22 16:35:18 +00:00
Guy Helmer da45326339 MFC: daemon.c 1.6 daemon.3 1.13-1.14
Prevent abnormal termination of a child daemon process when created
by a parent that is a session leader (e.g., login shell) by ignoring
SIGHUP before calling fork(2) and then restoring SIGHUP's action
after setsid(3).  Based on the patch by Martin Kammerhofer
<[email protected]>.
This has been in -current for 8 months with no reports of adverse
affects.

PR:		bin/25462
Prompted-by:	[email protected]
2004-07-21 13:53:14 +00:00
Maxim Sobolev 328d77b814 MFC: Allow /var/log to be not a directory but a symlink to a directory.
Reminded by:	gad
2004-07-21 07:22:54 +00:00
Max Khon 503bee413e Set ifp->if_output. This is still required in RELENG_4.
Submitted by:	Stanislav Svirid <count at riss-telecom dot ru>
2004-07-21 05:57:56 +00:00
Christian Brueffer ac13e2fa3f MFC: rev. 1.18
Mention the vfs.usermount sysctl.
2004-07-21 01:28:04 +00:00
Alexander Leidinger a744afb201 MFC rev. 1.77: Implement SNDCTL_DSP_SETDUPLEX.
Approved by:	matk
2004-07-20 14:29:34 +00:00
Alexander Leidinger a913a18b80 MFC rev. 1.43:
---snip---
New defines that paves the way for new midi features and ports.

Changes consists of an IOCTL (SNDCTL_SEQ_GETTIME) and a constant.
---snip---

PR:		59233
Approved by:	matk
Requested by:	lofi
2004-07-20 13:49:30 +00:00
Giorgos Keramidas d483ccc309 MFC: 1.32
Refer to the sysutils/cdrtools port now that the sysutils/mkisofs
port has been merged into the former.
2004-07-20 08:19:54 +00:00
Hidetoshi Shimokawa ce6dc61f26 MFC: Adjust packet length correctly for FreeBSD-4. 2004-07-20 04:33:08 +00:00
Brian Somers 8351d73116 MFC: Report the number of bytes not written when complaining about failed
writes
2004-07-20 01:48:44 +00:00
Maxime Henrion 8a4e5798aa MFC r1.70: When checking the result of the test_aux_port() function,
ignore two more bogus return values sent by some hardware.

PR:		kern/61482, kern/54188
Submitted by:	Ulf Lilleengen <[email protected]>,
		Victor Balada Diaz <[email protected]>
2004-07-19 00:43:34 +00:00
Christian Brueffer 49202d2ec0 MFC: rev. 1.12
Add traditional BSD names to the finger-friendly com[1-4] entries.

Approved by:	dougb
2004-07-18 02:26:54 +00:00
Brian Somers 6cc18d41bf MFC: Fix ``set ifaddr''. The code was actually using an uninitialised
variable, but conveniently, because ncpaddr.ncpaddr_family !=
     AF_INET, the call to ncpaddr_getip4addr() became a no-op leaving
     the local address as it was (defaulting to whatever my hostname
     resolves to).
2004-07-18 01:02:23 +00:00
Maxim Konovalov f67f0fe739 MFC rev. 1.13 limits.c and rev. 1.25 limits.1:
Update the usage string in the limits(1) manpage to include -b for
sbsize. Also, correct the format string in getopt(3) usage to reflect
that -b takes an argument, and correct another case of RLIMIT_SBSIZE
having been forgotten.
2004-07-17 21:39:15 +00:00
Boris Popov c7584757da MFC: Use correct location for nsmb.conf file. 2004-07-17 14:42:14 +00:00
Yaroslav Tykhiy 030415d443 Stop pretending we support full-blown HTTP/1.1 because we are not
ready to handle all its aspects.  Failure to deal with HTTP/1.1,
with chunked transfer encoding in particular, led to broken transfers
and data corruption.  Fall back to using HTTP/1.0, which is safe.

A point to note: While the "Host:" header had not been in the
original HTTP/1.0 standard, it became a de-facto standard for
HTTP/1.0 as well.  It is understood by servers in HTTP/1.0
sessions if supported at all.

This issue doesn't apply to CURRENT since lukemftp handles HTTP/1.1
correctly.

PR:		bin/68547
Reviewed by:	vs
2004-07-16 09:02:47 +00:00
Seigo Tanimura 88e7a7d178 snd_sbc depends on sbc_pcm.
PR:		kern/67426
Submitted by:	Matthew Emmerton <[email protected]>
Obtained from:	DragonFlyBSD
2004-07-16 07:58:53 +00:00
Giorgos Keramidas 3ac03a06f5 MFC: 1.22
Fix some grammar-wording knit.
2004-07-15 20:30:02 +00:00
Giorgos Keramidas 3303685f7e MFC: 1.28 , 1.29
Fix various grammar knits.
2004-07-15 20:23:18 +00:00
Giorgos Keramidas 74315662c3 MFC: 1.18
Correct a minor syntax mistake.
2004-07-15 20:17:31 +00:00
Peter Pentchev 32611ca35d Fix yet another hard sentence break. No content changes. 2004-07-15 13:44:45 +00:00
Peter Pentchev f58b752908 Several grammatical fixes.
PR:		66826 (partially)
Submitted by:	Michel Lavondes <[email protected]>
2004-07-15 13:43:49 +00:00
Peter Pentchev 21fec91c2e MFC the relevant spelling fixes from mpp's rev. 1.1234 of src/sys/conf/NOTES. 2004-07-15 07:46:24 +00:00
Murray Stokely 5b8d5516e5 Make latin american keymap with accent keys available in sysinstall.
PR:		67365
2004-07-15 06:13:42 +00:00
Murray Stokely 4ab1708ec3 MFC: latin american keymap improvements. submitted by maintainer.
PR:	misc/53327
2004-07-15 05:43:10 +00:00
Murray Stokely 9c07b25664 MFC: r1.7 - r1.9 : technical terms for automated spellchecking of docs 2004-07-15 04:00:52 +00:00
Brian Somers b97ea0606a MFC: If HISMACADDR is set in the environment (by pppoed), pass the value to
the RADIUS server as RAD_CALLING_STATION_ID.
2004-07-14 13:30:15 +00:00
Brian Somers acd2b49f6c MFC: Reduce MAXMSS limit by 12 bytes to allow for rfc 1323. 2004-07-14 13:26:24 +00:00
Brian Somers ef75fbb236 MFC: Mention that ``set mtu max'' is necessary for PPPoE.
Assorted whitespace & linefeed tweaks.
2004-07-14 13:25:10 +00:00
Peter Pentchev 78aac7d56e Fix a typo and MFC <sys/types.h> from rev. 1.6.\
PR:		66764
Submitted by:	Michel Lavondes <[email protected]>
2004-07-13 16:20:56 +00:00
Peter Pentchev f8fc049052 MFC rev. 1.16 (a 'paramter' typo fix) and 1.17 (kill hard sentence breaks).
PR:		66575
Submitted by:	Michel Lavondes <[email protected]>
2004-07-13 15:07:23 +00:00
Peter Pentchev 6e313453a3 MFC rev. 1.14: "An iface node *can* be configured..."
PR:		66574
Submitted by:	Michel Lavondes <[email protected]>
2004-07-13 15:01:41 +00:00
Peter Pentchev d9beecb216 Remove the description of the MAKE_SHELL variable that is not honored
in -STABLE's make.  The MAKE_SHELL description seems to have crept into
the merge in rev. 1.12.2.24.

PR:		65615
Submitted by:	Matthew Seaman <[email protected]>
2004-07-13 14:52:31 +00:00
Jens Schweikhardt 183462409b Catch up with -current. 2004-07-11 19:24:14 +00:00
Paul Saab c2dad9ae3f MFC: rev 1.135
Deal with the possibility of negative available space from the file server
to avoid Bad Things(TM) happening (eg: df crashing with a floating point
exception).
2004-07-10 10:28:08 +00:00
Oliver Eikemeier 00edce152f MFC of the new variable `.MAKEFILE_LIST'. Add the following
to make.conf(5) to have a `deptree' target in all makefiles:

.NOTMAIN: deptree
deptree:
	@echo 'Dependency tree for ${MAKE} in ${.CURDIR}:'
	@l=1; \
	for d in ${.MAKEFILE_LIST}; do \
		case "$$d" in \
		..)	l=$$(($$l-2));; \
		/*)	printf '%-*s%s\n' $$l '' "`realpath \"$$d\"`"; \
			l=$$(($$l+2));; \
		*)	printf '%-*s%s\n' $$l '' \
				"`realpath \"${.OBJDIR}/$$d\"`"; \
			l=$$(($$l+2));; \
		esac \
	done
2004-07-10 08:14:42 +00:00
Ruslan Ermilov 122b618ffe MFC: Avoid dependency on the current date. 2004-07-09 08:41:11 +00:00
Philip Paeps 0b94fa76fb MFC: Fix the '\' next to lshift for users of Belgian keyboards. 2004-07-09 06:42:32 +00:00
Maxim Konovalov d5c41ef3e8 o Several mbuf(9) flags have different values in -CURRENT and -STABLE.
Spotted by:	Robert Wagner
2004-07-07 16:34:49 +00:00
Oliver Eikemeier 081fb083c1 MFC of bsd.port.mk 1.307 and bsd.port.subdir.mk 1.31 2004-07-05 23:10:25 +00:00
Darren Reed 50bfabc1f8 These files (duplicates of sys/contrib/ipfilter/netinet/*) don't exist in
-current so an 'automatic' MFC will miss them.
2004-07-05 17:06:31 +00:00
Darren Reed 3a3fe2b792 MFC that got lost - cast interface numbers to ints, not chars, so that big
numbered ones (see PR) don't get truncated.

PR: 64584
2004-07-05 16:55:16 +00:00
Darren Reed 630b179a20 MFC: unless NOINET6 is defined, compile IPv6 code in by default.
PR: 57730
2004-07-05 16:23:17 +00:00
Darren Reed 133101f091 The prototype for fr_makefrip() should never have changed, the fil.c in
src/contrib/ipfilter just wasn't updated to match sys/contrib/ipfilter like
it should have been.
2004-07-05 06:02:35 +00:00
Darren Reed ca9ff87079 The prototype for fr_makefrip() is out of step with the function. 2004-07-04 17:41:44 +00:00
Darren Reed b33babcea8 MFC of IPFilter 3.4.35. 2004-07-04 09:24:41 +00:00
Garance A Drosehn dc1a374b60 Make "neworder" the default for how newsyslog will do it's work. 2004-07-02 22:24:40 +00:00
Paul Saab 5fdc71be51 MFC: rev 1.162
NO_SYNC_CACHE for ciss
2004-07-02 03:38:07 +00:00
Yoshihiro Takahashi 1a952bed97 MFi386: Add cp(4) driver. 2004-07-01 11:38:41 +00:00
Dag-Erling Smørgrav a81009aa76 MFC (1.68): fix discrepancy between code and docs for -S option. 2004-07-01 10:16:25 +00:00
Paul Saab c66fb1b0c9 MFC:
rev 1.51: need to call ciss_media_accept async anymore.
rev 1.52: on media exchange, update/rescan the drives.
2004-07-01 07:04:25 +00:00
Roman Kurakin ef1bedcb31 MFC: Add cp(4) driver for Cronyx Tau-PCI.
Requested by:	Cronyx users.
2004-06-30 17:56:01 +00:00
Roman Kurakin 6f3ce7d63d MFC: Add cp(4) driver for Cronyx Tau-PCI adapters.
Requested by:	Cronyx users.
2004-06-30 17:51:31 +00:00
Roman Kurakin de4749b88d MFC: Add cp(4) driver for Cronyx Tau-PCI adapters.
Requested by:	Cronyx users.
2004-06-30 17:44:08 +00:00
Roman Kurakin d903aef630 MFC: markup and spaces fixup by ru@, cross-reference to cp(4). 2004-06-30 17:39:57 +00:00
Roman Kurakin e4eb651002 MFC: Add cp(4) driver for Cronyx Tau-PCI adapters.
Requested by:	Cronyx users.
2004-06-30 17:37:22 +00:00
Roman Kurakin 0d7e597f72 MFC: Add cp(4) driver for Cronyx Tau-PCI.
Requested by:	Cronyx users.
2004-06-30 17:33:55 +00:00
Colin Percival dbc11f797a FreeBSD-SA-04:13.linux:
MFC revision 1.116 of sys/compat/linux/linux_ioctl.c

Approved by:	so (des)
2004-06-30 17:31:44 +00:00
Roman Kurakin 7b25d361f9 MFC: Add cp(4) driver for Cronyx Tau-PCI adapters.
Requested by:	Cronyx users.
2004-06-30 17:14:56 +00:00
Roman Kurakin decebe29a0 MFC: Add cp(4) driver for Cronyx Tau-PCI adapters.
Requested by:	Cronyx users.
2004-06-30 17:05:17 +00:00
Roman Kurakin 622da46e64 MFC: Add cp(4) driver for Cronyx Tau-PCI serial adapters.
Requested by:	Cronyx users.
2004-06-30 16:58:17 +00:00
Murray Stokely 24b54b5cd0 MFC: ipfw now supports lookup tables. 2004-06-30 00:47:55 +00:00
cvs2svn 359814c583 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-06-29 19:06:43 +00:00
Dag-Erling Smørgrav bb91d91c2b MFC: upgrade to 1.11.17.
Approved by:	peter
2004-06-29 16:10:53 +00:00
Scott Long 43c4d5d913 Document scsi bus wiring better.
PR: kern/50741
2004-06-29 15:41:05 +00:00
David Malone f49f5434db Sync syslogd with -current, except the -o option. Includes:
1.128 Terminate program names if we hit a '/'.
1.127 Log file name may be prefixed by a '-' if it shouldn't be synced.
1.126 Be more careful about using using the file descriptor f_file.
1.125 String fixes (inspired by OpenBSD).
1.124 Warn about paths that are too long (OpenBSD).
1.123 Fix some not-in-practice bugs to do with log levels.
1.122 Update some comments.
1.121 Warns fixes.
2004-06-29 10:07:35 +00:00
Warner Losh f8cbcd6f38 Put the candle back: we removed gdbserver in the last commit for reasons
no one can recall now, likely related to breakage in current.

Approved by: obrien
2004-06-29 03:32:11 +00:00
Christian Brueffer d826fba54f MFC: rev. 1.10
Fix typos and add spaces before `(' in some comments
2004-06-27 13:09:38 +00:00
John-Mark Gurney bbefd01b7c fix a deadlock that can occure w/ large files and syncing disks...
PR:		66781
Submitted by:	brian at ncircle dot com
Reviewed by:	mckusick
2004-06-27 05:32:39 +00:00
Markus Brueffer 9ea34678da MFC: rev. 1.31
s/udi_peed/udi_speed/
2004-06-26 18:08:07 +00:00
Oliver Eikemeier 00c20216b3 MFC: Addition of sha1 and rmd160 2004-06-25 16:35:12 +00:00
Stephen McKay 3db3075e69 MFC: nfs_bio.c:1.130, nfs_subs.c:1.128, nfsnode.h:1.43
Fix a bug which can cause an NFS client to incorrectly read a growing file.

PR:		kern/64091
Submitted by:	peadar
2004-06-25 12:28:50 +00:00
Bill Fumerola c5812ca0b3 MFC r1.27: refuse connections in per-ip chroot if the directory does not exist 2004-06-24 23:12:32 +00:00
Archie Cobbs 0af8aa22a9 MFC: (rev. 1.18) Avoid calling bpf_filter() with len == 0. 2004-06-24 14:37:35 +00:00
Doug Ambrisko a598b1ccb4 MFC Disable card interrupts when doing a TX. 2004-06-24 04:18:26 +00:00
Scott Long 4a55ebd190 MFC: Document the ciss passthrough interface. 2004-06-23 20:56:07 +00:00
Scott Long 32b0b85070 MFC: Add SCSI passthrough support to ciss. Non-disk devices that are exposed
by the ciss firmware will now be exported to CAM as normal devices.

Sponsored by:	Tape Laboratories, Inc.
2004-06-23 20:48:36 +00:00
Paul Saab befa7d92f0 MFC: 1.54 Reset the update flag when scanning for new devices. 2004-06-22 23:06:17 +00:00
Tony Ackerman db89fedf20 Removed ixgb driver as its unlikely to be used by many. 2004-06-22 20:57:55 +00:00
Bruce Evans 0530f1310a MFC (1.140: Turned off the "calcru: negative time" warning for certain
SMP cases, and print separate messages for non-monotonic and negative
times).

Turned off the warning for zombie cases too.

Fixed some style bugs in the messages.

Only the warning about non-monotonic times is turned off.  Unlike in
-current, these are only known to be caused by calling calcru() from
ttyinfo() for ^T processing (always if it is called for a zombie) so
turning off the warning is believed to only lose a cryptic warning
that the times printed for ^T are slightly out of date.

PR:		52490
2004-06-22 05:36:59 +00:00
Bruce Evans 757b803ba5 Raise the ipl to splstatclock() in donice() before calling resetpriority().
This fixes races with schedcpu() and schedclock().  It corresponds to
sched locking before the sched_nice() call in -current.  Lock assertions
made the races very obvious in -current.

Adjust the process's priority after calling resetpriority() as in
schedclock() to maintain the invariant that the current priority is
always _the_ process's user priority if it is a user priority.  This
is to support uncommitted assertions that the priority is correct on
return to user mode.  The priority is correct here (modulo bugs
elsewhere) but it needs to be set explicitly to satisfy the assertions.
2004-06-22 04:38:08 +00:00
Maxim Konovalov 057242a4d7 MFC -U flag (rev. 1.53 jail.8 and rev. 1.15 jail.c). 2004-06-21 10:09:47 +00:00
Lukas Ertl 8a116ea218 Don't set the ctime of an inode when atime or mtime are specified.
PR:            bin/44343
Submitted by:  Scott Wiersdorf <[email protected]>
2004-06-20 22:04:53 +00:00
Garance A Drosehn 28cb2255b6 MFC 1.90->1.95: MFC all of the changes related to the "neworder"
processing -- EXCEPT that the default behavior is still to use the
"oldorder" processing.  This allows people on 4.x-stable to try
out the "neworder" processing (either by `newsyslog -D neworder',
or by adding '<debug> neworder' to newsyslog.conf).

I plan to change the default to neworder in a week or two, and then
will remove all the oldorder code after a few more weeks.

PR:		parts of this came from bin/25070 by Helge Oldach
2004-06-20 17:41:22 +00:00
Max Khon c1af72064e Remove references to netstat(1). 2004-06-20 15:11:31 +00:00
David E. O'Brien 98047d032d MFC: rev 1.23 (add "blame" as an "annotate" alias for interoperability with
subversion)
2004-06-20 01:06:34 +00:00
Garance A Drosehn 2c4892b59e MFC 1.88->1.89: A variety of minor changes. Allow users to set a
debugging option via the newsyslog.conf file.  Add a routine to change
file-attributes (chown, chmod, chflags), instead of having several
places doing the same sequence of system-calls.  A few cosmetic/style
changes.  These should not effect any users.
2004-06-19 12:51:05 +00:00
Garance A Drosehn 2cec53328b MFC *: Add a 'D' flag that can be specified on entries in newsyslog.conf.
If specified, the matching log files will have the NODUMP flag set on
them after they are created.

[* = 1.87 newsyslog.c, 1.2 newsyslog.conf.5]

Submitted by:	Sean Eric Fagan
2004-06-19 12:39:00 +00:00
Garance A Drosehn e9c80bbd6d MFC 1.86: Change standard processing to use the newer createlog()
routine that had been written some months ago for other processing.
This should get rid of a few subtle situations where an existing log
file would not exist (for a short time) while it is being rotated.
2004-06-19 12:28:00 +00:00
Garance A Drosehn 1acbffe2bd MFC 1.83: Do not :-terminate err(3) string, one will be added anyway. 2004-06-19 12:23:20 +00:00
Colin Percival 25f7fec178 MFC: s/mbps/Mbps/ (We don't support any 10 millibit-per-second network cards.)
PR:		docs/67719
Submitted by:	Linh Pham
2004-06-19 01:52:40 +00:00
Nate Lawson 956fbcd8a0 MFC revs 1.8-1.9: Fix semantics for AcpiExSystemDoStall(). Sleeping with
tsleep allowed the process to lose splhigh() in the wrong place.

Tracked down by:	Andriy Gapon <avg AT icyb.net.ua>
2004-06-18 18:20:13 +00:00
Max Khon e4a2eb510d Back out printing sfbufs stats. 2004-06-18 08:52:02 +00:00
Kirill Ponomarev 6a70605b60 MFC: rev. 1.45 (new descriptions for path, info, maint, cat,
bdeps, and rdeps. Some new examples for "search" target.
2004-06-18 06:09:29 +00:00
Tony Ackerman ef871faee0 MFC
Adding ixgb(4) for Intel 10GbE Adapters
2004-06-17 18:17:08 +00:00
Tony Ackerman ab8120436f MFC
First release of ixgb driver for the Intel(R) PRO/10GbE Family of Adapters.  This driver has
been developed for use with FreeBSD, version 4.8 and later.

Submitted by:	Hema Joyce
Reviewed by:  	Prafulla Deuskar
Approved by:  	Prafulla Deuskar
2004-06-17 18:07:41 +00:00
Max Khon dcb4675601 MFC:
sendfile(2)-related statistics that can be viewed through netstat -m:
- The number of times sendfile() had to do disk I/O
- The number of times sfbuf allocation failed
- The number of times sfbuf allocation had to wait
and three sysctl's: kern.ipc.nsfbufs, kern.ipc.nsfbufspeak,
kern.ipc.nsfbufsused that also can be viewed through netstat -m.

Submitted by:	Igor Sysoev <is (at) rambler-co.ru>
2004-06-17 00:08:23 +00:00
Max Khon a995d48957 MFC: Add missing dot and newline in a message. 2004-06-16 21:57:55 +00:00
Max Khon a03338e4fe Change last remaining references to "arlconfig" to "arlcontrol". 2004-06-16 21:44:11 +00:00
Hajimu UMEMOTO 7527d8b1c6 MFC 1.52: _dns_getaddrinfo() used a dangling pointer "addr" in
the res_target structure.  It was not a problem for now.  But,
It should be fixed for a future.

PR:		bin/67994
Submitted by:	JINMEI Tatuya <[email protected]>
2004-06-16 17:11:20 +00:00
Peter Pentchev 9ae412aae5 Merge rev. 1.28:
Fix the ordering in the description of the dlsym() lookup procedure to
reflect src/libexec/rtld-elf/rtld.c rev. 1.68 - the globally-loaded
objects (RTLD_GLOBAL) are searched before the local object's DAG's.
2004-06-16 13:55:57 +00:00
Yaroslav Tykhiy 3f25347467 MFC rev. 1.19-20:
Describe how test(1) will evaluate its expressions for a symlink.
Remove a duplicated description of the test for the null string.
2004-06-16 12:10:25 +00:00
cvs2svn 37bf26c99a This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-06-16 09:47:27 +00:00
Ruslan Ermilov e76ae7c791 MF RELENG_4_10: Update for 4.10. 2004-06-16 07:57:33 +00:00
Ruslan Ermilov 2e194f7889 MFC: IPFW2 lookup tables. 2004-06-16 06:57:49 +00:00
Diomidis Spinellis 7e14c916a4 Removed CVS conflict lines.
Noticed by: pjd
2004-06-15 21:55:45 +00:00
Paul Saab cd0ed1ef6b MFC:
rev 1.10: Define HOTPLUG event
rev 1.11: Update logical drive structure
rev 1.12: Document the 64bit blocks_to_recover/pad struct to 1024 bytes.
2004-06-15 21:22:29 +00:00
Paul Saab 29ff608ccb MFC: Turn on SCSI PREFETCH 2004-06-15 21:18:26 +00:00
Paul Saab 8926bbf81a MFC: rev 1.47 and 1.48
Add a bunch of PCI device ID's and only do I/O to ONLINE volumes.
2004-06-15 21:09:45 +00:00
Diomidis Spinellis 8b2e4a7c5d MFC 1.44 Send RADIUS gigaword data when OctetsIn or OctetsOut go
over UINT32_MAX.

PR:             bin/61294
Submitted by:   Boris Kovalenko
2004-06-15 17:39:34 +00:00
Diomidis Spinellis b7e8a1b0b7 Partial MFC of 1.7: added some missing defines.
These are needed to MFC usr.sbin/ppp/radius.c 1.44

Submitted by:   Michael Bretterklieber
PR:             46555
PR:             bin/61294
Approved by:	ru
2004-06-15 17:38:10 +00:00
Diomidis Spinellis 01d970fd28 MFC 1.101: shave-off per packet getprotobynumber() calls reducing default
case running overhead by 38%.
2004-06-15 14:25:21 +00:00
Diomidis Spinellis 138962d61b MFC 1.14 Add Greek character encoding suport. 2004-06-15 14:16:04 +00:00
Diomidis Spinellis dd3cb7d73c Undo the previous 1.19 "Really add -l to the usage output." MFC.
RELENG_4 does not support led(4).
2004-06-15 14:09:23 +00:00
Diomidis Spinellis 058ccba7fb MFC 1.18 and 1.19
1.18 - Add Greek character encoding suport. (dds)
1.19 - Really add -l to the usage output. (ru)
2004-06-15 14:01:36 +00:00
Diomidis Spinellis 21e9482568 MFC: Fix and clarify unparsable sentence. 2004-06-15 13:38:12 +00:00
Diomidis Spinellis d6abe599a8 MFC:
Bring the description for login_getclassbyname in sync with the function's
arguments.  The function has as a second argument a struct passwd * pointer,
not a directory name.
2004-06-15 13:31:20 +00:00
Ian Dowse b03d28e805 MFC: 1.55; initialise `restartcnt' so that restarting the port is
actually attempted. This fixes "port error, giving up port 1" errors
on some VIA UHCI controllers.
2004-06-13 14:40:12 +00:00
MIHIRA Sanpei Yoshiro 71ba210b19 MFC 1.107: Add support Neodio-3260 8-in-1 multi format USB memory card / flash controller 2004-06-13 07:47:38 +00:00
MIHIRA Sanpei Yoshiro 3048e443a0 MFC 1.21: Add support SUNTAC U-Cable type A4 (AS144L4) 2004-06-13 07:35:47 +00:00
MIHIRA Sanpei Yoshiro 2e77b8aa1c MFC 1.15: Add support Sony/Ericsson SEMC DSS-20 SyncStation. 2004-06-13 06:18:25 +00:00
MIHIRA Sanpei Yoshiro 81d54bf413 Sync to 1.11.2.59 of usbdevs 2004-06-13 04:55:20 +00:00
MIHIRA Sanpei Yoshiro af3f67574c MFC: Syncronise the device list with -current. 2004-06-13 04:53:26 +00:00
Garance A Drosehn 70f6e0c569 MFC 1.5: Remove reference to <stdint.h>, even if it's just a comment in 4.x. 2004-06-12 17:57:08 +00:00
Garance A Drosehn 0e68251e26 Make it so users can select the new (5.x) behavior for processing extra
parameters by compiling `ps' with -DPS_BACKWARD_COMPATIBILITY=0, instead
of requiring them to patch ps.c.  The default behavior has not changed.
2004-06-12 17:53:48 +00:00
Garance A Drosehn cf43adf63a MFC 1.85: Improved versions of the is*ch() and tolowerch() macros. 2004-06-12 15:45:17 +00:00
Garance A Drosehn 772228eb51 MFC 1.84: When rotating some "blah.log" file, make sure that a chmod and
(if requested) a chown is done on the "blah.log.0" file.

PR:		bin/67137
Submitted by:	jeh
2004-06-12 15:43:01 +00:00
Vinod Kashyap 0ec2196974 Fix for a problem seen only on 6xxx series controllers, where-in the
driver tries to submit the same request repeatedly, on finding the
controller cmd queue to be full.  This is an MFC from -CURRENT, and
is being done a bit fast because it addresses a 4.10 errata item, and
has already been tested for a week on a heavily used -STABLE machine
that was previously showing symptoms of the problem.

Submitted by:ps, vkashyap
Reviewed by:re
Approved by:re
2004-06-11 18:57:32 +00:00
Christian Brueffer 210782c69b MFC: rev. 1.11
Fix typo
2004-06-11 14:07:39 +00:00
Oliver Eikemeier a6d97c3e6d MFC of the `-depth n' primary and the -maxdepth fix. 2004-06-11 09:40:17 +00:00
Oliver Eikemeier 46d57f8804 MFC of revision 1.96:
give out a little more information in case of a missing dependency
2004-06-11 09:06:27 +00:00
Peter Pentchev f86eaee27e MFC rev. 1.27 - fix a grammatical mistake: the PC3 character sequences
*are* also supported.
2004-06-11 06:07:14 +00:00
Ruslan Ermilov 056834fc55 MFC: 1.29: Avoid a null pointer dereference if the .DEFAULT target
has no commands.
2004-06-10 13:07:53 +00:00
Dag-Erling Smørgrav 7b24bba1b7 MFC (usbhid.h 1.11): add __BEGIN_DECLS / __END_DECLS. 2004-06-10 06:49:10 +00:00
Hiten Pandya 730aa1d769 Revert previous commit regarding FUNLOCKFILE(fp), it has ill effects. 2004-06-09 19:24:22 +00:00
Lukas Ertl 3344073b85 MFC 1.77:
Plug small memory leak.
2004-06-09 11:24:00 +00:00
David Malone cfdccf5ff5 MFC: Make the comment for DLT_NULL slightly more accurate. 2004-06-08 21:16:42 +00:00
Hiten Pandya 13f3cc92e3 Move the call to FUNLOCKFILE(fp) after modification of the fp's fields.
Reviewed by:   	Daniel Eischen <deischen at freebsd.org>,
             	Robert Watson <rwatson at freebsd.org>
2004-06-08 13:15:01 +00:00
Garance A Drosehn c5ded54bf9 MFC *: Fix the kludge-old-options processing so `ps tpt' will be treated
the same as `ps -tpt', instead of being changed into `ps -tpT'.  Also adjust
it so `ps t p0' is treated like `ps -t p0', instead of making it `ps -T p0'.

This includes the rewrite of the kludge-option processing, but it does NOT
remove the long-undocumented BACKWARD_COMPATIBILITY compile-time option.
If you delete the '#define BACKWARD_COMPATIBILITY' line, you'll get the
newer handling for "extra arguments", which is to treat them as requests
for processes.

Also brings in a number of style(9) improvements.

[* = 1.90 & 1.92 -> 1.98 ps.c]

PR:		bin/52489         (for `ps tpt' and `ps t p0')
Submitted by:	Jilles Tjoelker   ( " )
2004-06-08 00:11:26 +00:00
Murray Stokely 2da0ac0976 Additions to the known hardware problems list should be sent to doc@
rather than jkh@.  This section was reorganized in 5.X so the change
is not necessary there.

Noticed by:	"Ted Mittelstaedt" <[email protected]>
2004-06-07 22:45:59 +00:00
Hajimu UMEMOTO 439470cbf1 MFC 1.73: do not check super user privilege in ip6_savecontrol. It is
meaningless and can even be harmful.
2004-06-07 08:54:23 +00:00
Archie Cobbs bb5251083a The previous checkin (MFC: Allow "lower" and "orphans" hooks to be connected
at the same time) was incomplete and broke things. This patch fixes that.
2004-06-06 19:47:58 +00:00
Gregory Neil Shapiro d39c0831e1 MFC: Remove trailing space.
Revision  Changes    Path
     1.36      +1 -1      src/etc/mail/Makefile
2004-06-06 17:29:48 +00:00
Gregory Neil Shapiro 2afb8a30fb MFC: Honor NOINET6 and disable IPv6 support in libmilter and sendmail if it
is set.

     Revision  Changes    Path
     1.4       +5 -1      src/lib/libmilter/Makefile
     1.4       +5 -1      src/lib/libsm/Makefile
     1.44      +5 -1      src/usr.sbin/sendmail/Makefile
2004-06-06 17:27:11 +00:00
MIHIRA Sanpei Yoshiro b5c52ff6c5 MFC 1.202: Add new ID for Intel 82562ET (ICH5/ICH5R) Pro/100 VE Ethernet.
PR:		i386/61320, kern/67211
Submitted by:	Andrew Halliwell <[email protected]>
2004-06-05 13:19:03 +00:00
Kris Kennaway 216a2ba27b MFC: Add locale and www directories 2004-06-05 11:47:03 +00:00
MIHIRA Sanpei Yoshiro 173d5aeeb4 MFC 1.268: fix MELCO LPC3-TX entry. 2004-06-05 06:13:54 +00:00
Brian Somers 3565f05e6b Handle read_block() failures by ignoring the disk rather than
dumping core.
2004-06-04 11:57:38 +00:00
Peter Pentchev 7761a16e35 MFC ipfw.8 rev. 1.132: clarify the MAC address specification formats. 2004-06-04 09:24:33 +00:00
Peter Pentchev c0238c87b2 MFC accept.2 rev. 1.27: clarification that 'addr' is optional. 2004-06-04 09:15:54 +00:00
Marius Strobl 941e9e50b2 MFC:
release/alpha/mkisoimages.sh 1.8
release/i386/mkisoimages.sh 1.9

mkisofs(8) is now installed by sysutils/cdrtools.
2004-06-02 22:25:48 +00:00
Kirill Ponomarev 3c88d09ebe - Remove leading zero from document date [1]
- Remove entry which tells about periodical INDEX updates in
  the CVS repository
- Add description for fetchindex target

Requested by:	ru [1]
Approved by:	josef (mentor)
2004-06-02 20:21:51 +00:00
Max Khon b4b5760eaa MFC: arl(4) network device driver and control utility for
Aironet Arlan 655 wireless network adapters.
2004-06-02 19:06:39 +00:00
cvs2svn ea38e3e2eb This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-06-02 18:03:08 +00:00
Kirill Ponomarev 1445089ab4 - Bump the document date
Requested by:	ru
Approved by:	ru, josef (mentor)
2004-06-02 15:03:59 +00:00
John Baldwin 80dc010d15 Don't check to see if APs need to be added to the logical_cpus_mask unless
logical_cpus is non-zero.  Without this, machines w/o HTT get divide by
zero faults.

Pointy hat to:	jhb
2004-06-02 14:42:59 +00:00
Kirill Ponomarev 89c685b414 - Mention new targets from bsd.port.mk:
* config
  * showconfig
  * rmconfig
  * describe
- Add OPTIONS description
- Word smithing

PR:		docs/67342
Reviewed by:	ru
Approved by:	josef (mentor)
2004-06-02 14:21:15 +00:00
Hajimu UMEMOTO 9715ee6fc3 MFC 1.14: drop packet which has ::1 as src or dst via other than lo0
like as rc.firewall does.
2004-06-02 09:11:28 +00:00
Poul-Henning Kamp cc77aef1f2 There is a comma missing in the table initializing the
pmap_prefault_pageorder array.  This has two effects:

1. The resulting bogus contents of the array thwarts part of the
optimization effect pmap_prefault() is supposed to have.

2. The resulting array is only 7 elements long (auto-sized), while
pmap_prefault() expects it to be the intended 8 elements.  So this
function in fact accesses memory beyond the end of the array.
Fortunately though, if the data at this location is out of bounds it
will be ignored.

This bug dates back more than 6 years.  It has been introduced in
revision 1.178.

Submitted by:	Uwe Doering <[email protected]>
PR:	67460
2004-06-02 07:04:21 +00:00
Brian Somers f75dffcf36 MFC: Add a missing memcpy and a few tests for NULL pointers 2004-06-02 01:42:59 +00:00
Brian Somers e6e912a08d MFC descriptions of pkg_version and pkg_version_index.
Pull in a bunch of spelling and grammar fixes while I'm here.
2004-06-02 01:34:00 +00:00
Archie Cobbs 9e89f224d4 MFC: Allow "lower" and "orphans" hooks to be connected at the same time. 2004-06-01 22:55:24 +00:00
John Baldwin ca071a2135 A few BIOS's will actually enumerate logical CPUs in their MP Table. Try
to handle that case better by adding any CPUs that appear to be logical
CPUs to the logical_cpus_mask bitmask.  -CURRENT uses different code for
enumerating CPUs, so this is not an MFC.

Submitted by:	Bruce Walker bmw at mxtreme dot com
2004-06-01 18:09:58 +00:00
Ruslan Ermilov 130750596e MFC: Maintain statistics about received frames. 2004-06-01 14:50:38 +00:00
Seigo Tanimura 0f530408bd MFC rev 1.28: Alice, Christopher Robin and Pooh Bear. 2004-06-01 09:45:56 +00:00
Maxim Konovalov 3c2fcd5428 MFC rev. 1.218: fix buffer overrun in in_pcbopts(). 2004-06-01 07:38:56 +00:00
Hiroki Sato a3e0589668 Bump __FreeBSD_version to 491100 for 4.10-STABLE.
Submitted by:	eik
2004-06-01 03:49:13 +00:00
Yaroslav Tykhiy 7a847f5325 MFC:
Clarify the issue of compatibility of different interfaces
to advisory locking.
2004-05-31 19:17:07 +00:00
Yaroslav Tykhiy 522e06d9c2 MFC: cron(8) -j and -J options. 2004-05-31 17:27:01 +00:00
Yaroslav Tykhiy af214503a8 MFC: Add -j' and -J' for time jitter. 2004-05-31 17:14:25 +00:00
Kirill Ponomarev d1eeea341b - Fix typo
Approved by:	tobez
2004-05-31 16:55:12 +00:00
MIHIRA Sanpei Yoshiro f24043b762 Sync to 1.11.2.58 of usbdevs 2004-05-30 12:23:34 +00:00
MIHIRA Sanpei Yoshiro ab098dce20 MFC 1.49-1.51: add support Kyocera AH-K3001V (cellular phone in Japan) 2004-05-30 12:21:55 +00:00
David Malone 4307272345 MFC:
1.126	Remove the requirement that the "discard" service be defined.
1.125	request_init pairs terminated by a 0 key.
1.124	Warn if inetd's config file doesn't exist.
1.123	Rename 'int log' to avoid shadowing.
2004-05-30 10:53:46 +00:00
Maxim Konovalov 8a61168626 MFC rev. 1.20: fix a typo. 2004-05-28 07:59:31 +00:00
Paul Saab 991bdc90c5 Don't compile ciss with CISS_DEBUG=0 as a module. 2004-05-28 01:53:47 +00:00
Hiroki Sato 4f1177adbb New errata:
The release notes should have mentioned the bfe(4) driver.
2004-05-27 23:23:36 +00:00
Ken Smith 52d4972101 Note 4.10-RELEASE date. 2004-05-27 06:19:32 +00:00
Ruslan Ermilov 0155f53770 MFC: Maintain statistics about received frames. 2004-05-26 08:53:59 +00:00
Dag-Erling Smørgrav 05c48b65c1 Cosmetic change to simplify patch generation. 2004-05-25 22:46:38 +00:00
Ken Smith ea8035a600 Tagging for the 4.10 release is done so this is probably the right time
to shift RELENG_4 from PRERELEASE to STABLE.
2004-05-25 17:41:08 +00:00
Ken Smith d8a857f3c0 Unlike previous releases we want a few notes in the errata docs at
the point the release goes out so we're adding it now to RELENG_4
and then will MFS it.  This will probably be backed out so the entries
are empty in RELENG_4 some time after the 4.10 release.

Reviewed by:	bmah
2004-05-25 14:06:09 +00:00
Maxim Konovalov 3e0efc7c44 o MFC rev. 1.144: fix comments. 2004-05-24 17:42:16 +00:00
Diomidis Spinellis 67417d8e25 MFC changes 1.29 -> 1.30
Remove a trailing newline, to behave as documented in syslog(3):
"A trailing newline is added if none is present."
2004-05-24 14:40:10 +00:00
Paul Saab 7dc1060be8 MFC: support for the BCM5705K 2004-05-24 04:53:08 +00:00
Ken Smith 25ec5b711e It was found the previous commit causes a severe change in behavior
of msync( ...,MS_INVALIDATE) on NFS-mounted partitions.  Given this
is a stable branch and the issue being addressed to begin with may
not concern some users we are providing a way to get the old behavior
if desired.  The default will be to have the new behavior which is to
only flush pages from memory if they are not dirty.  By changing the
sysctl vm.old_msync users can get the old behavior back.  Because of the
unified VM/buffer-cache system what to do as a proper fix to this
issue is proving to be quite difficult.  It is still being worked on
but we need this stop-gap solution for now.
2004-05-22 20:28:53 +00:00
Joerg Wunsch 5caffa2a47 MFC:
smb.4 rev 1.10: much more detailed description of the API
smbus.4 rev 1.14: add xref URL to SMBus specs
2004-05-22 07:29:43 +00:00
Joerg Wunsch 96f3f63337 MFC: rev 1.8/1.9, fix description of the symmetric nature of the enigma
encryption, update xrefs.

PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from:
MFC after:
2004-05-22 07:26:34 +00:00
Oliver Eikemeier 6a4601ac2f MFC rev 1.60, 1.61 (document how -maxdepth and -mindepth really work)
PR:		66613
Approved by:	ru
2004-05-21 09:48:34 +00:00
Josef Karthauser 4531a21321 MFC: Allow the location of the INDEX file to specified to pkg_version.
This is particularly convenient on a cluster of machines to prevent
     having to rebuild the INDEX file on each.
2004-05-20 21:49:03 +00:00
Hiten Pandya 510f875cf9 Bring in important changes from HEAD:
* Remove a long obsolete paragraph from the BUGS section.
	* Bump the date.

Requested by:	alc
2004-05-20 20:43:33 +00:00
Ken Smith 716e1f17ae MFC rev 1.37, mdoc fixes.
mdoc help:	ru
2004-05-20 18:42:04 +00:00
Daniel Harris a9a21d4537 MFC 1.34-1.36, typos and style. 2004-05-20 17:54:57 +00:00
Ken Smith 19c08504ec Add mention of -g option to manual page and usage message. This had
already been done in HEAD as part of a larger commit (rev. 1.60).
2004-05-20 17:10:10 +00:00
Roman Kurakin 9ff92f43f8 MFC: 1.1159 Spell Cronyx Tau and Sigma families correctly. 2004-05-20 13:36:36 +00:00
Dag-Erling Smørgrav 7a2647b3d2 Merge updated patch from vendor branch (1.1.1.17) 2004-05-20 13:17:16 +00:00
Paul Saab 32ac2794c4 MFC: rev 1.124. Fix "thundering herd" problem in accept. 2004-05-19 19:28:24 +00:00
Ken Smith 16425b8844 Style fixup in previous commit.
Noticed by:     bde (thanks!)
2004-05-19 18:07:15 +00:00
Scott Long 6262246b0a MFC:
Use the Generic 9005 mask when looking for generic 7901B
	parts.  This allows the driver to attach to 7901B parts
	on motherboards using a non-Adaptec subvendor ID.

This also supports a recent Dell OEM part.

Submitted by:	gibbs
2004-05-19 17:33:42 +00:00
MIHIRA Sanpei Yoshiro 22287f24d3 MFC 1.20: fix SONY_CLIE_41 (as PEG-SJ33/U) 2004-05-19 11:04:19 +00:00
Dag-Erling Smørgrav 112cc98310 Merge parser fix from vendor branch (rev 1.1.1.16) 2004-05-19 06:21:56 +00:00
Maxim Konovalov 16b666fb07 o MFC revs. 1.46 - 1.47: document m_free(9) and m_getcl(9). 2004-05-18 14:24:33 +00:00
Warner Losh 20c85e48a7 Fix two bugs that aren't in the current:
1) only have a long timeout for the wi_cmd_ini command.  All others should
   much faster at 10ms.  Some cards seem to timeout when the signal quality
   is low, and a faster timeout means that retry will happen in a fraction of
   a second, rather than seconds.
2) ifconfig passes -1 in i_val for the ssid and ignores the rest of the
   parameters if it returns an error.  wi used to return an error in this
   case, which means none of the 802.11 parameters were being reported.
   Since an works, fix the presumed bug in wi.
2004-05-18 06:57:33 +00:00
Vinod Kashyap 1982ee8b1b Undid scottl's recent changes. 2004-05-17 17:06:12 +00:00
Christian Brueffer 13764c3893 MFC: 1.27
o fix a typo
o remove stray word
o add missing words
2004-05-17 11:38:55 +00:00
Roman Kurakin 05023e257b MFC: 1.200, 1.201 2004-05-17 10:46:46 +00:00
Archie Cobbs 63d6e044a8 MFC: Add 'enableWindowing' configuration knob to the ng_pptpgre(4) node. 2004-05-16 19:26:46 +00:00
Scott Long 549018e7ff Sleep for 1 second after loading modules so that slow devices can be probed.
This is not an MFC as it is unclear if it is needed in HEAD.

Submitted by:	vkashyap
2004-05-16 04:19:38 +00:00
Scott Long dd54a58a3a Remove twa_intrhook prototype
Submitted by: cperciva
2004-05-15 15:43:46 +00:00
Scott Long fc71e5b990 MFC: Set the cpi.hba_inquiry field to something useful. 2004-05-15 05:20:12 +00:00
Scott Long cc78281082 MFC: Remove the config_intrhook as it is not needed. 2004-05-15 05:19:50 +00:00
Ken Smith 4f75aff7ee Forced commit to note that the work done for rev 1.65.2.15 was done
by Matt Dillon.  Sorry Matt.
2004-05-14 23:36:20 +00:00
Ken Smith bb07c990bb Forced commit to note that the change for rev 1.187.2.27 was developed
by Matt Dillon.  Sorry Matt.
2004-05-14 23:35:19 +00:00
Ken Smith 5540244780 MFC of 1.119, Change ffs_realloccg() to set the valid bits for the extended
part of the fragment to zero the valid parts of a VM_IO buffer.

Reviewed by:	alc, tegge
MFS:		immediately
2004-05-14 22:02:36 +00:00
Ken Smith 15e2f6217b Implement IO_INVAL in the vnode op for writing by marking the buffer as
"no cache".  Note this was not done to HEAD because the VM system is
different.

Reviewed by:	alc, tegge
MFS:		immediately
2004-05-14 18:27:52 +00:00
Ken Smith b479bc7d93 Change vm_map_clean(... MS_INVALIDATE) to not delete dirty pages. Note
this was not needed in HEAD because the VM system is different.

Reviewed by:	alc, tegge
MFS:		immediately
2004-05-14 18:24:44 +00:00
Nate Lawson 1abc5fd5b2 MFC: rev 1.28 -- fix unqualified names. 2004-05-13 03:50:58 +00:00
Tim Kientzle 32129f25c4 MFC: Sync du up with -CURRENT. This includes:
* Faster link checking
  * ANSIfication
  * -h/-k interaction fixes
  * Style updates
2004-05-12 05:35:22 +00:00
Vinod Kashyap 0fae05c0c0 1. Fixed potential problem that would cause out-of-order requests in twe_startio.
2. Fixed possible race condition in twe_start.
3. Changed version.

Submitted by: scottl
Reviewed by: vkashyap
Approved by: re
2004-05-12 03:37:43 +00:00
Tim J. Robbins 8eef25b658 MFC rev. 1.21: Fix BSS buffer overflow in makeargv(). 2004-05-12 02:18:08 +00:00
Tim J. Robbins e4a2c0b197 MFC rev. 1.28: Fix two buffer overflows caused by off-by-one errors:
avoid writing a null character 1 byte past the end of cmdline[] when
libedit is being used for input, and avoid writing a null pointer 1
element past the end of margv[].
2004-05-12 02:11:33 +00:00
Tim J. Robbins e6169502b5 MFC rev. 1.5: Fix a BSS buffer overflow caused by makeargv() writing past
the end of margv[] when an input line contains 20 or more space-separated
words.
2004-05-12 02:05:58 +00:00
Simon L. B. Nielsen 1834623df7 Unlike -current, -stable has a linux(8) manual page, but no linux(4).
PR:		docs/66484
Submitted by:	Michel Lavondès <[email protected]>
2004-05-10 20:18:58 +00:00
Roman Kurakin eca792afa4 MFC: Hide FR support more correctly. We should hide it since we do not
have fr support in FreeBSD's sppp, but we have it in Cronyx's sppp.
2004-05-09 19:35:08 +00:00
Roman Kurakin f3243a1a40 Remove reference to hints file since we don't have it in RELENG_4
Correct kernel config entry.

Pointy hat:	rik
Pointed by:	Dmitry Morozovsky <marck at rinet dot ru>
2004-05-09 19:00:47 +00:00
Bruce A. Mah 87dda158ae MFC: Add 4.10 entries so that pkg_add -r fetches from the
right package sets.

Partial merge of:

	src/usr.sbin/pkg_install/add/main.c 1.56->1.57

PR:		66251
Submitted by:	eik
2004-05-08 23:54:26 +00:00
Kris Kennaway d7458f0003 MFC: (Belatedly) catch up to XFree86 4.3.0 layout 2004-05-08 07:32:33 +00:00
Nate Lawson ec17f52474 MFC quirk from rev 1.168: Neuros Digital Audio USB player 2004-05-08 04:02:34 +00:00
Christian Brueffer 7d9bd55207 MFC: 1.33
Fix spelling

Submitted by:	Michel Lavondès <[email protected]>
2004-05-07 18:54:03 +00:00
Christian Brueffer 9b5dad2730 MFC:
1.21  kill hard sentence breaks
1.22  fix typo

PR:		docs/66263
Submitted by:	Michel Lavondes <[email protected]>
2004-05-07 12:50:42 +00:00
Maxim Konovalov 3bb4b4fbf2 MFC revs. 1.79, 1.80: add OpenBSD 3.5, NetBSD 1.6.2 was a patch release,
add BSD/OS 5.1 ISE.
2004-05-06 16:08:17 +00:00
Yoshihiro Takahashi cc193cb5c6 MFC: Increase BUS_SPACE_IAT_MAXSIZE to 33. 2004-05-06 13:23:59 +00:00
Josef Karthauser 16596e50e6 Regen 2004-05-06 09:03:54 +00:00
Josef Karthauser 97f4633b83 MFC: Support the Palm Zire 31. 2004-05-06 09:03:23 +00:00
Jacques Vidrine d31cd5a2c1 Correct a heap buffer overflow in k5admind(8) when built with Kerberos
IV support.

Obtained from:	Heimdal CVS
2004-05-05 20:19:48 +00:00
Jacques Vidrine 040f6a17aa Correctly validate the transited field in Kerberos tickets.
http://vuxml.freebsd.org/bfb36941-84fa-11d8-a41f-0020ed76ef5a.html

Obtained from:	Heimdal 0.5.3
2004-05-05 19:49:41 +00:00
Ken Smith 3b105e1b75 MFC of rev 1.331:
date: 2004/03/23 08:37:34;  author: tjr;  state: Exp;  lines: +2 -1
	Do not copy vm_exitingcnt to the new vmspace in vmspace_exec().
	Copying it led to impossibly high values in the new vmspace,
	causing it to never drop to 0 and be freed.

Requested/tested by:	ps
Reviewed by:		alc
MFS:			immediately
2004-05-05 19:28:23 +00:00
Hiroki Sato d127946b2f MFC: Add URLS_ABSOLUTE=YES into the doc.1 target. 2004-05-05 13:11:26 +00:00
MIHIRA Sanpei Yoshiro b13ed4ea64 MFC: Add support 2 devices(USB-DVD-R drives rev.1.105)
- Logitec LDR-H443SU2
	- IO-DATA DVR-UEH8
2004-05-05 07:59:29 +00:00
Colin Percival 25d01a0568 MFC revision 1.12, a bit over 2 years late: Dereferencing NULL pointers
considered harmful.
2004-05-04 10:52:54 +00:00
John Polstra 7f7eddf984 MFC part of if_bge.c revision 1.41: atomically load and clear the
status block.  This makes the bge devices work much better when
interrupts are shared.

This change entails bringing in the atomic_readandclear_* functions
from -current.  RELENG_4 already had the equivalent loadandclear
function for the i386, but it did not exist for the alpha.
2004-05-03 20:32:32 +00:00
Andrey A. Chernov 60ccd51ffc MFC v1.15, split_lines() rewrite 2004-05-03 04:48:18 +00:00
Ken Smith 6a4632622e Adjustments to package sets for disc1 for the 4.10 release. The
compat packages are being removed because of security issues, they
are no longer buildable.  The other packages being removed are due
to space issues, they don't fit.  Packages chosen for removal were
either thought to be less popular with the majority of people, or
were large *and* you need a network connection to be able to use them
so downloading them post-install should be possible.

This will be merged into RELENG_4_10 immediately but note that a commit
to HEAD has not and will not be done for this now.  -current package
sets are smaller (.tbz versus .tgz) so the package sets are at least
somewhat disjoint.  And it's pointless to update this in HEAD until
a 5.X release comes.
2004-05-03 01:12:40 +00:00
John Polstra fe72310ec3 MFC 1.21: Fix memory leak in ng_get_string_token. 2004-05-01 18:41:19 +00:00
Pierre Beyssac 82e7e80303 MFC rev 1.26: check source address (-s) for validity. 2004-04-30 22:45:47 +00:00
Ken Smith 6edfe8b496 Add information about the new DISC?_NAME and DISC?_LABEL variables.
Caught by:	ru
2004-04-30 13:28:19 +00:00
Hiroki Sato 7490c79cac MFC:
mmap(2) security fix, and
	rarpd(8) multiple IP addresses support.
2004-04-30 11:54:37 +00:00
Ruslan Ermilov 5f0902387c MFC part of rev. 1.8 that fixed an mbuf memory leak (without
saying so in the commit log) when only one link is connected.

Glanced at by:	archie, julian
2004-04-30 09:29:17 +00:00
Ken Smith 734f6bd587 This allows for tweaking the name put in the label on the CD's when using the
Makefile to build the ISO's.  Previous 4.X releases had a non-generic name
for the labels but were put together 'manually' instead of using the Makefile.

This will be insta-MFC'ed...
2004-04-30 04:17:41 +00:00
Joerg Wunsch 6f2d8221d2 Mostly sync with -current.
Merged:

rarpd.c
. rev 1.35 (use in_addr_t instead of u_long)
. rev 1.36 (major cleanup, make everything more sane)
. rev 1.38 (clarification about -a)
. rev 1.39 (typo fix)
. rev 1.40 (allow rarpd to listen on interfaces with more than one
  IP address)
rarpd.8
. -a clarification

Not merged:

. rarpd.c 1.34 _FBSD() cosmetics

PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from:
MFC after:
2004-04-27 19:25:01 +00:00
Paul Saab 65b1d64b5e MFC: Bring ciss up-to-date with -CURRENT and support for the MSA20
and MSA500 as well as other small fixes.
2004-04-27 17:12:04 +00:00
Lukas Ertl 4bc9c45e87 Properly handle on-disk configuration formatting for subdisks that
aren't attached to a plex.

PR:             kern/65956
Submitted by:   Dmitry Morozovsky <[email protected]>
Approved by:    grog (mentor)
2004-04-26 20:32:59 +00:00
Lukas Ertl 74b7196fdc MFC 1.98:
Plug a mem leak in vinum_scandisk().
2004-04-26 20:16:29 +00:00
Marius Strobl fbe467ee04 MFC: 1.52
Fix a couple of camcontrol issues that popped up on sparc64:

 - bzero the CCB header in getdevtree() and set the path properly, to
   avoid having random garbage in the CCB header.
 - if the lun isn't specified in a device specifier, it should default to
   0, not whatever random data happens to be in the lun variable.
 - move the prototype for getdevtree() out from under #ifndef MINIMALISTIC,
   since it is used in both cases.

Approved by:	ken (maintainer), marcel (mentor)
2004-04-25 17:10:18 +00:00
Ken Smith fd0b032530 This is an MFC of work done by Alan Cox. It addresses a security issue
with mmap(2) where pages marked as PROT_NONE may become readable under
certain circumstances.

The commits to -current being MFC-ed with this are:

	Revision  Changes    Path
	1.333     +5 -4      src/sys/vm/vm_map.c
	1.109     +1 -1      src/sys/vm/vm_map.h

Which were a result of a PR:

	Submitted by:   "Mark W. Krentel" <[email protected]>
	PR:             kern/64573

Reviewed by:	alc
2004-04-25 16:03:41 +00:00
Hiroki Sato 6468edfb33 MFC:
ng_hub(4),
	vr(4) polling support,
	per-interface polling(4) support, and
	random ephemeral port allocation.
2004-04-24 17:33:09 +00:00
Hiroki Sato e0c9b1ba8c Update copyright and version numbers, and trim relnotes
and errata items for 4.10-STABLE.
2004-04-24 13:56:21 +00:00
Mike Silbersack 1493b41f82 MFC rev 1.143 - 1.146:
Randomize ephermal source ports.
2004-04-23 23:31:54 +00:00
Don Lewis ac296511a8 Don't skip the splx() call in *_usr_bind() and *_usr_connect() if the
socket address length check fails.  This is similar to the fix in
revision 1.99, except this version of the fix does not move the sanity
checks out from under the spl.

Submitted by:	pjd
Pointy hat to:	truckman
2004-04-23 19:49:08 +00:00
Ken Smith 59bf0f7ebc Dammage control...
This is the closest mapping to how the development branch got handled
for the previous releases.
2004-04-23 12:00:48 +00:00
Ruslan Ermilov 47885ac32b MFC: polling(4) meets vr(4). 2004-04-22 22:04:52 +00:00
Ruslan Ermilov 2039b93804 MFC: Per-interface polling(4) control. 2004-04-22 22:03:28 +00:00
Ruslan Ermilov 5b0c4be20c MFC: ng_hub(4). 2004-04-22 21:43:43 +00:00
Warner Losh 21beaf0b6f revert rather than argue 2004-04-22 19:54:59 +00:00
Warner Losh 2718c1ae36 MFC: FreeBSD anthology copyright from head
Noticed by: kensmith
2004-04-22 19:24:26 +00:00
Warner Losh 9399f9caa6 BETA->STABLE now that we've branched 2004-04-22 19:18:36 +00:00
Ken Smith 0ccc71cd64 From the better-late-than-never department: Bump copyright year to 2004. 2004-04-22 17:20:13 +00:00
Murray Stokely 7a93aeb05a MFC: Update number of ports and size requirement for ports dist.
Approved by:	re
2004-04-21 11:08:55 +00:00
Murray Stokely 99529a7a08 MFC: Add security/portaudit to disc3.
Approved by:	re
2004-04-21 10:58:20 +00:00
Luigi Rizzo c8f9c3f1cc MFC 1.105: only skip the length field (one byte) when comparing addresses.
Being so close to the code freeze I went for the easy fix -- just remove
the bug -- rather than playing with convoluted casts to produce a
stylistically correct piece of code.  This and whitespace can be
fixed after 4.10 by those interested.

Approved by: re
2004-04-20 23:40:14 +00:00
Ruslan Ermilov 2d9026793b MFC: Sync mdoc(7) with version in HEAD.
Approved by:	re (bmah)
2004-04-20 19:04:23 +00:00
Hiroki Sato fed593391a MFC:
DA_OLD_QUIRKS removed.

Approved by:	re (implicitly)
2004-04-20 18:38:19 +00:00
Nate Lawson 469f228846 MFC quirks.
Approved by:	re (scottl, any mistakes under penalty of beer)
2004-04-20 17:59:44 +00:00
Ken Smith 6ba1378d1b This is a partial MFC of 1.74. From the CVS log for that:
revision 1.74
	date: 2003/01/30 15:00:17;  author: phk;  state: Exp;  lines: +4 -0
	Catch some cases where asking for ridiculously large allocations could
	result in a segfault.  Instead just return NULL.

Requested by:	JINMEI Tatuya <jinmei (at) isl.rdc.toshiba.co.jp> and so@
Reviewed by:	phk (but he's not responsible if this makes 4.10 go boom :-)
Approved by:	re (scottl)
2004-04-20 14:43:25 +00:00
Nate Lawson 53f87a2b69 Prove once again data duplication is bad. Finally remove all instances
of DA_OLD_QUIRKS (I hope?)

Approved by:	re (in principle)
2004-04-20 13:03:55 +00:00
Wilko Bulte bd392fa06a MFC: Linux Alpha powertools link has become obsolete.
Reported by: R. Busch <[email protected]>

Approved by: re (jhb)
2004-04-19 20:29:59 +00:00
Colin Percival f3f0b0dd5b MFC revision 1.31 (plus style fixes thereof): Add support for Exsys
EX-41098 cards.

PR:		kern/65040
Submitted by:	Stefan Grundmann <[email protected]>
Approved by:	re (jhb)
Style fixes by:	bde
2004-04-19 19:28:18 +00:00
Nate Lawson 94b34272d8 Remove opt_da.h from 4-stable Makefile also.
Approved by:	re (future-tense, "unbreaking build good")
2004-04-19 17:32:16 +00:00
Maxime Henrion 68c886d620 Unbreak the build by not including opt_da.h since it doesn't exist anymore.
Kindly asked by		kris, cperciva
Approved by:		re (implicitely, this is to unbreak build)
Hopefully not minded by:	re
2004-04-19 14:13:16 +00:00
Nate Lawson a7c38f622c Remove the DA_OLD_QUIRKS option.
Approved by:	re (scottl)
2004-04-19 06:02:17 +00:00
Nate Lawson 8ac3bbd136 Remove quirks under DA_OLD_QUIRKS. They have been disabled since
2003/8/7 with no problems.

Approved by:	re (scottl)
2004-04-19 05:59:59 +00:00
cvs2svn c10aca829b This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-04-17 23:52:58 +00:00
Hiroki Sato 4221352668 MFC:
SA-04:07.cvs.

Approved by:	re (implicitly)
2004-04-17 17:08:46 +00:00
Christian Brueffer e56048f871 MFC: 1.13
o split a sentence to make it more understandable
o mention that the acctfile has to exist for accton to work
o add reference to acct.5

Approved by:	re (kensmith)
2004-04-17 10:06:38 +00:00
Christian Brueffer 4815eb82c6 MFC: 1.16 - 1.19
o List some sysctl variables that influence accounting
o Add reference to accton.8
o Bump document date

Approved by:	re (kensmith)
2004-04-17 10:04:10 +00:00
Bruce A. Mah 95fd32db0d MFC: src/CHANGES and src/UPDATING.
Fix minor typo in previous commit.

Approved by:	re (implicitly)
2004-04-17 05:22:40 +00:00
Bruce A. Mah 590759f12e Massage the GNOME update note a bit: Fix what looks like a mistaken
reference to kde3, tweak wording slightly, and use the portupgrade
manpage entity.

Approved by:	re (implicitly)
2004-04-17 05:12:33 +00:00
Hiroki Sato 887e94165b New release note:
GNOME 2.6 and KDE 3.2.1.

MFC:
	umct(4) driver added, and SIZE attribute in distinfo.

Update release note:
	Use &man.twa.4;, and
	usb(4) has early support for some USB2 devices[*].

Suggested by:	julian[*]
Approved by:	re (implicitly)
2004-04-16 18:42:08 +00:00
Julian Elischer 7a77567aa7 MFC of several small changes to the USB code..
Diff reduction on several ethernet adapter drivers (name chenges etc)
MFC a Bill Paul Copyright notice.
Add several device IDs.
Reset a uhci controller the same way we do in -current
remove an un-needed include file
add code to probe a Clie 3 series

Approved by: re (scottl@)
2004-04-16 18:12:58 +00:00
Olivier Houchard 3977213e1c MFC rev 1.22:
Call trm_Interrupt() in trm_poll(). This fixes the lock at reboot time some
people reported.

Approved by:	re
2004-04-15 20:16:28 +00:00
Ruslan Ermilov 3a72350fe3 MFC: Bring Groff and mdoc(7) in sync with -CURRENT.
Approved by:	re (bmah)
2004-04-15 19:25:02 +00:00
Jacques Vidrine 4447bf20aa MFC: Patch vulnerabilities in the CVS client and server:
A malicious CVS server could cause your CVS client to overwrite
    arbitrary files (CAN-2004-0180).

    When a CVS client uses the `-p' checkout option, the server could be
    fooled into checking out files from outside the given $CVSROOT.

Submitted by:	Derek Robert Price <[email protected]>
Approved by:	re
2004-04-15 15:35:26 +00:00
Ruslan Ermilov ff68ea7bfb MFC: 1.17: Enforce the poll_burst <= poll_burst_max constraint.
Approved by:	re (scottl)
2004-04-15 08:37:34 +00:00
Stephen McKay d35fa68994 MFC: if_sk.c (revs 1.67 and 1.78), if_skreg.h (revs 1.17 and 1.20).
Add support for Linksys EG1032 and D-Link DGE-530T cards.

Approved by: re (scottl)
Obtained from: OpenBSD/NetBSD (partially)
2004-04-15 07:24:21 +00:00
Vinod Kashyap 01a496c3a9 Added an entry for twa.4 (for 4.x).
Reviewed by: ru
Approved by: re
2004-04-14 18:08:17 +00:00
Vinod Kashyap e3d385db4a Removed old, redundant entry for twa.
Reviewed by: re
Approved by: re
2004-04-14 02:16:22 +00:00
Vinod Kashyap 5139bb84bf Adding man page for 3ware's 9000 series storage controller driver (twa) into 4.x.
Reviewed by: ru
Approved by: re
2004-04-14 02:12:14 +00:00
Julian Elischer 2178f4f320 Add an ID for the "Sitecom Cardreader CN-311"
Approved by: re (scott)
2004-04-13 21:28:58 +00:00
cvs2svn 25afede98d This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-04-13 20:57:45 +00:00
Robert Watson e990da42a0 MFC man page for umct(4) driver.
Approved by:	re (scottl)
2004-04-13 03:42:11 +00:00
Robert Watson 3d14262950 MFC umct(4) driver written by Scott Long <scottl>:
Add 'umct', a driver for MCT Corp. and Belkin F5U109 USB-Serial
  adapters.  This is based on the ubsa driver by Alexander Kabaev along
  with documentation gleaned from the Linux mct_u232 driver.  I've had
  this driver sitting in my tree for almost 6 months, and several others
  have found it useful.

I've been using this with success on my RELENG_4 USB macines.  MFC of
umct.4 to follow.

Approved by:	re (scottl)
2004-04-13 03:39:17 +00:00
Ken Smith 0384ef7a36 Sync list of FTP sites with current reality, and re-do the IPv6 section
to match -current's layout.

Approved by:	re (implicit)
2004-04-13 03:27:47 +00:00
Pierre Beyssac 892898510a MFC rev 1.36/1.37: fix _dns_ghbyname() to return NS_TRYAGAIN instead
of NS_NOTFOUND.  This gets getipnodebyname(3) to correctly return
h_errno=TRY_AGAIN instead of HOST_NOT_FOUND.

Approved by:	re (scottl)
2004-04-12 23:07:29 +00:00
Dag-Erling Smørgrav 98d7d99a7b MFC: (1.66) workaround for servers that ignore ranges in chunked mode.
Approved by:	re (scottl)
2004-04-12 19:52:44 +00:00
Bruce A. Mah 2e61f7fa96 Fix some minor grammar nits. Translators can probably ignore this.
Approved by:	re (implicitly)
2004-04-11 23:51:21 +00:00
Hiroki Sato 0215f09113 Some style fixes.
Approved by:	re (implicitly)
2004-04-11 17:06:28 +00:00
Hiroki Sato 191d022449 The next release is 4.10, not 4.9.1.
Approved by:	re (implicitly)
2004-04-11 11:50:17 +00:00
Hiroki Sato 61234566e9 Bump the version number. We are at 4.10-BETA now.
Approved by:	re (implicitly)
2004-04-10 20:53:05 +00:00
Hiroki Sato 1aef92c6fd MFC:
nge(4) VLAN support bugfix,
	rl(4) polling support bugfix,
	ste(4) polling support,
	twa driver,
	ps(1) supports more POSIX/SUSv3 compatible options, and
	OpenSSL 0.9.7c -> 0.9.7d.

Update release note:
	usb(4) initial support of EHCI and umodem(4) now uses /dev/ucom*.

Approved by:	re (implicitly)
2004-04-10 20:50:13 +00:00
Vinod Kashyap 78dadc9e82 Changed comments following changes to not bundle firmware by default.
Approved by: re
2004-04-10 02:46:27 +00:00
Ken Smith d18d35b702 Move the ciss and twa drivers into modules on floppy disk 2 instead of
inside the kernel on floppy disk 1 for floppy disk based installs.

Approved by:	re (scottl)
2004-04-10 02:13:49 +00:00
Scott Long 81223aa12a MFC rev 1.2: Don't inlcude the firmware image by default.
Approved by:	re
2004-04-10 02:02:27 +00:00
Scott Long f797638298 Hook twa up to the build as i386-only
Submitted by: vkashyap amcc.com
Approved by: re
2004-04-09 23:26:58 +00:00
Ken Smith 9f8b0a0dad First pass at disc1 package set adjustments for upcoming release.
Approved by:	re (scottl)
2004-04-09 19:34:09 +00:00
Lukas Ertl 459a54197a Correct check for md type drives and allow vinum to be run on
storage array type drives like ida(4).

PR:           bin/59042
Submitted by: Thomas Sandford <[email protected]>
Approved by:  grog (mentor)
Approved by:  re
2004-04-08 06:37:02 +00:00
Colin Percival 36c2455970 MFC revision 1.1.1.11: Repair a regression in OpenSSL 0.9.7d which could
cause a null pointer dereference.

Requested by:	nectar
Approved by:	re (scottl)
2004-04-08 05:36:17 +00:00
Vinod Kashyap a530cc89f4 Merged changes from twe in -CURRENT to RELENG_4.
Reviewed by: ps
Approved by: re
2004-04-07 22:18:01 +00:00
Vinod Kashyap 6f47e15f97 Initial check-in (for 4.x) of the device driver (twa) for 3ware's 9000 series
PATA/SATA RAID controllers.  This driver is a SIM under CAM, and so, behaves
like a driver for a SCSI controller.

Reviewed by: ps
Approved by: re
2004-04-07 20:29:01 +00:00
Vinod Kashyap 4806369cab Initial check-in (for 4.x) of the device driver for 3ware's 9000 series
PATA/SATA RAID controllers.  This driver is a SIM under CAM, and so, behaves
like a driver for a SCSI controller.

Reviewed by: ps
Approved by: re
2004-04-07 20:20:07 +00:00
Colin Percival 172cfeaefa Wrap security/freebsd-update inside if [ "X${PKG_ARCH}" = "Xi386" ], in
order to avoid breakage.  (security/freebsd-update is currently marked
i386-only.)

Approved by:	re (scottl)
2004-04-07 13:09:28 +00:00
Scott Long c737a26a5e Enter the 4.10 release cycle by going to 4.10-BETA
Approved by:	re
2004-04-07 12:36:50 +00:00
Ruslan Ermilov d519e0e833 Fixed a bug in previous revision: compute the payload checksum before
we convert ip_len into a network byte order; in_delayed_cksum() still
expects it in host byte order.

The symtom was the ``in_cksum_skip: out of data by %d'' complaints
from the kernel.

To add to the previous commit log.  These fixes make tcpdump(1) happy
by not complaining about UDP/TCP checksum being bad for looped back
IP multicast when multicast router is deactivated.

Reported by:	Vsevolod Lobko
2004-04-07 10:01:39 +00:00
Roman Kurakin 23a07ddd61 MFC: Add ct control devices for Cronyx Tau. 2004-04-07 09:53:54 +00:00
Roman Kurakin f20404ef12 MFC:
1. Extend Cronyx Sigma record cx(4).
2. Add Cronyx Tau record ctau(4).
2004-04-07 09:50:03 +00:00
Roman Kurakin 8a92525891 MFC:
1. Remove hyphen between prodoct and company name for Cronyx Sigma (cx (4)).
2. Add list of models for Cronyx Sigma.
3. Add Cronyx Tau (ctau(4)) entry.
2004-04-07 09:37:31 +00:00
Kirill Ponomarev 35135c1ac9 - Use "/bin/hostname" explicitly instead of "hostname".
MFC:		etc/rc.d/hostname rev 1.7
Approved by:	tobez
2004-04-07 09:27:30 +00:00
Roman Kurakin a9dc217a40 Add entries for ct.4 and ctau.4 as part of MFC. 2004-04-07 09:23:55 +00:00
Roman Kurakin c38b5311b7 Unbreak compilation of driver with option NETGRAPH_CRONYX. 2004-04-07 09:21:27 +00:00
Roman Kurakin 255f56bed3 MFC: Connect ct.4 and ctau.4 to system.
Approved by: imp (mentor)
2004-04-07 09:14:17 +00:00
Roman Kurakin 634f80b8ed MFC: Manual page for ct (4) device. 2004-04-07 09:11:58 +00:00
Roman Kurakin e3c04948b6 MFC: Add support for Cronyx Tau adapters (ctau (4) driver).
Approved by: imp (mentor)
2004-04-07 09:09:47 +00:00
Roman Kurakin ea49dffefe MFC: rev 1.22 2004-04-07 09:08:23 +00:00
Ruslan Ermilov 6e11e8bf30 MFC: 1.6: make this compile without warnings. 2004-04-07 08:59:32 +00:00
Roman Kurakin 9e935e51fd MFC: Add support for Cronyx Tau adapters (ctau (4) driver).
Approved by: imp (mentor)
2004-04-07 08:53:48 +00:00
Roman Kurakin fbc155aa69 MFC: Add support for Cronyx Tau adapters (ctau (4) driver). Connect driver
to the system.

Approved by: imp (mentor)
2004-04-07 08:39:06 +00:00
Roman Kurakin db0b437223 MFC: Add support for Cronyx Tau adapters (ctau (4) driver).
Approved by: imp (mentor)
2004-04-07 08:28:05 +00:00
Roman Kurakin 536e23d0f4 MFC: Add support for Cronyx Tau adapters (ctau (4) driver).
Approved by: imp (mentor)
2004-04-07 08:17:14 +00:00
Roman Kurakin 857f32a3c8 MFC: Add support for Cronyx Tau adapters (ctau (4) driver).
Approved by: imp (mentor)
2004-04-07 08:11:57 +00:00
Gregory Neil Shapiro 547ccb4b72 MFC: Fix path to rc.sendmail
Revision  Changes    Path
     1.25      +1 -1      src/contrib/sendmail/FREEBSD-upgrade
2004-04-07 05:32:13 +00:00
Paul Saab 19151ba2de MFC:
Add support for the Altima 1002, BCM5901, BCM5901 rev A2 and BCM5788.
2004-04-06 22:53:00 +00:00
Ceri Davies 2931a85491 MFC revision 1.16:
Add a new threads category.
2004-04-06 21:19:12 +00:00
Ruslan Ermilov ef8e79dae8 Overdue MFC of rev. 1.58.
Noticed by:	rwatson
2004-04-06 20:11:53 +00:00
Paul Saab 2ef6bb4f17 MFC: rev 1.66
Enable the memory arbiter before turning off the PXE restart.
2004-04-06 18:30:05 +00:00
cvs2svn 7c720078c5 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-04-06 12:34:26 +00:00
Ruslan Ermilov 0661ed5295 Actually fix the TX performance with polling(4) enabled
by increasing the TX list size from 64 to 128, which is
adequate for HZ=1000.

Submitted by:	Vsevolod Lobko
2004-04-06 11:04:54 +00:00
Bruce M Simpson 10ba73459e MFC: Fix regression in setkey whereby parser would fail to recognise tcp
as both a security protocol and an upper level protocol for encapsulation.

PR:		bin/63616
Submitted by:	ume@
2004-04-06 10:02:12 +00:00
Ruslan Ermilov 3110d38de0 MFC: ste(4) meets polling(4). 2004-04-06 08:44:55 +00:00
Ruslan Ermilov 3812bd3da5 MFC: synch driver with its -CURRENT version, including the support
for polling(4) and a work-around to deal with the hardware problem
of a stuck RX.
2004-04-06 08:40:39 +00:00
Colin Percival 1330fde7ae MFC revision 1.49 of pkg_info.1, revision 1.44 of main.c:
1. Clarify that `pkg_info -flags' needs either `-a' or a package name. [1]
2. Sychronize `usage:' with the manual page.

PR:		misc/64786 [1]
2004-04-06 03:49:11 +00:00
Warner Losh 38dedff018 MFC 1.128: Improve identification of VIA C3 Samuel, Samuel2, Ezra,
Ezra-T and Nehemiah CPUs.

MFC Forgotten by: imp
MFC Reminder: Yasuhiro KIMURA-san.
2004-04-06 01:40:30 +00:00
Julian Elischer 2faf5aeb11 MFC of 1.62->1.63
retry on the first action to hit the device, not the 2nd.
2004-04-06 00:46:02 +00:00
Maxim Konovalov 74b26872cd MFC rev. 1.141: the lenght of the port list is limited to 30 entries
in ipfw2 not to 15.
2004-04-05 19:33:44 +00:00
Shunsuke Akiyama 0145fbd314 umodem driver is no longer used /dev/umodem* device node.
Now it's used /dev/ucom* device node.
2004-04-05 14:02:56 +00:00
Ruslan Ermilov 036baabcc9 MFC: 1.134: Three bugfixes, mostly affecting polling(4). 2004-04-05 07:31:18 +00:00
Guido van Rooij 43c3d6d390 MFC:
mount.c: rev 1.58-1.61
mount.8: rev 1.60 and 1.61

This unbreaks -o fstab and -o current in combination with -a

Reminded by: Pawel Malachowski
2004-04-05 07:23:20 +00:00
Josef Karthauser aed0e651fa MFC: Add support for Treo600 (rev 1.18) 2004-04-04 19:17:35 +00:00
Josef Karthauser 953e03cf0c Regen. 2004-04-04 19:17:00 +00:00
Josef Karthauser dff4f556a5 MFC: Syncronise the device list with -current. 2004-04-04 19:16:31 +00:00
Garance A Drosehn e00893febb MFC 1.74 1.75 & 1.80: Sort the declarations of global variables, and
split two 'fmt' strings so they're easier to read on 80-char windows.

Approved by:	re(scottl)
2004-04-04 18:16:37 +00:00
Garance A Drosehn 1302b23d33 MFC 1.73 & 1.83: Sort the routine prototypes.
Approved by:	re(scottl)
2004-04-04 18:01:23 +00:00
Garance A Drosehn f21f8da873 MFC *: Change the #if-ish logic which is used to add the `-f' option
when `ps' is compiled with LAZY_PS, so that there is only one PS_ARGS
string to modify when changing the option-list.  Also get `-f' to show
up in the usage() statement when compiled with LAZY_PS.  Also move the
'f' case in the select statement, so it in alphabetical order.

[* = 1.68 1.69 & 1.86 ps.c]

Approved by:	re(scottl)
2004-04-04 17:50:23 +00:00
Garance A Drosehn 4b8012927a MFC *: Support more POSIX/SUSv3 options:
- Change `-p' to allow a list of process IDs, and `-t' to allow a list
    of terminal names, instead of only a single value for each.
  - Add the `-A' option of SUSv3, which is exactly the same as `-ax'.
  - Add the `-G gidlist' (group id).
  - Allow any of these "selector options" to be specified multiple times,
    and have `ps' keep adding to a given list -- instead of replacing the
    previously-specified values.
  - Fix interactions between selector-options, so that: "If any are
    specified, ... ps shall select the processes represented by the
    inclusive OR of all the selection-criteria options." (from SUSv3)
  - Add a `-X' option, which is the reverse of the `-x' option.
  - various minor improvements in parsing and error handling.

This should result in no user-visible changes, except for adding the
new features.  The man page is updated to describe the new features,
and to describe the sorting options in better and more complete detail.

[* = 1.67 1.72 1.76->1.79 1.84 & 1.85 ps.c,  1.71->1.74 ps.1]

Approved by:	re(scottl)
2004-04-04 17:03:40 +00:00
Colin Percival de4a869aff Finish initializing a knote before we pass it to a callout. This had
resulted in panics if large numbers of events were created with short
timeouts.

This hasn't been fixed in -CURRENT yet; 5.x has a more serious race
condition which I need to fix first.

PR:		kern/64121
Submitted by:	Gerrit Nagelhout
2004-04-04 07:03:14 +00:00
Yoshihiro Takahashi 93f9742943 MFi386: revision 1.27.2.12. 2004-04-04 04:38:26 +00:00
Roman Kurakin 32f7e5f566 Unbreak MAKEDEV all (MAKEDEV cx)
Pointed by:	nyan
2004-04-03 14:26:30 +00:00
Ruslan Ermilov e9fb26d230 MFC: 1.55: Properly program the VLAN TCI field (in network byte order). 2004-04-03 07:11:11 +00:00
Andre Oppermann 67d8b42a96 MFC of rev 1.50, fix refcount leak in verify_rev_path() function.
Reviewed by:	sam
2004-04-02 17:15:44 +00:00
Robert Watson be6705113c MFC src/sys/fs/msdosfs/msdosfs_vfsops.c:1.119:
Don't reject FAT file systems with a number of "Heads" greater than
  255; USB keychains exist that use 256 as the number of heads.  This
  check has also been removed in Darwin (along with most of the other
  head/sector sanity checks).
2004-04-02 16:56:10 +00:00
Roman Kurakin 89fe3acbe0 MFC: Add Cronyx-Sigma entries. (cx(4) and sconfig(8))
Approved by:	imp (mentor)
2004-04-02 16:07:56 +00:00
Roman Kurakin a392df8aed MFC: Add Cronyx-Sigma entry.
Approved by:	imp (mentor)
2004-04-02 16:03:56 +00:00
Roman Kurakin ac03705b9d MFC: Retire old cx(4) driver.
Approved by:	imp (mentor)
2004-04-02 15:59:56 +00:00
Roman Kurakin 7bf69ca361 MFC:
1. Remove reference to cxconfig.8
2. Add reference to sconfig.8

Approved by:	imp (mentor)
2004-04-02 15:46:29 +00:00
Simon L. B. Nielsen 8c7a272bc3 MFC v. 1.21 (from usr.sbin/nfsd/nfsd.8):
Add a cross reference to exports(5).
2004-04-02 10:40:42 +00:00
Jacques Vidrine 2c1f04b982 MFC OpenSSL 0.9.7d. 2004-04-02 01:11:21 +00:00
Alfred Perlstein b4a40edb7b Revert atkb change so that we can rebreak POLA for the sake of release.
Requested by: scottl
2004-04-01 22:59:22 +00:00
Alfred Perlstein 3e53d5fec2 MFC: Fix booting with ps2 keyboards. 2004-04-01 21:49:17 +00:00
Roman Kurakin 77b9d02d11 MFC: Finaly kill cxconfig itself.
Approved by:	imp (mentor)
2004-04-01 18:35:04 +00:00
Roman Kurakin 6220f8d69b MFC: Kill already dead cxconfig entry.
Approved by:	imp (mentor)
2004-04-01 18:26:16 +00:00
Roman Kurakin fd4abcf5cc MFC: connect sconfig to system build process.
Approved by:	imp (mentor)
2004-04-01 18:24:29 +00:00
Roman Kurakin e07b66bafc 1. Add making all Cronyx-Sigma devices (cx?, cuax?, cuay?, cuaz?, ttyx?, ttyy?
ttyz?)
2. Remove old control device /dev/cronyx in favour of /dev/cx? (it is safe to
   do it befor rm cxconfig, cause it is not linked to system build process.)

Approved by:	imp (mentor)
2004-04-01 17:12:58 +00:00
Roman Kurakin 1fd66ee745 MFC: Update man cx(4) to reflect driver changes.
Approved by:	imp (mentor)
2004-04-01 17:08:35 +00:00
Roman Kurakin 7be90102f8 MFC: New driver doesn't need old compatibily scheme.
Approved by:	imp (mentor)
2004-04-01 16:57:00 +00:00
Roman Kurakin 0496c9492b MFC:
1. Remove references to old driver.
   2. Connect new one to the system.

Approved by:	imp (mentor)
2004-04-01 16:55:30 +00:00
Roman Kurakin 732f5942b8 MFC: Remove references to old driver. We do not support pc98 at all.
Approved by:	imp (mentor)
2004-04-01 16:48:08 +00:00
Roman Kurakin e95439c7ac MFC: Add NETGRAPH_CRONYX option (if set, enables NETGRAPH support).
Approved by:	imp (mentor)
2004-04-01 16:40:28 +00:00
Roman Kurakin 68d3f74d3d MFC: Cronyx-Sigma entry.
Approved by:	imp (mentor)
2004-04-01 16:16:56 +00:00
Ruslan Ermilov 37c940eb30 MFC: 1.7, 1.9: Improved documentation about polling(4). 2004-04-01 11:12:29 +00:00
Ruslan Ermilov d1ea0a8600 Fixed bad bits of the polling(4) support MFC. 2004-03-31 15:17:57 +00:00
Ruslan Ermilov f5bca6da54 MFC: 1.212: Rework multicast routing interaction with delayed checksums. 2004-03-31 07:52:15 +00:00
Dag-Erling Smørgrav 749aa8cdb5 Revert previous commit (which removed locales that 4.x still has) 2004-03-30 20:59:41 +00:00
Robert Watson 692c4b0985 MFC src/usr.sbin/sbin/nfsd.c:1.29:
Problem:

    When an NFS server is port-scanned nfsd sometimes exits. This has
    happened 3 times the last few weeks.

    Nfsd has been written to exit when accept(2) fails. Unfortunately
    accept can sometimes make a "normal" return with errno ECONNABORTED
    and in this case nfsd exits prematurely.

  Solution:

    Check for ECONNABORTED (and also EINTR, since nfsd uses signals)
    and continue.

  Submitted by:   Bjoern Groenvall <[email protected]>
  PR:             61084

Reminded by:	Lewis Thompson <[email protected]>
2004-03-30 20:25:33 +00:00
Dag-Erling Smørgrav 3c41ae2dcf Synch with -CURRENT. 2004-03-30 19:40:35 +00:00
Dag-Erling Smørgrav 9364eb7072 Synch with -CURRENT. 2004-03-30 18:48:03 +00:00
Ken Smith 4b210dd4da Add information about the most recent Security Advisory. 2004-03-30 18:18:34 +00:00
David Malone 3dbc2290d3 MFC 1.19: Make the vaule of PTT_RELAY_SID match the RFC. 2004-03-30 14:03:02 +00:00
Dag-Erling Smørgrav 8f56fff5e5 MFC (rev 1.61): do not print warning if kernel does not support PIM 2004-03-30 09:18:15 +00:00
Pawel Jakub Dawidek a6713ff0d8 This is the right fix for the information leakage.
Reported by:	Dave Tweten
2004-03-30 07:53:17 +00:00
cvs2svn b0e84c1cea This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-03-30 03:46:01 +00:00
Roman Kurakin 368b869b85 MFC: configuration utility for Cronyx adapters. Replacement for cxconfig.
Old code will be deleted after switching system files to new one.

Approved by:	imp(mentor)
Approved by:	re
2004-03-29 21:36:19 +00:00
Roman Kurakin d54087f2b6 MFC: modules support for Cronyx-Sigma adapters.
Approved by:	imp (mentor)
Approved by:	re
2004-03-29 21:34:29 +00:00
Roman Kurakin e521edb4ed MFC: ioctls for Cronyx serial adapters.
Approved by:	imp (mentor)
Approved by:	re
2004-03-29 21:32:33 +00:00
Roman Kurakin e8b9283cf6 MFC: Update code for Cronyx-Sigma adapters. Old code will be deleted after
switching system files to new one.

Approved by: imp (mentor)
Approved by: re
2004-03-29 18:06:33 +00:00
Julian Elischer e46a558aea Turn allow people to compile the EHCI driver into a kernel.
It is not yet perfect, but it does work enough to be useful.
2004-03-29 18:04:29 +00:00
Ken Smith 71a41470d1 Fixes to file locking issues.
MFC:  usr.sbin/pw/edgroup.c 1.9
      usr.sbin/pw/fileupd.c 1.10
2004-03-29 14:14:21 +00:00
Julian Elischer 0587919163 MFC 1.142
After examining the remaining diffs after MFCing,
I've decided that -current has this right and 4.x has this wrong..
Set the buffer end address as startpage + offset + buflen
instead of startpage + buflen
After all, the buffer START is startpage + offset
2004-03-29 09:23:19 +00:00
Julian Elischer 41a53fdc65 MFC 1.142
MFNetBSD Version 1.146
    various probing and attaching tweeks.

Submitted by:   Rudolf Cejka <[email protected]>
2004-03-29 08:53:26 +00:00
Hajimu UMEMOTO 6f8a84cc00 MFC 1.52: in icmp6_mtudisc_update(), use ND link mtu to detect
if the path MTU should be updated.
2004-03-28 15:13:37 +00:00
Hajimu UMEMOTO c1876395b8 MFC 1.62 (partly), 1.77 (partly):
- notify a proper path MTU to applications.
  - strictly follow RFC2460 section 5 last paragraph (sending rule when
    PMTU < 1280).
2004-03-28 15:11:57 +00:00
Hidetoshi Shimokawa ad57d94411 Sync with -current:
* all
- s/__FUNCTION__/__func__/.
- Compatibility for RELENG_4 and DragonFly.

* firewire
- Fix kldload failure
- Add a PCI ID of NEC uPD72873.
- Fix a bug reported misc/64623.
- Timestamp just before queuing.
- Retry bus probe if it fails.
- Use device_printf() for debug message.
- Invalidiate CROM while update.
- Don't process minimum/invalid CROM.

* sbp
- Add ORB_SHORTAGE flag.
- Add sbp.tags tunable.
- Revive doorbell support. It's not enabled by default.
2004-03-28 11:50:43 +00:00
Hajimu UMEMOTO ba3451e7dd MFC 1.45: missing splx(). 2004-03-28 09:01:26 +00:00
Garance A Drosehn 9de161e859 MFC 1.29: Add a check for wtmp records which have invalid values for
ut_time.  Wtmp records with time==0 get "the time of the last valid
record", while records where time goes backwards (compared to the
previous record) are skipped.  Also prints a message saying how many
records were changed or skipped due to these checks. This check was
inspired by a simpler check in OpenBSD's version.
2004-03-27 18:02:44 +00:00
Garance A Drosehn 0b0b13e4a8 MFC 1.28: Add a debug-statement from NetBSD, and then rework all
debug-statements so the program compiles without errors or warnings
when DEBUG is defined on sparc64 with 64-bit time_t's (in -current).
Also have debug statements include the year when printing records
from a different year than 'now'.  Also print out a special
timestamp in debug statements when ut_time==0.
2004-03-27 17:58:46 +00:00
Garance A Drosehn 328ab403ca MFC 1.22->1.27: A variety of cosmetic changes, warning-reducing fixes, or
style(9) improvements.  After this, ac.c compiles okay with WARNS=5.
2004-03-27 17:53:19 +00:00
Garance A Drosehn 4297921b2d MFC 1.20->1.21: These are changes which were important for utmp fixes
done in current.  In my testing they do not change the results of ac,
but I want to MFC these to make later MFC's easier.
2004-03-27 17:41:19 +00:00
Garance A Drosehn 5da55a03a3 MFC 1.19: Fix logic error resulting in incorrect calculation of login time
(from Aug 5, 2001)

PR:		bin/4204
Submitted by:	Anatoly A. Orehovsky
2004-03-27 17:17:45 +00:00
Garance A Drosehn b552d94f66 MFC 1.17->1.18: Constify. Replace strncpy -> strlcpy. 2004-03-27 17:11:56 +00:00
Garance A Drosehn fb7ced41c0 MFC 1.66: Fix 'ps -p proclist' and 'ps -u userlist' so the command
returns non-zero if no processes were matched.  Also sorts the list
of 'int's in main, as long as I had to add another one...
2004-03-27 16:35:36 +00:00
Garance A Drosehn 22647ba58e MFC *: Improvements to 'ps -p <x>'. Wrt 4.x-stable, this adds support
for <x> being a comma-separated list of processes, and does a much
better checking for invalid-values of <x>, such as 'ps -p someword'.

[* = 1.65 ps.c, 1.67 ps.1]
2004-03-27 16:27:46 +00:00
Ceri Davies e0114bb9f1 MFC revisions 1.25 and 1.26 of src/usr.sbin/mountd/exports.5:
Note that only one webnfs share is allowed per NFS server.
2004-03-27 14:28:01 +00:00
Pawel Jakub Dawidek 4e401c9005 MFC informations leakage fix.
Reviewed by:	rwatson
2004-03-26 22:07:27 +00:00
Julian Elischer 210a962846 MFC latest MFNetBSD.
MFC: 1.5->1.6, "Diff reduction to NetBSD"
Obtained from: NetBSD via -current
2004-03-26 21:42:34 +00:00
Hidetoshi Shimokawa 319f08b246 Revert the previous change(rev 1.2.2.4).
Depending on CAM module seems to have ill effect on RELENG_4 when
CAM is compiled into the kernel.
2004-03-26 09:53:17 +00:00
Diomidis Spinellis 9bad1b8e27 MFC revision 1.28
Shave-off troff cycles by invoking .Fa only once.

Submitted by:	ru
2004-03-26 08:57:50 +00:00
Julian Elischer 527b9e1a94 Shut up stupid compiler warning. 2004-03-26 08:46:37 +00:00
Julian Elischer 294385da1f MFC 1.60->1.62
MFC some diffs from NetBSD to improve probing of some troublesom
 devices.
2004-03-26 08:39:37 +00:00
Garance A Drosehn 1726747766 More code-diff reductions wrt ps.c in 5.x-current, to make it easier to
MFC some upcoming updates.  This should cause no user-visible changes.
2004-03-25 19:16:40 +00:00
Ruslan Ermilov 66bbd65fc9 MFC: 1.63: Reprogram hardware RX filters when IFF_ALLMULTI flag is set. 2004-03-25 08:49:22 +00:00
Ruslan Ermilov aa4a1b937e MFC: 1.417: visual bell bugfix. 2004-03-25 08:41:09 +00:00
Hiroki Sato 8395465263 New release note:
better usb(4) support merged from -CURRENT,
	disklabel(8) -f option.

MFC:
	umass(4) timeout/ATAPI MMC command support.
2004-03-24 18:05:29 +00:00
Luigi Rizzo 3be06f9f9c do not run newaliases by default on diskless machines.
We can do that from the local rc files if necessary.
2004-03-24 11:42:51 +00:00
Luigi Rizzo a06f1734d6 Insert the directories passed with the T134 bootp cookie
(kern.bootp_cookie) in the list of paths used for diskless templates.

When foo.cpio.gz archives are present, do not copy the content from a
foo/ directory even if present. This restores the previous behaviour,
and is also important from the point of view of efficiency (saving
many RPCs to copy the individual files), which was the whole point for
introducing the cpio archive.

(these files are not anymore in -current but equivalent functionality
will be implemented there, and the maintainer has been already informed).
2004-03-24 11:41:56 +00:00
Colin Percival ccc9e49ac3 MFC revision 1.69: Correctly adjust the number of processes waiting on a
semaphore if we're woken up in the middle of sleeping.
2004-03-24 11:41:19 +00:00
Julian Elischer e8f5cf70d9 Don't needlessly duplicate a packet when we only have one destination
hook attached.

An MFC I forgot a couple of years ago.
2004-03-24 09:01:00 +00:00
Julian Elischer 1603874d27 MFC 1.25->1.26, don't collect statisitics for disconnected hooks. 2004-03-24 08:50:29 +00:00
Pawel Jakub Dawidek ca1268ef42 MFC: Fixed a bug: When symbolic link is pointed onto a mount point,
it can't be moved to a different file system.

PR:		bin/64430
Submitted by:	Samuel Tardieu
2004-03-24 08:34:36 +00:00
Luigi Rizzo ff6e3167f0 Add a -f option to make disklabel to work on regular files (representing
disk images). The change actually boils down to little more than
providing the equivalent of a 'virgin' label for the file, all
the remaining label manipulation being the same.
This saves the need for going through vn/mdconfig (and root privs)
just to label an image file.

RELENG_4 only commit because disklabel is not in RELENG_5/CURRENT anymore,
though I suspect a similar change could be applied to bsdlabel and friends.
2004-03-24 08:34:22 +00:00
Jens Schweikhardt 614a0e4598 Sync with CURRENT (rev. 1.143) 2004-03-23 19:41:32 +00:00
Garance A Drosehn 4430d425c7 MFC various style(9)-ish and other cosmetic changes from -current,
mainly to greatly reduce the code-diffs in ps.c (but that dragged
in some similar changes to the other files).  This should result
in no user-visible changes.  This is done to make it easier to MFC
some user-visible changes that are coming up, but those MFC's will
be done at a later date.
2004-03-23 18:40:24 +00:00
Anton Berezin 70d92a3802 Fix hostname determination from linux applications inside a jail
(uname(2) used to return the host environment's hostname).

Approved by:	silence on emulation@
2004-03-23 12:16:48 +00:00
Paul Saab cadec8d42e MFC:
speedup stream socket recv handling by tracking the tail of the
mbuf chain instead of walking the list for each append.  This has
been pretty well tested at Yahoo!

Obtained from:	netbsd (jason thorpe)
Reviewed by:	silby
2004-03-22 23:59:55 +00:00
Ruslan Ermilov 0a57da35a2 MFC: install /bin/sh in safe mode thus allowing the use of
shell scripts to strip binaries during installworld.
2004-03-22 07:40:12 +00:00
Hiroki Sato 3c1cd5bcfe MFC: Update the supported hardware.
Approved by:	scottl
2004-03-21 15:25:49 +00:00
Christian Brueffer 7ff44475fb MFC: 1.10
Grammar fix
2004-03-21 09:56:26 +00:00
Julian Elischer dcd38311ed MFC of 1.59->1.60 usb_subr.c
"Re-enable detach events after adding a bugfix from NetBSD
  that unbreaks them."
2004-03-21 07:39:51 +00:00
Scott Long 02fbca395d MFC: Add support for two new cards, along with one somewhat older one. 2004-03-20 21:10:08 +00:00
Maxim Konovalov f0873446bb MFC rev. 1.25: document 'callback phone_number'. 2004-03-20 19:33:58 +00:00
Jens Schweikhardt b694c0983f Catch up with -CURRENT. This includes:
* Fixes to xterm
* screen enhancements
* compact mvterm entry
* style police
2004-03-20 09:46:33 +00:00
Hiroki Sato 186376a878 MFC:
xl(4) hardware TX checksum disabled.
2004-03-20 06:19:38 +00:00
Mike Silbersack 314e12f912 MFC rev 1.167; disable TX checksumming 2004-03-19 23:21:05 +00:00
Daniel Harris f0a50a4f55 MFC 1.14: Remove extra "the". 2004-03-19 14:28:53 +00:00
Diomidis Spinellis a08b6abb17 MFC 1.27 changes.
Document missing EFAULT errno value.
2004-03-19 14:16:07 +00:00
Colin Percival 36881235d9 MFC rev. 1.20 2004-03-19 08:26:52 +00:00
Ceri Davies 252dddee10 MFC r1.15:
Correct a grammatical error.

	PR:		docs/63984
	Submitted by:	Ulrich Spoerlein <[email protected]>
2004-03-18 20:44:01 +00:00
Hiroki Sato e36238c022 MFC: SA-04:05.openssl. 2004-03-18 16:41:35 +00:00
Nate Lawson cfa6505f7d MFC: bus_alloc_resource_any(9) for compatibility with 5.x. No driver
conversions will be done in 4.x.
2004-03-17 17:54:25 +00:00
David Malone 9edf684ba6 Enable the programming of multicast filters on -stable.
Reviewed by:	julian
2004-03-17 17:39:12 +00:00
Jacques Vidrine 58a6c81357 MFC s3_pkt.c 1.1.1.9:
Correct a denial-of-service vulnerability in OpenSSL (CAN-2004-0079).
2004-03-17 12:23:51 +00:00
Tom Rhodes 6ccb52b2af Attach newsyslog.conf.5 to the build. 2004-03-16 20:12:38 +00:00
Tom Rhodes bd14e3a769 MFC the new syslog.conf.5 manual page and changes from newsyslog.8 rev 1.43. 2004-03-16 20:12:06 +00:00
Ruslan Ermilov 2726e84f43 MFC: 1.414, 1.415: Fixed the essential GID checks.
Prodded by:	gshapiro
2004-03-16 17:55:57 +00:00
Hiroki Sato d40be2bd43 MFC:
em(4) hiccup fix,
	ng_vlan(4),
	ifconfig(8) polling status support.
2004-03-16 15:28:16 +00:00
Ruslan Ermilov 4ae87c331a MFC: 1.313: Use fresh tools in installkernel, if available.
1.416: Create hierarchy before installing a new kernel.
2004-03-16 08:34:19 +00:00
Colin Percival 5d56b2bca9 MFC rev. 1.14 2004-03-16 07:12:44 +00:00
Colin Percival 6204eba859 MFC rev. 1.39 2004-03-16 07:11:07 +00:00
Max Khon b8b83d6fae softdep_sync_metadata: fix bug introduced in rev. 1.57.2.10:
call drain_output() in correct place
(before checking dirty list and with locks held).

Approved by:	mckusick
Spotted by:	<[email protected]>
2004-03-15 18:04:41 +00:00
Ruslan Ermilov d245d79c4f MFC: 1.98, 1.99. Mainly useful for displaying the polling(4) status
of the interface.
2004-03-15 07:25:30 +00:00
Marc Fonvieille a76d86792e MFC: 1.35
Typo fix.
2004-03-14 12:59:10 +00:00
Colin Percival a36a0201bb MFC of revisions 1.21, 1.24. This allows script to operate
non-interactively, and avoids doing tty stuff to non-ttys.

PR:		bin/56166, bin/57414, ports/57415, bin/59036, ports/60534
2004-03-13 09:21:00 +00:00
Colin Percival 857a545a2e MFC of revision 1.27
Approved by:	rwatson (mentor)
2004-03-12 23:33:10 +00:00
cvs2svn 62fe8c45a9 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-03-12 21:45:34 +00:00
Christian Brueffer 9e5e0da0ef MFC: 1.16
s/controller/device/ in synopsis

Prodded by:	Recent change in DragonFlyBSD
2004-03-12 16:07:11 +00:00
Peter Wemm 5992e1a0e6 MFC: part of vm_map.h rev 1.68 and vm_map.c 1.212. This is actually
a prequisite of the vm_map.c rev 1.280 that dillon prematurely MFC'ed
on Jan 13th, 2003.  Without this change, the kernel leaks vmspaces
to varying degrees depending on the circumstances.  Specifically,
vm_exitingcnt was being copied from the parent to the child when it
might have been non-zero.  This caused the child's vm_exitingcnt to
never hit zero.  This was blowing up machines at work.
2004-03-12 00:24:56 +00:00
Ruslan Ermilov 05f0dcfa84 ng_vlan(4) for the masses. 2004-03-10 15:35:20 +00:00
Lukas Ertl 4753f22e0c When faking disklabels, change default fragment size from 1k to 2k
as this is more appropriate for modern disks.

Also, remove a duplicate variable assignment.

PR:              kern/63839
Submitted by:    Dmitry Morozovsky <[email protected]>
Approved by:     grog (mentor)
2004-03-09 10:18:47 +00:00
Maxim Konovalov b5d332bae1 MFC revs. 1.77, 1.78: FreeBSD 5.2.1, NetBSD 1.6.2. 2004-03-07 07:56:20 +00:00
Christian Brueffer eae2c1eaeb MFC:
Add bfe(4)
2004-03-05 11:48:33 +00:00
Christian Brueffer 4ba9abcda1 MFC: 1.2
o remove stray 'the'
o remove instance of wrong apostrophe usage
2004-03-05 11:45:14 +00:00
Bruce A. Mah 4120fb130a MFC: SA-04:04. 2004-03-05 04:23:42 +00:00
Ceri Davies c1bff3b651 MFC revision 1.22:
Have edquota honour MAXLOGNAME rather than hardcoding the maximum
	  username length to 29 characters.

PR:             misc/62944
Submitted by:   David Hill <[email protected]>
Approved by:    ru
2004-03-04 19:23:05 +00:00
Bruce A. Mah 03b38e0a9c MFC: SA-04:04. 2004-03-04 17:07:22 +00:00
cvs2svn c1729b49ca This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-03-04 14:16:13 +00:00
Bruce M Simpson db602b2488 MFC: Add a new option to mountd(8), -p <port>. This allows the user to specify
a known port for use in firewall rulesets; otherwise the port is chosen
at run-time by bindresvport().

No objection from:	-security@
2004-03-04 13:04:32 +00:00
Tom Rhodes 1db125c226 MFC: rev 1.57 (-follow, / in place of .)
MFC: rev 1.56 (fix a type s/h/H/)
2004-03-04 12:02:44 +00:00
Don Lewis 32f62429e1 Forced commit. Previous commit also MFC'ed sys_process.c rev 1.117.
When reparenting a process in the PT_DETACH code, only set p_sigparent
  to SIGCHLD if the new parent process is initproc.
2004-03-04 09:02:37 +00:00
Maxim Konovalov f3cba6605a MFC rev. 1.59: sysctl net.inet.ip.forwarding=1 is needless. 2004-03-04 05:04:15 +00:00
Maxim Sobolev 45bca2a70e MFC: Pentium 4 thermal control circuit support. 2004-03-03 15:24:15 +00:00
Ruslan Ermilov 07bf472928 Properly adjust an mbuf(9) chain in ether_input() after stripping
Ethernet header.

PR:		kern/62989
2004-03-03 12:35:16 +00:00
Ruslan Ermilov 6ef444c522 MFC: 1.22: Use newer constraints for inline assembly to indicate
that an operand is input/output.  This is also -O0 friendly.

OK'ed by:	bde
2004-03-03 12:31:50 +00:00
Ruslan Ermilov f2f7d9e610 Alongside rev. 1.33, use static __inline', not extern __inline',
for __cursig(), needed to be able to compile the kernel with -O0.
2004-03-03 12:29:50 +00:00
Don Lewis 70a6ce0e19 MFC: kern_exit.c 1.222
A Linux thread created using clone() should not send SIGCHLD to its
    parent if no signal is specified in the clone() flags argument.

PR:	42457
2004-03-03 09:21:14 +00:00
Don Lewis 67405fb569 MFC: kern_exit.c 1.221
sys_process.c	1.116

    When reparenting a process to init, make sure that p_sigparent is
    set to SIGCHLD.
2004-03-03 09:18:41 +00:00
Julian Elischer 3ded5f573c Initial MFC edits for EHCI code 2004-03-02 23:27:41 +00:00
Julian Elischer 054f1481f0 Bring over ehci drivers from -current
more commits to follow
2004-03-02 23:21:14 +00:00
Max Khon 6b1d012417 MFC: rev. 1.5:
Properly cleanup the stack before jumping to cerror() if rfork(2) fails.

Submitted by:	Igor Sysoev <[email protected]>
2004-03-02 18:20:35 +00:00
Jacques Vidrine 3cda90ae2f MFC in part tcp_input.c 1.228, tcp_subr.c 1.182, tcp_var.h 1.98:
Limit TCP segment reassembly queue size.

Submitted by:	andre
2004-03-02 17:19:18 +00:00
Tim J. Robbins 4a5958485a MFC rev. 1.117: If the "next free cluster" field of the FSInfo block is
0xFFFFFFFF, it means that the correct value is unknown. Since this value
is just a hint to improve performance, initially assume that the first
non-reserved cluster is free, then correct this assumption if necessary
before writing the FSInfo block back to disk.

PR:		62826
2004-03-02 09:43:04 +00:00
Julian Elischer c327a5a025 MFC, Don't go into an infinite loop on receiving a packet error. 2004-03-02 08:41:33 +00:00
Julian Elischer 771dbf2c5d MFC of whitespace changes 2004-03-02 01:56:40 +00:00
Josef El-Rayes 145656ccef Merge the int values for the signal(3) manual page from current.
I removed the line for SIGTHR which does not exist under 4.X

Approved by:    simon(mentor)
MFC v. 1.34
2004-03-01 21:43:50 +00:00
John Baldwin 1bcb94cbac MFC: Fix problem with key rollover. 2004-03-01 20:56:02 +00:00
Yaroslav Tykhiy 9d59032f96 MFC 1.75: Add cross-references to vlan(4), capitalize generic "VLAN". 2004-03-01 18:24:01 +00:00
Thomas Quinot 081563adb5 MFC env.c rev. 1.11 and 1.12: bring crontab parser in conformity
with documentation.

PR:		bin/38374
2004-03-01 13:21:52 +00:00
Christian Brueffer 25151b0a0e Forced commit to note, that the last commit message should have read:
MFC: 1.17

Remove reference to miibus.4, cue(4) does not use it.
2004-03-01 09:23:45 +00:00
Christian Brueffer 2775b83c2b MFC: 1.11
cue(4) doesn't use miibus(4)
2004-03-01 09:22:11 +00:00
Julian Elischer 1007ae1e1d remove debug code specific to -current 2004-03-01 07:23:27 +00:00
Noriaki Mitsunaga 4b3aa07ca2 [MFC]
Add ncv(4), nsp(4), and stg(4) man page for nsp, ncv, and stg SCSI host
adapter device drivers, and attach them to the build.
2004-03-01 00:24:29 +00:00
Julian Elischer c427c62d5a After Far too long, MFC something resembling the -current version of the
USB code. This will allow teh addition of USB-2 support to 4.10 and
simplify debugging as they had diverged too much.

Submitted by:	[email protected]
Obtained from:	NeBSD via -current
2004-03-01 00:07:26 +00:00
Ian Dowse a1298a98b3 MFC: 1.14; fix a typo that stopped ypset's -h option from working
with a hostname rather than an IP address.
2004-02-29 21:09:39 +00:00
Ian Dowse 9989e41eb1 MFC: 1.102; exit immediately if a second SIGINT is received, to
avoid long delays where ^C is ineffective during certain DNS lokups.
2004-02-29 21:05:18 +00:00
Ian Dowse a4d7534240 MFC: 1.119, 1.120: be much more strict about parsing tagged log
messages from /dev/klog; if the line doesn't match ^<%d>, then treat
it as a regular kernel printf line. Use strtol for reading numbers.
2004-02-29 20:59:19 +00:00
Ian Dowse af1ffe62db MFC: 1.21, 1.22; don't print the oldest line in the message buffer
if the buffer is full, since that line is almost always incomplete.
Make the parsing of <%d> lines more strict, and simplify the logic.
2004-02-29 20:39:40 +00:00
cvs2svn f44b87bb48 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-02-29 18:30:36 +00:00
Tor Egge d68d3cb739 MFC: Fix off by one error when clearing posix locks during detach of
file descriptor table from a process leader.

PR:		61505
2004-02-28 00:43:31 +00:00
Joe Marcus Clarke 8952dc081b MFC:
Add ports-net-mgmt module.
2004-02-27 17:19:31 +00:00
Marc Fonvieille edc75100e6 MFC: 1.22: Fix bogus "ffsinfo -c 0" example with "ffsinfo -g 0 -l 4". 2004-02-27 10:56:56 +00:00
Dag-Erling Smørgrav 0be36e9683 MFC: markup nits, mention fetch(3) more prominently 2004-02-27 10:33:52 +00:00
Dag-Erling Smørgrav 4289455890 MFC: revamped progress meter. 2004-02-27 10:33:29 +00:00
Dag-Erling Smørgrav e02eefb7e6 MFC: various markup issues. 2004-02-27 10:25:34 +00:00
Dag-Erling Smørgrav 6cbb108abc MFC: graceful recovery from code 416. 2004-02-27 10:24:59 +00:00
MIHIRA Sanpei Yoshiro 965e9efdfa MFC: I forgot Add the READ_BUFFER command to umass_atapi_transform.
(1.11.2.23 and rev.1.97)

PR:		kern/63384
Submitted by:	Ryuji MATSUMOTO <[email protected]>
2004-02-26 23:45:58 +00:00
Tim J. Robbins ca3f2516f2 MFC: Fix problems that occurred when a file was removed and a directory
created with the same name, and vice versa.

PR:		62342
2004-02-26 11:12:43 +00:00
Maxim Konovalov 14aa90293e MFC a part of rev. 1.43: pri -> priority. 2004-02-26 10:07:33 +00:00
Jacques Vidrine 83e209362f MFC 1.9: Limit the amount of memory userspace processes can cause the
kernel to allocate via DRI on r128 devices.
2004-02-25 20:43:25 +00:00
Ceri Davies d24b032b55 MFC revision 1.19:
Only call chflags() on directories once.

	  Approved by:    ru
	  MFC after:      1 week
2004-02-25 19:47:50 +00:00
Ruslan Ermilov 19953eb12f MFC: Fixed parsing of double quotes. 2004-02-23 12:10:57 +00:00
Ruslan Ermilov d0a4947510 MFC: 1.324: "cvs update" with -R. 2004-02-23 11:26:11 +00:00
Ruslan Ermilov 3f11492547 MFC:
- New API functions for libnetgraph.
- Get rid of static buffers where possible.
- Fixed memory leak in NgSendAsciiMsg().
- WARNS fixes for ngctl(8).
- mdoc(7) cleanup for netgraph(3).
- Reduced gratuitous diffs to the trunk.
2004-02-23 11:23:12 +00:00
Ruslan Ermilov 88b305eff2 MFC: Allow the socket buffer sizes to be controlled via sysctl(8). 2004-02-23 10:17:33 +00:00
Julian Elischer 9f11673373 get a brain and check with KASSERTs turned on. 2004-02-23 02:46:46 +00:00
David Malone bd3f1e5e73 MFC 1.157: Return EACCES rather than ENOBUFS if ipfw blocks a packet
on the way out at layer 2.
2004-02-22 17:31:05 +00:00
Philippe Charnier 3c0fd7e012 MFC: add missing endusershell() call.
PR: bin/2442
2004-02-22 11:28:06 +00:00
Philippe Charnier e72efe5803 MFC: add missing setusershell() call.
PR: bin/2442
2004-02-22 11:21:27 +00:00
Philippe Charnier f75ad97fc8 MFC: rework of getusershell()/endusershell() use.
PR: bin/2442
2004-02-22 11:11:13 +00:00
Gregory Neil Shapiro 2a544dc1f6 sendmail 8.12.11 has been MFC'ed to RELENG_4 2004-02-22 04:30:32 +00:00
Gregory Neil Shapiro 7ba82be78b Update date to reflect date of RELENG_4 MFC 2004-02-22 04:26:34 +00:00
Gregory Neil Shapiro 2f3342e810 MFC: sendmail 8.12.11 import 2004-02-22 04:25:44 +00:00
Wilko Bulte 75eed988de MFC: Add EPSON Perfection 3200 scanner. 2004-02-21 16:40:07 +00:00
Wilko Bulte 13df1e508a MFC: Add EPSON Perfection 3200 scanner 2004-02-21 16:35:20 +00:00
Ruslan Ermilov 0a80a882e4 Connect bfe module to the build. 2004-02-20 15:44:41 +00:00
Ruslan Ermilov 7dfa9c3a5a Attempt to stop tinderbox flooding our mailboxes. 2004-02-20 15:41:54 +00:00
Ruslan Ermilov 80b67ebb1f MFC: 1.16: Fixed CLEANFILES. 2004-02-20 12:52:01 +00:00
Munechika SUMIKAWA 5daf89faa5 MFC: Flush stdout when -A option is used. 2004-02-20 12:10:27 +00:00
Ruslan Ermilov 1763aa8f82 Use the correct (for RELENG_4) header to get the byteorder(3) prototypes. 2004-02-19 18:54:27 +00:00
Pawel Jakub Dawidek d81a84df36 Don't allow mount/umount operations inside jail as well as don't allow
umount file systems mounted by users if vfs.usermount is set to 0.

Tested by:	demon
Approved by:	scottl (mentor)
2004-02-19 14:02:30 +00:00
Don Lewis b636c6896b MFC 1.92 - Check that sa_len is the appropriate value in tcp_usr_bind(),
tcp6_usr_bind(), tcp_usr_connect(), and tcp6_usr_connect()
           before checking whether the address is multicast so that the
           proper errno value will be returned if sa_len is incorrect.
2004-02-19 11:58:14 +00:00
Don Lewis d352e03d5c MFC 1.163 - Add a somewhat redundant check on the getsockaddr() len
argument to avoid writing past the end of a dynamically
             allocated buffer, even though the minimum allocation size
             prevents an actual buffer overflow from occuring without
             this check.
2004-02-19 11:55:42 +00:00
Julian Elischer 2e88b9f200 MFC the man page for the bfe driver.
I don't know if I should say it first appeared in 4.10 as I
don't know if there will be a 4.10 so I'm leaving it untouched..
2004-02-17 20:56:50 +00:00
Julian Elischer e650dbfe59 Add a note about the Broadcom BCM4401 driver. 2004-02-17 20:52:56 +00:00
Julian Elischer 2bb5e345db Allow people top try building the Broadcom 4401 driver into a kernel. 2004-02-17 20:47:25 +00:00
Julian Elischer fcaf350fdd Testing over the weekend has been positive. Remove the
warning to allow people to build this module.
2004-02-17 20:43:16 +00:00
Bruce A. Mah 26c1077c2c MFC: dcons(4) and dconschat(8), killall(1) -e, libdisk PC98, pw(8)
-H.
2004-02-17 05:32:14 +00:00
Bruce A. Mah c6637f1fdc MFC: TCP RFC 2385 (TCP-MD5), libmap.conf(5). 2004-02-17 05:17:29 +00:00
Bruce M Simpson 53e20e8a84 MFC: Shorten the name of the socket option used to enable TCP-MD5 packet
treatment.

Submitted by:	Vincent Jardin
2004-02-16 22:21:47 +00:00
Yaroslav Tykhiy 27826d7818 MFC rev. 1.148, 1.150-1.153:
- deny attempts to delete or rename a file
  if a guest user isn't allowed to modify files on the server;

- disallow downloading raw directory contents by real users
  in order to work around buggy GUI clients which think that
  trying to download a directory is a fair way to tell it
  from a regular file;

- "(char *)0" --> "NULL" where possible.
2004-02-16 16:11:26 +00:00
Bruce M Simpson 59eabf0a1e MFC: Spell types consistently throughout this file. Do not use the __packed
attribute, as we are often #include'd from userland without <sys/cdefs.h>
in front of us, and it is not strictly necessary.

Noticed by:	Sascha Blank
2004-02-16 14:41:46 +00:00
Bruce M Simpson 37e8e9dbfa Don't compile xform_tcp.c if options TCP_SIGNATURE is not defined.
Noticed by:	Chuck Swiger
2004-02-16 14:32:19 +00:00
Peter Pentchev 3a6c45e7f7 MFC bootpd.c 1.22 and bootpd.8 1.18: document the '-h hostname' option,
sort the options in the manpage synopsis, bring usage() up to date.
2004-02-16 09:17:37 +00:00
Justin T. Gibbs bd3f8055a2 MFC: Update to the aic7xxx and aic79xx drivers in today's current. 2004-02-15 19:30:03 +00:00
John-Mark Gurney 71ab0a1dd9 MFC: rev 1.93 update frlengths after isoc transfer
PR:		kern/60109
Submitted by:	Damien Bergamini
2004-02-15 05:26:54 +00:00
Bruce M Simpson 136b29c6b6 MFC: Import of TCP-MD5 (RFC2385) support (userland).
Sponsored by:	sentex.net
2004-02-14 22:28:29 +00:00
Bruce M Simpson e3d973742d MFC: Import of TCP-MD5 (RFC2385) support.
Sponsored by:   sentex.net
2004-02-14 22:24:09 +00:00
Bruce M Simpson 2a8d8f83e1 MFC: Document the functions m_apply() and m_getptr(). 2004-02-14 22:04:15 +00:00
Poul-Henning Kamp e97823f8ec Grab a copy of the majors file from -current and stick it in RELENG_4.
All future major number allocations should happen from the copy in RELENG_4.
2004-02-14 20:49:49 +00:00
Prafulla Deuskar 37dc7d9316 MFC:
Only reset the phy when it is absolutely required.
  This should fix the issues with long *init* times when
  you do ifconfig em0 alias.
2004-02-14 00:56:45 +00:00
Julian Elischer f557dfe09a Upgrade to the version of the MFC by Edwin Groothuis.
This seems to work but I have heard of hangs...
2004-02-13 21:36:34 +00:00
Diomidis Spinellis 5bade38b08 MFC 1.27
getnetbyname fixes:
Do not choke on malformed network addresses.
Return n_name in static space, not on the function's stack.

Tinderbox fixes by:	Ruslan Ermilov
2004-02-13 20:59:43 +00:00
Julian Elischer d282732c66 Stop people from using this until I complete the MFC 2004-02-12 23:08:49 +00:00
Julian Elischer ac4f3fd589 Makefile for creating bfe module. 2004-02-12 22:12:36 +00:00
Julian Elischer 7572d6b7e7 Merge to match "pavel's" version for 4.8.
other patches were also supplied by Edwin Groothuis (edwin at mavetju dot org)

more merging to come.
2004-02-12 21:54:02 +00:00
Julian Elischer a0a55af5d8 MFC the Broadcom 4401 ethernet driver
This commmit just brings over the files unchanged..
I will be applying the patches to make it 4.x as a second commit.
2004-02-12 21:00:54 +00:00
Doug Barton 30887e8a4c NO_MAKEDEV was supposed to be a commented out example.
PR:		misc/62683
Submitted by:	Dmitry Kazarov <[email protected]>
2004-02-11 22:08:50 +00:00
John Baldwin e09ba927b4 MFC: Add support for more 2-port Avlab Tech cards. 2004-02-11 18:02:05 +00:00
Bruce M Simpson d4f2b44348 Finish the job of killing off crmbuf.c due to the m_apply pushup. 2004-02-11 06:54:36 +00:00
Bruce M Simpson 82ef3ea615 The one that got away. Purge crmbuf.c as this was providing a definition
of m_apply which generated tinderbox errors.

Pointed out by:	tjr
2004-02-11 06:52:09 +00:00
Bruce M Simpson e93e667c54 Forced commit to note that previous commit was in fact an MFC. 2004-02-10 17:37:11 +00:00
Bruce M Simpson a427373c85 Push m_apply() and m_getptr() up into the collection of standard mbuf
routines, and purge them from opencrypto.

Reviewed by:	sam
Obtained from:	NetBSD
2004-02-10 17:34:53 +00:00
Tom Rhodes 74e17e3ec2 Sync with CURRENT. This brings in several mdoc(7) fixes and some content. 2004-02-10 07:25:18 +00:00
Tom Rhodes 87db2f5ce4 MFC: rev 1.33:
Remove 'broken in some cases' Xref to Kerberos.

PR:		30443
Cool with:	markm (who approved this ages ago)
2004-02-10 07:10:33 +00:00
Tom Rhodes 61a07a21f0 MFC: rev 1.23:
Discuss the 'MAILTO' environment variable.

PR:		58783
Submitted by:	Marc Silver <[email protected]>
2004-02-10 07:03:46 +00:00
Tom Rhodes 80c22cace9 MFC: rev 1.18:
It is not the job of this manual page to list 'supported chipsets'.

PR:		60575
Submitted by:	Andreas Möller
2004-02-10 06:57:41 +00:00
Tom Rhodes 7f2eae773c MFC: rev 1.307:
Xref the proper manual pages.

PR:		60999
Submitted by:	Marc Silver <[email protected]>
2004-02-10 06:54:15 +00:00
Diomidis Spinellis e767ccd633 MFC changes from killall.c 1.27 killall.1 1.30
New -e flag, modifies the behavior of the -u uid flag to use the
effective user id, instead of the real user id.
2004-02-09 21:46:07 +00:00
Ian Dowse bbea3e65c4 MFC: 1.14; Undo the adjustment of the total memory used by dirhash
in the case where allocating the dirhash structure fails. Fix a few
typos in comments and update copyright.
2004-02-08 22:30:59 +00:00
Bruce A. Mah 3e81cc27a7 MFC: SA-04:02.
While here, add missing date for SA-03:19 note.
2004-02-08 22:26:05 +00:00
Ian Dowse e45410b470 MFC: 1.32; make the documentation of PT_STEP match its implementation. 2004-02-08 22:24:17 +00:00
Doug Barton 672705a638 Properly document the difference between NO_MAKEDEV and NO_MAKEDEV_RUN.
PR:		conf/37909
Submitted by:	Paul Fardy <[email protected]>
2004-02-08 08:46:12 +00:00
Mike Silbersack da8f265ed2 MFC rev 1.91: don't bother defragging mbuf chains sent to the loopback,
the ipv6 stack can handle them just fine as is.
2004-02-08 08:40:24 +00:00
Bruce A. Mah 6f3952fe92 MFC: SA-04:02. 2004-02-06 21:38:39 +00:00
MIHIRA Sanpei Yoshiro 2dc7e990c5 MFC: Add the Synchronize command to umass_atapi_transform. It seems to work
unmodified for ATAPI type devices.(rev.1.40)

Submitted by:	MATSUMOTO Ryuji <[email protected]>
		[FreeBSD-users-jp 78260]
2004-02-06 14:51:52 +00:00
Jacques Vidrine 144e48357a MFC sysv_shm.c 1.90: Correct a reference counting bug in shmat(2). 2004-02-05 18:01:26 +00:00
Dag-Erling Smørgrav 20f479cc4c GC port.mkversion. 2004-02-05 00:07:09 +00:00
Dag-Erling Smørgrav 16bae34c3b Remove Perl lines except for the base system version; it's better to
let use.perl handle them.
2004-02-04 22:38:08 +00:00
Max Khon 999f51b8f5 Bump __FreeBSD_version for libmap MFC. 2004-02-04 06:07:39 +00:00
Max Khon 57ba045c0c MFC: rev. 1.10 (forgotten in previous commit). 2004-02-03 21:13:47 +00:00
Max Khon 829e70cd4e MFC:
Manpage for libmap.conf. Examples do not make sense in RELENG_4.
2004-02-03 21:10:31 +00:00
Max Khon bf5521f90d MFC:
Dynamic object dependency mapping: libmap.

PR:		58133
2004-02-03 21:04:16 +00:00
cvs2svn ca7a547e06 This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-02-03 18:53:41 +00:00
Matt Jacob 08bce52b4e MFC: spelling fix. 2004-02-02 22:38:25 +00:00
Matt Jacob 58df498086 MFC: MAKE_WWN_FROM_NODE_NAME macro 2004-02-02 22:38:13 +00:00
Matt Jacob 4d15c766c4 MFC: sync with common source. 2004-02-02 22:37:44 +00:00
Matt Jacob 3596d4ba86 MFC: fixes to message define botches; add at_crn field to ATIO2 2004-02-02 22:37:33 +00:00
Matt Jacob d888e022cb MFC: CTIO3 handling; some silly bug fixes that have been around for a while,
AYNC_CTIO handling
2004-02-02 22:37:00 +00:00
Matt Jacob 475ecb491c MFC: some debug printuots to be cleaner. 2004-02-02 22:36:18 +00:00
Matt Jacob 438dd7c2b9 MFC: we return f/w major/minor/micro with hba info. 2004-02-02 22:35:50 +00:00
Matt Jacob 1221f59921 MFC: bug fix for CTIO2 fetch; changes to ATIO2 fetch/put (for crn tag) 2004-02-02 22:35:29 +00:00
Matt Jacob ec5ff791bd MFC: changes to ioctl get gets HBA info; __inline -> INLINE 2004-02-02 22:34:48 +00:00
Matt Jacob f3f9a6cabf MFC: typos, some NetBSD fixes, ISP_FW_CRASH_DUMP fix, some reset logic changes
and role change implications.
2004-02-02 22:34:03 +00:00
Matt Jacob 80dbcb74e2 It's silly to keep a maintainer file around for something that is released
in -current.
2004-02-02 22:14:35 +00:00
MIHIRA Sanpei Yoshiro cb61308837 MFNetBSD: URL updates(rev.1.108) 2004-02-02 15:00:15 +00:00
Simon L. B. Nielsen d10185f733 MFC 1.5:
Add Sandberg USB to Serial Link (model number 133-08) to the list of
supported devices.
2004-02-01 12:37:35 +00:00
MIHIRA Sanpei Yoshiro 65c3f7f42a MFC: Add support(rev.1.101)
- 2nd type of GL641USB USB-IDE bridge
	- Plextor Plexwriter 40/12/40U
2004-02-01 12:27:16 +00:00
MIHIRA Sanpei Yoshiro a0555b17dc Sync to 1.11.2.53 of usbdevs 2004-02-01 12:23:16 +00:00
MIHIRA Sanpei Yoshiro da9dff6389 MFC: Synchronise with -current. 2004-02-01 12:12:28 +00:00
Andrey A. Chernov d6a6a136c9 MFC 1.50 - fix LC_ALL priority 2004-01-31 21:49:00 +00:00
Maxim Konovalov eb3f8f2b65 MFC rev. 1.45: pass a correct argument to errx(3). 2004-01-31 19:16:46 +00:00
Johan Karlsson 37aa348e6c MFC rev 1.12:
Do not install SYMLINKS if both NO_MAILWRAPPER and
	NO_SENDMAIL is defined.
2004-01-31 17:16:57 +00:00
Hartmut Brandt fc62ac150e Fix sorting order: 3C > 39. I'm still more comfortable with
octal than with hex numbers.
2004-01-30 14:40:47 +00:00
Joerg Wunsch 3588d8b8ea MFC rev 1.11: update to latest InterNIC version, namely change A RR for
b.root-servers.net.  named's are starting to complain these days...
2004-01-30 14:40:06 +00:00
Hartmut Brandt ad28490dad Bring over missing partition types from -current, but don't touch
the names of the already existing types. This is a delayed MFC of rev.
1.55, 1.58, 1.73.

PR:		i386/14793, bin/27268
2004-01-30 14:36:31 +00:00
Maxim Konovalov 19d96beb3b MFC rev. 1.30: document -s flag. 2004-01-30 10:15:31 +00:00
Colin Percival 7903cb9ba9 MFC rev 1.66: Bring ps(1) up to date with changes
in the past seven years.

PR:		bin/34955
Submitted by:	Tim Robbins
Approved by:	rwatson (mentor)
2004-01-29 19:06:34 +00:00
Jens Schweikhardt bcdbfc444d MFC: DTRT, quote parens in an extended regular expression. 2004-01-29 18:16:58 +00:00
Nate Lawson b3ce7fe380 MFC: enable autosense by default and note where someone (maybe you!)
should submit support for report luns.
2004-01-29 18:02:41 +00:00
Colin Percival a3133e4631 MFC rev 1.14: ffsinfo *appends* to outfile.
Approved by:	rwatson (mentor)
2004-01-29 15:48:26 +00:00
John Baldwin 1c02a9b0f3 MFC: Various fixes to libstand filesystem code:
- Cleanup inconsistencies in error code handling.
- Fix splitfs to allow for the first chunk to be on a different floppy than
  the foo.split file.
2004-01-28 17:34:26 +00:00
Olivier Houchard ca39d317eb MFC rev 1.138:
Update Eterm entry to Eterm 0.9.2

Submitted by:	Geraud CONTINSOUZAS <[email protected]>
2004-01-28 17:12:40 +00:00
John Baldwin 1b80f7d4f4 MFC: Fix edge case in floppy bounce buffers used for crossing 64k boundary. 2004-01-28 16:28:50 +00:00
Tim J. Robbins 5642fc7432 MFC rev. 1.12: Fix an inverted test for NOPEN in the unused
function smb_smb_flush().
2004-01-28 06:21:01 +00:00
David E. O'Brien 1f99d83811 MFC: revision 1.366 2004-01-28 05:18:12 +00:00
Yoshihiro Takahashi 8f2b0b0905 MFC: Fixed pc98 partition type. 2004-01-27 15:29:06 +00:00
Dag-Erling Smørgrav 3835afbbfc MFC: don't pretend that perfectly valid file names are "bogus". 2004-01-27 09:07:10 +00:00
Dag-Erling Smørgrav 2113c162c7 The previous log message is correct in that 1.25.2.8 fixes truncation
detection, but it was not a forced commit.  It should have said "MFC:
apply consistent indentation".
2004-01-27 09:06:21 +00:00
Dag-Erling Smørgrav b2ebd14f1d forced commit; previous log message should have been
MFC: correct truncation detection after use of snprintf.
2004-01-27 09:03:41 +00:00
Dag-Erling Smørgrav b6cc126127 whitespace nits. 2004-01-27 09:02:00 +00:00
Dag-Erling Smørgrav a84effeb24 MFC: avoid potential buffer overflow in format_cmd().
Forgotten by:	jkh
2004-01-27 08:59:48 +00:00
Dag-Erling Smørgrav 7ce40cd5f4 MFC part of 1.75; specifically, call pam_acct_mgmt().
PR:		bin/28311
2004-01-26 21:18:38 +00:00
Colin Percival 2d808e384a MFC rev 1.26: killall should avoid killing itself.
Approved by:	rwatson (mentor)
2004-01-26 18:07:01 +00:00
Maxim Sobolev edf5f80d4e MFC: (whilespace-only)
Kill trailing spaces.
2004-01-26 12:24:28 +00:00
Maxim Konovalov 08f94bd21d MFC rev. 1.28 killall.1 and rev. 1.25 killall.c: sync usage() and man
page synopsis with reality.

MFC rev. 1.29 killall.1: -m flags contructs case sensitive RE.
2004-01-26 12:19:19 +00:00
Hidetoshi Shimokawa d9054a408b Add dependency on cam. 2004-01-26 07:27:25 +00:00
Hidetoshi Shimokawa 1a971b49c1 MFC: cam_xpt.c rev 1.91
Build CAM module.

OK'ed by: ken
2004-01-26 07:18:46 +00:00
Hidetoshi Shimokawa a066e5bfae Sync with -current
* firewire
- Remove pending list.
- Ignore timeout for the FWXF_START state.
- Define M_FWMEM for debugging.
- Comment out DELAY() in fw_asybusy().
- Improve debugging messages.
- Fix register mis-alignment introduced in rev1.12.
- Add missing free() in exception handlers.
- Add tcode_str[] and improve debug message.

* sbp
- Freeze simq while bus reset.
- If max_speed is negative, use the maximum speed which the
  ohci chip supports.  The default max_speed is -1.

* sbp_targ.c
- Add speed in struct sbp_targ_login.
- Remove unnecessary htonl().

* if_fwe
- If tx_speed is negative, use the maximum speed which the
  ohci chip supports.  The default tx_speed is 2.

* all
- Remove __P().
2004-01-26 04:51:15 +00:00
Ian Dowse 41284ebcd1 MFC: add a -H <fd>' option that is like -h <fd>', but accepts an
already encrypted password on the specified file descriptor.
2004-01-25 20:42:59 +00:00
Christian Brueffer d07969a329 MFC: 1.3
Fix reference to firewire(4)
2004-01-25 01:53:05 +00:00
Joe Marcus Clarke 287cb9a84a MFC:
Add the ports-accessibility category.
2004-01-24 22:18:17 +00:00
Robert Watson d5e10ce671 MFC kern_sig.c:1.266
When not creating a core dump due to resource limits specifying
  a maximum dump size of 0, return a size-related error, rather
  than returning success.  Otherwise, waitpid() will incorrectly
  return a status indicating that a core dump was created.  Note
  that the specific error doesn't actually matter, since it's lost.

  MFC after:      2 weeks
  PR:             60367
  Submitted by:   Valentin Nechayev <[email protected]>
2004-01-24 18:56:44 +00:00
Yoshihiro Takahashi 284063b6f4 MFC: Supported the gdc_clear function. 2004-01-24 11:16:24 +00:00
Yoshihiro Takahashi 35d7de4626 MFC: Include machine/asmacros.h instead of machine/asm.h. 2004-01-24 11:11:07 +00:00
Yoshihiro Takahashi b1f68323af MFC: Fix to support KANA and graphics characters. 2004-01-24 10:58:38 +00:00
Simon L. B. Nielsen eb2d51b4c2 MFC 1.11:
Add Canon N676U and Canon N1220U to the list of supported devices.
2004-01-24 10:20:37 +00:00
MIHIRA Sanpei Yoshiro a485e66613 MFC: Add support IO-data DVD Multi-plus unit iU-CD2(rev.1.100) 2004-01-24 04:18:36 +00:00
MIHIRA Sanpei Yoshiro 7e04bc4ad4 MFC: Pay attention to the timeout value passed down by the upper layer.
(rev.1.99)
Some USE CD-R,RW Drive now support writing
2004-01-24 04:14:35 +00:00
MIHIRA Sanpei Yoshiro dc3bea302c MFC: Empty vendor string overrides knowndevs(rev. 1.59) 2004-01-24 03:55:46 +00:00
MIHIRA Sanpei Yoshiro 83ad3bfe1d MFC: Add support SUNTAC U-Cable type A3(AS64LX) 2004-01-24 03:52:34 +00:00
MIHIRA Sanpei Yoshiro 629eb05b60 Sync to 1.11.2.52 of usbdevs 2004-01-24 03:40:29 +00:00
MIHIRA Sanpei Yoshiro b12cd37ccf MFC: Synchronise with -current. 2004-01-24 03:36:44 +00:00
Christian Brueffer 362b77d09f Add two supported SATA chips, Intel ICH5 and VIA 8237
Reviewed by:	bmah
2004-01-23 13:44:58 +00:00
Maxim Konovalov 5bb8d559ec MFC rev. 1.51: include opt_ipsec.h so IPSEC/FAST_IPSEC is defined and
the appropriate code is compiled in to support the O_IPSEC operator.
2004-01-22 08:50:26 +00:00
Kris Kennaway bbba11c940 MFC: Do not try to mmap()/munmap() 0-length files.
This allows a 4.x cp binary to work correctly on 5.x kernels (for which
munmap() of a 0-length mapping returns an error).

Noticed by:	bento's 4.x package build
2004-01-22 06:23:38 +00:00
Warner Losh 7630ae3047 MFC: remove cryptotest, and merge the copyright notice from current
for the Makefile
2004-01-22 05:59:35 +00:00
cvs2svn 87f09e1a3b This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2004-01-21 13:24:39 +00:00
Joe Marcus Clarke 8c052d0c3f MFC:
Add the ports/arabic category to the examples.
2004-01-20 22:44:18 +00:00
John Baldwin 3e7f3183a2 MFC: Fix up some nits and save %cx around BIOS read calls to workaround a
bug in some BIOSs.
2004-01-20 19:30:31 +00:00
Gregory Neil Shapiro 0ddb92dfeb MFC: Sync AC97 changes from -CURRENT:
ac97.c: 1.49: Add ID for ALC658 CODEC.
ac97.c: 1.48: Recognize the Avance Logic ALC655 codec found on some
	      ICH4/5-based motherboards, such as the Gigabyte I848P.
ac97.c: 1.46: Add Creative EV1938.
ac97.c: 1.45: When present use ogain instead of master for surround sound
	      channels.
ac97.c: 1.44: Additional VT1616 id.
ac97.c: 1.43: Apply Rudolf Cejka's patch for AD1980 hook & ac97_fix_auxout.
	      Associate AC97_MIX_AUXOUT with SOUND_MIXER_OGAIN rather than
	      SOUND_MIXER_MONITOR.
	      Add ac97_fix_tone to remove tone controls from mixer if invalid

ac97.h: 1.14: Apply Rudolf Cejka's patch for AD1980 hook & ac97_fix_auxout.
	      Associate AC97_MIX_AUXOUT with SOUND_MIXER_OGAIN rather than
	      SOUND_MIXER_MONITOR.
	      Add ac97_fix_tone to remove tone controls from mixer if invalid

ac97_patch.c: 1.2: Add patch for AD198x.

ac97_patch.h: 1.2: Add patch for AD198x.

Approved by:	matk
2004-01-20 17:49:24 +00:00
Ceri Davies b1f5aa196c MFC r1.7
Correct compilation with "#define really_paranoid".
2004-01-18 21:58:33 +00:00
Ceri Davies 233f2f4426 MFC r1.15:
gethostbyname2() is able to lookup AF_INET6.

	PR:		23823
	Noticed by:	Andrew Arensburger <[email protected]>

This was mentioned again in:

PR:		docs/59669
Submitted by:	Volker Stolz <[email protected]>
2004-01-18 21:39:58 +00:00
Ceri Davies 69974ccca8 MFC r1.24:
Stop "fortune -l" from looping forever.
2004-01-18 21:32:24 +00:00
Alex Dupre 7cd4326848 MFC rev. 1.8 and rev. 1.1114:
- Update list of device drivers that support polling
- Remove redundancy in LINT
2004-01-18 09:17:53 +00:00
Maxim Konovalov d82d12d21c MFC rev. 1.137 and 1.138: -f in conjunction with -p and -c flags are
ipfw2 features.
2004-01-18 08:47:40 +00:00
Jens Schweikhardt da31e8ac52 Backout previous commit. On RELENG_4 we have printf as a shell builtin
(not so in HEAD). If you want to build/install RELENG_4 on HEAD, you
have to set MAKEDEVPATH to include /usr/bin (at least as long HEAD's
/bin/sh has no printf builtin).

Explained by:	bde
2004-01-18 08:28:07 +00:00
Robert Watson 37bf8914b9 MFC 1.179:
date: 2003/05/16 01:13:16;  author: rwatson;  state: Exp;  lines: +5 -1
  Add a tunable/sysctl "hw.fxp_noflow" which disables flow control support
  on if_fxp cards.  When flow control is enabled, if the operating system
  doesn't acknowledge the packet buffer filling, the card will begin to
  generate ethernet quench packets, but appears to get into a feedback
  loop of some sort, hosing local switches.  This is a temporary workaround
  for 5.1: the ability to configure flow control should probably be
  exposed by some or another management interface on ethernet link layer
  devices.

Requested by:	Pawel Malachowski <[email protected]>
2004-01-17 23:04:26 +00:00
Jens Schweikhardt 6cc38b3818 Add /usr/bin to PATH for the case when MAKEDEVPATH is empty
in order to find printf which is used several times.
2004-01-17 18:07:45 +00:00
Hajimu UMEMOTO ff065e50d2 MFC 1.41: try rtinit() only when the route is not installed.
this allows, e.g., duplicated attempts of 'ifconfig lo0 ::1'
like for IPv4.
2004-01-17 16:07:31 +00:00
Yoshihiro Takahashi 0c655f75ec MFC: MINIMALDOCPORTS lists. 2004-01-17 06:58:19 +00:00
Jens Schweikhardt 4fcc8f647f Garbage collect an unused variable and unused whitespace at EOL. 2004-01-16 20:01:16 +00:00
Maxim Konovalov bb24a496e8 MFC rev. 1.74-1.76: FreeBSD 4.9, MacOS 10.3, OpenBSD 3.4, FreeBSD 5.2,
fix footer.
2004-01-16 08:29:34 +00:00
Christian Brueffer a505cdd4e2 Add Intel ICH5 and VIA8237 to the list of supported chips. 2004-01-15 23:43:16 +00:00
Maxim Konovalov f0533223de MFC rev. 1.136 ipfw.8 and rev. 1.44 ipfw2.c: legitimate -f (force)
flag for -p (preprocessor) case.
2004-01-15 12:41:45 +00:00
Christian Brueffer 225b1872ae MFC:
Add reference to miibus.4
2004-01-14 12:57:25 +00:00
Christian Brueffer 365385aa7d MFC: 1.17
device uhci0 -> device uhci

Remove reference to miibus.4, the driver doesn't use it.
2004-01-14 12:52:16 +00:00
Christian Brueffer 057a39ce9c MFC: 1.9, 1.10 (relevant parts)
Remove drivers that don't need miibus(4):
o an
o awi
o kue

Add missing drivers:
o gx
o lge
o nge
o sk
2004-01-14 12:49:40 +00:00
David Schultz 2746b7597e Unbreak the build. I had this fix on my -STABLE test box, but it
apparently never made it back to my local repository.

Pointy hat to:	das
2004-01-13 21:20:02 +00:00
Hajimu UMEMOTO 4f5a032d13 MFC 1.46: in set{peer, sock}addr, do not convert the unspecified
address (::) to the mapped address form.
2004-01-13 14:43:22 +00:00
Christian Brueffer ad6ab6f35a MFC: 1.63
Fix typo in a comment
2004-01-13 11:32:44 +00:00
David Schultz 3ceac2ff45 MFC:
src/sys/fs/unionfs/union_vnops.c,v 1.103
2004-01-13 06:51:55 +00:00
MIHIRA Sanpei Yoshiro 027347b17f check USB_CDC_ACM_HAS_FEATURE flag(from FreeBSD-current and NetBSD)
Now umodem support motorola v66 phone

PR:		kern/47274
Submitted by:	Colin Perkins <[email protected]>
2004-01-12 13:19:08 +00:00
MIHIRA Sanpei Yoshiro 1ec2eea693 MFC: Rev. 1.97 Add the MMC commands to umass_atapi_transform. 2004-01-12 13:02:54 +00:00
MIHIRA Sanpei Yoshiro 65358acad4 MFC: Add support SUN TYPE 6 USB KEYBOARD 2004-01-12 12:58:34 +00:00
MIHIRA Sanpei Yoshiro ab0ffd2003 MFC: Add support
- Canon USB Scanner N676U
	- Canon USB Scanner N1220U
2004-01-12 12:54:34 +00:00
MIHIRA Sanpei Yoshiro e70e805efb Sync to 1.11.2.51 of usbdevs 2004-01-12 12:52:07 +00:00
MIHIRA Sanpei Yoshiro a59b6ca7b1 MFC: Synchronise with -current. 2004-01-12 12:49:39 +00:00
Ian Dowse 1ad931c8d3 MFC: 1.33; correct a problem with propagation of the nodump flag
on directories that are larger than one block in size.

Reminded by:	Pawel Malachowski
2004-01-12 00:30:31 +00:00
Johan Karlsson cf9af3255b MFC rev 1.28: Make sure argv[x] exists before using it. 2004-01-11 17:51:45 +00:00
Bruce A. Mah 3a00d9fb67 New release notes: stl(4) update.
MFC:  ifconfig(8) staticarp, makewhatis(1) rewrite, stat(1) from
NetBSD, which(1) rewrite.

Bump copyright date.
2004-01-10 18:15:44 +00:00
Tim J. Robbins d501ffdfc5 MFC: Fix a problem that occurs when truncating files on NFSv3 mounts: we
need to set np->n_size back to the desired size again after calling
nfs_meta_setsize(), since it could end up in nfs_loadattrcache() getting
called, which would change n_size back to the value it had before the
truncate request was issued. The result of this bug is that the size info
cached in the nfsnode becomes incorrect, lseek(fd, ofs, SEEK_END) seeks
past the end of the file, stat() returns the wrong size, etc.

PR:		41792
2004-01-10 08:24:33 +00:00
Tim J. Robbins 3660252fa3 MFC rev. 1.32: Change the buffer length test in NEEDSP() so that it does
not subtract one unsigned number from another potentially smaller one,
leading to wraparound (and heap corruption, eventually).

PR:		58813
2004-01-10 06:30:37 +00:00
Tim J. Robbins 2e86e350bd Bring in all of the smbfs features and bug fixes from -current to -stable:
- Add support for SMB signing, which is required to connect to
  Windows 2003 servers.
- Add support for mixed-case passwords.
- Add support for large (up to 64K) READ_ANDX/WRITE_ANDX requests.
- Increase TCP send/receive queue size to support these large requests.
- Receive packets in small pieces so TCP slowstart will get ACKs faster.
- Fix off-by-one bug preventing access to servers with NetBIOS names
  exactly 15 characters long.
- Allow the [, ], and = characters in non-8.3 filenames.
- Only close files on the server when there are no more references to
  the vnode; makes mmap()'d regions work properly after the local
  file descriptor has been closed.
- Fix mishandling of files >4GB.
- Diff reduction to make future merges easier.

PR:	36038 46902 57123
2004-01-10 04:17:50 +00:00
Tim J. Robbins bacf03bd21 MFC: Allow md_get_xxx() to be called with a NULL result pointer if the
caller is not interested in the result. Some diff reduction with -current.
2004-01-10 01:13:53 +00:00
Ruslan Ermilov 5b0b449271 MFC: Standardize the Ethernet address parse type. 2004-01-09 08:58:06 +00:00
Ruslan Ermilov 9eec79a322 MFC: 1.38: Replaced two bzero() calls with the M_ZERO flag to malloc(). 2004-01-09 08:40:36 +00:00
Maxim Konovalov 50615d70c2 MFC rev. 1.16: actually add -x option. 2004-01-09 08:33:58 +00:00
Ceri Davies 7b9c306790 MFC revision 1.27 of src/sbin/mount_nullfs/mount_nullfs.8:
Correct an instance of an erroneous "it's".
2004-01-08 22:28:42 +00:00
Dag-Erling Smørgrav b2db9cd896 Bump __FreeBSD_version for the addition of e_sid in struct kinfo_proc. 2004-01-08 22:15:01 +00:00
Dag-Erling Smørgrav 17b85b5fff Export the session id in struct kinfo_proc. 2004-01-08 22:14:16 +00:00
David Malone db5cc1106f MFC: Fix ip6fw reset so it works on TCP packets with SYN set. 2004-01-08 22:04:54 +00:00
John Baldwin 89e19bedbf MFC: Add support for the Sunix SUN1889-based 2 port card. 2004-01-07 19:26:03 +00:00
John Baldwin 1e9d917e38 MFC: Replace an outb() with a DELAY(1) during the test for configuration
mechanism #1.  This fixes probing for PCI on some systems.
2004-01-07 19:23:56 +00:00
Gregory Neil Shapiro 794408beb6 MFC: Use hoststat/purgestat instead of sendmail -bh/-bH so the calls can
be properly mailwrapper'ed.

     Revision  Changes    Path
     1.8       +3 -3      src/etc/periodic/daily/150.clean-hoststat
2004-01-06 17:50:52 +00:00
Simon L. B. Nielsen 5c27eb199f MFC the rest of the change from version 1.20 (missed in the original
MFC).

Submitted by:	Watanabe Kazuhiro <[email protected]>
PR:		docs/60854
2004-01-04 12:48:13 +00:00
Christian Brueffer 9603df2422 MFC: 1.14
o fix typos
o grammar fix
o concat two lines
2004-01-04 11:04:43 +00:00
Don Lewis 556694d2e5 MFC 1.226 - Set fs_ronly to the correct value in ffs_reload() when
reloading the file system super block after fsck has
	    repaired the file system.
2004-01-02 21:15:10 +00:00
Maxim Konovalov 1d950aa8ba MFC rev. 1.39: grammar. 2004-01-02 12:53:46 +00:00
Doug Ambrisko 517dbc8585 MFC Version 1.128, don't use the cached inp->inp_route unless
it is marked as RTF_UP.  This fixes a panic when an interface
	is detached (ie. suspend/resume).

Not objected by:	sam, iedowse
Fix in -current by:	iedowse
2004-01-02 04:06:42 +00:00
Christian Brueffer ca79a5785f MFC: 1.19
o use .Nm
o fix language usage
2004-01-01 15:29:05 +00:00
Christian Brueffer 8b063b295a MFC: 1.2
o add missing sysctl to synopsis
o remove some useless words
o fix spelling
2004-01-01 15:25:56 +00:00
Christian Brueffer 35256f3d79 MFC: 1.3
o add reference to safe.4
o remove useless word
2004-01-01 15:24:34 +00:00
Christian Brueffer 8fa582844a MFC: 1.3
o grammar fixes
o FireWire.4 -> firewire.4
o wordsmithing
2004-01-01 15:22:01 +00:00
Christian Brueffer ae0a5b023e MFC: 1.4
o grammar fixes
o wordsmithing
o sort references
2004-01-01 15:20:24 +00:00
Christian Brueffer eb18668492 MFC: 1.4
Add reference to safe.4
2004-01-01 15:15:50 +00:00
Hajimu UMEMOTO 31f0e09bc2 MFC 1.26: validate the argument for multicast routing socket options
correctly.
2004-01-01 07:37:33 +00:00
John Baldwin 0b542d7ec9 MFC: Add PCI ID's for the ICH4 mobile ATA controller.
PR:		kern/57969
Submitted by:	Ryuichiro Imura <[email protected]>
2003-12-31 18:05:16 +00:00
Gregory Neil Shapiro b493c79cfd MFC: Enable IPv6 by default but make it optional so it doesn't affect
sites without IPv6.

     Revision  Changes    Path
     1.29      +3 -3      src/etc/sendmail/freebsd.mc
2003-12-31 17:42:16 +00:00
John Baldwin 0247989427 MFC support for the following devices:
- Titan VScom PCI-800L
- Oxford Semiconductor OX12PCI840
- Moxa Technologies, Smartio C104H/PCI
- Moxa Technologies, Smartio CP-104UL/PCI
- IC Book Labs Ironclad x8 Lite
- IC Book Labs Ironclad x8 Pro

This was prompted by the PR which included a patch for 4.x for the Titan
800L.

PR:		kern/41555
Reported by:	François Laissus <[email protected]>
2003-12-31 17:28:47 +00:00
Daniel Eischen 5ce0776c19 MFC: Reenable signals for threads after joining. 2003-12-31 13:46:39 +00:00
Doug Ambrisko 3d095cbbf1 MFC: Fixes for MPI-350 so that it doesn't read past end of the buffer
space and don't access the dma memory until it is properly setup.
	This prevents a couple of panics (the read panic happens with
	newer firmware).
2003-12-31 03:02:46 +00:00
Maxim Konovalov 0fdfb81b5a MFC rev. 1.76: fix a comment. 2003-12-30 12:28:09 +00:00
Jens Schweikhardt 0675dd969d MFC: Fix a case of undefined behavior due to overlapping buf objects in
snprintf (buf, size, fmt, buf, etc). This only works by chance with our
libc, but fails (with a truncated string) on e.g. glibc.
2003-12-30 10:21:01 +00:00
Daniel Eischen 6a975d6427 MFC: In the wrapped write(), return if the syscall write() returns 0.
PR:	59291
2003-12-29 15:18:01 +00:00
Yaroslav Tykhiy f4d11c9e14 Document the sysctl(8) variable "net.graph.nonstandard_pppoe". 2003-12-29 14:28:56 +00:00
Yaroslav Tykhiy be51bf8bc3 MFC: Fix the DoS condition triggered by a non-standard PPPoE frame. 2003-12-29 14:24:58 +00:00
Ceri Davies 2d71cfa371 MFC revision 1.32:
Add the -m, -w and -x options to ls's usage message.

	PR:             51493
	Submitted by:   Walter Belgers
	MFC after:      1 month
2003-12-27 17:32:13 +00:00
Andrey A. Chernov b12e81151c MFC: 1.49 (slash-pointers advancement) 2003-12-27 14:16:03 +00:00
Christian Brueffer 6756ae0ab0 Start sentences on new lines.
This page is in sync with the -CURRENT one now.
2003-12-26 06:48:24 +00:00
Christian Brueffer 9a831abaf1 MFC: 1.22
o grammar fixes
o wordsmithing
2003-12-26 06:44:11 +00:00
David Malone ef74fa3326 Sync with -current (except -o option):
1) Don't recurse on errors.
2) Remove unused printf argument.
3) Use skip_message for program and hostname matching (which allows multiple
   comma-seperated names to be given).
2003-12-26 00:03:19 +00:00
Christian Brueffer e395f607f4 MFC: 1.11
o grammar fixes
o wordsmithing
o s/isochronus/isochronous/
2003-12-25 22:55:28 +00:00
Christian Brueffer b94393cc10 MFC: 1.2
o correct a path
o wordsmithing
2003-12-25 22:52:54 +00:00
Christian Brueffer 093a80823f MFC: 1.10
o grammar fixes
o removed wrong 's usage
2003-12-25 22:51:32 +00:00
Christian Brueffer 4116140597 MFC: 1.7
Grammar fixes
2003-12-25 22:48:49 +00:00
Christian Brueffer 372bdc44be MFC: 1.5
o use .Nm
o wordsmithing
2003-12-25 22:47:38 +00:00
Christian Brueffer 0554b9bea5 MFC: 1.9
Wordsmithing
2003-12-25 22:46:10 +00:00
Diomidis Spinellis f1c18a7ec1 MFC changes 1.35 -> 1.36
Add sticky(8) cross reference.

PR:             docs/60068
Submitted by:   Ken Stailey
2003-12-25 22:29:38 +00:00
Takeshi Shibagaki 8ed5563b75 MFC: Add Allied Telesis SIC-AT boards support.
if_ed.c <- 1.219
     if_ed_cbus.c <- 1.11
     if_ed_isa.c <- 1.14
     if_edreg.h <- 1.32
     if_edvar.h <- 1.15
2003-12-24 17:02:00 +00:00
Jordan K. Hubbard c6463664f6 In hindsight, committing stuff while under the influence of powerful narcotics
(aka prescription flu medicine containing lots of hydrocodone) might not have
been one of my better ideas.  Fix typo noticed by Nate Lawson.  The other
files look OK.
2003-12-24 04:11:49 +00:00
Jordan K. Hubbard cac95409ac This completes our sync-up with -current for the memory leak patch. 2003-12-24 01:10:34 +00:00
Jordan K. Hubbard da6c465c9f <big sigh>
I missed these from the MFC and caused the dysfunction reported on -stable,
I just didn't catch it due to lack of personal locale-use.  Yes, when you
change an internal function it is also necessary to change the functions
which *call* it or bad things happen.  Yes, I should have caught this myself.
I'm a little rusty in -stable, sorry.  Won't happen again. :(
</big sigh>
2003-12-24 01:08:47 +00:00
Maxim Konovalov 1db96d7265 MFC rev. 1.52: IN_MULTICAST wants an address in host byte order. 2003-12-23 12:23:57 +00:00
Jordan K. Hubbard 0debd99632 Syncronize with change to ldpart.c in last MFC. Whoops!
Reported by: Andrzej Tobola <[email protected]>
2003-12-23 07:29:32 +00:00
Jordan K. Hubbard 287e017d28 MFC: fix memory leak in setlocale() helper functions.
PR#: misc/59910
2003-12-22 20:45:16 +00:00
MIHIRA Sanpei Yoshiro bf45d2ea12 MFC Rev.1.92 - 1.96
Add support
	IBM 256MB USB Drive(MSYSTEM DiskOnKey2)
	Logitec LDR-H443U2 DVD-RAM/-R/+R/-RW/+RW Drive
	Panasonic KXL-CB20AN Portable DVD-ROM/CD-R/RW
	Panasonic KXL-CB35AN(DVD-ROM & CD-R/RW)
	PNY Attache Flash Drive
2003-12-22 20:30:25 +00:00
MIHIRA Sanpei Yoshiro 22ac9bb9e2 MFC Rev. 1.47
Add support minolta 5400 USB scanner
2003-12-22 20:00:55 +00:00
MIHIRA Sanpei Yoshiro 5a13babde3 MFC Rev. 1.78
Add support HP hn210e usb ethernet
2003-12-22 08:27:58 +00:00
MIHIRA Sanpei Yoshiro 786927cb12 Regen. 2003-12-22 07:54:03 +00:00
MIHIRA Sanpei Yoshiro 5901cee9c4 MFC: Synchronise with -current. 2003-12-22 07:52:56 +00:00
MIHIRA Sanpei Yoshiro 546052d50a MFC Rev.1.111
Add ADMtek ADM9511 and ADM9513 device ID's
2003-12-22 07:29:32 +00:00
John Baldwin 01bb38ef2b Remove the commented out HTT option as it was made obsolete prior to 4.9.
Reported by:	maxim
2003-12-19 22:52:44 +00:00
Hidetoshi Shimokawa afad18c534 Add dcons. 2003-12-19 14:34:23 +00:00
Maxim Konovalov ed088342e1 MFC a part of rev. 1.38: grammar. 2003-12-19 12:07:03 +00:00
John Baldwin 321c61834d MFC: Look for /boot/loader as well as /BOOT/LOADER. 2003-12-18 17:09:58 +00:00
Warner Losh b2b3eb7dff Fix comment about what the default compilation environment is. It is
4.x, not 2.1.x!
2003-12-17 21:18:20 +00:00
John Baldwin 252ac8a1a9 Pin 0 on the first I/O APIC is always an ExtINT pin. Some BIOS's are
broken and list the type of the pin as INT rather than ExtINT in the MP
Table.  To workaround, force pin 0 of ioapic 0 to be ExtINT if it is of
type INT.  This is not a MFC as -current has very different apic code now.
Current's mptable parser might need a similar workaround.

PR:		i386/39234
Reported by:	Henri Hennebert <[email protected]>
2003-12-16 16:32:28 +00:00
Ruslan Ermilov 7f8e5baecd MFC: 1.73: Unbreak the NOINSTALLLIB install. 2003-12-16 10:44:40 +00:00
Dag-Erling Smørgrav e5314f197e MFC (rev. 1.86): install a SIGCHLD handler. 2003-12-16 08:34:11 +00:00
Dag-Erling Smørgrav 89680e2813 MFC: support for the Vibra 128 (and other CT4730-based cards)
Submitted by:	orion
2003-12-15 21:31:29 +00:00
Ruslan Ermilov 09a864a844 Don't call bpf_mtap(), ether_input() does this for us. 2003-12-15 14:50:04 +00:00
Dag-Erling Smørgrav 3f5cb32b2c Connect stat(1) to the build. 2003-12-15 10:58:23 +00:00
Dag-Erling Smørgrav eceb2c846b MFC: stat(1) command from NetBSD. 2003-12-15 10:58:08 +00:00
Hidetoshi Shimokawa eed9d83e2b MFC:
- Introduce sbp_targ_login instead of sbp_targ_istate.
- Implement reconnection and logout.
- Freeze simq while bus reset.
2003-12-14 03:12:29 +00:00
Hidetoshi Shimokawa 40bd12f4f4 Put back accidentally removed cardbus support. 2003-12-14 03:09:27 +00:00
Dag-Erling Smørgrav f7fe32deda Perl is no longer needed for installworld, but makewhatis(1) is now a
bootstrap tool.  Also fix a NOPERL nit: PERL5LIB is not needed in the
cross-build environment if NOPERL is defined.
2003-12-13 16:05:34 +00:00
Dag-Erling Smørgrav 8dcf932850 Retire the Perl implementation of makewhatis(1). 2003-12-13 16:01:42 +00:00
Dag-Erling Smørgrav d399f5ecef Switch to the C implementation of makewhatis(1). 2003-12-13 15:59:11 +00:00
Dag-Erling Smørgrav b07a198dd3 MFC: reimplement makewhatis(1) in C. 2003-12-13 15:56:51 +00:00
Dag-Erling Smørgrav 5cd0c185dc MFC: reimplement which(1) in C. 2003-12-13 15:47:19 +00:00
Paul Saab 412ef013ee MFC: rev 1.33 whitespace cleanup 2003-12-13 07:56:28 +00:00
Warner Losh ae4ac29492 Research on Stallion's website shows that there is a limit of 4
pannels, or 32 ports for the ech boards.  The only possible way to
make an error is to have 8 + 8 + 8 + 16 or 8 + 16 + 16, so we detect
that more directly and cleanup properly (eg, ignore the last panel).
This was the intent of the too many ports attached to board message
before, and should be more robust.

# now, too port this to current.
2003-12-13 06:05:07 +00:00
Warner Losh 654ecccaae Move check to see if you have too many panels to early in the loop rather
than at the end where it suffered from a fencepost error.

However, I'm not entirely sure that it is still correct because it
looks like we access something in the ioaddr2 range.  I need more
stallion pannels to know for sure.  The code is less incorrect than it
was before at least when you have two pannels connected to the
EC8/32-AT.  Two pannels are allowed and appear to work.  Stallion says
that 3 cannot work, or when the agregate number of ports is > 32.  I
think that these tests should be more explicit, but until I have more
hardware, this is less wrong.
2003-12-13 00:14:25 +00:00
Paul Saab 1af73c6405 MFC: Correct the READ/WRITE CDB direction definition. 2003-12-12 22:03:38 +00:00
Paul Saab 72ce517747 MFC: Define RAID 5+1 and RAID ADG fault tolerances 2003-12-12 22:01:17 +00:00
Paul Saab 12fd6b2207 Fix a mis-merge in ciss_unmap_request and actually unmap a request.
Fir another mis-merge in ciss_cam_action_io when getting an error back
from ciss_start, only REQUEUE the request if the error is not EINPROGRESS

Pointy hat to: 	me
2003-12-12 21:58:42 +00:00
John Baldwin 8bb944bbbc MFC: Use casts to fix printf warnings in print_uptime() on alpha.
PR:		alpha/43561
Reported by:	Eugene Grosbein <[email protected]>
2003-12-11 21:33:43 +00:00
John Baldwin d02de97257 MFC: Various cleanups to the non-interactive disk labeling code including
failing altogether if a single entry failed instead of just continuing and
not leaking flags from earlier chunks into later ones.
2003-12-11 20:25:22 +00:00
John Baldwin 836e720587 MFC: Drop the size argument to new_part() as well as the hack to create
partitions twice since the size was not known the first time a partition
was created.
2003-12-11 20:20:15 +00:00
John Baldwin 4460ae8a6b MFC: When setting the mountpoint name, remember any previous setting of the
newfs flag for this partition.
2003-12-11 20:14:06 +00:00
John Baldwin 8127ea4393 MFC: Zero the interval timers on fork rather than copying them to the child
process.
2003-12-11 19:31:00 +00:00
John Baldwin 21577deb2c MFC: Don't call sysbeep() in sc_bell() if either duration or pitch is zero. 2003-12-11 19:27:34 +00:00
Diomidis Spinellis 17ef677715 MFC changes 1.15 -> 1.16
Removed unused macro definition
2003-12-11 15:11:04 +00:00
Diomidis Spinellis 2cdb1101ea MFC changes 1.11 - 1.12
- Document gencat(1) (dds)
- Remove claim that pi and ex use mkstr; pi is long gone, and nex doesn't
  use it. (tjr)
2003-12-11 15:08:56 +00:00
Diomidis Spinellis b387a4dcaa MFC 1.3 -> 1.4
Remove extraneous semicolons.  They are already provided by
the macro definition, and cause the generation of syntactically
incorrect code that gcc happens to accept.
2003-12-11 14:59:35 +00:00
Diomidis Spinellis aa402ccf94 MFC src/sys/nfsclient/nfs_vnops.c 1.208 -> 1.209 2003-12-11 14:52:23 +00:00
Diomidis Spinellis c9a3a124d8 MFC changes:
1.30 -> 1.31 feeder.c
1.9 -> 1.10 feeder.h

Change gcc-specific aggregate initialization member specifiers
into C9X initializer designators.
2003-12-11 14:41:12 +00:00
Hajimu UMEMOTO b53a045e2f MFC 1.70: link-local multicast address must be converted to KAME specific
embeded scopeid form.
2003-12-10 19:02:03 +00:00
Diomidis Spinellis c05bd6b067 MFC 1.20->1.21
Add errnor return values to match the NFS client implementation and
better represent failures of special files accessed over NFS.
2003-12-10 14:54:31 +00:00
Diomidis Spinellis e5615aff5e MFC 1.26 -> 1.27
Fix/add errno return values to match the NFS client implementation and
better represent failures of special files accessed over NFS.
2003-12-10 14:51:19 +00:00
Diomidis Spinellis 73800b9b5f MFC changes 1.12 -> 1.13
Documented missing EINVAL errno value; see kern_prot.c:
	if (ngrp > NGROUPS)
		return (EINVAL)
2003-12-10 14:35:48 +00:00
Diomidis Spinellis 81d3f865d6 MFC changes 1.7 -> 1.8
Fix problem where initgroups would silently truncate groups
with more than NGROUP elements without providing the opportunity to
setgroups to fail and correctly retorn an error and set errno.
2003-12-10 14:33:57 +00:00
Don Lewis 57caecf5cf MFC 1.39 through 1.42 - Print the dirpref avgfilesize and avgfpdir parameters. 2003-12-10 09:38:37 +00:00
Warner Losh 88c79fe0d2 Update the Stallion driver to 5.6.0b1 (the latest one on the web
site).  This only updates the stallion (stl) driver.  The stli driver
isn't updated because the driver is corrupt on the stallion web site
:-(.

This fixes my EC8/32-AT card, which worked with the 1.0.0 driver, but
not the 2.0.0 driver.  It also fails to break my EasyIO-8 PCI card
(well, I can't completely test it just yet).

This is being committed directly to stable because this driver doesn't
compile in current.  I'm doing a current port, but it will commit that
later.  Also, 2.0.0 hasn't made it into current either.
2003-12-09 04:36:30 +00:00
Paul Saab 7e59526712 MFC: rev 1.27
Support EINPROGRESS and properly deal with 64bit physical addressing.
2003-12-08 22:19:40 +00:00
Bruce M Simpson 3606e44668 MFC: Introduce the STATICARP flag to -STABLE.
Submitted by:	ru (rtsock.c)
Sponsored by:	Weyland-Yutani Corporation
2003-12-08 17:16:58 +00:00
Bruce M Simpson 0bc8a5bc69 MFC: Introduce the STATICARP flag to -STABLE.
Submitted by:	ru (rtsock.c)
Sponsored by:	Weyland-Yutani Corporation
2003-12-08 16:55:21 +00:00
Yaroslav Tykhiy adbc482304 MFC rev. 1.147: Avoid adding excessive CRs when in ASCII mode. 2003-12-06 18:13:20 +00:00
Bruce A. Mah 13a733c5f4 MFC: SA-03:19. 2003-12-05 00:01:30 +00:00
Søren Schmidt 649427556e Add support for the VIA 8235 and 8237 including the SATA part.
Add support for the AMD 8111
Fix support for the nForce (so it actually does something).
Add support for the nForc2 and nForce3.
Ideas from -current but different impl.

Sponsored by: Yahoo!
2003-12-04 10:47:42 +00:00
Søren Schmidt aca6da7f31 Add support for the Serverworks CSB6. Idea from -current but different impl.
Sponsored by: Yahoo!
2003-12-04 10:39:31 +00:00
Søren Schmidt ec7631c985 Fix support for the CMD648/649 chips, idea from -current but different impl.
Sponsored by: Yahoo!
2003-12-04 10:33:54 +00:00
Don Lewis 238fd80064 Fix two white space nits.
Pointed out by:	njl
2003-12-04 04:25:06 +00:00
Don Lewis f472804678 The existing hash algorithm in bufhash() does not distribute entries
very well across buckets, especially in the case of cylinder group blocks
which are located at a sequence of locations that are a multiple of a large
power of two apart.  In the case of large file systems, one or possibly
a few of the hash chains can get excessively long.  Replace the existing
hash algorithm with a variation on the Fibonacci hash.

Tested by:	Ken Marx <[email protected]>
2003-12-03 21:49:06 +00:00
Max Khon 543039c818 Mention -M option in usage().
PR:		57462
Submitted by:	Ryuichiro Imura
2003-12-03 01:51:23 +00:00
Bruce Evans 135f52d692 MFC (1.405: quick fix for most of the pessimization in rev.1.194). 2003-12-02 06:18:37 +00:00
David Greenman 695dcdfa5b Fixed typo: is -> it 2003-12-01 22:21:25 +00:00
Doug Ambrisko 2127acb223 MFC: Dell 2650 no link led problem. 2003-12-01 21:06:59 +00:00
Doug Ambrisko c408fa790b MFC: OX16PCI954 device id 0x950a. 2003-12-01 20:45:08 +00:00
Ceri Davies 28de8761cf MFC r1.35:
Attempt to save the last dregs of emacs users' sanity by saving the
    contents of the PR when an interrupt is received during the editor
    session.  This stops the use of ^G from deleting a filled PR from
    underneath the user.

    PR:			bin/59201
    Submitted by:	Heikki Suonsivu <[email protected]>
2003-12-01 19:12:58 +00:00
David Greenman ff4d8f189b Fixed a bug in sendfile(2) where the sent data would be corrupted due
to sendfile(2) being erroneously automatically restarted after a signal
is delivered. Fixed by converting ERESTART to EINTR prior to exiting.

Updated manual page to indicate the potential EINTR error, its cause
and consequences.
2003-12-01 09:38:11 +00:00
Joseph Koshy 105552d157 Correct typos. 2003-12-01 04:48:51 +00:00
Bruce A. Mah f0ae3dad91 MFC:
New release notes:  SA-03:19, BIND 8.3.7.

Add old version information to sendmail note.
2003-12-01 00:34:57 +00:00
Doug Ambrisko efa515d297 MFC: - Support for newer firmware on non MPI350 cards (ie. new RID lengths)
and more flexible SSID lists.
      -	Some tweaks to the MPI350 handling but not the hack to kick start
	the new MPI350 firmware.
2003-11-30 20:29:42 +00:00
Shunsuke Akiyama 5b329c006d MFC: revision 1.4
Add the following devices to the list of supported devices, to sync
manual page with the source code:
- HAL Corporation Crossam2+USB IR commander
- RATOC REX-USB60
- SOURCENEXT KeikaiDenwa 8 (with and without charger)
2003-11-30 13:12:47 +00:00
Shunsuke Akiyama f05a359b62 MFC: Make interrupt pipe interval time configurable.
- Add kernel options: {UPLCOM,UVSCOM}_INTR_INTERVAL
     - Add sysctl variables: 'hw.usb.{uplcom,uvscom}.interval'

sys/conf/options:		1.426
sys/dev/usb/uplcom.c:		1.16
sys/dev/usb/uvscom.c:		1.19
sys/i386/conf/LINT:		1.1189 (in NOTES)
sys/modules/uplcom/Makefile:	1.2
2003-11-30 13:05:38 +00:00
Shunsuke Akiyama d00eca24b9 MFC: revision 1.11
Apply some fixups in the driver_t's.
2003-11-30 12:53:40 +00:00
Shunsuke Akiyama 2563dfc6ec MFC: Revision 1.15, 1.17
Add device IDs supported by uplcom(4).
- SOURCENEXT Corp. KeikaiDenwa 8
- SOUECENEXT Corp. KeikaiDenwa 8 with charger
- HAL Corp. Crossam2+USB
2003-11-30 12:51:56 +00:00
Shunsuke Akiyama 251204bda4 MFC: revision 1.35
Add missing ioctl functions.
2003-11-30 12:48:52 +00:00
Shunsuke Akiyama e9f012bcb2 MFC: revision 1.7
Add rue(4) into list of miibus-using drivers and reference.
2003-11-30 12:47:25 +00:00
Bruce M Simpson 49b13d9069 MFC: Fix some minor nits in netstat whereby large interface names would be
truncated. In environments where many tunnel or vlan interfaces are created,
interface names have high numbers which overflow the field width.

PRs:		bin/52349, bin/35838
Submitted by:	Mike Tancsa, Scot W. Hetzel
2003-11-30 02:58:44 +00:00
Doug Barton e01e87bcd1 MFC of version 8.3.7 import
Requested by:	security-officer
2003-11-28 22:13:48 +00:00
Hajimu UMEMOTO 378bbc86c7 MFC 1.167: AF_LINK sockaddr has to be attached to ifp->if_addrlist until
the end, as many of the code assumes that TAILQ_FIRST(ifp->if_addrlist)
is non-null.
2003-11-28 15:09:03 +00:00
Hajimu UMEMOTO 5f5eec9b6d MFC 1.11: fixed a bug comparing sav->key_auth and SADB_AALG_NONE. 2003-11-28 14:54:26 +00:00
Hajimu UMEMOTO e6cca334eb MFC 1.23: correct stat to increment. 2003-11-28 14:52:52 +00:00
Hajimu UMEMOTO 58694486f1 MFC 1.60: missing splx. 2003-11-28 14:42:22 +00:00
Ruslan Ermilov 22e34fe7d8 Hook up the pst(4) driver.
Reviewed by:	sos
2003-11-28 08:51:54 +00:00
Mike Silbersack 53c9685f37 MFC rev 1.27:
Document that listen() can return EINVAL now.
2003-11-28 06:41:33 +00:00
Ruslan Ermilov bafbd8d225 MFC: Handle includes the normal way. 2003-11-27 15:05:37 +00:00
Ruslan Ermilov b2512a47cf Fixed a typo. 2003-11-27 14:52:36 +00:00
Ruslan Ermilov d697b04539 MFC: 1.69: Allow ``route -vnd flush'' for non-roots. 2003-11-27 14:50:04 +00:00
Ruslan Ermilov 6908cbf9ed MFC: 1.60: Print the correct ICMP statistics for "no return routes". 2003-11-27 14:46:49 +00:00
Bruce M Simpson ce33caeeba Forced commit to note that I also brought in ipsec_enable into rc.conf.5
as of last revision as it was missing.
2003-11-27 10:08:48 +00:00
Bruce M Simpson 448cfec42b Add a means of starting an IKE daemon from the rc system at an appropriate
time during the boot process. This is needed in the case where NFS mounts
from servers reachable only via IPSEC are in /etc/fstab.

PR:		conf/42497
Submitted by:	Volker Stolz
2003-11-27 09:51:29 +00:00
Hidetoshi Shimokawa 68b504d3a4 Add dependency. 2003-11-26 08:42:39 +00:00
Josef Karthauser 982ca41b09 Regen. 2003-11-25 21:23:48 +00:00
Josef Karthauser c7589594d3 MFC: Synchronise with -current. 2003-11-25 21:23:03 +00:00
Josef Karthauser 40093c0048 MFC: (Rev 1.29) fix spelling of ATTACH. 2003-11-25 21:13:37 +00:00
Anton Berezin 8ca3b9daed MFC rev. 1.90:
Sync comment with code's reality.
2003-11-25 18:52:03 +00:00
Luoqi Chen 4327290c08 Backout rev 1.48.2.2: it wasn't necessary and broke ddb breakpoint support.
Pointed out by:		bde
2003-11-24 21:16:47 +00:00
Simon L. B. Nielsen 4cedeadc92 MFC v. 1.3+1.4:
- Ispell sweep of share/man/man4.
- Add cross reference to the em(4) driver, which also supports the
  NICs supported by the gx(4) driver.
2003-11-24 00:07:16 +00:00
Simon L. B. Nielsen 96699bfd93 MFC v. 1.5:
- Synchronize the list of support devices with the driver source code.
2003-11-23 23:58:31 +00:00
Bruce Evans cde6b02965 MFC (1.23: changed RB_PAUSE to retrospectively avoid breaking binary
compatibility, and marked the old value and RB_PROBEKBD as reserved
for internal use in boot blocks.  Also unintentionally clobber a style
fix in 1.22).

The corresponding change to boot/boot2.c has not been not merged, since
RELENG_4's boot2 doesn't actually support RB_PAUSE (or even the 7 year
old flag RB_MUTE), so any plain merge would just add an incomplete set
of comments to code that should be rewritten so that it doesn't need
the comments.  RELENG_4's boot/loader does support these flags, and
it doesn't need changing since it doesn't hard-code copies of them.
2003-11-23 01:47:19 +00:00
Bruce Evans 7289ca60e0 MFC (1.22: fixed some style bugs). 2003-11-23 01:11:10 +00:00
Archie Cobbs 4c85c2aa66 MFC: (rev. 1.31) Maximum ACK timeout for GRE packets from 10 -> 1 second. 2003-11-22 15:28:16 +00:00
Simon L. B. Nielsen 80fd9356bd MFC 1.14-1.16:
- Document the KZPCA-AA.
- Sync the sym(4) manual page with the hardware notes, and change the
  list of supported controllers into a list.
2003-11-21 00:02:29 +00:00
Dag-Erling Smørgrav 9eaaddbfc0 MFC: warn about partitions that overlap with the mbr. 2003-11-20 08:24:33 +00:00
Wilko Bulte a866392285 MFC:
Add vendor ID to make Marvell chipset work. E.g. to be found
on SMC9452TX it seems

Submitted by: Jung-uk Kim <[email protected]>
Tested by: <Radu Bogdan 'veedee' Rusu> [email protected]
2003-11-18 23:22:03 +00:00
Prafulla Deuskar ef31ccb6a3 MFC:
- Code cleanup
- In the receive routine handle the case where last descriptor could have
    less than 4 bytes of data.
- Handle race between detach/ioctl routine.
- Add facilities for tuning "em" drivers interrupt delays without recompiling
  the driver. These changes were done by John Polstra.
Submitted by:	jdp (sysctl's for interrupt delay tuning)
2003-11-18 17:25:53 +00:00
Simon L. B. Nielsen 3006cf44a1 Bump version number since we are at 4.9-STABLE now.
Approved by:	ru
2003-11-18 13:42:04 +00:00
Don Lewis 4fdbb9c348 MFC 1.116 which tweaks the minbfree, minifree, maxcontigdirs calculations
to give results that work better.
2003-11-18 03:36:23 +00:00
Eric Anholt 31d26cfa4f MFC: r1.56 (Prevent leaking fsid to non-root in linux compat). 2003-11-17 22:58:57 +00:00
Hidetoshi Shimokawa 9e6a3584bc Fix build on alpha.
Noticed by: tinderbox & imp
2003-11-16 09:54:13 +00:00
Christian Brueffer 3ac1319fa3 MFC: 1.35
Add a describtion for the '-d' flag and fill in a missing comma
2003-11-15 10:48:59 +00:00
Bruce M Simpson 37e0f49ddf MFC: Add the svn service to /etc/services.
PR:		conf/54371
Submitted by:	Roman Neuhauser
2003-11-15 08:39:11 +00:00
Christian Brueffer 9132723a8a MFC: Sync this manual page with the one in -current 2003-11-14 23:23:58 +00:00
Anton Berezin 8fb6ba2ddd MFC 1.30:
Remove the code for parsing octal modes, since setmode(3) already
handles them.
2003-11-14 15:27:08 +00:00
Hidetoshi Shimokawa 022e618eb5 MFC: add dcons. 2003-11-14 12:59:51 +00:00
Hidetoshi Shimokawa 5548a03a21 Sync with -current. 2003-11-14 12:58:12 +00:00
Hidetoshi Shimokawa 26f09b4605 Add manpages for dcons(4), dcons_crom(4), and sbp_targ(4). 2003-11-14 12:57:35 +00:00
Hidetoshi Shimokawa e5338c8918 MFC: dconschat(8) 2003-11-14 12:21:00 +00:00
Hidetoshi Shimokawa 59016d89db MFC: dcons(4) and dcons_crom(4). 2003-11-14 12:16:46 +00:00
Hidetoshi Shimokawa 73f386e9e2 s/Firewire/FireWire/. 2003-11-14 12:14:07 +00:00
Hidetoshi Shimokawa a4a47944e4 Build sbp_targ(4). 2003-11-14 12:06:35 +00:00
Hidetoshi Shimokawa 06e725a114 Sync with -current:
- Add -p option to dump phy registers.
- Add '0x' in front of EUI64 to avoid confusion.
2003-11-14 11:40:20 +00:00
Hidetoshi Shimokawa de02cca606 Sync with -current:
- Major restruction of asynchronous receive API.
- Add sbp_targ(4) code.
- Add fwphy register definitions.
- Enable core dump on sbp-2 device.
- Add some tunables/sysctls.
- Minor bug fixes and stability improvement.
2003-11-14 11:34:29 +00:00
Hidetoshi Shimokawa 8e146da1f3 MFC: rev. 1.19 and 1.20
- Detach black hole device on AC_PATH_DEREGISTERED.
- Pick up a correct path_id for the bus on AC_PATH_REGISTERED.
- Call cam_periph_invalidate() only if the periph is found.
2003-11-14 11:31:25 +00:00
Hidetoshi Shimokawa 909d23d274 Sync with -current:
- Fixes for sbp_targ(4).
- Enhance -s option.
- 16 byte command support(not enabled for -stable).
2003-11-14 09:55:53 +00:00
Hidetoshi Shimokawa 19b1ca550f Don't check block number overflow for D_MEM.
/dev/fwmem needs 48bit offset.

This change is needed only for 4-stable.
2003-11-14 09:51:47 +00:00
Matt Jacob 785cc9c755 MFC: fix broken _IOR usage 2003-11-14 05:13:43 +00:00
Ruslan Ermilov c22c45e705 MFC: Shift+PrintScr - prev. screen. 2003-11-12 14:20:16 +00:00
Ruslan Ermilov a01b140220 Properly shutdown the node (don't panic). 2003-11-12 13:27:43 +00:00
Mike Heffner 1cb4f8f95a MFC:
Support A4 Tech RFSW-35 mouse.
2003-11-12 04:51:24 +00:00
Mike Heffner 6c74e20775 MFC: 1.60
Reset device twice.
2003-11-12 04:26:26 +00:00
cvs2svn 1153e4a1fb This commit was manufactured by cvs2svn to create branch 'RELENG_4'. 2003-11-12 04:06:22 +00:00
Josef Karthauser 2137436d2a MFC: (rev 1.16)
Sony Clie_40 devices don't need the PALM_4 initialisation hack.
2003-11-12 00:19:50 +00:00
Mike Silbersack 01a9f72f9e MFC rev 1.85; fix a condition where sis_encap would allocate a new mbuf,
causing bpf_mtap to be fed the stale, now-freed m_head.
2003-11-11 17:32:26 +00:00
Mike Silbersack 64bde611d5 MFC rev 1.127; fix a condition where dc_encap would allocate a new mbuf,
causing bpf_mtap to be fed the stale, now-freed m_head.
2003-11-11 17:28:15 +00:00
Mike Silbersack 81f70d8cd2 MFC rev 1.143; don't allow a listen on already connected sockets 2003-11-11 17:18:18 +00:00
Max Khon 65bcc36207 MFC: rev. 1.88
Add kern.ipc.shm_allow_removed (integer, rw) sysctl (default 0) which when set
to 1 allows to return removed segments in shm_find_segment_by_shmid().
2003-11-11 13:44:59 +00:00
Peter Pentchev 342ca95782 MFC the typo fix from rev. 1.61: 'in cloud' -> 'in a cloud'. 2003-11-11 08:27:51 +00:00
David Schultz 5698d5cec4 MFC src/sys/kern/kern_fork.c,v 1.126
This closes a local DOS whereby a user can put a process in an
uninterruptible sleep by calling rfork(RFNOWAIT|RFPPWAIT|RFPROC).

Reported by:	Igor Serikov <[email protected]>
2003-11-11 07:26:44 +00:00
David Schultz 4437eb9216 MFC src/sys/sys/unistd.h,v 1.29 2003-11-11 07:26:33 +00:00
Bruce A. Mah b0d322900f New errata: xterm termcap(5) entry breaks hack(6). ata(4) tagged
queueing broken.
2003-11-11 05:03:00 +00:00
Gregory Neil Shapiro 99a0328f21 MFC: People are blindly coping this example refuse file. Doing so breaks
buildworld as src/etc/sendmail/freebsd.mc is missing.  That example
     was added 3 years ago, before the /etc/mail/ infrastructure was in
     place for customized configurations.  It is time to remove this example.

     Revision  Changes    Path
     1.11      +0 -1      src/share/examples/cvsup/refuse
     1.10      +4 -6      src/share/examples/cvsup/refuse.README
2003-11-11 04:52:39 +00:00
Wilko Bulte 6c294dc619 reformat HP eng. mgr quote
Requested by: nate
2003-11-10 23:02:32 +00:00
Wilko Bulte 37b7d862da MFC: add HP engineering mgr anecdote 2003-11-10 18:49:57 +00:00
Christian Brueffer 2ddf32ad9b MFC: Document usbd_enable and usbd_flags
PR:		57118
Reported by:	Chris Pepper <[email protected]>
2003-11-10 16:22:32 +00:00
Ruslan Ermilov 1f6aa14e61 Attach ng_eiface(4) module to the build. 2003-11-10 14:01:18 +00:00
Ruslan Ermilov 67b690133b Added missing module dependency. 2003-11-10 13:59:54 +00:00
Ruslan Ermilov 811c5e5c82 Added the missing KMODDEPS, MFC the removal of -g. 2003-11-10 12:56:22 +00:00
Dag-Erling Smørgrav 52fc7c37b4 Add optional paths for recent and upcoming Perl versions. 2003-11-10 09:03:00 +00:00
Ceri Davies 52af50d70b Further diff reduction with HEAD. 2003-11-07 23:18:36 +00:00
Ceri Davies d8b2688931 Reduce diffs with HEAD. 2003-11-07 22:17:31 +00:00
Bruce A. Mah 32760db6ff MFC: amr(4) crashdump support, lost+found 0700, libalias and Cisco
Skinny Station.
2003-11-07 16:55:29 +00:00
Simon L. B. Nielsen 22cb595d14 MFC v. 1.13:
Add a missing word.
2003-11-07 11:48:56 +00:00
Paul Saab 9baf40c90a MFC: rev 1.31 PCI id 2003-11-07 03:25:46 +00:00
Ceri Davies cac38171a0 MFC r1.4:
Correct a grammatical error.

	PR:		misc/54967
	Submitted by:	Paul A. Scott <[email protected]>
2003-11-06 21:30:38 +00:00
Hajimu UMEMOTO c632f020c2 MFC 1.67: correct behavior when ipv6mr_interface is 0. 2003-11-06 16:47:04 +00:00
Matthew Hunt 1d36391d15 MFC: Add r_{earth,moon,sun}. 2003-11-05 22:40:47 +00:00
Gregory Neil Shapiro 75911cc372 MFC: Cast the NULL to a pointer type for 64 bit architectures 2003-11-04 21:35:40 +00:00
Murray Stokely 0eb671a6cf MFC: GBK encoding. 2003-11-04 19:38:29 +00:00
Murray Stokely 0918f51191 MFC: the GBK locale directories. I didn't meant to MFC this yet but I
accidentally MFCed one of the GBK files so this is needed.
2003-11-04 19:32:15 +00:00
Murray Stokely e35b6d25c6 Add GB18030 directories. 2003-11-04 05:15:44 +00:00
Murray Stokely edee2ade1d MFC: Support for gb18030 encoding. 2003-11-04 05:12:21 +00:00
Murray Stokely a03fab4d84 Finish MFC of GB18030 locale. 2003-11-04 05:03:28 +00:00
Murray Stokely b4595c9c8a MFC: PRC locales. 2003-11-03 16:45:49 +00:00
Hideyuki KURASHINA 2b12fab7ee Merge the following from the English version:
1.1.2.113  -> 1.1.2.117    errata/article.sgml
   1.22.2.385 -> 1.22.2.388   relnotes/common/new.sgml
2003-11-03 14:02:26 +00:00
Bruce A. Mah cff2f89135 Bump BASE variable definition for 4.9.
Pointed out by:	Kent Hauser <[email protected]>
2003-11-02 07:07:08 +00:00
Tim J. Robbins 2a91ea3f50 MFC rev. 1.20: Fix a warning that showed up on 64 bit systems. It was
actually a real bug that had been swept under the carpet.
2003-11-02 04:28:58 +00:00
Scott Long 55ba5153a5 MFC: Remove erroneous PCI Id. 2003-11-01 18:44:51 +00:00
Joe Marcus Clarke 3e6c918643 MFC: Add Cisco Skinny Station Protocol translation support to libalias
and supporting applications (ppp and natd).

Approved by:	ru
2003-11-01 03:50:03 +00:00
Bruce A. Mah 4521fc4f44 MFC: Sort the lists of supported devices. No other content changes. 2003-11-01 00:43:28 +00:00
Bruce A. Mah 8b74d38e29 MFC: In the lists of supported devices, remove "The" from the names of
devices and capitalize the words "Gigabit", "Ethernet", and "adapter"
consistently.
2003-11-01 00:42:39 +00:00
Bruce A. Mah af2dcd8bc8 MFC: Synchronize the list of supported ti(4) with CURRENT.
Partially in response to PR.

PR:		55637
2003-11-01 00:41:26 +00:00
Bruce A. Mah 5346b0ea03 MFC: Add the multicast.4 and pim.4 manual pages and hook up to the
build.
2003-11-01 00:14:56 +00:00
Tor Egge 99a7ed5523 MFC rev 1.428: Zero fill a new page table before adding it to a page
directory.  Otherwise a 2nd, 3rd etc. thread might end up using garbage
for address translation.
MFC (partial) rev 1.43[67]: Don't zero fill existing page table.
2003-10-31 20:13:09 +00:00
Tor Egge e4d3045faf MFC rev. 1.259: Don't put held pages onto a cache queue. 2003-10-31 20:12:11 +00:00
Simon L. B. Nielsen 3a6389fed8 Note the 4.9 release date.
Reviewed by:	bmah
2003-10-31 16:40:39 +00:00
Yoshihiro Takahashi 29141d516b MFi386: revisions 1.385.2.33 and 1.385.2.34. 2003-10-31 13:44:22 +00:00
Sheldon Hearn adad9c5a46 MFC rev 1.79: clarify description of INSTALL 2003-10-31 11:58:46 +00:00
Bruce A. Mah be45efd13e New errata (really plural this time): crypto distribution required,
mention problems with machines that don't support emulation-booting
CDROMs.

While here, add date-stamps for errata items.  A couple of people
asked for this and it seemed useful and easy to do.
2003-10-30 23:25:22 +00:00
Garance A Drosehn bcbdfa1ba2 MFC *: Move the time-processing routines to separate source files,
and restructure them.  This is mainly to fix up the "will trim at"
messages printed when running 'newsyslog -v'.

[* = 1.1->1.2 extern.h, 1.81->1.82 newsyslog.c, 1.1->1.4 ptimes.c,
     1.15 Makefile]
2003-10-30 23:21:03 +00:00
Gregory Neil Shapiro f7cdbba775 Sync with HEAD by MFC'ing change 1.3 made by des:
Usage style sweep: spell "usage" with a small 'u'.
2003-10-30 22:42:48 +00:00
Gregory Neil Shapiro b258887e99 MFC: Adding WorkAroundBrokenAAAA seems a necessity even in the submit.mc given
the number of broken DNS servers out there in the world.  Since we are
     diverging from the sendmail.org submit.mc, it's time to make our own
     freebsd.submit.mc.
2003-10-30 22:38:33 +00:00
Gregory Neil Shapiro aaf28c1fac MFC: Turn SENDMAIL_CF_DIR into an officially supported make.conf variable
and use it in src/etc/sendmail/Makefile in case the user wants to use
     a different path to the sendmail m4 sources (e.g., sendmail port users).
2003-10-30 22:37:06 +00:00
Gregory Neil Shapiro 12df8315bd MFC: Before trying to restart/stop the MTA or MSP queue runner, make sure
we are configured to use an MTA or MSP queue runner.  Otherwise the
     script used to complain about the missing PID file.
2003-10-30 22:33:14 +00:00
Gregory Neil Shapiro 83dc7a79d1 MFC: sendmail 8.12.10 (note that parts of 8.12.10 were MFC'ed prior to
FreeBSD 4.9-RELEASE)
2003-10-30 22:31:46 +00:00
Thomas Quinot 619e8a0c9c MFC rev. 1.43:
(scsi_request_sense): Set allocation length in REQUEST_SENSE CCB.

Reviewed by:	ken
2003-10-30 15:06:35 +00:00
Simon L. B. Nielsen 4de453a71e MFC 1.17:
- Update the page title to include information about which cards
  are supported by the driver.
- Use a list to specify which cards are supported.
- Add the 3c592/3c597 EISA cards to the list of supported cards.
2003-10-29 23:29:17 +00:00
Bruce A. Mah 5f22ee8931 New errata item: OpenLDAP package incompatibilities.
Pointed out by:	murray
2003-10-29 22:46:23 +00:00
Simon L. B. Nielsen 2fc5d0bd9b MFC 1.20:
- Sync usage with the manual page.

Approved by:	trhodes
2003-10-29 22:18:40 +00:00
Garance A Drosehn 0c75e80168 MFC 1.79->1.80: Reduce the annoying compiler warnings that can pop up
when compiling with gcc 3.3.x and -Wshadow.  (this was mainly an issue
on -current...)
2003-10-29 21:59:47 +00:00
Simon L. B. Nielsen d5067f63ca MFC 1.21+1.22:
- Reflect the fact that fxtv is now found in ports/multimedia/fxtv.
- mdoc(7) cleanup.
2003-10-29 21:57:23 +00:00
Simon L. B. Nielsen ded5cd2cef MFC 1.14-1.16:
- Add the optional port argument to SYNOPSIS.
- Make the description of the connect, get, and put commands clearer.
- Markup polishing.
2003-10-29 21:49:22 +00:00
Garance A Drosehn f4a8b02670 MFC 1.73->1.78: Mainly cosmetic changes to parse8601 and parseDWM.
Also adds the '-D something', which can set some debugging options
(such as '-D TN=<time>').
2003-10-29 21:37:35 +00:00
Simon L. B. Nielsen ae5315fc02 MFC 1.19:
- Add the Dell PERC 4/Di to the list of supported devices; it
  has been supported for the last 10 months.
- Make the device list compact, since it is getting rather large.
2003-10-29 21:27:03 +00:00
Ruslan Ermilov 86992e799e MFC: Added /usr/X11R6/man and /usr/local/man as optional manpaths. 2003-10-29 20:56:51 +00:00
Ruslan Ermilov 7d5ca82ae3 MFC: The -P option. 2003-10-29 20:39:46 +00:00
Hajimu UMEMOTO ad405ca84e MFC: Don't depend on IPv4-mapped IPv6 address to bind to both IPv4
and IPv6.

	libexec/ftpd/ftpd.8:	1.66
	libexec/ftpd/ftpd.c:	1.146
2003-10-29 18:22:48 +00:00
Simon L. B. Nielsen e689ef5e94 MFC: index(3) 1.10 and strchr(3) 1.11
Move a sentence about the terminating \0 from the RETURN VALUES section
(where it didn't really belong), to the DESCRIPTION section.
2003-10-29 18:15:48 +00:00
Bill Paul 1b8bd21f62 Kudos to Guido for porting the tdkphy driver to RELENG_4, but it
needs in the miibus module Makefile too.
2003-10-29 17:06:48 +00:00
Sheldon Hearn 69544a6fcf MFC rev 1.26: regen 2003-10-29 11:20:31 +00:00
Martin Blapp b346bbcc33 MFC Rev. 1.125
Don't read the MAC address from a copy of the EEPROM in the softc
that has been recorded earlier and overwrite it again later by
reading it directly from the EEPROM again.

Read the MAC address from the PAR0/PAR1 registers instead, which
are autoloaded on reboot.
2003-10-29 09:57:33 +00:00
Ian Dowse 013827e358 MFC: sbin/fsck_ffs 1.27; change the default mode for lost+found
from 01777 to 0700.
2003-10-29 09:53:29 +00:00
Martin Blapp c260f6d840 Forced commit: Previous commit message was not correct.
Ignore CSR13, CSR14, CSR15 'Media Specific Data' registers
for 21143 based cards which use SIA mode.

MFC rev. 1.126 of if_dc.c
2003-10-29 09:52:33 +00:00
Ian Dowse 0307339f51 MFC: 1.19; When looking for the ':' separator in the root path,
don't go past the terminating '\0'.
2003-10-29 09:47:40 +00:00
Martin Blapp 70d995dc31 MFC:
Rev. 1.38 of if_dcreg.h
Rev. 1.125 if if_dc.c
2003-10-29 09:46:10 +00:00
Guido van Rooij 393e4d8e7a MFC: support for tdk 78Q2120 MII 2003-10-29 09:27:52 +00:00
Paul Saab 18b704460a MFC: crashdump support for amr 2003-10-29 09:11:38 +00:00
Bruce A. Mah 5f47e34a22 First errata against 4.9-RELEASE: Change in HyperThreading support.
While here, add trademark boilerplate.
2003-10-28 18:15:15 +00:00
Bruce A. Mah 0627dec30b Trim release notes and errata for a post-4.9 world, bump version
numbers for 4.9-STABLE.

Approved by:	re (implicitly)
2003-10-27 18:49:51 +00:00
Murray Stokely ca2f2edc47 Add proper entries to release table so that pkg_add -r on a 4.9 system
will fetch 4.9 packages, instead of falling back on 4-stable packages.
2003-10-27 07:56:27 +00:00
Murray Stokely 73f6c89d75 Identify as 4.9-STABLE. 2003-10-27 02:24:47 +00:00
Murray Stokely 99cb926b07 Bump for 4.9-STABLE. 2003-10-27 02:22:50 +00:00
Max Khon 6679855387 Fix setting PIO mode timings on AcerLabs Aladdin IV/V chipsets
(add missing 'break' statements).

Approved by:	sos, re
Reported by:	Juan Manuel Sanchez <[email protected]>
2003-10-26 18:34:23 +00:00
Dag-Erling Smørgrav 59005991e3 MFC: (1.14) plug a memory leak in the PAM child process. 2003-10-26 11:20:47 +00:00
Dag-Erling Smørgrav c6e5096f43 MFC: fix, improve & extend NFS support.
Submitted by:	hmp
Approved by:	re (murray)
2003-10-23 20:57:22 +00:00
2505 changed files with 317413 additions and 98711 deletions

No files matched your search

+26
View File
@@ -1,6 +1,32 @@
# $FreeBSD$
# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94
The compilation of software known as FreeBSD is distributed under the
following terms:
Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
Releases is copyrighted by The Regents of the University of California.
+44 -21
View File
@@ -9,7 +9,6 @@
# -DNOCRYPT will prevent building of crypt versions
# -DNOMAN do not build the manual pages
# -DNOPROFILE do not build profiled libraries
# -DNOSECURE do not go into secure subdir
# -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files
@@ -77,7 +76,7 @@ SUBDIR+= libexec
.if exists(${.CURDIR}/sbin)
SUBDIR+= sbin
.endif
.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
.if exists(${.CURDIR}/secure) && !defined(NOCRYPT)
SUBDIR+= secure
.endif
.if exists(${.CURDIR}/share) && !defined(NOSHARE)
@@ -178,11 +177,14 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
MACHINE_ARCH=${TARGET_ARCH} \
MACHINE=${TARGET} \
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503 \
GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac
.if !defined(NOPERL)
CROSSENV+= PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503
.endif
# bootstrap-tool stage
BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \
DESTDIR= \
@@ -339,17 +341,25 @@ buildworld: ${WMAKE_TGTS}
#
# Checks to be sure system is ready for installworld
#
installcheck:
CHECK_UIDS=
CHECK_GIDS=
.if !defined(NO_SENDMAIL)
@if ! `id -u smmsp > /dev/null`; then \
echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \
false; \
fi
@if ! `id -g smmsp > /dev/null`; then \
echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \
false; \
fi
CHECK_UIDS+= smmsp
CHECK_GIDS+= smmsp
.endif
installcheck:
.for uid in ${CHECK_UIDS}
@if ! `id -u ${uid} >/dev/null 2>&1`; then \
echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
false; \
fi
.endfor
.for gid in ${CHECK_GIDS}
@if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \
echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
false; \
fi
.endfor
#
# distributeworld
@@ -364,7 +374,7 @@ distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
for prog in [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep \
ln make makewhatis mkdir mtree mv perl pwd_mkdb rm sed sh sysctl \
ln make makewhatis mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc zic; do \
cp `which $$prog` ${INSTALLTMP}; \
done
@@ -497,8 +507,21 @@ buildkernel:
# Install the kernel defined by INSTALLKERNEL
#
installkernel reinstallkernel:
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules)
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; \
${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy
.endif
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel"
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//}
${CROSSENV} PATH=${TMPPATH} \
${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//}
#
# update
@@ -531,7 +554,7 @@ update:
@echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; cvs -q update -rRELENG_4_9 -P -d
cd ${.CURDIR}; cvs -R -q update -rRELENG_4 -P -d
.endif
#
@@ -581,7 +604,7 @@ _strfile= games/fortune/strfile
bootstrap-tools:
.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \
usr.bin/uudecode usr.bin/xinstall \
usr.bin/makewhatis usr.bin/uudecode usr.bin/xinstall \
usr.sbin/config \
gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo
${ECHODIR} "===> ${_tool}"; \
@@ -612,12 +635,12 @@ _perl= gnu/usr.bin/perl/miniperl
.endif
.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
!defined(NOCRYPT) && defined(MAKE_KERBEROS4)
!defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4)
_libroken4= kerberosIV/lib/libroken
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
!defined(NOCRYPT) && defined(MAKE_KERBEROS5)
!defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
_libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
@@ -698,7 +721,7 @@ _generic_libs= gnu/lib
_generic_libs+= gnu/usr.bin/perl/libperl
.endif
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libgssapi
_prebuild_libs+= kerberos5/lib/libkrb5
@@ -706,7 +729,7 @@ _prebuild_libs+= kerberos5/lib/libroken
_generic_libs+= kerberos5/lib
.endif
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4)
_prebuild_libs+= kerberosIV/lib/libkrb
kerberosIV/lib/libkrb__L: lib/libcrypt__L
_generic_libs+= kerberosIV/lib
@@ -722,7 +745,7 @@ lib/libskey__L: lib/libcrypt__L lib/libmd__L
_generic_libs+= lib
.if !defined(NOCRYPT) && !defined(NOSECURE)
.if !defined(NOCRYPT)
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.if !defined(NO_OPENSSH)
+26 -1
View File
@@ -8,6 +8,31 @@ A reverse chronology since 4.0 was released is included, followed by
the common items quick how-tos, followed by entries for versions of
-current prior to 4.0 Release.
20070426:
The ABI breakage in sendmail(8)'s libmilter has been repaired
so it is no longer necessary to recompile mail filters (aka,
milters). If you recompiled mail filters after the 20070411
note, it is not necessary to recompile them again.
20070411:
sendmail(8) has been updated to version 8.14.1. Mail filters
(aka, milters) compiled against the libmilter included in the
base operating system should be recompiled.
20050513:
Intel Hyper-Threading is now disabled by default due to a
security issue, but can be re-enabled by setting the
machdep.hyperthreading_allowed tunable in /boot/loader.conf.
20050124:
FreeBSD 4.11-RELEASE.
20040527:
FreeBSD 4.10-RELEASE.
20031028:
FreeBSD 4.9-RELEASE.
20031022:
Support for HyperThread logical CPUs has now been enabled by
default. As a result, the HTT kernel option no longer exists.
@@ -845,7 +870,7 @@ versions of -stable/-current.
Changes to the pccardd kernel interface require that you recompile
pccardd for new kernel.
19980725:
19990725:
The ipfw interface to the kernel has changed. You will need to
recompile ipfw programs for the new kernel.
+4 -21
View File
@@ -68,16 +68,13 @@ main(argc, argv)
FTS *ftsp;
FTSENT *p;
mode_t *set;
long val;
int oct, omode;
int Hflag, Lflag, Pflag, Rflag, ch, fflag, fts_options, hflag, rval;
int vflag;
char *ep, *mode;
char *mode;
int newmode;
int (*change_mode) __P((const char *, mode_t));
set = NULL;
omode = 0;
Hflag = Lflag = Pflag = Rflag = fflag = hflag = vflag = 0;
while ((ch = getopt(argc, argv, "HLPRXfghorstuvwx")) != -1)
switch (ch) {
@@ -155,22 +152,8 @@ done: argv += optind;
change_mode = chmod;
mode = *argv;
if (*mode >= '0' && *mode <= '7') {
errno = 0;
val = strtol(mode, &ep, 8);
if (val > INT_MAX || val < 0)
errno = ERANGE;
if (errno)
err(1, "invalid file mode: %s", mode);
if (*ep)
errx(1, "invalid file mode: %s", mode);
omode = val;
oct = 1;
} else {
if ((set = setmode(mode)) == NULL)
errx(1, "invalid file mode: %s", mode);
oct = 0;
}
if ((set = setmode(mode)) == NULL)
errx(1, "invalid file mode: %s", mode);
if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
err(1, NULL);
@@ -203,7 +186,7 @@ done: argv += optind;
default:
break;
}
newmode = oct ? omode : getmode(set, p->fts_statp->st_mode);
newmode = getmode(set, p->fts_statp->st_mode);
if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS))
continue;
if ((*change_mode)(p->fts_accpath, newmode) && !fflag) {
+1 -1
View File
@@ -351,7 +351,7 @@ copy(argv, type, fts_options)
* normally want to preserve them on directories.
*/
if (pflag) {
if (setfile(curr->fts_statp, 0))
if (setfile(curr->fts_statp, -1))
rval = 1;
} else {
mode = curr->fts_statp->st_mode;
+22 -14
View File
@@ -132,7 +132,8 @@ copy_file(entp, dne)
* wins some CPU back.
*/
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
if (S_ISREG(fs->st_mode) && fs->st_size <= 8 * 1048576) {
if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
fs->st_size <= 8 * 1048576) {
if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
warn("%s", entp->fts_path);
@@ -214,7 +215,7 @@ copy_link(p, exists)
warn("symlink: %s", link);
return (1);
}
return (0);
return (pflag ? setfile(p->fts_statp, -1) : 0);
}
int
@@ -230,7 +231,7 @@ copy_fifo(from_stat, exists)
warn("mkfifo: %s", to.p_path);
return (1);
}
return (pflag ? setfile(from_stat, 0) : 0);
return (pflag ? setfile(from_stat, -1) : 0);
}
int
@@ -246,7 +247,7 @@ copy_special(from_stat, exists)
warn("mknod: %s", to.p_path);
return (1);
}
return (pflag ? setfile(from_stat, 0) : 0);
return (pflag ? setfile(from_stat, -1) : 0);
}
#define RETAINBITS \
@@ -259,20 +260,22 @@ setfile(fs, fd)
{
static struct timeval tv[2];
struct stat ts;
int rval;
int gotstat;
int rval, gotstat, islink, fdval;
rval = 0;
fdval = fd != -1;
islink = !fdval && S_ISLNK(fs->st_mode);
fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
S_IRWXU | S_IRWXG | S_IRWXO;
TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
if (utimes(to.p_path, tv)) {
warn("utimes: %s", to.p_path);
if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
warn("%sutimes: %s", islink ? "l" : "", to.p_path);
rval = 1;
}
if (fd ? fstat(fd, &ts) : stat(to.p_path, &ts))
if (fdval ? fstat(fd, &ts) :
(islink ? lstat(to.p_path, &ts) : stat(to.p_path, &ts)))
gotstat = 0;
else {
gotstat = 1;
@@ -286,8 +289,9 @@ setfile(fs, fd)
* chown. If chown fails, lose setuid/setgid bits.
*/
if (!gotstat || fs->st_uid != ts.st_uid || fs->st_gid != ts.st_gid)
if (fd ? fchown(fd, fs->st_uid, fs->st_gid) :
chown(to.p_path, fs->st_uid, fs->st_gid)) {
if (fdval ? fchown(fd, fs->st_uid, fs->st_gid) :
(islink ? lchown(to.p_path, fs->st_uid, fs->st_gid) :
chown(to.p_path, fs->st_uid, fs->st_gid))) {
if (errno != EPERM) {
warn("chown: %s", to.p_path);
rval = 1;
@@ -296,14 +300,18 @@ setfile(fs, fd)
}
if (!gotstat || fs->st_mode != ts.st_mode)
if (fd ? fchmod(fd, fs->st_mode) : chmod(to.p_path, fs->st_mode)) {
if (fdval ? fchmod(fd, fs->st_mode) :
(islink ? lchmod(to.p_path, fs->st_mode) :
chmod(to.p_path, fs->st_mode))) {
warn("chmod: %s", to.p_path);
rval = 1;
}
if (!gotstat || fs->st_flags != ts.st_flags)
if (fd ?
fchflags(fd, fs->st_flags) : chflags(to.p_path, fs->st_flags)) {
if (fdval ?
fchflags(fd, fs->st_flags) :
(islink ? (errno = ENOSYS) :
chflags(to.p_path, fs->st_flags))) {
warn("chflags: %s", to.p_path);
rval = 1;
}
+2
View File
@@ -130,6 +130,8 @@
/* we want to use the system malloc when we install as /bin/csh */
#define SYSMALLOC
#define BSD_STYLE_COLORLS
/* Use LC_MESSAGES locale category to open the message catalog */
#define MCLoadBySet NL_CAT_LOCALE
#endif
#if defined(__bsdi__)
+23 -1
View File
@@ -35,7 +35,7 @@
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
.\" $FreeBSD$
.\"
.Dd November 17, 1993
.Dd August 9, 2004
.Dt DATE 1
.Os
.Sh NAME
@@ -219,6 +219,22 @@ When the date is adjusted to a specific value that occurs twice
the resulting timezone will be set so that the date matches the earlier of
the two times.
.Pp
Adjusting the date by months is inherently ambiguous because
a month is a unit of variable length depending on the current date.
This kind of date adjustment is applied in the most intuitive way.
First of all,
.Nm
tries to preserve the day of the month.
If it is impossible because the target month is shorter than the present one,
the last day of the target month will be the result.
For example, using
.Fl v No +1m
on May 31 will adjust the date to June 30, while using the same option
on January 30 will result in the date adjusted to the last day of February.
This approach is also believed to make the most sense for shell scripting.
Nevertheless, be aware that going forth and back by the same number of
months may take you to a different date.
.Pp
Refer to the examples below for further details.
.El
.Pp
@@ -295,6 +311,12 @@ will display the last day of February in the year 2000:
.Pp
.Dl "Tue Feb 29 03:18:00 GMT 2000"
.Pp
So will do the command:
.Pp
.Dl "date -v30d -v3m -v0y -v-1m"
.Pp
because there is no such date as the 30th of February.
.Pp
The command:
.Pp
.Dl "date -v1d -v+1m -v-1d -v-fri"
+7
View File
@@ -150,6 +150,8 @@ adjyear(struct tm *t, char type, int val, int mk)
static int
adjmon(struct tm *t, char type, int val, int istext, int mk)
{
int lmdays;
if (val < 0)
return 0;
@@ -197,6 +199,11 @@ adjmon(struct tm *t, char type, int val, int istext, int mk)
t->tm_mon = --val;
}
/* e.g., -v-1m on March, 31 is the last day of February in common sense */
lmdays = daysinmonth(t);
if (t->tm_mday > lmdays)
t->tm_mday = lmdays;
return !mk || domktime(t, type) != -1;
}
+1 -1
View File
@@ -41,7 +41,7 @@
.Sh SYNOPSIS
.Nm
.Oo
.Fl b | h | H | k |
.Fl b | g | h | H | k |
.Fl m | P
.Oc
.Op Fl ailn
+23 -16
View File
@@ -112,7 +112,7 @@ unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA };
int bread(off_t, void *, int);
int checkvfsname(const char *, char **);
char *getmntpt(char *);
int longwidth(long);
int int64width(int64_t);
char *makenetvfslist(void);
char **makevfslist(char *);
void prthuman(struct statfs *, long);
@@ -376,9 +376,15 @@ prthumanval(double bytes)
* Convert statfs returned filesystem size into BLOCKSIZE units.
* Attempts to avoid overflow for large filesystems.
*/
#define fsbtoblk(num, fsbs, bs) \
(((fsbs) != 0 && (fsbs) < (bs)) ? \
(num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs)))
static int64_t
fsbtoblk(int64_t num, uint64_t fsbs, u_long bs)
{
if (fsbs != 0 && fsbs < bs)
return (num / (int64_t)(bs / fsbs));
else
return (num * (int64_t)(fsbs / bs));
}
/*
* Print out status about a filesystem.
@@ -420,11 +426,12 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp)
if (hflag) {
prthuman(sfsp, used);
} else {
(void)printf(" %*ld %*ld %*ld", mwp->total,
fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize),
mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize),
mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize,
blocksize));
(void)printf(" %*lld %*lld %*lld", mwp->total,
(long long)fsbtoblk(sfsp->f_blocks, sfsp->f_bsize,
blocksize), mwp->used,
(long long)fsbtoblk(used, sfsp->f_bsize, blocksize),
mwp->avail, (long long)fsbtoblk(sfsp->f_bavail,
sfsp->f_bsize, blocksize));
}
(void)printf(" %5.0f%%",
availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0);
@@ -453,20 +460,20 @@ update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp)
getbsize(&dummy, &blocksize);
mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname));
mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks,
mwp->total = imax(mwp->total, int64width(fsbtoblk(sfsp->f_blocks,
sfsp->f_bsize, blocksize)));
mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks -
mwp->used = imax(mwp->used, int64width(fsbtoblk(sfsp->f_blocks -
sfsp->f_bfree, sfsp->f_bsize, blocksize)));
mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail,
mwp->avail = imax(mwp->avail, int64width(fsbtoblk(sfsp->f_bavail,
sfsp->f_bsize, blocksize)));
mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files -
mwp->iused = imax(mwp->iused, int64width(sfsp->f_files -
sfsp->f_ffree));
mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree));
mwp->ifree = imax(mwp->ifree, int64width(sfsp->f_ffree));
}
/* Return the width in characters of the specified long. */
int
longwidth(long val)
int64width(int64_t val)
{
int len;
@@ -560,7 +567,7 @@ usage(void)
{
(void)fprintf(stderr,
"usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n");
"usage: df [-b | -g | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n");
exit(EX_USAGE);
}
+1 -1
View File
@@ -5,7 +5,7 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
DISTRIBUTION=crypto
CFLAGS+=-DDES
DPADD= ${LIBCIPHER}
+50 -10
View File
@@ -13,10 +13,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -55,47 +51,91 @@ __FBSDID("$FreeBSD$");
int
namecmp(const FTSENT *a, const FTSENT *b)
{
return (strcoll(a->fts_name, b->fts_name));
}
int
revnamecmp(const FTSENT *a, const FTSENT *b)
{
return (strcoll(b->fts_name, a->fts_name));
}
int
modcmp(const FTSENT *a, const FTSENT *b)
{
return (b->fts_statp->st_mtime - a->fts_statp->st_mtime);
if (b->fts_statp->st_mtimespec.tv_sec >
a->fts_statp->st_mtimespec.tv_sec)
return (1);
if (b->fts_statp->st_mtimespec.tv_sec <
a->fts_statp->st_mtimespec.tv_sec)
return (-1);
if (b->fts_statp->st_mtimespec.tv_nsec >
a->fts_statp->st_mtimespec.tv_nsec)
return (1);
if (b->fts_statp->st_mtimespec.tv_nsec <
a->fts_statp->st_mtimespec.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
int
revmodcmp(const FTSENT *a, const FTSENT *b)
{
return (a->fts_statp->st_mtime - b->fts_statp->st_mtime);
return (modcmp(b, a));
}
int
acccmp(const FTSENT *a, const FTSENT *b)
{
return (b->fts_statp->st_atime - a->fts_statp->st_atime);
if (b->fts_statp->st_atimespec.tv_sec >
a->fts_statp->st_atimespec.tv_sec)
return (1);
if (b->fts_statp->st_atimespec.tv_sec <
a->fts_statp->st_atimespec.tv_sec)
return (-1);
if (b->fts_statp->st_atimespec.tv_nsec >
a->fts_statp->st_atimespec.tv_nsec)
return (1);
if (b->fts_statp->st_atimespec.tv_nsec <
a->fts_statp->st_atimespec.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
int
revacccmp(const FTSENT *a, const FTSENT *b)
{
return (a->fts_statp->st_atime - b->fts_statp->st_atime);
return (acccmp(b, a));
}
int
statcmp(const FTSENT *a, const FTSENT *b)
{
return (b->fts_statp->st_ctime - a->fts_statp->st_ctime);
if (b->fts_statp->st_ctimespec.tv_sec >
a->fts_statp->st_ctimespec.tv_sec)
return (1);
if (b->fts_statp->st_ctimespec.tv_sec <
a->fts_statp->st_ctimespec.tv_sec)
return (-1);
if (b->fts_statp->st_ctimespec.tv_nsec >
a->fts_statp->st_ctimespec.tv_nsec)
return (1);
if (b->fts_statp->st_ctimespec.tv_nsec <
a->fts_statp->st_ctimespec.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
int
revstatcmp(const FTSENT *a, const FTSENT *b)
{
return (a->fts_statp->st_ctime - b->fts_statp->st_ctime);
return (statcmp(b, a));
}
+5 -3
View File
@@ -35,7 +35,7 @@
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
.\" $FreeBSD$
.\"
.Dd July 8, 2002
.Dd January 11, 2005
.Dt LS 1
.Os
.Sh NAME
@@ -188,7 +188,9 @@ This option overrides the environment variable
.Dq ell . )
List in long format.
(See below.)
If the output is to a terminal, a total sum for all the file
A total sum (in blocks, see the
.Fl s
option for the block size unit) for all the file
sizes is output on a line before the long listing.
.It Fl m
Stream output format; list files across the page, separated by commas.
@@ -216,7 +218,7 @@ lexicographical order or the oldest entries first.
.It Fl s
Display the number of file system blocks actually used by each file, in units
of 512 bytes, where partial units are rounded up to the next integer value.
If the output is to a terminal, a total sum for all the file
A total sum for all the file
sizes is output on a line before the listing.
The environment variable
.Ev BLOCKSIZE
+1
View File
@@ -597,6 +597,7 @@ display(FTSENT *p, FTSENT *list)
maxblock = makenines(maxblock);
maxnlink = makenines(maxnlink);
maxsize = makenines(maxsize);
free(jinitmax);
}
bcfile = 0;
flags = NULL;
+2 -2
View File
@@ -156,9 +156,9 @@ usage(void)
{
(void)fprintf(stderr,
#ifdef COLORLS
"usage: ls [-ABCFGHLPRTWabcdfghiklnoqrstu1]"
"usage: ls [-ABCFGHLPRTWabcdfghiklmnoqrstuwx1]"
#else
"usage: ls [-ABCFHLPRTWabcdfghiklnoqrstu1]"
"usage: ls [-ABCFHLPRTWabcdfghiklmnoqrstuwx1]"
#endif
" [file ...]\n");
exit(1);
+17 -6
View File
@@ -212,14 +212,25 @@ do_move(from, to)
struct statfs sfs;
char path[PATH_MAX];
/* Can't mv(1) a mount point. */
if (realpath(from, path) == NULL) {
warnx("cannot resolve %s: %s", from, path);
/*
* If the source is a symbolic link and is on another
* filesystem, it can be recreated at the destination.
*/
if (lstat(from, &sb) == -1) {
warn("%s", from);
return (1);
}
if (!statfs(path, &sfs) && !strcmp(path, sfs.f_mntonname)) {
warnx("cannot rename a mount point");
return (1);
if (!S_ISLNK(sb.st_mode)) {
/* Can't mv(1) a mount point. */
if (realpath(from, path) == NULL) {
warnx("cannot resolve %s: %s", from, path);
return (1);
}
if (!statfs(path, &sfs) &&
!strcmp(path, sfs.f_mntonname)) {
warnx("cannot rename a mount point");
return (1);
}
}
} else {
warn("rename %s to %s", from, to);
+2 -2
View File
@@ -230,7 +230,7 @@ name_uid(uid, frc)
++pwopn;
}
if (ptr == NULL)
ptr = (UIDC *)malloc(sizeof(UIDC));
ptr = uidtb[uid % UID_SZ] = (UIDC *)malloc(sizeof(UIDC));
if ((pw = getpwuid(uid)) == NULL) {
/*
@@ -308,7 +308,7 @@ name_gid(gid, frc)
++gropn;
}
if (ptr == NULL)
ptr = (GIDC *)malloc(sizeof(GIDC));
ptr = gidtb[gid % GID_SZ] = (GIDC *)malloc(sizeof(GIDC));
if ((gr = getgrgid(gid)) == NULL) {
/*
+30 -18
View File
@@ -453,7 +453,13 @@ tar_rd(arcn, buf)
* copy out the name and values in the stat buffer
*/
hd = (HD_TAR *)buf;
arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1);
/*
* old tar format specifies the name always be null-terminated,
* but let's be robust to broken archives.
* the same applies to handling links below.
*/
arcn->nlen = l_strncpy(arcn->name, hd->name,
MIN(sizeof(hd->name), sizeof(arcn->name)) - 1);
arcn->name[arcn->nlen] = '\0';
arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) &
0xfff);
@@ -482,7 +488,7 @@ tar_rd(arcn, buf)
*/
arcn->type = PAX_SLK;
arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
sizeof(arcn->ln_name) - 1);
MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1);
arcn->ln_name[arcn->ln_nlen] = '\0';
arcn->sb.st_mode |= S_IFLNK;
break;
@@ -494,7 +500,7 @@ tar_rd(arcn, buf)
arcn->type = PAX_HLK;
arcn->sb.st_nlink = 2;
arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
sizeof(arcn->ln_name) - 1);
MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1);
arcn->ln_name[arcn->ln_nlen] = '\0';
/*
@@ -604,7 +610,7 @@ tar_wr(arcn)
case PAX_SLK:
case PAX_HLK:
case PAX_HRG:
if (arcn->ln_nlen > sizeof(hd->linkname)) {
if (arcn->ln_nlen >= sizeof(hd->linkname)) {
paxwarn(1,"Link name too long for tar %s", arcn->ln_name);
return(1);
}
@@ -844,12 +850,19 @@ ustar_rd(arcn, buf)
*/
dest = arcn->name;
if (*(hd->prefix) != '\0') {
cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2);
cnt = l_strncpy(dest, hd->prefix,
MIN(sizeof(hd->prefix), sizeof(arcn->name) - 2));
dest += cnt;
*dest++ = '/';
cnt++;
}
arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt);
/*
* ustar format specifies the name may be unterminated
* if it fills the entire field. this also applies to
* the prefix and the linkname.
*/
arcn->nlen = cnt + l_strncpy(dest, hd->name,
MIN(sizeof(hd->name), sizeof(arcn->name) - cnt - 1));
arcn->name[arcn->nlen] = '\0';
/*
@@ -942,7 +955,7 @@ ustar_rd(arcn, buf)
* copy the link name
*/
arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
sizeof(arcn->ln_name) - 1);
MIN(sizeof(hd->linkname), sizeof(arcn->ln_name) - 1));
arcn->ln_name[arcn->ln_nlen] = '\0';
break;
case CONTTYPE:
@@ -999,7 +1012,7 @@ ustar_wr(arcn)
* check the length of the linkname
*/
if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) ||
(arcn->type == PAX_HRG)) && (arcn->ln_nlen >= sizeof(hd->linkname))){
(arcn->type == PAX_HRG)) && (arcn->ln_nlen > sizeof(hd->linkname))){
paxwarn(1, "Link name too long for ustar %s", arcn->ln_name);
return(1);
}
@@ -1024,17 +1037,16 @@ ustar_wr(arcn)
* occur, we remove the / and copy the first part to the prefix
*/
*pt = '\0';
l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix) - 1);
l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix));
*pt++ = '/';
} else
memset(hd->prefix, 0, sizeof(hd->prefix));
/*
* copy the name part. this may be the whole path or the part after
* the prefix
* the prefix. both the name and prefix may fill the entire field.
*/
l_strncpy(hd->name, pt, sizeof(hd->name) - 1);
hd->name[sizeof(hd->name) - 1] = '\0';
l_strncpy(hd->name, pt, sizeof(hd->name));
/*
* set the fields in the header that are type dependent
@@ -1077,8 +1089,8 @@ ustar_wr(arcn)
hd->typeflag = SYMTYPE;
else
hd->typeflag = LNKTYPE;
l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname) - 1);
hd->linkname[sizeof(hd->linkname) - 1] = '\0';
/* the link name may occupy the entire field in ustar */
l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname));
memset(hd->devmajor, 0, sizeof(hd->devmajor));
memset(hd->devminor, 0, sizeof(hd->devminor));
if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 3))
@@ -1178,9 +1190,9 @@ name_split(name, len)
* check to see if the file name is small enough to fit in the name
* field. if so just return a pointer to the name.
*/
if (len < TNMSZ)
if (len <= TNMSZ)
return(name);
if (len > (TPFSZ + TNMSZ))
if (len > (TPFSZ + TNMSZ + 1))
return(NULL);
/*
@@ -1189,7 +1201,7 @@ name_split(name, len)
* to find the biggest piece to fit in the name field (or the smallest
* prefix we can find)
*/
start = name + len - TNMSZ;
start = name + len - TNMSZ - 1;
while ((*start != '\0') && (*start != '/'))
++start;
@@ -1207,7 +1219,7 @@ name_split(name, len)
* the file would then expand on extract to //str. The len == 0 below
* makes this special case follow the spec to the letter.
*/
if ((len >= TPFSZ) || (len == 0))
if ((len > TPFSZ) || (len == 0))
return(NULL);
/*
+38 -38
View File
@@ -41,46 +41,46 @@ struct varent;
extern fixpt_t ccpu;
extern int eval, fscale, mempages, nlistread, rawcpu, cflag;
extern time_t now;
extern int sumrusage, termwidth, totwidth;
extern VAR var[];
extern VARENT *vhead;
__BEGIN_DECLS
void command __P((KINFO *, VARENT *));
void cputime __P((KINFO *, VARENT *));
int donlist __P((void));
void evar __P((KINFO *, VARENT *));
char *fmt_argv __P((char **, char *, int));
double getpcpu __P((KINFO *));
double getpmem __P((KINFO *));
void logname __P((KINFO *, VARENT *));
void longtname __P((KINFO *, VARENT *));
void lstarted __P((KINFO *, VARENT *));
void maxrss __P((KINFO *, VARENT *));
void nlisterr __P((struct nlist *));
void p_rssize __P((KINFO *, VARENT *));
void pagein __P((KINFO *, VARENT *));
void parsefmt __P((char *));
void pcpu __P((KINFO *, VARENT *));
void pmem __P((KINFO *, VARENT *));
void pri __P((KINFO *, VARENT *));
void rtprior __P((KINFO *, VARENT *));
void printheader __P((void));
void pvar __P((KINFO *, VARENT *));
void rssize __P((KINFO *, VARENT *));
void runame __P((KINFO *, VARENT *));
int s_runame __P((KINFO *));
void rvar __P((KINFO *, VARENT *));
void showkey __P((void));
void started __P((KINFO *, VARENT *));
void state __P((KINFO *, VARENT *));
void tdev __P((KINFO *, VARENT *));
void tname __P((KINFO *, VARENT *));
void tsize __P((KINFO *, VARENT *));
void ucomm __P((KINFO *, VARENT *));
void uname __P((KINFO *, VARENT *));
int s_uname __P((KINFO *));
void uvar __P((KINFO *, VARENT *));
void vsize __P((KINFO *, VARENT *));
void wchan __P((KINFO *, VARENT *));
void command(KINFO *, VARENT *);
void cputime(KINFO *, VARENT *);
int donlist(void);
void evar(KINFO *, VARENT *);
VARENT *find_varentry(VAR *);
const char *fmt_argv(char **, char *, size_t);
double getpcpu(const KINFO *);
void logname(KINFO *, VARENT *);
void longtname(KINFO *, VARENT *);
void lstarted(KINFO *, VARENT *);
void maxrss(KINFO *, VARENT *);
void nlisterr(struct nlist *);
void p_rssize(KINFO *, VARENT *);
void pagein(KINFO *, VARENT *);
void parsefmt(const char *, int);
void pcpu(KINFO *, VARENT *);
void pmem(KINFO *, VARENT *);
void pri(KINFO *, VARENT *);
void rtprior(KINFO *, VARENT *);
void printheader(void);
void pvar(KINFO *, VARENT *);
void rssize(KINFO *, VARENT *);
void runame(KINFO *, VARENT *);
void rvar(KINFO *, VARENT *);
int s_runame(KINFO *);
int s_uname(KINFO *);
void showkey(void);
void started(KINFO *, VARENT *);
void state(KINFO *, VARENT *);
void tdev(KINFO *, VARENT *);
void tname(KINFO *, VARENT *);
void tsize(KINFO *, VARENT *);
void ucomm(KINFO *, VARENT *);
void uname(KINFO *, VARENT *);
void uvar(KINFO *, VARENT *);
void vsize(KINFO *, VARENT *);
void wchan(KINFO *, VARENT *);
__END_DECLS
+26 -27
View File
@@ -31,38 +31,40 @@
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <vis.h>
#include "ps.h"
static char *cmdpart __P((char *));
static char *shquote __P((char **));
static char *cmdpart(char *);
static char *shquote(char **);
/*
* XXX
* This is a stub until marc does the real one.
*/
static char *
shquote(argv)
char **argv;
shquote(char **argv)
{
static long arg_max = -1;
long len;
size_t len;
char **p, *dst, *src;
static char *buf = NULL;
@@ -73,18 +75,18 @@ shquote(argv)
errx(1, "malloc failed");
}
if (*argv == 0) {
buf[0] = 0;
if (*argv == NULL) {
buf[0] = '\0';
return (buf);
}
dst = buf;
for (p = argv; (src = *p++) != 0; ) {
if (*src == 0)
for (p = argv; (src = *p++) != NULL; ) {
if (*src == '\0')
continue;
len = (4 * arg_max - (dst - buf)) / 4;
strvisx(dst, src, strlen(src) < len ? strlen(src) : len,
VIS_NL | VIS_CSTYLE);
while (*dst)
while (*dst != '\0')
dst++;
if ((4 * arg_max - (dst - buf)) / 4 > 0)
*dst++ = ' ';
@@ -97,24 +99,20 @@ shquote(argv)
}
static char *
cmdpart(arg0)
char *arg0;
cmdpart(char *arg0)
{
char *cp;
return ((cp = strrchr(arg0, '/')) != NULL ? cp + 1 : arg0);
}
char *
fmt_argv(argv, cmd, maxlen)
char **argv;
char *cmd;
int maxlen;
const char *
fmt_argv(char **argv, char *cmd, size_t maxlen)
{
int len;
size_t len;
char *ap, *cp;
if (argv == 0 || argv[0] == 0) {
if (argv == NULL || argv[0] == NULL) {
if (cmd == NULL)
return ("");
ap = NULL;
@@ -123,12 +121,13 @@ fmt_argv(argv, cmd, maxlen)
ap = shquote(argv);
len = strlen(ap) + maxlen + 4;
}
if ((cp = malloc(len)) == NULL)
return (NULL);
cp = malloc(len);
if (cp == NULL)
errx(1, "malloc failed");
if (ap == NULL)
sprintf(cp, " (%.*s)", maxlen, cmd);
sprintf(cp, " (%.*s)", (int)maxlen, cmd);
else if (strncmp(cmdpart(argv[0]), cmd, maxlen) != 0)
sprintf(cp, "%s (%.*s)", ap, maxlen, cmd);
sprintf(cp, "%s (%.*s)", ap, (int)maxlen, cmd);
else
(void) strcpy(cp, ap);
return (cp);
+46 -29
View File
@@ -31,14 +31,13 @@
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
#else
static const char rcsid[] =
"$FreeBSD$";
#endif
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/time.h>
@@ -49,17 +48,15 @@ static const char rcsid[] =
#include <sys/user.h>
#include <err.h>
#include <errno.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <utmp.h>
#include "ps.h"
static VAR *findvar __P((char *));
static int vcmp __P((const void *, const void *));
static VAR *findvar(char *, int, char **header);
static int vcmp(const void *, const void *);
#ifdef NOTINUSE
int utime(), stime(), ixrss(), idrss(), isrss();
@@ -80,9 +77,9 @@ int utime(), stime(), ixrss(), idrss(), isrss();
#define UIDLEN 5
#define PIDFMT "d"
#define PIDLEN 5
#define USERLEN UT_NAMESIZE
#define USERLEN (MAXLOGNAME - 1)
VAR var[] = {
static VAR var[] = {
{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4},
{"%mem", "%MEM", NULL, 0, pmem, NULL, 4},
{"acflag", "ACFLG",
@@ -193,11 +190,11 @@ VAR var[] = {
};
void
showkey()
showkey(void)
{
VAR *v;
int i;
char *p, *sep;
const char *p, *sep;
i = 0;
sep = "";
@@ -214,23 +211,45 @@ showkey()
}
void
parsefmt(p)
char *p;
parsefmt(const char *p, int user)
{
static struct varent *vtail;
char *tempstr, *tempstr1;
#define FMTSEP " \t,\n"
while (p && *p) {
char *cp;
#define SKIP_5x_USERCHGS 1
#if SKIP_5x_USERCHGS
/*
* XXX - For now in 4.x-stable, always act as if the user
* explicitly requested this format string. This is
* done to reduce the code-differences with 5.x,
* without making any user-visible changes.
*/
user = 1;
#endif
#define FMTSEP " \t,\n"
tempstr1 = tempstr = strdup(p);
while (tempstr && *tempstr) {
char *cp, *hp;
VAR *v;
struct varent *vent;
while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0')
while ((cp = strsep(&tempstr, FMTSEP)) != NULL && *cp == '\0')
/* void */;
if (cp == NULL || !(v = findvar(cp)))
if (cp == NULL || !(v = findvar(cp, user, &hp)))
continue;
if (!user) {
/*
* If the user is NOT adding this field manually,
* get on with our lives if this VAR is already
* represented in the list.
*/
vent = find_varentry(v);
if (vent != NULL)
continue;
}
if ((vent = malloc(sizeof(struct varent))) == NULL)
err(1, NULL);
errx(1, "malloc failed");
vent->var = v;
vent->next = NULL;
if (vhead == NULL)
@@ -240,6 +259,7 @@ parsefmt(p)
vtail = vent;
}
}
free(tempstr1);
if (!vhead) {
warnx("no valid keywords; valid keywords:");
showkey();
@@ -248,12 +268,10 @@ parsefmt(p)
}
static VAR *
findvar(p)
char *p;
findvar(char *p, int user, char **header __unused)
{
VAR *v, key;
char *hp;
int vcmp();
hp = strchr(p, '=');
if (hp)
@@ -267,20 +285,19 @@ findvar(p)
warnx("%s: illegal keyword specification", p);
eval = 1;
}
parsefmt(v->alias);
parsefmt(v->alias, user);
return ((VAR *)NULL);
}
if (!v) {
warnx("%s: keyword not found", p);
eval = 1;
} else if (hp)
v->header = hp;
v->header = strdup(hp);
return (v);
}
static int
vcmp(a, b)
const void *a, *b;
vcmp(const void *a, const void *b)
{
return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));
return (strcmp(((const VAR *)a)->name, ((const VAR *)b)->name));
}
+8 -5
View File
@@ -31,26 +31,29 @@
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
#include <stddef.h>
int donlist(void); /* should come from extern.h via ps.h */
fixpt_t ccpu; /* kernel _ccpu variable */
int nlistread; /* if nlist already read. */
int mempages; /* number of pages of phys. memory */
int fscale; /* kernel _fscale variable */
int
donlist()
donlist(void)
{
size_t oldlen;
+18 -28
View File
@@ -31,13 +31,14 @@
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/time.h>
@@ -58,8 +59,8 @@ static const char rcsid[] =
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <vis.h>
#include "ps.h"
@@ -348,36 +349,29 @@ longtname(k, ve)
}
void
started(k, ve)
KINFO *k;
VARENT *ve;
started(KINFO *k, VARENT *ve)
{
VAR *v;
static time_t now;
time_t then;
struct tm *tp;
static int use_ampm = -1;
char buf[100];
static int use_ampm = -1;
v = ve->var;
if (!k->ki_u.u_valid) {
(void)printf("%-*s", v->width, "-");
return;
}
if (use_ampm < 0)
use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0');
then = k->ki_u.u_start.tv_sec;
tp = localtime(&then);
if (!now)
(void)time(&now);
if (now - k->ki_u.u_start.tv_sec < 24 * 3600) {
(void)strftime(buf, sizeof(buf) - 1,
use_ampm ? "%l:%M%p" : "%k:%M ", tp);
use_ampm ? "%l:%M%p" : "%k:%M ", tp);
} else if (now - k->ki_u.u_start.tv_sec < 7 * 86400) {
(void)strftime(buf, sizeof(buf) - 1,
use_ampm ? "%a%I%p" : "%a%H ", tp);
use_ampm ? "%a%I%p" : "%a%H ", tp);
} else
(void)strftime(buf, sizeof(buf) - 1, "%e%b%y", tp);
(void)printf("%-*s", v->width, buf);
@@ -505,8 +499,7 @@ cputime(k, ve)
}
double
getpcpu(k)
KINFO *k;
getpcpu(const KINFO *k)
{
struct proc *p;
static int failure;
@@ -539,9 +532,8 @@ pcpu(k, ve)
(void)printf("%*.1f", v->width, getpcpu(k));
}
double
getpmem(k)
KINFO *k;
static double
getpmem(KINFO *k)
{
static int failure;
struct proc *p;
@@ -588,10 +580,9 @@ pagein(k, ve)
k->ki_u.u_valid ? k->ki_u.u_ru.ru_majflt : 0);
}
/* ARGSUSED */
void
maxrss(k, ve)
KINFO *k;
VARENT *ve;
maxrss(KINFO *k __unused, VARENT *ve)
{
VAR *v;
@@ -648,12 +639,11 @@ rtprior(k, ve)
* structures.
*/
static void
printval(bp, v)
char *bp;
VAR *v;
printval(void *bp, VAR *v)
{
static char ofmt[32] = "%";
char *fcp, *cp;
const char *fcp;
char *cp;
cp = ofmt + 1;
fcp = v->fmt;
+120 -49
View File
@@ -32,7 +32,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
.Dd April 18, 1994
.Dd March 27, 2004
.Dt PS 1
.Os
.Sh NAME
@@ -40,26 +40,64 @@
.Nd process status
.Sh SYNOPSIS
.Nm
.Op Fl aCcefhjlmrSTuvwx
.Op Fl aCcefhjlmrSTuvwXx
.Oo Fl G Ar gid Ns Xo
.Op , Ns Ar gid Ns No ...
.Xc
.Oc
.Op Fl M Ar core
.Op Fl N Ar system
.Op Fl O Ar fmt
.Op Fl o Ar fmt
.Op Fl p Ar pid
.Op Fl t Ar tty
.Op Fl U Ar username
.Oo Fl p Ar pid Ns Xo
.Op , Ns Ar pid Ns No ...
.Xc
.Oc
.Oo Fl t Ar tty Ns Xo
.Op , Ns Ar tty Ns No ...
.Xc
.Oc
.Oo Fl U Ar username Ns Xo
.Op , Ns Ar username Ns No ...
.Xc
.Oc
.Nm
.Op Fl L
.Sh DESCRIPTION
The
.Nm
utility
displays a header line followed by lines containing information about your
displays a header line, followed by lines containing information about
all of your
processes that have controlling terminals.
This information is sorted by controlling terminal, then by process
.Tn ID .
.Pp
The information displayed is selected based on a set of keywords (see the
A different set of processes can be selected for display by using any
combination of the
.Fl a , G , p , T , t
and
.Fl U
options.
If more than one of these options are given, then
.Nm
will select all processes which are matched by at least one of the
given options.
.Pp
For the processes which have been selected for display,
.Nm
will display one line per process.
By default all of these output lines are sorted first by controlling
terminal, then by process
.Tn ID .
The
.Fl m , r , u ,
and
.Fl v
options will change the sort order.
If more than one sorting option was given, then the selected processes
will be sorted by the last sorting option which was specified.
.Pp
For the processes which have been selected for display, the information
to display is selected based on a set of keywords (see the
.Fl L
.Fl O
and
@@ -80,6 +118,10 @@ The options are as follows:
.Bl -tag -width indent
.It Fl a
Display information about other users' processes as well as your own.
This will skip any processes which do not have a controlling teminal,
unless the
.Fl x
option is also specified.
This can be disabled by setting the
.Va kern.ps_showallprocs
sysctl to zero.
@@ -95,6 +137,10 @@ Display the environment as well.
.It Fl f
Show commandline and environment information about swapped out processes.
This option is honored only if the uid of the user is 0.
.It Fl G
Display information about processes which are running with the specified
real group
.Tn ID(s) .
.It Fl h
Repeat the information header as often as necessary to guarantee one
header per page of information.
@@ -102,17 +148,21 @@ header per page of information.
Print information associated with the following keywords:
user, pid, ppid, pgid, sess, jobc, state, tt, time and command.
.It Fl L
List the set of available keywords.
List the set of keywords available for the
.Fl O
and
.Fl o
options.
.It Fl l
Display information associated with the following keywords:
uid, pid, ppid, cpu, pri, nice, vsz, rss, wchan, state, tt, time
and command.
.It Fl M
Extract values associated with the name list from the specified core
instead of the default
.Pa /dev/kmem .
instead of the currently running system.
.It Fl m
Sort by memory usage, instead of by process
Sort by memory usage, instead of the combination of controlling
terminal and process
.Tn ID .
.It Fl N
Extract the name list from the specified system instead of the default
@@ -127,16 +177,20 @@ Keywords may be appended with an equals (``='') sign and a string.
This causes the printed header to use the specified string instead of
the standard header.
.It Fl o
Display information associated with the space or comma separated list
of keywords specified.
Display information associated with the space or comma separated
list of keywords specified.
Multiple keywords may also be given in the form of more than one
.Fl o
option.
Keywords may be appended with an equals (``='') sign and a string.
This causes the printed header to use the specified string instead of
the standard header.
.It Fl p
Display information associated with the specified process
.Tn ID .
Display information about processes which match the specified process
.Tn ID(s) .
.It Fl r
Sort by current cpu usage, instead of by process
Sort by current cpu usage, instead of the combination of controlling
terminal and process
.Tn ID .
.It Fl S
Change the way the process time is calculated by summing all exited
@@ -146,10 +200,10 @@ Display information about processes attached to the device associated
with the standard input.
.It Fl t
Display information about processes attached to the specified terminal
device.
device(s).
.It Fl U
Display the processes belonging to the specified
.Ar username .
.Ar username Ns (s) .
.It Fl u
Display information associated with the following keywords:
user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command.
@@ -175,8 +229,22 @@ If the
option is specified more than once,
.Nm
will use as many columns as necessary without regard for your window size.
.It Fl X
When displaying processes matched by other options, skip any processes
which do not have a controlling terminal.
.It Fl x
Display information about processes without controlling terminals.
When displaying processes matched by other options, include processes
which do not have a controlling terminal.
This is the opposite of the
.Fl X
option.
If both
.Fl X
and
.Fl x
are specified in the same command, then
.Nm
will use the one which was specified last.
.El
.Pp
A complete list of the available keywords are listed below.
@@ -199,7 +267,6 @@ the include file
.It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock"
.It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal"
.It Dv "P_INMEM" Ta No "0x00004 Loaded into memory"
.It Dv "P_NOCLDSTOP" Ta No "0x00008 No SIGCHLD when children stop"
.It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit"
.It Dv "P_PROFIL" Ta No "0x00020 Has started profiling"
.It Dv "P_SELECT" Ta No "0x00040 Selecting; wakeup/waiting danger"
@@ -213,6 +280,13 @@ the include file
.It Dv "P_EXEC" Ta No "0x04000 Process called exec"
.It Dv "P_OWEUPC" Ta No "0x20000 Owe process an addupc() call at next ast"
.It Dv "P_SWAPPING" Ta No "0x40000 Process is being swapped"
.It Dv "P_SWAPINREQ" Ta No "0x80000 Swapin request due to wakeup"
.It Dv "P_KTHREADP" Ta No "0x200000 Process is really a kernel thread"
.It Dv "P_DEADLKTREAT" Ta No "0x800000 Lock acquisition - deadlock treatment"
.It Dv "P_JAILED" Ta No "0x1000000 Process is in jail"
.It Dv "P_OLDMASK" Ta No "0x2000000 Need to restore mask before pause"
.It Dv "P_ALTSTACK" Ta No "0x4000000 Have alternate signal stack"
.It Dv "P_INEXEC" Ta No "0x8000000 Process is in execve()"
.El
.It lim
The soft limit on memory used, specified via a call to
@@ -243,11 +317,6 @@ The first character indicates the run state of the process:
Marks a process in disk (or other short term, uninterruptible) wait.
.It I
Marks a process that is idle (sleeping for longer than about 20 seconds).
.It J
Marks a process which is in
.Xr jail 2 .
The hostname of the prison can be found in
.Ql Li /proc/<pid>/status .
.It R
Marks a runnable process.
.It S
@@ -268,20 +337,13 @@ The process is in the foreground process group of its control terminal.
The process has raised
.Tn CPU
scheduling priority.
.It >
The process has specified a soft limit on memory requirements and is
currently exceeding that limit; such a process is (necessarily) not
swapped.
.It A
the process has asked for random page replacement
.Pf ( Dv MADV_RANDOM ,
from
.Xr madvise 2 ,
for example,
.Xr lisp 1
in a garbage collect).
.It E
The process is trying to exit.
.It J
Marks a process which is in
.Xr jail 2 .
The hostname of the prison can be found in
.Ql Li /proc/<pid>/status .
.It L
The process has pages locked in core (for example, for raw
.Tn I/O ) .
@@ -290,20 +352,11 @@ The process has reduced
.Tn CPU
scheduling priority (see
.Xr setpriority 2 ) .
.It S
The process has asked for
.Tn FIFO
page replacement
.Pf ( Dv MADV_SEQUENTIAL ,
from
.Xr madvise 2 ,
for example, a large image processing program using virtual memory to
sequentially address voluminous data).
.It s
The process is a session leader.
.It V
The process is suspended during a
.Xr vfork .
.Xr vfork 2 .
.It W
The process is swapped out.
.It X
@@ -503,8 +556,26 @@ the mount point of
.Xr procfs 5 ,
.Xr pstat 8 ,
.Xr sysctl 8
.Sh STANDARDS
For historical reasons,
.Nm
utility under
.Fx
supports a different set of options from what is described by
.St -p1003.2 ,
and what is supported on non-BSD operating systems.
.Sh HISTORY
The
.Nm
command appeared in
.At v4 .
.Sh BUGS
Since
.Nm
cannot run faster than the system and is run as any other scheduled
process, the information it displays can never be exact.
.Pp
The
.Nm
utility does not correctly display argument lists containing multibyte
characters.
+770 -265
View File
File diff suppressed because it is too large. Load diff
+11 -7
View File
@@ -48,6 +48,10 @@ struct usave {
#define KI_PROC(ki) (&(ki)->ki_p->kp_proc)
#define KI_EPROC(ki) (&(ki)->ki_p->kp_eproc)
/* These two make it easier to MFC some changes from 5.x. */
#define KI_PROC2(ki) (&(ki)->kp_proc)
#define KI_EPROC2(ki) (&(ki)->kp_eproc)
typedef struct kinfo {
struct kinfo_proc *ki_p; /* proc structure */
struct usave ki_u; /* interesting parts of user */
@@ -62,27 +66,27 @@ typedef struct varent {
} VARENT;
typedef struct var {
char *name; /* name(s) of variable */
char *header; /* default header */
char *alias; /* aliases */
const char *name; /* name(s) of variable */
const char *header; /* default header */
const char *alias; /* aliases */
#define COMM 0x01 /* needs exec arguments and environment (XXX) */
#define LJUST 0x02 /* left adjust on output (trailing blanks) */
#define USER 0x04 /* needs user structure */
#define DSIZ 0x08 /* field size is dynamic*/
u_int flag;
/* output routine */
void (*oproc) __P((struct kinfo *, struct varent *));
void (*oproc)(struct kinfo *, struct varent *);
/* sizing routine*/
int (*sproc) __P((struct kinfo *));
int (*sproc)(struct kinfo *);
short width; /* printing width */
/*
* The following (optional) elements are hooks for passing information
* to the generic output routines: pvar, evar, uvar (those which print
* simple elements from well known structures: proc, eproc, usave)
*/
int off; /* offset in structure */
size_t off; /* offset in structure */
enum type type; /* type of element */
char *fmt; /* printf format */
const char *fmt; /* printf format */
char *time; /* time format */
short dwidth; /* dynamic printing width */
/*
+11 -16
View File
@@ -44,11 +44,12 @@ static char const copyright[] =
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -589,7 +590,7 @@ sink(int argc, char *argv[])
off_t i, j, size;
int amt, count, exists, first, mask, mode, ofd, omode;
int setimes, targisdir, wrerrno = 0;
char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ];
char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ], path[PATH_MAX];
#define atime tv[0]
#define mtime tv[1]
@@ -686,21 +687,15 @@ sink(int argc, char *argv[])
if (*cp++ != ' ')
SCREWUP("size not delimited");
if (targisdir) {
static char *namebuf = NULL;
static size_t cursize;
size_t need;
need = strlen(targ) + strlen(cp) + 250;
if (need > cursize) {
if (namebuf != NULL)
free(namebuf);
if (!(namebuf = malloc(need)))
run_err("%s", strerror(errno));
cursize = need;
if (strlen(targ) + (*targ ? 1 : 0) + strlen(cp)
>= sizeof(path)) {
run_err("%s%s%s: name too long", targ,
*targ ? "/" : "", cp);
exit(1);
}
(void)snprintf(namebuf, need, "%s%s%s", targ,
(void)snprintf(path, sizeof(path), "%s%s%s", targ,
*targ ? "/" : "", cp);
np = namebuf;
np = path;
} else
np = targ;
exists = stat(np, &stb) == 0;
-2
View File
@@ -2,8 +2,6 @@
# $FreeBSD$
PROG= rm
WARNS?= 2
SRCS= rm.c
LINKS= ${BINDIR}/rm ${BINDIR}/unlink
MLINKS= rm.1 unlink.1
+37 -26
View File
@@ -1,3 +1,4 @@
.\"-
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -12,10 +13,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
.\" This product includes software developed by the University of
.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -35,7 +32,7 @@
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
.\" $FreeBSD$
.\"
.Dd January 28, 1999
.Dd September 29, 2005
.Dt RM 1
.Os
.Sh NAME
@@ -44,7 +41,8 @@
.Nd remove directory entries
.Sh SYNOPSIS
.Nm
.Op Fl dfiPRrvW
.Op Fl f | i
.Op Fl dIPRrvW
.Ar
.Nm unlink
.Ar file
@@ -80,10 +78,20 @@ The
option overrides any previous
.Fl f
options.
.It Fl I
Request confirmation once if more than three files are being removed or if a
directory is being recursively removed.
This is a far less intrusive option than
.Fl i
yet provides almost the same level of protection against mistakes.
.It Fl P
Overwrite regular files before deleting them.
Files are overwritten three times, first with the byte pattern 0xff,
then 0x00, and then 0xff again, before they are deleted.
Specifying this flag for a read only file will cause
.Nm
to generate an error message and exit.
The file wil not be removed or overwritten.
.It Fl R
Attempt to remove the file hierarchy rooted in each file argument.
The
@@ -115,9 +123,10 @@ The
utility removes symbolic links, not the files referenced by the links.
.Pp
It is an error to attempt to remove the files
.Dq .\&
.Pa / ,
.Pa .\&
or
.Dq .. .
.Pa .. .
.Pp
When the utility is called as
.Nm unlink ,
@@ -148,31 +157,17 @@ to parse its arguments, which allows it to accept
the
.Sq Li --
option which will cause it to stop processing flag options at that
point. This will allow the removal of file names that begin
point.
This will allow the removal of file names that begin
with a dash
.Pq Sq - .
For example:
.Dl rm -- -filename
The same behavior can be obtained by using an absolute or relative
path reference. For example:
path reference.
For example:
.Dl rm /home/user/-filename
.Dl rm ./-filename
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr rmdir 1 ,
.Xr undelete 2 ,
.Xr unlink 2 ,
.Xr fts 3 ,
.Xr getopt 3 ,
.Xr symlink 7
.Sh BUGS
The
.Fl P
option assumes that the underlying file system is a fixed-block file
system.
UFS is a fixed-block file system, LFS is not.
In addition, only regular files are overwritten, other types of files
are not.
.Sh COMPATIBILITY
The
.Nm
@@ -188,6 +183,14 @@ Also, historical
.Bx
implementations prompted on the standard output,
not the standard error output.
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr rmdir 1 ,
.Xr undelete 2 ,
.Xr unlink 2 ,
.Xr fts 3 ,
.Xr getopt 3 ,
.Xr symlink 7
.Sh STANDARDS
The
.Nm
@@ -203,3 +206,11 @@ A
.Nm
command appeared in
.At v1 .
.Sh BUGS
The
.Fl P
option assumes that the underlying file system is a fixed-block file
system.
UFS is a fixed-block file system, LFS is not.
In addition, only regular files are overwritten, other types of files
are not.
+129 -28
View File
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,6 +27,7 @@
* SUCH DAMAGE.
*/
#if 0
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1990, 1993, 1994\n\
@@ -38,10 +35,9 @@ static const char copyright[] =
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -53,6 +49,8 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <fcntl.h>
#include <fts.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -60,26 +58,29 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
int rflag, Iflag;
uid_t uid;
int check(char *, char *, struct stat *);
int check2(char **);
void checkdot(char **);
void checkslash(char **);
void rm_file(char **);
void rm_overwrite(char *, struct stat *);
int rm_overwrite(char *, struct stat *);
void rm_tree(char **);
void usage(void);
/*
* rm --
* This rm is different from historic rm's, but is expected to match
* POSIX 1003.2 behavior. The most visible difference is that -f
* POSIX 1003.2 behavior. The most visible difference is that -f
* has two specific effects now, ignore non-existent files and force
* file removal.
* file removal.
*/
int
main(int argc, char *argv[])
{
int ch, rflag;
int ch;
char *p;
/*
@@ -103,7 +104,7 @@ main(int argc, char *argv[])
}
Pflag = rflag = 0;
while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1)
while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1)
switch(ch) {
case 'd':
dflag = 1;
@@ -116,6 +117,9 @@ main(int argc, char *argv[])
fflag = 0;
iflag = 1;
break;
case 'I':
Iflag = 1;
break;
case 'P':
Pflag = 1;
break;
@@ -137,16 +141,22 @@ main(int argc, char *argv[])
if (argc < 1) {
if (fflag)
return 0;
return (0);
usage();
}
checkdot(argv);
if (getenv("POSIXLY_CORRECT") == NULL)
checkslash(argv);
uid = geteuid();
if (*argv) {
stdin_ok = isatty(STDIN_FILENO);
if (Iflag) {
if (check2(argv) == 0)
exit (1);
}
if (rflag)
rm_tree(argv);
else
@@ -182,8 +192,11 @@ rm_tree(char **argv)
flags |= FTS_NOSTAT;
if (Wflag)
flags |= FTS_WHITEOUT;
if (!(fts = fts_open(argv, flags, NULL)))
err(1, NULL);
if (!(fts = fts_open(argv, flags, NULL))) {
if (fflag && errno == ENOENT)
return;
err(1, "fts_open");
}
while ((p = fts_read(fts)) != NULL) {
switch (p->fts_info) {
case FTS_DNR:
@@ -197,8 +210,8 @@ rm_tree(char **argv)
errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
case FTS_NS:
/*
* FTS_NS: assume that if can't stat the file, it
* can't be unlinked.
* Assume that since fts_read() couldn't stat the
* file, it can't be unlinked.
*/
if (!needstat)
break;
@@ -267,9 +280,18 @@ rm_tree(char **argv)
}
break;
case FTS_NS:
/*
* Assume that since fts_read() couldn't stat
* the file, it can't be unlinked.
*/
if (fflag)
continue;
/* FALLTHROUGH */
default:
if (Pflag)
rm_overwrite(p->fts_accpath, NULL);
if (!rm_overwrite(p->fts_accpath, NULL))
continue;
rval = unlink(p->fts_accpath);
if (rval == 0 || (fflag && errno == ENOENT)) {
if (rval == 0 && vflag)
@@ -335,7 +357,8 @@ rm_file(char **argv)
rval = rmdir(f);
else {
if (Pflag)
rm_overwrite(f, &sb);
if (!rm_overwrite(f, &sb))
continue;
rval = unlink(f);
}
}
@@ -355,11 +378,11 @@ rm_file(char **argv)
* XXX
* This is a cheap way to *really* delete files. Note that only regular
* files are deleted, directories (and therefore names) will remain.
* Also, this assumes a fixed-block filesystem (like FFS, or a V7 or a
* System V filesystem). In a logging filesystem, you'll have to have
* Also, this assumes a fixed-block file system (like FFS, or a V7 or a
* System V file system). In a logging file system, you'll have to have
* kernel support.
*/
void
int
rm_overwrite(char *file, struct stat *sbp)
{
struct stat sb;
@@ -375,14 +398,14 @@ rm_overwrite(char *file, struct stat *sbp)
sbp = &sb;
}
if (!S_ISREG(sbp->st_mode))
return;
return (1);
if ((fd = open(file, O_WRONLY, 0)) == -1)
goto err;
if (fstatfs(fd, &fsb) == -1)
goto err;
bsize = MAX(fsb.f_iosize, 1024);
if ((buf = malloc(bsize)) == NULL)
err(1, "malloc");
err(1, "%s: malloc", file);
#define PASS(byte) { \
memset(buf, byte, bsize); \
@@ -401,13 +424,16 @@ rm_overwrite(char *file, struct stat *sbp)
PASS(0xff);
if (!fsync(fd) && !close(fd)) {
free(buf);
return;
return (1);
}
err: eval = 1;
if (buf)
free(buf);
if (fd != -1)
close(fd);
warn("%s", file);
return (0);
}
@@ -423,7 +449,7 @@ check(char *path, char *name, struct stat *sp)
else {
/*
* If it's not a symbolic link and it's unwritable and we're
* talking to a terminal, ask. Symbolic links are excluded
* talking to a terminal, ask. Symbolic links are excluded
* because their permissions are meaningless. Check stdin_ok
* first because we may not have stat'ed the file.
*/
@@ -434,12 +460,16 @@ check(char *path, char *name, struct stat *sp)
return (1);
strmode(sp->st_mode, modep);
if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
err(1, NULL);
err(1, "fflagstostr");
if (Pflag)
errx(1,
"%s: -P was specified, but file is not writable",
path);
(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
modep + 1, modep[9] == ' ' ? "" : " ",
user_from_uid(sp->st_uid, 0),
group_from_gid(sp->st_gid, 0),
*flagsp ? flagsp : "", *flagsp ? " " : "",
*flagsp ? flagsp : "", *flagsp ? " " : "",
path);
free(flagsp);
}
@@ -451,6 +481,77 @@ check(char *path, char *name, struct stat *sp)
return (first == 'y' || first == 'Y');
}
#define ISSLASH(a) ((a)[0] == '/' && (a)[1] == '\0')
void
checkslash(char **argv)
{
char **t, **u;
int complained;
complained = 0;
for (t = argv; *t;) {
if (ISSLASH(*t)) {
if (!complained++)
warnx("\"/\" may not be removed");
eval = 1;
for (u = t; u[0] != NULL; ++u)
u[0] = u[1];
} else {
++t;
}
}
}
int
check2(char **argv)
{
struct stat st;
int first;
int ch;
int fcount = 0;
int dcount = 0;
int i;
const char *dname = NULL;
for (i = 0; argv[i]; ++i) {
if (lstat(argv[i], &st) == 0) {
if (S_ISDIR(st.st_mode)) {
++dcount;
dname = argv[i]; /* only used if 1 dir */
} else {
++fcount;
}
}
}
first = 0;
while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') {
if (dcount && rflag) {
fprintf(stderr, "recursively remove");
if (dcount == 1)
fprintf(stderr, " %s", dname);
else
fprintf(stderr, " %d dirs", dcount);
if (fcount == 1)
fprintf(stderr, " and 1 file");
else if (fcount > 1)
fprintf(stderr, " and %d files", fcount);
} else if (dcount + fcount > 3) {
fprintf(stderr, "remove %d files", dcount + fcount);
} else {
return(1);
}
fprintf(stderr, "? ");
fflush(stderr);
first = ch = getchar();
while (ch != '\n' && ch != EOF)
ch = getchar();
if (ch == EOF)
break;
}
return (first == 'y' || first == 'Y');
}
#define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
void
checkdot(char **argv)
@@ -481,7 +582,7 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n",
"usage: rm [-f | -i] [-dPRrvW] file ...",
"usage: rm [-f | -i] [-dIPRrvW] file ...",
" unlink file");
exit(EX_USAGE);
}
+1
View File
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= sh
INSTALLFLAGS= -S
SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \
histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
mystring.c options.c output.c parser.c printf.c redir.c show.c \
+1 -1
View File
@@ -710,7 +710,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
* the command runs. Partly deleting like
* changepatch() does doesn't seem worth the
* bookinging effort, since most such runs add
* diretories in front of the new PATH.
* directories in front of the new PATH.
*/
clearcmdentry(0);
do_clearcmdentry = 1;
+1 -1
View File
@@ -699,7 +699,7 @@ unsetfunc(char *name)
delete_cmd_entry();
return (0);
}
return (1);
return (0);
}
/*
+1 -1
View File
@@ -1164,7 +1164,7 @@ expmeta(char *enddir, char *name)
if (*p == '\0')
break;
}
if (metaflag == 0 || stat(expdir, &statb) >= 0)
if (metaflag == 0 || lstat(expdir, &statb) >= 0)
addfname(expdir);
return;
}
+2 -1
View File
@@ -930,7 +930,8 @@ dowait(int block, struct job *job)
in_dowait--;
if (breakwaitcmd != 0) {
breakwaitcmd = 0;
return -1;
if (pid <= 0)
return -1;
}
if (pid <= 0)
return pid;
+1
View File
@@ -969,6 +969,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
USTPUTC('\\', out);
pungetc();
} else if (c == '\n') {
plinno++;
if (doprompt)
setprompt(2);
else
+1 -1
View File
@@ -262,7 +262,7 @@ When waiting for a child, execute traps immediately.
If this option is not set,
traps are executed after the child exits,
as specified in
.St -p1003.2
.St -p1003.2 .
This nonstandard option is useful for putting guarding shells around
children that block signals. The surrounding shell may kill the child
or it may just return control to the tty and leave the child alone,
+1 -1
View File
@@ -778,7 +778,7 @@ unsetvar(char *s)
}
}
return (1);
return (0);
}
+13 -6
View File
@@ -214,11 +214,6 @@ True if string
comes after
.Ar \&s\&2
based on the ASCII value of their characters.
.It Ar \&s\&1
True if
.Ar \&s\&1
is not the null
string.
.It Ar \&n\&1 Fl \&eq Ar \&n\&2
True if the integers
.Ar \&n\&1
@@ -259,6 +254,17 @@ than or equal to the integer
.Ar \&n\&2 .
.El
.Pp
If
.Ar file
is a symbolic link,
.Nm
will fully dereference it and then evaluate the expression
against the file referenced, except for the
.Fl h
and
.Fl L
primaries.
.Pp
These primaries can be combined with the following operators:
.Bl -tag -width Ar
.It Cm \&! Ar expression
@@ -319,7 +325,8 @@ An error occurred.
.Sh SEE ALSO
.Xr builtin 1 ,
.Xr expr 1 ,
.Xr sh 1
.Xr sh 1 ,
.Xr symlink 7
.Sh STANDARDS
The
.Nm
+5
View File
@@ -1,4 +1,9 @@
--- 8.3.7-REL released --- (Wed Sep 3 21:01:37 PDT 2003)
1581. [bug] apply anti-cache poison techniques to negative
answers.
--- 8.3.6-REL released --- (Sun Jun 8 15:11:32 PDT 2003)
1547. [port] cope with spurious EINVAL from evRead.
+3
View File
@@ -10,6 +10,9 @@ artifacts including BIND, INN, and DHCP.
Note that BIND 8 is in "end-of-life", having been replaced by BIND 9. See
http://www.isc.org/ for more details.
BIND 8.3.7 Highlights
Security release.
BIND 8.3.6 Highlights
Maintenance release.
+1 -1
View File
@@ -1 +1 @@
8.3.6-REL
8.3.7-REL
+1 -1
View File
@@ -1,6 +1,6 @@
#if !defined(lint) && !defined(SABER)
static const char sccsid[] = "@(#)ns_init.c 4.38 (Berkeley) 3/21/91";
static const char rcsid[] = "$Id: ns_init.c,v 8.77 2002/08/20 04:27:23 marka Exp $";
static const char rcsid[] = "$Id: ns_init.c,v 8.77.8.2 2003/09/04 04:09:09 marka Exp $";
#endif /* not lint */
/*
+10 -4
View File
@@ -1,6 +1,6 @@
#if !defined(lint) && !defined(SABER)
static const char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91";
static const char rcsid[] = "$Id: ns_resp.c,v 8.186.6.4 2003/06/02 09:56:35 marka Exp $";
static const char rcsid[] = "$Id: ns_resp.c,v 8.186.6.5 2003/09/04 03:03:18 marka Exp $";
#endif /* not lint */
/*
@@ -271,7 +271,7 @@ ns_resp(u_char *msg, int msglen, struct sockaddr_in from, struct qstream *qsp)
int soacount;
u_int qtype, qclass;
int validanswer, dbflags;
int cname, lastwascname, externalcname;
int cname, lastwascname, externalcname, cachenegative;
int count, founddata, foundname;
int buflen;
int newmsglen;
@@ -911,6 +911,7 @@ tcp_retry:
cname = 0;
lastwascname = 0;
externalcname = 0;
cachenegative = 1;
strcpy(aname, qname);
if (count) {
@@ -980,6 +981,7 @@ tcp_retry:
name);
db_detach(&dp);
validanswer = 0;
cachenegative = 0;
continue;
}
if (type == T_CNAME &&
@@ -1014,6 +1016,7 @@ tcp_retry:
"last was cname, ignoring auth. and add.");
db_detach(&dp);
validanswer = 0;
cachenegative = 0;
break;
}
if (i < arfirst) {
@@ -1029,6 +1032,7 @@ tcp_retry:
sin_ntoa(from));
db_detach(&dp);
validanswer = 0;
cachenegative = 0;
continue;
} else if (!ns_samedomain(name,
qp->q_domain)) {
@@ -1042,6 +1046,7 @@ tcp_retry:
sin_ntoa(from));
db_detach(&dp);
validanswer = 0;
cachenegative = 0;
continue;
}
if (type == T_NS) {
@@ -1205,8 +1210,9 @@ tcp_retry:
)
)
{
cache_n_resp(msg, msglen, from, qp->q_name,
qp->q_class, qp->q_type);
if (cachenegative)
cache_n_resp(msg, msglen, from, qp->q_name,
qp->q_class, qp->q_type);
if (!qp->q_cmsglen && validanswer) {
ns_debug(ns_log_default, 3,
-2
View File
@@ -77,7 +77,6 @@ static char sccsid[] = "@(#)commands.l 5.13 (Berkeley) 7/24/90";
* exit - exit the program
* root - set default server to the root
* ls NAME - list the domain NAME
* view FILE - sorts and view the file with more
* set OPTION - set an option
* help - print help information
* ? - print help information
@@ -103,7 +102,6 @@ static char sccsid[] = "@(#)commands.l 5.13 (Berkeley) 7/24/90";
extern char rootServerName[];
extern void PrintHelp();
extern void ViewList(char *);
#define YY_INPUT(buf, result, max_size) \
{ \
+34 -9
View File
@@ -312,6 +312,7 @@ static void compressedStreamEOF ( void ) NORETURN;
static void copyFileName ( Char*, Char* );
static void* myMalloc ( Int32 );
static int applySavedFileAttrToOutputFile ( int fd );
@@ -457,6 +458,10 @@ void compressStream ( FILE *stream, FILE *zStream )
ret = fflush ( zStream );
if (ret == EOF) goto errhandler_io;
if (zStream != stdout) {
int fd = fileno ( zStream );
if (fd < 0) goto errhandler_io;
ret = applySavedFileAttrToOutputFile ( fd );
if (ret != 0) goto errhandler_io;
ret = fclose ( zStream );
outputHandleJustInCase = NULL;
if (ret == EOF) goto errhandler_io;
@@ -525,6 +530,7 @@ Bool uncompressStream ( FILE *zStream, FILE *stream )
UChar obuf[5000];
UChar unused[BZ_MAX_UNUSED];
Int32 nUnused;
void* unusedTmpV;
UChar* unusedTmp;
nUnused = 0;
@@ -554,9 +560,10 @@ Bool uncompressStream ( FILE *zStream, FILE *stream )
}
if (bzerr != BZ_STREAM_END) goto errhandler;
BZ2_bzReadGetUnused ( &bzerr, bzf, (void**)(&unusedTmp), &nUnused );
BZ2_bzReadGetUnused ( &bzerr, bzf, &unusedTmpV, &nUnused );
if (bzerr != BZ_OK) panic ( "decompress:bzReadGetUnused" );
unusedTmp = (UChar*)unusedTmpV;
for (i = 0; i < nUnused; i++) unused[i] = unusedTmp[i];
BZ2_bzReadClose ( &bzerr, bzf );
@@ -567,6 +574,12 @@ Bool uncompressStream ( FILE *zStream, FILE *stream )
closeok:
if (ferror(zStream)) goto errhandler_io;
if ( stream != stdout) {
int fd = fileno ( stream );
if (fd < 0) goto errhandler_io;
ret = applySavedFileAttrToOutputFile ( fd );
if (ret != 0) goto errhandler_io;
}
ret = fclose ( zStream );
if (ret == EOF) goto errhandler_io;
@@ -639,6 +652,7 @@ Bool testStream ( FILE *zStream )
UChar obuf[5000];
UChar unused[BZ_MAX_UNUSED];
Int32 nUnused;
void* unusedTmpV;
UChar* unusedTmp;
nUnused = 0;
@@ -662,9 +676,10 @@ Bool testStream ( FILE *zStream )
}
if (bzerr != BZ_STREAM_END) goto errhandler;
BZ2_bzReadGetUnused ( &bzerr, bzf, (void**)(&unusedTmp), &nUnused );
BZ2_bzReadGetUnused ( &bzerr, bzf, &unusedTmpV, &nUnused );
if (bzerr != BZ_OK) panic ( "test:bzReadGetUnused" );
unusedTmp = (UChar*)unusedTmpV;
for (i = 0; i < nUnused; i++) unused[i] = unusedTmp[i];
BZ2_bzReadClose ( &bzerr, bzf );
@@ -1125,7 +1140,7 @@ void saveInputFileMetaInfo ( Char *srcName )
static
void applySavedMetaInfoToOutputFile ( Char *dstName )
void applySavedTimeInfoToOutputFile ( Char *dstName )
{
# if BZ_UNIX
IntNative retVal;
@@ -1134,16 +1149,26 @@ void applySavedMetaInfoToOutputFile ( Char *dstName )
uTimBuf.actime = fileMetaInfo.st_atime;
uTimBuf.modtime = fileMetaInfo.st_mtime;
retVal = chmod ( dstName, fileMetaInfo.st_mode );
ERROR_IF_NOT_ZERO ( retVal );
retVal = utime ( dstName, &uTimBuf );
ERROR_IF_NOT_ZERO ( retVal );
# endif
}
retVal = chown ( dstName, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
static
int applySavedFileAttrToOutputFile ( int fd )
{
# if BZ_UNIX
IntNative retVal;
retVal = fchmod ( fd, fileMetaInfo.st_mode );
if (retVal != 0)
return retVal;
(void) fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
/* chown() will in many cases return with EPERM, which can
be safely ignored.
*/
return 0;
# endif
}
@@ -1366,7 +1391,7 @@ void compress ( Char *name )
/*--- If there was an I/O error, we won't get here. ---*/
if ( srcMode == SM_F2F ) {
applySavedMetaInfoToOutputFile ( outName );
applySavedTimeInfoToOutputFile ( outName );
deleteOutputOnInterrupt = False;
if ( !keepInputFiles ) {
IntNative retVal = remove ( inName );
@@ -1544,7 +1569,7 @@ void uncompress ( Char *name )
/*--- If there was an I/O error, we won't get here. ---*/
if ( magicNumberOK ) {
if ( srcMode == SM_F2F ) {
applySavedMetaInfoToOutputFile ( outName );
applySavedTimeInfoToOutputFile ( outName );
deleteOutputOnInterrupt = False;
if ( !keepInputFiles ) {
IntNative retVal = remove ( inName );
+37 -14
View File
@@ -574,8 +574,11 @@ int BZ_API(BZ2_bzDecompressInit)
/*---------------------------------------------------*/
/* Return True iff data corruption is discovered.
Returns False if there is no problem.
*/
static
void unRLE_obuf_to_output_FAST ( DState* s )
Bool unRLE_obuf_to_output_FAST ( DState* s )
{
UChar k1;
@@ -584,7 +587,7 @@ void unRLE_obuf_to_output_FAST ( DState* s )
while (True) {
/* try to finish existing run */
while (True) {
if (s->strm->avail_out == 0) return;
if (s->strm->avail_out == 0) return False;
if (s->state_out_len == 0) break;
*( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
@@ -594,10 +597,13 @@ void unRLE_obuf_to_output_FAST ( DState* s )
s->strm->total_out_lo32++;
if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
}
/* can a new run be started? */
if (s->nblock_used == s->save_nblock+1) return;
if (s->nblock_used == s->save_nblock+1) return False;
/* Only caused by corrupt data stream? */
if (s->nblock_used > s->save_nblock+1)
return True;
s->state_out_len = 1;
s->state_out_ch = s->k0;
@@ -667,6 +673,10 @@ void unRLE_obuf_to_output_FAST ( DState* s )
cs_avail_out--;
}
}
/* Only caused by corrupt data stream? */
if (c_nblock_used > s_save_nblockPP)
return True;
/* can a new run be started? */
if (c_nblock_used == s_save_nblockPP) {
c_state_out_len = 0; goto return_notr;
@@ -712,6 +722,7 @@ void unRLE_obuf_to_output_FAST ( DState* s )
s->strm->avail_out = cs_avail_out;
/* end save */
}
return False;
}
@@ -732,8 +743,11 @@ __inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
/*---------------------------------------------------*/
/* Return True iff data corruption is discovered.
Returns False if there is no problem.
*/
static
void unRLE_obuf_to_output_SMALL ( DState* s )
Bool unRLE_obuf_to_output_SMALL ( DState* s )
{
UChar k1;
@@ -742,7 +756,7 @@ void unRLE_obuf_to_output_SMALL ( DState* s )
while (True) {
/* try to finish existing run */
while (True) {
if (s->strm->avail_out == 0) return;
if (s->strm->avail_out == 0) return False;
if (s->state_out_len == 0) break;
*( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
@@ -754,8 +768,11 @@ void unRLE_obuf_to_output_SMALL ( DState* s )
}
/* can a new run be started? */
if (s->nblock_used == s->save_nblock+1) return;
if (s->nblock_used == s->save_nblock+1) return False;
/* Only caused by corrupt data stream? */
if (s->nblock_used > s->save_nblock+1)
return True;
s->state_out_len = 1;
s->state_out_ch = s->k0;
@@ -788,7 +805,7 @@ void unRLE_obuf_to_output_SMALL ( DState* s )
while (True) {
/* try to finish existing run */
while (True) {
if (s->strm->avail_out == 0) return;
if (s->strm->avail_out == 0) return False;
if (s->state_out_len == 0) break;
*( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
@@ -800,7 +817,11 @@ void unRLE_obuf_to_output_SMALL ( DState* s )
}
/* can a new run be started? */
if (s->nblock_used == s->save_nblock+1) return;
if (s->nblock_used == s->save_nblock+1) return False;
/* Only caused by corrupt data stream? */
if (s->nblock_used > s->save_nblock+1)
return True;
s->state_out_len = 1;
s->state_out_ch = s->k0;
@@ -830,6 +851,7 @@ void unRLE_obuf_to_output_SMALL ( DState* s )
/*---------------------------------------------------*/
int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
{
Bool corrupt;
DState* s;
if (strm == NULL) return BZ_PARAM_ERROR;
s = strm->state;
@@ -840,12 +862,13 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
if (s->state == BZ_X_OUTPUT) {
if (s->smallDecompress)
unRLE_obuf_to_output_SMALL ( s ); else
unRLE_obuf_to_output_FAST ( s );
corrupt = unRLE_obuf_to_output_SMALL ( s ); else
corrupt = unRLE_obuf_to_output_FAST ( s );
if (corrupt) return BZ_DATA_ERROR;
if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) {
BZ_FINALISE_CRC ( s->calculatedBlockCRC );
if (s->verbosity >= 3)
VPrintf2 ( " {0x%x, 0x%x}", s->storedBlockCRC,
VPrintf2 ( " {0x%08x, 0x%08x}", s->storedBlockCRC,
s->calculatedBlockCRC );
if (s->verbosity >= 2) VPrintf0 ( "]" );
if (s->calculatedBlockCRC != s->storedBlockCRC)
@@ -863,7 +886,7 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
Int32 r = BZ2_decompress ( s );
if (r == BZ_STREAM_END) {
if (s->verbosity >= 3)
VPrintf2 ( "\n combined CRCs: stored = 0x%x, computed = 0x%x",
VPrintf2 ( "\n combined CRCs: stored = 0x%08x, computed = 0x%08x",
s->storedCombinedCRC, s->calculatedCombinedCRC );
if (s->calculatedCombinedCRC != s->storedCombinedCRC)
return BZ_DATA_ERROR;
+7 -5
View File
@@ -488,9 +488,11 @@ void sendMTFValues ( EState* s )
/*--
Recompute the tables based on the accumulated frequencies.
--*/
/* maxLen was changed from 20 to 17 in bzip2-1.0.3. See
comment in huffman.c for details. */
for (t = 0; t < nGroups; t++)
BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]),
alphaSize, 20 );
alphaSize, 17 /*20*/ );
}
@@ -527,7 +529,7 @@ void sendMTFValues ( EState* s )
if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
if (s->len[t][i] < minLen) minLen = s->len[t][i];
}
AssertH ( !(maxLen > 20), 3004 );
AssertH ( !(maxLen > 17 /*20*/ ), 3004 );
AssertH ( !(minLen < 1), 3005 );
BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]),
minLen, maxLen, alphaSize );
@@ -651,8 +653,8 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
if (s->blockNo > 1) s->numZ = 0;
if (s->verbosity >= 2)
VPrintf4( " block %d: crc = 0x%8x, "
"combined CRC = 0x%8x, size = %d\n",
VPrintf4( " block %d: crc = 0x%08x, "
"combined CRC = 0x%08x, size = %d\n",
s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
BZ2_blockSort ( s );
@@ -703,7 +705,7 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
bsPutUInt32 ( s, s->combinedCRC );
if (s->verbosity >= 2)
VPrintf1( " final combined CRC = 0x%x\n ", s->combinedCRC );
VPrintf1( " final combined CRC = 0x%08x\n ", s->combinedCRC );
bsFinishWrite ( s );
}
}
+11 -5
View File
@@ -524,17 +524,23 @@ Int32 BZ2_decompress ( DState* s )
if (s->origPtr < 0 || s->origPtr >= nblock)
RETURN(BZ_DATA_ERROR);
/*-- Set up cftab to facilitate generation of T^(-1) --*/
s->cftab[0] = 0;
for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
for (i = 0; i <= 256; i++) {
if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
/* s->cftab[i] can legitimately be == nblock */
RETURN(BZ_DATA_ERROR);
}
}
s->state_out_len = 0;
s->state_out_ch = 0;
BZ_INITIALISE_CRC ( s->calculatedBlockCRC );
s->state = BZ_X_OUTPUT;
if (s->verbosity >= 2) VPrintf0 ( "rt+rld" );
/*-- Set up cftab to facilitate generation of T^(-1) --*/
s->cftab[0] = 0;
for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
if (s->smallDecompress) {
/*-- Make a copy of cftab, used in generation of T --*/
+18 -1
View File
@@ -162,7 +162,24 @@ void BZ2_hbMakeCodeLengths ( UChar *len,
if (! tooLong) break;
for (i = 1; i < alphaSize; i++) {
/* 17 Oct 04: keep-going condition for the following loop used
to be 'i < alphaSize', which missed the last element,
theoretically leading to the possibility of the compressor
looping. However, this count-scaling step is only needed if
one of the generated Huffman code words is longer than
maxLen, which up to and including version 1.0.2 was 20 bits,
which is extremely unlikely. In version 1.0.3 maxLen was
changed to 17 bits, which has minimal effect on compression
ratio, but does mean this scaling step is used from time to
time, enough to verify that it works.
This means that bzip2-1.0.3 and later will only produce
Huffman codes with a maximum length of 17 bits. However, in
order to preserve backwards compatibility with bitstreams
produced by versions pre-1.0.3, the decompressor must still
handle lengths of up to 20. */
for (i = 1; i <= alphaSize; i++) {
j = weight[i] >> 8;
j = 1 + (j / 2);
weight[i] = j << 8;
+91 -26
View File
@@ -46,6 +46,19 @@ $FreeBSD$
#define lchown chown
#endif
# ifndef DIRECTORY_SEPARATOR
# define DIRECTORY_SEPARATOR '/'
# endif
# ifndef ISSLASH
# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
# endif
# ifndef FILE_SYSTEM_PREFIX_LEN
# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
# endif
static void read_pattern_file ();
static void tape_skip_padding ();
static void defer_copyin ();
@@ -376,6 +389,54 @@ swab_array (ptr, count)
/* Current time for verbose table. */
static time_t current_time;
/* Return a safer suffix of FILE_NAME, or "." if it has no safer
suffix. Check for fully specified file names and other atrocities. */
static const char *
safer_name_suffix (char const *file_name)
{
char const *p;
/* Skip file system prefixes, leading file name components that contain
"..", and leading slashes. */
size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (file_name);
for (p = file_name + prefix_len; *p;)
{
if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
prefix_len = p + 2 - file_name;
do
{
char c = *p++;
if (ISSLASH (c))
break;
}
while (*p);
}
for (p = file_name + prefix_len; ISSLASH (*p); p++)
continue;
prefix_len = p - file_name;
if (prefix_len)
{
char *prefix = alloca (prefix_len + 1);
memcpy (prefix, file_name, prefix_len);
prefix[prefix_len] = '\0';
error (0, 0, "Removing leading `%s' from member names", prefix);
}
if (!*p)
p = ".";
return p;
}
/* Read the collection from standard input and create files
in the file system. */
@@ -396,6 +457,7 @@ process_copy_in ()
int in_file_des; /* Input file descriptor. */
char skip_file; /* Flag for use with patterns. */
int existing_dir; /* True if file is a dir & already exists. */
mode_t existing_mode;
int i; /* Loop index variable. */
char *link_name = NULL; /* Name of hard and symbolic links. */
#ifdef HPUX_CDF
@@ -494,18 +556,11 @@ process_copy_in ()
/* Do we have to ignore absolute paths, and if so, does the filename
have an absolute path? */
if (no_abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0] == '/')
if (!abs_paths_flag && file_hdr.c_name && file_hdr.c_name[0])
{
char *p;
const char *p = safer_name_suffix (file_hdr.c_name);
p = file_hdr.c_name;
while (*p == '/')
++p;
if (*p == '\0')
{
strcpy (file_hdr.c_name, ".");
}
else
if (p != file_hdr.c_name)
{
char *non_abs_name;
@@ -642,6 +697,7 @@ process_copy_in ()
we are trying to create, don't complain about
it. */
existing_dir = TRUE;
existing_mode = file_stat.st_mode;
}
else if (!unconditional_flag
&& file_hdr.c_mtime <= file_stat.st_mtime)
@@ -778,8 +834,6 @@ process_copy_in ()
}
copy_files_tape_to_disk (in_file_des, out_file_des, file_hdr.c_filesize);
disk_empty_output_buffer (out_file_des);
if (close (out_file_des) < 0)
error (0, errno, "%s", file_hdr.c_name);
if (archive_format == arf_crcascii)
{
@@ -789,13 +843,15 @@ process_copy_in ()
}
/* File is now copied; set attributes. */
if (!no_chown_flag)
if ((chown (file_hdr.c_name,
if ((fchown (out_file_des,
set_owner_flag ? set_owner : file_hdr.c_uid,
set_group_flag ? set_group : file_hdr.c_gid) < 0)
&& errno != EPERM)
error (0, errno, "%s", file_hdr.c_name);
/* chown may have turned off some permissions we wanted. */
if (chmod (file_hdr.c_name, (int) file_hdr.c_mode) < 0)
if (fchmod (out_file_des, (int) file_hdr.c_mode) < 0)
error (0, errno, "%s", file_hdr.c_name);
if (close (out_file_des) < 0)
error (0, errno, "%s", file_hdr.c_name);
if (retain_time_flag)
{
@@ -847,14 +903,23 @@ process_copy_in ()
cdf_flag = 1;
}
#endif
res = mkdir (file_hdr.c_name, file_hdr.c_mode);
res = mkdir (file_hdr.c_name, file_hdr.c_mode & ~077);
}
else
res = 0;
{
if (!no_chown_flag && (existing_mode & 077) != 0
&& chmod (file_hdr.c_name, existing_mode & 07700) < 0)
{
error (0, errno, "%s: chmod", file_hdr.c_name);
return;
}
res = 0;
}
if (res < 0 && create_dir_flag)
{
create_all_directories (file_hdr.c_name);
res = mkdir (file_hdr.c_name, file_hdr.c_mode);
res = mkdir (file_hdr.c_name, file_hdr.c_mode & ~077);
}
if (res < 0)
{
@@ -936,20 +1001,20 @@ process_copy_in ()
#ifdef CP_IFIFO
if ((file_hdr.c_mode & CP_IFMT) == CP_IFIFO)
res = mkfifo (file_hdr.c_name, file_hdr.c_mode);
res = mkfifo (file_hdr.c_name, file_hdr.c_mode & ~077);
else
#endif
res = mknod (file_hdr.c_name, file_hdr.c_mode,
res = mknod (file_hdr.c_name, file_hdr.c_mode & ~077,
makedev (file_hdr.c_rdev_maj, file_hdr.c_rdev_min));
if (res < 0 && create_dir_flag)
{
create_all_directories (file_hdr.c_name);
#ifdef CP_IFIFO
if ((file_hdr.c_mode & CP_IFMT) == CP_IFIFO)
res = mkfifo (file_hdr.c_name, file_hdr.c_mode);
res = mkfifo (file_hdr.c_name, file_hdr.c_mode & ~077);
else
#endif
res = mknod (file_hdr.c_name, file_hdr.c_mode,
res = mknod (file_hdr.c_name, file_hdr.c_mode & ~077,
makedev (file_hdr.c_rdev_maj,
file_hdr.c_rdev_min));
}
@@ -1376,18 +1441,18 @@ create_final_defers ()
continue;
}
if (close (out_file_des) < 0)
error (0, errno, "%s", d->header.c_name);
/* File is now copied; set attributes. */
if (!no_chown_flag)
if ((chown (d->header.c_name,
if ((fchown (out_file_des,
set_owner_flag ? set_owner : d->header.c_uid,
set_group_flag ? set_group : d->header.c_gid) < 0)
&& errno != EPERM)
error (0, errno, "%s", d->header.c_name);
/* chown may have turned off some permissions we wanted. */
if (chmod (d->header.c_name, (int) d->header.c_mode) < 0)
if (fchmod (out_file_des, (int) d->header.c_mode) < 0)
error (0, errno, "%s", d->header.c_name);
if (close (out_file_des) < 0)
error (0, errno, "%s", d->header.c_name);
if (retain_time_flag)
{
+20 -2
View File
@@ -49,12 +49,13 @@ write_out_header (file_hdr, out_des)
{
char ascii_header[112];
char *magic_string;
int ret;
if (archive_format == arf_crcascii)
magic_string = "070702";
else
magic_string = "070701";
sprintf (ascii_header,
ret = snprintf (ascii_header, sizeof(ascii_header),
"%6s%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
magic_string,
file_hdr->c_ino, file_hdr->c_mode, file_hdr->c_uid,
@@ -62,6 +63,10 @@ write_out_header (file_hdr, out_des)
file_hdr->c_filesize, file_hdr->c_dev_maj, file_hdr->c_dev_min,
file_hdr->c_rdev_maj, file_hdr->c_rdev_min, file_hdr->c_namesize,
file_hdr->c_chksum);
if (ret >= sizeof(ascii_header)) {
fprintf(stderr, "Internal overflow, aborting\n");
exit (1);
}
tape_buffered_write (ascii_header, out_des, 110L);
/* Write file name to output. */
@@ -71,6 +76,7 @@ write_out_header (file_hdr, out_des)
else if (archive_format == arf_oldascii || archive_format == arf_hpoldascii)
{
char ascii_header[78];
int ret;
#ifndef __MSDOS__
dev_t dev;
dev_t rdev;
@@ -112,7 +118,7 @@ write_out_header (file_hdr, out_des)
if ((file_hdr->c_ino >> 16) != 0)
error (0, 0, "%s: truncating inode number", file_hdr->c_name);
sprintf (ascii_header,
ret = snprintf (ascii_header, sizeof(ascii_header),
"%06o%06o%06lo%06lo%06lo%06lo%06lo%06o%011lo%06lo%011lo",
file_hdr->c_magic & 0xFFFF, dev & 0xFFFF,
file_hdr->c_ino & 0xFFFF, file_hdr->c_mode & 0xFFFF,
@@ -120,6 +126,10 @@ write_out_header (file_hdr, out_des)
file_hdr->c_nlink & 0xFFFF, rdev & 0xFFFF,
file_hdr->c_mtime, file_hdr->c_namesize & 0xFFFF,
file_hdr->c_filesize);
if (ret >= sizeof(ascii_header)) {
fprintf(stderr, "Internal overflow, aborting\n");
exit (1);
}
tape_buffered_write (ascii_header, out_des, 76L);
/* Write file name to output. */
@@ -258,6 +268,14 @@ process_copy_out ()
file_hdr.c_dev_maj = major (file_stat.st_dev);
file_hdr.c_dev_min = minor (file_stat.st_dev);
file_hdr.c_ino = file_stat.st_ino;
/* Skip files larger than 4GB which will cause problems on
64bit platforms (and just not work on 32bit). */
if (file_stat.st_size > 0xffffffff) {
error (0, 0, "%s: skipping >4GB file", input_name.ds_string);
continue;
}
/* For POSIX systems that don't define the S_IF macros,
we can't assume that S_ISfoo means the standard Unix
S_IFfoo bit(s) are set. So do it manually, with a
+20 -11
View File
@@ -173,18 +173,18 @@ process_copy_pass ()
disk_empty_output_buffer (out_file_des);
if (close (in_file_des) < 0)
error (0, errno, "%s", input_name.ds_string);
if (close (out_file_des) < 0)
error (0, errno, "%s", output_name.ds_string);
/* Set the attributes of the new file. */
if (!no_chown_flag)
if ((chown (output_name.ds_string,
if ((fchown (out_file_des,
set_owner_flag ? set_owner : in_file_stat.st_uid,
set_group_flag ? set_group : in_file_stat.st_gid) < 0)
&& errno != EPERM)
error (0, errno, "%s", output_name.ds_string);
/* chown may have turned off some permissions we wanted. */
if (chmod (output_name.ds_string, in_file_stat.st_mode) < 0)
if (fchmod (out_file_des, in_file_stat.st_mode) < 0)
error (0, errno, "%s", output_name.ds_string);
if (close (out_file_des) < 0)
error (0, errno, "%s", output_name.ds_string);
if (reset_time_flag)
{
@@ -223,15 +223,24 @@ process_copy_pass ()
cdf_flag = 1;
}
#endif
res = mkdir (output_name.ds_string, in_file_stat.st_mode);
res = mkdir (output_name.ds_string, in_file_stat.st_mode & ~077);
}
else
res = 0;
{
if (!no_chown_flag && (out_file_stat.st_mode & 077) != 0
&& chmod (output_name.ds_string, out_file_stat.st_mode & 07700) < 0)
{
error (0, errno, "%s: chmod", output_name.ds_string);
continue;
}
res = 0;
}
if (res < 0 && create_dir_flag)
{
create_all_directories (output_name.ds_string);
res = mkdir (output_name.ds_string, in_file_stat.st_mode);
res = mkdir (output_name.ds_string, in_file_stat.st_mode & ~077);
}
if (res < 0)
{
@@ -297,20 +306,20 @@ process_copy_pass ()
{
#ifdef S_ISFIFO
if (S_ISFIFO (in_file_stat.st_mode))
res = mkfifo (output_name.ds_string, in_file_stat.st_mode);
res = mkfifo (output_name.ds_string, in_file_stat.st_mode & ~077);
else
#endif
res = mknod (output_name.ds_string, in_file_stat.st_mode,
res = mknod (output_name.ds_string, in_file_stat.st_mode & ~077,
in_file_stat.st_rdev);
if (res < 0 && create_dir_flag)
{
create_all_directories (output_name.ds_string);
#ifdef S_ISFIFO
if (S_ISFIFO (in_file_stat.st_mode))
res = mkfifo (output_name.ds_string, in_file_stat.st_mode);
res = mkfifo (output_name.ds_string, in_file_stat.st_mode & ~077);
else
#endif
res = mknod (output_name.ds_string, in_file_stat.st_mode,
res = mknod (output_name.ds_string, in_file_stat.st_mode & ~077,
in_file_stat.st_rdev);
}
if (res < 0)
+4 -4
View File
@@ -19,7 +19,7 @@ cpio \- copy files to and from archives
[\-\-unconditional] [\-\-verbose] [\-\-block-size=blocks] [\-\-swap-halfwords]
[\-\-io-size=bytes] [\-\-pattern-file=file] [\-\-format=format]
[\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message]
[\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] [\-\-only\-verify\-crc]
[\-\-force\-local] [\-\-absolute\-filenames] [\-\-sparse] [\-\-only\-verify\-crc]
[\-\-quiet] [\-\-help] [\-\-version] [pattern...] [< archive]
.B cpio
@@ -251,9 +251,9 @@ current volume number (starting at 1).
In the verbose table of contents listing, show numeric UID and GID
instead of translating them into names.
.TP
.I " \-\-no-absolute-filenames"
In copy-in mode, create all files relative to the current directory,
even if they have an absolute file name in the archive.
.I " \-\-absolute-filenames"
Do not strip leading file name components that contain ".."
and leading slashes from file names in copy-in mode
.TP
.I " \-\-no-preserve-owner"
In copy-in mode and copy-pass mode, do not change the ownership of the
+1 -1
View File
@@ -46,7 +46,7 @@ extern int no_chown_flag;
extern int sparse_flag;
extern int quiet_flag;
extern int only_verify_crc_flag;
extern int no_abs_paths_flag;
extern int abs_paths_flag;
extern int last_header_start;
extern int copy_matching_files;
+2 -2
View File
@@ -98,8 +98,8 @@ int quiet_flag = FALSE;
actually extract the files. */
int only_verify_crc_flag = FALSE;
/* If TRUE, don't use any absolute paths, prefix them by `./'. */
int no_abs_paths_flag = FALSE;
/* If TRUE, allow any absolute paths */
int abs_paths_flag = FALSE;
#ifdef DEBUG_CPIO
/* If TRUE, print debugging information. */
+6 -6
View File
@@ -56,7 +56,7 @@ struct option long_opts[] =
{"list", 0, &table_flag, TRUE},
{"make-directories", 0, &create_dir_flag, TRUE},
{"message", 1, 0, 'M'},
{"no-absolute-filenames", 0, 0, 136},
{"absolute-filenames", 0, 0, 136},
{"no-preserve-owner", 0, 0, 134},
{"nonmatching", 0, &copy_matching_files, FALSE},
{"numeric-uid-gid", 0, &numeric_uid, TRUE},
@@ -105,7 +105,7 @@ Usage: %s {-o|--create} [-0acvABLV] [-C bytes] [-H format] [-M message]\n\
[--unconditional] [--verbose] [--block-size=blocks] [--swap-halfwords]\n\
[--io-size=bytes] [--pattern-file=file] [--format=format]\n\
[--owner=[user][:.][group]] [--no-preserve-owner] [--message=message]\n\
[--force-local] [--no-absolute-filenames] [--sparse] [--only-verify-crc]\n\
[--force-local] [--absolute-filenames] [--sparse] [--only-verify-crc]\n\
[--quiet] [--help] [--version] [pattern...] [< archive]\n",
program_name);
fprintf (fp, "\
@@ -266,8 +266,8 @@ crc newc odc bin ustar tar (all-caps also recognized)", optarg);
numeric_uid = TRUE;
break;
case 136: /* --no-absolute-filenames */
no_abs_paths_flag = TRUE;
case 136: /* --absolute-filenames */
abs_paths_flag = TRUE;
break;
case 134: /* --no-preserve-owner */
@@ -414,7 +414,7 @@ crc newc odc bin ustar tar (all-caps also recognized)", optarg);
|| retain_time_flag || no_chown_flag || set_owner_flag
|| set_group_flag || swap_bytes_flag || swap_halfwords_flag
|| (append_flag && !(archive_name || output_archive_name))
|| rename_batch_file || no_abs_paths_flag
|| rename_batch_file || abs_paths_flag
|| input_archive_name || (archive_name && output_archive_name))
usage (stderr, 2);
if (archive_format == arf_unknown)
@@ -429,7 +429,7 @@ crc newc odc bin ustar tar (all-caps also recognized)", optarg);
if (argc - 1 != optind || archive_format != arf_unknown
|| swap_bytes_flag || swap_halfwords_flag
|| table_flag || rename_flag || append_flag
|| rename_batch_file || no_abs_paths_flag)
|| rename_batch_file || abs_paths_flag)
usage (stderr, 2);
directory_name = argv[optind];
}
+86 -2
View File
@@ -1,4 +1,88 @@
Authors of GNU CVS
Um, yeah. There were lots of 'em. See the "Credits" section of the
README file and the individual ChangeLog files for more.
The conflict-resolution algorithms and much of the administrative file
definitions of CVS were based on the original package written by Dick Grune
at Vrije Universiteit in Amsterdam <[email protected]>, and posted to
comp.sources.unix in the volume 6 release sometime in 1986. This original
version was a collection of shell scripts. I am thankful that Dick made
his work available.
Brian Berliner from Prisma, Inc. (now at Sun Microsystems, Inc.)
<[email protected]> converted the original CVS shell scripts into reasonably
fast C and added many, many features to support software release control
functions. See the manual page in the "man" directory. A copy of the
USENIX article presented at the Winter 1990 USENIX Conference, Washington
D.C., is included in the "doc" directory.
Jeff Polk from BSDI <[email protected]> converted the CVS 1.2
sources into much more readable and maintainable C code. He also added a
whole lot of functionality and modularity to the code in the process.
See the bottom of the NEWS file (from about 1992).
david d `zoo' zuhn <[email protected]> contributed the working base code
for CVS 1.4 Alpha. His work carries on from work done by K. Richard Pixley
and others at Cygnus Support. The CVS 1.4 upgrade is due in large part to
Zoo's efforts.
David G. Grubbs <[email protected]> contributed the CVS "history" and "release"
commands. As well as the ever-so-useful "-n" option of CVS which tells CVS
to show what it would do, without actually doing it. He also contributed
support for the .cvsignore file.
The Free Software Foundation (GNU) contributed most of the portability
framework that CVS now uses. This can be found in the "configure" script,
the Makefile's, and basically most of the "lib" directory.
K. Richard Pixley, Cygnus Support <[email protected]> contributed many bug
fixes/enhancement as well as completing early reviews of the CVS 1.3 manual
pages.
Roland Pesch, then of Cygnus Support <[email protected]> contributed
brand new cvs(1) and cvs(5) manual pages. Thanks to him for saving us
from poor use of our language!
Paul Sander, HaL Computer Systems, Inc. <[email protected]> wrote and
contributed the code in lib/sighandle.c. I added support for POSIX, BSD,
and non-POSIX/non-BSD systems.
Jim Kingdon and others at Cygnus Support <[email protected]> wrote the
remote repository access code.
Larry Jones and Derek Price <[email protected]> have been maintaining and
enhancing CVS for some years. Mark D. Baushke <[email protected]> came on in
2003.
There have been many, many contributions not listed here. Consult the
individual ChangeLog files in each directory for a more complete idea.
In addition to the above contributors, the following Beta testers
deserve special mention for their support. This is only a partial
list; if you have helped in this way and would like to be listed, let
bug-cvs know (as described in the Cederqvist manual).
Mark D. Baushke <[email protected]>
Per Cederqvist <[email protected]>
J.T. Conklin <[email protected]>
Vince DeMarco <[email protected]>
Paul Eggert <[email protected]>
Lal George <[email protected]>
Dean E. Hardi <[email protected]>
Mike Heath <[email protected]>
Jim Kingdon <[email protected]>
Bernd Leibing <[email protected]>
Benedict Lofstedt <[email protected]>
Dave Love <[email protected]>
Robert Lupton the Good <[email protected]>
Tom McAliney <[email protected]>
Eberhard Mattes <[email protected]>
Jim Meyering <[email protected]>
Thomas Mohr <[email protected]>
Thomas Nilsson <[email protected]>
Raye Raskin <[email protected]>
Harlan Stenn <[email protected]>
Gunnar Tornblom <[email protected]>
Greg A. Woods <[email protected]>
Many contributors have added code to the "contrib" directory. See the
README file there for a list of what is available. There is also a
contributed GNU Emacs CVS-mode in tools/pcl-cvs.
+39 -154
View File
@@ -15,16 +15,6 @@ similar file for the unix-like operating systems (not yet, at least).
This file also might contain some platform-specific bugs.
* Need more work on the procedure for fixing it if a binary file is
accidentally added in text mode (sanity.sh test cases, better
documentation, probably update and/or admin -kb should update
the -k setting in CVS/Entries).
* Wrappers (-t/-f) do not work client/server, and there are a variety of other
bugs and annoyances with wrappers.
* If your login name contains a space or various other characters
(particularly an issue on Windows), CVS will have trouble (it will
write invalid RCS files, probably). The fix would be to have CVS
@@ -42,10 +32,19 @@ provide a "Option-read-write" request which sends -w, in addition to
"Global_option -r" which sends -r.
* "make remotecheck" sometimes fails on test 187a3 with
cvs server: in directory .:
cvs [server aborted]: *PANIC* administration files missing
This does not happen every time. (-kingdon, Nov 96, Red Hat linux 3.0.3).
* Symbolic links to files will not work with or without LockDir. In the
repository, you should avoid using symbolic links to files since this issue
can cause data loss. Symlinks are only a problem when writing files. If your
repository does not allow any write access, symlinks are not a problem.
* Symbolic links to directories will not work with LockDir. In the
repository, you should avoid using symbolic links to directories if
you intend to use LockDir as the correct directory will NOT be locked
by CVS during write. Directory symlinks are not recommended, but should work
as long as LockDir is not being used. Symlinks are only a problem when
writing files. If your repository does not allow any write access, symlinks
are never a problem, whether or not LockDir is in use.
* The -m option to "cvs add" does not work with client/server CVS.
@@ -59,49 +58,13 @@ file's description.
users who try to add the same directory at nearly the same time.
* 'cvs admin' dumped core when files were missing from working directory
(and from the repository)?
* The following bug was reported against CVS 1.9:
Create a module named test with a file named test in it.
cactus:sfavor> cvs get test
cvs checkout: Updating test
U test/test
cactus:sfavor> cd test
cactus:sfavor> cvs get test
cvs checkout: cannot chdir to test: Not a directory
cvs checkout: ignoring module test
Exit 1
cactus:sfavor> cvs update
cvs update: Updating .
rcs.c:2139: failed assertion `rev == NULL || isdigit (*rev)'
Abort (core dumped)
Exit 134
* pcl-cvs doesn't like it when you try to check in a file which isn't
up-to-date. The messages produced by the server perhaps don't match
what pcl-cvs is looking for.
* From: [email protected] (Bill Robertson)
Subject: Problem with rtag and the -D option
Date: Fri, 17 Mar 1995 10:53:29 -0600 (CST)
I have been trying to use the -D option to specify a date for tagging, but
rtag does not recognize the -D option. It is documented to do so and I've
tested the use of -D with cvs update and cvs diff and it works fine there.
* From: "Charles M. Hannum" <[email protected]>
To: [email protected]
Subject: Still one more bug
Date: Sat, 25 Feb 1995 17:01:15 -0500
mycroft@duality [1]; cd /usr/src/lib/libc
mycroft@duality [1]; cvs diff -c2 '-D1 day ago' -Dnow
mycroft@duality [1]; cvs diff -C2 '-D1 day ago' -Dnow
cvs server: Diffing .
cvs server: Diffing DB
cvs [server aborted]: could not chdir to DB: No such file or directory
@@ -115,117 +78,39 @@ file's description.
P.S. Is anyone working on fixing these bugs?
* From: Roland McGrath <[email protected]>
To: Cyclic CVS Hackers <[email protected]>
Subject: weird bug
Date: Sat, 25 Mar 1995 16:41:41 -0500
X-Windows: Even your dog won't like it.
* CVS does not always seem to be waiting to the next filesystem timestamp
quanta after commits. So far this has only shown up in testing under the BSDI
OS. The symptoms are that ocassionally CVS will not notice that modified files
are modified, though the file must be modified within a short time after the
commit, probably milliseconds or seconds, for this symptom to be noticed. One
suspected cause is that one of the calls to sleep_past() is being called with
an incorrect value, though this does not explain why symptoms have only been
noticed under BSDI.
I just noticed some droppings on my disk from what must be a pretty weird
bug in remote CVS.
In my home directory on a repository machine I use, I find:
* Spaces in arguments to `cvs diff' are currently split on spaces and tabs
before being passed to diff. This can often cause diff to abort since it can
no longer interpret its options string and if it can, coincidentally,
interpret its option string, then the problem may be output in unexpected
formats.
drwxr-xr-x 4 roland staff 512 Mar 7 14:08 cvs-serv28962
drwxr-xr-x 4 roland staff 512 Mar 7 14:11 cvs-serv28978
drwxr-xr-x 4 roland staff 512 Mar 7 15:13 cvs-serv29141
OK, so these are leftover cruft from some cvs run that got aborted.
Well, it should clean up after itself, but so what.
* `release' of a project subdir does not remove the `subdir' entry from
`./CVS/Entries'.
The last one is pretty dull; the real weirdness is the contents of the
first two directories.
duality 77 # ls -RF cvs-serv28978/
CVS/ cvs-serv28978/
* Most of the remote commands are encountering assertion failures when listing
the toplevel of the repository (e.g. `cvs rlog .'). This appears to be
related to the symlinked CVS root fix.
cvs-serv28978/CVS:
Entries Repository
cvs-serv28978/cvs-serv28978:
arpa/
* Status
cvs-serv28978/cvs-serv28978/arpa:
CVS/ cvs-serv28978/
/*-------.
| Stable |
`-------*/
cvs-serv28978/cvs-serv28978/arpa/CVS:
Entries Repository
/*-------------------------.
| Sane for full scale use. |
`-------------------------*/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978:
assert/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert:
CVS/ cvs-serv28978/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/CVS:
Entries Repository
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978:
bare/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare:
CVS/ cvs-serv28978/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/CVS:
Entries Repository
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978:
conf/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf:
CVS/ cvs-serv28978/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/CVS:
Entries Repository
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978:
crypt/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt:
CVS/ cvs-serv28978/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/CVS:
Entries Repository
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978:
csu/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu:
CVS/ cvs-serv28978/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/CVS:
Entries Repository
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978:
ctype/
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype:
CVS/ cvs-serv28978/
[...]
ls: cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978/socket: File name too long
cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978:
* From: Roland McGrath <[email protected]>
To: Cyclic CVS Hackers <[email protected]>
Subject: bizarre failure mode
Date: Tue, 7 Mar 95 14:17:28 -0500
This is pretty weird:
CVS_SERVER='TMPDIR=. /usr/local/bin/cvs' ../cvs-build/src/cvs update -q
cvs [server aborted]: could not get working directory: Result too large
[Exit 1]
asylum 29 % grep 'Result too large' /usr/include/sys/errno.h
#define ERANGE 34 /* Result too large */
Now, getcwd fails with ERANGE when the buffer is too small. But I don't
know why that would be the case; I don't think there are exceptionally long
directory names involved. It would be robust to notice ERANGE and use a
bigger buffer. But I suspect something weirder is going on.
The repository in question in duality.gnu.ai.mit.edu:/gd4/gnu/cvsroot/libc.
Send me a PGP-signed message if you want the password to use the machine
where the problem showed up.
+909
View File
@@ -1,3 +1,905 @@
2004-06-09 Derek Price <[email protected]>
* NEWS: Note Stefan & Sebastian's security fixes.
* acinclude.m4 (gl_SIZE_MAX, gl_XSIZE): Import from GNULIB.
* configure.in: Call gl_XSIZE.
2004-06-09 Derek Price <[email protected]>
* NEWS: Note CAN-2004-0414 fix.
2004-05-19 Derek Price <[email protected]>
* NEWS: Note CAN-2004-0396 fix.
2004-05-17 Derek Price <[email protected]>
* BUGS: Note assertion failure of r* commands.
2004-05-17 Derek Price <[email protected]>
* BUGS: Remove out of date comment about out of date Windows build
files and several bug reports that are so old, without similar recent
reports, that I'm assuming that the problems have been fixed.
2004-05-15 Derek Price <[email protected]>
* cvsnt.dsp: Header file list updated.
* cvsnt.dep: Regenerated for "cvsnt.dsp" change.
* cvsnt.mak: Regenerated for "cvsnt.dsp" change.
(Patch from Conrad Pino <[email protected]>.)
2004-05-13 Derek Price <[email protected]>
* NEWS: Note MSVC++ project file regeneration.
2004-05-13 Derek Price <[email protected]>
* cvsnt.dsw: Rename "zlib/zlib.*" to "zlib/libz.*".
Add project "lib/libcvs".
* cvsnt.dsp: Revised for "cvsnt.dsw" changes. Move "lib/*.c" to
project "lib/libcvs". Upgraded to Visual C++ 6.0 format.
* cvsnt.dep: Added for "cvsnt.dsp" change.
* cvsnt.mak: Regenerated for "cvsnt.dsp" change.
(Patch from Conrad Pino <[email protected]>.)
* configure.in: Generate windows-NT/fix-msvc-mak.
2004-04-30 Derek Price <[email protected]>
* NEWS: Note that man page is generated from cvs.texinfo now.
* configure.in: Build doc/mkman.
* configure, Makefile.in: Regenerated.
2004-04-26 Derek Price <[email protected]>
* NEWS: Note that :ext: no longer relies on an external transport with
a GNU argument processor.
2004-04-20 Derek Price <[email protected]>
* NEWS: Note XP directory deletion fix.
2004-04-16 Derek Price <[email protected]>
* NEWS: Correct CVS name for piped checkout issue now that we have one.
2004-04-15 Derek Price <[email protected]>
* NEWS: Retroactively add CVE issue name for the piped etc issue.
2004-04-15 Derek Price <[email protected]>
* NEWS: Retroactively add CVE issue name for the trojan server issue.
2004-04-14 Derek Price <[email protected]>
* INSTALL (Building from source code under Unix): Move Autoconf &
Automake notes...
* HACKING (Regenerating Build Files): ...here.
2004-04-13 Derek Price <[email protected]>
* NEWS: Note validation of paths passed to the client.
2004-04-07 Derek Price <[email protected]>
* NEWS: Clarify relative-path up-reference article.
2004-04-07 Derek Price <[email protected]>
* NEWS: Note ignoring of method options in CVSROOTs.
2004-04-06 Derek Price <[email protected]>
* TODO (196, 217, 219, 220, 222, 226): Remove completed items.
(230): New item.
2004-04-06 Derek Price <[email protected]>
* NEWS: Note this change.
* configure.in: Do not try and use TMP, TEMP, or TMPDIR as default
temporary directories.
* configure: Regenerated.
2004-04-04 Derek Price <[email protected]>
* NEWS: Note Cygwin handles paths like X:\.
2004-04-02 Derek Price <[email protected]>
* NEWS: Note Windows ISDIRSEP fix.
2004-04-02 Derek Price <[email protected]>
* INSTALL: Instruct users to use the Workspace file and not the project
file for MSVC++.
(Patch from Conrad T. Pino <[email protected]>.)
2004-04-02 Derek Price <[email protected]>
* NEWS: Make some notes as to client/serverness of changes.
2004-04-02 Derek Price <[email protected]>
* NEWS: Note relative path fix.
2004-04-01 Derek Price <[email protected]>
* NEWS: Record run race removal.
2004-03-31 Mark D. Baushke <[email protected]>
* cvs.spec.in (BuildRequires): Do not fail if info DIR file does
not exist. (Not everyone has an install-info that generates the
dir file that we want deleted.)
(Report from Geoff Beier <[email protected]>.)
2004-03-25 Derek Price <[email protected]>
* NEWS: Note failure of Cygwin to convert back slashes to slashes.
2004-03-25 Derek Price <[email protected]>
* cvs.spec.in (BuildRoot): Use a more unique directory name.
2004-03-22 Derek Price <[email protected]>
* INSTALL: Note compilation & --without-gssapi requirement for HPPA
with HP-UX 11.11.
(Report from Nicolas Vervelle <[email protected]>.)
2004-03-20 Derek Price <[email protected]>
* NEWS: Note resurrection fixes.
2004-03-18 Derek Price <[email protected]>
* NEWS: Back out previous NEWS change at Larry Jones' suggestion.
2004-03-17 Derek Price <[email protected]>
* configure.in (--enable-password-authentication-client): Correct
error message text.
* NEWS: Note this change.
* configure: Regenerated.
2004-03-15 Derek Price <[email protected]>
* NEWS: Note cvs release + Kerberos fix.
2004-03-15 Derek Price <[email protected]>
* configure.in: Correct grammar in help text.
* configure: Regenerated.
2004-03-15 Derek Price <[email protected]>
* macintosh/.cvsignore: Complete pruning of directory started in 1999.
2004-03-14 Derek Price <[email protected]>
* NEWS: Note resurrection fix.
2004-03-14 Derek Price <[email protected]>
* NEWS: Note error & status message corrections.
2004-03-14 Derek Price <[email protected]>
* NEWS: Note diff of added files against arbitrary revisions fix.
2004-03-12 Derek Price <[email protected]>
* NEWS: Note Larry's recent documentation fixes.
2004-03-03 Derek Price <[email protected]>
* NEWS: Note that directories and files named `CVS' are now also
rejected by import.
2004-02-25 Derek Price <[email protected]>
* NEWS: Update dying gasp note.
2004-02-25 Derek Price <[email protected]>
* NEWS: Note `cvs release' Entries corruption fix.
2004-02-20 Derek Price <[email protected]>
* NEWS: Note that the dying gasp check has now been completely removed.
2004-02-17 Derek Price <[email protected]>
* NEWS: Note spec file fix.
* cvs.spec: Update to avoid the error checking algorithm's of more
recent version of RPM.
2004-02-17 Derek Price <[email protected]>
* NEWS: Note recent commenting of src/checkout.c and Mark's leak fixes.
2004-02-12 Derek Price <[email protected]>
* NEWS: Note Mark D. Baushke's recent memory leak plugs.
2004-02-12 Derek Price <[email protected]>
* NEWS: Note Ville Skyttä's other recent man page patch.
2004-02-12 Derek Price <[email protected]>
* NEWS: Note Ville Skyttä's recent man page patch.
2004-02-11 Derek Price <[email protected]>
* NEWS: Note :fork: segfault avoidance.
2004-02-11 Derek Price <[email protected]>
* NEWS: Note readability improvements.
2004-02-10 Derek Price <[email protected]>
* NEWS: Note dying gasp check.
2004-02-10 Derek Price <[email protected]>
* NEWS: Note flow control pipe race fix.
2004-02-10 Derek Price <[email protected]>
* BUGS: Note problems building with MSVC++ under Windows and
workaround.
* INSTALL: Ditto.
2004-02-10 Derek Price <[email protected]>
* cvsnt.mak: Add stack.c and stack.h in order to compile under Windows.
* NEWS: Note Windows fixes.
* README: Update copyright notice.
2004-02-09 Derek Price <[email protected]>
* NEWS: Note new tests in sanity.sh.
2004-02-06 Derek Price <[email protected]>
* README: Undo accidental overwrite.
2004-02-04 Derek Price <[email protected]>
* NEWS: Note that alias module recursion is now more comprehensive.
2004-02-03 Derek Price <[email protected]>
* NEWS: Note case insensitive client directory case preservation.
2004-02-02 Derek Price <[email protected]>
* NEWS: Note new join-rm tests.
2004-02-02 Derek Price <[email protected]>
* NEWS: Note removal from the server of support for case insensitive
clients.
2004-01-30 Derek Price <[email protected]>
* NEWS: Note man page fix.
2004-01-30 Derek Price <[email protected]>
* NEWS: Note contrib/log_accum tidy.
2004-01-25 Derek Price <[email protected]>
* NEWS: Note Kerberos 4 fix.
2004-01-22 Derek Price <[email protected]>
* NEWS: Note recent infinite alias loop fix.
2004-01-22 Derek Price <[email protected]>
* INSTALL: Remove a note about an Automake bug that has been fixed for
quite awhile.
2004-01-22 Derek Price <[email protected]>
* INSTALL: s/Automake 1.7.5/Automake 1.7.9/.
2004-01-14 Derek Price <[email protected]>
* NEWS: Note Larrys recent mktemp.sh inclusion, documentation reorg,
and zlib code fix.
2003-12-23 Larry Jones <[email protected]>
* Makefile.am: Add mktemp.sh to EXTRA_DIST.
* Makefile.in: Regenerated.
* configure.in: Get mktemp.sh from $srcdir.
* configure: Regenerated.
(Reported by Matt Selsky <[email protected]>.)
2003-12-18 Derek Price <[email protected]>
* NEWS: Add since 1.11.11 section.
* configure.in: Update for dev 1.11.11.1.
* configure: Regenerated.
2003-12-18 Derek Price <[email protected]>
* configure.in: Update for release 1.11.11.
* configure: Regenerated.
2003-12-18 Derek Price <[email protected]>
* NEWS: Note syslog of root attempts.
2003-12-18 Derek Price <[email protected]>
* NEWS: Note that pserver can no longer run as root.
2003-12-07 Mark D. Baushke <[email protected]>
* configure.in (AC_SYS_LARGEFILE): Remove. More work is needed
before AC_SYS_LARGEFILE will work on all platforms.
* configure, config.h.in: Regenerated.
* NEWS: Remove last note.
* configure.in (AC_SYS_LARGEFILE): Add. The history file on
Solaris boxes can grow beyond 2GB.
* configure, config.h.in: Regenerated.
* NEWS: Note addition of --disable-largefiles option.
2003-12-05 Derek Price <[email protected]>
* configure.in: Update to require Automake 1.7.9.
2003-12-04 Derek Price <[email protected]>
* configure.in: Update for dev version 1.11.10.1.
* NEWS: Add Changes since 1.11.10 section.
* configure: Regenerated.
2003-12-04 Derek Price <[email protected]>
* configure.in: Update for release 1.11.10.
* configure: Regenerated.
2003-12-03 Derek Price <[email protected]>
* configure.in: Always AC_LIBOBJ(fncase) when filenames are found to be
case insensitive.
* configure: Regenerated.
2003-11-26 Derek Price <[email protected]>
* NEWS: Note recase tests.
2003-11-26 Derek Price <[email protected]>
* NEWS: Note new test suite functionality.
2003-11-25 Derek Price <[email protected]>
* NEWS: Note latest case insensitivity fix.
2003-11-19 Derek Price <[email protected]>
* NEWS: Rename "OTHER ISSUES" to "GENERAL USER ISSUES" and move the
note about the Autoconf upgrade to a new "DEVELOPER ISSUES" section.
Add a note about upgrading Automake.
* aclocal.m4, configure, **/Makefile.in: Regenerated with Automake
1.7.9.
2003-11-18 Derek Price <[email protected]>
* NEWS: Subdivide Changes section into "SERVER SECURITY ISSUES" and
"OTHER ISSUES". Note module abspath issue in security section.
2003-11-10 Derek Price <[email protected]>
* BUGS: Add some detail to the last two notes Mark added.
2003-11-10 Mark D. Baushke <[email protected]>
* BUGS: Note that symlinks to files will not work with or without
LockDir. Note that symlinks to directories will not work with
LockDir.
* NEWS (Changes since 1.11.9): Note symlinked CVSROOT now works.
2003-11-10 Derek Price <[email protected]>
* configure.in: Require Autoconf 2.58.
* INSTALL, NEWS: Note new Autoconf requirements.
* configure: Regenerated.
2003-11-04 Derek Price <[email protected]>
* configure.in: Add some more help text for --enable-case-sensitivity.
* configure: Regenerated.
2003-11-03 Derek Price <[email protected]>
* configure.in: Require Automake 1.7.5.
2003-11-03 Derek Price <[email protected]>
* INSTALL: Add some notes on Autoconf requirements.
2003-10-31 Derek Price <[email protected]>
* INSTALL: Note Cygwin as an option for building CVS under Windows.
2003-10-31 Derek Price <[email protected]>
* INSTALL: s/cvsgui/wincvs/.
2003-10-27 Derek Price <[email protected]>
* configure.in: Move case sensitivity test to the enable-* section and
allow override via command line switch.
* NEWS: Update last news item to reflect new command line switch.
* configure, config.h.in: Regenerated.
2003-10-27 Derek Price <[email protected]>
* configure.in: Add new test for a case insensitive file system.
* configure, config.h.in: Regenerated.
* NEWS: Note the above change.
2003-10-24 Derek Price <[email protected]>
* NEWS: Update recent text about joins to reflect new behavior.
2003-10-24 Derek Price <[email protected]>
* BUGS: Note that release of a project subdir does not remove the entry
from `./CVS/Entries'.
2003-10-24 Derek Price <[email protected]>
* BUGS: Remove obsolete bug report.
(Patch from Paul Edwards <somewhere in Australia>.)
2003-10-24 Derek Price <[email protected]>
* BUGS: Remove obsolete bug report.
(Patch from Paul Edwards <somewhere in Australia>.)
2003-10-23 Mark D. Baushke <[email protected]>
* NEWS: Note behavior change for cvs update -jrev1 -jrev2.
2003-10-21 Derek Price <[email protected]>
* NEWS: Note Mark's recent admin -m fix.
2003-10-21 Derek Price <[email protected]>
* NEWS: Note the @email{} and @url{} fixes as misc documentation fixes.
2003-10-14 Derek Price <[email protected]>
* NEWS: Note POSIX 1003.1-2001 compatibility of docs and scripts.
2003-10-14 Derek Price <[email protected]>
Port to pedantic POSIX 1003.1-2001 hosts, such as Debian GNU/Linux
testing with _POSIX2_VERSION=200112 in the environment.
* BUGS: Suggest 'diff -C2', not 'diff -c2'.
* FAQ: Suggest 'sort -k 1.2', not 'sort +0.1'.
* depcomp: Sync to the depcomp shipped with Automake 1.7.8, as
it has the bug fixed and that's better than maintaining our
own depcomp.
(Patch from Paul Eggert <[email protected]>.)
2003-10-14 Derek Price <[email protected]>
* INSTALL: Add HPPA 2.0 running HP-UX 10.20 for CVS 1.11.9.
(Report from Tom Kuiper <[email protected]>.)
2003-10-10 Derek Price <[email protected]>
* NEWS (Changes since 1.11.9): New section.
* configure.in: Update package version to 1.11.9.1.
* configure: Regenerated.
2003-10-10 Derek Price <[email protected]>
* configure.in: Update package version to 1.11.9.
* configure: Regenerated.
2003-10-08 Derek Price <[email protected]>
* NEWS: Note history reporting fix.
2003-10-08 Derek Price <[email protected]>
* NEWS: Improve syntax and punctuation of my last entry.
2003-10-08 Derek Price <[email protected]>
* NEWS: Note history fix for clients requesting `P' records.
2003-10-07 Derek Price <[email protected]>
* NEWS: Note case insensitive file lookup fix.
2003-10-03 Derek Price <[email protected]>
* NEWS: Note server ignoring `-l' with a warning.
2003-10-02 Derek Price <[email protected]>
* NEWS (Changes since 1.11.8): Add empty section.
* configure.in: Update package version to 1.11.8.1.
* configure: Regenerated.
2003-10-02 Derek Price <[email protected]>
* configure.in: Update package version to 1.11.8.
* configure: Regenerated.
2003-10-02 Derek Price <[email protected]>
* NEWS: Note getpass fix.
2003-09-29 Derek Price <[email protected]>
* NEWS (Changes since 1.11.7): Insert empty entry.
* configure.in: Update to 1.11.7.1.
* configure: Regenerated.
2003-09-29 Derek Price <[email protected]>
* configure.in: Update package version to 1.11.7.
* configure: Regenerated.
2003-09-29 Derek Price <[email protected]>
* NEWS: Note recent fix of the potential segfault during a diff.
2003-09-26 Derek Price <[email protected]>
* BUGS: Note bug in options passed to diff via `cvs diff'.
2003-09-12 Derek Price <[email protected]>
* NEWS: Note checkoutlist error message handling fix.
2003-08-27 Larry Jones <[email protected]>
* NEWS: Note client/server messages have real command name, client/
server updates get logged in history file, history file has "P"
record type.
2003-07-29 Derek Price <[email protected]>
* configure.in: Replace my recent misuse of AH_VERBATIM with a call to
AC_DEFINE.
* config.h.in, configure: Regenerated.
2003-07-29 Derek Price <[email protected]>
* configure.in: Do not check for getpassphrase. Define `getpass' to
`cvs_getpass' in config.h to avoid conflicts with system decls.
* NEWS: Note use of GNULIB getpass.
* config.h.in, configure: Regenerated.
2003-07-25 Derek Price <[email protected]>
* INSTALL: Note --without-gssapi required to configure on OS X.
2003-07-18 Derek Price <[email protected]>
* BUGS: Remove mention of wrappers -t/-f since they are no longer
supported.
2003-07-18 Derek Price <[email protected]>
* Makefile.am (EXTRA_DIST): Add cvs.spec so that RPMs can be built
directly from tarballs.
* Makefile.in: Regenerated.
2003-07-18 Derek Price <[email protected]>
* TODO (72): Remove mention of the -i/-o in the modules file since they
have been removed.
2003-06-27 Larry Jones <[email protected]>
* NEWS: Note LockDir fix.
2003-06-23 Derek Price <[email protected]>
* configure.in: Debian Woody has -lkrb4, so check for that.
(Patch from Alexey Mahotkin <[email protected]>.)
* config.h.in: Regenerated.
* configure: Ditto.
2003-06-20 Derek Price <[email protected]>
* INSTALL: Add some OS X platforms to the compile list. Correct link to
cvsgui.org -> wincvs.org.
2003-06-09 Derek Price <[email protected]>
* cvsnt.mak: Rename win32.c to woe32.c in accordance with the GNU
convention to avoid implying that we consider the Microsoft Windows
Operating Environment any sort of "win".
2003-06-09 Derek Price <[email protected]>
* NEWS: Note short patch fix.
2003-06-09 Derek Price <[email protected]>
* TODO (45): Combine this with...
(30): ...this item (as #30). Remove reference to diff since the
modules file is only consulted for the r* commands.
2003-06-02 Derek Price <[email protected]>
* NEWS: Note empty diff change text fix.
2003-05-29 Derek Price <[email protected]>
* NEWS: Note removal of global -l option.
2003-05-27 Derek Price <[email protected]>
* AUTHORS: Give Mark an email address.
2003-05-27 Derek Price <[email protected]>
* cvs.spec.in: Add some files to doc. Remove redundant %defattr.
2003-05-27 Derek Price <[email protected]>
* NEWS (Changes since 1.11.5): Add missing entry.
2003-05-27 Derek Price <[email protected]>
* README (Credits): Move...
* AUTHORS: ...here and update.
2003-05-26 Derek Price <[email protected]>
* configure.in: Update CVS version to 1.11.6.1.
* configure: Regenerated.
2003-05-25 Derek Price <[email protected]>
* configure.in: Update CVS version to 1.11.6.
* configure: Regenerated.
2003-05-25 Derek Price <[email protected]>
* BUGS: Note current intermittant BSDI failures.
2003-05-22 Larry Jones <[email protected]>
* NEWS: Note recent administrative file changes.
2003-05-21 Derek Price <[email protected]>
* INSTALL: Mention new Automake version.
* NEWS: Ditto.
* Makefile.in: Regenerated.
* aclocal.m4: Ditto.
* config.h.in: Ditto.
* configure: Ditto.
2003-05-20 Derek Price <[email protected]>
* INSTALL: Using Autoconf version 2.57.
* NEWS: Ditto. Reorder NEWS items to put the stuff which it is likely
that only developers care about last.
* configure: Regenerated with Autoconf 2.57.
2003-05-09 Derek Price <[email protected]>
* configure.in: Back out all the S_ISSOCK changes I just made and move
the equivalent to lib/system.h.
* configure.in: Regenerated.
* config.h.in: Ditto.
2003-05-09 Derek Price <[email protected]>
* configure.in: Try again, with AC_TRY_LINK this time.
* configure: Regenerated.
2003-05-09 Derek Price <[email protected]>
* configure.in: Correct a typo in my last patch.
* configure: Regenerated.
2003-05-09 Derek Price <[email protected]>
* configure.in: Add some checks for S_ISSOCK to avoid a problem on
SCO OpenServer 5.0.6a.
(Reported by Boyd Lynn Gerber <[email protected]>.)
* config.h.in: Regenerated.
* configure: Ditto.
2003-05-01 Derek Price <[email protected]>
* TODO (149): Remove reference to defunct RELATIVE_REPOS macro.
2003-04-30 Derek Price <[email protected]>
* acinclude.m4 (ACX_WITH_GSSAPI): Fix typo in broken conditional.
(Thanks to Alexey Mahotkin <[email protected]>.)
* configure: Regenerated.
* aclocal.m4: Ditto.
2003-04-28 Derek Price <[email protected]>
* NEWS (Changes since 1.11.5): Note removal of Checkin.prog and
Update.prog functionality.
2003-04-10 Larry Jones <[email protected]>
* aclocal.m4 (AM_MAINTAINER_MODE): New macro to support
--enable-maintainer-mode.
* configure.in: Use it.
* configure: Regenerated.
* Makefile.in: Regenerated.
* noautomake.sh: Removed; no longer needed.
* INSTALL: Remove reference to noautomake.sh, add reference to
--enable-maintainer-mode.
* Makefile.am: Remove noautomake.sh.
* NEWS: Add note about --enable-maintainer-mode and noautomake.sh.
* README: Remove noautomake.sh.
2003-04-01 Derek Price <[email protected]>
* BUGS: Remove a pcl-cvs bug. pcl-cvs is no longer part of the CVS
source distribution.
2003-04-01 Derek Price <[email protected]>
* BUGS: Remove reference to cvs admin SEGV bug Larry Jones fixed
on 2003-02-19.
2003-04-01 Derek Price <[email protected]>
* BUGS: Remove obsolete bug.
* configure.in: Tail the BUGS file for status.
* configure: Regenerated.
2003-03-28 Derek Price <[email protected]>
* configure.in (--with-editor): Quit with an error message when no
editor is found. Allow --with-editor to override $EDITOR from the
user's environment. Add vim to the list of defaults.
* configure: Regenerated.
2003-03-26 Derek Price <[email protected]>
* configure.in (--with-editor): Quit with an error message when
--without-editor is specified.
(Report from Jim Salter <[email protected]>.)
* configure: Regenerated.
2003-03-24 Derek Price <[email protected]>
* configure.in: Add copyright notice.
* Makefile.am: Update copyright notice.
* Makefile.in: Regenerated.
* configure: Ditto.
2003-03-07 Derek Price <[email protected]>
* TESTS: Document some more global variables.
2003-03-05 Mark D Baushke <[email protected]>
* NEWS (Changes since 1.11.5): Backout CVS_LOCAL_BRANCH_NUM feature.
* NEWS (Changes since 1.11.5): Mention CVS_LOCAL_BRANCH_NUM
environment varaible.
2003-02-25 Derek Price <[email protected]>
* configure.in (WITH_KRB4): Import KRB4 patch from Redhat 8.0's CVS
1.11.2-5 SRPM. It's not the right fix, but it will work until I get
around to merging some of the code with WITH_GSSAPI and seperating the
bits into separate M4 files.
* configure: Regenerated.
* config.h.in: Ditto.
2003-02-28 Derek Price <[email protected]>
* acinclude.m4 (ACX_WITH_GSSAPI): Move the checkin from 1/23 to
aclocal.m4 to the source, here.
* aclocal.m4: Regenerated.
* configure: Regenerated.
2003-02-28 Larry Jones <[email protected]>
* TODO (206): Done in 1.11.3.
(226): Add comment about deadlock.
(228, 229): New items.
2003-02-26 Derek Price <[email protected]>
* mktemp.sh: Actually add file this time.
* mktemp.sh: Add copyright notice, some comments, and attempt to return
success and error codes.
2003-02-25 Derek Price <[email protected]>
* configure.in: Add checks for mktemp and sendmail.
* mktemp.sh: New file.
* Makefile.in: Regenerated.
* configure: Ditto.
2003-02-06 Derek Price <[email protected]>
* NEWS (Changes since 1.11.5): Note error message corrections.
2003-01-30 Larry Jones <[email protected]>
* FAQ: Update URL for tkCVS info.
* NEWS (Changes from 1.11.2 to 1.11.3): Add note about fixing watch
in server mode.
2003-01-28 Derek Price <[email protected]>
* INSTALL: Remove a reference to options.h.
(Thanks to Jenn Vesperman <[email protected]> for the report.)
2003-01-28 Larry Jones <[email protected]>
* NEWS: Update for 1.11.5, add notes about bug fixes in older
versions.
2003-01-23 Derek Price <[email protected]>
* aclocal.m4 (WITH_GSSAPI): Check for libcrypt before libroken to
satisfy a FreeBSD 4.6 dependency.
(Thanks to Jan Ruzicka <[email protected]> for the bug
report and a partial fix.)
* configure: regenerated.
2003-01-20 Derek Price <[email protected]>
* NEWS: Update the news for the last release to mention that client
builds are not affected by the security vulnerability.
2003-01-20 Derek Price <[email protected]>
* configure.in: Update to dev version 1.11.5.1.
* configure: Regenerated.
2003-01-16 Derek Price <[email protected]>
* NEWS: Add 1.11.4 entry in regards to
@@ -8,6 +910,13 @@
* configure: Regenerated.
2002-01-16 Derek Price <[email protected]>
* configure.in (--with-editor): Look for nano, the GNU GPL pico clone.
(Reported by Robin Cook <[email protected]>.)
* configure: Regenerated.
2002-01-16 Derek Price <[email protected]>
* configure.in: Update to dev version (1.11.4.1).
+4 -2
View File
@@ -1897,7 +1897,9 @@ You can branch a branch.
Note that according to the official GIC page at
http://www.cpsc.ucalgary.ca/redirect/grouplab/projects/gic/
GIC is no longer being maintained and tkCVS is recommended
instead. For more on tkCVS, see http://www.cyclic.com/tkcvs/
instead.
For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html.
[email protected]
@@ -4330,7 +4332,7 @@ [email protected]
You should be able to run:
sort +0.1 ${dir1}/history ${dir2}/history > history
sort -k 1.2 ${dir1}/history ${dir2}/history > history
If you "diff" a standard history file before and after such a sort,
you might see other differences caused by garbage (split lines, nulls,
+4 -24
View File
@@ -7,39 +7,19 @@ not under any circumstances commit new versions onto the mainline, new
versions or official-patch versions must be imported.
To prepare a new cvs dist for import, extract it into a fresh directory;
then delete the files and directories listed in FREEBSD-Xlist.
The following generated files were deleted:
doc/*.ps
doc/*.info*
doc/texinfo.tex
lib/getdate.c
cvsnt.*
cvs.spec*
build.com
*/*.com
*/*.dsp
*/.cvsignore
.cvsignore
README.VMS
The following non-freebsd-specific directories were deleted:
os2
emx
windows-NT
vms
zlib
It is imported from it's top level directory something like this:
CVS is imported from its top level directory something like this:
cvs -n import src/contrib/cvs CVSHOME v<version>
The -n option is "dont do anything" so you can see what is about to happen
The -n option is "don't do anything" so you can see what is about to happen
first. Remove it when it looks ok.
The initial import was done with:
cvs import src/contrib/cvs CVSHOME v1_8_1
When new versions are imported, cvs will give instructions on how to merge
the local and vendor changes when/if conflicts arise..
the local and vendor changes when/if conflicts arise.
The developers can be reached at: <[email protected]>. Local changes
that are suitable for public consumption should be submitted for inclusion
+19
View File
@@ -104,6 +104,25 @@ Filenames for .c and .h files may contain _ but should not contain -
(the latter causes Visual C++ 2.1 to create makefiles which Visual C++
4.0 cannot use).
* Regenerating Build Files
On UNIX, if you wish to change the Build files, you will need Autoconf and
Automake.
Some combinations of Automake and Autoconf versions may break the
CVS build if file timestamps aren't set correctly and people don't
have the same versions the developers do, so the rules to run them
automatically aren't included in the generated Makefiles unless you run
configure with the --enable-maintainer-mode option.
The CVS Makefiles and configure script were built using Automake 1.7.9 and
Autoconf 2.58, respectively.
There is a known bug in Autoconf 2.57 that will prevent the configure
scripts it generates from working on some platforms. Other combinations of
autotool versions may or may not work. If you get other versions to work,
please send a report to <[email protected]>.
* Writing patches (strategy)
Only some kinds of changes are suitable for inclusion in the
+31 -36
View File
@@ -123,6 +123,8 @@ HPPA:
HPPA running HP-UX 9.05 (1.9)
HPPA running HP-UX 10.01 (1.7)
HPPA running HP-UX 10.20 (1.10.7)
HPPA running HP-UX 11.11 (1.11.13) (footnote 12)
HPPA 2.0 running HP-UX 10.20 (1.10.9) (footnote 13)
NextSTEP 3.3 (1.7)
i386 family:
Solaris 2.4 using gcc (about 1.4A2)
@@ -181,6 +183,9 @@ PowerPC or RS/6000:
Lynx 2.3.1 120495 (1.6.86) (footnote 9)
Lynx 2.5 (1.9) (footnote 10)
MkLinux DR3 GENERIC #6 (1.10.5.1) (presumably LinuxPPC too)
Mac OS X Darwin 6.6 Darwin Kernel Version 6.6 (1.11.1p1)
Mac OS X Darwin 5.5 Darwin Kernel Version 5.5 (1.11.6) (footnote 12)
Mac OS X Darwin 5.5 Darwin Kernel Version 5.5 (1.12.1) (footnote 12)
SPARC:
Sun SPARC running SunOS 4.1.x (1.10)
Sun SPARCstation 10 running Solaris 2.3 using gcc and cc (about 1.4A2)
@@ -238,23 +243,21 @@ VAX:
ci: RCS/loginfo,v: Invalid argument
cvs [init aborted]: failed to checkin n:/safe/CVSROOT/loginfo
(footnote 12)
Need to `configure --without-gssapi' unless you have installed Kerberos 5
libraries on the system yourself. For some reason Apple ships OS X with
the Kerberos 5 headers installed and not the libraries, which confuses the
current configure script. Some HP, BSD, & Sun boxes have similar problems.
(footnote 13)
A build under HP PA-RISC 2.0 will probably not run under PA-RISC 1.1
unless "+DAportable" is added to the HP ANSI cc compiler flags.
-------------------------------------------------------------------------------
Building from source code under Unix:
1) Some combinations of Automake and Autoconf versions may break the CVS build
if file timestamps aren't set correctly, so you may wish to run
noautomake.sh to set the timestamps and avoid attempting to run the
autotools on your system, especially if you are building from source
checked out from CVS:
$ ./noautomake.sh --noautoconf
The CVS Makefiles and configure script were built using Automake 1.6.3 and
Autoconf 2.53, respectively. Other combinations of autotool versions may
or may not work.
2) Run "configure":
1) Run "configure":
$ ./configure
@@ -368,10 +371,7 @@ Building from source code under Unix:
END OF NOTE FOR NDBM GUNK.
3) Edit src/options.h. The defaults should be reasonable, and in fact
if you are lazy you can safely skip this step.
4) Try to build it:
2) Try to build it:
$ make
@@ -382,7 +382,7 @@ Building from source code under Unix:
compiler information, make output, and anything else you think
will be helpful.
4a) Run the regression tests (optional).
3) Run the regression tests (optional).
You may also wish to validate the correctness of the new binary by
running the regression tests. If they succeed, that is nice to
@@ -394,7 +394,7 @@ Building from source code under Unix:
If you want to run the tests, see the file TESTS for more information.
5) Install the binaries/documentation:
4) Install the binaries/documentation:
$ make install
@@ -442,7 +442,11 @@ Building from source code under Windows NT/95/98/2000:
You may find interesting information in windows-NT/README.
1) Using Microsoft Visual C++ 5.x, open the project `cvsnt.dsp',
* Using Microsoft Visual C++ 5.x (this is currently broken - someone with
MVC++ 5.x needs to regenerate the project files, but the builds using `nmake'
below will work).
1) Using Microsoft Visual C++ 5.x, open the project `cvsnt.dsw',
in the top directory of the CVS distribution. If you have an older
version of Visual C++, take a look at windows-NT/README.
2) Choose "Build cvs.exe" from the "Project" menu.
@@ -455,7 +459,12 @@ following also works:
C:\> vcvars32
C:\> nmake /f cvsnt.mak CFG="cvsnt - Win32 Debug"
* You might also try http://cvsgui.org & http://www.cvsnt.org
* Using the Cygwin development environment <http://cygwin.com>, Windows clients
and servers can be built using the instructions for building on UNIX. For
deploying the CVS server on Windows NT, see the `cygrunsrv' executable that
comes with Cygwin.
* You might also try <http://wincvs.org> & <http://www.cvsnt.org>.
-------------------------------------------------------------------------------
@@ -467,24 +476,10 @@ For VMS, see README.VMS
Mac OS X: Builds fine, just like UNIX.
For older versions of Mac OS, you might try http://cvsgui.org .
For older versions of Mac OS, you might try <http://wincvs.org>.
For a Java client, see jCVS (which is a separate package from CVS
itself, but which might be preferable to the Macintosh port mentioned
above, for example).
**** ****
Builds are breaking on some systems (notably,
BSD/OS thor.sdrc.com 4.0.1 BSDI BSD/OS 4.0.1 Kernel #3: Thu Mar 9 11:29:16 EST 2000
) due to Automake's dependency tracking code. The work around for this is to
comile without it by passing the '--disable-dependency-tracking' option to
configure:
$ ./configure --disable-dependency-tracking
This will allow a compile but make will no longer be tracking header
dependencies. This means that if you make any changes to header files you may
have to run 'make clean' before running a 'make' to get everything to compile.
-------------------------------------------------------------------------------
+6 -3
View File
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
# Master Makefile for the GNU Concurrent Versions System.
# Copyright (C) 1986, 1988-1992, 1994, 2000 Free Software Foundation, Inc.
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -33,11 +35,12 @@ EXTRA_DIST = \
TESTS \
build.com \
cvs-format.el \
cvsnt.dep \
cvsnt.dsp \
cvsnt.dsw \
cvsnt.mak \
noautomake.sh
cvs.spec \
mktemp.sh
## MAINTAINER Targets
+179 -72
View File
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,9 @@
@SET_MAKE@
# Master Makefile for the GNU Concurrent Versions System.
# Copyright (C) 1986, 1988-1992, 1994, 2000 Free Software Foundation, Inc.
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,79 +28,117 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSH = @CSH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build_alias = @build_alias@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
# Unix source subdirs, where we'll want to run lint and etags:
# This is a legacy variable from b4 Automake
@@ -121,10 +161,12 @@ EXTRA_DIST = \
TESTS \
build.com \
cvs-format.el \
cvsnt.dep \
cvsnt.dsp \
cvsnt.dsw \
cvsnt.mak \
noautomake.sh
cvs.spec \
mktemp.sh
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -133,14 +175,16 @@ CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
DIST_SOURCES =
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
uninstall-info-recursive all-recursive install-data-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README AUTHORS COPYING COPYING.LIB ChangeLog INSTALL \
Makefile.am Makefile.in NEWS TODO acinclude.m4 aclocal.m4 \
compile config.h.in configure configure.in cvs.spec.in depcomp \
install-sh mdate-sh missing mkinstalldirs
RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
ps-recursive install-info-recursive uninstall-info-recursive \
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
COPYING COPYING.LIB ChangeLog INSTALL Makefile.am NEWS TODO \
acinclude.m4 aclocal.m4 compile config.h.in configure \
configure.in cvs.spec.in depcomp install-sh mdate-sh missing \
mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -149,18 +193,18 @@ all: config.h
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): configure.in acinclude.m4
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -173,7 +217,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/config.h.in
@@ -243,10 +287,17 @@ tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ETAGS = etags
ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -262,9 +313,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
if (etags --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
else \
include_option=--include; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
test -f $$subdir/TAGS && \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -277,13 +334,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
@@ -295,13 +367,20 @@ am__remove_distdir = \
&& rm -fr $(distdir); }; }
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/zlib
@list='$(DISTFILES)'; for file in $$list; do \
$(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -359,12 +438,13 @@ distcheck: dist
$(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -372,23 +452,39 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
find $$dc_install_base -type f -print ; \
exit 1; } >&2 ) \
&& $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
(cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
if test '$(srcdir)' = . ; then \
@if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after distclean:" ; \
@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
@@ -408,7 +504,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -416,7 +512,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -427,6 +523,7 @@ clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
dvi: dvi-recursive
@@ -449,21 +546,31 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf autom4te.cache
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
clean-generic clean-recursive dist dist-all dist-bzip2 \
dist-gzip distcheck distclean distclean-generic distclean-hdr \
distclean-recursive distclean-tags distcleancheck distdir dvi \
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-recursive ctags ctags-recursive dist \
dist-all dist-bzip2 dist-gzip distcheck distclean \
distclean-generic distclean-hdr distclean-recursive \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am dvi-recursive info info-am info-recursive install \
install-am install-data install-data-am install-data-recursive \
install-exec install-exec-am install-exec-recursive \
@@ -472,9 +579,9 @@ uninstall-info: uninstall-info-recursive
installdirs installdirs-am installdirs-recursive \
maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-recursive tags tags-recursive uninstall \
uninstall-am uninstall-info-am uninstall-info-recursive \
uninstall-recursive
mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
ps-recursive tags tags-recursive uninstall uninstall-am \
uninstall-info-am uninstall-info-recursive uninstall-recursive
.PHONY: localcheck remotecheck
+402 -4
View File
@@ -1,17 +1,403 @@
Changes since 1.11.4:
Changes since 1.11.16:
**********************
* Fixed a security hole by which users with read only access could gain
write access. The Common Vulnerabilities and Exposures project (cve.mitre.org)
has assigned the name CAN-2003-0015 to this issue. See
SERVER SECURITY FIXES
* Thanks to Stefan Esser & Sebastian Krahmer, several potential security
problems have been fixed. The ones which were considered dangerous enough
to catalogue were assigned issue numbers CAN-2004-0416, CAN-2004-0417, &
CAN-2004-0418 by the Common Vulnerabilities and Exposures Project. Please
see <http://www.cve.mitre.org> for more information.
* A potential buffer overflow vulnerability in the server has been fixed.
This addresses the Common Vulnerabilities and Exposures Project's issue
#CAN-2004-0414. Please see <http://www.cve.mitre.org> for more information.
Changes from 1.11.15 to 1.11.16:
********************************
SERVER SECURITY FIXES
* A potential buffer overflow vulnerability in the server has been fixed.
Prior to this patch, a malicious client could potentially use carefully
crafted server requests to run arbitrary programs on the CVS server machine.
This addresses the Common Vulnerabilities and Exposures Project's issue
#CAN-2004-0396. Please see <http://www.cve.mitre.org> for more information.
BUG FIXES
* The Microsoft Visual C++ workspace and project files have been repaired and
regenerated with MSVC++ 6.0.
* The cvs.1 man page is now generated automatically from a section of the CVS
Manual.
* Thanks to a report from Mark Andrews at the Internet Systems Consortium, the
:ext: connection method no longer relies on a transparent transport that uses
an argument processor that can handle arbitrary ordering of options and other
arguments when using a username other than the caller's.
* Thanks to Ken Raeburn at MIT, directory deletion, whether via `cvs release'
or empty directory pruning, now works on network shares under Windows XP.
Changes from 1.11.14 to 1.11.15:
********************************
SERVER SECURITY ISSUES
* Piped checkouts of paths above $CVSROOT no longer work. Previously, clients
could have requested the contents of RCS archive files anywhere on a CVS
server. This addresses CVE issue CAN-2004-0405. Please see
<http://www.cve.mitre.org> for more information.
CLIENT SECURITY ISSUES
* Clients now check paths from the server to verify that they are within one of
the sandboxes the user requested be updated. Previously, a trojan server
could have written or overwritten files anywhere the user had access,
presenting a serious security risk. This addresses CVE issue CAN-2004-1080.
Please see <http://www.cve.mitre.org> for more information.
GENERAL USER ISSUES
* Method options (used by WinCVS & CVS 1.12.7+) in CVSROOTs are ignored.
* Configure no longer checks the $TMPDIR, $TMP, & $TEMP variables to set the
default temporary directory.
* CVS on Cygwin correctly handles X:\ style paths.
* Import now uses backslash rather than slash on Windows when checking for
"CVS" directories to ignore in import commands.
* Relative paths containing up-references (`..') should now work in
client/server mode (client fix).
* A race condition between the ordering of messages from CVS and messages from
called scripts in client/server mode has been removed (server fix).
* Resurrected files now get their modes and timestamps set correctly and a
longstanding bug involving resurrection of an uncommitted removal has been
fixed (server fix).
* Some resurrection (cvs add) status messages have changed slightly.
* `cvs release' now works with Kerberos or GSSAPI encryption enabled (server
fix).
* File resurrection from a previously existing revision no longer just reports
that it works (server fix).
* Misc error & status message corrections.
* Diffing of locally added files against arbitrary revisions in an RCS archive
is now allowed when a file of the same name exists or used to exist on some
branch (server fix).
* Misc documentation fixes.
Changes from 1.11.13 to 1.11.14:
********************************
GENERAL USER ISSUES
* Imports will now always ignore directories and files named `CVS' to avoid
violating assumptions made by other parts of CVS.
* A problem with `cvs release' of subdirs that could corrupt CVS/Entries files
has been fixed (client/server).
* The CVS server's protocol check for unused data from the client is no longer
called automatically at program exit in order to avoid potential recursive
calls to error when the first close is due to memory allocation or similar
problems that cause calls to error() to fail. The check is still made when
the server program exits normally.
* The spec file has been updated to work with more recent versions of RPM.
* Several memory leaks have been plugged (client/server).
DEVELOPER ISSUES
* Misc cosmetic, readability, and commenting fixes.
Changes from 1.11.12 to 1.11.13:
********************************
GENERAL USER ISSUES
* Several memory leaks have been plugged.
* Thanks to Ville Skyttä the man page has a few less spelling errors and is
slightly more accurate.
* An unlikely potential segfault when using the :fork: connection method has
been fixed.
* The CVS server has had the protocol check for unused data from the client
partially restored.
* A fix has been included that should avoid a very rare race condition that
could cause a CVS server to exit with a "broken pipe" message.
* A minor problem with the nmake build file that was preventing the source from
compiling under Windows has been fixed.
* Tests have been added to the test suite.
DEVELOPER ISSUES
* Misc cosmetic, readability, and commenting fixes.
Changes from 1.11.11 to 1.11.12:
********************************
GENERAL USER ISSUES
* Infinite alias loops in the modules file are now checked for and avoided.
* Clients on case insensitive systems now preserve the case of directories in
CVS/Entries, in addition to files, for use in communications with the CVS
server.
* Some previously untested behavior is now being tested.
* Server support for case insensitive clients has been removed in favor of the
server relying on the client to preserve the case of checked out files, as
per the CVS client/server protocol spec. This is not as drastic as it may
sound, as all of the current tests still pass without modification when run
from a case insensitive client to a case sensitive server. This change
disables little previous functionality, enables access to more of the
possible namespace to users on systems with case insensitive file systems,
fixes a few bugs, and in the end this should provide a major stability
improvement.
* Thanks to Ville Skyttä the man page is a bit more accurate.
* Thanks to Ville Skyttä some unused variables were removed from the log_accum
Perl script in contrib.
* Thanks to Alexey Mahotkin, a bug that prevented CVS from being compiled with
Kerberos 4 authentication enabled has been fixed.
* A minor bug that caused CVS to fail to report an inifinte alias loop in the
modules file when portions of the alias definition contained trailing slashes
has been fixed.
* A bug in the gzip code that could cause heap corruption and segfaults in CVS
servers talking to clients less than 1.8 and some modern third-party CVS
clients has been fixed.
* mktemp.sh is now included with the source distribution so that the rcs2log
and cvsbug executables may be run on systems which do not contain an
implementation of mktemp.
* Misc documentation fixes.
Changes from 1.11.10 to 1.11.11:
********************************
SERVER SECURITY ISSUES
* pserver can no longer be configured to run as root via the
$CVSROOT/CVSROOT/passwd file, so if your passwd file is compromised, it no
longer leads directly to a root hack. Attempts to root will also be logged
via the syslog.
Changes from 1.11.9 to 1.11.10:
*******************************
SERVER SECURITY ISSUES
* Malformed module requests could cause the CVS server to attempt to create
directories and possibly files at the root of the filesystem holding the CVS
repository. Filesystem permissions usually prevent the creation of these
misplaced directories, but nevertheless, the CVS server now rejects the
malformed requests.
GENERAL USER ISSUES
* Case insensitive clients using a case sensitive server can now use a
`cvs rm -f file; cvs add FILE' command sequence to add a file with the same
name in a new case.
* CVSROOTs which contain a symlink to a real repository should work.
* The configure script now tests whether it is building CVS on a case
insensitive file system. If it is, CVS assumes that all file systems on this
platform will be case insensitive. This is useful for getting the case
insensitivity flag set correctly when compiling on Mac OS X and under Cygwin
on Windows. Autodetection can be overridden using the
--disable-case-sensitivity and --enable-case-sensitivity arguments to
configure.
* A behavior change in `cvs up -jrev1 -jrev2' for modified files with a base
revision of rev2 (ie, checked-out version matches rev2 and file has been
modified). The operation is no longer ignored and instead is passed to
diff3. This will potentially re-apply the diffs between the two revisions to
a modified local file. Status messages like from a standard merge have also
been added when the file would not or does not change due to this merge
request ("[file] already contains the changes between [revisions]...").
* A bug which could stop `cvs admin -mTAG:message' from recursing has been
fixed.
* Misc documentation cleanup and fixes.
* Some of the contrib scripts, some of the documentation, and sanity.sh were
modified to use and recommend more portable commands rather than using and
recommending commands which were not compatible with the POSIX 1003.1-2001
specification.
DEVELOPER ISSUES
* A new set of tests to test issues specific to case insensitive clients and
servers has also been added.
* Support has been added to the test suite to support testing over a :ext: link
to another machine, subject to some stringent requirements. This support can
be used, for instance, to test the operation of a case insensitive client
against a case sensitive server. Please see the comments in TEST and the
src/sanity.sh test script itself for more.
* We've standardized on Automake 1.7.9 to get a bug fix. See the note below
on the Autoconf upgrade for more details.
* We've standardized on Autoconf version 2.58 to avoid a bug and get at a few
new macros. Again, this should only really affect developers, though it is
possible that CVS will now compile on a few new platforms. Please see the
section of the INSTALL file about using the autotools if you are compiling
CVS yourself.
Changes from 1.11.8 to 1.11.9:
* CVS now knows how to report, as well as record, `P' record types.
* When running the `cvs history' command, clients will now send the
long-accepted `-e' option, for all records, rather than explicitly requesting
`P' record types, a request which servers prior to 1.11.7 will reject with a
fatal error message.
* A problem with locating files requested by case insensitive clients which was
accidentally introduced in 1.11.6 as part of a fix for a data loss problem
involving `cvs add's from case insensitive clients has been fixed. The
relevant error message was `cvs [<command> aborted]: filE,v is ambiguous;
could mean FILE,v or file,v'.
* Attempts to use the global `-l' option, removed from both client and server
as of version 1.11.6, will now elicit a warning rather than a fatal error
from the server.
Changes from 1.11.7 to 1.11.8:
* A problem in the CVS getpass library that could cause passwords to echo on
some systems has been fixed.
Changes from 1.11.6 to 1.11.7:
* A segfault that could occur in very rare cases where the stat of a file
failed during a diff has been fixed.
* Any user with write privleges to the CVSROOT/checkoutlist file could pass
arbitrary format strings directly through to a printf function. This was
probably bad and has been fixed. White space at the beginning of error strings
in checkoutlist is now ignored properly.
* In client/server mode, most messages from CVS now contain the actual
command name rather than the generic "server".
* A long-standing bug that prevented most client/server updates from being
logged in the history file has been fixed.
* Updates done via a patch ("P" status) are now logged in the history file
by default and the corresponding "P" history record type is now documented.
If you're setting the LogHistory option in your CVSROOT/config file, you may
want to add "P" to the list of record types.
* CVS now will always compile and its own getpass() function (originally from
GNULIB) in favor of any system one that may exist. This avoids some problems
with long passwords on some systems and updates us to POSIX.2 compliance, since
getpass() was removed from the POSIX.2 specification.
* A bug that allowed a write lock to be created in a directory despite
there being existing read locks when using LockDir in CVSROOT/config has
been fixed.
* A bug with short patches (`rdiff -s') which caused rdiff to sometimes report
differences that did not exist has been fixed.
* Some minor corrections were made to the diff code to keep diff & rdiff from
printing diff headers with empty change texts when two files have different
revision numbers but the same content.
* The global '-l' option, which suppressed history logging, has been removed
from both client and server.
Changes from 1.11.5 to 1.11.6:
* A warning message is now issued if an administrative file contains
more than one DEFAULT entry.
* An error running a verifymsg script (such as referencing an unset user
variable or the script not existing) now causes the verification to
fail.
* Errors in administrative files commands (like unset user variables)
are no longer reported unless the command is actually executed.
* When a file is initially checked out, its last access time is now set
to the current time rather than being set to the time the file was last
checked in like the modification time is.
* The Checkin.prog and Update.prog functionality has been removed. This
fuctionality previously allowed executables to be specified in the modules file
to be run at update and checkin time, but users could edit these files on a per
workspace basis, creating a security hole.
* contrib/rcs2log and src/cvsbug now use the BSD mktemp program to create
their temp files and directories on systems which provide it.
* Corrected the path in a failed write error message.
* Autoconf and Automake are no longer run automatically unless you run
configure with --enable-maintainer-mode. Accordingly, noautomake.sh is
no longer needed and has been removed.
* We've standardized on Automake version 1.7.5 and Autoconf version 2.57 to get
at a few new macros. Again, this should only really affect developers. See
the section of the INSTALL file about using the autotools if you are compiling
CVS yourself.
Changes from 1.11.4 to 1.11.5:
* Fixed a security hole in the CVS server by which users with read only access
could gain write access. This issue does not affect client builds. The
Common Vulnerabilities and Exposures project (cve.mitre.org) has assigned the
name CAN-2003-0015 to this issue. See
<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0015> for more
information.
* Fixed some bugs where revision numbers starting with 0 (like 0.3)
weren't correctly handled. (CVS doesn't normally use such revision
numbers, but users may be able to force it to do so and old RCS files
might.)
Changes from 1.11.3 to 1.11.4:
* Some minor changes to allow the code to compile on Windows platforms.
Changes from 1.11.2 to 1.11.3:
* The tag/rtag code has been fixed to once again lock just a single
directory at a time.
* There was a bug where certain error conditions could cause the server
to go into an infinite loop. There was also a bug that caused a
compressed connection from an older client to hang on shutdown. These
bugs have been fixed.
* Fixed a bug that caused the server to reject most watch commands.
* When waiting for another user's lock, the message timestamps are now
in UTC rather than the server's local time.
@@ -24,6 +410,12 @@ sanity.sh to use Autotest and Autoshell. Again, this should only really affect
developers. See the section of the INSTALL file about using the autotools if
you are compiling CVS yourself.
* Fixed a bug in the log/rlog code when a revision range crosses a
branch point.
* Fixed a bug where filenames starting with - would be misinterpreted as
options when using client/server mode.
Changes from 1.11.1p1 to 1.11.2:
* There is a new feature, enabled by RereadLogAfterVerify in CVSROOT/config,
@@ -62,6 +454,12 @@ Changes from 1.11.1 to 1.11.1p1:
Changes from 1.11 to 1.11.1:
* There was a locking bug in the tag/rtag code that could lose changes
made to a file while the tag operation was in progress. This has been
fixed, but all of the directories being tagged are now locked for the
entire duration of the tag operation rather than only one directory at a
time.
* The "cvs diff" command now accepts the -y/--side=by-side and -T/
--initial-tab options. (To use these options with a remote repository,
both the client and the server must support them.)
+4 -85
View File
@@ -3,6 +3,9 @@
Copyright (c) 1993-1994 Brian Berliner
Copyright (c) 1992 Brian Berliner and Jeff Polk
Copyright (c) 1989-1992, Brian Berliner
Copyright (c) 1998-2004 Free Software Foundation,
Derek Price,
& Ximbiot <http://ximbiot.com>
All Rights Reserved
This program is free software; you can redistribute it and/or modify
@@ -75,7 +78,6 @@ Installation:
Please read the INSTALL file for installation instructions. Brief summary:
$ ./noautomake.sh --noautoconf
$ ./configure
$ make
(run the regression tests if desired)
@@ -112,87 +114,4 @@ then it will be possible to create one.
-------------------------------------------------------------------------------
Credits:
The conflict-resolution algorithms and much of the administrative file
definitions of CVS were based on the original package written by Dick Grune
at Vrije Universiteit in Amsterdam <[email protected]>, and posted to
comp.sources.unix in the volume 6 release sometime in 1986. This original
version was a collection of shell scripts. I am thankful that Dick made
his work available.
Brian Berliner from Prisma, Inc. (now at Sun Microsystems, Inc.)
<[email protected]> converted the original CVS shell scripts into reasonably
fast C and added many, many features to support software release control
functions. See the manual page in the "man" directory. A copy of the
USENIX article presented at the Winter 1990 USENIX Conference, Washington
D.C., is included in the "doc" directory.
Jeff Polk from BSDI <[email protected]> converted the CVS 1.2
sources into much more readable and maintainable C code. He also added a
whole lot of functionality and modularity to the code in the process.
See the bottom of the NEWS file (from about 1992).
david d `zoo' zuhn <[email protected]> contributed the working base code
for CVS 1.4 Alpha. His work carries on from work done by K. Richard Pixley
and others at Cygnus Support. The CVS 1.4 upgrade is due in large part to
Zoo's efforts.
David G. Grubbs <[email protected]> contributed the CVS "history" and "release"
commands. As well as the ever-so-useful "-n" option of CVS which tells CVS
to show what it would do, without actually doing it. He also contributed
support for the .cvsignore file.
The Free Software Foundation (GNU) contributed most of the portability
framework that CVS now uses. This can be found in the "configure" script,
the Makefile's, and basically most of the "lib" directory.
K. Richard Pixley, Cygnus Support <[email protected]> contributed many bug
fixes/enhancement as well as completing early reviews of the CVS 1.3 manual
pages.
Roland Pesch, then of Cygnus Support <[email protected]> contributed
brand new cvs(1) and cvs(5) manual pages. Thanks to him for saving us
from poor use of our language!
Paul Sander, HaL Computer Systems, Inc. <[email protected]> wrote and
contributed the code in lib/sighandle.c. I added support for POSIX, BSD,
and non-POSIX/non-BSD systems.
Jim Kingdon and others at Cygnus Support <[email protected]> wrote the
remote repository access code.
There have been many, many contributions not listed here. Consult the
ChangeLog files in each directory for a more complete idea.
In addition to the above contributors, the following Beta testers
deserve special mention for their support. This is only a partial
list; if you have helped in this way and would like to be listed, let
bug-cvs know (as described in the Cederqvist manual).
Mark D. Baushke <[email protected]>
Per Cederqvist <[email protected]>
J.T. Conklin <[email protected]>
Vince DeMarco <[email protected]>
Paul Eggert <[email protected]>
Lal George <[email protected]>
Dean E. Hardi <[email protected]>
Mike Heath <[email protected]>
Jim Kingdon <[email protected]>
Bernd Leibing <[email protected]>
Benedict Lofstedt <[email protected]>
Dave Love <[email protected]>
Robert Lupton the Good <[email protected]>
Tom McAliney <[email protected]>
Eberhard Mattes <[email protected]>
Jim Meyering <[email protected]>
Thomas Mohr <[email protected]>
Thomas Nilsson <[email protected]>
Raye Raskin <[email protected]>
Harlan Stenn <[email protected]>
Gunnar Tornblom <[email protected]>
Greg A. Woods <[email protected]>
Many contributors have added code to the "contrib" directory. See the
README file there for a list of what is available. There is also a
contributed GNU Emacs CVS-mode in tools/pcl-cvs.
Credits: See the AUTHORS file.
+9 -2
View File
@@ -206,6 +206,10 @@ miss, but here are a few important ones. I'm leaving off long explanations
after the first few since it probably gives you the idea and the data is in
sanity.sh.
Note that the boolean variables contain shell commands which return true or
false when executed and are intended to be used like,
"if $remote; then ... ; else ... ; fi"
* $testdir = the directory this test is taking place in
(CVSROOT=$testdir/cvsroot or CVSROOT=:fork:$testdir/cvsroot)
@@ -216,8 +220,11 @@ sanity.sh.
* $username = regexp to match a username
* $hostname = regexp to match a hostname
* $PROG = regexp to match progname in CVS error messages
* $remote = 'yes' or 'no', depending on whether the script is running with
a remote CVSROOT
* $remote = ':' (true) or 'false', depending on whether the script is
running with a remote CVSROOT
* $keep = ':' (true) or 'false'. When set, the first test run will
leave any files and directories it created in $testdir and
exit when complete.
And, of course, some characters like '.' in regexps need to be '\' escaped when
you mean them literally. Some characters may be interpreted by the shell,
+15 -36
View File
@@ -6,9 +6,10 @@ The "TODO" file! -*-Indented-Text-*-
(If done, this should be configurable via commitinfo or some new
config file -kingdon, Jun 1995).
30. Add "rdiff" program option to the modules database (and "diff"
too?). (perhaps should think a little harder about what this is
trying to accomplish and what the best way is -kingdon, Jul 1997).
30. Add "rdiff" & "rtag" program options to the modules database. These
commands seem hard to use since these commands deal directly with the
RCS ,v files. (perhaps should think a little harder about what this is
trying to accomplish and what the best way is -kingdon, Jul 1997).
31. Think hard about ^C recovery.
One particular issue: RCS removes the ,foo.c, file on ^C and CVS
@@ -26,10 +27,6 @@ trying to accomplish and what the best way is -kingdon, Jul 1997).
PRCS 1.0 was particularly bad the way it handled the "invisible
state", but 1.2 is significantly better.
45. Consider enhancing the "rdiff" and "tag" (rtag??) command support in
the module database -- they seem hard to use since these commands
deal directly with the RCS ,v files.
49. cvs xxx commands should be able to deal with files in other
directories. I want to do a cvs add foo/bar.c.
[[ most commands now use the generic recursion processor, but not all;
@@ -56,8 +53,8 @@ trying to accomplish and what the best way is -kingdon, Jul 1997).
66. Length of the CVS temporary files must be limited to 14 characters for
System-V stupid support. As well as the length on the CVS.adm files.
72. Consider re-design of the module -o, -i, -t options to use the file
system more intuitively.
72. Consider re-design of the module -t options to use the file system more
intuitively.
73. Consider an option (in .cvsrc?) to automatically add files that are new
and specified to commit.
@@ -261,10 +258,6 @@ trying to accomplish and what the best way is -kingdon, Jul 1997).
This behavior was not particularly popular and has been since
reverted.
Note also RELATIVE_REPOS in options.h; it needs to be set for
changing CVS/Root (not CVS/Repository) to be sufficient in the
case where the directory has changed.
This whole area is a rather bad pile of individual decisions which
accumulated over time, some of them probably bad decisions with
hindsight. But we didn't get into this mess overnight, and we're
@@ -787,10 +780,6 @@ send differences instead of entire files. In the degenerate case
(e.g. "cvs diff" without arguments) the required network traffic is
reduced to zero, and the client need not even contact the server.
196. Using a CVSROOT with a trailing slash will confuse CVS. I think
we need to add a call to strip_trailing_slashes in root.c
(parse_cvsroot), but I haven't considered all of the ramifications.
197. Analyze the difference between CVS_UNLINK & unlink_file. As far as I
can tell, unlink_file aborts in noexec mode and CVS_UNLINK does not. I'm not
sure it would be possible to remove even the use of temp files in noexec mode,
@@ -825,9 +814,6 @@ and other non-canonical paths confuse CVS. Most of the cases that do
work are handled on an ad-hoc basis. We need to come up with a coherent
strategy to address path canonicalization and apply it consistently.
206. Restore directory-at-a-time locking for tag operations instead of
locking the entire tree.
208. Merge enhancements to the diff package back into the original GNU source.
209. Go through this file and try to:
@@ -862,24 +848,12 @@ glibc version.
216. Avoid command-line keyword expansion modes overriding binary mode
(or make binary mode completely separate from keyword expansion mode).
217. Fix assertion failures that occur when CVSROOT is a symlink to the
actual repository location.
218. Fix "checkout -d ." in client/server mode.
219. Fix "checkout -d multi/level/dir" in client/server mode.
220. Send correct Max-dotdot in client/server mode (broken by change to
support multiple repositories).
221. Handle spaces in file/directory names. (Most, if not all, of the
internal infrastructure already handles them correctly, but most of the
administrative file interfaces do not.)
222. Fix assertion failure (*rcsnode == NULL in commit.c, line 2056)
when adding a file from a case-insensitive client that matches an Attic
file with case differences.
223. Internationalization support. This probably means using some kind
of universal character set (ISO 10646?) internally and converting on
input and output, which opens the locale can of worms.
@@ -899,13 +873,18 @@ local time string according to the localization settings before printing it.
225. Add support for --allow-root to server command.
226. Add support for upgrading read locks to write locks and use it to
avoid holding potentially long-term write locks (for example, in tag and
commit).
227. 'cvs release' should use the CVS/Root in the directory being released
when such is specified rather than $CVSROOT. In my work directory with no CVS
dir, a release of subdirectories causes the released projects to be tested
against my $CVSROOT environment variable, which often isn't correct but which
can complete without generating error messages if the project also exists in
the other CVSROOT. This happens a lot with my copies of the ccvs project.
228. Consider adding -d to commit ala ci.
229. Improve the locking code to use a random delay with exponential
backoff ala Ethernet and separate the notification interval from the
wait interval.
230. Support for options like compression as part of the CVSROOT might be
nice. This should be fairly easy to implement now using the method options.
+89 -1
View File
@@ -85,7 +85,7 @@ AC_MSG_RESULT([$acx_gssapi_cv_gssapi])
# Set up GSSAPI includes for later use. We don't bother to check for
# $acx_gssapi_cv_gssapi=no here since that will be caught later.
#
if test x$acx_gssapi_cv_gssapi = yes; then
if test x$acx_gssapi_cv_gssapi = xyes; then
# no special includes necessary
GSSAPI_INCLUDES=""
else
@@ -210,8 +210,14 @@ when using GSSAPI.])
#
AC_SEARCH_LIBS([__dn_expand], [resolv])
#
# crypt Needed by roken under FreeBSD 4.6.
#
AC_SEARCH_LIBS([crypt], [crypt])
#
# roken Heimdal K 0.3d -lresolv
# roken FreeBSD 4.6 -lcrypt
#
AC_SEARCH_LIBS([roken_gethostbyaddr], [roken])
@@ -261,3 +267,85 @@ when using GSSAPI.])
AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])
fi
])dnl
# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
AC_DEFUN([gl_SIZE_MAX],
[
AC_CHECK_HEADERS(stdint.h)
dnl First test whether the system already has SIZE_MAX.
AC_MSG_CHECKING([for SIZE_MAX])
result=
AC_EGREP_CPP([Found it], [
#include <limits.h>
#if HAVE_STDINT_H
#include <stdint.h>
#endif
#ifdef SIZE_MAX
Found it
#endif
], result=yes)
if test -z "$result"; then
dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
dnl than the type 'unsigned long'.
dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
_AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
[#include <stddef.h>], result=?)
_AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
[#include <stddef.h>], result=?)
_AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
[#include <stddef.h>], result=?)
if test "$fits_in_uint" = 1; then
dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
AC_TRY_COMPILE([#include <stddef.h>
extern size_t foo;
extern unsigned long foo;
], [], fits_in_uint=0)
fi
if test -z "$result"; then
if test "$fits_in_uint" = 1; then
result="$res_hi$res_lo"U
else
result="$res_hi$res_lo"UL
fi
else
dnl Shouldn't happen, but who knows...
result='~(size_t)0'
fi
fi
AC_MSG_RESULT([$result])
if test "$result" != yes; then
AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
[Define as the maximum value of type 'size_t', if the system doesn't define it.])
fi
])
# xsize.m4 serial 3
dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
AC_DEFUN([gl_XSIZE],
[
dnl Prerequisites of lib/xsize.h.
AC_REQUIRE([gl_SIZE_MAX])
AC_REQUIRE([AC_C_INLINE])
AC_CHECK_HEADERS(stdint.h)
])
+249 -97
View File
@@ -1,6 +1,6 @@
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -98,7 +98,7 @@ AC_MSG_RESULT([$acx_gssapi_cv_gssapi])
# Set up GSSAPI includes for later use. We don't bother to check for
# $acx_gssapi_cv_gssapi=no here since that will be caught later.
#
if test x$acx_gssapi_cv_gssapi = yes; then
if test x$acx_gssapi_cv_gssapi = xyes; then
# no special includes necessary
GSSAPI_INCLUDES=""
else
@@ -223,8 +223,14 @@ when using GSSAPI.])
#
AC_SEARCH_LIBS([__dn_expand], [resolv])
#
# crypt Needed by roken under FreeBSD 4.6.
#
AC_SEARCH_LIBS([crypt], [crypt])
#
# roken Heimdal K 0.3d -lresolv
# roken FreeBSD 4.6 -lcrypt
#
AC_SEARCH_LIBS([roken_gethostbyaddr], [roken])
@@ -275,12 +281,94 @@ when using GSSAPI.])
fi
])dnl
# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
AC_DEFUN([gl_SIZE_MAX],
[
AC_CHECK_HEADERS(stdint.h)
dnl First test whether the system already has SIZE_MAX.
AC_MSG_CHECKING([for SIZE_MAX])
result=
AC_EGREP_CPP([Found it], [
#include <limits.h>
#if HAVE_STDINT_H
#include <stdint.h>
#endif
#ifdef SIZE_MAX
Found it
#endif
], result=yes)
if test -z "$result"; then
dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
dnl than the type 'unsigned long'.
dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
_AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
[#include <stddef.h>], result=?)
_AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
[#include <stddef.h>], result=?)
_AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
[#include <stddef.h>], result=?)
if test "$fits_in_uint" = 1; then
dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
AC_TRY_COMPILE([#include <stddef.h>
extern size_t foo;
extern unsigned long foo;
], [], fits_in_uint=0)
fi
if test -z "$result"; then
if test "$fits_in_uint" = 1; then
result="$res_hi$res_lo"U
else
result="$res_hi$res_lo"UL
fi
else
dnl Shouldn't happen, but who knows...
result='~(size_t)0'
fi
fi
AC_MSG_RESULT([$result])
if test "$result" != yes; then
AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
[Define as the maximum value of type 'size_t', if the system doesn't define it.])
fi
])
# xsize.m4 serial 3
dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
AC_DEFUN([gl_XSIZE],
[
dnl Prerequisites of lib/xsize.h.
AC_REQUIRE([gl_SIZE_MAX])
AC_REQUIRE([AC_C_INLINE])
AC_CHECK_HEADERS(stdint.h)
])
# Do all the work for Automake. -*- Autoconf -*-
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -298,16 +386,9 @@ fi
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 8
# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.52])
AC_PREREQ([2.54])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.
@@ -333,6 +414,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
@@ -340,8 +431,8 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
@@ -362,19 +453,41 @@ AM_PROG_INSTALL_STRIP
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_][CC],
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CXX],
[define([AC_PROG_CC],
defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_][CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
])
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
$1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -395,14 +508,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.6.3])])
[AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*-
@@ -688,9 +801,42 @@ fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# serial 4 -*- Autoconf -*-
# -*- Autoconf -*-
# Copyright (C) 2003 Free Software Foundation, Inc.
# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 1
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
[rm -rf .tst 2>/dev/null
mkdir .tst 2>/dev/null
if test -d .tst; then
am__leading_dot=.
else
am__leading_dot=_
fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
# serial 5 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -751,18 +897,32 @@ AC_CACHE_CHECK([dependency style of $depcc],
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
# We will build objects and dependencies in a subdirectory because
# it helps to detect inapplicable dependency modes. For instance
# both Tru64's cc and ICC support -MD to output dependencies as a
# side effect of compilation, but ICC will put the dependencies in
# the current directory while Tru64 will put them in the object
# directory.
mkdir sub
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
# we should not choose a depcomp mode which is confused by this.
#
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
echo '#include "conftest.h"' > conftest.c
echo 'int i;' > conftest.h
echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
: > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -780,13 +940,20 @@ AC_CACHE_CHECK([dependency style of $depcc],
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 &&
source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_$1_dependencies_compiler_type=$depmode
break
# icc doesn't choke on unknown options, it will just issue warnings
# (even with -Werror). So we grep stderr for any message
# that says an option was ignored.
if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
fi
done
@@ -797,6 +964,9 @@ else
fi
])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
@@ -805,16 +975,8 @@ AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[rm -f .deps 2>/dev/null
mkdir .deps 2>/dev/null
if test -d .deps; then
DEPDIR=.deps
else
# MS-DOS does not allow filenames that begin with a dot.
DEPDIR=_deps
fi
rmdir .deps 2>/dev/null
AC_SUBST([DEPDIR])
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
@@ -916,7 +1078,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -941,8 +1105,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
doit:
am__doit:
@echo done
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
@@ -956,7 +1121,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
_am_result=GNU
@@ -970,9 +1135,9 @@ if test "$am__include" = "#"; then
_am_result=BSD
fi
fi
AC_SUBST(am__include)
AC_SUBST(am__quote)
AC_MSG_RESULT($_am_result)
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
@@ -1016,7 +1181,7 @@ else
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([conditional \"$1\" was never defined.
AC_MSG_ERROR([conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.])
fi])])
@@ -1043,60 +1208,47 @@ AC_PREREQ([2.52])
# serial 6
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. We must strip everything past the first ":",
# and everything past the last "/".
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# _AM_DIRNAME(PATH)
# -----------------
# Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME],
[m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
m4_if(regexp([$1], [^/.*]), -1,
[.],
patsubst([$1], [^\(/\).*], [\1])),
patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
])# _AM_DIRNAME
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
# The stamp files are numbered to have different names.
# We could number them on a directory basis, but that's additional
# complications, let's have a unique counter.
m4_define([_AM_STAMP_Count], [0])
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# _AM_STAMP(HEADER)
# -----------------
# The name of the stamp file for HEADER.
AC_DEFUN([_AM_STAMP],
[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
[:.*])))/stamp-h[]_AM_STAMP_Count])
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
# ------------------------------------------------------------
# We used to try to get a real timestamp in stamp-h. But the fear is that
# that will cause unnecessary cvs conflicts.
AC_DEFUN([_AM_CONFIG_HEADER],
[# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
AC_CONFIG_HEADERS([$1],
[# update the timestamp
echo 'timestamp for $1' >"_AM_STAMP([$1])"
$2],
[$3])
])# _AM_CONFIG_HEADER
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
USE_MAINTAINER_MODE=$enableval,
USE_MAINTAINER_MODE=no)
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST(MAINT)dnl
]
)
# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
])# AM_CONFIG_HEADER
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# serial 2
+28 -5
View File
@@ -41,10 +41,15 @@
/* Define to enable encryption support. */
#undef ENCRYPTION
/* Define if this executable will be running on case insensitive file systems.
In the client case, this means that it will request that the server pretend
to be case insensitive if it isn't already. */
#undef FILENAMES_CASE_INSENSITIVE
/* When committing or importing files, you must enter a log message. Normally,
you can do this either via the -m flag on the command line, the -F flag on
the command line, or an editor will be started for you. If you like to use
logging templates (the rcsinfo file within the /CVSROOT directory),
logging templates (the rcsinfo file within the $CVSROOT/CVSROOT directory),
you might want to force people to use the editor even if they specify a
message with -m or -F. Enabling FORCE_USE_EDITOR will cause the -m or -F
message to be appended to the temp file when the editor is started. */
@@ -83,7 +88,7 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if your system has a working `fnmatch' function. */
/* Define to 1 if your system has a working POSIX `fnmatch' function. */
#undef HAVE_FNMATCH
/* Define to 1 if you have the <fnmatch.h> header file. */
@@ -116,9 +121,6 @@
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define to 1 if you have the `getpassphrase' function. */
#undef HAVE_GETPASSPHRASE
/* Define if you have the getspnam function. */
#undef HAVE_GETSPNAM
@@ -155,6 +157,12 @@
/* Define to 1 if you have the `krb_get_err_text' function. */
#undef HAVE_KRB_GET_ERR_TEXT
/* Define to 1 if you have the `krb' library (-lkrb). */
#undef HAVE_LIBKRB
/* Define to 1 if you have the `krb4' library (-lkrb4). */
#undef HAVE_LIBKRB4
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
@@ -417,6 +425,10 @@
*/
#undef SERVER_SUPPORT
/* Define as the maximum value of type 'size_t', if the system doesn't define
it. */
#undef SIZE_MAX
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
@@ -470,9 +482,20 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* We want to always use the GNULIB version of getpass which we have in lib,
so define getpass to something that won't conflict with any existing system
declarations. */
#undef getpass
/* Define to `int' if <sys/types.h> doesn't define. */
#undef gid_t
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Define to `int' if <sys/types.h> does not define. */
#undef mode_t
+5335 -1704
View File
File diff suppressed because it is too large. Load diff
+175 -35
View File
@@ -1,11 +1,12 @@
dnl configure.in for cvs
AC_INIT([Concurrent Versions System (CVS)],[1.11.5],[[email protected]],[cvs])
AC_INIT([Concurrent Versions System (CVS)],[1.11.17],[[email protected]],[cvs])
AC_CONFIG_SRCDIR(src/cvs.h)
AM_INIT_AUTOMAKE([gnu 1.5 dist-bzip2 no-define])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([gnu 1.7.9 dist-bzip2 no-define])
AC_PREREQ(2.58)
AC_PREFIX_PROGRAM(cvs)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
AC_PROG_CC
AM_PROG_CC_C_O
@@ -71,8 +72,18 @@ AC_EXEEXT
AC_PATH_PROG(PERL, perl, no)
AC_PATH_PROG(CSH, csh, no)
AC_PATH_PROG(PR, pr, no)
# for contrib/rcs2log.sh & src/cvsbug.in.
AC_PATH_PROG(MKTEMP, mktemp, mktemp)
if test x"$MKTEMP" = xmktemp; then
MKTEMP_SH_FUNCTION=$srcdir/mktemp.sh
else
MKTEMP_SH_FUNCTION=/dev/null
fi
AC_SUBST_FILE(MKTEMP_SH_FUNCTION)
# for src/cvsbug.in
AC_PATH_PROG(SENDMAIL, sendmail, no, [$PATH:/usr/sbin:/usr/lib])
# For diff/util.c
AC_PATH_PROG(PR, pr, no)
if test x"$PR" != xno; then
AC_DEFINE_UNQUOTED([PR_PROGRAM], ["$PR"], [Path to the pr utility])
fi
@@ -174,6 +185,27 @@ AC_REPLACE_FUNCS(\
valloc \
waitpid \
)
dnl
dnl Begin GNULIB stuff.
dnl
gl_XSIZE
dnl We always want to use the GNULIB getpass, so define its name to something
dnl that won't conflict with system declarations.
AC_DEFINE([getpass], [cvs_getpass],
[We want to always use the GNULIB version of getpass which we have in lib,
so define getpass to something that won't conflict with any existing system
declarations.])
dnl
dnl End GNULIB stuff.
dnl
AC_CHECK_FUNCS(\
fchdir \
fchmod \
@@ -183,7 +215,6 @@ AC_CHECK_FUNCS(\
getgroups \
getopt \
getpagesize \
getpassphrase \
gettimeofday \
initgroups \
login \
@@ -349,18 +380,20 @@ if test -n "$krb_h"; then
LDFLAGS=$hold_ldflags
else
AC_CHECK_LIB(krb,printf,[krb_lib=yes krb_libdir=])
AC_CHECK_FUNC(krb_recvauth,[krb_lib=yes krb_libdir=])
fi
if test -n "$krb_lib"; then
AC_DEFINE([HAVE_KERBEROS], 1,
[Define if you have MIT Kerberos version 4 available.])
test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}"
LIBS="${LIBS} -lkrb"
# Put -L${krb_libdir} in LDFLAGS temporarily so that it appears before
# -ldes in the command line. Don't do it permanently so that we honor
# the user's setting for LDFLAGS
hold_ldflags=$LDFLAGS
test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -ldes"])
AC_CHECK_LIB(krb,krb_recvauth)
AC_CHECK_LIB(krb4,krb_recvauth)
LDFLAGS=$hold_ldflags
if test -n "$krb_incdir"; then
includeopt="${includeopt} -I$krb_incdir"
@@ -396,8 +429,21 @@ AC_ARG_WITH(
[--with-editor],
[The default text editor CVS should use for log messages
(default autoselects)]), ,
[with_editor="vi emacs pico edit"])
[with_editor=yes])
# If --with-editor was supplied with an argument, let it override $EDITOR from
# the user's environment. We need to unset EDITOR here because AC_CHECK_PROGS
# will let the value of EDITOR ride when it is set rather than searching. We
# ignore the --without-editor case since it will be caught below.
if test -n "$EDITOR" && test yes != $with_editor; then
AS_UNSET([EDITOR])
fi
# Set the default when --with-editor wasn't supplied or when it was supplied
# without an argument.
if test yes = $with_editor; then
with_editor="vim vi emacs nano pico edit"
fi
if echo $with_editor |grep ^/ >/dev/null; then
# If $with_editor is an absolute path, issue a warning if the executable
@@ -409,31 +455,40 @@ if echo $with_editor |grep ^/ >/dev/null; then
if ! test -f $with_editor \
|| ! test -x $with_editor; then
# warn the user that they may encounter problems
AC_MSG_WARN([$with_editor is not a path to an executable file])
AC_MSG_WARN([\`$with_editor' is not a path to an executable file])
fi
elif test no != "${with_editor}"; then
# Search for an editor
AC_CHECK_PROGS([EDITOR], [$with_editor])
AC_CHECK_PROGS([EDITOR], [$with_editor], [no])
if test no = "${EDITOR}"; then
AC_MSG_ERROR([
Failed to find a text file editor. CVS cannot be compiled
without a default log message editor. Searched for
\`$with_editor'. Try \`configure --with-editor'.])
fi
else
AC_MSG_CHECKING([for an editor])
AC_MSG_RESULT([no])
AC_MSG_ERROR([
CVS cannot be compiled without a default log message editor.
Try \`configure --with-editor'.])
fi
if test -n "${EDITOR}"; then
dnl FIXME - Using --without-editor will probably break a compile at
dnl the moment, but maybe it is reasonable for someone to want to
dnl compile a CVS executable that refuses to run if no $EDITOR,
dnl $CVS_EDITOR, or -e option is specified? Making a preliminary
dnl design decision in this direction, subject to discussion.
AC_DEFINE_UNQUOTED(
[EDITOR_DFLT], ["$EDITOR"],
[The default editor to use, if one does not specify the "-e" option
to cvs, or does not have an EDITOR environment variable. If this
is not set to an absolute path to an executable, use the shell to
find where the editor actually is. This allows sites with
/usr/bin/vi or /usr/ucb/vi to work equally well (assuming that their
PATH is reasonable).])
fi
dnl FIXME - Using --without-editor will probably break a compile at
dnl the moment, but maybe it is reasonable for someone to want to
dnl compile a CVS executable that refuses to run if no $EDITOR,
dnl $CVS_EDITOR, or -e option is specified? Making a preliminary
dnl design decision in this direction, subject to discussion.
dnl
dnl Still don't know if the above would be useful, but we shouldn't
dnl be able to get here any longer without $EDITOR defined due to the
dnl error checking above.
AC_DEFINE_UNQUOTED(
[EDITOR_DFLT], ["$EDITOR"],
[The default editor to use, if one does not specify the "-e" option
to cvs, or does not have an EDITOR environment variable. If this
is not set to an absolute path to an executable, use the shell to
find where the editor actually is. This allows sites with
/usr/bin/vi or /usr/ucb/vi to work equally well (assuming that their
PATH is reasonable).])
dnl
dnl done finding an editor
@@ -454,7 +509,7 @@ AC_ARG_WITH(
AC_MSG_CHECKING([for temporary directory])
if test -z "$with_tmpdir" || test yes = "$with_tmpdir"; then
for with_tmpdir in "$TMPDIR" "$TMP" "$TEMP" /tmp /var/tmp no; do
for with_tmpdir in /tmp /var/tmp no; do
if test -d "$with_tmpdir" && test -x "$with_tmpdir" \
&& test -w "$with_tmpdir" && test -r "$with_tmpdir"; then
break
@@ -633,7 +688,7 @@ if test no != "$enable_password_authenticated_client"; then
method in the CVS client (default)])
else
AC_MSG_WARN(
[--enable-password-authenticated-server is meaningless with
[--enable-password-authenticated-client is meaningless with
the CVS client disabled (--disable-client)])
fi
fi
@@ -740,6 +795,73 @@ if test no != "$enable_server"; then
fi # enable_server
dnl
dnl begin --enable-case-sensitivity
dnl
AC_ARG_ENABLE(
[case-sensitivity],
AC_HELP_STRING(
[--enable-case-sensitivity],
[Force CVS to expect a case sensitive file system. Enabling this on a case
insensitive system should have little effect on the server or client
operation, though client users may ocassionally be suprised that the CVS
server appears to be case sensitive. Disabling this for a case sensitive
server disables server support for case insensitive clients, which can
confuse all users of case insensitive clients contacting the server.
Disabling this for a case sensitive client will cause the client to ask
servers to behave case insensitively, which could cause confusion for
users, but also probably no real harm. (default autoselects based on the
case sensitivity of the file system containing the current working
directory)]),
[case "$enable_case_sensitivity" in
yes | no | auto) ;;
*)
AC_MSG_ERROR([Unrecognized argument to --enable-case-sensitivity: \`$enable_case_sensitivity'. Acceptable values are \`yes', \`no', and \`auto'.])
;;
esac],
[enable_case_sensitivity=auto])
acx_forced=' (forced)'
AC_MSG_CHECKING([for a case sensitive file system])
if test $enable_case_sensitivity = auto; then
dnl
dnl Check for a case insensitive filesystem, like Mac OS X and Windows have.
dnl
AC_CACHE_VAL([acx_cv_case_sensitive],
[ rm -f ac_TEST_filenames_CASE_sensitive
echo foo >ac_test_filenames_case_sensitive
if test -f ac_TEST_filenames_CASE_sensitive; then
acx_cv_case_sensitive=no
else
acx_cv_case_sensitive=yes
fi
rm ac_test_filenames_case_sensitive
])
enable_case_sensitivity=$acx_cv_case_sensitive
acx_forced=
fi
AC_MSG_RESULT([$enable_case_sensitivity$acx_forced])
if test $enable_case_sensitivity = no; then
AC_DEFINE([FILENAMES_CASE_INSENSITIVE], [1],
[Define if this executable will be running on case insensitive
file systems. In the client case, this means that it will request
that the server pretend to be case insensitive if it isn't
already.])
dnl Compile fncase.c (containing fncase() & fncmp()) to handle file name
dnl comparisons on case insensitive filesystems.
AC_LIBOBJ(fncase)
fi
dnl
dnl end --enable-case-sensitivity
dnl
dnl
dnl begin --enable-encryption
dnl
dnl
dnl Use --enable-encryption to turn on encryption support, but ignore this
dnl option unless either client or server is enabled.
@@ -757,7 +879,7 @@ if test "$enable_encryption" = yes; then
[Define to enable encryption support.])
else
AC_MSG_WARN(
[--enable-encryption is meaningless with neither the CVS client
[--enable-encryption is meaningless when neither the CVS client
nor the CVS server is enabled (--disable-client and --disable-server).])
fi
fi
@@ -849,6 +971,7 @@ dnl end --enable-*
dnl
dnl For the moment we will assume that all systems which have
dnl the unixyness to run configure are unixy enough to do the
dnl PreservePermissions stuff. I have this sinking feeling that
@@ -856,11 +979,9 @@ dnl things won't be that simple, before long.
dnl AC_DEFINE(PRESERVE_PERMISSIONS_SUPPORT, 1,
dnl [Define if this system supports chown(), link(), and friends.])
dnl On cygwin32, we configure like a Unix system, but we use the
dnl Windows support code in lib/fncase.c to handle the case
dnl insensitive file system. We also need some support libraries. We
dnl do this at the end so that the new libraries are added at the end
dnl of LIBS.
dnl On cygwin32, we configure like a Unix system, but we need some support
dnl libraries. We do this at the end so that the new libraries are added at
dnl the end of LIBS.
dnl
dnl FIXME: We should be trying to meet the autoconf ideal of checking for
dnl the properties of the system rather than the name of the os here. In other
@@ -870,7 +991,6 @@ AC_CACHE_CHECK(for cygwin32, ccvs_cv_sys_cygwin32,
[AC_TRY_COMPILE([], [return __CYGWIN32__;],
ccvs_cv_sys_cygwin32=yes, ccvs_cv_sys_cygwin32=no)])
if test $ccvs_cv_sys_cygwin32 = yes; then
AC_LIBOBJ(fncase)
LIBS="$LIBS -ladvapi32"
dnl On Windows you can only change file times if you can write to
@@ -898,9 +1018,13 @@ AC_CONFIG_FILES(contrib/log, [chmod +x contrib/log])
AC_CONFIG_FILES(contrib/log_accum, [chmod +x contrib/log_accum])
AC_CONFIG_FILES(contrib/mfpipe, [chmod +x contrib/mfpipe])
AC_CONFIG_FILES(contrib/pvcs2rcs, [chmod +x contrib/pvcs2rcs])
AC_CONFIG_FILES(contrib/rcs2log:contrib/rcs2log.sh, [chmod +x contrib/rcs2log])
AC_CONFIG_FILES(contrib/rcslock, [chmod +x contrib/rcslock])
AC_CONFIG_FILES(contrib/sccs2rcs, [chmod +x contrib/sccs2rcs])
AC_CONFIG_FILES(doc/mkman, [chmod +x doc/mkman])
AC_CONFIG_FILES(src/cvsbug, [chmod +x src/cvsbug])
AC_CONFIG_FILES(windows-NT/fix-msvc-mak:windows-NT/fix-msvc-mak-head.pl:windows-NT/fix-msvc-mak.pl,
[chmod +x windows-NT/fix-msvc-mak])
dnl the bulk files
AC_CONFIG_FILES([Makefile \
@@ -921,3 +1045,19 @@ AC_CONFIG_FILES([Makefile \
dnl and we're done
AC_OUTPUT
# Report the state of this version of CVS if this is from dev.
m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[0-9]*\.[0-9]*\.[0-9]*\.[0-9]],
[ cat <<EOF
You are about to use an unreleased version of CVS. Be sure to
read the relevant mailing lists, most importantly <[email protected]>.
Below you will find information on the status of this version of CVS.
EOF
sed -n '/^\* Status/,$p' $srcdir/BUGS
])
+70
View File
@@ -1,3 +1,73 @@
2004-01-30 Derek Price <[email protected]>
Close issue #155.
* log_accum.in: Remove unused variables.
(Patch from (Ville Skyttä <[email protected]>.)
2003-10-14 Derek Price <[email protected]>
Port to pedantic POSIX 1003.1-2001 hosts, such as Debian GNU/Linux
testing with _POSIX2_VERSION=200112 in the environment.
* cvs2vendor.sh: Work with POSIX sort as well as with
traditional sort.
* rcs2sccs.sh, sccs2rcs.in: Likewise.
(Patch from Paul Eggert <[email protected]>.)
2003-09-26 Mark D. Baushke <[email protected]>
* sccs2rcs.in: Use @AWK@ to avoid ancient Solaris awk (no support
for the "?" operator). Add support for handling binary SCCS files.
(Suggestion from Allan Schrum <[email protected]>.)
2003-08-06 Derek Price <[email protected]>
* commit_prep.in, log_accum.in: Port copious changes from Karl Fogel
and CollabNet. These changes add features, generalize, and organize.
2003-07-07 Larry Jones <[email protected]>
* rcs2log.1: New file from Paul Eggert <[email protected]>
via Eric Seidel <[email protected]>.
2003-06-20 Derek Price <[email protected]>
* Don't call CVS with the -l option since CVS no longer accepts it.
(Suggestion from Matt Doar <[email protected]>.)
2003-05-21 Derek Price <[email protected]>
* Makefile.in: Regenerate with Automake version 1.7.5.
2003-04-10 Larry Jones <[email protected]>
* Makefile.in: Regenerated.
2003-03-24 Derek Price <[email protected]>
* Makefile.am: Update copyright notice.
* Makefile.in: Regenerated.
2003-02-25 Derek Price <[email protected]>
* rcs2log.sh: Import RedHat 8.0's use of mktemp from the CVS 1.11.2
RPM. Use new MKTEMP variable from configure.
* Makefile.in: Regenerated.
2003-02-24 Larry Jones <[email protected]>
and Donald Sharp <[email protected]>
* check_cvs.in: Filenames with funky characters need to be quoted
correctly. Also needed to modify regex due to locked revisions of
files cause output to be different.
* check_cvs.in: Fixed multiple symlinks in your cvsroot,
improved CVSROOT/CVSROOT handling (Patch from Shlomo Reinstein
<[email protected]). Fixed retrieving revisions of ,v
files. Added passwd, readers, and writers to list of files to
ignore and sorted list to match the one in src/mkmodules.c.
2002-12-16 Derek Price <[email protected]>
* cvs_acls.in: Fix split loop error with Perl 5.8.0.
+3 -1
View File
@@ -1,7 +1,9 @@
## Process this file with automake to produce Makefile.in
# Makefile for GNU CVS contributed sources.
# Do not use this makefile directly, but only from `../Makefile'.
# Copyright (C) 1986, 1988-1990 Free Software Foundation, Inc.
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
+105 -45
View File
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,9 @@
# Makefile for GNU CVS contributed sources.
# Do not use this makefile directly, but only from `../Makefile'.
# Copyright (C) 1986, 1988-1990 Free Software Foundation, Inc.
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,79 +29,117 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSH = @CSH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build_alias = @build_alias@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
contribdir = $(pkgdatadir)/contrib
@@ -155,26 +195,28 @@ CLEANFILES = $(bin_SCRIPTS) $(contrib_SCRIPTS)
SUFFIXES = .sh
subdir = contrib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = check_cvs clmerge cln_hist commit_prep cvs_acls log \
log_accum mfpipe pvcs2rcs rcslock sccs2rcs
log_accum mfpipe pvcs2rcs rcs2log rcslock sccs2rcs
SCRIPTS = $(contrib_SCRIPTS)
DIST_SOURCES =
DATA = $(contrib_DATA)
DIST_COMMON = README ChangeLog Makefile.am Makefile.in check_cvs.in \
clmerge.in cln_hist.in commit_prep.in cvs_acls.in log.in \
log_accum.in mfpipe.in pvcs2rcs.in rcslock.in sccs2rcs.in
DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am \
check_cvs.in clmerge.in cln_hist.in commit_prep.in cvs_acls.in \
log.in log_accum.in mfpipe.in pvcs2rcs.in rcs2log.sh rcslock.in \
sccs2rcs.in
all: all-am
.SUFFIXES:
.SUFFIXES: .sh
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu contrib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
check_cvs: $(top_builddir)/config.status check_cvs.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -194,6 +236,8 @@ mfpipe: $(top_builddir)/config.status mfpipe.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
pvcs2rcs: $(top_builddir)/config.status pvcs2rcs.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
rcs2log: $(top_builddir)/config.status rcs2log.sh
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
rcslock: $(top_builddir)/config.status rcslock.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
sccs2rcs: $(top_builddir)/config.status sccs2rcs.in
@@ -240,13 +284,22 @@ uninstall-contribDATA:
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -272,7 +325,6 @@ all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(contribdir) $(DESTDIR)$(contribdir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -284,7 +336,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -293,7 +345,7 @@ clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -303,7 +355,7 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -326,13 +378,21 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-contribDATA uninstall-contribSCRIPTS \
uninstall-info-am uninstall-local
@@ -343,7 +403,7 @@ uninstall-am: uninstall-contribDATA uninstall-contribSCRIPTS \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic uninstall uninstall-am \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-contribDATA uninstall-contribSCRIPTS \
uninstall-info-am uninstall-local
+105 -38
View File
@@ -67,6 +67,7 @@ my $verbose = 0;
my $total_revisions;
my $total_interesting_revisions;
my $total_files;
my @ignore_files;
######################################################################
# SUBROUTINES #
@@ -121,12 +122,19 @@ if( exists( $ENV{ CVSDEBUGEDIT } ) )
}
$directory_to_look_at = $ENV{ CVSROOT };
if( -l $directory_to_look_at )
my $sym_count = 0;
while( -l $directory_to_look_at )
{
$directory_to_look_at = readlink( $directory_to_look_at );
$sym_count += 1;
if( $sym_count > 5 )
{
die( "Encountered too many symlinks for $ENV{ CVSROOT }\n" );
}
}
print( "Processing: $directory_to_look_at\n" ) if( $verbose );
@ignore_files = &get_ignore_files_from_cvsroot( $directory_to_look_at );
find( \&process_file, $directory_to_look_at );
my $num_files = @list_of_broken_files;
@@ -184,34 +192,6 @@ sub process_file
elsif( ! -d $File::Find::name )
{
my $save = 0;
my @ignore_files = ( 'CVS\/fileattr$',
'^CVSROOT\/modules',
'^CVSROOT\/.#modules',
'^CVSROOT\/loginfo',
'^CVSROOT\/.#loginfo',
'^CVSROOT\/rcsinfo',
'^CVSROOT\/.#rcsinfo',
'^CVSROOT\/editinfo',
'^CVSROOT\/.#editinfo',
'^CVSROOT\/commitinfo',
'^CVSROOT\/.#commitinfo',
'^CVSROOT\/taginfo',
'^CVSROOT\/.#taginfo',
'^CVSROOT\/notify',
'^CVSROOT\/.#notify',
'^CVSROOT\/checkoutlist',
'^CVSROOT\/.#checkoutlist',
'^CVSROOT\/cvswrappers',
'^CVSROOT\/.#cvswrappers',
'^CVSROOT\/val-tags',
'^CVSROOT\/.#val-tags',
'^CVSROOT\/verifymsg',
'^CVSROOT\/.#verifymsg',
'^CVSROOT\/config',
'^CVSROOT\/.#config',
'^CVSROOT\/history',
'^CVSROOT\/cvsignore',
'^CVSROOT\/.#cvsignore' );
foreach my $ignore ( @ignore_files )
{
@@ -322,18 +302,29 @@ sub look_at_cvs_file
sub get_history
{
my( $file ) = @_;
$file =~ s/(["\$`\\])/\\$1/g;
my @revisions;
my $revision;
my $ignore = 1;
my $save_ = $_;
open( FILE, "rlog -N '$file' 2>&1 |" ) or die( "unable to run rlog, help" );
open( FILE, "rlog -N \"$file\" 2>&1 |" ) or die( "unable to run rlog, help" );
while( <FILE> )
{
if( ( $revision ) = /^revision (.*)$/ )
{
push( @revisions, $revision );
#rlog outputs a "----" line before the actual revision
#without this we'll pick up peoples comments if they
#happen to start with revision
if( /^----------------------------$/ )
{
$ignore = 0;
next;
}
if( ( !$ignore ) && ( ( $revision ) = m/^revision (\S+)/ ) )
{
push( @revisions, $revision );
$ignore = 1;
}
}
@@ -369,9 +360,6 @@ sub get_history
#
# COMMENTS :
# cvs command line options are as followed:
# -l - Do not log this command in the history file. I am
# doing this because we will literaly be looking at
# thousands of files with *lots* of revisions.
# -n - Do not run any checkout program as specified by the -o
# option in the modules file
# -p - Put all output to standard out.
@@ -383,11 +371,12 @@ sub get_history
sub check_revision
{
my( $file, $revision ) = @_;
$file =~ s/(["\$`\\])/\\$1/g;
my $cwd = getcwd();
chdir( "/tmp" );
my $ret_code = 0xffff & system( "cvs -l co -n -p -r $revision '$file' > /dev/null 2>&1" );
my $ret_code = 0xffff & system( "cvs co -n -p -r $revision \"$file\" > /dev/null 2>&1" );
chdir( $cwd );
return( 1 ) if ( $ret_code == 0 );
@@ -753,3 +742,81 @@ sub branch_split
return( $branch, pop( @split_rev ) );
}
######################################################################
#
# NAME :
# get_ignore_files_from_cvsroot
#
# PURPOSE :
# Retrieve the list of files from the CVSROOT/ directory
# that should be ignored.
# These are the regular files (e.g., commitinfo, loginfo)
# and those specified in the checkoutlist file.
#
# PARAMETERS :
# The CVSROOT
#
# GLOBALS :
# NONE
#
# RETURNS :
# @ignore - the list of files to ignore
#
# COMMENTS :
# NONE
#
######################################################################
sub get_ignore_files_from_cvsroot {
my( $cvsroot ) = @_;
my @ignore = ( 'CVS\/fileattr$',
'^CVSROOT\/loginfo',
'^CVSROOT\/.#loginfo',
'^CVSROOT\/rcsinfo',
'^CVSROOT\/.#rcsinfo',
'^CVSROOT\/editinfo',
'^CVSROOT\/.#editinfo',
'^CVSROOT\/verifymsg',
'^CVSROOT\/.#verifymsg',
'^CVSROOT\/commitinfo',
'^CVSROOT\/.#commitinfo',
'^CVSROOT\/taginfo',
'^CVSROOT\/.#taginfo',
'^CVSROOT\/cvsignore',
'^CVSROOT\/.#cvsignore',
'^CVSROOT\/checkoutlist',
'^CVSROOT\/.#checkoutlist',
'^CVSROOT\/cvswrappers',
'^CVSROOT\/.#cvswrappers',
'^CVSROOT\/notify',
'^CVSROOT\/.#notify',
'^CVSROOT\/modules',
'^CVSROOT\/.#modules',
'^CVSROOT\/readers',
'^CVSROOT\/.#readers',
'^CVSROOT\/writers',
'^CVSROOT\/.#writers',
'^CVSROOT\/passwd',
'^CVSROOT\/config',
'^CVSROOT\/.#config',
'^CVSROOT\/val-tags',
'^CVSROOT\/.#val-tags',
'^CVSROOT\/history' );
my $checkoutlist_file = "$cvsroot\/CVSROOT\/checkoutlist";
open( CHECKOUTLIST, "<$cvsroot\/CVSROOT\/checkoutlist" )
or die( "Unable to read checkoutlist file: $!\n" );
my @list = <CHECKOUTLIST>;
chomp( @list );
close( CHECKOUTLIST )
or die( "Unable to close checkoutlist file: $!\n" );
foreach my $line( @list )
{
next if( $line =~ /^#/ || $line =~ /^$/ );
if( $line =~ /^\s*(\S*)\s*/ ) { $line = $1 };
push( @ignore, "^CVSROOT\/$line", "^CVSROOT\/\.#$line" );
}
return @ignore;
}
+33 -192
View File
@@ -1,215 +1,56 @@
#! @PERL@
# -*-Perl-*-
#
#
# Perl filter to handle pre-commit checking of files. This program
# records the last directory where commits will be taking place for
# use by the log_accum.pl script. For new files, it forces the
# existence of a RCS "Id" keyword in the first ten lines of the file.
# For existing files, it checks version number in the "Id" line to
# prevent losing changes because an old version of a file was copied
# into the direcory.
#
# Possible future enhancements:
#
# Check for cruft left by unresolved conflicts. Search for
# "^<<<<<<<$", "^-------$", and "^>>>>>>>$".
#
# Look for a copyright and automagically update it to the
# current year. [[ bad idea! -- woods ]]
# use by the log_accum.pl script.
#
# IMPORTANT: this script interacts with log_accum, they have to agree
# on the tmpfile name to use. See $LAST_FILE below.
#
# Contributed by David Hampton <[email protected]>
# Stripped to minimum by Roy Fielding
#
# Hacked on lots by Greg A. Woods <[email protected]>
############################################################
$TMPDIR = $ENV{'TMPDIR'} || '/tmp';
$FILE_PREFIX = '#cvs.';
#
# Configurable options
#
# If see a "-u $USER" argument, then destructively remove it from the
# argument list, so $ARGV[0] will be the repository dir again, as it
# used to be before we added the -u flag.
if ($ARGV[0] eq '-u') {
shift @ARGV;
$CVS_USERNAME = shift (@ARGV);
}
# Constants (remember to protect strings from RCS keyword substitution)
#
$LAST_FILE = "/tmp/#cvs.lastdir"; # must match name in log_accum.pl
$ENTRIES = "CVS/Entries";
# Patterns to find $Log keywords in files
#
$LogString1 = "\\\$\\Log: .* \\\$";
$LogString2 = "\\\$\\Log\\\$";
$NoLog = "%s - contains an RCS \$Log keyword. It must not!\n";
# pattern to match an RCS Id keyword line with an existing ID
#
$IDstring = "\"@\\(#\\)[^:]*:.*\\\$\Id: .*\\\$\"";
$NoId = "
%s - Does not contain a properly formatted line with the keyword \"Id:\".
I.e. no lines match \"" . $IDstring . "\".
Please see the template files for an example.\n";
# pattern to match an RCS Id keyword line for a new file (i.e. un-expanded)
#
$NewId = "\"@(#)[^:]*:.*\\$\Id\\$\"";
$NoName = "
%s - The ID line should contain only \"@(#)module/path:\$Name\$:\$\Id\$\"
for a newly created file.\n";
$BadName = "
%s - The file name '%s' in the ID line does not match
the actual filename.\n";
$BadVersion = "
%s - How dare you!!! You replaced your copy of the file '%s',
which was based upon version %s, with an %s version based
upon %s. Please move your '%s' out of the way, perform an
update to get the current version, and them merge your changes
into that file, then try the commit again.\n";
#
# Subroutines
#
# This needs to match the corresponding var in log_accum.pl, including
# the appending of the pgrp and username suffixes (see uses of this
# var farther down).
$LAST_FILE = "$TMPDIR/${FILE_PREFIX}lastdir";
sub write_line {
local($filename, $line) = @_;
open(FILE, ">$filename") || die("Cannot open $filename, stopped");
my ($filename, $line) = @_;
# A check of some kind is needed here, but the rules aren't apparent
# at the moment:
# foreach($filename, $line){
# $_ =~ m#^([-\@\w.\#]+)$#;
# $_ = $1;
# }
open(FILE, ">$filename") || die("Cannot open $filename: $!\n");
print(FILE $line, "\n");
close(FILE);
}
sub check_version {
local($i, $id, $rname, $version);
local($filename, $cvsversion) = @_;
open(FILE, "<$filename") || return(0);
@all_lines = ();
$idpos = -1;
$newidpos = -1;
for ($i = 0; <FILE>; $i++) {
chop;
push(@all_lines, $_);
if ($_ =~ /$IDstring/) {
$idpos = $i;
}
if ($_ =~ /$NewId/) {
$newidpos = $i;
}
}
if (grep(/$LogString1/, @all_lines) || grep(/$LogString2/, @all_lines)) {
print STDERR sprintf($NoLog, $filename);
return(1);
}
if ($debug != 0) {
print STDERR sprintf("file = %s, version = %d.\n", $filename, $cvsversion{$filename});
}
if ($cvsversion{$filename} == 0) {
if ($newidpos != -1 && $all_lines[$newidpos] !~ /$NewId/) {
print STDERR sprintf($NoName, $filename);
return(1);
}
return(0);
}
if ($idpos == -1) {
print STDERR sprintf($NoId, $filename);
return(1);
}
$line = $all_lines[$idpos];
$pos = index($line, "Id: ");
if ($debug != 0) {
print STDERR sprintf("%d in '%s'.\n", $pos, $line);
}
($id, $rname, $version) = split(' ', substr($line, $pos));
if ($rname ne "$filename,v") {
print STDERR sprintf($BadName, $filename, substr($rname, 0, length($rname)-2));
return(1);
}
if ($cvsversion{$filename} < $version) {
print STDERR sprintf($BadVersion, $filename, $filename, $cvsversion{$filename},
"newer", $version, $filename);
return(1);
}
if ($cvsversion{$filename} > $version) {
print STDERR sprintf($BadVersion, $filename, $filename, $cvsversion{$filename},
"older", $version, $filename);
return(1);
}
return(0);
}
#
# Main Body
#
$id = getpgrp(); # You *must* use a shell that does setpgrp()!
# Check each file (except dot files) for an RCS "Id" keyword.
#
$check_id = 0;
# Record the directory for later use by the log_accumulate stript.
#
$record_directory = 0;
# parse command line arguments
#
while (@ARGV) {
$arg = shift @ARGV;
if ($arg eq '-d') {
$debug = 1;
print STDERR "Debug turned on...\n";
} elsif ($arg eq '-c') {
$check_id = 1;
} elsif ($arg eq '-r') {
$record_directory = 1;
} else {
push(@files, $arg);
}
}
$directory = shift @files;
if ($debug != 0) {
print STDERR "dir - ", $directory, "\n";
print STDERR "files - ", join(":", @files), "\n";
print STDERR "id - ", $id, "\n";
}
# Suck in the CVS/Entries file
#
open(ENTRIES, $ENTRIES) || die("Cannot open $ENTRIES.\n");
while (<ENTRIES>) {
local($filename, $version) = split('/', substr($_, 1));
$cvsversion{$filename} = $version;
}
# Now check each file name passed in, except for dot files. Dot files
# are considered to be administrative files by this script.
#
if ($check_id != 0) {
$failed = 0;
foreach $arg (@files) {
if (index($arg, ".") == 0) {
next;
}
$failed += &check_version($arg);
}
if ($failed) {
print STDERR "\n";
exit(1);
}
}
# Record this directory as the last one checked. This will be used
# by the log_accumulate script to determine when it is processing
# the final directory of a multi-directory commit.
#
if ($record_directory != 0) {
&write_line("$LAST_FILE.$id", $directory);
}
$id = getpgrp();
&write_line("$LAST_FILE.$id.$CVS_USERNAME", $ARGV[0]);
exit(0);
+6 -1
View File
@@ -42,6 +42,11 @@ rm -f $revfile
commentfile=/tmp/cvs2vendor_$$_comment
rm -f $commentfile
if sort -k 1,1 /dev/null 2>/dev/null
then sort_each_field='-k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -k 9'
else sort_each_field='+0 +1 +2 +3 +4 +5 +6 +7 +8'
fi
srcdirs=`cd $tsrcdir && find . -type d -print | sed 's~^\.[/]*~~'`
# the "" is a trick to get $tsrcdir itself without resorting to '.'
@@ -68,7 +73,7 @@ for ldir in "" $srcdirs; do
fi
# work on each rev of that file in ascending order
rlog $file | grep "^revision [0-9][0-9]*\." | awk '{print $2}' | sed -e 's/\./ /g' | sort -n -u +0 +1 +2 +3 +4 +5 +6 +7 +8 | sed -e 's/ /./g' > $revfile
rlog $file | grep "^revision [0-9][0-9]*\." | awk '{print $2}' | sed -e 's/\./ /g' | sort -n -u $sort_each_field | sed -e 's/ /./g' > $revfile
for rev in `cat $revfile`; do
File diff suppressed because it is too large. Load diff
+9 -4
View File
@@ -31,7 +31,7 @@ Report bugs to <[email protected]>.'
Id='$Id: rcs2log,v 1.48 2001/09/05 23:07:46 eggert Exp $'
# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001
# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -49,13 +49,16 @@ Id='$Id: rcs2log,v 1.48 2001/09/05 23:07:46 eggert Exp $'
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
Copyright='Copyright 2001 Free Software Foundation, Inc.
Copyright='Copyright 1992-2003 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING.
Author: Paul Eggert <[email protected]>'
# functions
@MKTEMP_SH_FUNCTION@
# Use the traditional C locale.
LANG=C
LANGUAGE=C
@@ -79,8 +82,10 @@ nl='
# Parse options.
# defaults
: ${MKTEMP="@MKTEMP@"}
: ${AWK=awk}
: ${TMPDIR=/tmp}
changelog=ChangeLog # change log file name
datearg= # rlog date option
hostname= # name of local host (if empty, will deduce it later)
@@ -182,11 +187,11 @@ month_data='
m[9]="Oct"; m[10]="Nov"; m[11]="Dec"
'
logdir=$TMPDIR/rcs2log$$
logdir=`$MKTEMP -d $TMPDIR/rcs2log.XXXXXX`
test -n "$logdir" || exit
llogout=$logdir/l
trap exit 1 2 13 15
trap "rm -fr $logdir 2>/dev/null" 0
(umask 077 && exec mkdir $logdir) || exit
# If no rlog-format log file is given, generate one into $rlogfile.
case $rlogfile in
+5 -1
View File
@@ -42,13 +42,17 @@ cp $tmpfile $sedfile
############################################################
# Loop over every RCS file in RCS dir
#
if sort -k 1,1 /dev/null 2>/dev/null
then sort_each_field='-k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -k 9'
else sort_each_field='+0 +1 +2 +3 +4 +5 +6 +7 +8'
fi
for vfile in *,v; do
# get rid of the ",v" at the end of the name
file=`echo $vfile | sed -e 's/,v$//'`
# work on each rev of that file in ascending order
firsttime=1
rlog $file | grep "^revision [0-9][0-9]*\." | awk '{print $2}' | sed -e 's/\./ /g' | sort -n -u +0 +1 +2 +3 +4 +5 +6 +7 +8 | sed -e 's/ /./g' > $revfile
rlog $file | grep "^revision [0-9][0-9]*\." | awk '{print $2}' | sed -e 's/\./ /g' | sort -n -u $sort_each_field | sed -e 's/ /./g' > $revfile
for rev in `cat $revfile`; do
if [ $? != 0 ]; then
echo ERROR - revision
+43 -8
View File
@@ -42,6 +42,12 @@
# ...!harvard!cg-atla!viewlog!kenstir
#
# Various hacks made by Brian Berliner before inclusion in CVS contrib area.
#
# Modified to detect SCCS binary files. If binary, skip the keyword
# substitution and flag the RCS file as binary (using rcs -i -kb).
# -Allan G. Schrum [email protected] [email protected]
# Fri Sep 26 10:40:40 EDT 2003
#
# $FreeBSD$
@@ -164,6 +170,13 @@ end
onintr ERROR
sort -k 1,1 /dev/null >& /dev/null
if ($status == 0) then
set sort_each_field = '-k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -k 9'
else
set sort_each_field = '+0 +1 +2 +3 +4 +5 +6 +7 +8'
endif
############################################################
# Loop over every s-file in SCCS dir
#
@@ -173,7 +186,18 @@ foreach sfile (SCCS/s.*)
# work on each rev of that file in ascending order
set firsttime = 1
sccs prs $file | grep "^D " | awk '{print $2}' | sed -e 's/\./ /g' | sort -n -u +0 +1 +2 +3 +4 +5 +6 +7 +8 | sed -e 's/ /./g' > $revfile
# Only scan the file up to the "I" keyword, then see if
# the "f" keyword is set to binary. The SCCS file has
# <ctrl>-aI denoting the start of the file (or end of header).
set binary = (`sed -e '/^.I/,$d' < $sfile | grep '^.f e 1$'`)
#if ($#binary) then
# echo This is a binary file
#else
# echo This is not a binary file
#endif
sccs prs $file | grep "^D " | @AWK@ '{print $2}' | sed -e 's/\./ /g' | sort -n -u $sort_each_field | sed -e 's/ /./g' > $revfile
foreach rev (`cat $revfile`)
if ($status != 0) goto ERROR
@@ -182,23 +206,34 @@ foreach sfile (SCCS/s.*)
# Is the substr stuff and the +0 in the following awk script really
# necessary? It seems to me that if we didn't find the date format
# we expected in the output we have other problems.
set date = `sccs prs -r$rev $file | awk '/^D / {print (substr($3,0,2)+0<70?20:19) $3, $4; exit}'`
set author = `sccs prs -r$rev $file | awk '/^D / {print $5; exit}'`
# Note: Solaris awk does not like the following line. Use gawk
# mawk, or nawk instead.
set date = `sccs prs -r$rev $file | @AWK@ '/^D / {print (substr($3,0,2)+0<70?20:19) $3, $4; exit}'`
set author = `sccs prs -r$rev $file | @AWK@ '/^D / {print $5; exit}'`
echo ""
echo "==> file $file, rev=$rev, date=$date, author=$author"
sccs edit -r$rev $file >>& $logfile
if ($status != 0) goto ERROR
echo checked out of SCCS
# add RCS keywords in place of SCCS keywords
sed -f $sedfile $file > $tmpfile
if ($status != 0) goto ERROR
echo performed keyword substitutions
cp $tmpfile $file
# add RCS keywords in place of SCCS keywords (only if not binary)
if ($#binary == 0) then
sed -f $sedfile $file > $tmpfile
if ($status != 0) goto ERROR
echo performed keyword substitutions
cp $tmpfile $file
endif
# check file into RCS
if ($firsttime) then
set firsttime = 0
if ($#binary) then
echo this is a binary file
# Mark initial, empty file as binary
rcs -i -kb -t$emptyfile $file
endif
if ($nodesc) then
echo about to do ci
echo ci -f -r$rev -d"$date" -w$author -t$emptyfile $file
+200 -118
View File
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000 Free Software Foundation, Inc.
# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,11 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Originally written by Alexandre Oliva <[email protected]>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
@@ -26,7 +31,16 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
fi
# `libtool' can also be set to `yes' or `no'.
depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
if test -z "$depfile"; then
base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
dir=`echo "$object" | sed 's,/.*$,/,'`
if test "$dir" = "$object"; then
dir=
fi
# FIXME: should be _deps on DOS.
depfile="$dir.deps/$base"
fi
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@@ -50,8 +64,9 @@ fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay!
"$@" -MT "$object" -MF "$tmpdepfile" -MD -MP
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
@@ -157,19 +172,25 @@ sgi)
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. This file always lives in the current directory.
# Also, the AIX compiler puts `$object:' at the start of each line;
# $object doesn't have directory information.
stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
# in a .u file. In older versions, this file always lives in the
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
stat=$?
if test -f "$tmpdepfile"; then :
else
stripped=`echo "$stripped" | sed 's,^.*/,,'`
tmpdepfile="$stripped.u"
fi
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
@@ -177,6 +198,7 @@ aix)
fi
if test -f "$tmpdepfile"; then
outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
@@ -191,29 +213,80 @@ aix)
rm -f "$tmpdepfile"
;;
icc)
# Intel's C compiler understands `-MD -MF file'. However on
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
# ICC 7.0 will fill foo.d with something like
# foo.o: sub/foo.c
# foo.o: sub/foo.h
# which is wrong. We want:
# sub/foo.o: sub/foo.c
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
# ICC 7.1 will output
# foo.o: sub/foo.c sub/foo.h
# and will wrap long lines using \ :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
"$@" -MD -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
# Each line is of the form `foo.o: dependent.h',
# or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
# Some versions of the HPUX 10.20 sed can't process this invocation
# correctly. Breaking it into two sed invocations is a workaround.
sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
tru64)
# The Tru64 AIX compiler uses -MD to generate dependencies as a side
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
tmpdepfile="$object.d"
if test "$libtool" = yes; then
tmpdepfile1="$dir.libs/$base.lo.d"
tmpdepfile2="$dir.libs/$base.d"
"$@" -Wc,-MD
else
tmpdepfile1="$dir$base.o.d"
tmpdepfile2="$dir$base.d"
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
if test -f "$tmpdepfile1"; then
tmpdepfile="$tmpdepfile1"
else
tmpdepfile="$tmpdepfile2"
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a space and a tab in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
# That's a tab and a space in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -226,34 +299,42 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
test -z "$dashmflag" && dashmflag=-M
( IFS=" "
case " $* " in
*" --mode=compile "*) # this is libtool, let us make it quiet
for arg
do # cycle over the arguments
case "$arg" in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
# always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# Remove `-o $object'.
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
"$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
done
test -z "$dashmflag" && dashmflag=-M
# Require at least two characters before searching for `:'
# in the target name. This is to cope with DOS-style filenames:
# a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
"$@" $dashmflag |
sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
@@ -271,36 +352,40 @@ dashXmstdout)
;;
makedepend)
# X makedepend
(
shift
cleared=no
for arg in "$@"; do
case $cleared in no)
set ""; shift
cleared=yes
esac
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift;;
-*)
;;
*)
set fnord "$@" "$arg"; shift;;
esac
"$@" || exit $?
# Remove any Libtool call
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
shift
fi
# X makedepend
shift
cleared=no
for arg in "$@"; do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file.
-*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tail +3 "$tmpdepfile" | tr ' ' '
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
@@ -310,35 +395,39 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
( IFS=" "
case " $* " in
*" --mode=compile "*)
for arg
do # cycle over the arguments
case $arg in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
# always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# Remove `-o $object'.
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
"$@" -E |
done
"$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -348,34 +437,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
( IFS=" "
case " $* " in
*" --mode=compile "*)
for arg
do # cycle over the arguments
case $arg in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
"$@" || exit $?
IFS=" "
for arg
do
case "$arg" in
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
shift
shift
;;
esac
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
done
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+51
View File
@@ -1,3 +1,54 @@
2004-05-15 Derek Price <[email protected]>
* libdiff.dsp: Header file list updated.
* libdiff.dep: Regenerated for "libdiff.dsp" changes.
* libdiff.mak: Regenerated for "libdiff.dsp" changes.
(Patch from Conrad Pino <[email protected]>.)
2004-05-13 Derek Price <[email protected]>
* .cvsignore: Changed for "libdiff.dsp" changes.
* libdiff.dep: Added for "../cvsnt.dsw" changes.
* libdiff.dsp: Changed for "../cvsnt.dsw" changes.
* libdiff.mak: Regenerated for "../cvsnt.dsw" changes.
(Patch from Conrad Pino <[email protected]>.)
2004-03-20 Derek Price <[email protected]>
* diff.c (diff_run): Update string arg to const.
* diffrun.h: Update prototype to match.
2003-07-12 Larry Jones <[email protected]>
* io.c (find_identical_ends): Update to match current diffutils
code and improve handling of files with no newline at end.
(Patch from Andrew Moise <[email protected]>.)
2003-06-13 Derek Price <[email protected]>
* diff3.c (read_diff): Fix memory leak.
(Patch from Kenneth Lorber <[email protected]>.)
2003-05-21 Derek Price <[email protected]>
* Makefile.in: Regenerate with Automake version 1.7.5.
2003-05-09 Derek Price <[email protected]>
* system.h: Define S_ISSOCK on SCO OpenServer.
2003-04-10 Larry Jones <[email protected]>
* Makefile.in: Regenerated.
2003-02-25 Derek Price <[email protected]>
* Makefile.in: Regenerated.
2003-02-01 Larry Jones <[email protected]>
* util.c (finish_output): Handle EINTR from waitpid.
2002-09-24 Derek Price <[email protected]>
* Makefile.in: Regenerated using Automake 1.6.3.
+2 -1
View File
@@ -21,4 +21,5 @@ libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
context.c ed.c normal.c ifdef.c util.c dir.c version.c diff.h \
side.c system.h diffrun.h
EXTRA_DIST = ChangeLog build_diff.com diagmeet.note libdiff.dsp
EXTRA_DIST = ChangeLog build_diff.com diagmeet.note \
libdiff.dep libdiff.dsp libdiff.mak
+145 -71
View File
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,79 +13,117 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSH = @CSH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build_alias = @build_alias@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
INCLUDES = -I$(top_srcdir)/lib
@@ -96,8 +134,11 @@ libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
side.c system.h diffrun.h
EXTRA_DIST = ChangeLog build_diff.com diagmeet.note libdiff.dsp
EXTRA_DIST = ChangeLog build_diff.com diagmeet.note \
libdiff.dep libdiff.dsp libdiff.mak
subdir = diff
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -111,11 +152,7 @@ am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) analyze.$(OBJEXT) \
version.$(OBJEXT) side.$(OBJEXT)
libdiff_a_OBJECTS = $(am_libdiff_a_OBJECTS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/analyze.Po ./$(DEPDIR)/cmpbuf.Po \
@@ -129,19 +166,18 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(libdiff_a_SOURCES)
DIST_COMMON = ChangeLog Makefile.am Makefile.in
DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
SOURCES = $(libdiff_a_SOURCES)
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu diff/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
AR = ar
@@ -173,26 +209,35 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
distclean-depend:
-rm -rf ./$(DEPDIR)
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
CCDEPMODE = @CCDEPMODE@
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -218,20 +263,41 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -256,7 +322,6 @@ check: check-am
all-am: Makefile $(LIBRARIES)
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -268,7 +333,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -276,7 +341,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -286,9 +351,10 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
distclean-am: clean-am distclean-compile distclean-depend \
distclean-generic distclean-tags
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
dvi: dvi-am
@@ -309,25 +375,33 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
.PHONY: GTAGS all all-am check check-am clean clean-generic \
clean-noinstLIBRARIES distclean distclean-compile \
distclean-depend distclean-generic distclean-tags distdir dvi \
dvi-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic tags uninstall uninstall-am \
uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-noinstLIBRARIES ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am info \
info-am install install-am install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-man install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
ps ps-am tags uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+3 -1
View File
@@ -233,11 +233,13 @@ static struct option const longopts[] =
{0, 0, 0, 0}
};
int
diff_run (argc, argv, out, callbacks_arg)
int argc;
char *argv[];
char *out;
const char *out;
const struct diff_callbacks *callbacks_arg;
{
int val;
+1
View File
@@ -1363,6 +1363,7 @@ read_diff (filea, fileb, output_placement)
if (close (fd) != 0)
diff3_perror_with_exit ("pipe close");
unlink (diffout);
free( diffout );
return diff_result + total;
}
+1 -1
View File
@@ -56,7 +56,7 @@ struct diff_callbacks
/* Run a diff. */
extern int diff_run DIFFPARAMS((int, char **, char *,
extern int diff_run DIFFPARAMS((int, char **, const char *,
const struct diff_callbacks *));
/* Run a diff3. */
+2 -3
View File
@@ -508,11 +508,10 @@ find_identical_ends (filevec)
beg0 = filevec[0].prefix_end + (n0 < n1 ? 0 : n0 - n1);
/* Scan back until chars don't match or we reach that point. */
while (p0 != beg0)
if (*--p0 != *--p1)
for (; p0 != beg0; p0--, p1--)
if (*p0 != *p1)
{
/* Point at the first char of the matching suffix. */
++p0, ++p1;
beg0 = p0;
break;
}
+13 -3
View File
@@ -61,9 +61,19 @@ GNU General Public License for more details.
#if !defined(S_ISFIFO) && defined(S_IFFIFO)
#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFFIFO)
#endif
#if !defined(S_ISSOCK) && defined(S_IFSOCK)
#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
#endif
#ifndef S_ISSOCK
# if defined( S_IFSOCK )
# ifdef S_IFMT
# define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
# else
# define S_ISSOCK(mode) ((mode) & S_IFSOCK)
# endif /* S_IFMT */
# elif defined( S_ISNAM )
/* SCO OpenServer 5.0.6a */
# define S_ISSOCK S_ISNAM
# endif /* !S_IFSOCK && S_ISNAM */
#endif /* !S_ISSOCK */
#if HAVE_UNISTD_H
#include <unistd.h>
+4 -2
View File
@@ -300,7 +300,7 @@ finish_output ()
if (paginate_flag && outfile != 0 && outfile != stdout)
{
#ifdef PR_PROGRAM
int wstatus;
int wstatus, w;
if (ferror (outfile))
fatal ("write error");
# if ! HAVE_FORK
@@ -308,7 +308,9 @@ finish_output ()
# else /* HAVE_FORK */
if (fclose (outfile) != 0)
pfatal_with_name ("write error");
if (waitpid (pr_pid, &wstatus, 0) < 0)
while ((w = waitpid (pr_pid, &wstatus, 0)) < 0 && errno == EINTR)
;
if (w < 0)
pfatal_with_name ("waitpid");
# endif /* HAVE_FORK */
if (wstatus != 0)
+523 -1
View File
@@ -1,3 +1,525 @@
2004-05-28 Derek Price <[email protected]>
* cvs.texinfo (Global options): Remove reference to global -l option.
(Report from Kevin Bulgrien <[email protected]>.)
2004-05-14 Mark D. Baushke <[email protected]>
* cvs.texinfo: Fix makeinfo error.
* cvs.texinfo (Adding files): Minor cleanup.
(Using keywords): Minor cleanup.
(annotate): Move into the manual section, split into three nodes.
(annotate options): New node.
(annotate example): New node.
(based on patch from Steve McIntyre <[email protected]>.)
(Locks, GSSAPI authenticated): Minor cleanup.
(Sticky tags): Clarify operation.
(Locks): Spelling fix.
(Merging adds and removals): Ditto.
(Invoking CVS): Ditto
(Builds): Grammar fix.
(Line group formats): Ditto
(Line group formats, Line formats): Ditto
(commit files): Ditto.
* cvs.1, stamp-vti, version.texi: Regenerated
2004-05-12 Derek Price <[email protected]>
* mkman.in: Clarify status messages.
2004-05-10 Derek Price <[email protected]>
* mkman.in: Organize & tidy comments. Check for unprocessed texinfo
commands. Output better error messages on finding unprocessed texinfo
commands.
(do_keyword, keyword_mode): Accept $file argument for error messages.
2004-05-06 Derek Price <[email protected]>
* mkman.in: Require Perl 5.005. Add comments. Remove duplicate s///.
Handle @:.
2004-05-06 Derek Price <[email protected]>
* cvs.man.header: Minor text correction.
* mkman.in: Ignore @need keyword. Restore previous font for nested
keywords.
(do_keyword): Ditto on fonts. Move some functionality to...
(keyword_mode): ...this new function.
2004-05-06 Derek Price <[email protected]>
* mkman.in: Handle keywords that cross multiple lines.
(do_keyword): New function.
2004-05-04 Derek Price <[email protected]>
* cvs.man.header, cvs.man.footer: Reference `info CVS' rather than
`info cvs' to send users to the top node.
2004-05-03 Derek Price <[email protected]>
* Makefile.am: mkman is built in the build dir, not $(srcdir).
(Report from Mark D. Baushke <[email protected]>.)
2004-05-03 Derek Price <[email protected]>
* HACKING.DOCS: Fix spelling error. Add reference for @strong.
(Report from Mark D. Baushke <[email protected]>.)
* HACKING.DOCS: Note dependency on `makeinfo' 3.11 & greater.
2004-04-30 Derek Price <[email protected]>
* mkman.in: Handle single quotes better. Parse out some redundancy
from node and section names.
* cvs.man.footer: Replace some quotes with the usual bold font.
Reformat links in the SEE ALSO section.
* cvs.1: Regenerated.
2004-04-30 Derek Price <[email protected]>
* mkman.in: Handle examples better. Protect a few more characters.
* cvs.1, stamp-vti, version.texi: Regenerated.
2004-04-30 Derek Price <[email protected]>
* cvs.man.header: Add copyright notice.
* cvs.1: Regenerated.
2004-04-30 Derek Price <[email protected]>
* mkman.in: Add copyright and license notice.
2004-04-30 Derek Price <[email protected]>
* mkman.in: Handle @@.
* cvs.1: Regenerated.
2004-04-30 Derek Price <[email protected]>
First pass at closing issue #3 on cvshome.org.
* .cvsignore: Ignore mkman.
* cvs.1, mkman.in, cvs.man.header, cvs.man.footer: New files.
* cvs.texinfo: Add cut tags for mkman.
* Makefile.in (man_MANS): Add cvs.1.
(EXTRA_DIST): Add cvs.man.header & cvs.man.footer.
(cvs.1, mkman): New targets.
* Makefile.in: Regenerated.
2004-04-23 Derek Price <[email protected]>
* cvs.texinfo: Update years in Copyright.
* stamp-vti, version.texi: Regenerated.
2004-04-21 Derek Price <[email protected]>
* cvs.texinfo: Use splitrcskeyword macro consistently in a failed
attempt to avoid a warning during PDF generation.
* stamp-vti, version.texi: Regenerated.
2004-04-18 Derek Price <[email protected]>
* cvs.texinfo: Various spelling, typo, and capitalization fixes.
(Patch from Ville Skyttä <[email protected]>.)
2004-04-06 Larry Jones <[email protected]>
* cvs.texinfo (Assigning revisions): Note that client/server mode
only considers files sent to the server to determine the major
revision for new files.
(Reported by Krzysztof GORBIEL <[email protected]>.)
* stamp-vti, version.texi: Regenerated.
2004-03-15 Derek Price <[email protected]>
* stamp-vti, version.texi: Regenerated.
2004-03-11 Larry Jones <[email protected]>
* cvs.texinfo (loginfo, Error messages): Note that not reading all of
the log info can result in a broken pipe signal.
(Reported by Steven Nicoloso <[email protected]>.)
* stamp-vti, version.texi: Regenerated.
2004-02-04 Derek Price <[email protected]>
* cvs.texinfo (File Permissions): Clarify index entry.
* stamp-vti, version.texi: Regenerated.
2004-01-22 Derek Price <[email protected]>
* stamp-vti, version.texi: Regenerated.
2004-01-08 Larry Jones <[email protected]>
* cvs.texinfo (user-defined logging): Move taginfo stuff from here...
(Administrative files): ...to its own node under here.
2003-12-18 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.11.1.
2003-12-18 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.11.
2003-12-05 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated.
2003-12-04 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.10.1.
2003-12-04 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.10.
2003-11-18 Derek Price <[email protected]>
* stamp-vti, version.texi: Regenerated.
2003-11-13 Larry Jones <[email protected]>
* cvs.texinfo (Reverting local changes): Use the same vendor tag
in the admin command as was used in the previous import commands.
2003-11-10 Derek Price <[email protected]>
* stamp-vti, version.texi: Regenerated.
2003-11-07 Mark D. Baushke <[email protected]>
* cvs.texinfo (CVS commands): Fix typo.
(FreeBSD PR docs/58669 reported by Ceri Davies <[email protected]>.)
2003-10-30 Derek Price <[email protected]>
* stamp-vti, version.texi: Regenerated.
2003-10-30 Derek Price <[email protected]>
* cvs.texinfo (File permissions, Error messages): Add index entries for
CVSROOT/val-tags file.
2003-10-21 Derek Price <[email protected]>
* cvs.texinfo: Note gnu.cvs.* usenet mirrors of the email lists.
(Suggestion from Paul Edwards, from somewhere in Australia.)
* cvs.texinfo: Put email addresses in @email{} tags and URLs in @url{}
tags rather than relying on markup like @code{}.
* stamp-vti, version.texi: Regenerated.
2003-10-14 Derek Price <[email protected]>
* stamp-vti, version.texi: Regenerated.
2003-10-14 Derek Price <[email protected]>
Port to pedantic POSIX 1003.1-2001 hosts, such as Debian GNU/Linux
testing with _POSIX2_VERSION=200112 in the environment.
* cvs.texinfo: Suggest 'sed 1q', not 'head -1'.
(Patch from Paul Eggert <[email protected]>.)
2003-10-10 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.9.1.
2003-10-10 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.9.
2003-10-06 Derek Price <[email protected]>
* cvsclient.texi (Requests): Add recommendation to client developers to
avoid the `Case' request.
* stamp-1, version-client.texi: Regenerated.
2003-10-02 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.8.1.
2003-10-02 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.8.
2003-09-29 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.7.1.
2003-09-29 Derek Price <[email protected]>
* stamp-1, stamp-vti, version-client.texi, version.texi: Regenerated
for 1.11.7.
2003-09-12 Derek Price <[email protected]>
* cvs.texinfo (checkoutlist): Document the error messages which may be
specified in this file.
* stamp-vti, version.texi: Regenerated.
2003-08-27 Larry Jones <[email protected]>
* cvs.texinfo (history options): Note the 'P' record type which
has been around for a long time but never actually appeared in
the history file due to bugs in the code.
(Invoking CVS): Ditto.
(config): Ditto.
* stamp-vti, version.texi: Regenerated.
2003-08-07 Derek Price <[email protected]>
* .cvsignore: Ignore {cvs,cvsclient}.txt.
2003-08-07 Derek Price <[email protected]>
* cvs.texinfo: Use the @dircategory and @direntry commands from texinfo
rather than rolling our own.
* stamp-vti, version.texi: Regenerated.
2003-08-07 Derek Price <[email protected]>
* Makefile.am (POSTSCRIPTS): Rename to...
(PSS): ...to sync with and override Automakes default targets.
(PDFS): Reorder to match PSS.
(SUFFIXES): Remove .pdf and .aux.
(cvs.aux, cvs.pdf, cvsclient.aux, cvsclient.pdf): Remove these targets.
.aux weren't being generated anyhow and .pdf no longer need to be
supplied explicitly.
(cvs-paper.pdf: cvs-paper.ps): Provide ps2pdf rule explicitly.
(.{texinfo,texi,txy}.pdf): Remove these suffix rules - they are now
provided by Automake.
2003-08-06 Derek Price <[email protected]>
* Makefile.am (CLEANFILES): Move...
(MOSTLYCLEANFILES): ...here and drop PDFs since this is where Automake
cleans PDFs & PSs by default.
(MAINTAINERCLEANFILES): Clean all PostScripts even though they will
have been removed in mostlyclean. That is a bug in Automake.
(doc): Depend on info & ps.
(pdf, ps): Removed in favor of Automake's default targets for these
types.
(cvsclient.* targets): Depened on version-client.texi.
(cvs-paper.pdf): Remove in favor of Automake's default target.
(.{texinfo,texi,txi}.{pdf,txt}): Update these targets based on
Automake's similar treatment of dvi, ps, and info targets.
* .cvsignore: Add cvs.tmp, a `make pdf' generated file.
* Makefile.in: Regenerated.
2003-07-18 Derek Price <[email protected]>
* cvs.texinfo: Put a few errant references to bug-cvs inside @code{}
for consistancy.
2003-07-18 Derek Price <[email protected]>
* cvs.texinfo: Update WARNINGs and Notes for a more consistent
appearance. Remove some obsolete comments.
* stamp-vti: Regenerated.
* version.texi: Regenerated.
2003-07-12 Larry Jones <[email protected]>
* cvs.texinfo (Binary howto): Add note about how to determine whether
a file is marked as binary or not.
(Suggested by Erik Sigra <[email protected]>.)
* stamp-vti: Regenerated.
* version.texi: Regenerated.
2003-06-23 Derek Price <[email protected]>
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-06-16 Derek Price <[email protected]>
* cvs.texinfo (splitrcskeyword): New macro, now that @ifhtml will work
properly with texi2html (as of version 1.68), to cause output HTML to
contain <i></i> where we used to have @asis{} and prevent RCS keyword
substitution in generated HTML.
(Original patch from Patrice Dumas <[email protected]>.)
2003-06-11 Derek Price <[email protected]>
* cvs.texinfo (Invoking CVS): Remove `-P' from the list of `cvs export'
options.
(Patch from Alexander Taler <[email protected]>.)
2003-06-11 Derek Price <[email protected]>
* cvs.texinfo (Top): Remove out-of-date (by at least 5 years) comment.
(Patch from Alexander Taler <[email protected]>.)
2003-05-27 Derek Price <[email protected]>
* cvs.texinfo: Consolidate copyright notices into a single macro that
is called elsewhere to avoid needing three of them. Update copyright
notice.
(BUGS): Suggest Ximbiot rather than the defunct Signum Support as CVS
consultants.
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-05-26 Derek Price <[email protected]>
* stamp-1: Regenerated for 1.11.6.1.
* stamp-vti: Ditto.
* version-client.texi: Ditto.
* version.texi: Ditto.
2003-05-25 Derek Price <[email protected]>
* stamp-1: Regenerated for 1.11.6.
* stamp-vti: Ditto.
* version-client.texi: Ditto.
* version.texi: Ditto.
2003-05-21 Derek Price <[email protected]>
* Makefile.in: Regenerate with Automake version 1.7.5.
2003-04-28 Derek Price <[email protected]>
* cvs.texinfo (Working directory storage, Module options, Module
program options): Remove references to Checkin.prog and Update.prog.
(commit options): Remove reference to -n option.
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-04-10 Larry Jones <[email protected]>
* Makefile.in: Regenerated.
2003-03-26 Derek Price <[email protected]>
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-03-25 Larry Jones <[email protected]>
* cvs.texinfo (Server temporary directory): Reorder list of places
to match code.
(Connection): Add additional example error message and note about
firewall software.
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-03-24 Derek Price <[email protected]>
* Makefile.am: Update copyright notice.
* Makefile.in: Regenerated.
2003-03-06 Derek Price <[email protected]>
* cvs.texinfo (What is CVS?): Correct date of first post of CVS by
Dick Grune from December to July based on the archive posted on
Google:
<http://groups.google.com/groups?q=Grune+cvs+group:mod.sources.*&hl=en&lr=&ie=UTF-8&selm=122%40mirror.UUCP&rnum=2>.
(Thanks to David A Wheeler <[email protected]>.)
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-03-05 Mark D. Baushke <[email protected]>
* cvs.texinfo (CVS_LOCAL_BRANCH_NUM): Backout CVS_LOCAL_BRANCH_NUM
feature.
* cvs.texinfo (CVS_LOCAL_BRANCH_NUM): Document new environment
variable.
2003-02-27 Derek Price <[email protected]>
* cvs.texinfo (Environment variables): Make the information on
CVS_CLIENT_PORT slightly clearer.
(Kerberos authenticated): XREF the Environment variables node.
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-02-25 Derek Price <[email protected]>
* Makefile.in: Regenerated.
* stamp-1: Ditto.
* version-client.texi: Ditto.
2003-02-06 Derek Price <[email protected]>
* cvs.texinfo (Working directory storage, Module options,
Module program options): Correct description of where Checkin.prog
and Update.prog are run. Provide more index entries and cross
references. Remove some FIXME comments. Add a FIXCVS THEN FIXME.
(Thanks to Art Manion at the CERT Coordination Center <[email protected]>.)
2003-02-04 Derek Price <[email protected]>
* cvs.texinfo (File status): Mention the "Unresolved Conflict" status
which was apparently and erroneously removed from the doc at some
point in the past.
2003-02-03 Derek Price <[email protected]>
* cvs.texinfo (Merging a branch): Mention the GCA as opposed to the
"branch point" as the implicit revision when merging a branch.
2003-02-03 Derek Price <[email protected]>
* cvs.texinfo (Remote repositories): :METHOD: is optional.
2003-02-03 Derek Price <[email protected]>
* cvs.texinfo (Committing your changes): Move index entries closer to
their corresponding references.
(Environment variables): Include $VISUAL in order of
preference. Add index entries. Reference Global options node.
(Variables): Change order of list to match the Env. Variables node
mentioned above.
* stamp-1: Regenerated.
* stamp-vti: Ditto.
* version-client.texi: Ditto.
* version.texi: Ditto.
2003-02-14 Derek Price <[email protected]>
* cvs.texinfo (Watch Information, Editing files, Getting Notified,
Setting a watch): Edit usage specs for correctness and uniformity.
(Sticky tags): Use ref rather than xref to avoid a warning from
makeinfo.
* stamp-vti: Regenerated.
* version.texi: Ditto.
2003-01-23 Derek Price <[email protected]>
* stamp-1: Regenerated.
* stamp-vti: Ditto.
* version-client.texi: Ditto.
* version.texi: Ditto.
2003-01-22 Larry Jones <[email protected]>
* cvs.texinfo (config): Correct LogHistory default (U was omitted).
2003-01-16 Derek Price <[email protected]>
* stamp-1: Regenerated for version (1.11.5).
@@ -179,7 +701,7 @@
* Makefile.in: Regenerated.
* stamp-1: New file.
* version-client.texi: Ditto.
(Reportred by Alexey Mahotkin <[email protected]>.)
(Reported by Alexey Mahotkin <[email protected]>.)
2001-09-04 Derek Price <[email protected]>
+31 -34
View File
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
# Makefile for GNU CVS documentation (excluding man pages - see ../man).
# Copyright (C) 1986, 1988-1990, 2000 Free Software Foundation, Inc.
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -13,15 +15,16 @@
# GNU General Public License for more details.
info_TEXINFOS = cvs.texinfo cvsclient.texi
man_MANS = cvs.1
POSTSCRIPTS = \
PSS = \
cvs.ps \
cvs-paper.ps \
cvsclient.ps
PDFS = \
cvs-paper.pdf \
cvs.pdf \
cvs-paper.pdf \
cvsclient.pdf
TXTS = \
@@ -29,25 +32,26 @@ TXTS = \
cvsclient.txt
EXTRA_DIST = \
$(POSTSCRIPTS) \
$(PSS) \
.cvsignore \
ChangeLog.fsf \
RCSFILES \
mdate-sh \
cvs-paper.ms
cvs.1 \
cvs-paper.ms \
cvs.man.header \
cvs.man.footer
CLEANFILES = \
$(PDFS) \
MOSTLYCLEANFILES = \
$(TXTS)
# These Automake generates MOSTLYCLEAN targets for PostScripts genersted from
# TEXINFOS, but it shouldn't when those files are in EXTRA_DIST
MAINTAINERCLEANFILES = \
cvs-paper.ps
$(PSS)
doc ps: $(POSTSCRIPTS)
.PHONY: doc ps
pdf: $(PDFS)
.PHONY: pdf
doc: info ps
.PHONY: doc
txt: $(TXTS)
.PHONY: txt
@@ -58,8 +62,8 @@ dvi: cvs.dvi cvsclient.dvi
# FIXME-AUTOMAKE:
# For some reason if I remove version.texi, it doesn't get built automatically.
# This needs to be fixed in automake.
cvs.aux cvs.pdf cvs.txt: cvs.texinfo $(srcdir)/version.texi
cvsclient.aux cvsclient.pdf cvsclient.txt: cvsclient.texi
cvs.txt: cvs.texinfo $(srcdir)/version.texi
cvsclient.txt: cvsclient.texi $(srcdir)/version-client.texi
# These targets need to be very specific so that the other PDFs get generated
# correctly. If they are more generic and cvs.ps is made before cvs.pdf, then
@@ -70,36 +74,29 @@ cvs-paper.ps: cvs-paper.ms
mv $@-t $@
cvs-paper.pdf: cvs-paper.ps
$(PS2PDF) $< $@
ps2pdf $< $@
SUFFIXES = .aux .txt .pdf
# Targets to build a man page from cvs.texinfo.
cvs.1: @MAINTAINER_MODE_TRUE@ mkman cvs.man.header cvs.texinfo cvs.man.footer
./mkman $(srcdir)/cvs.man.header $(srcdir)/cvs.texinfo \
$(srcdir)/cvs.man.footer >$@
# texinfo based targets automake neglects to include
.texinfo.pdf:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
.txi.pdf:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
.texi.pdf:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
SUFFIXES = .txt
.texinfo.txt:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.txi.txt:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.texi.txt:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
##
## MAINTAINER Targets
##
## realclean ##
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
.PHONY: realclean
+282 -176
View File
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,9 @@
@SET_MAKE@
# Makefile for GNU CVS documentation (excluding man pages - see ../man).
# Copyright (C) 1986, 1988-1990, 2000 Free Software Foundation, Inc.
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,91 +28,130 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSH = @CSH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build_alias = @build_alias@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
info_TEXINFOS = cvs.texinfo cvsclient.texi
man_MANS = cvs.1
POSTSCRIPTS = \
PSS = \
cvs.ps \
cvs-paper.ps \
cvsclient.ps
PDFS = \
cvs-paper.pdf \
cvs.pdf \
cvs-paper.pdf \
cvsclient.pdf
@@ -120,157 +161,162 @@ TXTS = \
EXTRA_DIST = \
$(POSTSCRIPTS) \
$(PSS) \
.cvsignore \
ChangeLog.fsf \
RCSFILES \
mdate-sh \
cvs-paper.ms
cvs.1 \
cvs-paper.ms \
cvs.man.header \
cvs.man.footer
CLEANFILES = \
$(PDFS) \
MOSTLYCLEANFILES = \
$(TXTS)
# These Automake generates MOSTLYCLEAN targets for PostScripts genersted from
# TEXINFOS, but it shouldn't when those files are in EXTRA_DIST
MAINTAINERCLEANFILES = \
cvs-paper.ps
$(PSS)
SUFFIXES = .aux .txt .pdf
# texinfo based targets automake neglects to include
SUFFIXES = .txt
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CONFIG_CLEAN_FILES = mkman
DIST_SOURCES =
am__TEXINFO_TEX_DIR = $(srcdir)
INFO_DEPS = cvs.info cvsclient.info
DVIS = cvs.dvi cvsclient.dvi
TEXINFOS = cvs.texinfo cvsclient.texi
DIST_COMMON = ChangeLog Makefile.am Makefile.in mdate-sh stamp-1 \
stamp-vti texinfo.tex version-client.texi version.texi
NROFF = nroff
MANS = $(man_MANS)
DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am mdate-sh \
mkman.in stamp-1 stamp-vti texinfo.tex version-client.texi \
version.texi
all: all-am
.SUFFIXES:
.SUFFIXES: .aux .txt .pdf .dvi .info .ps .texi .texinfo .txi
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
.SUFFIXES: .txt .dvi .info .pdf .ps .texi .texinfo .txi
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
mkman: $(top_builddir)/config.status mkman.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(srcdir)/version.texi: $(srcdir)/stamp-vti
@:
$(srcdir)/stamp-vti: cvs.texinfo $(top_srcdir)/configure.in
@(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/cvs.texinfo`; \
.texinfo.info:
@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.texinfo.dvi:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
.texinfo.pdf:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
cvs.info: cvs.texinfo version.texi
cvs.dvi: cvs.texinfo version.texi
cvs.pdf: cvs.texinfo version.texi
version.texi: @MAINTAINER_MODE_TRUE@ stamp-vti
stamp-vti: cvs.texinfo $(top_srcdir)/configure
@(dir=.; test -f ./cvs.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cvs.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
echo "@set VERSION $(VERSION)") > vti.tmp
@cmp -s vti.tmp $(srcdir)/version.texi \
|| (echo "Updating $(srcdir)/version.texi"; \
cp vti.tmp $(srcdir)/version.texi)
@cmp -s vti.tmp version.texi \
|| (echo "Updating version.texi"; \
cp vti.tmp version.texi)
-@rm -f vti.tmp
@cp $(srcdir)/version.texi $@
@cp version.texi $@
mostlyclean-vti:
-rm -f vti.tmp
maintainer-clean-vti:
-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
@MAINTAINER_MODE_TRUE@ -rm -f stamp-vti version.texi
cvs.info: cvs.texinfo $(srcdir)/version.texi
cvs.dvi: cvs.texinfo $(srcdir)/version.texi
.texi.info:
@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $@ `test -f '$<' || echo '$(srcdir)/'`$<
$(srcdir)/version-client.texi: $(srcdir)/stamp-1
@:
$(srcdir)/stamp-1: cvsclient.texi $(top_srcdir)/configure.in
@(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/cvsclient.texi`; \
.texi.dvi:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
.texi.pdf:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
cvsclient.info: cvsclient.texi version-client.texi
cvsclient.dvi: cvsclient.texi version-client.texi
cvsclient.pdf: cvsclient.texi version-client.texi
version-client.texi: @MAINTAINER_MODE_TRUE@ stamp-1
stamp-1: cvsclient.texi $(top_srcdir)/configure
@(dir=.; test -f ./cvsclient.texi || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cvsclient.texi`; \
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
echo "@set VERSION $(VERSION)") > 1.tmp
@cmp -s 1.tmp $(srcdir)/version-client.texi \
|| (echo "Updating $(srcdir)/version-client.texi"; \
cp 1.tmp $(srcdir)/version-client.texi)
@cmp -s 1.tmp version-client.texi \
|| (echo "Updating version-client.texi"; \
cp 1.tmp version-client.texi)
-@rm -f 1.tmp
@cp $(srcdir)/version-client.texi $@
@cp version-client.texi $@
mostlyclean-1:
-rm -f 1.tmp
maintainer-clean-1:
-rm -f $(srcdir)/stamp-1 $(srcdir)/version-client.texi
@MAINTAINER_MODE_TRUE@ -rm -f stamp-1 version-client.texi
cvsclient.info: cvsclient.texi $(srcdir)/version-client.texi
cvsclient.dvi: cvsclient.texi $(srcdir)/version-client.texi
.texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
`echo $< | sed 's,.*/,,'`
.texi.dvi:
TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) $<
.texi:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
`echo $< | sed 's,.*/,,'`
.texinfo.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
`echo $< | sed 's,.*/,,'`
.texinfo.dvi:
TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) $<
.texinfo:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
`echo $< | sed 's,.*/,,'`
MAKEINFO = @MAKEINFO@
TEXI2PDF = $(TEXI2DVI) --pdf --batch
DVIPS = dvips
.dvi.ps:
$(DVIPS) $< -o $@
$(DVIPS) -o $@ $<
uninstall-info-am:
$(PRE_UNINSTALL)
@if (install-info --version && \
install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \
install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \
done; \
else :; fi
@$(NORMAL_UNINSTALL)
@list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
(if cd $(DESTDIR)$(infodir); then \
echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
else :; fi); \
done
dist-info: $(INFO_DEPS)
list='$(INFO_DEPS)'; \
for base in $$list; do \
d=$(srcdir); \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
for file in $$d/$$base*; do \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
test -f $(distdir)/$$relfile || \
@@ -279,30 +325,86 @@ dist-info: $(INFO_DEPS)
done
mostlyclean-aminfo:
-rm -f cvs.aux cvs.cp cvs.cps cvs.dvi cvs.fn cvs.fns cvs.ky cvs.log cvs.pg \
cvs.ps cvs.tmp cvs.toc cvs.tp cvs.vr cvsclient.aux \
cvsclient.cp cvsclient.dvi cvsclient.fn cvsclient.ky \
cvsclient.log cvsclient.pg cvsclient.ps cvsclient.tmp \
cvsclient.toc cvsclient.tp cvsclient.vr
-rm -f cvs.aux cvs.cp cvs.cps cvs.fn cvs.fns cvs.ky cvs.kys cvs.log cvs.pg \
cvs.pgs cvs.tmp cvs.toc cvs.tp cvs.tps cvs.vr cvs.vrs cvs.dvi \
cvs.pdf cvs.ps cvsclient.aux cvsclient.cp cvsclient.cps \
cvsclient.fn cvsclient.fns cvsclient.ky cvsclient.kys \
cvsclient.log cvsclient.pg cvsclient.pgs cvsclient.tmp \
cvsclient.toc cvsclient.tp cvsclient.tps cvsclient.vr \
cvsclient.vrs cvsclient.dvi cvsclient.pdf cvsclient.ps
maintainer-clean-aminfo:
cd $(srcdir) && \
list='$(INFO_DEPS)'; for i in $$list; do \
rm -f $$i; \
if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
rm -f $$i-[0-9]*; \
fi; \
@list='$(INFO_DEPS)'; for i in $$list; do \
i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
done
man1dir = $(mandir)/man1
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(man1dir)
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
case "$$i" in \
*.1*) list="$$list $$i" ;; \
esac; \
done; \
for i in $$list; do \
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
case "$$ext" in \
1*) ;; \
*) ext='1' ;; \
esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
done
uninstall-man1:
@$(NORMAL_UNINSTALL)
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
case "$$i" in \
*.1*) list="$$list $$i" ;; \
esac; \
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
case "$$ext" in \
1*) ;; \
*) ext='1' ;; \
esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
rm -f $(DESTDIR)$(man1dir)/$$inst; \
done
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -323,15 +425,14 @@ distdir: $(DISTFILES)
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="${top_distdir}" distdir="$(distdir)" \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-info
check-am: all-am
check: check-am
all-am: Makefile $(INFO_DEPS)
all-am: Makefile $(INFO_DEPS) $(MANS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(infodir)
$(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -343,16 +444,16 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -363,7 +464,7 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -374,7 +475,7 @@ info: info-am
info-am: $(INFO_DEPS)
install-data-am: install-info-am
install-data-am: install-info-am install-man
install-exec-am:
@@ -385,10 +486,12 @@ install-info-am: $(INFO_DEPS)
$(mkinstalldirs) $(DESTDIR)$(infodir)
@list='$(INFO_DEPS)'; \
for file in $$list; do \
d=$(srcdir); \
for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
$$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
if test -f $$ifile; then \
relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
$(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
else : ; fi; \
@@ -396,19 +499,20 @@ install-info-am: $(INFO_DEPS)
done
@$(POST_INSTALL)
@if (install-info --version && \
install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
relfile=`echo "$$file" | sed 's|^.*/||'`; \
echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
done; \
else : ; fi
install-man:
install-man: install-man1
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-1 \
maintainer-clean-aminfo maintainer-clean-generic \
maintainer-clean-vti
@@ -418,24 +522,33 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-1 mostlyclean-aminfo mostlyclean-generic \
mostlyclean-vti
uninstall-am: uninstall-info-am
pdf: pdf-am
pdf-am: $(PDFS)
ps: ps-am
ps-am: $(PSS)
uninstall-am: uninstall-info-am uninstall-man
uninstall-man: uninstall-man1
.PHONY: all all-am check check-am clean clean-generic dist-info \
distclean distclean-generic distdir dvi dvi-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-1 maintainer-clean-aminfo \
maintainer-clean-generic maintainer-clean-vti mostlyclean \
mostlyclean-1 mostlyclean-aminfo mostlyclean-generic \
mostlyclean-vti uninstall uninstall-am uninstall-info-am
install-man1 install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-1 \
maintainer-clean-aminfo maintainer-clean-generic \
maintainer-clean-vti mostlyclean mostlyclean-1 \
mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
uninstall-man uninstall-man1
doc ps: $(POSTSCRIPTS)
.PHONY: doc ps
pdf: $(PDFS)
.PHONY: pdf
doc: info ps
.PHONY: doc
txt: $(TXTS)
.PHONY: txt
@@ -446,8 +559,8 @@ dvi: cvs.dvi cvsclient.dvi
# FIXME-AUTOMAKE:
# For some reason if I remove version.texi, it doesn't get built automatically.
# This needs to be fixed in automake.
cvs.aux cvs.pdf cvs.txt: cvs.texinfo $(srcdir)/version.texi
cvsclient.aux cvsclient.pdf cvsclient.txt: cvsclient.texi
cvs.txt: cvs.texinfo $(srcdir)/version.texi
cvsclient.txt: cvsclient.texi $(srcdir)/version-client.texi
# These targets need to be very specific so that the other PDFs get generated
# correctly. If they are more generic and cvs.ps is made before cvs.pdf, then
@@ -458,28 +571,21 @@ cvs-paper.ps: cvs-paper.ms
mv $@-t $@
cvs-paper.pdf: cvs-paper.ps
$(PS2PDF) $< $@
# texinfo based targets automake neglects to include
.texinfo.pdf:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
.txi.pdf:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
.texi.pdf:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
ps2pdf $< $@
# Targets to build a man page from cvs.texinfo.
cvs.1: @MAINTAINER_MODE_TRUE@ mkman cvs.man.header cvs.texinfo cvs.man.footer
./mkman $(srcdir)/cvs.man.header $(srcdir)/cvs.texinfo \
$(srcdir)/cvs.man.footer >$@
.texinfo.txt:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.txi.txt:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.texi.txt:
TEXINPUTS=$(srcdir):$$TEXINPUTS \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
File diff suppressed because it is too large. Load diff
Loaded 100 of 2505 files, more files were not shown because too many files have changed in this diff. Show more