Note ipfilter update to 3.4.12, cd(4) support for write operations,

MFC of OpenSSH-2.2.0, MFC of chio(1) enhancements, MFC of libisc
import, mergemaster improvements.

2 files changed, 28 insertions, 8 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 50b6c96..2a5890b 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -80,7 +80,7 @@ Due to a licensing change, softupdates have been integrated into the
 main portion of the kernel source tree.  As a consequence, softupdates   
 are now available with the GENERIC kernel. [MERGED]
 
-ipfilter has been updated to 3.4.9. 
+ipfilter has been updated to 3.4.13. 
 
 The tap driver, a virtual Ethernet device driver for bridged 
 configurations, has been added.  [MERGED]
@@ -173,6 +173,15 @@ Extremely large swap areas (>67 GB) no longer panic the system.
 The Inode Filesystem (IFS) has been added; more information can be
 found in /usr/src/sys/ufs/ifs/README.
 
+The cd(4) driver now has support for write operations.  This allows
+writing to DVD-RAM, PD and similar drives that probe as CD devices.
+Note that change affects only random-access writeable devices, not
+sequential-only writeable devices such as CD-R drives, which are
+supported by cdrecord.
+
+mergemaster(8) has gained some new features, has been cleaned up
+somewhat, and is now more cross-platform friendly.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -223,7 +232,7 @@ handle DSA keys.  An sftp server interoperable with ssh.com clients
 and others has been added.  scp(1) can now handle files >2GB.
 Interoperability with other ssh2 clients/servers has been improved.  A
 new feature to limit the number of outstanding unauthenticated ssh
-connections in sshd has been added.
+connections in sshd has been added. [MERGED]
 
 Support for USB devices was added to the GENERIC kernel and to the
 installation programs to support USB devices out of the box.  Note that
@@ -322,7 +331,7 @@ setproctitle(3) has been moved from libutil to libc. [MERGED]
 
 chio(1) now has the ability to specify elements by volume tag instead
 of by their physical location as well as the ability to return an
-element to its previous location.
+element to its previous location. [MERGED]
 
 sed(1) now takes a -E option for extended regular expression
 support. [MERGED]
@@ -363,7 +372,8 @@ gperf has been updated to 2.7.2.
 style.perl.7, a style guide for Perl code in the FreeBSD base system,
 has been added.
 
-The ISC library from the BIND distribution is now built as libisc.
+The ISC library from the BIND distribution is now built as
+libisc. [MERGED]
 
 The "in use" percentage metric displayed by netstat(1) now really
 reflects the percentage of network mbufs used. [MERGED]
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index ba2d39a..aa36a38 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -86,7 +86,7 @@ are now available with the GENERIC kernel. [MERGED]
 
 A driver for AGP hardware has been added. [MERGED]
 
-ipfilter has been updated to 3.4.9.
+ipfilter has been updated to 3.4.12.
 
 Various fixes and improvements to the IPv6 code have been merged in
 from the KAME project, including significantly-improved IPSEC
@@ -219,6 +219,12 @@ The ncv, nsp, and stg drivers have been ported from NetBSD/pc98.
 They supports NCR 53C50 / Workbit Ninja SCSI-3 / TMC 18C30, 18C50 
 based PC-Card/ISA SCSI controllers.
 
+The cd(4) driver now has support for write operations.  This allows
+writing to DVD-RAM, PD and similar drives that probe as CD devices.
+Note that change affects only random-access writeable devices, not
+sequential-only writeable devices such as CD-R drives, which are
+supported by cdrecord.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -269,7 +275,7 @@ handle DSA keys.  An sftp server interoperable with ssh.com clients
 and others has been added.  scp(1) can now handle files >2GB.
 Interoperability with other ssh2 clients/servers has been improved.  A
 new feature to limit the number of outstanding unauthenticated ssh
-connections in sshd has been added.
+connections in sshd has been added. [MERGED]
 
 Support for USB devices was added to the GENERIC kernel and to the
 installation programs to support USB devices out of the box.  Note that
@@ -387,7 +393,7 @@ setproctitle(3) has been moved from libutil to libc. [MERGED]
 
 chio(1) now has the ability to specify elements by volume tag instead
 of by their physical location as well as the ability to return an
-element to its previous location.
+element to its previous location. [MERGED]
 
 sed(1) now takes a -E option for extended regular expression
 support. [MERGED]
@@ -428,11 +434,15 @@ gperf has been updated to 2.7.2.
 style.perl.7, a style guide for Perl code in the FreeBSD base system,
 has been added.
 
-The ISC library from the BIND distribution is now built as libisc.
+The ISC library from the BIND distribution is now built as
+libisc. [MERGED]
 
 The "in use" percentage metric displayed by netstat(1) now really
 reflects the percentage of network mbufs used. [MERGED]
 
+mergemaster(8) has gained some new features, has been cleaned up
+somewhat, and is now more cross-platform friendly.
+
 
 2. Supported Configurations
 ---------------------------