New release notes: timed(8) fix (FreeBSD-SA-01:28), rwhod(8) fix

(FreeBSD-SA-01:29), Heimdal 0.3 update, pkg_sign(1) and pkg_check(1)
added, BSD_daemon graphics.

Many MFCs for RELENG_4 noted as well.

2 files changed, 67 insertions, 32 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 1221c02..073b8ff 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -143,10 +143,11 @@ and Maestro-2e; Forte Media fm801, ESS Maestro-2e, and VIA
 Technologies VT82C686A sound card/chipsets, and has received some
 other updates.  [MERGED] A driver for the ESS Maestro-3/Allegro has
 been added, however due to the amount of GPL firmware included, it
-will only be built as a module.  Separate drivers for the SoundBlaster
-8 and Soundblaster 16 now replace an older, unified driver.
-A driver for the CMedia CMI8338/CMI8738 sound chips has been added. 
-A driver for the CS4281 sound chip has been added. [MERGED]
+will only be built as a module. [MERGED] Separate drivers for the
+SoundBlaster 8 and Soundblaster 16 now replace an older, unified
+driver. [MERGED] A driver for the CMedia CMI8338/CMI8738 sound chips
+has been added.  A driver for the CS4281 sound chip has been
+added. [MERGED]
 
 Replace the PQ_*CACHE options with a single PQ_CACHESIZE option to be
 set to the cache size in kilobytes.  The old options are still
@@ -406,6 +407,14 @@ securely. [MERGED]
 A bug in ICMP that could cause an attacker to disrupt TCP and UDP
 "sessions" has been corrected. [MERGED]
 
+A bug in timed(8), which caused it to crash if send certain malformed
+packets, has been corrected (see security advisory
+FreeBSD-SA-01:28). [MERGED]
+
+A bug in rwhod(8), which caused it to crash if send certain malformed
+packets, has been corrected (see security advisory
+FreeBSD-SA-01:29). [MERGED]
+
 
 1.3. USERLAND CHANGES
 ---------------------
@@ -421,7 +430,7 @@ mtree as a part of an intrusion-detection system.  [MERGED]
 OpenSSL has been upgraded to 0.9.6. [MERGED]
 
 OpenSSL now has support for machine-dependent ASM optimizations,
-activated by the new MACHINE_CPU Makefile variable.
+activated by the new MACHINE_CPU Makefile variable. [MERGED]
 
 The OPIE one-time-password suite has been updated to 2.32. [MERGED]
 
@@ -456,7 +465,7 @@ SRM does not support USB devices at the moment, so you must still use
 an AT keyboard if you are not using a serial console. [MERGED]
 
 The csh(1) shell has been replaced by tcsh(1), although it can still
-be run as csh(1). [MERGED]  tcsh has been updated to version 6.10.
+be run as csh(1).  tcsh has been updated to version 6.10. [MERGED]
 
 The more(1) command has been replaced by less(1), although it can still
 be run as more(1). [MERGED]
@@ -631,7 +640,7 @@ IP Filter is now supported by the rc.conf(5) boot-time configuration
 and initialization. [MERGED]
 
 The lastlogin(1) utility, which prints the last login time of each
-user, has been imported from NetBSD.
+user, has been imported from NetBSD. [MERGED]
 
 newfs(1) now implements write combining, which can make creation of
 new filesystems up to seven times faster. [MERGED]
@@ -690,7 +699,7 @@ lpr(1), lpq(1), and lpd(8) have received a few minor
 enhancements. [MERGED]
 
 pkg_update(1), a utility to update installed packages and update their
-dependencies, has been added.
+dependencies, has been added. [MERGED]
 
 pkg_info(1) now supports globbing against names of installed packages.
 The -G option disables this behavior, and the -x option causes regular
@@ -701,7 +710,9 @@ with a "-", it is assumed to be an interface.
 
 rdist(1) has been retired.
 
-Kerberos IV has been updated to 1.0.5.
+Kerberos IV has been updated to 1.0.5. [MERGED]
+
+Heimdal has been updated to 0.3e. [MERGED]
 
 ppp(8) has gained the tcpmssfixup option, which adjusts outgoing TCP
 SYN packets so that the maximum receive segment size is no larger than
@@ -781,7 +792,7 @@ expressions. [MERGED]
 
 tftpd(8) now takes the -c and -C options, which allow the server to
 chroot(2) based on the IP address of the connecting client.  tftp(1)
