PERFORCE change 92564 for review
soc-andrew
soc-andrew at FreeBSD.org
Tue Feb 28 22:04:10 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=92564
Change 92564 by soc-andrew at soc-andrew_serv on 2006/03/01 06:03:02
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#10 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#30 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#9 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#13 integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#10 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -506,7 +506,7 @@
# Check for missing UIDs/GIDs.
#
CHECK_UIDS=
-CHECK_GIDS=
+CHECK_GIDS= audit
.if !defined(NO_SENDMAIL)
CHECK_UIDS+= smmsp
CHECK_GIDS+= smmsp
@@ -1079,11 +1079,14 @@
.for file in ${OLD_FILES}
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
- @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \
- || ([ -f "${DESTDIR}/${file}" ] \
- && echo "Removing schg flag on ${DESTDIR}/${file}" \
- && chflags noschg "${DESTDIR}/${file}" \
- && rm ${RM_I} "${DESTDIR}/${file}"))
+ @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
+ rm ${RM_I} "${DESTDIR}/${file}" || true; \
+ if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
+ echo "Removing schg flag on ${DESTDIR}/${file}"; \
+ chflags noschg "${DESTDIR}/${file}"; \
+ rm ${RM_I} "${DESTDIR}/${file}"; \
+ fi; \
+ fi
.endfor
# Remove catpages without corresponding manpages.
@3<&0; \
@@ -1100,7 +1103,9 @@
check-old-files:
@echo ">>> Checking for old files"
.for file in ${OLD_FILES}
- @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}"
+ @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
+ echo "${DESTDIR}/${file}"; \
+ fi
.endfor
# Check for catpages without corresponding manpages.
@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
@@ -1116,32 +1121,49 @@
@echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt
.for file in ${OLD_LIBS}
- @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \
- || ([ -f "${DESTDIR}/${file}" ] \
- && echo "Removing schg flag on ${DESTDIR}/${file}" \
- && chflags noschg "${DESTDIR}/${file}" \
- && rm ${RM_I} "${DESTDIR}/${file}"))
+ @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
+ rm ${RM_I} "${DESTDIR}/${file}" || true; \
+ if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
+ echo "Removing schg flag on ${DESTDIR}/${file}"; \
+ chflags noschg "${DESTDIR}/${file}"; \
+ rm ${RM_I} "${DESTDIR}/${file}"; \
+ fi; \
+ fi
.endfor
@echo ">>> Old libraries removed"
check-old-libs:
@echo ">>> Checking for old libraries"
.for file in ${OLD_LIBS}
- @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}"
+ @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
+ echo "${DESTDIR}/${file}"; \
+ fi
.endfor
delete-old-dirs:
@echo ">>> Removing old directories"
.for dir in ${OLD_DIRS}
# Don't fail if an old directory isn't empty.
- @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true)
+ @if [ -d "${DESTDIR}/${dir}" ]; then \
+ rmdir -v "${DESTDIR}/${dir}" || true; \
+ else \
+ if [ -L "${DESTDIR}/${dir}" ]; then \
+ echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \
+ fi; \
+ fi
.endfor
@echo ">>> Old directories removed"
check-old-dirs:
@echo ">>> Checking for old directories"
.for dir in ${OLD_DIRS}
- @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}"
+ @if [ -d "${DESTDIR}/${dir}" ]; then \
+ echo "${DESTDIR}/${dir}"; \
+ else \
+ if [ -L "${DESTDIR}/${dir}" ]; then \
+ echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \
+ fi; \
+ fi
.endfor
delete-old: delete-old-files delete-old-dirs
==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#30 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.898 2006/01/30 14:24:31 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.899 2006/02/08 11:18:29 hrs Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -667,10 +667,11 @@
-czf ${RD}/dists/ports/ports.tgz -C /usr ports
@cp ${.CURDIR}/scripts/ports-install.sh ${RD}/dists/ports/install.sh
@(cd ${RD}/dists/ports; \
- rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \
+ rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \
md5 * > .CHECKSUM.MD5; \
- sha256 * > CHECKSUM.SHA256; \
- mv .CHECKSUM.MD5 CHECKSUM.MD5)
+ sha256 * > .CHECKSUM.SHA256; \
+ mv .CHECKSUM.MD5 CHECKSUM.MD5; \
+ mv .CHECKSUM.SHA256 CHECKSUM.SHA256)
@echo "ports distribution is finished."
.endif
touch ${.TARGET}
@@ -702,10 +703,11 @@
done
.endif
(cd ${RD}/dists/src; \
- rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \
+ rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \
md5 * > .CHECKSUM.MD5; \
- sha256 * > CHECKSUM.SHA256; \
- mv .CHECKSUM.MD5 CHECKSUM.MD5)
+ sha256 * > .CHECKSUM.SHA256; \
+ mv .CHECKSUM.MD5 CHECKSUM.MD5; \
+ mv .CHECKSUM.SHA256 CHECKSUM.SHA256)
@echo "src distribution is finished."
.endif
touch ${.TARGET}
@@ -1212,11 +1214,11 @@
)
.endif
@( cd ${RD}/dists/${TD}; \
- rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \
+ rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \
md5 * > .CHECKSUM.MD5; \
- sha256 * > CHECKSUM.SHA256; \
- mv .CHECKSUM.MD5 CHECKSUM.MD5 \
- )
+ sha256 * > .CHECKSUM.SHA256; \
+ mv .CHECKSUM.MD5 CHECKSUM.MD5; \
+ mv .CHECKSUM.SHA256 CHECKSUM.SHA256)
doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \
release.5 release.6 release.7 release.8 release.9 ${EXTRAS}
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 (text+ko) ====
@@ -7,7 +7,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.31 2003/05/27 16:11:09 alex Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.32 2006/02/26 04:57:16 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -123,13 +123,13 @@
Änderungen in &os; seit &release.prev;. Dazu gehören
sowohl die Änderungen, die nur &release.prev; betreffen,
als auch Änderungen in den anderen Entwicklungszweigen
- seit &os; &release.prev.historic;. Letztere sind als &merged;
+ seit &os; &release.prev;. Letztere sind als &merged;
gekennzeichnet.
]]>
</para>
<para>Die Einträge umfassen alle Sicherheitshinweise, die nach
- dem Erscheinen von &release.prev.historic; herausgegeben wurden,
+ dem Erscheinen von &release.prev; herausgegeben wurden,
neue Treiber bzw. Unterstützung für neue Hardware, neue
Befehle oder Optionen, die Behebung wichtiger Fehler, und
Aktualisierungen von zusätzlicher Software. Sie können
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 (text+ko) ====
@@ -29,7 +29,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.295 2006/02/07 03:32:22 marcel Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.296 2006/02/20 21:46:54 brueffer Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -246,6 +246,8 @@
&hwlist.my;
+ &hwlist.myri10ge;
+
&hwlist.nge;
&hwlist.nve;
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.898 2006/02/05 20:54:53 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.903 2006/02/26 21:48:50 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -102,7 +102,7 @@
<para>Typical release note items
document recent security advisories issued after
- &release.prev.historic;,
+ &release.prev;,
new drivers or hardware support, new commands or options,
major bug fixes, or contributed software upgrades. They may also
list changes to major ports/packages or release engineering
@@ -118,38 +118,38 @@
could allow a local attacker to overwrite files in the context
of a user running the &man.texindex.1; utility, has been fixed.
For more details see security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>. &merged;</para>
<para>A temporary file vulnerability in the &man.ee.1; text
editor, which could allow a local attacker to overwrite files in
the context of a user running &man.ee.1;, has been fixed. For
more details see security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>. &merged;</para>
<para>Several vulnerabilities in the &man.cpio.1; utility have
been corrected. For more
details see security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>. &merged;</para>
<para>An error in &man.ipfw.4; IP fragment handling, which could
cause a crash, has been fixed. For more
details see security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>. &merged;</para>
<para>A potential buffer overflow in the IEEE 802.11 scanning code
has been corrected. For more
details see security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>. &merged;</para>
<para>Two instances in which portions of kernel memory could be
disclosed to users have been fixed. For more details see
security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>. &merged;</para>
<para>A logic bug in the IP fragment handling in &man.pf.4;, which
could cause a crash under certain circumstances, has been fixed.
For more details see security advisory <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged</para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged;</para>
</sect2>
@@ -525,17 +525,16 @@
<sect2 id="contrib">
<title>Contributed Software</title>
- <para><application>libpcap</application> has been updated
- to v0.9.1 (release).</para>
+ <para><application>BIND</application> has been updated from 9.3.1
+ to 9.3.2. &merged;</para>
- <para><application>OpenSSH</application> has been updated from
- version 4.0p1 to version 4.2p1.</para>
+ <para><application>IPFilter</application> has been updated from
+ 4.1.8 to 4.1.10.</para>
- <para><application>sendmail</application> has been updated from
- version 8.13.3 to version 8.13.4.</para>
+ <para>The timezone database has been updated from the
+ <application>tzdata2005l</application> release to the
+ <application>tzdata2005r</application> release. &merged;</para>
- <para><application>tcpdump</application> has been updated
- to v3.9.1 (release).</para>
</sect2>
<sect2 id="ports">
@@ -618,6 +617,26 @@
changed.</para>
</listitem>
</itemizedlist>
+
+ <para>The supported version of
+ the <application>GNOME</application> desktop environment
+ (<filename role="package">x11/gnome2</filename>) has been
+ updated from 2.10.2 to 2.12.3. &merged;</para>
+
+ <para>The supported version of
+ the <application>KDE</application> desktop environment
+ (<filename role="package">x11/kde2</filename>) has been
+ updated from 3.4.2 to 3.5.1. &merged;</para>
+
+ <para>The supported version of
+ the <application>Perl</application> interpreter
+ (<filename role="package">lang/perl5.8</filename>) has been updated
+ from 5.8.7 to 5.8.8. &merged;</para>
+
+ <para>The supported version of
+ the <application>&xorg;</application> windowing system
+ (<filename role="package">x11/xorg</filename>) has been updated
+ from 6.8.2 to 6.9.0. &merged;</para>
</sect2>
<sect2 id="doc">
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
FreeBSD Japanese Documentation Project
- $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $
+ $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.98 2006/02/26 04:57:17 hrs Exp $
Original revision: 1.663.2.5
-->
@@ -11,7 +11,7 @@
<corpauthor>FreeBSD ¥×¥í¥¸¥§¥¯¥È</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.98 2006/02/26 04:57:17 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -107,14 +107,14 @@
<![ %no.include.historic; [
&release.prev; °Ê¹ß¤Ë¿·¤¿¤ËÄɲá¦Êѹ¹¤µ¤ì¤¿
¥æ¡¼¥¶¤Ë±Æ¶Á¤¹¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
- ¤³¤ì¤Ë¤Ï¾¤Î¥Ö¥é¥ó¥Á (&os; &release.prev.historic; °Ê¹ß) ¤Ø¤È
+ ¤³¤ì¤Ë¤Ï¾¤Î¥Ö¥é¥ó¥Á (&os; &release.prev; °Ê¹ß) ¤Ø¤È
ºÇ¶á¥Þ¡¼¥¸¤µ¤ì¤¿µ¡Ç½¤Ë²Ã¤¨¤Æ¡¢&release.branch; ¥Ö¥é¥ó¥Á
¤Ë¸ÇͤιàÌܤâ´Þ¤Þ¤ì¤Þ¤¹¡£
]]>
</para>
<para>¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë¤Ï¡¢
- &release.prev.historic; °Ê¹ß¤Ë½Ð¤µ¤ì¤¿¥»¥¥å¥ê¥Æ¥£´«¹ð¡¢
+ &release.prev; °Ê¹ß¤Ë½Ð¤µ¤ì¤¿¥»¥¥å¥ê¥Æ¥£´«¹ð¡¢
¿·¤·¤¤¥É¥é¥¤¥Ð¤ä¥Ï¡¼¥É¥¦¥§¥¢Âбþ¡¢
¿·¤·¤¤¥³¥Þ¥ó¥É¤ä¥ª¥×¥·¥ç¥ó¡¢½ÅÍפʥХ°¥Õ¥£¥Ã¥¯¥¹¤ä´ó£¥½¥Õ¥È¥¦¥§¥¢
¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 (text+ko) ====
@@ -11,7 +11,7 @@
<corpauthor>ðÒÏÅËÔ &os;</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.21 2005/07/08 14:34:10 den Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.22 2006/02/26 04:57:17 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -109,7 +109,7 @@
<para>ïÂÙÞÎÏ × ÉÎÆÏÒÍÁÃÉÉ Ï ÒÅÌÉÚÅ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏ ×ËÌÀÞÅÎÙ
ÐÏÓÌÅÄÎÉÅ ÓÏÏÂÝÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ, ×ÙÐÕÝÅÎÎÙÅ ÐÏÓÌÅ
- &release.prev.historic;, ÉÎÆÏÒÍÁÃÉÑ Ï ÐÏÄÄÅÒÖËÅ ÎÏ×ÙÈ ÄÒÁÊ×ÅÒÏ× ÉÌÉ
+ &release.prev;, ÉÎÆÏÒÍÁÃÉÑ Ï ÐÏÄÄÅÒÖËÅ ÎÏ×ÙÈ ÄÒÁÊ×ÅÒÏ× ÉÌÉ
ÏÂÏÒÕÄÏ×ÁÎÉÑ, ÎÏ×ÙÈ ËÏÍÁÎÄ ÉÌÉ ÐÁÒÁÍÅÔÒÏ×, ÉÎÆÏÒÍÁÃÉÑ Ï ÏÓÎÏ×ÎÙÈ
ÉÓÐÒÁ×ÌÅÎÉÑÈ ÏÛÉÂÏË, ÉÌÉ ÏÂÎÏ×ÌÅÎÉÑÈ ÓÔÏÒÏÎÎÅÇÏ ÐÒÏÇÒÁÍÍÎÏÇÏ
ÏÂÅÓÐÅÞÅÎÉÑ. ÷ ÎÅÍ ÍÏÇÕÔ ÔÁËÖÅ ÐÅÒÅÞÉÓÌÑÔØÓÑ ÉÚÍÅÎÅÎÉÑ ×ÁÖÎÅÊÛÉÈ
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#9 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.77 2006/02/07 03:25:18 marcel Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.78 2006/02/20 21:46:54 brueffer Exp $
#
#
@@ -84,6 +84,7 @@
mlx i386,alpha,ia64,amd64
mly i386,ia64,amd64
my i386,pc98
+myri10ge i386,amd64
ncr i386,pc98,alpha,sparc64,amd64
ncv i386,pc98
ng_bt3c i386,pc98,amd64
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.ent#3 (text+ko) ====
@@ -1,6 +1,6 @@
<!-- -*- sgml -*-
- $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.25 2005/07/15 15:14:22 hrs Exp $
+ $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.26 2006/02/23 06:15:56 hrs Exp $
OS Release Information -->
@@ -11,16 +11,12 @@
<!-- The previous version used for comparison in the "What's New"
section. For -CURRENT, we might point back to the last
branchpoint. -->
-<!ENTITY release.prev "5.3-RELEASE">
+<!ENTITY release.prev "6.0-RELEASE">
<!-- The previous stable release, useful for pointing user's at the
release they SHOULD be running if they don't want the bleeding
edge. -->
-<!ENTITY release.prev.stable "4.10-RELEASE">
-
-<!-- The previous historical release. Used only to tell what was
- the cutoff point for "historic" release notes. -->
-<!ENTITY release.prev.historic "6.0-RELEASE">
+<!ENTITY release.prev.stable "6.0-RELEASE">
<!-- The next version to be released, usually used for snapshots. -->
<!ENTITY release.next "7.0-RELEASE">
@@ -40,9 +36,9 @@
<!-- The manpaths for man page references -->
<!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
-<!ENTITY release.manpath.xfree86 "4.4.0">
-<!ENTITY release.manpath.xorg "6.8.2">
-<!ENTITY release.manpath.netbsd "2.0.2">
+<!ENTITY release.manpath.xfree86 "4.5.0">
+<!ENTITY release.manpath.xorg "6.9.0">
+<!ENTITY release.manpath.netbsd "3.0">
<!ENTITY release.manpath.freebsd-ports "Ports">
<!ENTITY release.manpath.freebsd "7.0-current">
==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.343 2006/02/02 11:14:35 rwatson Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.346 2006/02/27 16:17:25 harti Exp $
# XXX MISSING: mkproto
SUBDIR= ac \
@@ -12,9 +12,9 @@
${_apmd} \
${_arlcontrol} \
arp \
- audit \
- auditd \
- auditreduce \
+ ${_audit} \
+ ${_auditd} \
+ ${_auditreduce} \
${_asf} \
${_atm} \
${_authpf} \
@@ -124,7 +124,7 @@
pppd \
pppstats \
${_praliases} \
- praudit \
+ ${_praudit} \
procctl \
pstat \
pw \
@@ -200,6 +200,13 @@
_atm= atm
.endif
+.if !defined(NO_AUDIT)
+_audit= audit
+_auditd= auditd
+_auditreduce= auditreduce
+_praudit= praudit
+.endif
+
.if !defined(NO_BIND)
.if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT)
_dnssec-keygen= dnssec-keygen
More information about the p4-projects
mailing list