This commit was manufactured by cvs2svn to create branch 'RELENG_6_0'.
This commit was manufactured by cvs2svn to create branch 'RELENG_6_0'.
This commit was manufactured by cvs2svn to create branch 'RELENG_6_0'.
Correct a man-in-the-middle SSL version rollback vulnerability.

Security:       FreeBSD-SA-05:21.openssl
Approved by:    re@ (scottl)
MFC revision 1.24:
 > The pthread_attr_set_createsuspend_np was broken, fix it by
 > replacing THR_FLAGS_SUSPENDED with THR_FLAGS_NEED_SUSPEND.

Approved by: re (scottl)
MFRELENG_6 Simplified Chinese translation of Release Documentations

Approved by:	re (hrs)
MFC (by gibbs):
| Correct bug that caused the completed "recovery" scb to have its
| timer reset rather than the timer of an SCB still pending on the
| controller after recovery completed.  This should correct timeout
| loops seen in the field.
|
| Revision  Changes    Path
| 1.22      +2 -1      src/sys/dev/aic7xxx/aic79xx_osm.c
| 1.43      +2 -1      src/sys/dev/aic7xxx/aic7xxx_osm.c

Approved by:	re (kensmith)
MFC: Sync the driver with RELENG_6 to pick up critical atapi-cd and ata-raid
fixes, as well as ATI support.

Submitted by:	sos
Approved by:	re
Merge the 'kldstat -q' functionality, that is required for proper
operation of the /etc/rc.d/pfsync script, that was merged before
the RELENG_6_0 has been forked.

Approved by:	re (kensmith)
MFR6 Release Notes Language Improvements

Approved by:	re (hrs)
Use RELENG_6_0 for standard-supfile.

Approved by:	re (implicitly)
Update various version numbers and entities
for upcoming 6.0-RELEASE.

Approved by:	re (implicitly)
Update version numbers for upcoming 6.0-RELEASE.

Approved by:	re (implicitly)
Merge ufs_extattr.c:1.82 from RELENG_6 to RELENG_6_0:

  When performing a VOP_LOOKUP() as part of UFS1 extended attribute
  auto-start, set cnp.cn_lkflags to LK_EXCLUSIVE.  This flag must now
  be set so that lockmgr knows what kind of lock to acquire, and it
  will panic if not specified.  This resulted in a panic when using
  extended attributes on UFS1 as of locking work present in the 6.x
  branch.

  Reported by:    lofi

Approved by:    re (kensmith)
Merge in.c:1.89,1.90 from HEAD to RELENG_6_0:

  Acquire Giant conditionally in in_addmulti() and in_delmulti() based on
  whether the interface being accessed is IFF_NEEDSGIANT or not.  This
  avoids lock order reversals when calling into the interface ioctl
  handler, which could potentially lead to deadlock.

  The long term solution is to eliminate non-MPSAFE network drivers.

  Discussed with: jhb

  Unlock Giant symmetrically with respect to lock acquire order as that's
  generally nicer.

  Spotted by:     johan

Approved by:    re (kensmith)
MFC r1.72: Partially revert r1.67 which changed maxbcache and maxswzone
from int to long without updating the <sys/buf.h> version.  This broke the
corresponding tunables on sparc.

Approved by:    re (kensmith)
MFC r1.20:

Add a default value for VM_BCACHE_SIZE_MAX of 400MB.  This is copied from
amd64, and is a factor of 3 less than the value previously auto-sized on
a 12GB machine, which would cause an overflow in calculations involving the
maxbcache int, causing bufinit() to loop forever at boot.

Approved by:	re (kensmith)
MF-RELENG_6: rtl8029 and qemu fixes.
>   1.2       +6 -5      src/sys/dev/ed/if_ed_rtl80x9.c
>   1.48      +9 -2      src/sys/dev/ed/if_ed_pci.c
Approved by: re@ (kensmith)
MF6:	nanobsd.sh fixes

Approved by:	re@ (scottl)
MF6: Update critical(9) with recently reality.

Approved by:	re (kensmith)