-and tftpd(8) can now transfer files larger than 65535 blocks.
+and tftpd(8) can now transfer files larger than 65535 blocks. [MERGED]
 
 vidcontrol(1) now accepts a -g parameter to select custom text
 geometry in the VESA_800x600 raster text mode. [MERGED]
@@ -807,7 +818,7 @@ present in FreeBSD 3.5.1-RELEASE. [MERGED]
 
 savecore(8) now supports a -k option to prevent clearing a crash dump
 after saving it.  It also attempts to avoid writing large stretches of
-zeros to crash dump files to save space and time.
+zeros to crash dump files to save space and time. [MERGED]
 
 When requested to delete multiple packages, pkg_delete(1) will now
 attempt to remove them in dependency order rather than the order
@@ -815,13 +826,13 @@ specified on the command line. [MERGED]
 
 pkg_delete(1) now can perform glob/regexp matching of package names.
 In addition, it supports the -a option for removing all packages and
-the -i option for rm(1)-style interactive confirmation.
+the -i option for rm(1)-style interactive confirmation. [MERGED]
 
 tar(1) now supports the TAR_RSH variable, principally to enable the
 use of ssh(1) as a transport. [MERGED]
 
 disklabel(8) now supports partition sizes expressed in kilobytes,
-megabytes, or gigabytes, in addition to sectors.
+megabytes, or gigabytes, in addition to sectors. [MERGED]
 
 The pseudo-random number generator implemented by rand(3) has been
 improved to provide less biased results.
@@ -834,12 +845,12 @@ given group.
 
 The new CPUTYPE make.conf variable controls the compilation of
 processor-specific optimizations in various pieces of code such as
-OpenSSL.
+OpenSSL. [MERGED]
 
 The default value for the CVS_RSH variable (used by cvs(1)) is now
-ssh, rather than rsh.
+ssh, rather than rsh. [MERGED]
 
-bc has been updated from 1.04 to 1.06.
+bc has been updated from 1.04 to 1.06. [MERGED]
 
 ipfstat(8) now supports the -t option to turn on a top(1)-like
 display. [MERGED]
@@ -848,6 +859,13 @@ The dreaded 'going nowhere without my init' bug that manifested itself
 while installing on hardware that had labeled disks connected (e.g. 
 with Tru64 on it) has been fixed.
 
+pkg_sign(1) and pkg_check(1) have been added to digitally sign and 
+verify the signatures on binary package files. [MERGED]
+
+/usr/src/share/examples/BSD_daemon/ now contains a scalable Beastie
+graphic. [MERGED]
+
+
 2. Supported Configurations
 ---------------------------
 
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 70b644e..0d97cd9 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -166,10 +166,11 @@ and Maestro-2e; Forte Media fm801, ESS Maestro-2e, and VIA
 Technologies VT82C686A sound card/chipsets, and has received some
 other updates. [MERGED] A driver for the ESS Maestro-3/Allegro has
 been added, however due to the amount of GPL firmware included, it
-will only be built as a module.  Separate drivers for the SoundBlaster
-8 and Soundblaster 16 now replace an older, unified driver.
-A driver for the CMedia CMI8338/CMI8738 sound chips has been added.
-A driver for the CS4281 sound chip has been added. [MERGED]
+will only be built as a module. [MERGED] Separate drivers for the
+SoundBlaster 8 and Soundblaster 16 now replace an older, unified
+driver. [MERGED] A driver for the CMedia CMI8338/CMI8738 sound chips
+has been added.  A driver for the CS4281 sound chip has been
+added. [MERGED]
 
 Replace the PQ_*CACHE options with a single PQ_CACHESIZE option to be
 set to the cache size in kilobytes.  The old options are still
@@ -481,6 +482,14 @@ securely. [MERGED]
 A bug in ICMP that could cause an attacker to disrupt TCP and UDP
 "sessions" has been corrected. [MERGED]
 
+A bug in timed(8), which caused it to crash if send certain malformed
+packets, has been corrected (see security advisory
+FreeBSD-SA-01:28). [MERGED]
+
+A bug in rwhod(8), which caused it to crash if send certain malformed
+packets, has been corrected (see security advisory
+FreeBSD-SA-01:29). [MERGED]
+
 
 1.3. USERLAND CHANGES
 ---------------------
@@ -496,7 +505,7 @@ mtree as a part of an intrusion-detection system.  [MERGED]
 OpenSSL has been upgraded to 0.9.6. [MERGED]
 
 OpenSSL now has support for machine-dependent ASM optimizations,
-activated by the new MACHINE_CPU Makefile variable.
+activated by the new MACHINE_CPU Makefile variable. [MERGED]
 
 The OPIE one-time-password suite has been updated to 2.32. [MERGED]
 
@@ -538,7 +547,7 @@ length (1024 bytes).  As a result, several userland changes were made to
 cope with MBR boot loaders of varying sizes. [MERGED]
 
 The csh(1) shell has been replaced by tcsh(1), although it can still
-be run as csh(1). [MERGED]  tcsh has been updated to version 6.10.
+be run as csh(1).  tcsh has been updated to version 6.10. [MERGED]
 
 The more(1) command has been replaced by less(1), although it can still
 be run as more(1). [MERGED]
@@ -725,7 +734,7 @@ IP Filter is now supported by the rc.conf(5) boot-time configuration
 and initialization. [MERGED]
 
 The lastlogin(1) utility, which prints the last login time of each
-user, has been imported from NetBSD.
+user, has been imported from NetBSD. [MERGED]
 
 newfs(1) now implements write combining, which can make creation of
 new filesystems up to seven times faster. [MERGED]
@@ -783,7 +792,7 @@ lpr(1), lpq(1), and lpd(8) have received a few minor
 enhancements. [MERGED]
 
 pkg_update(1), a utility to update installed packages and update their
-dependencies, has been added.
+dependencies, has been added. [MERGED]
 
 pkg_info(1) now supports globbing against names of installed packages.
 The -G option disables this behavior, and the -x option causes regular
@@ -794,7 +803,9 @@ with a "-", it is assumed to be an interface.
 
 rdist(1) has been retired.
 
-Kerberos IV has been updated to 1.0.5.
+Kerberos IV has been updated to 1.0.5. [MERGED]
+
+Heimdal has been updated to 0.3e. [MERGED]
 
 ppp(8) has gained the tcpmssfixup option, which adjusts outgoing TCP
 SYN packets so that the maximum receive segment size is no larger than
@@ -874,7 +885,7 @@ expressions. [MERGED]
 
 tftpd(8) now takes the -c and -C options, which allow the server to
 chroot(2) based on the IP address of the connecting client.  tftp(1)
-and tftpd(8) can now transfer files larger than 65535 blocks.
+and tftpd(8) can now transfer files larger than 65535 blocks. [MERGED]
 
 vidcontrol(1) now accepts a -g parameter to select custom text
 geometry in the VESA_800x600 raster text mode. [MERGED]
@@ -900,7 +911,7 @@ present in FreeBSD 3.5.1-RELEASE. [MERGED]
 
 savecore(8) now supports a -k option to prevent clearing a crash dump
 after saving it.  It also attempts to avoid writing large stretches of
-zeros to crash dump files to save space and time.
+zeros to crash dump files to save space and time. [MERGED]
 
 When requested to delete multiple packages, pkg_delete(1) will now
 attempt to remove them in dependency order rather than the order
@@ -908,13 +919,13 @@ specified on the command line. [MERGED]
 
 pkg_delete(1) now can perform glob/regexp matching of package names.
 In addition, it supports the -a option for removing all packages and
-the -i option for rm(1)-style interactive confirmation.
+the -i option for rm(1)-style interactive confirmation. [MERGED]
 
 tar(1) now supports the TAR_RSH variable, principally to enable the
 use of ssh(1) as a transport. [MERGED]
 
 disklabel(8) now supports partition sizes expressed in kilobytes,
-megabytes, or gigabytes, in addition to sectors.
+megabytes, or gigabytes, in addition to sectors. [MERGED]
 
 The pseudo-random number generator implemented by rand(3) has been
 improved to provide less biased results.
@@ -927,16 +938,22 @@ given group.
 
 The new CPUTYPE make.conf variable controls the compilation of
 processor-specific optimizations in various pieces of code such as
-OpenSSL.
+OpenSSL. [MERGED]
 
 The default value for the CVS_RSH variable (used by cvs(1)) is now
-ssh, rather than rsh.
+ssh, rather than rsh. [MERGED]
 
-bc has been updated from 1.04 to 1.06.
+bc has been updated from 1.04 to 1.06. [MERGED]
 
 ipfstat(8) now supports the -t option to turn on a top(1)-like
 display. [MERGED]
 
+pkg_sign(1) and pkg_check(1) have been added to digitally sign and 
+verify the signatures on binary package files. [MERGED]
+
+/usr/src/share/examples/BSD_daemon/ now contains a scalable Beastie
+graphic. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------